From a84175b5e189ac6da0d80ac64f77a4b45e7c9157 Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期四, 14 十一月 2024 13:48:34 +0800
Subject: [PATCH] 1.添加瞬时流量相关2.优化界面3.修改原开阀和未关阀列表的sessionId为clientId

---
 pages/home/home.js |   63 +++++++++++++++++++++----------
 1 files changed, 43 insertions(+), 20 deletions(-)

diff --git a/pages/home/home.js b/pages/home/home.js
index 54d9a2c..cd54a3f 100644
--- a/pages/home/home.js
+++ b/pages/home/home.js
@@ -114,12 +114,12 @@
           isLogin: true
         })
         if (app.globalData.sessionId) {
-          this.getOpenList();
           this.getUserDataBySession();
         }
       }).catch((err) => {});
       storage.getItem('clientId').then((data) => {
         app.globalData.clientId = data;
+        this.getOpenList();
       }).catch((err) => {});
     } else {
       //鏈湴娌℃湁缂撳瓨寰俊鐧诲綍
@@ -128,7 +128,7 @@
     if (this.data.options.param === "1") {
       this.setData({
         showTipDialog: true,
-        tipData: "寮�闃�鍛戒护涓嬪彂鎴愬姛锛岀害20-60绉掑悗鍙埛鏂板揩閫熷叧闃�鍒楄〃鏌ョ湅鎵ц缁撴灉銆�"
+        tipData: "寮�闃�鍛戒护涓嬪彂鎴愬姛锛屽洜寮�闃�闇�瑕佹椂闂达紝绾�20-60绉掑悗鍙埛鏂板揩閫熷叧闃�鍒楄〃鏌ョ湅鎵ц缁撴灉銆�"
       })
       setTimeout(() => {
         this.getOpenList();
@@ -143,19 +143,22 @@
     }
   },
   wxLogin() {
-    const that = this;
-    wx.login({
-      success: function (res) {
-        if (res.code) {
-          var code = res.code;
-          console.log(code);
-          // 灏哻ode鍙戦�佸埌鏈嶅姟鍣ㄨ幏鍙杘penid
-          that.codeLogin(code);
-        } else {
-          console.log('鐧诲綍澶辫触锛�' + res.errMsg);
+    // if (!this.data.isLogin) {
+      const that = this;
+      wx.login({
+        success: function (res) {
+          if (res.code) {
+            var code = res.code;
+            console.log(code);
+            // 灏哻ode鍙戦�佸埌鏈嶅姟鍣ㄨ幏鍙杘penid
+            that.codeLogin(code);
+          } else {
+            console.log('鐧诲綍澶辫触锛�' + res.errMsg);
+          }
         }
-      }
-    });
+      });
+    // }
+
   },
   //寰俊code鐧诲綍
   codeLogin(codeData) {
@@ -278,7 +281,7 @@
       showForceConfirm: false,
       showConfirm: false,
       showTipDialog: false,
-      showUnBind:false
+      showUnBind: false
     });
   },
   /**
@@ -349,7 +352,7 @@
       const params = {
         url: 'wx/valve/get',
         data: {
-          operator: app.globalData.sessionId
+          operator: app.globalData.clientId
         }
       };
       get(params).then(data => {
@@ -564,9 +567,6 @@
       title: '姝ｅ湪寮哄埗鍒犻櫎璇风◢鍊�...', // 鍔犺浇鎻愮ず鏂囧瓧
       mask: true // 鏄惁鏄剧ず閫忔槑钂欏眰锛岄槻姝㈣Е鎽哥┛閫忥紝榛樿涓� false
     });
-    that.setData({
-      lastIntakeName: intakeName
-    })
     const data = {
       vcNum: item.vcNum, //鍙栨按鍙D
       rtuAddr: item.rtuAddr, //闃�鎺у櫒鍦板潃
@@ -598,9 +598,22 @@
       } else {
         displayText = "鍏抽榾"
       }
+      let deleteText = "鍒犻櫎"
+      let time;
+      if (!item.dt) {
+        time = "鏆傛棤"
+      } else {
+        time = this.extractTime(item.dt)
+      }
+      if (item.waterInstant===null) {
+        item.waterInstant = "鏆傛棤"
+      }
+
       return {
         ...item,
-        displayText
+        displayText,
+        deleteText,
+        time
       }; // 淇濈暀鎵�鏈夊叾浠栧瓧娈碉紝骞舵坊鍔� displayText 瀛楁
     });
     // 鏇存柊鍒楄〃鏁版嵁
@@ -674,5 +687,15 @@
     this.setData({
       showInfoDialog: false
     })
+  },
+  //澶勭悊鏃堕棿鍘绘帀骞存湀鏃�
+  extractTime(datetimeString) {
+    const formattedDate = datetimeString.replace(" ", "T");
+    const date = new Date(formattedDate);
+    // 鑾峰彇灏忔椂銆佸垎閽熷拰绉�
+    const hours = date.getHours().toString().padStart(2, '0');
+    const minutes = date.getMinutes().toString().padStart(2, '0');
+    const seconds = date.getSeconds().toString().padStart(2, '0');
+    return `${hours}:${minutes}:${seconds}`;
   }
 })
\ No newline at end of file

--
Gitblit v1.8.0