From 068be2757aa2d51e3f6604dae54287683160ad0e Mon Sep 17 00:00:00 2001
From: riku <risaku@163.com>
Date: 星期一, 19 一月 2026 17:29:48 +0800
Subject: [PATCH] 2026.1.19
---
pages/mUser/behaviors/bLogin.js | 36 ++++++++++++++++++++++++++----------
1 files changed, 26 insertions(+), 10 deletions(-)
diff --git a/pages/mUser/behaviors/bLogin.js b/pages/mUser/behaviors/bLogin.js
index 0ceb3dc..b048e37 100644
--- a/pages/mUser/behaviors/bLogin.js
+++ b/pages/mUser/behaviors/bLogin.js
@@ -1,5 +1,8 @@
import userservice from '../../../service/userservice'
import moment from '../../../utils/moment.min'
+import {
+ loadConfig
+} from "../../../config/loadConfig";
const app = getApp()
@@ -74,9 +77,10 @@
},
complete() {
// wx.hideLoading()
- that.setData({
- loading: false
- })
+ // 2026.1.19 鍔犺浇鐘舵�佺敱涓嬮潰閰嶇疆鑾峰彇鎺ュ彛 缁撴潫
+ // that.setData({
+ // loading: false
+ // })
}
})
},
@@ -84,6 +88,7 @@
},
gotoHomePage() {
+ var that = this
if (app.globalData.accessToken.userName == 'pcheck') {
wx.navigateTo({
url: '/pages/mExtra/pSupervisiontask/pSupervisiontask',
@@ -96,23 +101,34 @@
const now = moment()
app.globalData.newUser = now.diff(registerTime, 'months') <= 1
}
- console.log(app.globalData.newUser);
-
+ console.log('app.globalData.newUser', app.globalData.newUser);
app.globalData.userInfo = data
app.globalData.isLogin = true
wx.setStorage({
key: 'userInfo',
data: data,
success: (result) => {
- wx.switchTab({
- url: '/pages/home/home',
- })
- }
+ loadConfig().then(() => {
+ wx.switchTab({
+ url: '/pages/home/home',
+ })
+ })
+ .finally(() => {
+ that.setData({
+ loading: false,
+ });
+ });
+ },
+ fail: err => {
+ that.setData({
+ loading: false,
+ });
+ },
})
}
})
}
-
+
},
}
})
\ No newline at end of file
--
Gitblit v1.9.3