From 68b29d2fb7b137949b2660a5f63e22c151176d82 Mon Sep 17 00:00:00 2001
From: 1154079537 <1154079537@qq.com>
Date: Mon, 13 May 2024 17:29:57 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=8D=E7=A7=B0=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/order_details/index.vue | 45 ++++++++++++++++++++++-------------
 1 file changed, 28 insertions(+), 17 deletions(-)

diff --git a/pages/order_details/index.vue b/pages/order_details/index.vue
index 9e66f9d..61854e8 100644
--- a/pages/order_details/index.vue
+++ b/pages/order_details/index.vue
@@ -126,19 +126,21 @@
 						</view>
 					</view>
 				</view>
-				<view class="merchant line1" v-if="orderInfo.merchant && orderInfo.order_type != 1"
+				<view class="merchant" v-if="orderInfo.merchant && orderInfo.order_type != 1"
 					@click="goStore(orderInfo.mer_id)">
-					{{orderInfo.merchant.mer_name}}
+					<text class="merchant_name line1">{{orderInfo.merchant.mer_name}}</text>
 					<text class="iconfont icon-xiangyou"></text>
 				</view>
 				<block v-if="cartInfo.length>0">
-					<orderGoods :orderData='orderInfo' :pay_type="orderInfo.pay_type" :status="orderInfo.status"  :evaluate='orderInfo.status'
-						:activityType='orderInfo.activity_type' :sale_type="sale_type" :orderId="order_id" :cartInfo="cartInfo" :jump="true">
+					<orderGoods :orderData='orderInfo' :pay_type="orderInfo.pay_type" :status="orderInfo.status"
+						:evaluate='orderInfo.status' :activityType='orderInfo.activity_type' :sale_type="sale_type"
+						:orderId="order_id" :cartInfo="cartInfo" :jump="true">
 					</orderGoods>
 					<block
 						v-if="orderInfo.order_type == 1 && orderInfo.takeOrderList && orderInfo.takeOrderList.length > 0"
 						v-for="(item,index) in orderInfo.takeOrderList" :key="index">
-						<orderGoods :orderData='item' :pay_type="orderInfo.pay_type" :status="orderInfo.status" :evaluate='item.status' :activityType='item.activity_type' :sale_type="sale_type"
+						<orderGoods :orderData='item' :pay_type="orderInfo.pay_type" :status="orderInfo.status"
+							:evaluate='item.status' :activityType='item.activity_type' :sale_type="sale_type"
 							:orderId="item.order_id" :cartInfo="item.orderProduct" :jump="true"></orderGoods>
 					</block>
 				</block>
@@ -244,9 +246,9 @@
 						<view class='conter' v-if="orderInfo.pay_type==4 || orderInfo.pay_type==5">支付宝支付</view>
 						<view class='conter'
 							v-if="orderInfo.pay_type==1 || orderInfo.pay_type==2 || orderInfo.pay_type==3">微信支付</view>
-            <view class='conter' v-if="orderInfo.pay_type==11">微信收款</view>
-            <view class='conter' v-if="orderInfo.pay_type==12">现金收款</view>
-            <view class='conter' v-if="orderInfo.pay_type==13">支付宝收款</view>
+						<view class='conter' v-if="orderInfo.pay_type==11">微信收款</view>
+						<view class='conter' v-if="orderInfo.pay_type==12">现金收款</view>
+						<view class='conter' v-if="orderInfo.pay_type==13">支付宝收款</view>
 					</view>
 					<view class='item acea-row row-between' v-if="orderInfo.mark">
 						<view>买家留言：</view>
@@ -286,10 +288,11 @@
 					<view>优惠券抵扣：</view>
 					<view class='conter' style="color: #F55726;">-￥{{orderInfo.coupon_price}}</view>
 				</view>
-        <view class='item acea-row row-between' v-if='orderInfo.platform_coupon_price > 0'>
-        	<view>平台优惠抵扣：</view>
-        	<view class='conter' style="width: auto;color: #F55726;">-￥{{orderInfo.platform_coupon_price}}</view>
-        </view>
+				<view class='item acea-row row-between' v-if='orderInfo.platform_coupon_price > 0'>
+					<view>平台优惠抵扣：</view>
+					<view class='conter' style="width: auto;color: #F55726;">-￥{{orderInfo.platform_coupon_price}}
+					</view>
+				</view>
 				<view class='item acea-row row-between' v-if='orderInfo.integral'>
 					<view>积分抵扣：</view>
 					<view class='conter'>-￥{{orderInfo.integral_price}}</view>
@@ -511,7 +514,7 @@
 					invoice: false,
 					add: false,
 				},
-        sale_type: 1
+				sale_type: 1
 			};
 		},
 		computed: {
@@ -534,7 +537,7 @@
 		onLoad: function(options) {
 			if (options.order_id) {
 				this.$set(this, 'order_id', options.order_id);
-        options.sale_type ? this.sale_type = options.sale_type : null;
+				options.sale_type ? this.sale_type = options.sale_type : null;
 			}
 		},
 		onShow() {
@@ -613,7 +616,7 @@
 			goStore(mer_id) {
 				if (this.hide_mer_status != 1) {
 					uni.navigateTo({
-						url: '/pages/store/home/index?id=' + mer_id  + '&sale_type=' + this.sale_type
+						url: '/pages/store/home/index?id=' + mer_id + '&sale_type=' + this.sale_type
 					})
 				}
 			},
@@ -938,11 +941,12 @@
 				})
 				orderAgain({
 					data: data,
-          sale_type: this.sale_type
+					sale_type: this.sale_type
 				}).then(res => {
 					let cart_id = res.data.cart_id.join(',')
 					return uni.navigateTo({
-						url: '/pages/users/order_confirm/index?cartId=' + cart_id + '&sale_type=' + this.sale_type
+						url: '/pages/users/order_confirm/index?cartId=' + cart_id + '&sale_type=' +
+							this.sale_type
 					});
 				}).catch(err => {
 					that.$util.Tips({
@@ -1054,6 +1058,7 @@
 	}
 
 	.merchant {
+		display: flex;
 		width: 100%;
 		height: 86rpx;
 		padding: 0 30rpx;
@@ -1065,6 +1070,12 @@
 		box-sizing: border-box;
 		background-color: #fff;
 
+		.merchant_name {
+			display: inline-block;
+			overflow: hidden;
+			max-width: 700rpx;
+		}
+
 		.iconfont {
 			margin-top: 6rpx;
 			font-size: 22rpx;