Merge branch 'master' of http://gitlab2.dui88.com/fh/20250528_FHQ1

pages/syWebview/syWebview.vue

@@ -53,7 +53,7 @@ const globalStore = useGlobalStore()
 // 登录获取 cuk
 const wxAutoLogin = async () => {
 	await new Promise(resolve => {
-		userStore.wxAutoLogin(resolve)
+		userStore.syWxAutoLogin(resolve)
 	})
 }
 

stores/user.js

@@ -259,6 +259,36 @@ export const useUserStore = defineStore("userInfo", {
       });
     },
 
+    /**
+     * 
+     * @param {sy使用}  
+     * @returns 
+     */
+    async syWxAutoLogin(cb=null) {
+      uni.login({
+        provider: "weixin",
+        success: async (res) => {
+          console.log("wxAutoLogin", res);
+          if (res.errMsg === "login:ok") {
+            const { data } = await autoLoginByCode(code);
+          console.log("autoLoginByCode", data);
+          // 如果登录成功，获取用户信息和宝宝信息，更新到state中，方便全局使用
+          if (data && data.cuk) {
+            globalStore.setCuk(data.cuk,data.openId,data.unionId);
+            cb && cb();
+          }
+          } else {
+            uni.showToast({
+              title: res.errMsg,
+              icon: "error",
+            });
+          }
+
+          md.sensors.init();
+        },
+      });
+    },
+
     async createBabyInfo(babyInfo) {
       console.log("createBabyInfo:", babyInfo);
       const res = await updateBabyInfo(babyInfo);