diff --git a/components/mescroll-uni/components/mescroll-up.css b/components/mescroll-uni/components/mescroll-up.css
index cbf48cd..5021b49 100644
--- a/components/mescroll-uni/components/mescroll-up.css
+++ b/components/mescroll-uni/components/mescroll-up.css
@@ -2,7 +2,7 @@
.mescroll-upwarp {
box-sizing: border-box;
min-height: 110rpx;
- padding: 30rpx 0;
+ padding: 0 0 30rpx 0;
text-align: center;
clear: both;
}
diff --git a/components/mescroll-uni/mescroll-uni-option.js b/components/mescroll-uni/mescroll-uni-option.js
index 2a6e36d..4967902 100644
--- a/components/mescroll-uni/mescroll-uni-option.js
+++ b/components/mescroll-uni/mescroll-uni-option.js
@@ -12,7 +12,7 @@ const GlobalOption = {
up: {
// 其他up的配置参数也可以写,这里只展示了常用的配置:
textLoading: '加载中 ...', // 加载中的提示文本
- textNoMore: '-- END --', // 没有更多数据的提示文本
+ textNoMore: '没有更多数据啦~', // 没有更多数据的提示文本
offset: 80, // 距底部多远时,触发upCallback
toTop: {
// 回到顶部按钮,需配置src才显示
diff --git a/components/mescroll-uni/mescroll-uni.js b/components/mescroll-uni/mescroll-uni.js
index 8c7a391..76a5ac5 100644
--- a/components/mescroll-uni/mescroll-uni.js
+++ b/components/mescroll-uni/mescroll-uni.js
@@ -92,7 +92,7 @@ MeScroll.prototype.extendUpScroll = function(optUp) {
noMoreSize: 5, // 如果列表已无数据,可设置列表的总数量要大于等于5条才显示无更多数据;避免列表数据过少(比如只有一条数据),显示无更多数据会不好看
offset: 80, // 距底部多远时,触发upCallback
textLoading: '加载中 ...', // 加载中的提示文本
- textNoMore: '-- END --', // 没有更多数据的提示文本
+ textNoMore: '没有更多数据啦~', // 没有更多数据的提示文本
bgColor: "transparent", // 背景颜色 (建议在pages.json中再设置一下backgroundColorBottom)
textColor: "gray", // 文本颜色 (当bgColor配置了颜色,而textColor未配置时,则textColor会默认为白色)
inited: null, // 初始化完毕的回调
diff --git a/pages/order/apply-details.vue b/pages/order/apply-details.vue
index 683d8d8..dac4973 100644
--- a/pages/order/apply-details.vue
+++ b/pages/order/apply-details.vue
@@ -28,49 +28,80 @@
-
-
-
-
- 可退金额
-
-
+
+
+
+ 订单金额
+
+
+
+
+
+ 扣费率
+
+ 30%
+
+
+
+ 扣费金额
+
+
+
-
- 订单编号
-
- 67432428794847982374
- 复制
+
+
+
+
+
+
+ 可退金额
+
+
+
+
+
+ 订单编号
+
+ 67432428794847982374
+ 复制
+
-
-
+
-
-
-
-
-
-
-
+
+
-
-
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
diff --git a/pages/order/apply-refund.vue b/pages/order/apply-refund.vue
index d40a404..3057d8d 100644
--- a/pages/order/apply-refund.vue
+++ b/pages/order/apply-refund.vue
@@ -27,51 +27,84 @@
-
-
-
- 可退金额
-
-
+
+
+
+ 订单金额
+
+
+
-
-
- 订单编号
-
- 67432428794847982374
- 复制
+
+ 扣费率
+
+ 30%
+
+
+
+ 扣费金额
+
+
+
-
- 退款说明
-
-
-
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pages/order/confirm-order.vue b/pages/order/confirm-order.vue
index 2be60d8..230d2dc 100644
--- a/pages/order/confirm-order.vue
+++ b/pages/order/confirm-order.vue
@@ -1,6 +1,6 @@
-
+
@@ -8,7 +8,7 @@
-
+
{{orderDetails.goods.name}}
@@ -38,35 +38,42 @@
-
-
- 优惠
- 暂无优惠
+
+
+
+ 优惠
+ 暂无优惠
+
-
+
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+ {{orderDetails.agreement.tips}}
- {{orderDetails.agreement.tips}}
-
-
-
-
- 应付款：
-
-
+
+
+
+ 应付款：
+
+
+
+
-
-
+
@@ -86,7 +93,8 @@
}],
goods_id: 1,
goods_specs_id: 1,
- orderDetails: {}
+ orderDetails: {},
+ ifchoose: true
}
},
computed: {
@@ -105,11 +113,10 @@
this.orderDetails = res.data
this.skeletonLoading = false
this.mescroll.endSuccess(); // 请求成功,隐藏加载状态
- console.log(this.orderDetails)
}
}).catch(err => {
-
+ // this.mescroll.endErr();
});
},
reduce() {
@@ -120,16 +127,10 @@
this.num++
},
CheckboxChange(e) {
- var items = this.checkbox,
- values = e.detail.value;
- for (var i = 0, lenI = items.length; i < lenI; ++i) {
- items[i].checked = false;
- for (var j = 0, lenJ = values.length; j < lenJ; ++j) {
- if (items[i].value == values[j]) {
- items[i].checked = true;
- break
- }
- }
+ if(e.detail.value != '') {
+ this.ifchoose = true
+ }else {
+ this.ifchoose = false
}
},
// 点击复制
@@ -139,7 +140,12 @@
});
},
submit(){
- this.$routerGo('/pages/order/pay-success')
+ if(this.ifchoose == true) {
+ this.$routerGo('/pages/order/pay-success')
+ }else {
+ this.$msg('请认真阅读并同意协议!')
+ return
+ }
},
//下拉刷新
downCallback() {
diff --git a/pages/order/index.vue b/pages/order/index.vue
index 0726cf1..207e1cb 100644
--- a/pages/order/index.vue
+++ b/pages/order/index.vue
@@ -50,7 +50,7 @@
this.assetsType = e.type
this.tabIndex = this.assetsType === 'all' ? 0 : this.assetsType === 'unpaid' ? 1 : this.assetsType === 'paid' ? 2 : 0
// 需要固定swiper的高度
- this.height = (uni.getSystemInfoSync().windowHeight) + 'px'
+ this.height = (uni.getSystemInfoSync().windowHeight-40) + 'px'
},
methods: {
diff --git a/pages/order/order-details.vue b/pages/order/order-details.vue
index 2c2987e..1a6e086 100644
--- a/pages/order/order-details.vue
+++ b/pages/order/order-details.vue
@@ -1,6 +1,6 @@
-
+
@@ -8,16 +8,16 @@
-
+
{{orderDetails.goods.name}}
- 数量 x{{orderDetails.amount}}
+ 数量 x{{orderDetails.number}}
-
+
@@ -32,67 +32,68 @@
-
-
- 订单编号
-
- {{orderDetails.order_sn}}
- 复制
+
+
+
+ 订单编号
+
+ {{orderDetails.order_sn}}
+ 复制
+
+
+
+ 下单时间
+ {{orderDetails.created_at_text}}
+
+
+ 付款时间
+ {{orderDetails.payment_at_text}}
+
+
+ 支付方式
+ {{orderDetails.payment_type}}
-
- 下单时间
- {{orderDetails.created_at_text}}
-
-
- 付款时间
- {{orderDetails.payment_at_text}}
-
-
- 支付方式
- {{orderDetails.payment_type}}
-
-
-
-
-
-
- 优惠
- 暂无优惠
-
-
-
-
+
-
-
-
+
+
+ 优惠
+ 暂无优惠
-
+
+
+
+
+
-
+
- SP738644872
- 复制
-
-
- 待使用
-
-
-
-
- 已付款：
-
-
+
+
+
+
+ SP738644872
+ 复制
+
+
+ 待使用
-
- 已付款
+
+
+ 已付款：
+
+
+
+
+
+ 已付款
+
-
-
-
+
+
@@ -119,15 +120,13 @@
if(this.orderId) {
this.getOrderDetails()
}
- setTimeout(()=>{
- this.skeletonLoading = false
- },1000)
},
methods: {
getOrderDetails() {
this.$http(this.API.API_ORDER_DETAILS, {order_id: this.orderId}).then(res => {
if(res.code == 0) {
this.orderDetails = res.data
+ this.skeletonLoading = false
console.log(this.orderDetails)
}
diff --git a/pages/order/order-item.vue b/pages/order/order-item.vue
index 33ed3da..a0d47da 100644
--- a/pages/order/order-item.vue
+++ b/pages/order/order-item.vue
@@ -3,7 +3,7 @@
-
+
@@ -16,7 +16,7 @@
{{item.goods.name}}
- 数量 x{{item.number}}
+ 数量 x{{item.number}}
@@ -147,7 +147,7 @@
}
},
created() {
-
+ this.getUserOrder()
}
}