From dcfe83a022f2c4aa2a707baa6d5e98a67753bf76 Mon Sep 17 00:00:00 2001
From: zuoxiao <zuoxiao>
Date: 星期二, 18 三月 2025 16:11:12 +0800
Subject: [PATCH] 添加clientId字段到全局状态，优化请求参数处理，更新页面路由，调整取水口和灌溉相关界面，增强用户体验。
---
api/config.js | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 52 insertions(+), 6 deletions(-)
diff --git a/api/config.js b/api/config.js
index 2b8d316..07885fe 100644
--- a/api/config.js
+++ b/api/config.js
@@ -1,17 +1,63 @@
const { ENV } = require('./env')
let BASEURL
+const PROJECT_URLS = {
+ JYG: 'https://irrigate.dayuyanjiuyuan.top/', // 鍢夊唱鍏抽」鐩�
+ // MQ: 'https://shifanqu1.dayuyanjiuyuan.top/' // 姘戝嫟椤圭洰
+ MQ: 'https://no253541tf71.vicp.fun/' // 姘戝嫟椤圭洰
+}
+
+// 灏濊瘯浠庢湰鍦板瓨鍌ㄨ幏鍙栧凡閫夋嫨鐨勯」鐩�
+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);
+ }
+ }
+
+ // 濡傛灉鍏ㄥ眬搴旂敤宸插垵濮嬪寲锛屼篃灏濊瘯浠庡叏灞�鍙橀噺鑾峰彇
+ const app = getApp();
+ if (app && app.globalData && app.globalData.selectedProject) {
+ selectedProject = app.globalData.selectedProject;
+ console.log('浠庡叏灞�鍙橀噺鍔犺浇椤圭洰璁剧疆:', selectedProject);
+ }
+} catch (e) {
+ console.error('鑾峰彇宸查�夋嫨椤圭洰澶辫触:', e);
+}
+
switch (ENV) {
case 'production':
- BASEURL = ''
- break
+ BASEURL = PROJECT_URLS[selectedProject] || PROJECT_URLS.JYG;
+ break;
case 'test':
- BASEURL = ''
- break
+ // BASEURL 灏嗘牴鎹敤鎴烽�夋嫨鐨勯」鐩姩鎬佽缃�
+ BASEURL = PROJECT_URLS[selectedProject] || PROJECT_URLS.JYG;
+ break;
default:
- BASEURL = ''
- break
+ BASEURL = PROJECT_URLS[selectedProject] || PROJECT_URLS.JYG;
+ break;
}
+
+// 瀵煎嚭鍔ㄦ�佽缃� BASEURL 鐨勫嚱鏁�
+function setBaseUrl(project) {
+ if (PROJECT_URLS[project]) {
+ BASEURL = PROJECT_URLS[project];
+ console.log('鍔ㄦ�佽缃� BASEURL:', BASEURL);
+ return true;
+ }
+ return false;
+}
+
module.exports = {
BASEURL,// 椤圭洰鎺ュ彛鍦板潃锛屾敮鎸佸鍩熷悕
+ PROJECT_URLS,
+ setBaseUrl
}
\ No newline at end of file
--
Gitblit v1.8.0