From c0c8ba4ea76109e21fde94ace1ea41a402aabf72 Mon Sep 17 00:00:00 2001
From: xuxueyang <xuxy@fengyuntec.com>
Date: 星期四, 01 八月 2024 16:57:45 +0800
Subject: [PATCH] fix bug
---
sub_pages/customer/shopping/confirm.vue | 52 +++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 45 insertions(+), 7 deletions(-)
diff --git a/sub_pages/customer/shopping/confirm.vue b/sub_pages/customer/shopping/confirm.vue
index 777dd9a..628c5c7 100644
--- a/sub_pages/customer/shopping/confirm.vue
+++ b/sub_pages/customer/shopping/confirm.vue
@@ -41,11 +41,24 @@
this.loadTransportList()
this.cacheAddressId = this.address.id
}
+ //
//先获取直接的全部地址
// @ApiModelProperty(value = "订单商品")
// private List<FlowerCartListDTO> flowers;
// @ApiModelProperty(value = "打包费")
// private BigDecimal packing;
+
+ if (this.currentInfo.customerDTO && this.currentInfo.customerDTO.partnerId) {
+ this.$http.request('get', '/api/partner/page/view', {
+ params: {
+ id: this.currentInfo.customerDTO.partnerId
+ }
+ }).then(res => {
+ if (res.code == 0) {
+ this.partnerInfo = res.data || {}
+ }
+ })
+ }
},
data() {
@@ -65,6 +78,7 @@
need_columns: [
[]
],
+ partnerInfo: {},
}
},
@@ -126,7 +140,7 @@
}
if (!this.address.id) {
- this.$message.showToast('请选择收货地址',{
+ this.$message.showToast('请选择收货地址', {
duration: 2000
})
return
@@ -234,6 +248,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">
@@ -267,13 +310,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
}">
@@ -429,6 +466,7 @@
.transform-list {
overflow-x: scroll;
+
.transform-item {
background: rgba(225, 240, 231, 0.38);
border-radius: 8rpx;
--
Gitblit v1.9.3