From 00a96d6881dd10ae7d3c4f5437bfceaabe677723 Mon Sep 17 00:00:00 2001
From: riku <risaku@163.com>
Date: 星期四, 14 十一月 2024 10:55:29 +0800
Subject: [PATCH] bug修复
---
behaviors/login.js | 36 ++++++++++++++++++++++++------------
1 files changed, 24 insertions(+), 12 deletions(-)
diff --git a/behaviors/login.js b/behaviors/login.js
index 3b094f7..6677a4b 100644
--- a/behaviors/login.js
+++ b/behaviors/login.js
@@ -1,8 +1,4 @@
-import {
- fetchLoginPW,
- fetchUserInfo,
- fetchUserBaseInfo,
-} from '../services/usercenter/fetchUser';
+import { fetchLoginPW, fetchUserInfo, fetchUserBaseInfo } from '../services/usercenter/fetchUser';
import { loadConfig } from '../behaviors/loadConfig';
import dayjs from 'dayjs';
@@ -33,12 +29,10 @@
app.globalData.accessToken.suserId = data.suserId;
app.globalData.accessToken.openId = data.openId;
if (accessTokenPW.userName) {
- app.globalData.accessToken.userName =
- accessTokenPW.userName;
+ app.globalData.accessToken.userName = accessTokenPW.userName;
}
if (accessTokenPW.password) {
- app.globalData.accessToken.password =
- accessTokenPW.password;
+ app.globalData.accessToken.password = accessTokenPW.password;
}
wx.setStorage({
key: 'accessToken',
@@ -99,10 +93,28 @@
key: 'userInfo',
data: data,
success: result => {
- loadConfig().then(res => {
- wx.switchTab({
- url: '/pages/home/index',
+ loadConfig()
+ .then(res => {
+ // 鍒ゆ柇鐢ㄦ埛鏄惁杩涘叆绠�鍖栦富椤�
+ if (app.globalData.userConfig && app.globalData.userConfig.ucExtension1 == 'simple') {
+ wx.redirectTo({
+ url: '/pages/simple-home/index',
+ });
+ } else {
+ wx.switchTab({
+ url: '/pages/home/index',
+ });
+ }
+ })
+ .finally(() => {
+ this.setData({
+ loading: false,
+ });
});
+ },
+ fail: err => {
+ this.setData({
+ loading: false,
});
},
});
--
Gitblit v1.9.3