From c768d20f2256ba40ebf6bc1be984c667d6bc7a11 Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期五, 27 十二月 2024 14:52:59 +0800
Subject: [PATCH] 添加分享功能
---
pages/openCard/openCard.js | 78 ++++++++++++++++++++++++---------------
1 files changed, 48 insertions(+), 30 deletions(-)
diff --git a/pages/openCard/openCard.js b/pages/openCard/openCard.js
index a3f47d4..9305438 100644
--- a/pages/openCard/openCard.js
+++ b/pages/openCard/openCard.js
@@ -1,4 +1,4 @@
-// 寮�鍗￠�夋嫨铏氭嫙鍗�
+// 寮�闃�閫夋嫨铏氭嫙鍗�
const {
get,
post
@@ -14,7 +14,8 @@
vcId: "",
activeIndex: -1,
datetimeVisible: false,
- datetime: new Date().getTime(),
+ dateStartTime: new Date().getTime(),
+ dateEndTime: new Date().getTime() + 24 * 60 * 60 * 1000,
datetimeText: '',
allCardPoints: [], // 鎵�鏈夎櫄鎷熷崱
irrigateProfile: [], //鑾峰彇鎵�閫夌亴婧夋柟寮忕殑璇︾粏鏁版嵁
@@ -36,7 +37,9 @@
radioValue: "0", //寮�闃�鏂瑰紡閫変腑鐨勭被鍨�
costiomTime: "", //鑷畾涔夌亴婧夋椂闂�
waterAmount: 0, //瀹氶噺寮�闃�鐨勬按閲�
- costiomWater:"",//杈撳叆鐨勮嚜瀹氫箟姘撮噺
+ costiomWater: "", //杈撳叆鐨勮嚜瀹氫箟姘撮噺
+ isWXRefreshing: false,
+ intakeName: "" //鎵爜寮�闃�浠庨椤典紶鏉ョ殑鍙栨按鍙ｅ悕绉�
},
openValva(event) {
const {
@@ -45,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.vcId,
+ vcId: item.id,
})
+ if (this.data.intakeName) {
+ //鎵爜寮�闃�閫昏緫
+ this.postOpenValva(false);
+ } else {
+ // 閫夋嫨铏氭嫙鍗″悗
+ this.initDialogData();
+ }
+
}
},
handleAutoIrrigation() {},
@@ -62,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();
@@ -103,7 +114,10 @@
* 椤甸潰鐩稿叧浜嬩欢澶勭悊鍑芥暟--鐩戝惉鐢ㄦ埛涓嬫媺鍔ㄤ綔
*/
onPullDownRefresh() {
-
+ this.setData({
+ isWXRefreshing: true
+ });
+ this.getCardList();
},
/**
@@ -163,7 +177,8 @@
});
// 鏇存柊鍒楄〃鏁版嵁
this.setData({
- allCardPoints: updatedList
+ allCardPoints: updatedList,
+ isWXRefreshing: false
});
},
handleClost() {
@@ -198,7 +213,7 @@
this.data.waterAmount = parseInt(this.data.irrigateProfile[index].defaultValue)
this.setData({
activeIndex: parseInt(index),
- costiomWater:""
+ costiomWater: ""
});
}
},
@@ -249,6 +264,7 @@
this.setData({
isOpenTiming: true,
radioValue: value,
+ dateStartTime: new Date().getTime()
})
} else {
this.setData({
@@ -300,7 +316,8 @@
dialog_time: false,
dialog_water: false,
dialog_mode: true,
- group_time: false
+ group_time: false,
+ activeIndex: -1
})
},
//绔嬪嵆寮�娉�
@@ -313,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({
@@ -327,7 +345,7 @@
wx.hideLoading();
//瀹屾垚鍚庡洖鍒伴椤�
wx.reLaunch({
- url: '/pages/home/home?param=true' // 棣栭〉鐨勮矾寰勶紝鏍规嵁瀹為檯鎯呭喌濉啓
+ url: '/pages/home/home?param=1' // 棣栭〉鐨勮矾寰勶紝鏍规嵁瀹為檯鎯呭喌濉啓
});
}).catch(error => {
@@ -359,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",
@@ -371,7 +389,7 @@
wx.hideLoading();
//瀹屾垚鍚庡洖鍒伴椤�
wx.reLaunch({
- url: '/pages/home/home?param=true' // 棣栭〉鐨勮矾寰勶紝鏍规嵁瀹為檯鎯呭喌濉啓
+ url: '/pages/home/home?param=1' // 棣栭〉鐨勮矾寰勶紝鏍规嵁瀹為檯鎯呭喌濉啓
});
}).catch(error => {
// 鍔犺浇瀹屾垚鍚庨殣钘忓姞杞藉姩鐢�
@@ -395,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 => {
// 澶勭悊鎴愬姛鍝嶅簲
@@ -408,7 +426,7 @@
wx.hideLoading();
//瀹屾垚鍚庡洖鍒伴椤�
wx.reLaunch({
- url: '/pages/home/home?param=true' // 棣栭〉鐨勮矾寰勶紝鏍规嵁瀹為檯鎯呭喌濉啓
+ url: '/pages/home/home?param=2' // 棣栭〉鐨勮矾寰勶紝鏍规嵁瀹為檯鎯呭喌濉啓
});
}).catch(error => {
// 鍔犺浇瀹屾垚鍚庨殣钘忓姞杞藉姩鐢�
@@ -431,11 +449,11 @@
const data = {
intakeId: this.data.intakeId, //鍙栨按鍙D
vcId: this.data.vcId, //铏氭嫙鍗D
- minutes: this.data.waterAmount, //姘撮噺
- operator: app.globalData.sessionId //鎿嶄綔鍛�
+ waterAmount: this.data.waterAmount, //姘撮噺
+ operator: app.globalData.clientId //鎿嶄綔鍛�
};
post({
- url: "/wx/valve/quantify_close",
+ url: "wx/valve/quantify_close",
data: data
}).then(response => {
// 澶勭悊鎴愬姛鍝嶅簲
@@ -444,7 +462,7 @@
wx.hideLoading();
//瀹屾垚鍚庡洖鍒伴椤�
wx.reLaunch({
- url: '/pages/home/home?param=true' // 棣栭〉鐨勮矾寰勶紝鏍规嵁瀹為檯鎯呭喌濉啓
+ url: '/pages/home/home?param=1' // 棣栭〉鐨勮矾寰勶紝鏍规嵁瀹為檯鎯呭喌濉啓
});
}).catch(error => {
// 鍔犺浇瀹屾垚鍚庨殣钘忓姞杞藉姩鐢�
@@ -468,11 +486,11 @@
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({
- url: "/wx/valve/planed_open_quantify_close",
+ url: "wx/valve/planed_open_quantify_close",
data: data
}).then(response => {
// 澶勭悊鎴愬姛鍝嶅簲
@@ -481,7 +499,7 @@
wx.hideLoading();
//瀹屾垚鍚庡洖鍒伴椤�
wx.reLaunch({
- url: '/pages/home/home?param=true' // 棣栭〉鐨勮矾寰勶紝鏍规嵁瀹為檯鎯呭喌濉啓
+ url: '/pages/home/home?param=2' // 棣栭〉鐨勮矾寰勶紝鏍规嵁瀹為檯鎯呭喌濉啓
});
}).catch(error => {
// 鍔犺浇瀹屾垚鍚庨殣钘忓姞杞藉姩鐢�
@@ -583,7 +601,7 @@
}
},
//杈撳叆鑷畾涔夋按閲忕殑鐩戝惉
- onWaterInputChange(data){
+ onWaterInputChange(data) {
console.log(data.detail.value)
if (data.detail.value !== "") {
this.setData({
@@ -597,7 +615,7 @@
}
},
// 瀹氶噺寮�娉垫寜閽�
- btnOpenOnWater(){
+ btnOpenOnWater() {
if (this.data.waterAmount > 0) {
if (this.data.isOpenTiming) {
this.quantifyOpenTime();
@@ -610,7 +628,7 @@
title: '璇烽�夋嫨鎴栬緭鍏ョ亴婧夋椂闂达紒',
})
}
- }
+ },
})
\ No newline at end of file
--
Gitblit v1.8.0