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

pages/rechargeRecord/index.js

@@ -1,7 +1,8 @@
 import { getRechargeList } from "../../service/recharge";
 import { getOwnTenementList } from "../../service/tenement";
 import { getYears } from "../../utils/index";
-
+import request from "../../utils/request";
+const { OK } = request;
 // pages/rechargeRecord/index.js
 Page({
 
@@ -20,7 +21,8 @@ Page({
     show: false,
     columns: [],
     type: "",
-    title: ""
+    title: "",
+    amount: 0,
   },
   clickYear() {
     this.setData({
@@ -30,13 +32,24 @@ Page({
       title: "年份"
     })
   },
+  clickTenement() {
+    this.setData({
+      type: "tenement",
+      columns: this.data.tenements,
+      show: true,
+      title: "商户"
+    })
+  },
   onOk(e) {
-    console.log('e', e)
     const { type, value = {} } = e.detail;
     if (type === "year") {
       this.onChangeYear(value.id)
       return;
     }
+    if (type === "tenement") {
+      this.onChangeTenement(value.id)
+      return;
+    }
   },
   /**
    * 生命周期函数--监听页面加载
@@ -62,19 +75,32 @@ Page({
     })
     this.init(currentYear, tenement)
   },
+  onChangeTenement(e) {
+    const { year } = this.data;
+    // const currentYear = years[Number(e)]
+    this.setData({
+      // year: currentYear,
+      tenement: e, 
+      type: "",
+      show: false,
+      title: ""
+    })
+    this.init(year, e)
+  },
   /**
    * 生命周期函数--监听页面显示
    */
   onShow() {
     const { year, tenement } = this.data;
-    this.init(year, tenement)
+    this.init(year, tenement);
+    this.getTenementsList();
   },
   async getTenementsList() {
     const { code, message, data } = await getOwnTenementList()
-    if (code !== OK) {
-      alertInfo(message)
-      return
-    }
+    // if (code !== OK) {
+    //   alertInfo(message)
+    //   return
+    // }
     let tenements = [];
     data.forEach(item => {
       if (item.tenements) {
@@ -84,9 +110,17 @@ Page({
     this.setData({ tenements })
   },
   async init(year, tenement) {
-    const { code, message, data } = await getRechargeList(year, tenement);
+    const { code, message, data = [], amount = 0 } = await getRechargeList(year, tenement);
     this.setData({
-      list: [...data, ...data]
+      list: data,
+      amount
+    })
+  },
+  onCancel() {
+    this.setData({
+      show: false,
+      title: "",
+      type: "",
     })
   },
   jumpToDetail(e) {