From 7e247648201b208cfb5a5901803f784b7dbda948 Mon Sep 17 00:00:00 2001
From: xuxueyang <xuxy@fengyuntec.com>
Date: 星期三, 31 七月 2024 01:54:17 +0800
Subject: [PATCH] 1
---
sub_pages/customer/shopping/confirm.vue | 49 ++++++++++++++++++++++++++++++++++---------------
1 files changed, 34 insertions(+), 15 deletions(-)
diff --git a/sub_pages/customer/shopping/confirm.vue b/sub_pages/customer/shopping/confirm.vue
index 9bb416c..5faf578 100644
--- a/sub_pages/customer/shopping/confirm.vue
+++ b/sub_pages/customer/shopping/confirm.vue
@@ -37,7 +37,7 @@
value: ''
})
})
- if(this.address.id){
+ if (this.address.id) {
this.loadTransportList()
this.cacheAddressId = this.address.id
}
@@ -74,6 +74,12 @@
this.loadTransportList()
this.cacheAddressId = nv.id
+ } else if (!nv.id) {
+ //说明id清空了
+ if (!this.cacheAddressId) {
+ transportList = []
+ this.cacheAddressId = ''
+ }
}
}
},
@@ -84,8 +90,11 @@
this.dto.specialNeeds = e.value[0].value
},
async loadTransportList() {
+ if (this.currentInfo.customerDTO && this.currentInfo.customerDTO.partnerId) {
+ return
+ }
let that = this;
- console.log('address', that.address, that.cacheAddressId)
+ // console.log('address', that.address, that.cacheAddressId)
if (that.address && that.address.id && that.cacheAddressId !== that.address.id) {
that.$message.showLoading()
const {
@@ -107,12 +116,19 @@
},
async submitOrder() {
console.log('submitOrder', this.dto)
- if (!this.dto.transportId) {
- this.$message.showToast('请选择配送方式')
- return
+ if (this.currentInfo.customerDTO && this.currentInfo.customerDTO.partnerId) {
+
+ } else {
+ if (!this.dto.transportId) {
+ this.$message.showToast('请选择配送方式')
+ return
+ }
}
+
if (!this.address.id) {
- this.$message.showToast('请选择收货地址')
+ this.$message.showToast('请选择收货地址',{
+ duration: 2000
+ })
return
}
this.dto.addressId = this.address.id
@@ -156,9 +172,11 @@
await tmp.$store.dispatch('sign_add', 'shopping')
uni.navigateBack()
},
- fail(err) {
+ async fail(err) {
console.error('pay fail', err)
tmp.$message.showToast('支付失败')
+ await tmp.$store.dispatch('sign_add', 'shopping')
+ uni.navigateBack()
}
})
@@ -217,7 +235,8 @@
</view>
</view>
<!-- 查看商品列表，和选择运费 -->
- <view class="br-4 transform-container m-t-12 p10">
+ <view class="br-4 transform-container m-t-12 p10"
+ v-if="!currentInfo.customerDTO||!currentInfo.customerDTO.partnerId">
<view class="title">
<view>运输方式：</view>
<view class="flex transform-list flex-wrap-normal">
@@ -323,6 +342,8 @@
background-color: #ffffff;
left: 0rpx;
padding: 20rpx;
+ z-index: 99;
+ z-index: 11;
right: 0rpx;
bottom: 0rpx;
}
@@ -420,6 +441,7 @@
margin-right: auto;
max-width: 32%;
width: 130rpx;
+ min-width: 130rpx;
.title {
font-weight: 400;
@@ -451,13 +473,10 @@
.transform-list:nth-child(3n+2) {
margin-right: 0;
}
-
- .desc-red{
-
- }
- .desc{
-
- }
+
+ .desc-red {}
+
+ .desc {}
}
}
--
Gitblit v1.9.3