From 0556e2bfdf6e9424ef6ef12abe08fc9d7b44cf1b Mon Sep 17 00:00:00 2001
From: jyy <935090232@qq.com>
Date: Sat, 16 Jan 2021 08:54:05 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/jyyforjava/hive-xcx
---
pages/yuyue/order.js | 64 ++++++++++++++++++--------------
1 files changed, 36 insertions(+), 28 deletions(-)
diff --git a/pages/yuyue/order.js b/pages/yuyue/order.js
index e4c57ac..55a2942 100644
--- a/pages/yuyue/order.js
+++ b/pages/yuyue/order.js
@@ -5,8 +5,8 @@
data: {
currentIndex: 0,
orderList: [],
- limit: 8,
- offset: 0,
+ pageSize: 8,
+ pageNum: 1,
refresh: false,
orderShow: false,
// hiddenData:true
@@ -52,7 +52,7 @@
this.setData({
currentIndex: index,
- offset: 0
+ pageNum: 0
})
this.getOrderInfo(index);
},
@@ -61,15 +61,15 @@
getOrderInfo: function(index) {
var _this = this;
- var limit = _this.data.limit;
- var offset = _this.data.offset;
- var status=index=="0"?"":index;
+ var pageSize = _this.data.pageSize;
+ var pageNum = _this.data.pageNum;
+ var status=this.data.currentIndex;
util.request({
api: api.yuyue.getServiceOrderList,
data: {
- "limit": limit,
- "status": status,
- "offset": offset
+ "pageSize": pageSize,
+ "vipStatus": status,
+ "pageNum": pageNum
},
callback: function(data) {
console.log("订单信息")
@@ -81,10 +81,12 @@
if (orderList.length == 0) {
_this.setData({
orderShow: true,
+ noMore:true
})
} else {
_this.setData({
- orderShow: false
+ orderShow: false,
+ noMore:false
})
}
}
@@ -108,14 +110,13 @@
if (sm.confirm) {
util.request({
- api: api.yuyue.cancelOrderById,
+ api: api.yuyue.cancelOrderById+"/"+id,
data: { id: id},
callback: function (data) {
wx.showToast({
title: '取消成功',
success: function () {
- debugger
- _this.getOrderInfo(0);
+ _this.getOrderInfo(index);
}
})
}
@@ -157,7 +158,7 @@
var _this = this;
var id = e.currentTarget.dataset.id;
wx.navigateTo({
- url: '/pages/yuyue/yyInfo?model=2&id=' + id,
+ url: '/pages/yuyue/showYyInfo?id=' + id,
})
},
@@ -165,29 +166,36 @@
onReachBottom: function() {
var _this = this;
- var limit = _this.data.limit;
- var offset = _this.data.offset + limit;
+ var pageSize = _this.data.pageSize;
+ var pageNum = _this.data.pageNum + 1;
var orderList = _this.data.orderList;
- var index = _this.data.currentIndex;
- var status = index == "0" ? "" : index;
+ var status = _this.data.currentIndex;
_this.setData({
- offset: offset
+ pageNum: pageNum
});
util.request({
api: api.yuyue.getServiceOrderList,
data: {
- "limit": limit,
- "status": status,
- "offset": offset
+ "pageSize": pageSize,
+ "vipStatus": status,
+ "pageNum": pageNum
},
callback: function(data) {
- for (var i = 0; i < data.rows.length; i++) {
- orderList.push(data.rows[i]);
- }
- _this.setData({
- orderList: orderList
- });
+ if(data.rows.length>0){
+ for (var i = 0; i < data.rows.length; i++) {
+ orderList.push(data.rows[i]);
+ }
+ _this.setData({
+ orderList: orderList
+ });
+ }else{
+ _this.setData({
+ noMore:true
+ })
+ }
+
+
}
});
--
Gitblit v1.9.1