From 5b280a9e9d631208de8e8da3f9ba321163d5ee8a Mon Sep 17 00:00:00 2001
From: qiaomu <3520484422@qq.com>
Date: Thu, 25 Jul 2024 15:07:29 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=B5=E9=87=8F=E6=9F=A5=E8=AF=A2=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E5=88=86=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 childPackage/pages/electricQuery/index.js   | 17 ++++++++++++++---
 childPackage/pages/electricQuery/index.wxml | 10 +++++++---
 pages/login/index.js                        | 14 +++++++-------
 project.private.config.json                 |  4 ++--
 service/accounting.js                       |  4 ++--
 5 files changed, 32 insertions(+), 17 deletions(-)

diff --git a/childPackage/pages/electricQuery/index.js b/childPackage/pages/electricQuery/index.js
index 692967a..ac3dbd4 100644
--- a/childPackage/pages/electricQuery/index.js
+++ b/childPackage/pages/electricQuery/index.js
@@ -41,6 +41,7 @@ Page({
     accountingList: [],
     electricNumber: 0,
     meterNumber: 0,
+    page: 1,
   },
   changeQueryType(e) {
     const { type } = e.currentTarget.dataset
@@ -80,7 +81,7 @@ Page({
     this.init()
   },
   async init() {
-    const { queryType, timeType, meterId, year, yearMonth, yearMonthDay } = this.data;
+    const { queryType, timeType, meterId, year, yearMonth, yearMonthDay, page } = this.data;
     let time;
     switch(timeType) {
       case 1:
@@ -93,12 +94,12 @@ Page({
         time = yearMonthDay;
         break;
     }
-    const { code, message, data, electricNumber, meterNumber } = await getElectricityList({ type: timeType, meter: meterId, time: time })
+    const { code, message, data, electricNumber, meterNumber, total } = await getElectricityList({ type: timeType, meter: meterId, time: time, page })
     if (code !== OK) {
       alertInfo(message)
       return;
     }
-    this.setData({ list: data, electricNumber, meterNumber })
+    this.setData({ list: data, electricNumber: Number(electricNumber)?.toFixed(2), meterNumber: Number(meterNumber), totalPage: Math.ceil(total / 20) })
     if (!data?.length) {
       return;
     }
@@ -186,6 +187,16 @@ Page({
        
     })
   },
+  async onChangePage(e) {
+    console.log('e', e)
+    const page = e.detail.currentIndex;
+    const that = this;
+    this.setData({
+      page
+    }, () => {
+      that.init();
+    })
+  },
   async getAccountingBalanceList() {
     const { meterId } = this.data;
     const { code, message, data } = await getAccountingList(meterId)
diff --git a/childPackage/pages/electricQuery/index.wxml b/childPackage/pages/electricQuery/index.wxml
index 34cc5fa..83a0ef8 100644
--- a/childPackage/pages/electricQuery/index.wxml
+++ b/childPackage/pages/electricQuery/index.wxml
@@ -70,7 +70,10 @@
 </view>
   <view wx:if="{{queryType === 0}}">
     <view style="margin: 30rpx;">
-      <table header="{{header}}" list="{{list}}" wx:if="{{list.length}}" />
+      <view wx:if="{{list.length}}">
+        <table header="{{header}}" list="{{list}}"  />
+        <pagination currentIndex="{{page}}" totalPage="{{totalPage}}" bind:pagingChange="onChangePage"  />
+      </view>
       <empty bind:refresh="init" wx:else />
     </view>
     <view class="sum">
@@ -84,12 +87,13 @@
           header="{{meterReadingHeader}}" 
           list="{{meterReadingList}}" 
         />
-        <pagination currentIndex="{{}}" totalPage="{{}}" />
+       
       </view>
       
       <empty bind:refresh="getReadingList" wx:else />
     </view>
-   
+
+    
   </view>
   <view wx:if="{{queryType === 2}}">
     <view style="margin: 30rpx;">
diff --git a/pages/login/index.js b/pages/login/index.js
index 8498bcd..da7302a 100644
--- a/pages/login/index.js
+++ b/pages/login/index.js
@@ -21,19 +21,19 @@ Page({
    * 生命周期函数--监听页面加载
    */
   onLoad() {
-    // const user = wx.getStorageSync('user')
-    // if (!user || !user.id) {
-    //   return;
-    // }
+    const user = wx.getStorageSync('user')
+    if (!user || !user.id) {
+      return;
+    }
     // if (user.status === 0 || user.status === 2) {
     //   wx.redirectTo({
     //     url: '/pages/waitApprove/index',
     //   })
     //   return
     // }
-    // wx.switchTab({
-    //   url: '/pages/home/index',
-    // })
+    wx.switchTab({
+      url: '/pages/home/index',
+    })
     this.getPrivacy();
   },
   async getPrivacy() {
diff --git a/project.private.config.json b/project.private.config.json
index 5b4ca4b..e16f9e9 100644
--- a/project.private.config.json
+++ b/project.private.config.json
@@ -11,8 +11,8 @@
     "miniprogram": {
       "list": [
         {
-          "name": "pages/login/index",
-          "pathName": "pages/login/index",
+          "name": "childPackage/pages/electricQuery/index",
+          "pathName": "childPackage/pages/electricQuery/index",
           "query": "",
           "launchMode": "default",
           "scene": null
diff --git a/service/accounting.js b/service/accounting.js
index cd44010..8892afe 100644
--- a/service/accounting.js
+++ b/service/accounting.js
@@ -9,9 +9,9 @@ export const getBillList = async function(page) {
 }
 
 // 电量查询
-export const getElectricityList = async function({ meter, type, time }) {
+export const getElectricityList = async function({ meter, type, time, page }) {
   const tenement = wx.getStorageSync('tenement')?.id || ""
-  return await GET(`/wx/getElectricityList?tenement=${tenement}&meter=${meter}&type=${type}&time=${time}`);
+  return await GET(`/wx/getElectricityList?tenement=${tenement}&meter=${meter}&type=${type}&time=${time}&page=${page}`);
 }
 
 // 抄表记录列表