From f66a9a2c565966e98720be5e20604c6f75030f82 Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期一, 28 十月 2024 17:40:13 +0800
Subject: [PATCH] 1.首页添加使用说明。2.修改扫码开阀功能。3.问题反馈功能相关
---
pages/openCard/openCard.js | 24 +++++++++++++++++-------
1 files changed, 17 insertions(+), 7 deletions(-)
diff --git a/pages/openCard/openCard.js b/pages/openCard/openCard.js
index 101c497..7d989d7 100644
--- a/pages/openCard/openCard.js
+++ b/pages/openCard/openCard.js
@@ -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.initDialogData();
+ } else {
+ //鎵爜寮�闃�閫昏緫
+ this.postOpenValva(false);
+ }
+
}
},
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() {
@@ -319,6 +328,7 @@
const data = {
intakeId: this.data.intakeId, //鍙栨按鍙D
vcId: this.data.vcId, //铏氭嫙鍗D
+ intakeName: this.data.intakeName, //鍙栨按鍙ｅ悕绉�
operator: app.globalData.sessionId, //鎿嶄綔鍛�
forceOpen: !!isforce // 浣跨敤閫昏緫闈炴搷浣滅 !! 鏉ョ‘淇� isForce 鏄竷灏斿��
};
--
Gitblit v1.8.0