From 56cdbfbf5d9977e6f90f505417cf1dde9d761523 Mon Sep 17 00:00:00 2001
From: ghusermoon <2673031505@qq.com>
Date: Tue, 1 Sep 2020 15:00:36 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=87=AA=E6=8F=90=E6=98=BE?=
=?UTF-8?q?=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pageC/cart/ConfirmOrder.vue | 33 ++++++++++++++++++++++++++-------
pageE/order/Details.vue | 12 ++++++++----
2 files changed, 34 insertions(+), 11 deletions(-)
diff --git a/pageC/cart/ConfirmOrder.vue b/pageC/cart/ConfirmOrder.vue
index 3dae2a0..f361dd4 100644
--- a/pageC/cart/ConfirmOrder.vue
+++ b/pageC/cart/ConfirmOrder.vue
@@ -48,6 +48,10 @@
+
+ 自提地址
+ {{ orderInfo.store_list[index].store_address }}
+
@@ -387,6 +391,12 @@ export default {
},
async setDelivery(index) {
// console.log(index);
+ if(index == 1) {
+ if(!this.isTakeawayer) this.$u.toast('此地区不支持骑手配送');
+ return false;
+ this.delivery = this.deliveryList[index];
+ this.getFreight();
+ }
if(index == 2) {
this.is_selfraising = 1;
for (const key in this.freight) {
@@ -400,12 +410,6 @@ export default {
} else {
this.is_selfraising = 0;
}
- if(index == 1) {
- if(!this.isTakeawayer) this.$u.toast('此地区不支持骑手配送');
- return false;
- this.delivery = this.deliveryList[index];
- this.getFreight();
- }
if(index == 0) {
this.delivery = this.deliveryList[index];
this.getFreight();
@@ -434,6 +438,7 @@ export default {
min-height: calc(100vh - var(--window-top));
background-color: #ECECEC;
padding-top: 1rpx;
+ padding-bottom: 200rpx;
.info-address {
padding: 30rpx;
display: flex;
@@ -591,10 +596,24 @@ export default {
}
}
}
+ .pick-up {
+ padding: 30rpx;
+ background: rgba(255,255,255,1);
+ .title {
+ font-size: 28rpx;
+ color: #666666;
+ margin-bottom: 30rpx;
+ }
+ .content {
+ font-size: 30rpx;
+ color: #343434;
+ line-height: 40rpx;
+ }
+ }
}
}
.common-active {
- padding-bottom: 200rpx;
+ padding-bottom: 30rpx;
> view {
height: 98rpx;
background: rgba(255,255,255,1);
diff --git a/pageE/order/Details.vue b/pageE/order/Details.vue
index 4896201..3681d78 100644
--- a/pageE/order/Details.vue
+++ b/pageE/order/Details.vue
@@ -39,10 +39,6 @@
-
- 配送方式
- 自提
-
运费(快递/骑手)
￥{{ orderInfo.shipping_fee }}
@@ -63,12 +59,17 @@
支付方式
{{ orderInfo.payment_name }}
+
+ 配送方式
+ 自提
+
订单编号：{{ orderInfo.order_sn }}
支付单号：{{ orderInfo.pay_sn }}
创建时间：{{ orderInfo.add_time | date}}
+ 自提地址：{{ orderInfo.extend_store.store_address }}
@@ -464,6 +465,9 @@ export default {
> view:not(:last-child) {
margin-bottom: 30rpx;
}
+ .address {
+ line-height: 40rpx;
+ }
}
}
.btn {