From 5db0b5a4ae6124624d197bcebff28b3a9ed46400 Mon Sep 17 00:00:00 2001
From: zuoxiao <zuoxiao>
Date: 星期一, 12 五月 2025 16:48:53 +0800
Subject: [PATCH] 添加账号密码登录页面的跳转逻辑，优化登录方式选择；更新项目配置以支持不同登录方式，提升用户体验。

---
 pages/login/login.js |   42 ++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 40 insertions(+), 2 deletions(-)

diff --git a/pages/login/login.js b/pages/login/login.js
index f5c4db2..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,12 +226,35 @@
         
         // 鏇存柊 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鑾峰彇鍒伴」鐩俊鎭紝浣跨敤榛樿鍊�');
     }

--
Gitblit v1.8.0