From f43ef06ff00f4be534b700ff222956e77be47195 Mon Sep 17 00:00:00 2001
From: weipengfei <2187978347@qq.com>
Date: Wed, 8 Nov 2023 12:00:24 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/columnGoods/goods_search_con/index.vue | 51 ++++++++++++++------
 pages/order_addcart/order_addcart.vue        |  2 +-
 pages/users/order_confirm/index.vue          |  3 +-
 3 files changed, 38 insertions(+), 18 deletions(-)

diff --git a/pages/columnGoods/goods_search_con/index.vue b/pages/columnGoods/goods_search_con/index.vue
index 0670e5a..fed435a 100644
--- a/pages/columnGoods/goods_search_con/index.vue
+++ b/pages/columnGoods/goods_search_con/index.vue
@@ -157,24 +157,28 @@
 									<view class="avater">
 										<image :src="item.mer_avatar" mode=""></image>
 									</view>
-									<view class=" text">
-										<view class="text_one">
-											<view class="">
+									<view class="text">
+										<view class="text_one text_flex">
+											<view class="text_flex">
 												<image src="@/static/images/phone.png" mode=""></image>
 												{{item.service_phone}}
 											</view>
-											<view class="text_one_r">
+											<view class="text_one_r text_flex">
 												<image src="@/static/images/clock.png" mode=""></image>
 												{{item.mer_take_time[0]}}-{{item.mer_take_time[1]}}
 											</view>
 										</view>
-										<view class="text_two">
+										<view class="text_two text_flex">
 											<image src="@/static/images/shangpu.png" mode=""></image>
-											{{item.mer_info}}
+											<view class="text_tip">
+                        {{item.mer_info}}
+                      </view>
 										</view>
-										<view class="text_three">
+										<view class="text_three text_flex">
 											<image src="@/static/images/dingwei.png" mode=""></image>
-											{{item.mer_address}}
+                      <view class="text_tip">
+                        {{item.mer_address}}
+                      </view>
 										</view>
 									</view>
 								</view>
@@ -1204,6 +1208,12 @@
 		}
 	}
 
+    
+  .text_flex{
+    display: flex;
+    align-items: center;
+  }
+  
 	.productList .list .item .text .money {
 		display: flex;
 		align-items: center;
@@ -1521,11 +1531,12 @@
 						margin-left: 20px;
 
 						.avater {
-							width: 60px;
+							width: 80px;
 							height: 80px;
+              flex-shrink: 0;
 
 							image {
-								width: 60px;
+								width: 80px;
 								height: 80px;
 							}
 						}
@@ -1541,10 +1552,13 @@
 									width: 20px;
 									height: 20px;
 									margin-right: 10px;
+                  flex-shrink: 0;
 								}
 
 								.text_one_r {
+                  flex: 1;
 									margin-left: 10px;
+                  
 								}
 							}
 
@@ -1553,14 +1567,17 @@
 								height: 30px;
 								line-height: 30px;
 								padding-left: 10px;
-								white-space: nowrap;
-								overflow: hidden;
-								text-overflow: ellipsis;
+                .text_tip{
+                  white-space: nowrap;
+                  overflow: hidden;
+                  text-overflow: ellipsis;          
+                }
 
 								image {
 									width: 20px;
 									height: 20px;
 									margin-right: 10px;
+                  flex-shrink: 0;
 								}
 							}
 
@@ -1569,9 +1586,11 @@
 								height: 30px;
 								line-height: 30px;
 								padding-left: 10px;
-								white-space: nowrap;
-								overflow: hidden;
-								text-overflow: ellipsis;
+                .text_tip{
+                  white-space: nowrap;
+                  overflow: hidden;
+                  text-overflow: ellipsis;          
+                }
 
 								image {
 									width: 20px;
diff --git a/pages/order_addcart/order_addcart.vue b/pages/order_addcart/order_addcart.vue
index a71e449..9b63810 100644
--- a/pages/order_addcart/order_addcart.vue
+++ b/pages/order_addcart/order_addcart.vue
@@ -579,7 +579,7 @@
 				})
 				if (selectValue.length > 0) {
 					uni.navigateTo({
-						url: '/pages/users/order_confirm/index?cartId=' + selectValue.join(',')
+						url: '/pages/users/order_confirm/index?cartId=' + selectValue.join(',') + '&product_type=' + this.product_type
 					});
 				} else {
 					return this.$util.Tips({
diff --git a/pages/users/order_confirm/index.vue b/pages/users/order_confirm/index.vue
index aad800e..9b62720 100644
--- a/pages/users/order_confirm/index.vue
+++ b/pages/users/order_confirm/index.vue
@@ -1029,7 +1029,8 @@
 					address_id: address_id,
 					takes: that.take,
 					use_coupon: that.subCoupon,
-					use_integral: that.use_integral
+					use_integral: that.use_integral,
+          product_type: that.product_type
 				}).then(res => {
 					// 默认选中
 					that.product_type=res.data.order_type