From 19804e37592d2250c551fcf5df1d87cdf551f1d1 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 |   79 ++++++++++++++++++++++++++++++++-------
 1 files changed, 64 insertions(+), 15 deletions(-)

diff --git a/pages/waterIntake/waterIntake.js b/pages/waterIntake/waterIntake.js
index 68f5a3c..de10bb5 100644
--- a/pages/waterIntake/waterIntake.js
+++ b/pages/waterIntake/waterIntake.js
@@ -9,6 +9,11 @@
     searchQuery: "",
     commonWaterPoints: [], // 甯哥敤鍙栨按鍙ｆ暟鎹�
     allWaterPoints: [], // 鎵�鏈夊彇姘村彛鏁版嵁
+    searchData: [{
+      intakeNum: "1111111"
+    }, {
+      intakeNum: "2222222"
+    }],
     isRefreshing_all: false,
     isRefreshing_common: false,
     showConfirm: false,
@@ -19,6 +24,9 @@
     confirmBtn: {
       content: '纭'
     },
+    showForceConfirm: false,
+    forceIntakeId: "", //寮哄埗寮�闃�鐨勫彇姘村彛id
+    inputValue:""
   },
 
   // 鍒囨崲 Tabs
@@ -39,7 +47,9 @@
       this.getallWaterPoints(query)
       // 鍦ㄨ繖閲岃繘琛屾悳绱㈡搷浣滐紝鏇存柊 allWaterPoints 鏁版嵁
     } else {
-      this.getallWaterPoints(query)
+      this.setData({
+        allWaterPoints: []
+      })
     }
   },
 
@@ -48,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({
@@ -59,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
@@ -68,7 +89,8 @@
     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",
@@ -90,12 +112,17 @@
       wx.hideLoading();
       // 澶勭悊閿欒鍝嶅簲
       console.error('璇锋眰澶辫触:', error);
-
-      this.setData({
-        showErrorDialog: true,
-        errorData: error.msg
-      })
-
+      if (error.code === "10005") {
+        this.setData({
+          forceIntakeId: intakeId,
+          showForceConfirm: true
+        })
+      } else {
+        this.setData({
+          showErrorDialog: true,
+          errorData: error.msg
+        })
+      }
     });
   },
 
@@ -110,7 +137,6 @@
    * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍒濇娓叉煋瀹屾垚
    */
   onReady() {
-    this.getallWaterPoints();
     this.getcommonWaterPoints();
   },
 
@@ -152,7 +178,7 @@
 
   },
   /**
-   * 鑾峰彇鎵�鏈夊彇姘村彛
+   *鍦ㄦ墍鏈夊彇姘村彛鎼滅储
    */
   getallWaterPoints: function (intakeNum) {
     let params = {
@@ -169,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,
@@ -250,5 +284,20 @@
     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