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}} - - - - - - - 当前价 - - * - - - {{item.money}} - - {{item.priceUnit}} - 暂无出价 - - - +
+ +
+

{{item.content}}

+

{{item.timeType}}

+
+
+ + + +

+ 当前价 + + * + + + {{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 { } -