From d18a0c9fe708dcf58253b54ef2938b5e864b24df Mon Sep 17 00:00:00 2001
From: zuoxiao <zuoxiao>
Date: 星期一, 28 四月 2025 14:39:30 +0800
Subject: [PATCH] 优化水摄入页面的确认弹窗逻辑，调整showConfirm状态的设置位置，并移除不必要的代码注释，提升代码可读性和维护性。

---
 pages/openCard/openCard.js |  124 ++++++++++++++++++++++++++--------------
 1 files changed, 80 insertions(+), 44 deletions(-)

diff --git a/pages/openCard/openCard.js b/pages/openCard/openCard.js
index 7115e73..9a85d8f 100644
--- a/pages/openCard/openCard.js
+++ b/pages/openCard/openCard.js
@@ -1,69 +1,79 @@
-// pages/openCard/openCard.js
+// 寮�鍗￠�夋嫨铏氭嫙鍗�
+const {
+  get,
+  post
+} = require('../../api/request.js');
 Page({
 
   /**
    * 椤甸潰鐨勫垵濮嬫暟鎹�
    */
   data: {
-    allCardPoints: [{
-        id: 511111111,
-        balance: '30',
-        state: 1
-      },
-      {
-        id: 411111111,
-        balance: '30',
-        state: 0
-      },
-      {
-        id: 31111111111,
-        balance: '30',
-        state: 1
-      },
-      {
-        id: 2,
-        balance: '30',
-        state: 1
-      },
-      {
-        id: 1,
-        balance: '30',
-        state: 1
-      },
-      {
-        id: 0,
-        balance: '30',
-        state: 1
-      },
-    ] // 甯哥敤鍙栨按鍙ｆ暟鎹�
+    intakeId: 0,
+
+    allCardPoints: [] // 鎵�鏈夎櫄鎷熷崱
   },
   openValva(event) {
     const {
       item
     } = event.currentTarget.dataset; // 鑾峰彇褰撳墠鐐瑰嚮鐨� item
-    if (item.state === 1) {
+    if (item.inUse === 0) {
       // 鍦ㄩ〉闈㈠姞杞芥椂鏄剧ず鍔犺浇鍔ㄧ敾
       wx.showLoading({
-        title: '姝ｅ湪寮�娉佃绋嶅悗...', // 鍔犺浇鎻愮ず鏂囧瓧
+        title: '姝ｅ湪寮�娉佃绋嶅��...', // 鍔犺浇鎻愮ず鏂囧瓧
         mask: true // 鏄惁鏄剧ず閫忔槑钂欏眰锛岄槻姝㈣Е鎽哥┛閫忥紝榛樿涓� false
       });
-      // 妯℃嫙鍔犺浇鏁版嵁
-      setTimeout(() => {
-        // 鍔犺浇瀹屾垚鍚庨殣钘忓姞杞藉姩鐢�
-        wx.hideLoading();
-        //瀹屾垚鍚庡洖鍒伴椤�
-        wx.reLaunch({
-          url: '/pages/home/home?param=true' // 棣栭〉鐨勮矾寰勶紝鏍规嵁瀹為檯鎯呭喌濉啓
-        });
-      }, 2000); // 寤舵椂 2 绉掓ā鎷熷姞杞芥暟鎹�
+      this.postOpenValva(item.vcId);
     }
+  },
+  //寮�娉甸�氫俊
+  postOpenValva(vcId) {
+    const app = getApp();
+    const data = {
+      intakeId: this.data.intakeId, //鍙栨按鍙D
+      vcId: vcId, //铏氭嫙鍗D
+      operator: app.globalData.operator //鎿嶄綔鍛�
+    };
+    post({
+      url: "8087/wx/valve/open_wx",
+      data: data
+    }).then(response => {
 
+      // 澶勭悊鎴愬姛鍝嶅簲
+      console.log('璇锋眰鎴愬姛:', response);
+      // 鍔犺浇瀹屾垚鍚庨殣钘忓姞杞藉姩鐢�
+      wx.hideLoading();
+      //瀹屾垚鍚庡洖鍒伴椤�
+      wx.reLaunch({
+        url: '/pages/home/home?param=true' // 棣栭〉鐨勮矾寰勶紝鏍规嵁瀹為檯鎯呭喌濉啓
+      });
+
+    }).catch(error => {
+      // 鍔犺浇瀹屾垚鍚庨殣钘忓姞杞藉姩鐢�
+      wx.hideLoading();
+      // 澶勭悊閿欒鍝嶅簲
+      console.error('璇锋眰澶辫触:', error);
+      if (error.code === "1002") {
+        wx.showToast({
+          title: '寮�娉靛け璐�',
+          icon: 'error',
+          duration: 3000 // 鎻愮ず鐨勬寔缁椂闂达紝鍗曚綅姣
+        })
+      }
+    });
   },
   /**
    * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍔犺浇
    */
   onLoad(options) {
-
+    const {
+      intakeId
+    } = options;
+    this.setData({
+      intakeId
+    })
+    console.log('intakeId:' + this.data.intakeId);
+    this.getCardList();
   },
 
   /**
@@ -113,5 +123,31 @@
    */
   onShareAppMessage() {
 
+  },
+  //鑾峰彇铏氭嫙鍗″垪琛�
+  getCardList() {
+    get({
+        url: '8084/sell/virtual_card/get',
+        data: {
+          clientId: getApp().globalData.sessionId
+        }
+      })
+      .then((data) => {
+        if (data.success && data.code === "0001") {
+          this.setData({
+            allCardPoints: data.content
+          });
+        } else {
+          wx.showToast({
+            title: data.msg,
+          })
+        }
+        console.log('Failed to add item:');
+      })
+      .catch((error) => {
+
+
+        console.error('Failed to add item:', error);
+      });
   }
 })
\ No newline at end of file

--
Gitblit v1.8.0