修改二维码

pages/home/index.js

@@ -80,6 +80,7 @@ Page({
           tenement: value.tenements?.[0]
         })
         wx.setStorageSync('park', park)
+        wx.setStorageSync('tenement', value.tenements?.[0])
         break;
       case "tenement": 
         // const  currentTenement = this.data.tenement;
@@ -87,6 +88,8 @@ Page({
         //   this.setData({ show: false })
         //   return
         // }
+        wx.setStorageSync('tenement', value)
+        // wx.setStorageSync('meter', null)
         this.setData({
           show: false,
           tenement: value
@@ -206,9 +209,12 @@ Page({
       },
       set: function (newVal) {
         // const oldValue = value;
-        value = newVal;
         wx.setStorageSync('tenement', newVal)
-        that.getMeters(newVal);
+        if (value !== newVal) {
+          that.getMeters(newVal);
+          that.setUser();
+        }
+        value = newVal;
       }
     });
   },
@@ -230,16 +236,38 @@ Page({
       }
     });
   },
+  watchMeter() {
+    const that = this;
+    let value = this.data.meter; // 获取被监听属性的当前值
+ 
+    // 使用 Object.defineProperty 方法在数据对象上定义属性的 getter 和 setter
+    Object.defineProperty(this.data, 'meter', {
+      configurable: true, // 可配置
+      enumerable: true, // 可枚举
+      get: function () {
+        return value; // 返回属性的当前值
+      },
+      set: function (newVal) {
+        // const oldValue = value;
+        value = newVal;
+        wx.setStorageSync('meter', newVal)
+      }
+    });
+  },
   async getMeters({ id }) {
     const { code, message, data } = await getTenementMeterList(id);
     if (code !== OK) {
       alertInfo(message)
       return;
     }
+    const storageMeter = wx.getStorageSync('meter');
     this.setData({
       meterList: data || [],
-      meter: data?.[0] || {}
+      meter: storageMeter || (data?.[0] || {})
     })
+    if (!storageMeter) {
+      wx.setStorageSync('meter', data?.[0])
+    }
   },
   async setUser() {
     const result = await getUserInfo();
@@ -264,13 +292,15 @@ Page({
     const { park, tenement } = this.data;
     const updateDatas = {}
     if (!park || !park.id) {
-      updateDatas.park = firstPark
+      const storagePark = wx.getStorageSync('park')
+      updateDatas.park = storagePark || firstPark
     }
     if (!tenement || !tenement.id) {
+      const storageTenement = wx.getStorageSync('tenement')
       if (!park || !park.id) {
-        updateDatas.tenement = firstPark.tenements?.[0]
+        updateDatas.tenement = storageTenement || firstPark.tenements?.[0]
       } else {
-        updateDatas.tenement = park.tenements?.[0];
+        updateDatas.tenement = storageTenement || park.tenements?.[0];
       }
     }
     updateDatas.all = data;

pages/invoiceDetail/index.wxml

@@ -52,4 +52,6 @@
 <navigator title="发票详细" canBack="{{true}}" bind:back="back" />
 <view class="wrapper">
   <view> 尊敬的客户，您好 </view>
+  <view> 已经为您开具订单2222222222的发票，发票数量共计1张，如下： </view>
+  <view> 发票裂隙：数电发票（电子发票），发票号码：54645654656556，您可以点击“发票下载”获取该发票文件 </view>
 </view>

pages/invoiceList/components/already/index.wxml

@@ -17,10 +17,10 @@
   <view class="right">
     <view class="money"> ￥3026 </view>
     <view class="operate">
-      <view>
+      <view style="margin-top: 20rpx; margin-bottom: 20rpx;">
-        <van-button type="info" class="save" bind:click="submit" size="small">发票</van-button>
+        <van-button type="info" class="invoiceBtn" bind:click="submit" size="small">发票</van-button>
       </view>
-      <van-button type="info" class="save" bind:click="submit" size="small">明细</van-button>
+      <van-button type="info" class="detailBtn" bind:click="submit" size="small">明细</van-button>
     </view>
   </view>
 </view>

pages/invoiceList/components/already/index.wxss

@@ -18,3 +18,16 @@
 .right {
 
 }
+.detailBtn {
+  margin-top: 20rpx;
+}
+
+.title {
+  font-size: 34rpx;
+  font-weight: 600;
+}
+
+.invoiceContent, .invoiceType, .time {
+  margin-top: 30rpx;
+  font-size: 32rpx;
+}

pages/qrCode/index.js

@@ -11,16 +11,19 @@ Page({
    * 页面的初始数据
    */
   data: {
-    list: [],
+    // list: [],
-    urls: [],
+    // urls: [],
-    indexs: [],
+    // indexs: [],
+    url: "",
+    tenement: wx.getStorageSync('tenement')
   },
 
   /**
    * 生命周期函数--监听页面加载
    */
   onLoad(options) {
-    this.getList()
+    // this.getList()
+    this.getCode()
   },
   async getList() {
     const { code, message, data } = await getOwnTenementList()
@@ -38,20 +41,24 @@ Page({
     })
   },
   async getCode(e, that) {
-    const { index, id } = e.currentTarget.dataset;
+    // const { index, id } = e.currentTarget.dataset;
-    const { code, message, data } = await getWxCode(id)
+    const tenement = this.data.tenement;
+    const { code, message, data } = await getWxCode(tenement.id)
     if (code !== OK) {
       alertInfo(message)
       return;
     }
-    const newUrls = that.data.urls;
+    this.setData({
-    newUrls[index] = data;
+      url: data
-    const newIndexs = that.data.indexs;
-    newIndexs[index] = true;
-    that.setData({
-      urls: newUrls,
-      indexs: newIndexs,
     })
+    // const newUrls = that.data.urls;
+    // newUrls[index] = data;
+    // const newIndexs = that.data.indexs;
+    // newIndexs[index] = true;
+    // that.setData({
+    //   urls: newUrls,
+    //   indexs: newIndexs,
+    // })
   },
   look(e) {
     const that = this;

pages/qrCode/index.wxml

@@ -1,12 +1,18 @@
 <!--pages/qrCode/index.wxml-->
-<view class="wrapper">
+<!-- <view class="wrapper">
   <view class="item" wx:for="{{list}}" wx:key="index">
     <view class="tenement" >
       <view class="name">{{item.name}}</view>
       <view class="primaryTextBtn" data-index="{{index}}" data-id="{{item.id}}" bind:tap="look"> 查看二维码 </view>
     </view>
-    <view class="image" wx:if="{{indexs[index] == true}}">
+   
-      <van-image width="400rpx" height="400rpx" src="{{urls[index]}}"  />
-    </view>
   </view>
+</view> -->
+
+<view class="wrapper">
+  <view class="image">
+    <van-image width="400rpx" height="400rpx" src="{{url}}"  />
+  </view>
+  <view style="padding-bottom: 100rpx;margin-left: 40rpx;margin-right: 40rpx;"> 扫描该二维码可进入{{tenement.name}} </view>
 </view>
+

pages/qrCode/index.wxss

@@ -1,12 +1,11 @@
 /* pages/qrCode/index.wxss */
 .wrapper {
-  /* width: 100vw;
+  width: 100vw;
   height: 100vh;
   display: flex;
   justify-content: center;
   align-items: center;
-  flex-direction: column; */
+  flex-direction: column;
-  /* margin-top: 20rpx; */
   margin-left: 32rpx;
   margin-right: 32rpx;
 }