wesmiler 更新第5期更新代码合并

app/api/controller/MemberController.php

@@ -1101,6 +1101,15 @@ class MemberController extends BaseController
             showJson(1004, $validate->getError());
         }
 
+        // 验证身份证号是否被使用
+        $idcard = isset($params['idcard'])? trim($params['idcard']) : '';
+        $checkId = UserProfile::where(['idcard' => $idcard])
+            ->where('userid', 'not in', $this->userId)
+            ->value('id');
+        if ($checkId) {
+            showJson(1004, 2128);
+        }
+
         $result = FaceAuth::getToken($this->userId,$params);
         $data = isset($result['result'])? $result['result'] : [];
         $code = isset($result['code']) && $result['code']? $result['code'] : 'error';

public/themes/default/weixin/auth/idcard.html

@@ -25,6 +25,7 @@
         <div class="baoc_ann" >
             <h1 v-if="authInfo.idcard_check == 3" @click="authCheck()">重新提交</h1>
             <h1 v-else-if="authInfo.idcard_check == 2" >已认证</h1>
+            <h1 v-else-if="authInfo.idcard_check == 1 && authInfo.idcard_check_online">审核中</h1>
             <h1 v-else @click="authCheck()">开始验证</h1>
         </div>
     </div>

public/themes/default/weixin/member/home.html

@@ -108,7 +108,7 @@
                             </div>
                             <div class="auth-type" >
                                 <p v-if="homeInfo.idcard_check==2">实名已认证</p><p v-else>实名未认证</p>
-                                <p class="type">认证方式：居民身份证</p>
+                                <p class="type">认证方式：人脸核验</p>
                             </div>
                         </div>
                     </div>

public/themes/default/weixin/public/assets/css/match.css

@@ -9,7 +9,8 @@ body {
 .box {
     padding: 0 15px;
     overflow-y: scroll !important;
-    height: calc(100% - 134px);
+    height: calc(100% - 122px);
+    /*height: calc(100% - 134px);*/
     position: relative;
     margin-bottom: 0;
  }