From 556464a10ec5f3946b738080428a848154d5b780 Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期一, 12 八月 2024 09:06:39 +0800
Subject: [PATCH] 添加识别二维码切换地址的功能
---
pages/waterIntake/waterIntake.js | 105 ++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 84 insertions(+), 21 deletions(-)
diff --git a/pages/waterIntake/waterIntake.js b/pages/waterIntake/waterIntake.js
index 81ded95..de10bb5 100644
--- a/pages/waterIntake/waterIntake.js
+++ b/pages/waterIntake/waterIntake.js
@@ -9,11 +9,24 @@
searchQuery: "",
commonWaterPoints: [], // 甯哥敤鍙栨按鍙ｆ暟鎹�
allWaterPoints: [], // 鎵�鏈夊彇姘村彛鏁版嵁
+ searchData: [{
+ intakeNum: "1111111"
+ }, {
+ intakeNum: "2222222"
+ }],
isRefreshing_all: false,
isRefreshing_common: false,
showConfirm: false,
waterIntakeName: "",
- choseItem: null
+ choseItem: null,
+ errorData: '', //閿欒鍐呭
+ showErrorDialog: false,
+ confirmBtn: {
+ content: '纭'
+ },
+ showForceConfirm: false,
+ forceIntakeId: "", //寮哄埗寮�闃�鐨勫彇姘村彛id
+ inputValue:""
},
// 鍒囨崲 Tabs
@@ -34,7 +47,9 @@
this.getallWaterPoints(query)
// 鍦ㄨ繖閲岃繘琛屾悳绱㈡搷浣滐紝鏇存柊 allWaterPoints 鏁版嵁
} else {
- this.getallWaterPoints(query)
+ this.setData({
+ allWaterPoints: []
+ })
}
},
@@ -43,9 +58,11 @@
* @param {} event
*/
choseCard(event) {
+ //鏄剧ず浜屾纭寮圭獥
this.setData({
showConfirm: true,
- choseItem: event.currentTarget.dataset.item
+ choseItem: event.currentTarget.dataset.item,
+ allWaterPoints: []
})
// console.log(intakeId);
// wx.navigateTo({
@@ -54,7 +71,16 @@
},
//寮�娉甸�氫俊
- postOpenValva(intakeId) {
+ /**
+ *
+ * @param {*} intakeId 鍙栨按鍙d
+ * @param {*} isforce 鏄惁寮哄埗寮�闃�
+ */
+ postOpenValva(intakeId, isforce) {
+ this.setData({
+ inputValue:""
+ })
+ console.log("intakeId:" + intakeId + " isforce:" + isforce)
wx.showLoading({
title: '姝ｅ湪寮�闃�璇风◢鍊�...', // 鍔犺浇鎻愮ず鏂囧瓧
mask: true // 鏄惁鏄剧ず閫忔槑钂欏眰锛岄槻姝㈣Е鎽哥┛閫忥紝榛樿涓� false
@@ -63,11 +89,13 @@
const data = {
intakeId: intakeId, //鍙栨按鍙D
// vcId: vcId, //铏氭嫙鍗D
- operator: app.globalData.sessionId //鎿嶄綔鍛�
+ operator: app.globalData.sessionId, //鎿嶄綔鍛�
+ forceOpen: !!isforce // 浣跨敤閫昏緫闈炴搷浣滅 !! 鏉ョ‘淇� isForce 鏄竷灏斿��
};
post({
url: "wx/valve/open_wx",
- data: data
+ data: data,
+ timeout: 180000
}).then(response => {
// 澶勭悊鎴愬姛鍝嶅簲
@@ -84,11 +112,15 @@
wx.hideLoading();
// 澶勭悊閿欒鍝嶅簲
console.error('璇锋眰澶辫触:', error);
- if (error.code === "1002") {
- wx.showToast({
- title: '寮�闃�澶辫触',
- icon: 'error',
- duration: 3000 // 鎻愮ず鐨勬寔缁椂闂达紝鍗曚綅姣
+ if (error.code === "10005") {
+ this.setData({
+ forceIntakeId: intakeId,
+ showForceConfirm: true
+ })
+ } else {
+ this.setData({
+ showErrorDialog: true,
+ errorData: error.msg
})
}
});
@@ -105,7 +137,6 @@
* 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍒濇娓叉煋瀹屾垚
*/
onReady() {
- this.getallWaterPoints();
this.getcommonWaterPoints();
},
@@ -147,11 +178,11 @@
},
/**
- * 鑾峰彇鎵�鏈夊彇姘村彛
+ *鍦ㄦ墍鏈夊彇姘村彛鎼滅储
*/
getallWaterPoints: function (intakeNum) {
let params = {
- url: 'project/intake/all_intakes'
+ url: 'wx/intake/all_intakes'
};
if (intakeNum) {
params.data = {
@@ -164,9 +195,17 @@
isRefreshing_all: false
});
if (data.success && data.code === "0001") {
- this.setData({
- allWaterPoints: data.content.obj
- });
+ if (!data.content) {
+ wx.showToast({
+ title: '娌℃湁鎼滅储鍒板彇姘村彛',
+ icon: 'error',
+ })
+ }else{
+ this.setData({
+ allWaterPoints:[data.content]
+ });
+ }
+
} else {
wx.showToast({
title: data.msg,
@@ -178,13 +217,18 @@
this.setData({
isRefreshing_all: false
});
+ wx.showToast({
+ title: error.msg,
+ icon: 'error',
+ duration: 3000 // 鎻愮ず鐨勬寔缁椂闂达紝鍗曚綅姣
+ })
console.error('Failed to add item:', error);
});
},
//鑾峰彇甯哥敤鍙栨按鍙�
getcommonWaterPoints() {
get({
- url: 'project/intake/used_intakes',
+ url: 'wx/intake/used_intakes',
data: {
operator: getApp().globalData.sessionId
}
@@ -209,7 +253,7 @@
isRefreshing_common: false
});
wx.showToast({
- title: error.code,
+ title: error.msg,
icon: 'error',
duration: 3000 // 鎻愮ず鐨勬寔缁椂闂达紝鍗曚綅姣
})
@@ -227,7 +271,7 @@
},
confirmDialog() {
this.setData({
- showConfirm:false
+ showConfirm: false
})
this.postOpenValva(this.data.choseItem.intakeId);
},
@@ -235,6 +279,25 @@
this.setData({
showConfirm: false
})
+ },
+ closeErrorDialog() {
+ this.setData({
+ showErrorDialog: false
+ })
+ },
+ cancelDialog() {
+ this.setData({
+ showForceConfirm: false
+ });
+ },
+ //寮哄埗寮�闃�
+ confirmForceDialog() {
+ this.postOpenValva(this.data.forceIntakeId, true);
+ },
+ closeSearch(){
+ this.setData({
+ allWaterPoints:[],
+ inputValue:""
+ })
}
-
})
\ No newline at end of file
--
Gitblit v1.8.0