From e876fed618abd4237b9818424b72d01e24f8908c Mon Sep 17 00:00:00 2001
From: xuxueyang <xuxy@fengyuntec.com>
Date: 星期四, 01 八月 2024 16:22:17 +0800
Subject: [PATCH] update
---
sub_pages/customer/shopping/confirm.vue | 63 +++++++++++++++++++++++--------
1 files changed, 47 insertions(+), 16 deletions(-)
diff --git a/sub_pages/customer/shopping/confirm.vue b/sub_pages/customer/shopping/confirm.vue
index 18ecf6c..777dd9a 100644
--- a/sub_pages/customer/shopping/confirm.vue
+++ b/sub_pages/customer/shopping/confirm.vue
@@ -37,6 +37,10 @@
value: ''
})
})
+ if (this.address.id) {
+ this.loadTransportList()
+ this.cacheAddressId = this.address.id
+ }
//先获取直接的全部地址
// @ApiModelProperty(value = "订单商品")
// private List<FlowerCartListDTO> flowers;
@@ -70,6 +74,12 @@
this.loadTransportList()
this.cacheAddressId = nv.id
+ } else if (!nv.id) {
+ //说明id清空了
+ if (!this.cacheAddressId) {
+ transportList = []
+ this.cacheAddressId = ''
+ }
}
}
},
@@ -80,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 {
@@ -103,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
@@ -152,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()
}
})
@@ -183,8 +205,8 @@
</view>
<view>
<view class="flower-container m-t-12 br-4 p10">
- <view class="shopping-item m-b-20" v-for="(item,index) of dto.flowers" :key="index">
- <u-divider v-if="index>0"></u-divider>
+ <view class="shopping-item " v-for="(item,index) of dto.flowers" :key="index">
+ <!-- <view class="line-gray" v-if></view> -->
<view class="sup-title flex">
<image class="icon-dp img100 m-r-10" src="/static/common/icon-dp.png"></image>
<view>{{ item.supplierName || '-' }}</view>
@@ -213,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">
@@ -228,20 +251,21 @@
</view>
</view>
</view>
- <view class="m-t-20" v-if="false">
+ <view class="m-t-20" v-if="true">
<view class="desc-red">
10kg以下的零买订单将收取打包费，花店建议购满20kg， 可选冷链物流
</view>
<view class="desc">
- 预计装1Mini件，运费约18.00元(5公斤内18元，不满5公斤按5公斤计费，每件货不能超过5公斤)，第一汤下单预计次日凌晨发货，备货高峰期除外，冷链汽车运输，发货后72小时左右到货，三线城市会推迟6-12小时，顺丰送货到店。
- 优势:价格便宜，顺丰配送
- 弊端:订单必须是5kg以内
+ <!-- 预计装1Mini件，运费约18.00元(5公斤内18元，不满5公斤按5公斤计费，每件货不能超过5公斤)， -->
+ 第一次下单预计次日凌晨发货，备货高峰期除外，冷链汽车运输，发货后72小时左右到货，三线城市会推迟6-12小时送货到店。
+ <!-- 优势:价格便宜，顺丰配送 -->
+ <!-- 弊端:订单必须是5kg以内 -->
</view>
</view>
</view>
<view class="p10 bg-white m-t-20 br-4">
- <view class="form-item ">
+ <view class="form-item flex ">
<view class="label">特殊需求</view>
<!-- <view class="m-l-a m-r-0 flex1">
<view class="m-t-12 m-b-12">
@@ -261,7 +285,7 @@
<view class="label">留言</view>
<view class="m-l-a m-r-0 flex1">
<view class="m-t-12 m-b-12">
- <u-textarea v-model="dto.remarks" placeholder="填写内容需与卖家协商并确认">
+ <u-textarea v-model="dto.remarks" clearable placeholder="填写内容需与卖家协商并确认">
</u-textarea>
</view>
@@ -318,6 +342,8 @@
background-color: #ffffff;
left: 0rpx;
padding: 20rpx;
+ z-index: 99;
+ z-index: 11;
right: 0rpx;
bottom: 0rpx;
}
@@ -326,7 +352,7 @@
background-color: #ffffff;
.shopping-item {
- padding: 28rpx 22rpx;
+ padding: 10rpx 22rpx;
position: relative;
.sup-title {
@@ -402,6 +428,7 @@
background-color: #ffffff;
.transform-list {
+ overflow-x: scroll;
.transform-item {
background: rgba(225, 240, 231, 0.38);
border-radius: 8rpx;
@@ -415,6 +442,7 @@
margin-right: auto;
max-width: 32%;
width: 130rpx;
+ min-width: 130rpx;
.title {
font-weight: 400;
@@ -447,6 +475,9 @@
margin-right: 0;
}
+ .desc-red {}
+
+ .desc {}
}
}
--
Gitblit v1.9.3