From 5f9cf32984bb26a99e3fe0359e295c7a27cd5069 Mon Sep 17 00:00:00 2001
From: zuoxiao <zuoxiao>
Date: 星期二, 22 四月 2025 14:17:13 +0800
Subject: [PATCH] 重构灌溉组详情页面的请求逻辑，改用请求库简化API调用；更新WXML以优化组名展示样式，提升用户体验。
---
api/config.js | 58 ++++++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 46 insertions(+), 12 deletions(-)
diff --git a/api/config.js b/api/config.js
index e6a3218..cf4a428 100644
--- a/api/config.js
+++ b/api/config.js
@@ -1,17 +1,51 @@
-const { ENV } = require('./env')
+const {
+ ENV
+} = require('./env')
+const { PROJECT_CONFIG } = require('../utils/projectConfig')
let BASEURL
-switch (ENV) {
- case 'production':
- BASEURL = ''
- break
- case 'test':
- BASEURL = 'https://irrigate.dayuyanjiuyuan.top/'
- break
- default:
- BASEURL = ''
- break
+// 灏濊瘯浠庢湰鍦板瓨鍌ㄨ幏鍙栧凡閫夋嫨鐨勯」鐩�
+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);
}
+
+// 鏍规嵁鐜鍜岄」鐩缃瓸ASEURL
+BASEURL = PROJECT_CONFIG[selectedProject]?.serverUrl || PROJECT_CONFIG.JYG.serverUrl;
+
+// 瀵煎嚭鍔ㄦ�佽缃� BASEURL 鐨勫嚱鏁�
+function setBaseUrl(project) {
+ const serverUrl = PROJECT_CONFIG[project]?.serverUrl;
+ if (serverUrl) {
+ BASEURL = serverUrl;
+ console.log('鍔ㄦ�佽缃� BASEURL:', BASEURL);
+ return true;
+ }
+ console.error('椤圭洰閰嶇疆涓嶅瓨鍦ㄦ垨鏈缃湇鍔″櫒鍦板潃:', project);
+ return false;
+}
+
module.exports = {
- BASEURL,// 椤圭洰鎺ュ彛鍦板潃锛屾敮鎸佸鍩熷悕
+ BASEURL, // 椤圭洰鎺ュ彛鍦板潃锛屾敮鎸佸鍩熷悕
+ setBaseUrl
}
\ No newline at end of file
--
Gitblit v1.8.0