Commit 7f97f3c1 authored by spc's avatar spc

fixed

parent 0c59f9d5
......@@ -88,8 +88,8 @@ const getMessage = (e) => {
const initWebviewUrl = async () => {
// 使用固定的基础URL,从 options 中获取或使用默认值
const options = pageOptions.value
let baseUrl = options.url || options.baseUrl || 'https://momclub-test.feihe.com/h5/game/index.html'
let baseUrl = 'https://momclub-test.feihe.com/h5/game/index.html'
// 如果 baseUrl 已经包含协议,直接使用;否则添加协议
if (!baseUrl.startsWith('http://') && !baseUrl.startsWith('https://')) {
baseUrl = 'https://' + baseUrl
......@@ -113,17 +113,23 @@ const initWebviewUrl = async () => {
const params = { ...cleanOptions }
if (cuk && !params.cuk) params.cuk = cuk
// 添加用户信息参数
if (openId && !params.openId) params.openId = openId
if (openId && !params.miniopenid) params.miniopenid = openId
if (unionId && !params.unionId) params.unionId = unionId
// 获取会员信息(优先从 memberInfo 获取,如果没有则从 userInfo 获取)
const memberInfo = userStore.memberInfo || userStore.userInfo
const userInfo = userStore.userInfo
// 添加微信昵称(如果存在)
if (userInfo?.nickname) {
params.wxNickName = userInfo.nickname
}
// 添加 memberId(如果已注册)
if (memberInfo?.memberId && memberInfo.memberId !== "not_login") {
params.crmId = memberInfo.memberId
// 添加会员ID
params.memberId = memberInfo.memberId
params.memberid = memberInfo.memberId
// 添加是否登录(1表示已登录,0表示未登录)
params.programLogin = '1'
// 添加会员等级(从 gradeList 中根据 grade 获取 gradeName)
......@@ -315,7 +321,7 @@ onShareTimeline((options) => {
return {
title: title || '分享',
path: shareurl || '/pages/index/index',
path: shareurl || '/pages/gameWebview/webview',
imageUrl: imageUrl || '',
success: function (res) {
//星妈会埋点方法,用户分享成功后触发事件
......
......@@ -248,7 +248,7 @@ export const useUserStore = defineStore("userInfo", {
console.log("fetchMemberInfo=", data);
this.setMemberInfo(data);
if (data?.memberId !== "not_login") {
uni.setStorageSync('memberId', data?.memberId)
}
......@@ -393,16 +393,16 @@ export const useUserStore = defineStore("userInfo", {
/**
* 清除用户信息(注销时使用)
*/
// clearUserData() {
// this.userInfo = null;
// this.babyInfo = null;
// this.memberInfo = null;
// this.babyNickCache = [];
// this.cepingjieguoInfo = null;
// // 清除本地存储
// uni.removeStorageSync('memberId');
// uni.removeStorageSync('loginStatus');
// },
clearUserData() {
this.userInfo = null;
this.babyInfo = null;
this.memberInfo = null;
this.babyNickCache = [];
this.cepingjieguoInfo = null;
// 清除本地存储
uni.removeStorageSync('memberId');
uni.removeStorageSync('loginStatus');
},
},
});
\ No newline at end of file
......@@ -88,11 +88,11 @@ export default {
uni.hideLoading();
if (res.ok) {
// 清除本地缓存的用户信息
// const userStore = useUserStore();
const userStore = useUserStore();
// const globalStore = useGlobalStore();
// const homeStore = useHomeStore();
// userStore.clearUserData();
userStore.clearUserData();
// globalStore.clearAuthData();
// homeStore.clearHomeData();
......@@ -100,7 +100,7 @@ export default {
// 跳转到首页
uni.reLaunch({
url: '/pages/index/index'
url: '/pages/index/index?pageType=home'
});
} else {
uni.showToast({
......
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