diff --git a/assets/img/dingdan.png b/assets/img/dingdan.png
new file mode 100644
index 0000000..ed5cab2
Binary files /dev/null and b/assets/img/dingdan.png differ
diff --git a/pages/order/index/index.js b/pages/order/index/index.js
index 1060f83..d99931e 100644
--- a/pages/order/index/index.js
+++ b/pages/order/index/index.js
@@ -21,7 +21,7 @@ Page({
list: [],
current: "",
current_scroll: "1",
- page: 2,
+ page: 1,
allow_load: true
},
onLoad(e) {
@@ -32,9 +32,8 @@ Page({
},
getList(key, pageNum) {
- wx.showLoading({
- title: "loading..."
- });
+ let that = this;
+
console.log(key);
/**
@@ -53,38 +52,38 @@ Page({
orderStatus: key
};
}
-
- if(that.data.allow_load==''){
-
- }
- Http.get({
- url: config.api.orderList,
- data: variable
- }).then(res => {
- console.log(res);
- console.log("姐姐的订单列表");
- wx.hideLoading();
- console.log(res);
- if (pageNum >= res.data.pages) {
- wx.showToast({
- title: "加载完成喽",
- icon: "success"
- });
+ if (that.data.allow_load) {
+ wx.showLoading({
+ title: "加载中"
+ });
+ Http.get({
+ url: config.api.orderList,
+ data: variable
+ }).then(res => {
+ console.log(res);
+ console.log("姐姐的订单列表");
+ setTimeout(function() {
+ wx.hideLoading();
+ }, 1200);
+ if (pageNum >= res.data.pages) {
+ that.setData({
+ allow_load: false
+ });
+ }
+ /**
+ * 先赋值后渲染页面
+ * concat 不会改变原数组值
+ * push 会改变原数组值,但不会一条一条插入,而是整个数组插入
+ */
+ that.data.list = that.data.list.concat(res.data.list);
that.setData({
- allow_load: false
+ list: that.data.list
});
- }
- /**
- * 先赋值后渲染页面
- * concat 不会改变原数组值
- * push 会改变原数组值,但不会一条一条插入,而是整个数组插入
- */
- that.data.list = that.data.list.concat(res.data.list);
- that.setData({
- list: that.data.list
});
- });
+ } else {
+ console.log("加载完成allow_load设置成false");
+ }
},
handleChange({ detail }) {
this.setData({
@@ -92,19 +91,22 @@ Page({
});
},
handleChangeScroll({ detail }) {
- this.getList(detail.key, 1);
this.setData({
+ list:[],
+ allow_load: true,
current_scroll: detail.key
- });
+ })
+ this.getList(detail.key, 1);
},
onReachBottom: function() {
var that = this;
- console.info("before++ " + that.data.page);
+ console.log(that.data.page);
that.data.page++;
- console.info("after++ " + that.data.page);
+ console.log(that.data.page);
that.setData({
page: that.data.page
});
- that.getList(0, that.data.page);
+ console.info("after++ " + that.data.page);
+ that.getList(that.data.current_scroll, that.data.page);
}
});
diff --git a/pages/order/index/index.wxml b/pages/order/index/index.wxml
index d189285..bf3273e 100644
--- a/pages/order/index/index.wxml
+++ b/pages/order/index/index.wxml
@@ -2,30 +2,36 @@
-
-
-
-
+
+
+
+
+
+
+
+
+ {{item.detail}}
+ 等待付款
+
+
+
+ 下单时间:2018-07-10 11:30
+
+
-
+
- {{item.detail}}
- 等待付款
+ ¥{{item.payment}}
+ ¥{{item.paymentType}}
-
-
- 下单时间:2018-07-10 11:30
+
+ 支付
-
-
- ¥{{item.payment}}
- ¥{{item.paymentType}}
-
-
- 支付
-
+
+
+ 暂无订单
\ No newline at end of file
diff --git a/pages/order/index/index.wxss b/pages/order/index/index.wxss
index dfed73e..13ff835 100644
--- a/pages/order/index/index.wxss
+++ b/pages/order/index/index.wxss
@@ -63,13 +63,15 @@
font-size: 24rpx;
}
-.info view:nth-child(2), .info view:nth-child(3) {
+.info view:nth-child(2),
+.info view:nth-child(3) {
color: #f96563;
font-size: 24rpx;
padding-left: 4%;
}
-.info view:nth-child(2) text, .info view:nth-child(3) text {
+.info view:nth-child(2) text,
+.info view:nth-child(3) text {
font-size: 22rpx;
color: #b8b8b8;
}
@@ -101,7 +103,7 @@
text-decoration: line-through;
}
-.btn{
+.btn {
position: absolute;
top: 0;
bottom: 0;
@@ -122,3 +124,17 @@
font-size: 28rpx;
color: #fff;
}
+.dingdan{
+ margin-top: 200rpx;
+}
+.dingdan text {
+ display: block;
+ text-align: center;
+ font-size: 30rpx;
+ color: #999;
+}
+.dingdan image {
+ display: block;
+ width: 100rpx;
+ margin: 0 auto 16rpx;
+}