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

src/views/sunVillage_info/identity_check.vue

@@ -6,22 +6,21 @@
       </div>
 
       <!--      未认证-->
-      <div class="list_main">
-        <p class="userName">万小云 <span class="noCheck">待认证</span></p>
-        <p class="id_card">371006598754784267</p>
-        <img class="img_block" src="../../assets/images/sunVillage_info/check_icon_02.png" alt="">
+      <div class="list_main"v-if="responseData.isFacial ==='N'" >
+        <p class="userName">{{responseData.memberName}}<span class="noCheck">待认证</span></p>
+        <p class="id_card" >{{responseData.idcard}}</p>
+        <van-uploader v-model="fileList" :max-count="1" multiple :after-read="afterRead" @delete="deleteFile1" />
         <p class="text_block">上传或拍摄人像图进行认证</p>
         <p class="btn_block">验证</p>
       </div>
 
       <!--      已认证-->
-      <div class="list_main">
-        <p class="userName">万小云
-          <span class="yesCheck">已认证<span class="yesTime">2023.10.05</span></span>
+      <div class="list_main" v-if="responseData.isFacial ==='Y'">
+        <p class="userName" >{{responseData.memberName}}
+          <span class="yesCheck">已认证<span class="yesTime" >{{responseData.facialAt}}</span></span>
         </p>
-        <p class="id_card">371006598754784267</p>
-
-        <van-uploader v-model="fileList" :max-count="1" multiple :after-read="afterRead" @delete="deleteFile1" />
+        <p class="id_card" >{{responseData.idcard}}</p>
+        <img class="img_block" :src="'/api'+responseData.headSculpture" alt="">
 
 <!--        <img class="img_block" src="../../assets/images/sunVillage_info/check_icon_02.png" alt="">-->
 
@@ -40,10 +39,11 @@
         fileList:[],
         openPic:[],
         openPic2:[],
+        responseData: null,
       };
     },
     created() {
-
+      this.responseData = this.$route.query.responseData;
     },
     methods: {
       deleteFile1(detail){

src/views/sunVillage_info/login_code.vue

@@ -75,8 +75,12 @@
           idcard:'',
           bookId:'',
           deptId:null,
+          facialAt:null,
+          isFacial:null,
+          headSculpture:null,
           rememberMe:false,
           identityCheck:false,
+
         },
         loading: false,
         codeUrl: "", //验证码
@@ -126,10 +130,7 @@
             return false;
           }
 
-          if (this.formData.identityCheck){
-            this.$router.push({path:'/sunVillage_info/identity_check'})
-            return;
-          }
+
           checkFarmer(this.formData).then(response => {
             // console.log(response.data)
             if (response.code == 200){
@@ -137,9 +138,18 @@
 
               let expires = new Date(new Date() * 1 + seconds * 1000);
               getFamilyMemberList({idcard:this.formData.idcard,familyStatus:"02"}).then(res => {
+
                 const farmerCode = res.rows[0].farmerCode;
+
                 Cookies.set("farmerCode",farmerCode, { expires: 30 });
                 Cookies.set("user", response.data, { expires: expires });
+
+                if (this.formData.identityCheck){
+                  this.$router.push({
+                    path: '/sunVillage_info/identity_check',
+                    query: { responseData: response.data }});
+                  return;
+                }
                 this.$router.push({path:'/sunVillage_info/index_code_rights'})
               })