From ffe748f8069aeeaf0ffae846f7c09210ce64da4b Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期三, 18 十二月 2024 11:29:00 +0800
Subject: [PATCH] 修改表述文字
---
pages/openCard/openCard.js | 52 ++++++++++++++++++++++++++++++++--------------------
1 files changed, 32 insertions(+), 20 deletions(-)
diff --git a/pages/openCard/openCard.js b/pages/openCard/openCard.js
index 101c497..9305438 100644
--- a/pages/openCard/openCard.js
+++ b/pages/openCard/openCard.js
@@ -1,4 +1,4 @@
-// 寮�鍗￠�夋嫨铏氭嫙鍗�
+// 寮�闃�閫夋嫨铏氭嫙鍗�
const {
get,
post
@@ -38,7 +38,8 @@
costiomTime: "", //鑷畾涔夌亴婧夋椂闂�
waterAmount: 0, //瀹氶噺寮�闃�鐨勬按閲�
costiomWater: "", //杈撳叆鐨勮嚜瀹氫箟姘撮噺
- isWXRefreshing:false,
+ isWXRefreshing: false,
+ intakeName: "" //鎵爜寮�闃�浠庨椤典紶鏉ョ殑鍙栨按鍙ｅ悕绉�
},
openValva(event) {
const {
@@ -47,14 +48,20 @@
if (item.isAlarmValue === true) {
//閲戦鎶ヨ
wx.navigateTo({
- url: '/pages/rechargeMoney/rechargMoney?vcId=' + item.vcId,
+ url: '/pages/rechargeMoney/rechargMoney?vcId=' + item.id,
})
} else if (item.inUse === false) {
- // 閫夋嫨铏氭嫙鍗″悗
- this.initDialogData();
this.setData({
vcId: item.id,
})
+ if (this.data.intakeName) {
+ //鎵爜寮�闃�閫昏緫
+ this.postOpenValva(false);
+ } else {
+ // 閫夋嫨铏氭嫙鍗″悗
+ this.initDialogData();
+ }
+
}
},
handleAutoIrrigation() {},
@@ -64,10 +71,12 @@
*/
onLoad(options) {
const {
- intakeId
+ intakeId,
+ intakeName
} = options;
this.setData({
- intakeId: intakeId
+ intakeId: intakeId,
+ intakeName: intakeName
})
console.log('intakeId:' + this.data.intakeId);
this.getCardList();
@@ -169,7 +178,7 @@
// 鏇存柊鍒楄〃鏁版嵁
this.setData({
allCardPoints: updatedList,
- isWXRefreshing:false
+ isWXRefreshing: false
});
},
handleClost() {
@@ -255,6 +264,7 @@
this.setData({
isOpenTiming: true,
radioValue: value,
+ dateStartTime: new Date().getTime()
})
} else {
this.setData({
@@ -306,7 +316,8 @@
dialog_time: false,
dialog_water: false,
dialog_mode: true,
- group_time: false
+ group_time: false,
+ activeIndex: -1
})
},
//绔嬪嵆寮�娉�
@@ -319,7 +330,8 @@
const data = {
intakeId: this.data.intakeId, //鍙栨按鍙D
vcId: this.data.vcId, //铏氭嫙鍗D
- operator: app.globalData.sessionId, //鎿嶄綔鍛�
+ intakeName: this.data.intakeName, //鍙栨按鍙ｅ悕绉�
+ operator: app.globalData.clientId, //鎿嶄綔鍛�
forceOpen: !!isforce // 浣跨敤閫昏緫闈炴搷浣滅 !! 鏉ョ‘淇� isForce 鏄竷灏斿��
};
post({
@@ -333,7 +345,7 @@
wx.hideLoading();
//瀹屾垚鍚庡洖鍒伴椤�
wx.reLaunch({
- url: '/pages/home/home?param=true' // 棣栭〉鐨勮矾寰勶紝鏍规嵁瀹為檯鎯呭喌濉啓
+ url: '/pages/home/home?param=1' // 棣栭〉鐨勮矾寰勶紝鏍规嵁瀹為檯鎯呭喌濉啓
});
}).catch(error => {
@@ -365,7 +377,7 @@
intakeId: this.data.intakeId, //鍙栨按鍙D
vcId: this.data.vcId, //铏氭嫙鍗D
minutes: this.data.postMinutes, //鍒嗛挓
- operator: app.globalData.sessionId //鎿嶄綔鍛�
+ operator: app.globalData.clientId //鎿嶄綔鍛�
};
post({
url: "wx/valve/timed_close",
@@ -377,7 +389,7 @@
wx.hideLoading();
//瀹屾垚鍚庡洖鍒伴椤�
wx.reLaunch({
- url: '/pages/home/home?param=true' // 棣栭〉鐨勮矾寰勶紝鏍规嵁瀹為檯鎯呭喌濉啓
+ url: '/pages/home/home?param=1' // 棣栭〉鐨勮矾寰勶紝鏍规嵁瀹為檯鎯呭喌濉啓
});
}).catch(error => {
// 鍔犺浇瀹屾垚鍚庨殣钘忓姞杞藉姩鐢�
@@ -401,11 +413,11 @@
intakeId: this.data.intakeId, //鍙栨按鍙D
vcId: this.data.vcId, //铏氭嫙鍗D
minutes: this.data.postMinutes, //鍒嗛挓
- operator: app.globalData.sessionId, //鎿嶄綔鍛�
+ operator: app.globalData.clientId, //鎿嶄綔鍛�
plannedOpenTime: this.data.openTime
};
post({
- url: "wx/valve/timed_close",
+ url: "wx/valve/planed_open_timed_close",
data: data
}).then(response => {
// 澶勭悊鎴愬姛鍝嶅簲
@@ -414,7 +426,7 @@
wx.hideLoading();
//瀹屾垚鍚庡洖鍒伴椤�
wx.reLaunch({
- url: '/pages/home/home?param=true' // 棣栭〉鐨勮矾寰勶紝鏍规嵁瀹為檯鎯呭喌濉啓
+ url: '/pages/home/home?param=2' // 棣栭〉鐨勮矾寰勶紝鏍规嵁瀹為檯鎯呭喌濉啓
});
}).catch(error => {
// 鍔犺浇瀹屾垚鍚庨殣钘忓姞杞藉姩鐢�
@@ -438,7 +450,7 @@
intakeId: this.data.intakeId, //鍙栨按鍙D
vcId: this.data.vcId, //铏氭嫙鍗D
waterAmount: this.data.waterAmount, //姘撮噺
- operator: app.globalData.sessionId //鎿嶄綔鍛�
+ operator: app.globalData.clientId //鎿嶄綔鍛�
};
post({
url: "wx/valve/quantify_close",
@@ -450,7 +462,7 @@
wx.hideLoading();
//瀹屾垚鍚庡洖鍒伴椤�
wx.reLaunch({
- url: '/pages/home/home?param=true' // 棣栭〉鐨勮矾寰勶紝鏍规嵁瀹為檯鎯呭喌濉啓
+ url: '/pages/home/home?param=1' // 棣栭〉鐨勮矾寰勶紝鏍规嵁瀹為檯鎯呭喌濉啓
});
}).catch(error => {
// 鍔犺浇瀹屾垚鍚庨殣钘忓姞杞藉姩鐢�
@@ -474,7 +486,7 @@
intakeId: this.data.intakeId, //鍙栨按鍙D
vcId: this.data.vcId, //铏氭嫙鍗D
waterAmount: this.data.waterAmount, //姘撮噺
- operator: app.globalData.sessionId, //鎿嶄綔鍛�
+ operator: app.globalData.clientId, //鎿嶄綔鍛�
plannedOpenTime: this.data.openTime
};
post({
@@ -487,7 +499,7 @@
wx.hideLoading();
//瀹屾垚鍚庡洖鍒伴椤�
wx.reLaunch({
- url: '/pages/home/home?param=true' // 棣栭〉鐨勮矾寰勶紝鏍规嵁瀹為檯鎯呭喌濉啓
+ url: '/pages/home/home?param=2' // 棣栭〉鐨勮矾寰勶紝鏍规嵁瀹為檯鎯呭喌濉啓
});
}).catch(error => {
// 鍔犺浇瀹屾垚鍚庨殣钘忓姞杞藉姩鐢�
--
Gitblit v1.8.0