From 6d76a7f979cee2b7897300370f7d58d11350a791 Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期一, 04 十一月 2024 09:38:18 +0800
Subject: [PATCH] 1.优化开关阀提示信息。2.实体卡消费记录添加clientId参数

---
 pages/waterIntake/waterIntake.js |   21 +++++++--------------
 1 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/pages/waterIntake/waterIntake.js b/pages/waterIntake/waterIntake.js
index 912fe64..7824332 100644
--- a/pages/waterIntake/waterIntake.js
+++ b/pages/waterIntake/waterIntake.js
@@ -54,21 +54,15 @@
   },
 
   /**
-   * 閫夋嫨铏氭嫙鍗�
+   * 璺宠浆鍒伴�夋嫨铏氭嫙鍗$晫闈�
    * @param {} event 
    */
   choseCard(event) {
-    //鏄剧ず浜屾纭寮圭獥
     this.setData({
-      showConfirm: true,
       choseItem: event.currentTarget.dataset.item,
       allWaterPoints: []
     })
-    //  console.log(intakeId);
-    //   wx.navigateTo({
-    //     url: '/pages/openCard/openCard?intakeId='+intakeId,
-    //   })
-
+    this.toOpenCard();
   },
   //寮�娉甸�氫俊
   /**
@@ -230,7 +224,7 @@
     get({
         url: 'wx/intake/used_intakes',
         data: {
-          operator: getApp().globalData.sessionId
+          operatorId: getApp().globalData.sessionId
         }
       })
       .then((data) => {
@@ -270,10 +264,9 @@
     this.getcommonWaterPoints();
   },
   confirmDialog() {
-    // this.setData({
-    //   showConfirm: false
-    // })
-    // this.postOpenValva(this.data.choseItem.intakeId);
+    this.setData({
+      showConfirm: false
+    })
     this.toOpenCard();
   },
   closeDialog() {
@@ -303,7 +296,7 @@
   },
   toOpenCard(){
     wx.navigateTo({
-      url: '/pages/openCard/openCard',
+      url: '/pages/openCard/openCard?intakeId='+this.data.choseItem.intakeId,
     })
   }
 })
\ No newline at end of file

--
Gitblit v1.8.0