From d18a0c9fe708dcf58253b54ef2938b5e864b24df Mon Sep 17 00:00:00 2001
From: zuoxiao <zuoxiao>
Date: 星期一, 28 四月 2025 14:39:30 +0800
Subject: [PATCH] 优化水摄入页面的确认弹窗逻辑，调整showConfirm状态的设置位置，并移除不必要的代码注释，提升代码可读性和维护性。
---
api/config.js | 83 +++++++++++++++++------------------------
1 files changed, 34 insertions(+), 49 deletions(-)
diff --git a/api/config.js b/api/config.js
index 9cffc53..cf4a428 100644
--- a/api/config.js
+++ b/api/config.js
@@ -1,66 +1,51 @@
-const { ENV } = require('./env')
+const {
+ ENV
+} = require('./env')
+const { PROJECT_CONFIG } = require('../utils/projectConfig')
let BASEURL
-
-const PROJECT_URLS = {
- JYG: 'https://irrigate.dayuyanjiuyuan.top/', // 鍢夊唱鍏抽」鐩�
- MQ: 'https://shifanqu1.dayuyanjiuyuan.top/', // 姘戝嫟椤圭洰
- TEST:'https://no253541tf71.vicp.fun/'// test椤圭洰
- // TEST:'http://192.168.40.182:8087/'// test椤圭洰
- // MQ: 'https://no253541tf71.vicp.fun/' // 姘戝嫟椤圭洰
- // TEST: 'http://192.168.40.166:54321/'
-}
// 灏濊瘯浠庢湰鍦板瓨鍌ㄨ幏鍙栧凡閫夋嫨鐨勯」鐩�
let selectedProject = 'JYG'; // 榛樿涓哄槈宄叧椤圭洰
try {
- // 灏濊瘯浠庢湰鍦板瓨鍌ㄨ幏鍙栧凡閫夋嫨鐨勯」鐩�
- if (typeof wx !== 'undefined') {
- try {
- const selectedProjectFromStorage = wx.getStorageSync('selectedProject');
- if (selectedProjectFromStorage) {
- selectedProject = selectedProjectFromStorage;
- console.log('浠庢湰鍦板瓨鍌ㄥ姞杞介」鐩缃�:', selectedProject);
- }
- } catch (e) {
- console.error('浠庢湰鍦板瓨鍌ㄨ幏鍙栭」鐩け璐�:', e);
- }
+ // 灏濊瘯浠庢湰鍦板瓨鍌ㄨ幏鍙栧凡閫夋嫨鐨勯」鐩�
+ if (typeof wx !== 'undefined') {
+ try {
+ const selectedProjectFromStorage = wx.getStorageSync('selectedProject');
+ if (selectedProjectFromStorage) {
+ selectedProject = selectedProjectFromStorage;
+ console.log('浠庢湰鍦板瓨鍌ㄥ姞杞介」鐩缃�:', selectedProject);
+ }
+ } catch (e) {
+ console.error('浠庢湰鍦板瓨鍌ㄨ幏鍙栭」鐩け璐�:', e);
}
+ }
- // 濡傛灉鍏ㄥ眬搴旂敤宸插垵濮嬪寲锛屼篃灏濊瘯浠庡叏灞�鍙橀噺鑾峰彇
- const app = getApp();
- if (app && app.globalData && app.globalData.selectedProject) {
- selectedProject = app.globalData.selectedProject;
- console.log('浠庡叏灞�鍙橀噺鍔犺浇椤圭洰璁剧疆:', selectedProject);
- }
+ // 濡傛灉鍏ㄥ眬搴旂敤宸插垵濮嬪寲锛屼篃灏濊瘯浠庡叏灞�鍙橀噺鑾峰彇
+ const app = getApp();
+ if (app && app.globalData && app.globalData.selectedProject) {
+ selectedProject = app.globalData.selectedProject;
+ console.log('浠庡叏灞�鍙橀噺鍔犺浇椤圭洰璁剧疆:', selectedProject);
+ }
} catch (e) {
- console.error('鑾峰彇宸查�夋嫨椤圭洰澶辫触:', e);
+ console.error('鑾峰彇宸查�夋嫨椤圭洰澶辫触:', e);
}
-switch (ENV) {
- case 'production':
- BASEURL = PROJECT_URLS[selectedProject] || PROJECT_URLS.JYG;
- break;
- case 'test':
- // BASEURL 灏嗘牴鎹敤鎴烽�夋嫨鐨勯」鐩姩鎬佽缃�
- BASEURL = PROJECT_URLS[selectedProject] || PROJECT_URLS.JYG;
- break;
- default:
- BASEURL = PROJECT_URLS[selectedProject] || PROJECT_URLS.JYG;
- break;
-}
+// 鏍规嵁鐜鍜岄」鐩缃瓸ASEURL
+BASEURL = PROJECT_CONFIG[selectedProject]?.serverUrl || PROJECT_CONFIG.JYG.serverUrl;
// 瀵煎嚭鍔ㄦ�佽缃� BASEURL 鐨勫嚱鏁�
function setBaseUrl(project) {
- if (PROJECT_URLS[project]) {
- BASEURL = PROJECT_URLS[project];
- console.log('鍔ㄦ�佽缃� BASEURL:', BASEURL);
- return true;
- }
- return false;
+ const serverUrl = PROJECT_CONFIG[project]?.serverUrl;
+ if (serverUrl) {
+ BASEURL = serverUrl;
+ console.log('鍔ㄦ�佽缃� BASEURL:', BASEURL);
+ return true;
+ }
+ console.error('椤圭洰閰嶇疆涓嶅瓨鍦ㄦ垨鏈缃湇鍔″櫒鍦板潃:', project);
+ return false;
}
module.exports = {
- BASEURL,// 椤圭洰鎺ュ彛鍦板潃锛屾敮鎸佸鍩熷悕
- PROJECT_URLS,
- setBaseUrl
+ BASEURL, // 椤圭洰鎺ュ彛鍦板潃锛屾敮鎸佸鍩熷悕
+ setBaseUrl
}
\ No newline at end of file
--
Gitblit v1.8.0