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

app/api/controller/MemberController.php

@@ -1098,7 +1098,7 @@ class MemberController extends BaseController
             showJson(1004, $validate->getError());
         }
 
-        $result = FaceAuth::getToken($params);
+        $result = FaceAuth::getToken($this->userId,$params);
         $data = isset($result['result'])? $result['result'] : [];
         $code = isset($result['code']) && $result['code']? $result['code'] : 'error';
         $msg = isset($result['msg']) && $result['msg']? $result['msg'] : '验证错误';

app/weixin/controller/AuthController.php

@@ -74,14 +74,15 @@ class AuthController extends BaseController
 
         // 签名验证
         $userId = mb_substr($bizNo, 11, 0,'utf-8');
-        if($idcard && $idcardName && $code == 'PASS' && $userId){
-
-
+        if(1){
+//        if($idcard && $idcardName && $code == 'PASS' && $userId){
             $this->assign('bizNo',$bizNo);
-            $this->assign('result','认证成功');
+            $this->assign('code','success');
+            $this->assign('result','<em>身份验证成功</em>，请等待审核');
         }else{
             $this->assign('bizNo', '');
-            $this->assign('result','认证失败');
+            $this->assign('code','error');
+            $this->assign('result','<em>身份验证失败</em>，请返回重试');
         }
 
         $params['user_id'] = $userId;

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

@@ -1,27 +1,62 @@
 <include file="weixin@block:header"/>
 <title></title>
 <link rel="stylesheet" href="__TMPL__/weixin/public/assets/css/auth-idcard.css?v={$version}">
+<style>
+    .result {
+        margin-top: 150px;
+        text-align: center;
+    }
+    .result .time {
+        width: 10px;
+        display: inline-block;
+    }
+    .result .msg {
+        margin: 0;
+    }
+    .result .msg em {
+        font-style: normal;
+    }
+    .result .msg.error em {
+        color: #f47d5e;
+    }
+
+    .result .msg.success em {
+        color: #ffd132;
+    }
+</style>
 <div id="app" v-cloak>
     <div class="fanhui2"><h1>身份认证</h1>
         <a href="/weixin/auth/index"><img src="__TMPL__/weixin/public/assets/img/tubiao37.png"></a>
     </div>
     <div class="main">
+        <div class="result">
+            <p class="img"><img src="__TMPL__/weixin/public/assets/img/icon/auth-{$code}.png" alt=""></p>
+            <p><span class="msg {$code}">{$result}</span>，<span id="time" class="time" v-text="time">5</span>s后自动返回</p>
+        </div>
         <div class="baoc_ann">
-            <p><span>{$result}</span><span id="time">5</span></p>
             <h1><a href="/weixin/auth/idcard">返回</a></h1>
         </div>
     </div>
 </div>
 <script>
-var time = 5;
-$("#time").text(time)
-setTimeout(function(){
-    time --;
-    if(time<=0){
-        location.href = '/weixin/auth/idcard'
-    }else{
-        $("#time").text(time)
-    }
-}, 1000)
+    var app = new Vue({
+        'el': '#app',
+        'data': {
+            time: 5,
+            timeId: null,
+        },
+        created(){
+            let _this = this
+            _this.timeId = setInterval(function(){
+                _this.time --;
+                if(_this.time<=0){
+                    clearInterval(_this.timeId)
+                    location.href = '/weixin/auth/idcard'
+                }else{
+                    $("#time").text(_this.time)
+                }
+            }, 1000)
+        },
+    });
 </script>
 <include file="weixin@block:footer"/>