Merge branch 'master' of http://116.255.223.226:3000/zhangzl/nsgk_mobile

 Conflicts:

	src/views/biddingHall/index.vue

src/views/biddingHall/index.vue

@@ -151,7 +151,7 @@
           </div>
           <div class="list_li_time">
             <p>
-              <span style="color: #848484">竞价时间：{{item.biddingStartTime}} ~ {{item.biddingStopSetime}}</span>
+              <span style="color: #848484">竞价时间：{{item.biddingStartTime}}~{{item.biddingStopSetime}}</span>
             </p>
           </div>
 
@@ -296,9 +296,9 @@ export default {
               time = endDate-nowDate>0?endDate-nowDate:0
             }
             console.log(time)
-            this.infoList.push({content:item.projectName,biddingType:item.biddingType,deadline:time,currentPrice:item.price,priceUnit:item.unit,id:item.id,money:item.money,projectShowStatus:item.projectShowStatus,biddingStopTime:item.biddingStopTime,biddingStartTime:item.biddingStartTime,biddingStopSetime:item.biddingStopSetime})
+            this.infoList.push({content:item.projectName,biddingType:item.biddingType,deadline:time,currentPrice:item.price,priceUnit:item.unit,id:item.id,money:item.money,projectShowStatus:item.projectShowStatus,biddingStopTime:item.biddingStopTime,biddingStartTime:item.biddingStartTime})
           }else{
-            this.infoList.push({content:item.projectName,biddingType:item.biddingType,deadline:0,currentPrice:item.price,priceUnit:item.unit,id:item.id,money:item.money,projectShowStatus:item.projectShowStatus,biddingStopTime:item.biddingStopTime,biddingStartTime:item.biddingStartTime,biddingStopSetime:item.biddingStopSetime})
+            this.infoList.push({content:item.projectName,biddingType:item.biddingType,deadline:0,currentPrice:item.price,priceUnit:item.unit,id:item.id,money:item.money,projectShowStatus:item.projectShowStatus,biddingStopTime:item.biddingStopTime,biddingStartTime:item.biddingStartTime})
           }
         })
         if(this.infoList.length >= response.total){

src/views/project/projectDetail.vue

@@ -60,7 +60,7 @@
             <van-col span="24"><span>竞价开始时间：</span>{{ detail.biddingStartTime }}</van-col>
           </van-row>
           <van-row>
-            <van-col span="24"><span>竞价结束时间<span v-if="detail.delayPeriod!=0">(含延期)</span>：</span>{{ detail.biddingStopTime }}</van-col>
+            <van-col span="24"><span>竞价结束时间：</span>{{ detail.biddingStopSetime }}</van-col>
           </van-row>
           <van-row>
             <van-col span="24"><span>竞价方式：</span>{{ detail.biddingType }}</van-col>

src/views/user/application/index.vue

@@ -19,8 +19,8 @@
           </template>
           <template #label>
             <p>报名状态：<span :style="{color:item.depositStatus == '1' ? '#007E72':'#c21F3a'}">{{item.depositStatus}}</span></p>
-            <p>开始时间：{{item.biddingStartTime}}</p>
-            <p>结束时间：{{item.biddingStopTime}}</p>
+            <p>竞价开始时间：{{item.biddingStartTime}}</p>
+            <p>实际竞价结束时间：{{item.biddingStopTime}}</p>
             <p>距<span style="margin: 0 0.5em">结</span>束：
               <van-count-down :time="item.endTime">
                 <template #default="timeData">{{timeData.days}}天{{timeData.hours}}时{{timeData.minutes}}分{{timeData.seconds}}秒</template>