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 | 36 +++++++++++++++++++-----------------
1 files changed, 19 insertions(+), 17 deletions(-)
diff --git a/pages/openCard/openCard.js b/pages/openCard/openCard.js
index 7d989d7..9305438 100644
--- a/pages/openCard/openCard.js
+++ b/pages/openCard/openCard.js
@@ -1,4 +1,4 @@
-// 寮�鍗￠�夋嫨铏氭嫙鍗�
+// 寮�闃�閫夋嫨铏氭嫙鍗�
const {
get,
post
@@ -54,12 +54,12 @@
this.setData({
vcId: item.id,
})
- if (this.data.intakeName === "") {
- // 閫夋嫨铏氭嫙鍗″悗
- this.initDialogData();
- } else {
+ if (this.data.intakeName) {
//鎵爜寮�闃�閫昏緫
this.postOpenValva(false);
+ } else {
+ // 閫夋嫨铏氭嫙鍗″悗
+ this.initDialogData();
}
}
@@ -264,6 +264,7 @@
this.setData({
isOpenTiming: true,
radioValue: value,
+ dateStartTime: new Date().getTime()
})
} else {
this.setData({
@@ -315,7 +316,8 @@
dialog_time: false,
dialog_water: false,
dialog_mode: true,
- group_time: false
+ group_time: false,
+ activeIndex: -1
})
},
//绔嬪嵆寮�娉�
@@ -329,7 +331,7 @@
intakeId: this.data.intakeId, //鍙栨按鍙D
vcId: this.data.vcId, //铏氭嫙鍗D
intakeName: this.data.intakeName, //鍙栨按鍙ｅ悕绉�
- operator: app.globalData.sessionId, //鎿嶄綔鍛�
+ operator: app.globalData.clientId, //鎿嶄綔鍛�
forceOpen: !!isforce // 浣跨敤閫昏緫闈炴搷浣滅 !! 鏉ョ‘淇� isForce 鏄竷灏斿��
};
post({
@@ -343,7 +345,7 @@
wx.hideLoading();
//瀹屾垚鍚庡洖鍒伴椤�
wx.reLaunch({
- url: '/pages/home/home?param=true' // 棣栭〉鐨勮矾寰勶紝鏍规嵁瀹為檯鎯呭喌濉啓
+ url: '/pages/home/home?param=1' // 棣栭〉鐨勮矾寰勶紝鏍规嵁瀹為檯鎯呭喌濉啓
});
}).catch(error => {
@@ -375,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",
@@ -387,7 +389,7 @@
wx.hideLoading();
//瀹屾垚鍚庡洖鍒伴椤�
wx.reLaunch({
- url: '/pages/home/home?param=true' // 棣栭〉鐨勮矾寰勶紝鏍规嵁瀹為檯鎯呭喌濉啓
+ url: '/pages/home/home?param=1' // 棣栭〉鐨勮矾寰勶紝鏍规嵁瀹為檯鎯呭喌濉啓
});
}).catch(error => {
// 鍔犺浇瀹屾垚鍚庨殣钘忓姞杞藉姩鐢�
@@ -411,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 => {
// 澶勭悊鎴愬姛鍝嶅簲
@@ -424,7 +426,7 @@
wx.hideLoading();
//瀹屾垚鍚庡洖鍒伴椤�
wx.reLaunch({
- url: '/pages/home/home?param=true' // 棣栭〉鐨勮矾寰勶紝鏍规嵁瀹為檯鎯呭喌濉啓
+ url: '/pages/home/home?param=2' // 棣栭〉鐨勮矾寰勶紝鏍规嵁瀹為檯鎯呭喌濉啓
});
}).catch(error => {
// 鍔犺浇瀹屾垚鍚庨殣钘忓姞杞藉姩鐢�
@@ -448,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",
@@ -460,7 +462,7 @@
wx.hideLoading();
//瀹屾垚鍚庡洖鍒伴椤�
wx.reLaunch({
- url: '/pages/home/home?param=true' // 棣栭〉鐨勮矾寰勶紝鏍规嵁瀹為檯鎯呭喌濉啓
+ url: '/pages/home/home?param=1' // 棣栭〉鐨勮矾寰勶紝鏍规嵁瀹為檯鎯呭喌濉啓
});
}).catch(error => {
// 鍔犺浇瀹屾垚鍚庨殣钘忓姞杞藉姩鐢�
@@ -484,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({
@@ -497,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