From 67aaec3dc689d37e67471d6b3871a9c29822292c Mon Sep 17 00:00:00 2001
From: wuhui_zzw <1760308791@qq.com>
Date: Thu, 11 Apr 2024 15:17:45 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=EF=BC=9A=E6=80=BB=E5=B9=B3?=
 =?UTF-8?q?=E5=8F=B0=E5=95=86=E5=93=81=E5=9C=A8=E8=AE=A2=E5=8D=95=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85=E6=98=BE=E7=A4=BA=E5=86=85=E5=AE=B9=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=EF=BC=8C=E4=B8=8D=E6=98=BE=E7=A4=BA=E5=BA=97=E9=93=BA=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/order_details/stay.vue | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pages/order_details/stay.vue b/pages/order_details/stay.vue
index d74bd5c..31d582a 100644
--- a/pages/order_details/stay.vue
+++ b/pages/order_details/stay.vue
@@ -11,7 +11,7 @@
 						<view class='state'>请在{{orderInfo.cancel_time}}前完成支付!</view>
 						<view>{{orderInfo.add_time_y}}<text class='time'>{{orderInfo.create_time}}</text></view>
 					</view>
-				</view>	
+				</view>
 				<view class='nav'>
 					<view class='navCon acea-row row-between-wrapper'>
 						<view class="on">待付款</view>
@@ -53,7 +53,8 @@
 			</view>
 			<!-- 店铺商品列表 -->
 			<view class="order-wrapper" v-for="(item,index) in orderInfo.orderList" :key="index">
-				<view class="title" @click="goStore(item)">{{item.merchant.mer_name}}<text class="iconfont icon-xiangyou"></text>
+				<view v-if="item.mer_id > 0" class="title" @click="goStore(item)">
+          {{item.merchant.mer_name}}<text class="iconfont icon-xiangyou"></text>
 				</view>
 				<view class="goods-box">
 					<view v-for="(goods,j) in item.orderProduct" :key="goods.order_product_id" @click="goProduct(goods)">
@@ -169,7 +170,7 @@
 		</view>
 		<authorize @onLoadFun="onLoadFun" :isAuto="isAuto" :isShowAuth="isShowAuth" @authColse="authColse"></authorize>
 		<payment :payMode='payMode' :pay_close="pay_close" @onChangeFun='onChangeFun' :order_id="pay_order_id" :totalPrice='totalPrice'></payment>
-	
+
 	</view>
 </template>
 <style scoped lang="scss">
@@ -576,7 +577,7 @@
 					color: #868686;
 				}
 			}
-			
+
 			 .event_name{
 				display: inline-block;
 				margin-right: 9rpx;