修改首页选择园区，，商户，，电表

pages/home/index.js

@@ -3,6 +3,7 @@ import { getOwnTenementList } from "../../service/tenement";
 import { getUserInfo } from "../../service/user";
 import { alertError, alertInfo } from "../../utils/index";
 import request from '../../utils/request';
+import { getDot } from "../../utils/system";
 const { OK } = request;
 // pages/home/index.js
 Page({
@@ -52,30 +53,15 @@ Page({
   },
   async changeMeter() {
     const { meterList = [], meterIndex, tenement = {} } = this.data;
-    let newIndex = meterIndex + 1;
-    if (newIndex === meterList.length) {
-      newIndex = 0;
-    }
-    const { code, message, data } = getMeterDetail({ code: meterList[newIndex]?.code, tenement: tenement.id })
-    if (code !== OK) {
-      alertInfo(message)
-      return
-    }
-    meterList[newIndex] = { ...data.meter, money: data.money };
     this.setData({
-      meterIndex: newIndex,
-      meterList
+      columns: meterList.map(item => { item.id = item.code; item.name = `${item.code} - ${item.address}`; return item; }),
+      show: true,
+      pickerType: "meter"
     })
   },
   async refreshMeter() {
-    const { meterIndex } = this.data;
-    const { code, message, data } = getMeterDetail({ code: meterList[newIndex].id, tenement: tenement.id })
-    if (code !== OK) {
-      alertInfo(message)
-      return
-    }
-    meterList[meterIndex] = { ...data.meter, money: data.money };
-    this.setData({ meterList })
+    const { meter } = this.data;
+    this.handleGetMeterDetail(meter.code);
   },
   onOk(e) {
     const { type, index, value } = e.detail;
@@ -102,6 +88,18 @@ Page({
         tenement: value
       })
     }
+    if (type === "meter") {
+      const { code, id } = e.detail.value;
+      this.handleGetMeterDetail(code)
+    }
+  },
+  async handleGetMeterDetail(meterCode) {
+    const { tenement } = this.data;
+    const { code, message, data } = await getMeterDetail({ tenement, code: meterCode });
+    this.setData({
+      tenement: data,
+      show: false,
+    })
   },
   onCancel() {
     this.setData({
@@ -115,7 +113,7 @@ Page({
     })
   },
   onChangeMoney(e) {
-    this.setData({ money: Number(e.detail) })
+    this.setData({ money: e.detail ? Number(e.detail) : e.detail })
   },
   recharge() {
     const { user, money } = this.data;
@@ -136,6 +134,7 @@ Page({
     this.setUser();
     this.getAllList();
     this.watchTenement();
+    getDot();
   },
   watchTenement() {
     const that = this;
@@ -151,18 +150,19 @@ Page({
       set: function (newVal) {
         const oldValue = value;
         value = newVal;
-        // that.getMeters(newVal);
+        that.getMeters(newVal);
       }
     });
   },
   async getMeters({ id }) {
     const { code, message, data } = await getTenementMeterList(id);
-    if (code !== OK) {
-      alertError(message)
-      return;
-    }
+    // if (code !== OK) {
+    //   alertError(message)
+    //   return;
+    // }
     this.setData({
-      meterList: data || []
+      meterList: data || [],
+      meter: data?.[0] || {}
     })
   },
   async setUser() {
@@ -178,10 +178,10 @@ Page({
   },
   async getAllList() {
     const { code, message, data } = await getOwnTenementList()
-    if (code !== OK) {
-      alertInfo(message)
-      return
-    }
+    // if (code !== OK) {
+    //   alertInfo(message)
+    //   return
+    // }
     const [firstPark = {}] = data;
     const { park, tenement } = this.data;
     const updateDatas = {}

pages/home/index.wxml

@@ -32,9 +32,10 @@
   <view class="card">
     <view class="cardTop">
       <view class="cardTopLeft">
-        <view> 华昌宝能 - 软c307 </view>
+        <view wx:if="{{user.id}}"> 华昌宝能 - 软c307 </view>
+        <view wx:else> -- </view>
       </view>
-      <van-button type="info" size="small" plain="{{true}}" class="loginBtn" bind:click="changeMeter">
+      <van-button type="info" size="small" plain="{{true}}" class="loginBtn" bind:click="changeMeter" wx:if="{{user.id}}">
         <van-icon name="exchange" />
         切换电表
       </van-button>
@@ -42,17 +43,20 @@
     <view class="cardContent">
       <view class="cardItem">
         <view class="cardItemLabel"> 电表编号： </view>
-        <view class="cardItemValue"> 15151515 </view>
+        <view class="cardItemValue" wx:if="{{user.id}}"> {{meter.code}} </view>
+        <view class="cardItemValue" wx:else> -- </view>
       </view>
       <view class="cardItem">
         <view class="cardItemLabel"> 电表地址： </view>
-        <view class="cardItemValue"> 软C307 </view>
+        <view class="cardItemValue" wx:if="{{user.id}}"> {{meter.address}} </view>
+        <view class="cardItemValue" wx:else> -- </view>
       </view>
       <view class="cardItem">
         <view class="cardItemLabel"> 电表余额： </view>
         <view class="cardItemValue">
-          <view class="text"> 200 </view>
-          <van-button type="info" size="small" plain="{{true}}" bind:click="refreshMeter">
+          <view class="text"  wx:if="{{user.id}}"> {{meter.money}} </view>
+          <view class="text"  wx:else> --- </view>
+          <van-button type="info" size="small" plain="{{true}}" bind:click="refreshMeter"  wx:if="{{user.id}}">
             <van-icon name="replay" />
             刷新
           </van-button>
@@ -80,7 +84,7 @@
     </view>
   </view>
   <view class="operate">
-    <van-button color="rgb(88, 165, 141)" block>去缴费</van-button>
+    <van-button color="rgb(88, 165, 141)" block bind:click="recharge">去缴费</van-button>
   </view>
   <view class="others">
     <van-grid direction="horizontal" column-num="2">