From c9ece393fc028ffecca0915d1b9af62d51b5aef6 Mon Sep 17 00:00:00 2001
From: xuxueyang <xuxy@fengyuntec.com>
Date: 星期二, 13 八月 2024 17:21:19 +0800
Subject: [PATCH] 1
---
sub_pages/customer/shopping/confirm.vue | 79 ++++++++++++++++++++++++++++++++++-----
1 files changed, 68 insertions(+), 11 deletions(-)
diff --git a/sub_pages/customer/shopping/confirm.vue b/sub_pages/customer/shopping/confirm.vue
index 0827637..bfd1426 100644
--- a/sub_pages/customer/shopping/confirm.vue
+++ b/sub_pages/customer/shopping/confirm.vue
@@ -41,11 +41,34 @@
this.loadTransportList()
this.cacheAddressId = this.address.id
}
+ //
//先获取直接的全部地址
// @ApiModelProperty(value = "订单商品")
// private List<FlowerCartListDTO> flowers;
// @ApiModelProperty(value = "打包费")
// private BigDecimal packing;
+
+ // 两种情况,我合伙人是A,我进入页面前改成了B,我进去后还是获取了A——可以通过
+
+ if (this.currentInfo.customerDTO && this.currentInfo.customerDTO.partnerId) {
+ // 考虑一下，由后台实时获取，如果获取的合伙人id不一样，那么就刷新当前用户信息。
+
+ this.$http.request('get', '/api/current/customer/partner', {
+ params: {
+ // id: this.currentInfo.customerDTO.partnerId
+ }
+ }).then(async res => {
+ if (res.code == 0) {
+ this.partnerInfo = res.data || {}
+ if (this.partnerInfo.id !== this.currentInfo.customerDTO.partnerId) {
+ //刷新用户信息
+ await dispatch('getCurrentInfo')
+ }
+ }
+ })
+
+
+ }
},
data() {
@@ -65,6 +88,7 @@
need_columns: [
[]
],
+ partnerInfo: {},
}
},
@@ -126,7 +150,9 @@
}
if (!this.address.id) {
- this.$message.showToast('请选择收货地址')
+ this.$message.showToast('请选择收货地址', {
+ duration: 2000
+ })
return
}
this.dto.addressId = this.address.id
@@ -170,9 +196,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()
}
})
@@ -201,8 +229,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>
@@ -230,6 +258,35 @@
</view>
</view>
</view>
+ <view class="p10 bg-white m-t-20 br-4" v-if="partnerInfo&&partnerInfo.id">
+ <view class="form-item flex ">
+ <view class="label">仓位名称</view>
+ <view class="m-l-a m-r-0 flex desc-gray">
+ <view>{{partnerInfo.cityWarehouse|| '-'}}</view>
+ </view>
+ </view>
+ <view class="form-item flex ">
+ <view class="label">合伙人名称</view>
+ <view class="m-l-a m-r-0 flex desc-gray">
+ <view>{{partnerInfo.name|| '-'}}</view>
+ </view>
+ </view>
+ <view class="form-item flex ">
+ <view class="label">联系方式</view>
+ <view class="m-l-a m-r-0 flex desc-gray">
+ <view>{{partnerInfo.contactTel|| '-'}}</view>
+ </view>
+ </view>
+ <view class="form-item flex ">
+ <view class="label">提货地址</view>
+ <view class="m-l-a m-r-0 flex desc-gray">
+ {{ partnerInfo['province'] || '' }}{{ partnerInfo['city'] && ('/' + partnerInfo['city']) || '' }}{{
+ partnerInfo['region'] && ('/' + partnerInfo['region']) || ''
+ }}{{partnerInfo.address|| '-'}}
+ </view>
+ </view>
+ </view>
+
<!-- 查看商品列表，和选择运费 -->
<view class="br-4 transform-container m-t-12 p10"
v-if="!currentInfo.customerDTO||!currentInfo.customerDTO.partnerId">
@@ -263,13 +320,7 @@
<view class="p10 bg-white m-t-20 br-4">
<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">
- <u-textarea v-model="dto.specialNeeds" placeholder="请输入特殊需求">
- </u-textarea>
- </view>
- </view> -->
<view class="m-l-a m-r-0 flex " :class="[!dto.specialNeeds?'desc-gray':'']" @click="()=>{
show_select_need=true
}">
@@ -338,6 +389,8 @@
background-color: #ffffff;
left: 0rpx;
padding: 20rpx;
+ z-index: 99;
+ z-index: 11;
right: 0rpx;
bottom: 0rpx;
}
@@ -346,7 +399,7 @@
background-color: #ffffff;
.shopping-item {
- padding: 28rpx 22rpx;
+ padding: 10rpx 22rpx;
position: relative;
.sup-title {
@@ -422,6 +475,8 @@
background-color: #ffffff;
.transform-list {
+ overflow-x: scroll;
+
.transform-item {
background: rgba(225, 240, 231, 0.38);
border-radius: 8rpx;
@@ -435,6 +490,7 @@
margin-right: auto;
max-width: 32%;
width: 130rpx;
+ min-width: 130rpx;
.title {
font-weight: 400;
@@ -442,6 +498,7 @@
color: #000000;
line-height: 40rpx;
word-break: break-word;
+ min-height: 90rpx
}
.price {
--
Gitblit v1.9.3