From 90612989855f6849fd94b0665168c3bb7619ff32 Mon Sep 17 00:00:00 2001
From: zuoxiao <zuoxiao>
Date: 星期一, 07 四月 2025 18:08:01 +0800
Subject: [PATCH] 更新项目配置，添加多个项目的专有设置，包括登录需求和统一ID；优化用户数据获取逻辑，确保根据项目需求进行登录状态检查；调整界面显示项目名称和提示信息，增强用户体验。
---
pages/groupDetail/groupDetail.js | 168 ++++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 134 insertions(+), 34 deletions(-)
diff --git a/pages/groupDetail/groupDetail.js b/pages/groupDetail/groupDetail.js
index ad8fb75..f663689 100644
--- a/pages/groupDetail/groupDetail.js
+++ b/pages/groupDetail/groupDetail.js
@@ -5,79 +5,179 @@
* 椤甸潰鐨勫垵濮嬫暟鎹�
*/
data: {
- projectId: '',
projectName: '',
- groupId: '',
groupName: '',
- valveList: [
- // 妯℃嫙鏁版嵁锛屽疄闄呭簲浠嶢PI鑾峰彇
- { id: '1', name: '闃�鎺у櫒1', status: 'online', location: '浣嶇疆A' },
- { id: '2', name: '闃�鎺у櫒2', status: 'offline', location: '浣嶇疆B' },
- { id: '3', name: '闃�鎺у櫒3', status: 'online', location: '浣嶇疆C' },
- { id: '4', name: '闃�鎺у櫒4', status: 'online', location: '浣嶇疆D' },
- { id: '5', name: '闃�鎺у櫒5', status: 'offline', location: '浣嶇疆E' }
- ],
- loading: false
+ groupId: '',
+ waterOutletList: [],
+ refreshing: false,
+ isIrrigating: false // 鏄惁姝ｅ湪鐏屾簤涓�
},
/**
* 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍔犺浇
*/
onLoad: function (options) {
+ console.log('鎺ユ敹鍒扮殑鍙傛暟:', options);
+
if (options) {
+ // 鐩存帴浣跨敤浼犻�掔殑isIrrigating鍙傛暟锛岃�屼笉鏄牴鎹畇tatus鍒ゆ柇
+ const isIrrigating = options.isIrrigating === 'true';
+ console.log('鐏屾簤鐘舵�佸垽鏂�:', options.status, '鏄惁姝ｅ湪鐏屾簤:', isIrrigating);
+
+ // 澶勭悊鎺ユ敹鍒扮殑鍙傛暟
this.setData({
- projectId: options.projectId || '',
projectName: options.projectName || '',
+ groupName: options.groupName || '',
groupId: options.groupId || '',
- groupName: options.groupName || ''
+ isIrrigating: isIrrigating
});
+ console.log('璁剧疆鍚庣殑鏁版嵁:', this.data);
+
+ // 璁剧疆瀵艰埅鏍忔爣棰�
wx.setNavigationBarTitle({
title: this.data.groupName || '杞亴缁勮鎯�'
});
- // 鑾峰彇闃�鎺у櫒鍒楄〃
- this.fetchValveList();
+ this.loadWaterOutletData();
}
},
/**
- * 鑾峰彇闃�鎺у櫒鍒楄〃
+ * 鍔犺浇鍙栨按鍙ｆ暟鎹�
*/
- fetchValveList: function () {
- this.setData({ loading: true });
+ loadWaterOutletData: function() {
+ this.setData({
+ refreshing: true
+ });
- // 杩欓噷搴旇鏄疄闄呯殑API璇锋眰
- // 妯℃嫙API璇锋眰寤惰繜
+ console.log('鍔犺浇鍙栨按鍙ｆ暟鎹紝鐏屾簤鐘舵��:', this.data.isIrrigating);
+
+ // 妯℃嫙鏁版嵁
+ let mockData = {
+ waterOutlets: []
+ };
+
+ // 鐢熸垚鍙栨按鍙ｆ暟鎹紝鎵�鏈夊彇姘村彛閮芥湁鍛戒护鐘舵��
+ mockData.waterOutlets = [
+ {
+ id: 1,
+ name: '鍙栨按鍙� A-1',
+ status: 'online',
+ commandStatus: 'sent' // 鍛戒护宸蹭笅鍙�
+ },
+ {
+ id: 2,
+ name: '鍙栨按鍙� A-2',
+ status: 'online',
+ commandStatus: 'unsent' // 鍛戒护鏈笅鍙�
+ },
+ {
+ id: 3,
+ name: '鍙栨按鍙� A-3',
+ status: 'offline',
+ commandStatus: 'unsent' // 鍛戒护鏈笅鍙�
+ }
+ ];
+
+ // 妯℃嫙缃戠粶璇锋眰寤惰繜
setTimeout(() => {
- this.setData({ loading: false });
- // 瀹為檯鏁版嵁宸插湪data涓垵濮嬪寲锛岃繖閲屽彧鏄ā鎷熻姹傚畬鎴�
+ this.setData({
+ waterOutletList: mockData.waterOutlets,
+ refreshing: false
+ });
+ console.log('璁剧疆鍙栨按鍙ｆ暟鎹畬鎴�:', this.data.waterOutletList);
}, 1000);
- // 瀹為檯API璇锋眰绀轰緥
+ // 瀹為檯椤圭洰涓簲璇ヤ娇鐢╳x.request鑾峰彇鏁版嵁
// wx.request({
- // url: 'your-api-url',
- // data: {
- // projectId: this.data.projectId,
- // groupId: this.data.groupId
- // },
+ // url: `https://your-api-url/groups/${this.data.groupId}/waterOutlets`,
+ // method: 'GET',
// success: (res) => {
- // this.setData({
- // valveList: res.data,
- // loading: false
- // });
+ // if (res.data && res.data.code === 0) {
+ // this.setData({
+ // waterOutletList: res.data.data.waterOutlets,
+ // refreshing: false
+ // });
+ // } else {
+ // wx.showToast({
+ // title: '鑾峰彇鏁版嵁澶辫触',
+ // icon: 'none'
+ // });
+ // this.setData({
+ // refreshing: false
+ // });
+ // }
// },
// fail: () => {
- // this.setData({ loading: false });
// wx.showToast({
- // title: '鑾峰彇鏁版嵁澶辫触',
+ // title: '缃戠粶閿欒',
// icon: 'none'
+ // });
+ // this.setData({
+ // refreshing: false
// });
// }
// });
},
/**
+ * 涓嬫媺鍒锋柊澶勭悊鍑芥暟
+ */
+ onRefresh: function() {
+ this.loadWaterOutletData();
+ },
+
+ /**
+ * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍒濇娓叉煋瀹屾垚
+ */
+ onReady: function () {
+
+ },
+
+ /**
+ * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鏄剧ず
+ */
+ onShow: function () {
+
+ },
+
+ /**
+ * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰闅愯棌
+ */
+ onHide: function () {
+
+ },
+
+ /**
+ * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍗歌浇
+ */
+ onUnload: function () {
+
+ },
+
+ /**
+ * 椤甸潰鐩稿叧浜嬩欢澶勭悊鍑芥暟--鐩戝惉鐢ㄦ埛涓嬫媺鍔ㄤ綔
+ */
+ onPullDownRefresh: function () {
+
+ },
+
+ /**
+ * 椤甸潰涓婃媺瑙﹀簳浜嬩欢鐨勫鐞嗗嚱鏁�
+ */
+ onReachBottom: function () {
+
+ },
+
+ /**
+ * 鐢ㄦ埛鐐瑰嚮鍙充笂瑙掑垎浜�
+ */
+ onShareAppMessage: function () {
+
+ },
+
+ /**
* 杩斿洖涓婁竴椤�
*/
goBack: function () {
--
Gitblit v1.8.0