From ad2a48933cde6f0ad8a17e92cfd0672177622b21 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, 21 Jun 2023 13:26:18 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BA=A7=E6=9D=83=E4=BA=A4=E6=98=93?= =?UTF-8?q?=E5=8D=95=E4=BD=8D=E7=94=A8=E6=88=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/register/companyRegister.vue | 31 ++++++++++++++- .../userInformation/companyInformation.vue | 38 ++++++++++++++++++- 2 files changed, 67 insertions(+), 2 deletions(-) diff --git a/src/views/register/companyRegister.vue b/src/views/register/companyRegister.vue index 75bb8bfe..09ac0a07 100644 --- a/src/views/register/companyRegister.vue +++ b/src/views/register/companyRegister.vue @@ -27,7 +27,14 @@ - + + + + + + + + @@ -149,6 +156,7 @@ export default { showPicker: false, columns:[], fileListKHZM:[], + fileListFRZJZ:[], form: { phone: "", //账号 code: "", //验证码 @@ -251,6 +259,27 @@ export default { }) }); }, + afterReadFRZJZ(file) { + // 此时可以自行将文件上传至服务器 + this.$toast.loading({ + message: "上传中...", + forbidClick: true, + duration: 0, + }); + let params1 = { + file:file.content + } + base64Upload(params1).then((r1) => { + this.form.idCardPic = r1.fileName; + }) + }, + deleteFileFRZJZ(elIndex){ + return (file, name) => { + let fileIndex = name.index + this.fileListFRZJZ[elIndex].splice(fileIndex, 1) + this.form.idCardPic = ''; + } + }, afterReadKHZM(file) { this.$toast.loading({ message: "上传中...", diff --git a/src/views/user/accountSetting/userInformation/companyInformation.vue b/src/views/user/accountSetting/userInformation/companyInformation.vue index 71bbdfcb..1dc9ae8f 100644 --- a/src/views/user/accountSetting/userInformation/companyInformation.vue +++ b/src/views/user/accountSetting/userInformation/companyInformation.vue @@ -66,7 +66,14 @@ - + + + + + + + + @@ -99,6 +106,7 @@ export default { fileList:[], companyNameList:[], fileListKHZM:[], + fileListFRZJZ:[], form: { files:[], fileType:'', @@ -173,6 +181,13 @@ export default { }]; } + if (response.data.idCardPic!=''){ + this.fileListFRZJZ = [{ + url:'/api'+response.data.idCardPic, + isImage: true + }]; + } + this.tel = response.data.phone this.getDicts("company_nature").then(res => { @@ -192,6 +207,27 @@ export default { }); }); }, + afterReadFRZJZ(file) { + // 此时可以自行将文件上传至服务器 + this.$toast.loading({ + message: "上传中...", + forbidClick: true, + duration: 0, + }); + let params1 = { + file:file.content + } + base64Upload(params1).then((r1) => { + this.userForm.idCardPic = r1.fileName; + }) + }, + deleteFileFRZJZ(elIndex){ + return (file, name) => { + let fileIndex = name.index + this.fileListFRZJZ[elIndex].splice(fileIndex, 1) + this.userForm.idCardPic = ''; + } + }, afterReadKHZM(file) { // 此时可以自行将文件上传至服务器 let params1 = new FormData(); From a21a392047d93b0f625f94f636bf4a744ee95c4a 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, 21 Jun 2023 13:33:15 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BA=A7=E6=9D=83=E4=BA=A4=E6=98=93?= =?UTF-8?q?=E5=8D=95=E4=BD=8D=E7=94=A8=E6=88=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/register/companyRegister.vue | 8 ++++---- .../accountSetting/userInformation/companyInformation.vue | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/views/register/companyRegister.vue b/src/views/register/companyRegister.vue index 2b258d6b..8c5af4a1 100644 --- a/src/views/register/companyRegister.vue +++ b/src/views/register/companyRegister.vue @@ -26,16 +26,16 @@ + + + + - - - - diff --git a/src/views/user/accountSetting/userInformation/companyInformation.vue b/src/views/user/accountSetting/userInformation/companyInformation.vue index 1dc9ae8f..003c72da 100644 --- a/src/views/user/accountSetting/userInformation/companyInformation.vue +++ b/src/views/user/accountSetting/userInformation/companyInformation.vue @@ -15,8 +15,6 @@ - - + + From 97f2ab3fdb6c2e24e9109b45162dc4fdf69fad42 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, 21 Jun 2023 16:53:01 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BA=A7=E6=9D=83=E4=BA=A4=E6=98=93?= =?UTF-8?q?=E7=AB=9E=E4=BB=B7=E5=A4=A7=E5=8E=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/biddingHall/index.vue | 307 +++++++++++++++++++++++--------- static/images/title_icon.png | Bin 0 -> 403 bytes 2 files changed, 220 insertions(+), 87 deletions(-) create mode 100644 static/images/title_icon.png diff --git a/src/views/biddingHall/index.vue b/src/views/biddingHall/index.vue index a7a796f4..d2a31d3b 100644 --- a/src/views/biddingHall/index.vue +++ b/src/views/biddingHall/index.vue @@ -30,84 +30,74 @@ - - 竞价流程 - - - - - + + + 竞价流程 + + + + - + + - 第一步 查看项目 - - + + + - + + + - 第二步 注册报名 - - + + + - + + + - 第三步 交保证金 - - + + + - + + + - 第四步 资质审核 - - + + + - + + + - 第五步 参与竞价 - - + + + - + + + - 第六步 成交确认 - - - - + + + + + + - 第七步 结算交割 - - - + + + - - - {{item.content}} - - - - - 距竞价结束{{timeData.days}}天{{timeData.hours}}时{{timeData.minutes}}分{{timeData.seconds}}秒 - - - - 当前价 - - * - - - {{item.money}} - - {{item.priceUnit}} - 暂无出价 - - - + + + + {{item.content}} + {{item.timeType}} + + + + + 距竞价结束 + {{timeData.days}}天{{timeData.hours}}时{{timeData.minutes}}分{{timeData.seconds}}秒 + + + + 当前价 + + * + + + {{item.money}} + + {{item.priceUnit}} + 暂无出价 + + + + + + + + + + + + + + + + + + + @@ -224,6 +263,32 @@ export default { this.queryParams.projectShowStatus = this.value3; getBiddingList(this.queryParams).then(response =>{ response.rows.map(item => { + if(item.biddingStopTime != null || item.biddingStartTime != null){ + var endTimes=item.biddingStopTime.substring(0,10).split('-'); + var biddingStopTime=endTimes[1]+'/'+endTimes[2]+'/'+endTimes[0]+' '+item.biddingStopTime.substring(10,19); + + var startTimes=item.biddingStartTime.substring(0,10).split('-'); + var biddingStartTime=startTimes[1]+'/'+startTimes[2]+'/'+startTimes[0]+' '+item.biddingStartTime.substring(10,19); + + var nowTime = Date.parse(new Date()); + var leftTime = Date.parse(biddingStopTime)-nowTime; + var rightTime = Date.parse(biddingStartTime)-nowTime; + console.log(biddingStopTime) + console.log(leftTime) + + if(leftTime>0){ + console.log('进行中') + item.timeType = '进行中' + } + if(leftTime<0){ + console.log('已结束') + item.timeType = '已结束' + } + if(rightTime>0){ + console.log('未开始') + item.timeType = '未开始' + } + } if (item.biddingStopTime!=""){ let time = 0 let endDate = Date.parse(item.biddingStopTime); @@ -232,9 +297,9 @@ export default { time = endDate-nowDate>0?endDate-nowDate:0 } console.log(time) - this.infoList.push({content:item.projectName,deadline:time,currentPrice:item.price,priceUnit:item.unit,id:item.id,money:item.money}) + this.infoList.push({content:item.projectName,deadline:time,currentPrice:item.price,priceUnit:item.unit,id:item.id,money:item.money,timeType:item.timeType}) }else{ - this.infoList.push({content:item.projectName,deadline:0,currentPrice:item.price,priceUnit:item.unit,id:item.id,money:item.money}) + this.infoList.push({content:item.projectName,deadline:0,currentPrice:item.price,priceUnit:item.unit,id:item.id,money:item.money,timeType:item.timeType}) } }) if(this.infoList.length >= response.total){ @@ -301,7 +366,47 @@ export default { } -
+ + 竞价流程 +
第一步
查看项目
第二步
注册报名
第三步
交保证金
第四步
资质审核
第五步
参与竞价
第六步
成交确认
第七步
结算交割
{{item.content}}
{{item.timeType}}
+ 当前价 + + * + + + {{item.money}} + + {{item.priceUnit}} + 暂无出价 +