From 870110a79a12944fc001f8a66178d23839c6aed6 Mon Sep 17 00:00:00 2001
From: fanfan <franceesfan@163.com>
Date: Sun, 11 Aug 2024 13:23:58 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=86=E8=8A=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/news3/shopOrderDetails.vue | 3 +--
 pages/order/detail.vue           | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/pages/news3/shopOrderDetails.vue b/pages/news3/shopOrderDetails.vue
index 5f575aa..4e589a1 100644
--- a/pages/news3/shopOrderDetails.vue
+++ b/pages/news3/shopOrderDetails.vue
@@ -190,7 +190,7 @@
 						</view>
 						<view style="overflow: hidden;">
 							<view class="merchant" v-for="(item, idx) in orderInfo.merchant">
-								<view class="merchantImg">
+								<view class="merchantImg" v-if="item.image_url">
 									<image @click="previewImage(idxs,item.image_url)" :src="img.preview_url"
 										v-for="(img, idxs) in item.image_url" mode=""></image>
 								</view>
@@ -1279,7 +1279,6 @@
 			display: flex;
 			flex-wrap: wrap;
 			flex-direction: row;
-			min-height: 100rpx;
 		}
 
 		.merchantImg image {
diff --git a/pages/order/detail.vue b/pages/order/detail.vue
index 592c9c5..bb00117 100644
--- a/pages/order/detail.vue
+++ b/pages/order/detail.vue
@@ -214,7 +214,7 @@
 				</view>
 				<view style="overflow: hidden;">
 					<view class="merchant" v-for="(item, idx) in order.merchant">
-						<view class="merchantImg">
+						<view class="merchantImg" v-if="item.image_url">
 							<image @click="previewImage(idxs,item.image_url)" :src="img.preview_url"
 								v-for="(img, idxs) in item.image_url" mode=""></image>
 						</view>
@@ -1615,7 +1615,6 @@
 			display: flex;
 			flex-wrap: wrap;
 			flex-direction: row;
-			min-height: 100rpx;
 		}
 
 		.merchantImg image {