showMask

activity0915/act0915/act0915.vue

@@ -573,7 +573,7 @@ const onGetPhoneNumber = async (e) => {
 		try {
 			// 隐藏授权弹窗
 			showMask.value = false;
-			userStore.phoneCallback(e.detail).then(async () => {
+			userStore.phoneCallback(e.detail, null, null, async () => {
 				// 重新获取用户信息（登录后）
 				await fetchAct915HomeData();
 

stores/user.js

@@ -71,7 +71,7 @@ export const useUserStore = defineStore("userInfo", {
      * @param {Object} data : {encryptedData, iv, code}
      * @returns
      */
-    async phoneCallback(data, onOpenRegisterFn = () => { }, cb) {
+    async phoneCallback(data, onOpenRegisterFn = () => { }, cb,cb2) {
       uni.login({
         provider: "weixin",
         success: async (res) => {
@@ -94,6 +94,7 @@ export const useUserStore = defineStore("userInfo", {
 
             const homeStore = useHomeStore();
             await homeStore.setBabyExistence(babyExistence);
+            cb2 && cb2();
 
             // 授权注册成功后做一次登录
             this.wxAutoLogin();