From 4a654abb7ad0deef8bbcef0be343f1a0668ca8b9 Mon Sep 17 00:00:00 2001
From: wuhui_zzw <1760308791@qq.com>
Date: Thu, 11 Apr 2024 17:02:01 +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/users/order_list/index.vue | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/pages/users/order_list/index.vue b/pages/users/order_list/index.vue
index 03d0245..61573cf 100644
--- a/pages/users/order_list/index.vue
+++ b/pages/users/order_list/index.vue
@@ -60,9 +60,7 @@
 						<view class='item' v-for="(item,index) in orderList" :key="index">
 							<view @click='goOrderDetails(item.group_order_id)'>
 								<view class='title acea-row row-between-wrapper'>
-									<view class="acea-row row-middle left-wrapper">
-										{{item.group_order_sn}}
-									</view>
+									<view class="acea-row row-middle left-wrapper">{{item.group_order_sn}}</view>
 									<view class='t-color'>{{ item.orderList[0].activity_type === 2 && item.orderList[0].orderProduct[0].cart_info.productPresell.presell_type ==2 ? "待付定金" : "待付款" }}</view>
 								</view>
 								<view v-for="(order,j) in item.orderList" :key="order.order_id+j">
@@ -135,7 +133,7 @@
 						<view class='item' v-for="(item,index) in orderList" :key="index">
 							<view @click='goOrderDetails(item.order_id)'>
 								<view class='title acea-row row-between-wrapper'>
-									<view class="acea-row row-middle left-wrapper" @click.stop="goMall(item)">
+									<view class="acea-row row-middle left-wrapper" @click.stop="goMall(item)" v-if="item.mer_id > 0">
 										<text class="iconfont icon-shangjiadingdan"></text>
 										<view class="store-name">{{item.merchant.mer_name}}</view>
 										<text class="iconfont icon-xiangyou"></text>