From 59a29506851e9184a4275d5ab9bbca843918b49e Mon Sep 17 00:00:00 2001
From: zuoxiao <zuoxiao>
Date: 星期二, 13 五月 2025 17:26:16 +0800
Subject: [PATCH] 更新项目配置，添加梅江项目的相关信息，调整URL格式以提升代码一致性和可读性。
---
pages/login/login.js | 114 ++++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 100 insertions(+), 14 deletions(-)
diff --git a/pages/login/login.js b/pages/login/login.js
index 090adb9..5100e0d 100644
--- a/pages/login/login.js
+++ b/pages/login/login.js
@@ -3,6 +3,8 @@
const {
post
} = require('../../api/request.js');
+const { PROJECT_CONFIG } = require('../../utils/projectConfig.js');
+const { setBaseUrl } = require('../../api/config.js');
Page({
@@ -174,6 +176,19 @@
},
/**
+ * 璺宠浆鍒拌处鍙峰瘑鐮佺櫥褰曢〉闈�
+ */
+ goToAccountLogin: function() {
+ // 鑾峰彇褰撳墠椤圭洰淇℃伅锛屼紶閫掔粰accountLogin椤甸潰
+ const { selectedProject, projectName } = this.data;
+
+ // 璺宠浆鍒拌处鍙峰瘑鐮佺櫥褰曢〉闈�
+ wx.navigateTo({
+ url: `/pages/accountLogin/accountLogin?project=${selectedProject}&projectName=${projectName}`
+ });
+ },
+
+ /**
* 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍔犺浇
*/
onLoad: function (options) {
@@ -211,11 +226,34 @@
// 鏇存柊 BASEURL
try {
- const { PROJECT_URLS } = require('../../api/config.js');
- getApp().globalData.baseUrl = PROJECT_URLS[project];
+ // 浣跨敤瀵煎叆鐨剆etBaseUrl鍑芥暟璁剧疆baseUrl
+ setBaseUrl(project);
+
+ // 浠嶱ROJECT_CONFIG涓幏鍙杝erverUrl
+ const serverUrl = PROJECT_CONFIG[project]?.serverUrl;
+ if (serverUrl) {
+ getApp().globalData.baseUrl = serverUrl;
+ console.log('璁剧疆baseUrl鎴愬姛:', serverUrl);
+ }
} catch (e) {
console.error('璁剧疆baseUrl澶辫触:', e);
}
+ }
+
+ // 妫�鏌ラ」鐩厤缃殑鐧诲綍鏂瑰紡鏄惁涓庡綋鍓嶉〉闈㈠尮閰�
+ const projectConfig = PROJECT_CONFIG[project];
+ if (projectConfig && projectConfig.loginType === 'account') {
+ console.log(`褰撳墠椤圭洰閰嶇疆鐨勭櫥褰曟柟寮忎负account锛岃嚜鍔ㄨ烦杞埌璐﹀彿瀵嗙爜鐧诲綍椤甸潰`);
+
+ // 璁剧疆鎵嬪姩瀵艰埅鏍囪锛岄伩鍏嶈Е鍙戣繑鍥為�昏緫
+ this.setData({ manualNavigate: true });
+
+ // 寤惰繜鎵ц璺宠浆锛岀‘淇濋〉闈㈠畬鍏ㄥ姞杞�
+ setTimeout(() => {
+ wx.redirectTo({
+ url: `/pages/accountLogin/accountLogin?project=${project}&projectName=${projectName}`
+ });
+ }, 100);
}
} else {
console.log('鏈粠URL鑾峰彇鍒伴」鐩俊鎭紝浣跨敤榛樿鍊�');
@@ -287,11 +325,13 @@
console.log('妫�娴嬪埌鏈変笂涓�椤碉紝浣跨敤navigateBack杩斿洖');
wx.navigateBack({
delta: 1,
- success: () => console.log('navigateBack鎴愬姛'),
- fail: (err) => {
- console.error('navigateBack澶辫触:', err);
- // 濡傛灉navigateBack澶辫触锛屽皾璇時eLaunch
- this.backupReturnToHome();
+ success: () => {
+ // 閫氳繃eventChannel鍚戜笂涓�涓〉闈紶閫掓暟鎹�
+ const eventChannel = pages[pages.length - 2].getOpenerEventChannel();
+ if (eventChannel && eventChannel.emit) {
+ eventChannel.emit('fromLogin', { fromLogin: true });
+ }
+ console.log('宸叉垚鍔熻繑鍥炲埌涓婁竴椤甸潰');
}
});
} else {
@@ -438,7 +478,11 @@
// 淇濆瓨userData淇℃伅锛屽寘鍚玸essionId鍜宼ag
const userData = JSON.stringify({
sessionId: String(data.content.sessionId),
- tag: tag
+ tag: this.data.selectedProject === 'JYG' ? 'ym' : (this.data.selectedProject === 'MQ' ? 'mq' : 'ym'),
+ project: this.data.selectedProject,
+ phone: this.data.phone,
+ clientName: data.content.clientName || '',
+ clientId: String(data.content.clientId)
});
return storage.setItem("userData", userData);
})
@@ -488,12 +532,54 @@
success: () => {
// 寤惰繜璺宠浆锛岀‘淇漈oast鏄剧ず瀹屾垚
setTimeout(() => {
- console.log('鐧诲綍鎴愬姛锛屽噯澶囪烦杞埌棣栭〉');
- // 璺宠浆鍒伴椤碉紝浣跨敤reLaunch鑰屼笉鏄痳edirectTo
- wx.redirectTo({
- url: '/pages/home/home'
- });
- });
+ console.log('鐧诲綍鎴愬姛锛屽噯澶囪繑鍥炲埌棣栭〉');
+
+ // 鑾峰彇褰撳墠椤甸潰鏍�
+ const pages = getCurrentPages();
+
+ // 妫�鏌ユ槸鍚︽湁涓婁竴涓〉闈㈠彲杩斿洖
+ if (pages.length > 1) {
+ // 搴旂敤涓�涓妧宸э紝鍏堣缃墠涓�涓〉闈㈢殑鍙傛暟
+ try {
+ if (pages.length > 1) {
+ const prevPage = pages[pages.length - 2];
+ if (prevPage && prevPage.options) {
+ // 璁剧疆 fromLogin 鍙傛暟
+ prevPage.options.fromLogin = 'true';
+
+ // 濡傛灉椤甸潰鏈塷nLoad鏂规硶锛屽垯鍙兘闇�瑕佷紶閫掑弬鏁�
+ if (typeof prevPage.onLoad === 'function') {
+ let newOptions = {...prevPage.options};
+ newOptions.fromLogin = 'true';
+ prevPage.onLoad(newOptions);
+ }
+ }
+ }
+ } catch (e) {
+ console.error('璁剧疆鍓嶄竴椤靛弬鏁板け璐�:', e);
+ }
+
+ // 杩斿洖鍒颁笂涓�涓〉闈�
+ wx.navigateBack({
+ delta: 1,
+ success: () => {
+ console.log('宸叉垚鍔熻繑鍥炲埌涓婁竴椤甸潰');
+ },
+ fail: (err) => {
+ console.error('navigateBack澶辫触:', err);
+ // 濡傛灉杩斿洖澶辫触锛屼娇鐢ㄩ噸瀹氬悜
+ wx.redirectTo({
+ url: '/pages/home/home?fromLogin=true'
+ });
+ }
+ });
+ } else {
+ // 濡傛灉娌℃湁涓婁竴涓〉闈紝鍒欓噸鏂版墦寮�home椤甸潰
+ wx.redirectTo({
+ url: '/pages/home/home?fromLogin=true'
+ });
+ }
+ }, 1500);
}
});
},
--
Gitblit v1.8.0