Merge remote-tracking branch 'origin/master'

rk

16 小时以前 fa4c7baec36d58b4bdca66159ece743b5a45a9c8

 app/pages/wallet/wallet.vue

@@ -53,8 +53,8 @@
                  </view>
               </view>
               <view class="item-date-bottom">
                  <text>收入：¥{{(countDataList.totalIncome || 0).toFixed(2)}}</text>
                  <text>支出：¥{{(countDataList.totalExpense || 0).toFixed(2)}}</text>
                  <text>收入：¥{{((countDataList.totalIncome || 0) / 100).toFixed(2)}}</text>
                  <text>支出：¥{{((countDataList.totalExpense || 0) / 100).toFixed(2)}}</text>
               </view>
            </view>
            <view class="item-list">
@@ -166,6 +166,7 @@
      data() {
         return {
            currentPage:1,
            loading:false,
            total:0,
            active:0,
            wordsWidth:250,
@@ -240,6 +241,7 @@
                return value
            },
         getShopPage() {
            console.log(this.loading, this.hasNext)
            if(this.loading || !this.hasNext){
               return
            }
@@ -248,6 +250,12 @@
               this.hasNext = true
               this.dataList=[]
            }
            console.log({
                  startTime: this.startDate || this.defaultStartDate,
                  endTime: this.endDate || this.defaultEndDate,
                  type: this.type,
                  optType: this.active === 1?1:(this.active === 2?-1:'')
               })
            this.$u.api.driverPage({
               capacity: 10,
               model: {
@@ -259,15 +267,16 @@
               page: this.currentPage
            }).then(res => {
               if (res.code == 200) {
                  this.dataList.push(...res.data.records)
                  const records = res.data.records || []
                  this.dataList.push(...records)
                  this.total = res.data.total
                  this.currentPage = this.currentPage+1
                  if (this.dataList.length >= res.data.total) {
                     this.hasNext = false
                  } else {
                     this.hasNext = true
                  }
                  this.currentPage++
                  this.hasNext = this.dataList.length < res.data.total
               }
            }).catch(err => {
               console.log(err)
            }).finally(() => {
               this.loading = false
            })
         },
         getShopSummary() {
@@ -428,7 +437,7 @@
            this.tempType = index
         },
         getFirstPageData(){
            this.currentPage = 0
            this.currentPage = 1
            this.hasNext=true
            this.loading=false
            this.total=0