|
|
|
@ -48,6 +48,7 @@ function processGoodsMedia(goods) { |
|
|
|
|
|
|
|
Page({ |
|
|
|
data: { |
|
|
|
isLoggedIn: false, |
|
|
|
currentUserType: null, |
|
|
|
showUserInfoForm: false, |
|
|
|
avatarUrl: 'https://mmbiz.qpic.cn/mmbiz/icTdbqWNOwNRna42FI242Lcia07jQodd2FJGIYQfG0LAJGFxM4FbnQP6yfMxBgJ0F3YRqJCJ1aPAK2dQagdusBZg/0', |
|
|
|
@ -2049,6 +2050,11 @@ Page({ |
|
|
|
duration: 2000 |
|
|
|
}) |
|
|
|
|
|
|
|
// 更新登录状态
|
|
|
|
this.setData({ |
|
|
|
isLoggedIn: true |
|
|
|
}) |
|
|
|
|
|
|
|
// 测试登录成功,但已移除类型选择和跳转功能
|
|
|
|
} catch (error) { |
|
|
|
wx.hideLoading() |
|
|
|
@ -2204,6 +2210,11 @@ Page({ |
|
|
|
console.log('手机号验证通过:', userInfo.phoneNumber) |
|
|
|
} |
|
|
|
|
|
|
|
// 更新登录状态
|
|
|
|
this.setData({ |
|
|
|
isLoggedIn: true |
|
|
|
}) |
|
|
|
|
|
|
|
return true |
|
|
|
} else { |
|
|
|
console.warn('服务器验证失败,可能是新用户或登录状态无效') |
|
|
|
@ -2413,13 +2424,15 @@ Page({ |
|
|
|
if (app.globalData.userInfo) { |
|
|
|
this.setData({ |
|
|
|
userInfo: app.globalData.userInfo, |
|
|
|
needPhoneAuth: !app.globalData.userInfo.phoneNumber |
|
|
|
needPhoneAuth: !app.globalData.userInfo.phoneNumber, |
|
|
|
isLoggedIn: !!(userId && openid) |
|
|
|
}) |
|
|
|
} else { |
|
|
|
app.globalData.userInfo = localUserInfo |
|
|
|
this.setData({ |
|
|
|
userInfo: localUserInfo, |
|
|
|
needPhoneAuth: !localUserInfo.phoneNumber |
|
|
|
needPhoneAuth: !localUserInfo.phoneNumber, |
|
|
|
isLoggedIn: !!(userId && openid) |
|
|
|
}) |
|
|
|
} |
|
|
|
|
|
|
|
@ -2768,7 +2781,8 @@ Page({ |
|
|
|
this.setData({ |
|
|
|
needPhoneAuth: false, |
|
|
|
userInfo: userInfo, |
|
|
|
showOneKeyLoginModal: false |
|
|
|
showOneKeyLoginModal: false, |
|
|
|
isLoggedIn: true |
|
|
|
}) |
|
|
|
|
|
|
|
wx.hideLoading() |
|
|
|
|