From 17bb1250f2120415e5fc9f47fe50b60f72b47a07 Mon Sep 17 00:00:00 2001
From: xuxueyang <xuxy@fengyuntec.com>
Date: 星期日, 04 八月 2024 12:50:01 +0800
Subject: [PATCH] update 优化搜索事件
---
sub_pages/customer/shopping/confirm.vue | 59 +++++++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 49 insertions(+), 10 deletions(-)
diff --git a/sub_pages/customer/shopping/confirm.vue b/sub_pages/customer/shopping/confirm.vue
index 5faf578..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
@@ -205,8 +219,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>
@@ -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
}">
@@ -352,7 +389,7 @@
background-color: #ffffff;
.shopping-item {
- padding: 28rpx 22rpx;
+ padding: 10rpx 22rpx;
position: relative;
.sup-title {
@@ -428,6 +465,8 @@
background-color: #ffffff;
.transform-list {
+ overflow-x: scroll;
+
.transform-item {
background: rgba(225, 240, 231, 0.38);
border-radius: 8rpx;
--
Gitblit v1.9.3