From c6ad105d1b743bcfd8aa6ee2781d39039f319a87 Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期四, 04 七月 2024 11:28:51 +0800
Subject: [PATCH] 添加tag
---
pages/home/home.js | 131 ++++++++++++++++++++++++++++++++-----------
1 files changed, 98 insertions(+), 33 deletions(-)
diff --git a/pages/home/home.js b/pages/home/home.js
index 4bc1a09..fb5c516 100644
--- a/pages/home/home.js
+++ b/pages/home/home.js
@@ -12,7 +12,7 @@
data: {
sessionId: "",
showConfirm: false,
- myItem:{},
+ myItem: {},
waterIntakeName: "",
image: "/images/ic_head_bg.jpg",
userPhone: "158****0723",
@@ -20,7 +20,12 @@
scrollViewHeight: 0,
listData: [],
isRefreshing: false,
- isWXRefreshing: false
+ isWXRefreshing: false,
+ errorData: '', //閿欒鍐呭
+ showErrorDialog: false,
+ confirmBtn: {
+ content: '纭'
+ },
},
openValve: function (e) {
@@ -44,7 +49,7 @@
isRefreshing: true
});
this.getOpenList();
-
+
}
},
@@ -73,9 +78,15 @@
});
//褰撳紑闃�鎴愬姛鍚庤皟鐢ㄥ埛鏂�
console.log("onLoad锛�" + options.param);
- if(options.param){
- getOpenList() ;
+ if (options.param) {
+ wx.showToast({
+ title: '寮�闃�鎴愬姛',
+ icon: 'success',
+ duration: 3000
+ })
+ this.getOpenList();
}
+ this.getUserDataBySession();
},
/**
@@ -131,13 +142,7 @@
});
console.log(this.data.isRefreshing);
// 鏁版嵁璇锋眰瀹屾垚鍚庯紝鍋滄涓嬫媺鍒锋柊鐨勫姩鐢�
- var self = this;
- setTimeout(function () {
- self.setData({
- isWXRefreshing: false, // 灏唗riggered灞炴�ц缃负false锛岃〃绀轰笅鎷夊埛鏂板凡瀹屾垚
- })
- console.log('涓嬫媺鍒锋柊宸插畬鎴�');
- }, 3000);
+ this.getOpenList();
},
/**
@@ -154,19 +159,26 @@
},
recharge() {
- wx.navigateTo({
- url: '/pages/rechargeCard/rechargeCard',
+ // wx.navigateTo({
+ // url: '/pages/rechargeCard/rechargeCard',
+ // })
+ wx.showToast({
+ title: '鏆傛湭寮�鏀�',
+ icon: 'none'
})
},
openValveList() {
+ // wx.navigateTo({
+ // url: '/pages/valveList/valveList',
+ // })
wx.showToast({
- title: '姝ｅ湪寮�鍙戜腑',
+ title: '鏆傛湭寮�鏀�',
icon: 'none'
})
},
feedBack() {
wx.showToast({
- title: '姝ｅ湪寮�鍙戜腑',
+ title: '鏆傛湭寮�鏀�',
icon: 'none'
})
},
@@ -176,7 +188,7 @@
this.setData({
showConfirm: true,
waterIntakeName: item.intakeNum,
- myItem:item
+ myItem: item
});
},
closeDialog() {
@@ -191,31 +203,44 @@
* @param {*} vcNum 铏氭嫙鍗＄紪鍙�
*/
postCloseValaue(orderNo, rtuAddr, vcNum) {
+ wx.showLoading({
+ title: '姝ｅ湪鍏抽榾璇风◢鍊�...', // 鍔犺浇鎻愮ず鏂囧瓧
+ mask: true // 鏄惁鏄剧ず閫忔槑钂欏眰锛岄槻姝㈣Е鎽哥┛閫忥紝榛樿涓� false
+ });
const app = getApp();
const data = {
- rtuAddr: rtuAddr,
+ rtuAddr: rtuAddr,
vcNum: vcNum, //铏氭嫙鍗D
- orderNo:orderNo,
- userType: 2, //鐢ㄦ埛绫诲瀷1-骞冲彴锛�2-App
+ orderNo: orderNo,
operator: app.globalData.sessionId //鎿嶄綔鍛�
};
- console.log("postCloseValaue"+data);
+ console.log("postCloseValaue" + data);
post({
- url: "valve/close",
+ url: "wx/valve/close_wx",
data: data,
- isShowLoding:true
+ isShowLoding: false,
+ timeout: 185000
}).then(response => {
+
// 澶勭悊鎴愬姛鍝嶅簲
console.log('璇锋眰鎴愬姛:', response);
// 鍔犺浇瀹屾垚鍚庨殣钘忓姞杞藉姩鐢�
wx.hideLoading();
- //瀹屾垚鍚庡洖鍒伴椤�
- wx.reLaunch({
- url: '/pages/home/home?param=true' // 棣栭〉鐨勮矾寰勶紝鏍规嵁瀹為檯鎯呭喌濉啓
- });
+ this.getOpenList();
+ wx.showToast({
+ title: '鍏抽榾鎴愬姛',
+ icon: 'success',
+ duration: 3000
+ })
}).catch(error => {
+ wx.hideLoading();
+ this.setData({
+ showErrorDialog: true,
+ errorData: error.msg
+ })
// 澶勭悊閿欒鍝嶅簲
console.error('璇锋眰澶辫触:', error);
+
});
},
/**
@@ -224,7 +249,7 @@
getOpenList() {
const app = getApp();
const params = {
- url: 'valve/get',
+ url: 'wx/valve/get',
data: {
operator: app.globalData.sessionId
}
@@ -233,12 +258,18 @@
this.setData({
listData: data.content,
isRefreshing: false, // 灏唗riggered灞炴�ц缃负false锛岃〃绀轰笅鎷夊埛鏂板凡瀹屾垚
+ isWXRefreshing: false, // 灏唗riggered灞炴�ц缃负false锛岃〃绀轰笅鎷夊埛鏂板凡瀹屾垚
})
}).catch(err => {
// 閿欒鍥炶皟
- console.error('Error:', err);
this.setData({
isRefreshing: false, // 灏唗riggered灞炴�ц缃负false锛岃〃绀轰笅鎷夊埛鏂板凡瀹屾垚
+ isWXRefreshing: false, // 灏唗riggered灞炴�ц缃负false锛岃〃绀轰笅鎷夊埛鏂板凡瀹屾垚
+ })
+ wx.showToast({
+ title: err.msg,
+ icon: 'error',
+ duration: 3000
})
});
},
@@ -246,14 +277,48 @@
* 纭鍏抽棴鍥炶皟
* @param {} item
*/
- confirmDialog(){
+ confirmDialog() {
this.setData({
showConfirm: false
});
- this.postCloseValaue(this.data.myItem.orderNo,this.data.myItem.rtuAddr,this.data.myItem.vcNum);
+ this.postCloseValaue(this.data.myItem.orderNo, this.data.myItem.rtuAddr, this.data.myItem.vcNum);
+ },
+ //鏍规嵁session鑾峰彇鍐滄埛淇℃伅
+ getUserDataBySession() {
+ const app = getApp();
+ const params = {
+ url: 'wx/client/simple_info',
+ data: {
+ sessionId: app.globalData.sessionId
+ }
+ };
+ get(params).then(data => {
+ this.setData({
+ userName: data.content.clientName,
+ userPhone: this.maskPhoneNumber(data.content.phone)
+ })
+ }).catch(err => {
+ // 閿欒鍥炶皟
+ wx.showToast({
+ title: err.msg,
+ icon: 'error',
+ duration: 3000
+ })
+ })
+ },
+ maskPhoneNumber(phoneNumber) {
+ if (phoneNumber.length !== 11) {
+ throw new Error("Phone number must be 11 digits");
+ }
+ // 浣跨敤姝ｅ垯琛ㄨ揪寮忔浛鎹腑闂村洓浣嶆暟瀛椾负鏄熷彿
+ const maskedPhoneNumber = phoneNumber.replace(/^(\d{3})\d{4}(\d{4})$/, "$1****$2");
+ return maskedPhoneNumber;
+ },
+ closeDialog() {
+ this.setData({
+ showErrorDialog:false
+ })
}
-
-
--
Gitblit v1.8.0