✨ 微信小程序登录：手动登录完成

sheep/platform/provider/wechat/miniProgram.js

@@ -1,6 +1,8 @@
-import { isEmpty } from 'lodash';
 import third from '@/sheep/api/third';
 import $store from '@/sheep/store';
+import AuthUtil from '@/sheep/api/member/auth';
+
+const socialType = 34; // 社交类型 - 微信小程序
 
 let sessionId = uni.getStorageSync('sessionId');
 let subscribeEventList = [];
@@ -17,30 +19,32 @@ function load() {
   getSubscribeTemplate();
 }
 
-// 微信小程序静默授权登陆 TODO-ldh: code > 0 问题 改为error
+// 微信小程序静默授权登陆
 const login = async () => {
   return new Promise(async (resolve, reject) => {
-    const { error } = await third.wechat.login({
-      platform: 'miniProgram',
-      shareInfo: uni.getStorageSync('shareLog') || {},
-      payload: encodeURIComponent(
-        JSON.stringify({
-          sessionId: uni.getStorageSync('sessionId'),
-        }),
-      ),
-    });
+    // 1. 获得微信 code
+    const codeResult = await uni.login();
+    if (codeResult.errMsg !== 'login:ok') {
+      resolve(false);
+    }
 
-    if (error === 0) {
+    // 2. 社交登录
+    const loginResult = await loginByCode(codeResult.code);
+    if (loginResult.code === 0) {
+      setOpenid(loginResult.data.openid);
       resolve(true);
+    } else {
+      resolve(false);
     }
-
-    if (error === -1) {
-      getSessionId(false);
-    }
-    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) => {
@@ -240,6 +244,11 @@ function subscribeMessage(event) {
   });
 }
 
+// 设置 openid 到本地存储，目前只有 pay 支付时会使用
+function setOpenid(openid) {
+  uni.setStorageSync('openid', openid);
+}
+
 export default {
   load,
   login,

sheep/platform/provider/wechat/officialAccount.js

@@ -1,6 +1,5 @@
 import third from '@/sheep/api/third';
 import $wxsdk from '@/sheep/libs/sdk-h5-weixin';
-import $store from '@/sheep/store';
 import { getRootUrl } from '@/sheep/helper';
 import AuthUtil from '@/sheep/api/member/auth';
 
@@ -8,32 +7,24 @@ const socialType = 31; // 社交类型 - 微信公众号
 
 // 加载微信公众号JSSDK
 async function load() {
-  // TODO 芋艿：自动登录的逻辑
-  if ($store('app').platform.auto_login
-    && $store('user').isLogin
-    && location.href.search('pages/index/login') === -1) {
-    // 发起自动登陆
-    login();
-  }
   $wxsdk.init();
 }
 
 // 微信公众号登陆
 async function login(code = '', state = '') {
-  // 获取登陆地址
+  // 情况一：没有 code 时，去获取 code
   if (!code) {
     const loginUrl = await getLoginUrl();
     if (loginUrl) {
       uni.setStorageSync('returnUrl', location.href);
       window.location = loginUrl;
     }
+  // 情况二：有 code 时，使用 code 去自动登录
   } else {
     // 解密 code 发起登陆
     const loginResult = await loginByCode(code, state);
     if (loginResult.code === 0) {
-      if (loginResult.data.openid) {
-        setOpenid(loginResult.data.openid);
-      }
+      setOpenid(loginResult.data.openid);
       return loginResult;
     }
   }