From 5eb8c33038c68769876f0fad7fe0ed3a90213900 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BA=9E=E4=B8=9C=E6=97=AD?= <850374051@qq.com> Date: Wed, 28 Jun 2023 13:41:18 +0800 Subject: [PATCH 1/8] =?UTF-8?q?=E4=BA=A7=E6=9D=83=E4=BA=A4=E6=98=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/project/projectDetail.vue | 49 +++++++++++++++++++++++++++-- 1 file changed, 47 insertions(+), 2 deletions(-) diff --git a/src/views/project/projectDetail.vue b/src/views/project/projectDetail.vue index 2e063fe5..45c97ad9 100644 --- a/src/views/project/projectDetail.vue +++ b/src/views/project/projectDetail.vue @@ -231,10 +231,16 @@ +

出价

{{price}}元

 + + +

出价

+ + @@ -294,7 +300,8 @@ export default { userId:"", timeConfig:'', biddinglistInformationLength:0, - biddingTimeType:0 + biddingTimeType:0, + isFirst:'' }; }, computed: { @@ -473,7 +480,7 @@ export default { }; getSignup(data).then(r =>{ if(r.data=="1"){ - _this.isSignup=true + _this.isSignup=true; this.btnMsg="立即竞价" // this.price=this.detail.ladderPrice?this.biddinglistInformation[0].money+this.detail.ladderPrice:this.biddinglistInformation[0].money+1 }else{ @@ -507,6 +514,7 @@ export default { _this.isSignup=true this.btnMsg="立即竞价" this.showBtn=true + _this.isFirst = r.signup.isFirst; // this.price=this.detail.ladderPrice?this.biddinglistInformation[0].money+this.detail.ladderPrice:this.biddinglistInformation[0].money+1 }else{ this.btnMsg="未报名" @@ -517,6 +525,7 @@ export default { }) setInterval(function () { + console.log('qweasd') getBiddingList(that.id).then(response =>{ that.biddinglistInformation = response.rows if((response.rows.length != that.biddinglistInformationLength) && that.detail.ladderPrice){ @@ -552,6 +561,42 @@ export default { }) }); }, + + offerFirst(){ + let newMoney; + projectNewBidMoney(this.id).then(response =>{ + if (response.data&&response.code==200){ + newMoney = response.data; + }else{ + newMoney = this.detail.price; + } + + let data= { + projectId:this.id, + memberId:this.memberId, + userId:this.userId, + userAccount:this.userAccount, + userName:this.userName, + money:parseInt(newMoney).toFixed(2), + }; + biddingSubmit(data).then(response =>{ + let _this = this + if(response){ + this.$toast({ + icon: 'success', // 找到自己需要的图标 + message: '出价成功', + duration:"1000", + onClose:function(){ + _this.reload() + } + }) + + } + }) + + }); + }, + offer(){ let newMoney; projectNewBidMoney(this.id).then(response =>{ From 2ea6fa548f5bc774459f3a0cf334ea8a7deb7fe8 Mon Sep 17 00:00:00 2001 From: zzl <961867786@qq.com> Date: Wed, 28 Jun 2023 15:24:02 +0800 Subject: [PATCH 2/8] =?UTF-8?q?=E8=AF=A6=E6=83=85=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/project/projectDetail.vue | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/views/project/projectDetail.vue b/src/views/project/projectDetail.vue index 5a0614ae..ba9075c7 100644 --- a/src/views/project/projectDetail.vue +++ b/src/views/project/projectDetail.vue @@ -94,8 +94,8 @@ 住址（地址）{{ detail.address }} - 经济类型{{ detail.economicType }} - 机构代码证号{{ detail.areaNum }} + 经济类型{{ detail.economicType }} + 机构代码证号{{ detail.areaNum }} 法人/负责人{{ detail.legalPerson }} @@ -106,8 +106,8 @@ 身份证号*************** - 项目类型{{ detail.projectNumber }} - 农地性质{{ detail.projectType }} + 项目类型{{ detail.projectNumber }} + 农地性质{{ detail.projectType }} 转出项目名称{{ detail.projectName }} @@ -120,8 +120,8 @@ - 拟转出方式{{ detail.rollout }} - 拟转出面积/数量 {{detail.allCount}}{{detail.allCountUnit}} + 拟转出方式{{ detail.rollout }} + 拟转出面积/数量 {{detail.allCount}}{{detail.allCountUnit}} 拟转出期限{{detail.outStartTime}} 至 {{detail.outStopTime}}     共{{detail.outYearNum}}年 From d4e5ea261895867f92d46b589e574549d40c809c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BA=9E=E4=B8=9C=E6=97=AD?= <850374051@qq.com> Date: Wed, 28 Jun 2023 15:54:41 +0800 Subject: [PATCH 3/8] =?UTF-8?q?=E4=BA=A7=E6=9D=83=E4=BA=A4=E6=98=93?= =?UTF-8?q?=E7=A6=BB=E5=BC=80=E9=A1=B5=E9=9D=A2=E6=97=B6=E6=B8=85=E9=99=A4?= =?UTF-8?q?=E5=AE=9A=E6=97=B6=E5=99=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/project/projectDetail.vue | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/src/views/project/projectDetail.vue b/src/views/project/projectDetail.vue index 5a0614ae..33a8566a 100644 --- a/src/views/project/projectDetail.vue +++ b/src/views/project/projectDetail.vue @@ -286,7 +286,8 @@ export default { timeConfig:'', biddinglistInformationLength:0, biddingTimeType:0, - isFirst:'' + isFirst:'', + timer:null }; }, computed: { @@ -509,8 +510,7 @@ export default { }) }) - setInterval(function () { - console.log('qweasd') + this.timer = setInterval(function () { getBiddingList(that.id).then(response =>{ that.biddinglistInformation = response.rows if((response.rows.length != that.biddinglistInformationLength) && that.detail.ladderPrice){ @@ -839,6 +839,19 @@ export default { } } + }, + destroyed () { + console.log('bbbbbbbbbb') + clearInterval(this.timer); + }, + beforeDestory() { + clearInterval(this.timer) + }, + //离开页面清除定时器失效问题 + beforeRouteLeave (to, from, next) { + console.log("我离开了") + clearInterval(this.timer) + next() } }; From 2319a53fbc37b35896af00fbff7dc649fd738522 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BA=9E=E4=B8=9C=E6=97=AD?= <850374051@qq.com> Date: Wed, 28 Jun 2023 16:24:40 +0800 Subject: [PATCH 4/8] =?UTF-8?q?=E4=BA=A7=E6=9D=83=E4=BA=A4=E6=98=93?= =?UTF-8?q?=E6=B3=A8=E5=86=8C=E6=A3=80=E7=B4=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/register/companyRegister.vue | 4 ++-- src/views/register/userRegister.vue | 4 ++-- .../accountSetting/bankInformation/index.vue | 16 ++++++++++++++++ 3 files changed, 20 insertions(+), 4 deletions(-) diff --git a/src/views/register/companyRegister.vue b/src/views/register/companyRegister.vue index 3c3cdd82..63f796cf 100644 --- a/src/views/register/companyRegister.vue +++ b/src/views/register/companyRegister.vue @@ -346,7 +346,7 @@ export default { } depositList(data).then(response => { if (response.rows.length<1){ - if (this.sheng==''||this.shi==''){ + if (this.form.sheng==''||this.form.shi==''){ this.$toast({ icon: 'fail', // 找到自己需要的图标 message: '请选择省市', @@ -354,7 +354,7 @@ export default { }) return; } - if (this.bankDeposit==''){ + if (this.form.bankDeposit==''){ this.$toast({ icon: 'fail', // 找到自己需要的图标 message: '请输入关键词', diff --git a/src/views/register/userRegister.vue b/src/views/register/userRegister.vue index 31b72ba6..18d6193b 100644 --- a/src/views/register/userRegister.vue +++ b/src/views/register/userRegister.vue @@ -309,7 +309,7 @@ export default { } depositList(data).then(response => { if (response.rows.length<1){ - if (this.sheng==''||this.shi==''){ + if (this.form.sheng==''||this.form.shi==''){ this.$toast({ icon: 'fail', // 找到自己需要的图标 message: '请选择省市', @@ -317,7 +317,7 @@ export default { }) return; } - if (this.bankDeposit==''){ + if (this.form.bankDeposit==''){ this.$toast({ icon: 'fail', // 找到自己需要的图标 message: '请输入关键词', diff --git a/src/views/user/accountSetting/bankInformation/index.vue b/src/views/user/accountSetting/bankInformation/index.vue index 4f3239cb..ac3025e8 100644 --- a/src/views/user/accountSetting/bankInformation/index.vue +++ b/src/views/user/accountSetting/bankInformation/index.vue @@ -164,6 +164,22 @@ import {depositList, realtimeBackList} from "@/api/register"; } depositList(data).then(response => { if (response.rows.length<1){ + if (this.form.sheng==''||this.form.shi==''){ + this.$toast({ + icon: 'fail', // 找到自己需要的图标 + message: '请选择省市', + duration:"1000", + }) + return; + } + if (this.form.bankDeposit==''){ + this.$toast({ + icon: 'fail', // 找到自己需要的图标 + message: '请输入关键词', + duration:"1000", + }) + return; + } realtimeBackList(data).then(response2 => { console.log(response2) this.bankAddressOption = response2.data; From 1a706e2c037d8a5325fce37040cabdf034850348 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BA=9E=E4=B8=9C=E6=97=AD?= <850374051@qq.com> Date: Wed, 28 Jun 2023 17:21:56 +0800 Subject: [PATCH 5/8] =?UTF-8?q?=E4=BA=A7=E6=9D=83=E4=BA=A4=E6=98=93?= =?UTF-8?q?=E6=B3=A8=E5=86=8C=E6=A3=80=E7=B4=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/project/signUp.vue | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/views/project/signUp.vue b/src/views/project/signUp.vue index eada3b30..4b88ac4e 100644 --- a/src/views/project/signUp.vue +++ b/src/views/project/signUp.vue @@ -350,6 +350,11 @@ export default { }) }, onRead (file) { + this.$toast.loading({ + message: "正在提交...", + forbidClick: true, + duration: 0, + }); let data = {}; let f = [] for (let i of file){ From 1c1dabb7a9447c25cb32dbd57c565701c40fd351 Mon Sep 17 00:00:00 2001 From: zzl <961867786@qq.com> Date: Wed, 28 Jun 2023 17:29:21 +0800 Subject: [PATCH 6/8] =?UTF-8?q?=E8=AF=A6=E6=83=85=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/project/projectDetail.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/project/projectDetail.vue b/src/views/project/projectDetail.vue index 566e5552..d59d73ea 100644 --- a/src/views/project/projectDetail.vue +++ b/src/views/project/projectDetail.vue @@ -44,7 +44,7 @@