From 5227ce05a36d16fc32691b73e4d75c8aee9cea51 Mon Sep 17 00:00:00 2001
From: li-guang <153605324@qq.com>
Date: Mon, 11 Jan 2021 16:46:37 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/jyyforjava/hive-app
---
hive-app/pages/manager/companyReports.vue | 48 +++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 41 insertions(+), 7 deletions(-)
diff --git a/hive-app/pages/manager/companyReports.vue b/hive-app/pages/manager/companyReports.vue
index 0fdf98a..595d814 100644
--- a/hive-app/pages/manager/companyReports.vue
+++ b/hive-app/pages/manager/companyReports.vue
@@ -54,6 +54,9 @@
</view>
</view>
</view>
+ <view v-if="list.length">
+ <uni-load-more :status="loadStatus" color="#a5abaf"></uni-load-more>
+ </view>
</view>
<view v-else>
<view class="list-item">
@@ -105,10 +108,12 @@
</template>
<script>
+ import uniLoadMore from '@/components/uni-load-more/uni-load-more.vue';
import HTabs from "@/components/liuyuno-tabs/liuyuno-tabs.vue";
export default {
components: {
- HTabs
+ HTabs,
+ uniLoadMore
},
data() {
return {
@@ -131,7 +136,9 @@
isShowFilter:false,
storeList: [],
shopId: '',//门店id
- list: []
+ list: [],
+ loadStatus: 'more',
+ pageNum: 1
}
},
onLoad(options) {
@@ -153,6 +160,17 @@
this.loadShopList();;
}
},
+ onPullDownRefresh(){
+ this.reloadData();
+ let timer = setTimeout(function () {
+ uni.startPullDownRefresh();
+ clearTimeout(timer);
+ timer = null;
+ }, 800);
+ },
+ onReachBottom(){
+ this.loadList()
+ },
onNavigationBarButtonTap(e){
if(e.index==0){
uni.navigateTo({
@@ -167,6 +185,12 @@
this.hideFilter()
},
methods:{
+ reloadData(){
+ this.list = [];
+ this.pageNum = 1;
+ this.loadStatus = 'more';
+ this.loadList();
+ },
tabChange(index){
let val = index + 1;
if(val == this.tabIndex){
@@ -174,7 +198,7 @@
}
this.tabIndex = val;
if(val != 3){
- this.loadList()
+ this.reloadData()
}
},
hideFilter(){
@@ -194,7 +218,7 @@
uni.setNavigationBarTitle({
title: item.shopShortName + '经营报表'
});
- this.loadList();
+ this.reloadData();
},
loadShopList(){
this.$httpUtils.request('/api/shop/findAllShopList').then((res) => {
@@ -212,14 +236,24 @@
})
},
loadList(){
+ if(this.loadStatus!=='more'){
+ return;
+ }
this.$httpUtils.request('/api/statistics/findShopBusinessesData', {
- "pageNum": 1,
- "pageSize": 100,
+ "pageNum": this.pageNum,
+ "pageSize": 10,
"shopId": this.shopId,
"type": this.tabIndex
}, 'POST').then((res) => {
if(res.status == 200){
- this.list = res.rows;
+ let result = res.rows;
+ if(result.length < 10){
+ this.loadStatus = 'noMore';
+ } else {
+ this.pageNum ++ ;
+ this.loadStatus = 'more';
+ }
+ this.list = this.list.concat(result);
}
})
}
--
Gitblit v1.9.1