Merge remote-tracking branch 'origin/master'

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>{{ detail.biddingStopTime }}</van-col>
+            <van-col span="24"><span>竞价结束时间 <span v-if="detail.delayPeriod!=0">(含延期)</span>：</span>{{ detail.biddingStopTime }}</van-col>
           </van-row>
           <van-row>
             <van-col span="24"><span>竞价方式：</span>{{ detail.biddingType }}</van-col>