From 404ebee9f47d2d80353e64974193e3e31e7b91b6 Mon Sep 17 00:00:00 2001
From: Liuyi <candymxq888@outlook.com>
Date: 星期二, 08 十月 2024 17:38:57 +0800
Subject: [PATCH] 添加设备列表,添加待配送订单

---
 unpackage/dist/dev/mp-weixin/pages/index/index.js |   54 ++++++++++++++++++++++++++++++++++--------------------
 1 files changed, 34 insertions(+), 20 deletions(-)

diff --git a/unpackage/dist/dev/mp-weixin/pages/index/index.js b/unpackage/dist/dev/mp-weixin/pages/index/index.js
index ab50f11..0cbe4a4 100644
--- a/unpackage/dist/dev/mp-weixin/pages/index/index.js
+++ b/unpackage/dist/dev/mp-weixin/pages/index/index.js
@@ -20,14 +20,15 @@
       userPhone: ""
     });
     const isVip = common_vendor.ref(false);
-    async function getVipInfo() {
+    async function getInfo() {
       let res = await api_index.getUserInfo();
+      console.log("res", res.data);
       cardInfo.value.userName = res.data.userInfo.userName;
       cardInfo.value.headImg = res.data.userInfo.headImg;
       cardInfo.value.userPhone = res.data.userInfo.userPhone;
       if (res.data.userInfo.waterCardNumber) {
         let res1 = await api_index.getVipInfoApi();
-        cardInfo.value.waterCardNumber = res1.data.userInfo.waterCardNumber;
+        cardInfo.value.waterCardNumber = res1.data.cardNumber;
         if (res1.data.cardType == 1) {
           cardInfo.value.balance = res1.data.balance;
         } else if (res1.data.cardType == 2) {
@@ -37,10 +38,18 @@
       } else {
         isVip.value = false;
       }
+      common_vendor.index.setStorageSync("userInfo", JSON.stringify(cardInfo.value));
     }
     function toScan() {
-      common_vendor.index.navigateTo({
-        url: "/pages/scanWater/index"
+      common_vendor.index.scanCode({
+        scanType: ["qrCode"],
+        success: function(res) {
+          console.log("条码类型:" + res.scanType);
+          console.log("条码内容:" + res.result);
+          common_vendor.index.navigateTo({
+            url: "/pages/scanWater/index"
+          });
+        }
       });
     }
     const functionList = common_vendor.ref([
@@ -62,26 +71,31 @@
     }
     common_vendor.onMounted(async () => {
       getTopHeight();
-      await getVipInfo();
     });
     common_vendor.onShow(async () => {
-      await getVipInfo();
+      await getInfo();
     });
     return (_ctx, _cache) => {
       return {
         a: common_assets._imports_0$1,
         b: common_vendor.t(cardInfo.value.userName),
         c: common_assets._imports_1,
-        d: common_assets._imports_2,
-        e: common_vendor.t(cardInfo.value.waterCardNumber),
-        f: common_vendor.o(($event) => navTo("/pages/userInfo/index")),
-        g: topHeight.value + "rpx",
+        d: common_vendor.o(($event) => navTo("/pages/userInfo/index")),
+        e: common_assets._imports_2,
+        f: common_vendor.t(cardInfo.value.waterCardNumber),
+        g: common_vendor.t(cardInfo.value.userPhone),
         h: common_assets._imports_3,
-        i: common_vendor.o(($event) => navTo("/pages/sendWater/index")),
-        j: common_vendor.o(($event) => navTo("/pages/recharge/index")),
-        k: common_assets._imports_4,
-        l: common_vendor.o(($event) => toScan()),
-        m: common_vendor.f(functionList.value, (item, index, i0) => {
+        i: common_vendor.o(($event) => navTo("/pages/addCard/index")),
+        j: common_vendor.t(cardInfo.value.balance),
+        k: common_vendor.o(($event) => navTo("/pages/recharge/index")),
+        l: topHeight.value + "rpx",
+        m: common_assets._imports_4,
+        n: common_vendor.o(($event) => navTo("/pages/sendWater/index")),
+        o: common_assets._imports_1$1,
+        p: common_vendor.o(($event) => navTo("/pages/deviceList/index")),
+        q: common_assets._imports_6,
+        r: common_vendor.o(($event) => toScan()),
+        s: common_vendor.f(functionList.value, (item, index, i0) => {
           return {
             a: item.icon,
             b: common_vendor.t(item.text),
@@ -89,11 +103,11 @@
             d: index
           };
         }),
-        n: common_assets._imports_5,
-        o: common_assets._imports_6,
-        p: common_assets._imports_7,
-        q: common_assets._imports_8,
-        r: common_assets._imports_7
+        t: common_assets._imports_7,
+        v: common_assets._imports_8,
+        w: common_assets._imports_9,
+        x: common_assets._imports_10,
+        y: common_assets._imports_9
       };
     };
   }

--
Gitblit v1.9.3