From d18a0c9fe708dcf58253b54ef2938b5e864b24df Mon Sep 17 00:00:00 2001
From: zuoxiao <zuoxiao>
Date: 星期一, 28 四月 2025 14:39:30 +0800
Subject: [PATCH] 优化水摄入页面的确认弹窗逻辑，调整showConfirm状态的设置位置，并移除不必要的代码注释，提升代码可读性和维护性。
---
pages/waterIntake/waterIntake.js | 207 +++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 175 insertions(+), 32 deletions(-)
diff --git a/pages/waterIntake/waterIntake.js b/pages/waterIntake/waterIntake.js
index a1e0926..73369f1 100644
--- a/pages/waterIntake/waterIntake.js
+++ b/pages/waterIntake/waterIntake.js
@@ -47,8 +47,6 @@
openTime: "", //璁″垝寮�娉电殑寮�濮嬫椂闂�
openTimeText: "",
isShowOpenTime: "false",
- isOpenTiming: false, //鏄惁鏄鍒掑紑闃�鏃堕棿鏍峰紡鐨勫紑闃�
- postMinutes: 0, //瀹氱亴婧夋椂闀跨殑鏃堕棿
showForceConfirm: false,
showErrorDialog: false, //閿欒鎻愮ず
errorData: "",
@@ -61,6 +59,8 @@
costiomWater: "", //杈撳叆鐨勮嚜瀹氫箟姘撮噺
isWXRefreshing: false,
irrigateProfile: [], //鑾峰彇鎵�閫夌亴婧夋柟寮忕殑璇︾粏鏁版嵁
+ datetimeVisible: false,
+
},
// 鍒囨崲 Tabs
@@ -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鏂规硶涓�
},
//寮�娉甸�氫俊
/**
@@ -134,7 +127,6 @@
data: data,
timeout: 180000
}).then(response => {
-
// 澶勭悊鎴愬姛鍝嶅簲
console.log('璇锋眰鎴愬姛:', response);
// 鍔犺浇瀹屾垚鍚庨殣钘忓姞杞藉姩鐢�
@@ -143,7 +135,6 @@
wx.reLaunch({
url: '/pages/home/home?param=true' // 棣栭〉鐨勮矾寰勶紝鏍规嵁瀹為檯鎯呭喌濉啓
});
-
}).catch(error => {
// 鍔犺浇瀹屾垚鍚庨殣钘忓姞杞藉姩鐢�
wx.hideLoading();
@@ -154,10 +145,18 @@
forceIntakeId: intakeId,
showForceConfirm: true
})
+ } else if (error.code === "ECONNABORTED" || error.message?.includes('timeout')) {
+ // 澶勭悊瓒呮椂閿欒
+ this.setData({
+ showErrorDialog: true,
+ errorData: "閫氫俊瓒呮椂锛岃绋嶅悗鍐嶈瘯",
+ errorDialogTitle: "寮�闃�閿欒"
+ })
} else {
this.setData({
showErrorDialog: true,
- errorData: error.msg
+ errorData: error.msg,
+ errorDialogTitle: "寮�闃�閿欒"
})
}
});
@@ -232,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
});
}
@@ -307,10 +306,6 @@
this.getcommonWaterPoints();
},
confirmDialog() {
- // this.setData({
- // showConfirm: false
- // })
- // this.postOpenValva(this.data.choseItem.intakeId);
this.setData({
showConfirm: false
})
@@ -505,14 +500,14 @@
});
const data = {
intakeId: this.data.choseItem.intakeId, //鍙栨按鍙D
- // vcId: app.globalData.vcId, //铏氭嫙鍗D
minutes: this.data.postMinutes, //鍒嗛挓
operator: app.globalData.clientId, //鎿嶄綔鍛�
plannedOpenTime: this.data.openTime
};
post({
url: "wx/valve/planed_open_timed_close",
- data: data
+ data: data,
+ timeout: 180000
}).then(response => {
// 澶勭悊鎴愬姛鍝嶅簲
console.log('璇锋眰鎴愬姛:', response);
@@ -527,10 +522,20 @@
wx.hideLoading();
// 澶勭悊閿欒鍝嶅簲
console.error('璇锋眰澶辫触:', error);
- this.setData({
- showErrorDialog: true,
- errorData: error.msg
- })
+ if (error.code === "ECONNABORTED" || error.message?.includes('timeout')) {
+ // 澶勭悊瓒呮椂閿欒
+ this.setData({
+ showErrorDialog: true,
+ errorData: "閫氫俊瓒呮椂锛岃绋嶅悗鍐嶈瘯",
+ errorDialogTitle: "寮�闃�閿欒"
+ })
+ } else {
+ this.setData({
+ showErrorDialog: true,
+ errorData: error.msg,
+ errorDialogTitle: "寮�闃�閿欒"
+ })
+ }
});
},
//瀹氭椂鍏抽榾寮忓紑闃�
@@ -542,13 +547,13 @@
});
const data = {
intakeId: this.data.choseItem.intakeId, //鍙栨按鍙D
- // vcId: app.globalData.vcId, //铏氭嫙鍗D
minutes: this.data.postMinutes, //鍒嗛挓
operator: app.globalData.clientId //鎿嶄綔鍛�
};
post({
url: "wx/valve/timed_close",
- data: data
+ data: data,
+ timeout: 180000
}).then(response => {
// 澶勭悊鎴愬姛鍝嶅簲
console.log('璇锋眰鎴愬姛:', response);
@@ -563,10 +568,20 @@
wx.hideLoading();
// 澶勭悊閿欒鍝嶅簲
console.error('璇锋眰澶辫触:', error);
- this.setData({
- showErrorDialog: true,
- errorData: error.msg
- })
+ if (error.code === "ECONNABORTED" || error.message?.includes('timeout')) {
+ // 澶勭悊瓒呮椂閿欒
+ this.setData({
+ showErrorDialog: true,
+ errorData: "閫氫俊瓒呮椂锛岃绋嶅悗鍐嶈瘯",
+ errorDialogTitle: "寮�闃�閿欒"
+ })
+ } else {
+ this.setData({
+ showErrorDialog: true,
+ errorData: error.msg,
+ errorDialogTitle: "寮�闃�閿欒"
+ })
+ }
});
},
// 閫氳繃灏忔椂杞崲鎴愬垎閽�
@@ -601,5 +616,133 @@
costiomWater: ""
});
}
+ }, //鏄剧ず鏃堕棿閫夋嫨鍣�
+ showPicker(e) {
+ this.setData({
+ datetime: new Date().getTime(),
+ datetimeVisible: true,
+ isShowOpenTime: true
+ });
+ },
+ onConfirm(e) {
+ const {
+ value
+ } = e?.detail;
+ console.log(value);
+ this.setData({
+ openTime: value,
+ openTimeText: "璁″垝寮�闃�鏃堕棿锛�" + value
+ })
+ }, hidePicker() {
+ this.setData({
+ isShowOpenTime: false,
+ isOpenTiming: false,
+ radioValue: "0"
+ })
+ }, // 瀹氶噺寮�娉垫寜閽�
+ btnOpenOnWater() {
+ if (this.data.waterAmount > 0) {
+ if (this.data.isOpenTiming) {
+ this.quantifyOpenTime();
+ } else {
+ this.quantifyOpen();
+ }
+ } else {
+ wx.showToast({
+ icon: 'error',
+ title: '璇烽�夋嫨鎴栬緭鍏ョ亴婧夋椂闂达紒',
+ })
+ }
+ },//瀹氶噺寮�闃�寮忚鍒掑紑闃�
+ quantifyOpenTime() {
+ const app = getApp();
+ wx.showLoading({
+ title: '姝ｅ湪閫氫俊璇风◢鍊�...', // 鍔犺浇鎻愮ず鏂囧瓧
+ mask: true // 鏄惁鏄剧ず閫忔槑钂欏眰锛岄槻姝㈣Е鎽哥┛閫忥紝榛樿涓� false
+ });
+ const data = {
+ intakeId: this.data.choseItem.intakeId, //鍙栨按鍙D
+ waterAmount: this.data.waterAmount, //姘撮噺
+ operator: app.globalData.clientId, //鎿嶄綔鍛�
+ plannedOpenTime: this.data.openTime
+ };
+ post({
+ url: "wx/valve/planed_open_quantify_close",
+ data: data,
+ timeout: 180000
+ }).then(response => {
+ // 澶勭悊鎴愬姛鍝嶅簲
+ console.log('璇锋眰鎴愬姛:', response);
+ // 鍔犺浇瀹屾垚鍚庨殣钘忓姞杞藉姩鐢�
+ wx.hideLoading();
+ //瀹屾垚鍚庡洖鍒伴椤�
+ wx.reLaunch({
+ url: '/pages/home/home?param=2' // 棣栭〉鐨勮矾寰勶紝鏍规嵁瀹為檯鎯呭喌濉啓
+ });
+ }).catch(error => {
+ // 鍔犺浇瀹屾垚鍚庨殣钘忓姞杞藉姩鐢�
+ wx.hideLoading();
+ // 澶勭悊閿欒鍝嶅簲
+ console.error('璇锋眰澶辫触:', error);
+ if (error.code === "ECONNABORTED" || error.message?.includes('timeout')) {
+ // 澶勭悊瓒呮椂閿欒
+ this.setData({
+ showErrorDialog: true,
+ errorData: "閫氫俊瓒呮椂锛岃绋嶅悗鍐嶈瘯",
+ errorDialogTitle: "寮�闃�閿欒"
+ })
+ } else {
+ this.setData({
+ showErrorDialog: true,
+ errorData: error.msg,
+ errorDialogTitle: "寮�闃�閿欒"
+ })
+ }
+ });
+ },//瀹氶噺寮�闃�
+ quantifyOpen() {
+ const app = getApp();
+ wx.showLoading({
+ title: '姝ｅ湪寮�闃�璇风◢鍊�...', // 鍔犺浇鎻愮ず鏂囧瓧
+ mask: true // 鏄惁鏄剧ず閫忔槑钂欏眰锛岄槻姝㈣Е鎽哥┛閫忥紝榛樿涓� false
+ });
+ const data = {
+ intakeId: this.data.choseItem.intakeId, //鍙栨按鍙D
+ waterAmount: this.data.waterAmount, //姘撮噺
+ operator: app.globalData.clientId //鎿嶄綔鍛�
+ };
+ post({
+ url: "wx/valve/quantify_close",
+ data: data,
+ timeout: 180000
+ }).then(response => {
+ // 澶勭悊鎴愬姛鍝嶅簲
+ console.log('璇锋眰鎴愬姛:', response);
+ // 鍔犺浇瀹屾垚鍚庨殣钘忓姞杞藉姩鐢�
+ wx.hideLoading();
+ //瀹屾垚鍚庡洖鍒伴椤�
+ wx.reLaunch({
+ url: '/pages/home/home?param=1' // 棣栭〉鐨勮矾寰勶紝鏍规嵁瀹為檯鎯呭喌濉啓
+ });
+ }).catch(error => {
+ // 鍔犺浇瀹屾垚鍚庨殣钘忓姞杞藉姩鐢�
+ wx.hideLoading();
+ // 澶勭悊閿欒鍝嶅簲
+ console.error('璇锋眰澶辫触:', error);
+ if (error.code === "ECONNABORTED" || error.message?.includes('timeout')) {
+ // 澶勭悊瓒呮椂閿欒
+ this.setData({
+ showErrorDialog: true,
+ errorData: "閫氫俊瓒呮椂锛岃绋嶅悗鍐嶈瘯",
+ errorDialogTitle: "寮�闃�閿欒"
+ })
+ } else {
+ this.setData({
+ showErrorDialog: true,
+ errorData: error.msg,
+ errorDialogTitle: "寮�闃�閿欒"
+ })
+ }
+ });
},
})
\ No newline at end of file
--
Gitblit v1.8.0