From a84175b5e189ac6da0d80ac64f77a4b45e7c9157 Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期四, 14 十一月 2024 13:48:34 +0800
Subject: [PATCH] 1.添加瞬时流量相关2.优化界面3.修改原开阀和未关阀列表的sessionId为clientId
---
pages/home/home.js | 131 +++++++++++++++++++++++++++++--------------
1 files changed, 89 insertions(+), 42 deletions(-)
diff --git a/pages/home/home.js b/pages/home/home.js
index 879e346..cd54a3f 100644
--- a/pages/home/home.js
+++ b/pages/home/home.js
@@ -32,7 +32,9 @@
lastIntakeName: "",
isLogin: false, //鏄惁宸茬粡鐧诲綍
showInfoDialog: false,
-
+ showTipDialog: false,
+ options: '',
+ showUnBind: false
},
openValve: function (e) {
@@ -88,23 +90,15 @@
* 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍔犺浇
*/
onLoad(options) {
- // 浣跨敤 wx.nextTick 绛夊緟椤甸潰娓叉煋瀹屾垚
- wx.nextTick(() => {
- this.calculateScrollViewHeight();
- });
//褰撳紑闃�鎴愬姛鍚庤皟鐢ㄥ埛鏂�
console.log("onLoad锛�" + options.param);
- if (options.param) {
- wx.showToast({
- title: '寮�闃�鎴愬姛',
- icon: 'success',
- duration: 3000
- })
+ if (options.param === "1" || options.param === "2") {
this.setData({
- isLogin: true
+ options: options,
+ isLogin: true,
})
- this.getOpenList();
}
+
},
/**
@@ -120,32 +114,51 @@
isLogin: true
})
if (app.globalData.sessionId) {
- this.getOpenList();
this.getUserDataBySession();
}
}).catch((err) => {});
storage.getItem('clientId').then((data) => {
app.globalData.clientId = data;
+ this.getOpenList();
}).catch((err) => {});
} else {
//鏈湴娌℃湁缂撳瓨寰俊鐧诲綍
this.wxLogin();
}
+ if (this.data.options.param === "1") {
+ this.setData({
+ showTipDialog: true,
+ tipData: "寮�闃�鍛戒护涓嬪彂鎴愬姛锛屽洜寮�闃�闇�瑕佹椂闂达紝绾�20-60绉掑悗鍙埛鏂板揩閫熷叧闃�鍒楄〃鏌ョ湅鎵ц缁撴灉銆�"
+ })
+ setTimeout(() => {
+ this.getOpenList();
+ }, 20000)
+
+ } else if (this.data.options.param === "2") {
+ this.setData({
+ showTipDialog: true,
+ tipData: "棰勭害寮�闃�鍛戒护涓嬪彂鎴愬姛锛屽綋鍒拌揪棰勭害鏃堕棿骞朵笖鎴愬姛寮�闃�鍚庡揩閫熷叧闃�鍒楄〃浼氭樉绀烘湭鍏抽榾璁板綍"
+ })
+ this.getOpenList();
+ }
},
wxLogin() {
- const that = this;
- wx.login({
- success: function (res) {
- if (res.code) {
- var code = res.code;
- console.log(code);
- // 灏哻ode鍙戦�佸埌鏈嶅姟鍣ㄨ幏鍙杘penid
- that.codeLogin(code);
- } else {
- console.log('鐧诲綍澶辫触锛�' + res.errMsg);
+ // if (!this.data.isLogin) {
+ const that = this;
+ wx.login({
+ success: function (res) {
+ if (res.code) {
+ var code = res.code;
+ console.log(code);
+ // 灏哻ode鍙戦�佸埌鏈嶅姟鍣ㄨ幏鍙杘penid
+ that.codeLogin(code);
+ } else {
+ console.log('鐧诲綍澶辫触锛�' + res.errMsg);
+ }
}
- }
- });
+ });
+ // }
+
},
//寰俊code鐧诲綍
codeLogin(codeData) {
@@ -259,13 +272,16 @@
this.setData({
showConfirm: false,
showErrorDialog: false,
- showForceConfirm: false
+ showForceConfirm: false,
+ showTipDialog: false
});
},
cancelDialog() {
this.setData({
showForceConfirm: false,
- showConfirm: false
+ showConfirm: false,
+ showTipDialog: false,
+ showUnBind: false
});
},
/**
@@ -300,14 +316,17 @@
wx.hideLoading();
this.getOpenList();
if (response.content.data.success) {
- wx.showToast({
- title: '鍏抽榾鎴愬姛',
- icon: 'success',
- duration: 3000
+ this.setData({
+ isLogin: true,
+ showTipDialog: true,
+ tipData: "鍏抽榾鍛戒护涓嬪彂鎴愬姛锛岀害20-60绉掑悗鍙埛鏂板揩閫熷叧闃�鍒楄〃鏌ョ湅鎵ц缁撴灉銆�"
})
+ setTimeout(() => {
+ this.getOpenList();
+ }, 40000)
} else {
wx.showToast({
- title: '鍏抽榾澶辫触',
+ title: '鍛戒护鎵ц澶辫触',
icon: 'error',
duration: 3000
})
@@ -333,7 +352,7 @@
const params = {
url: 'wx/valve/get',
data: {
- operator: app.globalData.sessionId
+ operator: app.globalData.clientId
}
};
get(params).then(data => {
@@ -548,9 +567,6 @@
title: '姝ｅ湪寮哄埗鍒犻櫎璇风◢鍊�...', // 鍔犺浇鎻愮ず鏂囧瓧
mask: true // 鏄惁鏄剧ず閫忔槑钂欏眰锛岄槻姝㈣Е鎽哥┛閫忥紝榛樿涓� false
});
- that.setData({
- lastIntakeName: intakeName
- })
const data = {
vcNum: item.vcNum, //鍙栨按鍙D
rtuAddr: item.rtuAddr, //闃�鎺у櫒鍦板潃
@@ -582,9 +598,22 @@
} else {
displayText = "鍏抽榾"
}
+ let deleteText = "鍒犻櫎"
+ let time;
+ if (!item.dt) {
+ time = "鏆傛棤"
+ } else {
+ time = this.extractTime(item.dt)
+ }
+ if (item.waterInstant===null) {
+ item.waterInstant = "鏆傛棤"
+ }
+
return {
...item,
- displayText
+ displayText,
+ deleteText,
+ time
}; // 淇濈暀鎵�鏈夊叾浠栧瓧娈碉紝骞舵坊鍔� displayText 瀛楁
});
// 鏇存柊鍒楄〃鏁版嵁
@@ -594,11 +623,14 @@
},
//瑙ｇ粦
unbind() {
- //娓呯┖鏁版嵁
this.setData({
- userPhone: "璇风櫥褰�",
- userName: "鏈櫥褰�",
- listData: []
+ showUnBind: true
+ })
+ },
+ //纭瑙ｇ粦
+ unBindPost() {
+ this.setData({
+ showUnBind: false
})
wx.showLoading({
title: '姝ｅ湪瑙ｇ粦璇风◢鍊�...', // 鍔犺浇鎻愮ず鏂囧瓧
@@ -637,6 +669,11 @@
wx.hideLoading();
// 澶勭悊閿欒鍝嶅簲
console.error('璇锋眰澶辫触:', error);
+ wx.showToast({
+ title: '瑙ｇ粦澶辫触',
+ icon: 'error',
+ duration: 3000
+ })
});
},
//鐐瑰嚮鎻愮ず鎸夐挳
@@ -650,5 +687,15 @@
this.setData({
showInfoDialog: false
})
+ },
+ //澶勭悊鏃堕棿鍘绘帀骞存湀鏃�
+ extractTime(datetimeString) {
+ const formattedDate = datetimeString.replace(" ", "T");
+ const date = new Date(formattedDate);
+ // 鑾峰彇灏忔椂銆佸垎閽熷拰绉�
+ const hours = date.getHours().toString().padStart(2, '0');
+ const minutes = date.getMinutes().toString().padStart(2, '0');
+ const seconds = date.getSeconds().toString().padStart(2, '0');
+ return `${hours}:${minutes}:${seconds}`;
}
})
\ No newline at end of file
--
Gitblit v1.8.0