From 4a14685c7c07407912fa098cc638610bc5a57695 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E7=BF=94=E5=AE=87-=E6=97=85=E7=AE=A1=E5=AE=B6?=
 <153298343@qq.com>
Date: Wed, 11 Jan 2023 14:38:01 +0800
Subject: [PATCH] up

---
 packages/packageBuy/pages/shopDetail/shopDetail.vue | 10 +++++-----
 packages/packageBuy/pages/shopList/shopList.vue     | 10 +++++-----
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/packages/packageBuy/pages/shopDetail/shopDetail.vue b/packages/packageBuy/pages/shopDetail/shopDetail.vue
index 1e12559..0d69d18 100644
--- a/packages/packageBuy/pages/shopDetail/shopDetail.vue
+++ b/packages/packageBuy/pages/shopDetail/shopDetail.vue
@@ -20,12 +20,12 @@
 					<image mode="heightFix" src="../../static/icon_detail_star_pre@2x.png"></image>
 				</view>
 			</view>
-			<view class="shopInfo">
+			<view class="shopInfo" v-if="false">
 				<view class="tit">
 					<image mode="heightFix" src="../../static/icon_shijian@2x.png"></image>
 				</view>
 			</view>
-			<view class="shopInfo">
+			<view class="shopInfo" v-if="false">
 				<view class="tit">
 					<image mode="heightFix" src="../../static/icon_dizhi.png"></image>
 					<text>{{info.merchant.address}}</text>
@@ -44,8 +44,8 @@
 				<image class="pic" src="../../static/shop-logo.png"></image>
 				<view class="infos">
 					<view class="name">{{info.merchant.username}}</view>
-					<view class="date-txt">周一至周日 09:00-18:00</view>
-					<view class="txt">{{info.merchant.address}}</view>
+					<view class="date-txt" v-if="false">周一至周日 09:00-18:00</view>
+					<view class="txt" v-if="false">{{info.merchant.address}}</view>
 				</view>
 			</view>
 		</view>
@@ -68,7 +68,7 @@
 						<view class="i_intro">{{item.product_type.name}}</view>
 					</view>
 					<view class="columnInfo">
-						<view class="title">{{item.name}}</view>
+						<view class="title">{{item.username}}</view>
 						<view class="discuss">
 							<view class="starBox">
 								<image mode="heightFix" src="../../static/icon_detail_star_pre@2x.png">
diff --git a/packages/packageBuy/pages/shopList/shopList.vue b/packages/packageBuy/pages/shopList/shopList.vue
index 74eeecc..d73236d 100644
--- a/packages/packageBuy/pages/shopList/shopList.vue
+++ b/packages/packageBuy/pages/shopList/shopList.vue
@@ -129,14 +129,14 @@
 			}
 			if (options.product_type_id) {
 				this.product_type_id = options.product_type_id
-			}
-			if (options.keyword) {
-				this.keyword = options.keyword;
 			}
-		},
-		onShow() {
+			if (options.keyword) {
+				this.keyword = options.keyword;
+			}
+
 			this.loadPage(1);
 		},
+		onShow() {},
 		methods: {
 			toback: function() {
 				let route = getCurrentPages();