From 7123295bac789011a9dad11938997721149a35ce Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期四, 30 五月 2024 15:36:59 +0800
Subject: [PATCH] 开泵相关界面优化和充值界面

---
 pages/openCard/openCard.js |   64 ++++++++++++++------------------
 1 files changed, 28 insertions(+), 36 deletions(-)

diff --git a/pages/openCard/openCard.js b/pages/openCard/openCard.js
index 2a1fdcb..0942e8c 100644
--- a/pages/openCard/openCard.js
+++ b/pages/openCard/openCard.js
@@ -11,57 +11,27 @@
   data: {
     intakeId: 0,
 
-    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
-      },
-    ] // 甯哥敤鍙栨按鍙ｆ暟鎹�
+    allCardPoints: [] // 鎵�鏈夎櫄鎷熷崱
   },
   openValva(event) {
     const {
       item
     } = event.currentTarget.dataset; // 鑾峰彇褰撳墠鐐瑰嚮鐨� item
-    if (item.state === 1) {
+    if (item.inUse === 0) {
       // 鍦ㄩ〉闈㈠姞杞芥椂鏄剧ず鍔犺浇鍔ㄧ敾
       wx.showLoading({
         title: '姝ｅ湪寮�娉佃绋嶅悗...', // 鍔犺浇鎻愮ず鏂囧瓧
         mask: true // 鏄惁鏄剧ず閫忔槑钂欏眰锛岄槻姝㈣Е鎽哥┛閫忥紝榛樿涓� false
       });
-      this.postOpenValva();
+      this.postOpenValva(item.vcId);
     }
   },
   //寮�娉甸�氫俊
-  postOpenValva() {
+  postOpenValva(vcId) {
     const app = getApp();
     const data = {
       intakeId: this.data.intakeId, //鍙栨按鍙D
-      vcId: '2023122618460900006', //铏氭嫙鍗D
+      vcId: vcId, //铏氭嫙鍗D
       userType: 2, //鐢ㄦ埛绫诲瀷1-骞冲彴锛�2-App
       operator: app.globalData.sessionId //鎿嶄綔鍛�
     };
@@ -69,7 +39,7 @@
       url: "comRes/receive",
       data: data
     }).then(response => {
-   
+    
       // 澶勭悊鎴愬姛鍝嶅簲
       console.log('璇锋眰鎴愬姛:', response);
       // 鍔犺浇瀹屾垚鍚庨殣钘忓姞杞藉姩鐢�
@@ -97,6 +67,7 @@
       intakeId
     })
     console.log('intakeId:' + this.data.intakeId);
+    this. getCardList();
   },
 
   /**
@@ -146,5 +117,26 @@
    */
   onShareAppMessage() {
 
+  },
+  //鑾峰彇铏氭嫙鍗″垪琛�
+  getCardList(){
+    get({url:'https://d4x9787456.vicp.fun/sell/virtual_card/get', data: {
+      operator: 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