From 58f33b05dd61840dc477a1484d5b609adb0f70b6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?lemon=E6=A9=AA?= <17633066053@163.com>
Date: Thu, 9 Sep 2021 17:53:57 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=BE=AE=E4=BF=A1=E5=85=AC?=
 =?UTF-8?q?=E4=BC=97=E5=8F=B7=E4=B8=ADh5=E7=99=BB=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/passport/codeLogin.vue    | 22 +++++++++++++++++++---
 pages/passport/onClickLogin.vue |  2 +-
 2 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/pages/passport/codeLogin.vue b/pages/passport/codeLogin.vue
index f10cca3..62febf1 100644
--- a/pages/passport/codeLogin.vue
+++ b/pages/passport/codeLogin.vue
@@ -6,9 +6,10 @@
       </u-form-item>
 
       <u-form-item class="cell code" label-width="120" prop="code" label="验证码">
-        <div style="display:flex; with:100%;">
+        <div style="display:flex; width:100%;">
           <u-input maxlength="6" v-model="codeForm.code" placeholder="请输入验证码" />
-          <u-verification-code keep-running unique-key="page-login" :seconds="seconds" @end="end" @start="start" ref="uCode" @change="codeChange"></u-verification-code>
+          <u-verification-code keep-running unique-key="page-login" :seconds="seconds" @end="end" @start="start"
+            ref="uCode" @change="codeChange"></u-verification-code>
           <view @tap="getCode" :style="{color:aiderLightColor}" class="text-tips">{{ tips }}</view>
 
         </div>
@@ -28,6 +29,7 @@ import storage from "@/utils/storage.js"; //缓存
 import { whetherNavigate } from "@/utils/Foundation"; //登录跳转
 import myVerification from "@/components/verification/verification.vue"; //验证码模块
 import uuid from "@/utils/uuid.modified.js"; // uuid
+import api from "@/config/api.js";
 export default {
   components: {
     myVerification,
@@ -73,7 +75,6 @@ export default {
   },
   // 必须要在onReady生命周期setRules，因为onLoad生命周期组件可能尚未创建完毕
   mounted() {
-    // whetherNavigate();
     this.$refs.validateCodeForm.setRules(this.codeRules);
     /**
      * 条件编译判断当前客户端类型
@@ -82,6 +83,7 @@ export default {
     this.clientType = "H5";
     //#endif
     //#ifdef APP-PLUS
+
     this.clientType = "APP";
     //#endif
   },
@@ -190,7 +192,21 @@ export default {
     },
     // 跳转到一键登录
     clickLogin() {
+      // #ifndef APP-PLUS
+      //判断是否微信浏览器
+      var ua = window.navigator.userAgent.toLowerCase();
+      if (ua.match(/MicroMessenger/i) == "micromessenger") {
+        let code = "WECHAT";
+        let buyer = api.buyer;
+        window.open(buyer + `/connect/login/web/` + code, "_self");
+      }
+      else{
+        this.$emit("open", "click");
+      }
+      // #endif
+      // #ifdef APP-PLUS
       this.$emit("open", "click");
+      // #endif
     },
 
     /**点击验证码*/
diff --git a/pages/passport/onClickLogin.vue b/pages/passport/onClickLogin.vue
index a87bd30..eb766cf 100644
--- a/pages/passport/onClickLogin.vue
+++ b/pages/passport/onClickLogin.vue
@@ -5,7 +5,7 @@
         <!-- 循环出当前可使用的第三方登录模式 -->
         <div :style="{background:item.color}" class="login-item" v-for="(item,index) in loginList" :key="index">
           <u-icon v-if="item.title!='APPLE'" color="#fff" size="42" :name="item.icon" @click="navigateLogin(item)"></u-icon>
-           <u-image v-else src="/static/appleidButton@2x.png" :lazy-load="false" width="80" height="80" />
+           <u-image v-else src="/static/appleidButton@2x.png" :lazy-load="false" @click="navigateLogin(item)" width="80" height="80" />
         </div>
       </div>