childPackage/pages/electricQuery/index.js

@@ -41,7 +41,6 @@ Page({
     accountingList: [],
     electricNumber: 0,
     meterNumber: 0,
-    page: 1,
   },
   changeQueryType(e) {
     const { type } = e.currentTarget.dataset
@@ -81,7 +80,7 @@ Page({
     this.init()
   },
   async init() {
-    const { queryType, timeType, meterId, year, yearMonth, yearMonthDay, page } = this.data;
+    const { queryType, timeType, meterId, year, yearMonth, yearMonthDay } = this.data;
     let time;
     switch(timeType) {
       case 1:
@@ -94,12 +93,12 @@ Page({
         time = yearMonthDay;
         break;
     }
-    const { code, message, data, electricNumber, meterNumber, total } = await getElectricityList({ type: timeType, meter: meterId, time: time, page })
+    const { code, message, data, electricNumber, meterNumber } = await getElectricityList({ type: timeType, meter: meterId, time: time })
     if (code !== OK) {
       alertInfo(message)
       return;
     }
-    this.setData({ list: data, electricNumber: Number(electricNumber)?.toFixed(2), meterNumber: Number(meterNumber), totalPage: Math.ceil(total / 20) })
+    this.setData({ list: data, electricNumber, meterNumber })
     if (!data?.length) {
       return;
     }
@@ -187,16 +186,6 @@ 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)

childPackage/pages/electricQuery/index.wxml

@@ -70,10 +70,7 @@
 </view>
   <view wx:if="{{queryType === 0}}">
     <view style="margin: 30rpx;">
-      <view wx:if="{{list.length}}">
-        <table header="{{header}}" list="{{list}}"  />
-        <pagination currentIndex="{{page}}" totalPage="{{totalPage}}" bind:pagingChange="onChangePage"  />
-      </view>
+      <table header="{{header}}" list="{{list}}" wx:if="{{list.length}}" />
       <empty bind:refresh="init" wx:else />
     </view>
     <view class="sum">
@@ -87,13 +84,12 @@
           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;">

pages/login/index.js

@@ -21,21 +21,20 @@ Page({
    * 生命周期函数--监听页面加载
    */
   onLoad() {
-    this.getPrivacy();
-    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() {
     const { code, message, data } = await getPrivaciList()

project.private.config.json

@@ -11,8 +11,8 @@
     "miniprogram": {
       "list": [
         {
-          "name": "childPackage/pages/electricQuery/index",
-          "pathName": "childPackage/pages/electricQuery/index",
+          "name": "pages/login/index",
+          "pathName": "pages/login/index",
           "query": "",
           "launchMode": "default",
           "scene": null

service/accounting.js

@@ -9,9 +9,9 @@ export const getBillList = async function(page) {
 }
 
 // 电量查询
-export const getElectricityList = async function({ meter, type, time, page }) {
+export const getElectricityList = async function({ meter, type, time }) {
   const tenement = wx.getStorageSync('tenement')?.id || ""
-  return await GET(`/wx/getElectricityList?tenement=${tenement}&meter=${meter}&type=${type}&time=${time}&page=${page}`);
+  return await GET(`/wx/getElectricityList?tenement=${tenement}&meter=${meter}&type=${type}&time=${time}`);
 }
 
 // 抄表记录列表

utils/request.js

@@ -95,10 +95,6 @@ const parseResponse = function (response, url) {
     return { code: 403, message: "非法访问" }
   }
   if (statusCode === 404) {
-    wx.redirectTo({
-      url: '/pages/login/index',
-    })
-    wx.clearStorageSync()
     return { code: 404, message: "服务故障" }
   }
   if (500 <= statusCode && statusCode < 600) {