From 789cbe84611194a941a7cb9c85b79186cacccfbe Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Sat, 23 Dec 2023 19:45:44 +0800
Subject: [PATCH] =?UTF-8?q?=E2=9C=A8=20=E5=BE=AE=E4=BF=A1=E5=B0=8F?=
 =?UTF-8?q?=E7=A8=8B=E5=BA=8F=E7=99=BB=E5=BD=95=EF=BC=9A=E4=B8=80=E9=94=AE?=
 =?UTF-8?q?=E7=99=BB=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/user/info.vue                           |  6 +--
 sheep/api/member/auth.js                      | 19 ++++++-
 sheep/api/user.js                             | 10 ----
 .../components/s-auth-modal/s-auth-modal.vue  | 39 +++++++++-----
 sheep/platform/provider/wechat/miniProgram.js | 51 ++++++++-----------
 sheep/store/app.js                            |  1 -
 6 files changed, 67 insertions(+), 59 deletions(-)

diff --git a/pages/user/info.vue b/pages/user/info.vue
index 3342180c..56a1f3f6 100644
--- a/pages/user/info.vue
+++ b/pages/user/info.vue
@@ -183,12 +183,12 @@
 </template>
 
 <script setup>
-  import { computed, ref, reactive, onBeforeMount } from 'vue';
-  import { mobile, password, username } from '@/sheep/validate/form';
+  import { computed, reactive, onBeforeMount } from 'vue';
   import sheep from '@/sheep';
   import { clone } from 'lodash';
   import { showAuthModal } from '@/sheep/hooks/useModal';
   import FileApi from '@/sheep/api/infra/file';
+  import UserApi from '@/sheep/api/member/user';
 
   const state = reactive({
     model: {}, // 个人信息
@@ -278,7 +278,7 @@
 
   // 保存信息
   async function onSubmit() {
-	 const { code } = await sheep.$api.user.update({
+	 const { code } = await UserApi.updateUser({
       avatar: state.model.avatar,
       nickname: state.model.nickname,
       sex: state.model.sex,
diff --git a/sheep/api/member/auth.js b/sheep/api/member/auth.js
index 776eed48..782ef728 100644
--- a/sheep/api/member/auth.js
+++ b/sheep/api/member/auth.js
@@ -65,7 +65,24 @@ const AuthUtil = {
       custom: {
         showSuccess: true,
         loadingMsg: '登陆中',
-        // TODO 芋艿：登录成功？？？
+      },
+    });
+  },
+  // 微信小程序的一键登录
+  weixinMiniAppLogin: (phoneCode, loginCode, state) => {
+    debugger
+    return request({
+      url: '/app-api/member/auth/weixin-mini-app-login',
+      method: 'POST',
+      data: {
+        phoneCode,
+        loginCode,
+        state
+      },
+      custom: {
+        showSuccess: true,
+        loadingMsg: '登陆中',
+        successMsg: '登录成功',
       },
     });
   },
diff --git a/sheep/api/user.js b/sheep/api/user.js
index a02bfdd7..56af4272 100644
--- a/sheep/api/user.js
+++ b/sheep/api/user.js
@@ -30,16 +30,6 @@ export default {
 				auth: true,
 			},
 		}),
-	update: (data) =>
-		request2({
-			url: 'member/user/update',
-			method: 'PUT',
-			custom: {
-				showSuccess: true,
-				auth: true,
-			},
-			data,
-		}),
 	// 账号登录
 	accountLogin: (data) =>
 		request({
diff --git a/sheep/components/s-auth-modal/s-auth-modal.vue b/sheep/components/s-auth-modal/s-auth-modal.vue
index b2bb2392..449eb201 100644
--- a/sheep/components/s-auth-modal/s-auth-modal.vue
+++ b/sheep/components/s-auth-modal/s-auth-modal.vue
@@ -32,18 +32,16 @@
         <!-- 立即注册&快捷登录 TextButton -->
         <view v-if="sheep.$platform.name === 'WechatMiniProgram'" class="ss-flex register-box">
           <view class="register-title">还没有账号?</view>
-          <button class="ss-reset-button register-btn" @tap="showAuthModal('smsRegister')">
-            立即注册
+          <button class="ss-reset-button login-btn" open-type="getPhoneNumber" @getphonenumber="getPhoneNumber">
+            快捷登录
           </button>
-          <view class="or-title">或</view>
-          <button class="ss-reset-button login-btn" @tap="thirdLogin('wechat')">快捷登录</button>
-          <view class="circle"></view>
+          <view class="circle" />
         </view>
 
-        <!-- 公众号|App微信登录 -->
+        <!-- 微信的公众号、App、小程序的登录，基于 openid + code -->
         <button
           v-if="
-            ['WechatOfficialAccount', 'App'].includes(sheep.$platform.name) &&
+            ['WechatOfficialAccount', 'WechatMiniProgram', 'App'].includes(sheep.$platform.name) &&
             sheep.$platform.isWechatInstalled
           "
           @tap="thirdLogin('wechat')"
@@ -55,7 +53,7 @@
           />
         </button>
 
-        <!-- iOS登录 -->
+        <!-- iOS 登录 -->
         <button
           v-if="sheep.$platform.os === 'ios' && sheep.$platform.name === 'App'"
           @tap="thirdLogin('apple')"
@@ -64,12 +62,12 @@
           <image
             class="auto-login-img"
             :src="sheep.$url.static('/static/img/shop/platform/apple.png')"
-          ></image>
+          />
         </button>
       </view>
 
       <view
-        v-if="['accountLogin', 'smsLogin', 'smsRegister'].includes(authType)"
+        v-if="['accountLogin', 'smsLogin'].includes(authType)"
         class="agreement-box ss-flex ss-row-center"
         :class="{ shake: currentProtocol }"
       >
@@ -98,7 +96,7 @@
           </view>
         </label>
       </view>
-      <view class="safe-box"></view>
+      <view class="safe-box"/>
     </view>
   </su-popup>
 </template>
@@ -126,12 +124,12 @@
 
   const currentProtocol = ref(false);
 
-  //勾选协议
+  // 勾选协议 TODO 芋艿：协议
   function onChange() {
     state.protocol = !state.protocol;
   }
 
-  // 查看协议
+  // 查看协议 TODO 芋艿：协议
   function onProtocol(id, title) {
     closeAuthModal();
     sheep.$router.go('/pages/public/richtext', {
@@ -140,7 +138,7 @@
     });
   }
 
-  // 点击登录/注册事件
+  // 点击登录 / 注册事件
   function onConfirm(e) {
     currentProtocol.value = e;
     setTimeout(() => {
@@ -167,6 +165,19 @@
       // #endif
     }
   };
+
+  // 微信小程序的“手机号快速验证”：https://developers.weixin.qq.com/miniprogram/dev/framework/open-ability/getPhoneNumber.html
+  const getPhoneNumber = async (e) => {
+    if (e.detail.errMsg !== 'getPhoneNumber:ok') {
+      sheep.$helper.toast('快捷登录失败');
+      return;
+    }
+    let result = await sheep.$platform.useProvider().mobileLogin(e.detail);
+    if (result) {
+      debugger
+      closeAuthModal();
+    }
+  };
 </script>
 
 <style lang="scss" scoped>
diff --git a/sheep/platform/provider/wechat/miniProgram.js b/sheep/platform/provider/wechat/miniProgram.js
index 802f3a68..d4b83eb6 100644
--- a/sheep/platform/provider/wechat/miniProgram.js
+++ b/sheep/platform/provider/wechat/miniProgram.js
@@ -25,55 +25,45 @@ const login = async () => {
     // 1. 获得微信 code
     const codeResult = await uni.login();
     if (codeResult.errMsg !== 'login:ok') {
-      resolve(false);
+      return resolve(false);
     }
 
     // 2. 社交登录
-    const loginResult = await loginByCode(codeResult.code);
+    const loginResult = await AuthUtil.socialLogin(socialType, codeResult.code, 'default');
+    debugger
     if (loginResult.code === 0) {
       setOpenid(loginResult.data.openid);
-      resolve(true);
+      return resolve(true);
     } else {
-      resolve(false);
+      return resolve(false);
     }
-    return loginResult.code === 0 ? resolve(true) : resolve(false);
   });
 };
 
-function loginByCode(code) {
-  return AuthUtil.socialLogin(socialType, code, 'default');
-  // TODO 芋艿：shareLog
-}
-
 // 微信小程序手机号授权登陆
 const mobileLogin = async (e) => {
   return new Promise(async (resolve, reject) => {
+    console.log(e.errMsg)
     if (e.errMsg !== 'getPhoneNumber:ok') {
-      resolve(false);
-      return;
+      return resolve(false);
     }
 
-    const { error } = await third.wechat.login({
-      platform: 'miniProgram',
-      shareInfo: uni.getStorageSync('shareLog') || {},
-      payload: encodeURIComponent(
-        JSON.stringify({
-          sessionId: uni.getStorageSync('sessionId'),
-          code: e.code,
-          iv: e.iv,
-          encryptedData: e.encryptedData,
-        }),
-      ),
-    });
-
-    if (error === 0) {
-      resolve(true);
+    // 1. 获得微信 code
+    const codeResult = await uni.login();
+    if (codeResult.errMsg !== 'login:ok') {
+      return resolve(false);
     }
 
-    if (error === -1) {
-      getSessionId(false);
+    // 2. 一键登录
+    debugger
+    const loginResult = await AuthUtil.weixinMiniAppLogin(e.code, codeResult.code, 'default');
+    if (loginResult.code === 0) {
+      setOpenid(loginResult.data.openid);
+      return resolve(true);
+    } else {
+      return resolve(false);
     }
-    resolve(false);
+    // TODO 芋艿：shareInfo: uni.getStorageSync('shareLog') || {},
   });
 };
 
@@ -256,5 +246,6 @@ export default {
   unbind,
   checkUpdate,
   bindUserPhoneNumber,
+  mobileLogin,
   subscribeMessage,
 };
diff --git a/sheep/store/app.js b/sheep/store/app.js
index 6f309edd..6e874a74 100644
--- a/sheep/store/app.js
+++ b/sheep/store/app.js
@@ -31,7 +31,6 @@ const app = defineStore({
         posterInfo: {}, // 海报信息
         linkAddress: '', // 复制链接地址
       },
-      auto_login: 0, // 自动登陆
       bind_mobile: 0, // 登陆后绑定手机号提醒 (弱提醒，可手动关闭)
     },
     chat: {},