From ab8b53407a4d2213b1b3cdaf3cf649ef6c457dae Mon Sep 17 00:00:00 2001
From: zuoxiao <zuoxiao>
Date: 星期一, 28 四月 2025 15:52:19 +0800
Subject: [PATCH] 优化首页项目选择逻辑，添加临时选择变量以支持未确认的项目选择；更新登录页面逻辑，确保从登录页返回时正确刷新数据并处理项目选择确认，提升用户体验。
---
pages/waterIntake/waterIntake.js | 19 ++++---------------
1 files changed, 4 insertions(+), 15 deletions(-)
diff --git a/pages/waterIntake/waterIntake.js b/pages/waterIntake/waterIntake.js
index 9305679..73369f1 100644
--- a/pages/waterIntake/waterIntake.js
+++ b/pages/waterIntake/waterIntake.js
@@ -94,18 +94,11 @@
choseCard(event) {
//鏄剧ず浜屾纭寮圭獥
this.setData({
- // showConfirm: true,
+ showConfirm: true,
choseItem: event.currentTarget.dataset.item,
allWaterPoints: []
-
})
- this.initDialogData();
-
- // console.log(intakeId);
- // wx.navigateTo({
- // url: '/pages/openCard/openCard?intakeId='+intakeId,
- // })
-
+ // 娉ㄦ剰锛歩nitDialogData鐨勮皟鐢ㄧЩ鍒颁簡confirmDialog鏂规硶涓�
},
//寮�娉甸�氫俊
/**
@@ -238,14 +231,14 @@
isRefreshing_all: false
});
if (data.success && data.code === "0001") {
- if (!data.content) {
+ if (!data.content || data.content.itemTotal === 0 || !data.content.obj || data.content.obj.length === 0) {
wx.showToast({
title: '娌℃湁鎼滅储鍒板彇姘村彛',
icon: 'error',
})
} else {
this.setData({
- allWaterPoints: [data.content]
+ allWaterPoints: data.content.obj
});
}
@@ -313,10 +306,6 @@
this.getcommonWaterPoints();
},
confirmDialog() {
- // this.setData({
- // showConfirm: false
- // })
- // this.postOpenValva(this.data.choseItem.intakeId);
this.setData({
showConfirm: false
})
--
Gitblit v1.8.0