From ab8b53407a4d2213b1b3cdaf3cf649ef6c457dae Mon Sep 17 00:00:00 2001
From: zuoxiao <zuoxiao>
Date: 星期一, 28 四月 2025 15:52:19 +0800
Subject: [PATCH] 优化首页项目选择逻辑，添加临时选择变量以支持未确认的项目选择；更新登录页面逻辑，确保从登录页返回时正确刷新数据并处理项目选择确认，提升用户体验。
---
pages/groupDetail/groupDetail.js | 118 +++++++++++++++++++++++++---------------------------------
1 files changed, 51 insertions(+), 67 deletions(-)
diff --git a/pages/groupDetail/groupDetail.js b/pages/groupDetail/groupDetail.js
index f663689..edec131 100644
--- a/pages/groupDetail/groupDetail.js
+++ b/pages/groupDetail/groupDetail.js
@@ -1,4 +1,5 @@
const app = getApp();
+const { get } = require('../../api/request');
Page({
/**
@@ -34,11 +35,6 @@
console.log('璁剧疆鍚庣殑鏁版嵁:', this.data);
- // 璁剧疆瀵艰埅鏍忔爣棰�
- wx.setNavigationBarTitle({
- title: this.data.groupName || '杞亴缁勮鎯�'
- });
-
this.loadWaterOutletData();
}
},
@@ -51,74 +47,62 @@
refreshing: true
});
- console.log('鍔犺浇鍙栨按鍙ｆ暟鎹紝鐏屾簤鐘舵��:', this.data.isIrrigating);
-
- // 妯℃嫙鏁版嵁
- let mockData = {
- waterOutlets: []
- };
-
- // 鐢熸垚鍙栨按鍙ｆ暟鎹紝鎵�鏈夊彇姘村彛閮芥湁鍛戒护鐘舵��
- mockData.waterOutlets = [
- {
- id: 1,
- name: '鍙栨按鍙� A-1',
- status: 'online',
- commandStatus: 'sent' // 鍛戒护宸蹭笅鍙�
+ get({
+ url: '/wx/irrigation/getGroupDetails',
+ data: {
+ groupId: this.data.groupId
},
- {
- id: 2,
- name: '鍙栨按鍙� A-2',
- status: 'online',
- commandStatus: 'unsent' // 鍛戒护鏈笅鍙�
- },
- {
- id: 3,
- name: '鍙栨按鍙� A-3',
- status: 'offline',
- commandStatus: 'unsent' // 鍛戒护鏈笅鍙�
+ isShowLoding: true
+ }).then(res => {
+ console.log('杞亴缁勮鎯呮帴鍙ｈ繑鍥�:', res);
+
+ if (res.success) {
+ this.handleGroupDetailsResponse(res);
+ } else {
+ wx.showToast({
+ title: res.msg || '鑾峰彇鏁版嵁澶辫触',
+ icon: 'none'
+ });
+ this.setData({
+ refreshing: false
+ });
}
- ];
-
- // 妯℃嫙缃戠粶璇锋眰寤惰繜
- setTimeout(() => {
+ }).catch(err => {
+ console.error('璇锋眰澶辫触:', err);
+ wx.showToast({
+ title: '缃戠粶閿欒',
+ icon: 'none'
+ });
this.setData({
- waterOutletList: mockData.waterOutlets,
refreshing: false
});
- console.log('璁剧疆鍙栨按鍙ｆ暟鎹畬鎴�:', this.data.waterOutletList);
- }, 1000);
+ });
+ },
+
+ /**
+ * 澶勭悊杞亴缁勮鎯呭搷搴旀暟鎹�
+ */
+ handleGroupDetailsResponse: function(response) {
+ const data = response.content;
- // 瀹為檯椤圭洰涓簲璇ヤ娇鐢╳x.request鑾峰彇鏁版嵁
- // wx.request({
- // url: `https://your-api-url/groups/${this.data.groupId}/waterOutlets`,
- // method: 'GET',
- // success: (res) => {
- // 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: () => {
- // wx.showToast({
- // title: '缃戠粶閿欒',
- // icon: 'none'
- // });
- // this.setData({
- // refreshing: false
- // });
- // }
- // });
+ // 澶勭悊鍙栨按鍙ｆ暟鎹�
+ const waterOutletList = data.intakes.map(item => {
+ return {
+ id: item.rtuAddr, // 浣跨敤rtuAddr浣滀负ID
+ name: item.intakeName,
+ rtuAddr: item.rtuAddr,
+ status: item.isOnLine ? 'online' : 'offline'
+ };
+ });
+
+ this.setData({
+ projectName: data.projectName || this.data.projectName,
+ groupName: data.groupName || this.data.groupName,
+ waterOutletList: waterOutletList,
+ refreshing: false
+ });
+
+ console.log('璁剧疆鍙栨按鍙ｆ暟鎹畬鎴�:', this.data.waterOutletList);
},
/**
--
Gitblit v1.8.0