|
|
@@ -245,8 +245,6 @@ const HomePage: React.FC = () => {
|
|
|
// 未登录时先静默登录,检查是否是新用户
|
|
|
React.useEffect(() => {
|
|
|
const checkUserAndShowPrivacy = async () => {
|
|
|
- console.log("isLoggedIn:",isLoggedIn);
|
|
|
- console.debug("isLoggedIn:",isLoggedIn);
|
|
|
if (!isLoggedIn) {
|
|
|
try {
|
|
|
// 获取登录code
|
|
|
@@ -266,19 +264,13 @@ const HomePage: React.FC = () => {
|
|
|
}
|
|
|
})
|
|
|
|
|
|
- console.log("checkUserAndShowPrivacyResponse")
|
|
|
- console.log(response)
|
|
|
if (response.status === 200) {
|
|
|
const { token, user, isNewUser } = await response.json()
|
|
|
|
|
|
// 保存token和用户信息
|
|
|
Taro.setStorageSync('userInfo', user)
|
|
|
Taro.setStorageSync('mini_token', token)
|
|
|
- console.log("userInfo")
|
|
|
- console.log(user)
|
|
|
setUser(user as any)
|
|
|
- console.log("isNewUser")
|
|
|
- console.log(isNewUser)
|
|
|
// 如果是新用户,显示隐私弹框
|
|
|
if (isNewUser) {
|
|
|
setShowPrivacyModal(true)
|
|
|
@@ -315,19 +307,12 @@ const HomePage: React.FC = () => {
|
|
|
})
|
|
|
|
|
|
if (response.status === 200) {
|
|
|
- console.debug("response")
|
|
|
- console.debug(response)
|
|
|
const { token, user, isNewUser } = await response.json();
|
|
|
// Taro.setStorageSync('openid', token);
|
|
|
- Taro.setStorageSync('userInfo', JSON.stringify(user))
|
|
|
-
|
|
|
- console.debug("token")
|
|
|
- console.debug(token)
|
|
|
- console.debug("user")
|
|
|
- console.debug(user)
|
|
|
+ Taro.setStorageSync('user', JSON.stringify(user))
|
|
|
+ Taro.setStorageSync('user', JSON.stringify(user))
|
|
|
+ setUser(user as any) // 使用类型断言,mini-login 返回的用户类型与 me API 略有不同
|
|
|
|
|
|
- console.debug("isNewUser")
|
|
|
- console.debug(isNewUser)
|
|
|
if(isNewUser){
|
|
|
|
|
|
}else{
|
|
|
@@ -341,6 +326,8 @@ const HomePage: React.FC = () => {
|
|
|
const userNew = await meResponse.json()
|
|
|
if(userNew ){
|
|
|
Taro.setStorageSync('userInfo', JSON.stringify(userNew))
|
|
|
+ Taro.setStorageSync('user', JSON.stringify(userNew))
|
|
|
+ setUser(userNew as any) // 使用类型断言,mini-login 返回的用户类型与 me API 略有不同
|
|
|
console.debug('静默登录成功,返回新用户信息')
|
|
|
setShowPrivacyModal(false) //隐藏框
|
|
|
//加载广告
|
|
|
@@ -350,10 +337,8 @@ const HomePage: React.FC = () => {
|
|
|
console.debug("静默登录失败")
|
|
|
}
|
|
|
}
|
|
|
-
|
|
|
//加载商品列表啊
|
|
|
|
|
|
-
|
|
|
}
|
|
|
// const { token: newToken } = await response.json()
|
|
|
// Taro.setStorageSync('mini_token', newToken)
|