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

src/utils/request.js

@@ -78,40 +78,42 @@ service.interceptors.response.use(res => {
               return;
             }
           } catch (e) { console.log(e); }
-
+          // 农业执法
           if (window.location.href.indexOf('/lawEnforcement') != -1) {
             window.location.href = '/lawEnforcement/login';
             return;
           }
+          // 确权回头看
           if (window.location.href.indexOf('/authenticRight') != -1) {
             window.location.href = '/authenticRight/login';
             return;
           }
+          // 宅基地调查
           if (window.location.href.indexOf('/homesteadSurvey') != -1) {
             window.location.href = '/homesteadLogin';
             return;
           }
-          /*  已取消此页面
-          if (window.location.href.indexOf('/onlineHome') != -1) {
-            window.location.href = '/zjdLogin';
-            return;
-          }*/
+          // 事项审批
           if (window.location.href.indexOf('/yinnong') != -1) {
             window.location.href = '/yinnongLogin';
             return;
           }
+          // 阳光村务
           if (window.location.href.indexOf('/sunVillage_info/') != -1) {
             window.location.href = '/sunVillage_info/login';
             return;
           }
+          // 两清三化
           if (window.location.href.indexOf('/homestead/') != -1) {
             window.location.href = '/homestead/login';
             return;
           }
+          // 生产托管
           if (window.location.href.indexOf('/agriculturalTrusteeship') != -1){
             window.location.href = '/agriculturalTrusteeship/login';
             return;
           }
+          // 产权交易
           window.location.href = '/login';
         })
       })

src/views/sunVillage_info/homeApplication/proposerLite.vue

@@ -140,7 +140,7 @@
                               :on-remote-response="'data'"
                             />
                             <van-field required v-model="item.sfzh" label="身份证号" placeholder="身份证号" input-align="right" :rules="[{pattern: /^[1-9]\d{5}(18|19|20|(3\d))\d{2}((0[1-9])|(1[0-2]))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$/}]" @input="updateMemberInfo(index)"/>
-                            <van-field required v-model="applicationDetail.sqhhzhkszd" label="户口所在地" placeholder="户口所在地" input-align="right" :rules="[{ required: true }]"/>
+                            <van-field required v-model="item.hkszd" label="户口所在地" placeholder="户口所在地" input-align="right" :rules="[{ required: true }]"/>
                           </div>
                         </div>
                       </van-tab>
@@ -2090,7 +2090,6 @@ export default {
    }else{
      this.sysFarmer = JSON.parse(Cookies.get('user'));
    }
-    console.info( this.sysFarmer);
     this.getFormIntent();
     this.getDetail();
     // this.getLandCoord();
@@ -4226,6 +4225,7 @@ export default {
       for(let i in this.applicationDetail.sqrjtcyList)
       {
         let v = this.applicationDetail.sqrjtcyList[i];
+        console.info(v);
         if (this.checkString(v.xm)) {
           return "成员姓名不能为空";
         }