修改充值后内容不刷新的问题,修改部分接口传参空值的问题，调整接口地址,，正在做分页

app.json

@@ -1,5 +1,6 @@
 {
   "pages": [
+    "pages/login/index",
     "pages/home/index",
     "pages/billList/index",
     "pages/rechargeRecord/index",
@@ -8,7 +9,6 @@
     "pages/invoiceDetailContent/index",
     "pages/invoicing/index",
     "pages/member/index",
-    "pages/login/index",
     "pages/handleLogin/index",
     "pages/my/index",
     "pages/waitApprove/index",

childPackage/pages/electricQuery/index.json

@@ -10,6 +10,7 @@
     "empty": "/components/empty/index",
     "timePicker": "/components/timePicker/index",
     "accountingCard": "./components/accountingCard/index",
+    "pagination": "/components/pagination/index",
     "echarts": "/childPackage/components/echarts/ec-canvas"
   },
   "navigationStyle": "custom"

childPackage/pages/electricQuery/index.wxml

@@ -79,7 +79,14 @@
   </view>
   <view wx:if="{{queryType === 1}}">
     <view style="margin: 30rpx;">
-      <table header="{{meterReadingHeader}}" list="{{meterReadingList}}" wx:if="{{meterReadingList.length}}" />
+      <view     wx:if="{{meterReadingList.length}}" >
+        <table 
+          header="{{meterReadingHeader}}" 
+          list="{{meterReadingList}}" 
+        />
+        <pagination currentIndex="{{}}" totalPage="{{}}" />
+      </view>
+      
       <empty bind:refresh="getReadingList" wx:else />
     </view>
    

components/pagination/index.js

@@ -0,0 +1,143 @@
+Component({
+  /**
+   * 组件的属性列表
+   */
+  properties: {
+    currentIndex: { //当前页码
+      type: Number,
+      value: 1
+    },
+    totalPage: {
+      type: Number
+    }
+  },
+ 
+  /**
+   * 组件的初始数据
+   */
+  data: {
+    index: 1,
+    total: 10,
+    pageMask: false,
+    prevBtnDis: true,
+    nextBtnDis: false
+  },
+ 
+  /**
+   * 组件的方法列表
+   */
+  lifetimes: {
+     // 在组件实例进入页面节点树时执行
+    attached: function () {
+      this.setData({
+        index: this.properties.currentIndex,
+        total: this.properties.totalPage
+      })
+    }
+    
+  },
+  methods: {
+
+    // 设置异步请求之后的页面、总记录数
+    setPage(index, total){
+      this.setData({
+        index,
+        total
+      })
+    },
+
+    //每次改变页码就调用该函数
+    triggerParent: function () {
+
+      // 通知父组件当前加载的页数
+
+      // 自定义组件向父组件传值 
+        const option = {
+          currentIndex: this.data.index
+        };
+
+      // pagingChange 自定义名称事件，父组件中使用
+      this.triggerEvent('pagingChange', option)
+     
+    },
+    //开启页码弹窗
+    showPagePopUp: function () {
+      this.setData({
+        pageMask: true
+      })
+    },
+    //关闭页码弹窗
+    hidePagePopUp: function () {
+      this.setData({
+        pageMask: false
+      })
+    },
+    //更改页码点击事件
+    onChangePage: function (e) {
+      //console.log("更改页码事件：",e);
+      this.setData({
+        pageMask: false,
+        index: e.currentTarget.dataset.index //点击的页数
+      })
+
+      // 先判断当前页数，是否需要更新disabled的状态
+      this.updateBtnDis();
+
+      this.triggerParent();
+    
+    },
+    //上一页点击事件
+    prevPage: function () {
+      if(this.data.index <= 1) return; 
+      let num = this.data.index - 1;
+      this.setData({
+        index: num
+      })
+      this.triggerParent();
+      // 更新按钮状态
+      this.updateBtnDis();
+    },
+    //下一页点击事件
+    nextPage: function () {
+      if(this.data.index >= this.data.total) return; 
+      let num = this.data.index + 1;
+      this.setData({
+        index: num
+      })
+
+      this.triggerParent();
+
+      // 更新按钮状态
+      this.updateBtnDis();
+    },
+
+    //判断按钮是否为disabled
+    updateBtnDis: function () {
+
+      let index = this.data.index;
+      let total = this.data.total;
+
+      if(index == total && index == 1){ // 都为起始页和总页数都为1
+        this.setData({
+          nextBtnDis: true,
+          prevBtnDis: true
+        })
+      }else if (index == total) { // 最后一页
+        this.setData({
+          nextBtnDis: true
+        })
+      } else if (index == 1){ // 第一页
+        this.setData({
+          prevBtnDis: true
+        })
+      }else{
+        this.setData({
+          prevBtnDis: false
+        })
+        this.setData({
+          nextBtnDis: false
+        })
+      }
+    }
+  }
+})

components/pagination/index.json

@@ -0,0 +1,4 @@
+{
+  "component": true,
+  "usingComponents": {}
+}

components/pagination/index.wxml

@@ -0,0 +1,16 @@
+<!--components/pagination/index.wxml-->
+<view class="page-control">
+  <view class="page-control-btns">
+    <view class="page-btn {{prevBtnDis?'btn-disabled':''}}" bindtap="prevPage">上一页</view>
+    <view class="page-number" bindtap="shopPagePopup"><text>{{index}}</text>/<text>{{total}}</text></view>    
+    <view class="page-btn {{nextBtnDis?'btn-disabled':''}}" bindtap="nextPage">下一页</view>
+  </view>
+  <view class="page-container" hidden="{{!pageMask}}">
+    <view class="page-mask" bindtap="hidePagePopup"></view>
+    <view class="page-popup">
+      <view class="page-popup-box">
+        <view class="page-line" wx:for="{{total}}" wx:for-index="idx" data-index="{{idx+1}}" bindtap="changePage">第{{item+1}}页</view>
+      </view>
+    </view>
+  </view>
+</view>

components/pagination/index.wxss

@@ -0,0 +1,83 @@
+/* components/pagination/index.wxss */
+view,text,image{
+  padding: 0;
+  margin: 0;
+  box-sizing: border-box;
+}
+.page-control{
+  width: 100%;
+}
+.page-control .page-control-btns{
+  width: 100%;
+  padding: 20rpx 0;
+  display: flex;
+  align-items: center;
+  justify-content: space-around;
+}
+.page-control .page-control-btns .page-number{
+  width: 20%;
+  text-align: center;
+  color: #333;
+}
+.page-control .page-control-btns .page-number:active{
+  background-color: #ddd;
+}
+.page-control .page-control-btns .page-btn{
+  width: 30%;
+  padding: 15rpx 20rpx;
+  font-size: 30rpx;
+  background-color: #0099CC;
+  color: #fff;
+  border-radius: 10rpx;
+  text-align: center;
+}
+.page-control .page-control-btns .page-btn:active{
+  opacity: .5;
+}
+.page-control .page-control-btns .btn-disabled{
+  background-color: #ddd;
+  color: #999;
+}
+.page-container{
+  position: fixed;
+  top: 0rpx;
+  left: 0rpx;
+  width: 100%;
+  height: 100%;
+  z-index: 999;
+}
+.page-mask{
+  width: 100%;
+  height: 100%;
+  position: absolute;
+  left: 0;
+  top: 0;
+  background-color: rgba(0,0,0,0.5);
+}
+.page-popup{
+  width: 100%;
+  height: 100%;
+  display: flex;
+  flex-wrap: wrap;
+  align-items: center;
+  justify-content: center;
+}
+.page-popup-box{
+  width: 60%;
+  margin: 0 auto;
+  background-color: #fff;
+  height: 60%;
+  border-radius: 10rpx;
+  z-index: 9999;
+  overflow: auto;
+}
+.page-line{
+  width: 100%;
+  height: 80rpx;
+  line-height: 80rpx;
+  padding: 0rpx 20rpx;
+  border-bottom: 1rpx solid #e2e2e2;
+}
+.page-line:active{
+  background-color: #ddd;
+}

components/select/index.wxss

@@ -4,8 +4,6 @@
 }
 
 .options {
- 
-
   background-color: #fff;
   padding: 20rpx;
   margin-left: 32rpx;
@@ -15,7 +13,8 @@
   border-radius: 5rpx;
   box-sizing: border-box;
   width: calc(100% - 64rpx);
-  max-height: 50vh;
+  max-height: 40vh;
+  overflow: auto;
 }
 
 .option {

pages/handleLogin/index.js

@@ -23,6 +23,7 @@ Page({
    */
   onLoad(options) {
     const { canBack } = options
+    console.log('cnaback', canBack)
     if (canBack === 'false') {
       this.setData({ canBack: false })
     }

pages/handleLogin/index.wxml

@@ -5,13 +5,10 @@
   <van-tab title="扫码绑定">
     <view class="codeContent">
       <view class="text">
-        您可以联系贵司在系统中预留的手机号联系人
+        点击下方扫一扫，扫描管理员二维码直接绑定。
       </view>
       <view class="text">
-        登录本系统-我的-二维码
-      </view>
-      <view class="text">
-        使用微信扫一扫，直接绑定
+        说明：系统预留手机号联系人为本系统管理员，其它人员可通过扫描管理员二维码进行绑定。
       </view>
       <view class="scan">
         <van-button type="info" block bind:click="scan"> 去扫码 </van-button>

pages/home/index.js

@@ -276,9 +276,11 @@ Page({
     }
     if (!data?.length) {
       alertInfo("尚无信息")
-      wx.redirectTo({
-        url: '/pages/handleLogin/index?back=false',
-      })
+      setTimeout(() => {
+        wx.redirectTo({
+          url: '/pages/handleLogin/index?back=false',
+        })
+      }, 500)
       return;
     }
     const [firstPark = {}] = data;
@@ -336,6 +338,7 @@ Page({
       alertInfo(message)
       return;
     }
+    const that = this;
     wx.requestPayment({
       timeStamp: data?.time,
       nonceStr: data?.nonceStr,

pages/login/index.js

@@ -69,7 +69,7 @@ Page({
         this.noPermission()
         return;
       }
-      alertSuccess("登录成功")
+      alertSuccess("注册成功")
       const { token, ...user } = data
       wx.setStorageSync('user', user)
       wx.setStorageSync('token', data?.token)

pages/member/components/memberManage/index.js

@@ -43,9 +43,10 @@ Component({
       })
     },
     async setAdmin(e) {
-      const { user, tenement } = e.currentTarget.dataset;
+      const { user } = e.currentTarget.dataset;
+      const tenement = wx.getStorageSync('tenement');
       await wxModal({ content: `你的管理员身份将转交给${user.name}` })
-      const { code, message } = await approveUser({ userId: user.id, type: 2, tenement })
+      const { code, message } = await approveUser({ userId: user.id, type: 2, tenement: tenement?.id })
       if (code !== OK) {
         alertInfo(message)
         return;
@@ -57,9 +58,10 @@ Component({
       alertSuccess("转交成功")
     },
     async remove(e) {
-      const { user, tenement } = e.currentTarget.dataset;
+      const { user } = e.currentTarget.dataset;
+      const tenement = wx.getStorageSync('tenement');
       await wxModal({ content: `将移除${user.name}？` })
-      const { code, message } = await removeUser(user.id, tenement)
+      const { code, message } = await removeUser(user.id, tenement?.id)
       if (code !== OK) {
         alertInfo(message)
         return;

pages/questions/index.wxml

@@ -2,7 +2,7 @@
 <scrollPageWrapper>
   <navigator title="常见问题" canBack="{{true}}" />
   <view class="content">
-    <view wx:for="{{questions}}" list-item>
+    <view wx:for="{{questions}}" wx:key="index">
       <view class="question"> {{index + 1}}、 {{ item.name }} </view>
       <view class="answer"> {{ item.content }} </view>
     </view>

pages/questions/index.wxss

@@ -3,7 +3,6 @@
   flex: 1;
   padding: 16rpx 24rpx 20rpx;
   box-sizing: border-box;
-  display: flex;
 }
 
 .question {

service/park.js

@@ -4,4 +4,9 @@ const { GET, POST, PUT, DELETE } = apis
 // 获取园区列表
 export const getParkList = async function({ keyword }) {
   return await GET(`/wx/getParkList?keyword=${keyword}`);
+}
+
+// 获取未登录的园区列表
+export const getLoginParkList = async function({ keyword }) {
+  return await GET(`/wx/getLoginParkList?keyword=${keyword}`);
 }

utils/index.js

@@ -55,7 +55,7 @@ export function getConfigByEnv() {
       break;
     // 正式版
     case 'release':
-      api = "https://zgd.hbhcbn.com/api"
+      api = "https://zgd.hbhcbn.com/api3"
       break;
   }
   return { api, }