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

 Conflicts:

	src/views/user/index.vue

src/views/homesteadSurvey/add4.vue

@@ -126,13 +126,13 @@
           :lineWidth="signature.lineWidth"
           :lineColor="signature.lineColor"
           :bgColor.sync="signature.bgColor"
-          v-if="zjdzdxx.surveyStatus == '4' || zjdzdxx.surveyStatus == '2' || !signature.resultImg"
+          v-if="zjdzdxx.surveyStatus != '3' && zjdzdxx.surveyStatus != '5' || !signature.resultImg && permission == 'true'"
         />
       </div>
-        <img src="../../assets/images/sunVillage_info/signature_icon_10.png" id="canvasTT"  v-if="zjdzdxx.surveyStatus == '4' || zjdzdxx.surveyStatus == '2' ||!signature.resultImg"
+        <img src="../../assets/images/sunVillage_info/signature_icon_10.png" id="canvasTT"  v-if="zjdzdxx.surveyStatus != '3' && zjdzdxx.surveyStatus != '5' || !signature.resultImg && permission == 'true'"
              style="position:absolute;top: 50%;left: 50%;transform: translate(-50%,-50%)" alt="">
-        <img :src="signature.resultImg" alt="" width="100%" v-if="signature.resultImg && zjdzdxx.surveyStatus != '4' && zjdzdxx.surveyStatus != '2'"/>
-      <div class="signature-footer"  v-if="zjdzdxx.surveyStatus == '4' || zjdzdxx.surveyStatus == '2' || !signature.resultImg && permission == 'true'">
+        <img :src="signature.resultImg" alt="" width="100%" v-if="signature.resultImg && zjdzdxx.surveyStatus == '3' || zjdzdxx.surveyStatus == '5'"/>
+      <div class="signature-footer"  v-if="zjdzdxx.surveyStatus != '3' && zjdzdxx.surveyStatus != '5' || !signature.resultImg && permission == 'true'">
           <van-button type="primary" round size="small" @click="handleReset">清空画板</van-button>
           <van-button type="primary" round size="small" @click="handleGenerate">保存提交</van-button>
       </div>

src/views/homesteadSurvey/fsssAdd.vue

@@ -25,7 +25,7 @@
           </van-col>
           <van-col span="4"  style="text-align:center;" @click="$router.push({path:'/homesteadSurvey/add2'})" >
             <van-icon :name="require('../../assets/images/housesteadSurvey/nhxx'+(active==2?'A':'D')+'.png')" size="1rem" style="margin-top:0px;"/>
-            <p :style="{color:(active==2?'rgb(34, 183, 242)':'#000')}">农户</p>
+            <p :style="{color:(active==2?'rgb(34, 183, 242)':'#000')}">权利人</p>
           </van-col>
           <van-col span="2">
             <div style="border-top: 2px dashed #b5b4b4;margin-top: 20px;"></div>

src/views/homesteadSurvey/shyqrAdd.vue

@@ -348,6 +348,7 @@ export default {
       deptId:JSON.parse(localStorage.getItem("surveyItem")).deptId,
       nhdmDictionaries:[],
       newList:[],
+      newListTwo:[],
       nmfwDictionaries:[],
       mapShow: false,
       form:{}
@@ -402,6 +403,7 @@ export default {
           };
         });
         this.newList = this.nhdmDictionaries;
+        this.newListTwo = this.nhdmDictionaries;
       });
     },
     checkNhdmQx(){
@@ -534,7 +536,7 @@ export default {
         }
       }
       if(val==""){
-        this.getList()
+        this.newList = this.newListTwo;
       }
     },
     /** 查找地图中宅基地 */

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>

src/views/user/index.vue

@@ -120,7 +120,10 @@ export default {
           this.activitiStatus = response.data.activitiStatus;
           this.instanceId = response.data.instanceId;
           this.memberType = response.data.memberType;
-          this.getHistoryList()
+          if(this.instanceId !== "" && this.instanceId != null){
+            this.getHistoryList()
+          }
+
         });
       });
     },