新增充值的修改

pages/home/index.js

@@ -1,7 +1,6 @@
 import { getMeterDetail, getMeterList, getTenementMeterList } from "../../service/meter";
 import { getOwnTenementList } from "../../service/tenement";
-import { getUserInfo } from "../../service/user";
-import { alertError, alertInfo } from "../../utils/index";
+import { alertInfo } from "../../utils/index";
 import request from '../../utils/request';
 import { getDot } from "../../utils/system";
 const { OK } = request;
@@ -52,9 +51,10 @@ Page({
 
   },
   async changeMeter() {
-    const { meterList = [], meterIndex, tenement = {} } = this.data;
+    const { meterList = [] } = this.data;
+    const newColumns = meterList.map(item => { item.id = item.code; item.name = `${item.code} - ${item.address}`; return item; })
     this.setData({
-      columns: meterList.map(item => { item.id = item.code; item.name = `${item.code} - ${item.address}`; return item; }),
+      columns: newColumns,
       show: true,
       pickerType: "meter"
     })
@@ -66,36 +66,42 @@ Page({
   onOk(e) {
     const { type, index, value } = e.detail;
     const  currentPark = this.data.park;
-    if (type === "park") {
-      if (value.id === currentPark?.id) {
-        this.setData({ show: false })
-        return
-      }
-      this.setData({
-        show: false,
-        park: value,
-        tenement: value.tenements?.[0]
-      })
-    }
-    if (type === "tenement") {
-      const  currentTenement = this.data.tenement;
-      if (value.id === currentTenement?.id) {
-        this.setData({ show: false })
-        return
-      }
-      this.setData({
-        show: false,
-        tenement: value
-      })
-    }
-    if (type === "meter") {
-      const { code, id } = e.detail.value;
-      this.handleGetMeterDetail(code)
+    switch(type) {
+      case "park": 
+        // if (value.id === currentPark?.id) {
+        //   this.setData({ show: false })
+        //   return
+        // }
+        this.setData({
+          show: false,
+          park: value,
+          tenement: value.tenements?.[0]
+        })
+        break;
+      case "tenement": 
+        const  currentTenement = this.data.tenement;
+        // if (value.id === currentTenement?.id) {
+        //   this.setData({ show: false })
+        //   return
+        // }
+        this.setData({
+          show: false,
+          tenement: value
+        })
+        break;
+      case "meter":
+        const { code, id } = e.detail.value;
+        this.handleGetMeterDetail(code)
+        break;
     }
   },
   async handleGetMeterDetail(meterCode) {
     const { tenement } = this.data;
     const { code, message, data } = await getMeterDetail({ tenement, code: meterCode });
+    if (code !== OK) {
+      alertInfo(message);
+      return;
+    }
     this.setData({
       tenement: data,
       show: false,
@@ -122,6 +128,11 @@ Page({
       return
     }
   },
+  jumpToInvoice() {
+    wx.navigateTo({
+      url: '/pages/invoiceList/index',
+    })
+  },
   jumpToLogin() {
     wx.navigateTo({
       url: '/pages/login/index',
@@ -148,7 +159,7 @@ Page({
         return value; // 返回属性的当前值
       },
       set: function (newVal) {
-        const oldValue = value;
+        // const oldValue = value;
         value = newVal;
         that.getMeters(newVal);
       }
@@ -156,10 +167,10 @@ Page({
   },
   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 || [],
       meter: data?.[0] || {}
@@ -178,10 +189,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 = {}