feat: 修改手机授权逻辑

api/request.js

@@ -51,9 +51,6 @@ const request = (options = {}) => {
 				} else {
 					resolve(data.data);
 				}
-				// const [err, res] = data;
-				// TODO uni.showToast errMsg
-
 			})
 			.catch((error) => {
 				reject(error);

api/user.js

 import requestModule from './request.js';
-const { api } = requestModule;
+const {
+	api
+} = requestModule;
 
 /**
  * 获取用户信息
- * @param {*} cuk
  * @returns
  */
-export const fetchUserInfo = (cuk) =>
-  api.get('/c/user/memberInfo', {
-    cuk,
-  });
+export const fetchUserInfo = () => api.get('/c/user/memberInfo');
 
 /**
  * 获取宝宝信息
- * @param {*} cuk
  * @returns
  */
-export const fetchBabyInfo = (cuk) =>
-  api.get('/c/user/babyInfo', {
-    cuk,
-  });
+export const fetchBabyInfo = () => api.get('/c/user/babyInfo');
 
 /**
  * 根据wx.login接口返回的code完成登录
  * @param {*} code
  * @returns
  */
-export const autoLoginByCode = (code) =>
-  api.get('/c/login/autologin', {
-    code,
-  });
+export const autoLoginByCode = (code) => api.get('/c/login/autologin', {
+	code,
+});
 
 /**
  * 手机号授权，调用微信手机号快速验证组件，获取encryptedData、iv、code
  * 通过此接口完成手机号授权，注册新用户
- * @param {*} data : {phoneEncryptedData, phoneIv, code}
+ * @param {*} data : {phoneEncryptedData, phoneIv, code, codeLogin}
  * @returns
  */
-export const fetchAutoPhone = (data) => api.post('/c/login/authPhone', data);
+export const fetchAutoPhone = (data) => api.post('/c/login/authPhone', data);
\ No newline at end of file

stores/global.js

@@ -7,7 +7,7 @@ const cuk = uni.getStorageSync('cuk')
 export const useGlobalStore = defineStore('global', {
 	state: () => {
 		return {
-			cuk: cuk, // 用户登录后获取的凭证，获取用户、宝宝信息接口时使用
+			cuk: cuk, // 用户登录后获取的凭证，调用接口时headers中携带
 		};
 	},
 	actions: {

stores/user.js

@@ -9,7 +9,8 @@ import {
 } from '../api/user.js';
 import {
 	useGlobalStore
-} from './global.js';
+} from './global.js';
+
 const globalStore = useGlobalStore();
 
 export const useUserStore = defineStore('userInfo', {
@@ -42,14 +43,29 @@ export const useUserStore = defineStore('userInfo', {
 		 * @returns
 		 */
 		async phoneCallback(data) {
-			// 用户手机授权
-			await fetchAutoPhone({
-				phoneEncryptedData: data.encryptedData,
-				phoneIv: data.iv,
-				code: data.code,
+			uni.login({
+				provider: 'weixin',
+				success: async (res) => {
+					// console.log('wxAutoLogin', res);
+					if (res.errMsg === 'login:ok') {
+						// 用户手机授权
+						await fetchAutoPhone({
+							phoneEncryptedData: data.encryptedData,
+							phoneIv: data.iv,
+							code: data.code,
+							codeLogin: res.code
+						});
+						// 授权注册成功后做一次登录
+						this.wxAutoLogin();
+					} else {
+						uni.showToast({
+							title: res.errMsg,
+							icon: 'error'
+						});
+					}
+				},
 			});
-			// 授权注册成功后做一次登录
-			this.wxAutoLogin();
+
 		},
 
 		/**
@@ -106,6 +122,11 @@ export const useUserStore = defineStore('userInfo', {
 					console.log('wxAutoLogin', res);
 					if (res.errMsg === 'login:ok') {
 						this.autoLoginByCode(res.code);
+					} else {
+						uni.showToast({
+							title: res.errMsg,
+							icon: 'error'
+						});
 					}
 				},
 			});