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/workbench/orderList.vue | 62 ++++++++++++++++++++++++++----
1 files changed, 53 insertions(+), 9 deletions(-)
diff --git a/hive-app/pages/workbench/orderList.vue b/hive-app/pages/workbench/orderList.vue
index b799e45..f1784c3 100644
--- a/hive-app/pages/workbench/orderList.vue
+++ b/hive-app/pages/workbench/orderList.vue
@@ -45,9 +45,12 @@
</view>
</view>
</navigator>
- <view class="list-footer" v-if="item.orderStatus!=='已取消'">
+ <view class="list-footer" v-if="item.orderStatus!=='已取消' && $utils.hasPermission('ddgl.cancel')">
<text class="blue-btn small-btn" @click="cancelOrder(item.orderId)">取消订单</text>
</view>
+ </view>
+ <view v-if="list.length">
+ <uni-load-more :status="loadStatus" color="#a5abaf"></uni-load-more>
</view>
</view>
</view>
@@ -57,10 +60,12 @@
<script>
import HTabs from "@/components/liuyuno-tabs/liuyuno-tabs.vue";
import searchBar from '../../components/searchBar/index.vue';
+ import uniLoadMore from '@/components/uni-load-more/uni-load-more.vue';
export default {
components: {
HTabs,
- searchBar
+ searchBar,
+ uniLoadMore
},
data() {
return {
@@ -83,13 +88,36 @@
name: '欠款'
},
],
- list: []
+ list: [],
+ loadStatus: 'more',
+ pageNum: 1
}
},
onLoad(options) {
if(options.status){
this.orderStatus = Number(options.status);
}
+ this.loadList()
+
+ // 判断权限
+ // #ifdef APP-PLUS
+ if(!this.$utils.hasPermission('ddgl.add')){
+ let webView = this.$mp.page.$getAppWebview();
+ webView.setTitleNViewButtonStyle(0, {
+ width: 0,
+ });
+ }
+ // #endif
+ },
+ onPullDownRefresh(){
+ this.reloadData();
+ let timer = setTimeout(function () {
+ uni.startPullDownRefresh();
+ clearTimeout(timer);
+ timer = null;
+ }, 800);
+ },
+ onReachBottom(){
this.loadList()
},
onNavigationBarButtonTap(Object){
@@ -100,28 +128,44 @@
}
},
methods:{
+ reloadData(){
+ this.list = [];
+ this.pageNum = 1;
+ this.loadStatus = 'more';
+ this.loadList();
+ },
loadList(){
+ if(this.loadStatus!=='more'){
+ return;
+ }
this.$httpUtils.request('/api/order/findOrderList', {
- pageNum: 1,
- pageSize: 100,
+ pageNum: this.pageNum,
+ pageSize: 10,
queryKey: this.queryKey,
orderStatus: this.orderStatus
}, '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);
}
})
},
search(val){
this.queryKey = val;
- this.loadList();
+ this.reloadData();
},
tabChange(index){
if(this.orderStatus === index){
return;
}
this.orderStatus = index;
- this.loadList();
+ this.reloadData();
},
caculateColor(status){
if(status==='待付款'){
@@ -143,7 +187,7 @@
console.log('用户点击确定');
this.$httpUtils.request('/api/order/cancelOrder/'+id).then((res) => {
if(res.status == 200){
- this.loadList()
+ this.reloadData()
}
this.$toast.info(res.info);
})
--
Gitblit v1.9.1