Commit 6813cd81 authored by 黄韬's avatar 黄韬

Merge branch '20250528-dev-ht' into 'dev'

fix: 修复注册后有宝宝信息不需填写

See merge request sparkprojects/20250528_FHQ1!36
parents 92033f33 51d0891b
......@@ -47,7 +47,7 @@ export const myObj = {
"desc": "宝宝体质测试",
"link": {
"type": 3,
"url": "https://www.baidu.com",
"url": "https://ali.xudankeji.com/play/rCeXjMai",
"extra": {}
}
}
......
......@@ -61,7 +61,7 @@ export const useUserStore = defineStore("userInfo", {
* @param {Object} data : {encryptedData, iv, code}
* @returns
*/
async phoneCallback(data) {
async phoneCallback(data, onOpenRegisterFn = () => {}) {
uni.login({
provider: "weixin",
success: async (res) => {
......@@ -74,6 +74,9 @@ export const useUserStore = defineStore("userInfo", {
code: data.code,
codeLogin: res.code,
});
!babyExistence && onOpenRegisterFn && onOpenRegisterFn();
const homeStore = useHomeStore();
await homeStore.setBabyExistence(babyExistence);
......
......@@ -173,7 +173,6 @@ const $baseUrl = proxy.$baseUrl;
const userStore = useUserStore();
const pageCfgStore = usePageCfgStore();
const cfgStatus = ref({
openBabyCardDesc: false,
showDetail: false,
......@@ -233,8 +232,6 @@ const handleToolClick = async (item) => {
const { sign, timestamp, appId, partnerUserId, env } = res.data;
console.log('sign, timestamp, appId, partnerUserId:', sign, timestamp, appId, partnerUserId, env);
jump({
type: JumpType.MINI,
url: "/pages/partner/redirect",
......@@ -318,9 +315,9 @@ const getRealtimePhoneNumber = async (e) => {
});
return;
}
console.log("detail", e.detail);
await userStore.phoneCallback(e.detail);
showRegisterLayer.value = true;
await userStore.phoneCallback(e.detail, () => {
showRegisterLayer.value = true;
});
};
const handleChangeBaby = () => {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment