theluyuan/deming
2
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request '新增自提显示' (#316) from zhy into master

Browse Source 
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/316
This commit is contained in:
hansu 2020-09-01 15:02:18 +08:00
commit 8f400e2524
2 changed files with 34 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
pageC/cart/ConfirmOrder.vue
View File

@ -48,6 +48,10 @@
</view> </view>
</view> </view>
</view> </view>
<view class="pick-up" v-if="is_selfraising == 1">
<view class="title">自提地址</view>
<view class="content">{{ orderInfo.store_list[index].store_address }}</view>
</view>
</view> </view>
</view> </view>
<view class="common-active"> <view class="common-active">
@ -387,6 +391,12 @@ export default {
}, },
async setDelivery(index) { async setDelivery(index) {
// console.log(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) { if(index == 2) {
this.is_selfraising = 1; this.is_selfraising = 1;
for (const key in this.freight) { for (const key in this.freight) {
@ -400,12 +410,6 @@ export default {
} else { } else {
this.is_selfraising = 0; 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) { if(index == 0) {
this.delivery = this.deliveryList[index]; this.delivery = this.deliveryList[index];
this.getFreight(); this.getFreight();
@ -434,6 +438,7 @@ export default {
min-height: calc(100vh - var(--window-top)); min-height: calc(100vh - var(--window-top));
background-color: #ECECEC; background-color: #ECECEC;
padding-top: 1rpx; padding-top: 1rpx;
padding-bottom: 200rpx;
.info-address { .info-address {
padding: 30rpx; padding: 30rpx;
display: flex; 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 { .common-active {
padding-bottom: 200rpx; padding-bottom: 30rpx;
> view { > view {
height: 98rpx; height: 98rpx;
background: rgba(255,255,255,1); background: rgba(255,255,255,1);

12
pageE/order/Details.vue
View File

@ -39,10 +39,6 @@
</view> </view>
</view> </view>
<view class="goods-others"> <view class="goods-others">
<view>
<view class="title">配送方式</view>
<view class="price" v-if="orderInfo.is_selfraising == 1">自提</view>
</view>
<view> <view>
<view class="title">运费(快递/骑手)</view> <view class="title">运费(快递/骑手)</view>
<view class="price">￥{{ orderInfo.shipping_fee }}</view> <view class="price">￥{{ orderInfo.shipping_fee }}</view>
@ -63,12 +59,17 @@
<view class="title">支付方式</view> <view class="title">支付方式</view>
<view class="price">{{ orderInfo.payment_name }}</view> <view class="price">{{ orderInfo.payment_name }}</view>
</view> </view>
<view v-if="orderInfo.is_selfraising == 1">
<view class="title">配送方式</view>
<view class="price">自提</view>
</view>
</view> </view>
</view> </view>
<view class="info-order"> <view class="info-order">
<view>订单编号：{{ orderInfo.order_sn }}</view> <view>订单编号：{{ orderInfo.order_sn }}</view>
<view>支付单号：{{ orderInfo.pay_sn }}</view> <view>支付单号：{{ orderInfo.pay_sn }}</view>
<view>创建时间：{{ orderInfo.add_time | date}}</view> <view>创建时间：{{ orderInfo.add_time | date}}</view>
<view v-if="orderInfo.is_selfraising == 1" class="address">自提地址：{{ orderInfo.extend_store.store_address }}</view>
</view> </view>
</view> </view>
<!-- '4', '8' --> <!-- '4', '8' -->
@ -464,6 +465,9 @@ export default {
> view:not(:last-child) { > view:not(:last-child) {
margin-bottom: 30rpx; margin-bottom: 30rpx;
} }
.address {
line-height: 40rpx;
}
} }
} }
.btn { .btn {