From 3f77553b097cd3bf505bf2525a28f800b93ed16e Mon Sep 17 00:00:00 2001
From: fanfan <franceesfan@163.com>
Date: Sun, 11 Aug 2024 22:03:16 +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/shopList/index.vue    | 2 +-
 pages/shopList/shopPage.vue | 9 ++++++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/pages/shopList/index.vue b/pages/shopList/index.vue
index 076410f..e6a6e14 100644
--- a/pages/shopList/index.vue
+++ b/pages/shopList/index.vue
@@ -17,7 +17,7 @@
 		<view class="list">
 			<view v-for="(item, index) in shopsList" :key="index" class="shop-item">
 				<view class="shop-info">
-					<image :src="item.logoImage.external_url" mode="aspectFill" class="logo"></image>
+					<image v-if="item.logoImage" :src="item.logoImage.external_url" mode="aspectFill" class="logo"></image>
 					<view class="info-box">
 						<view class="info-top">
 							<text class="name">{{ item.shop_name }}</text>
diff --git a/pages/shopList/shopPage.vue b/pages/shopList/shopPage.vue
index 4f754d5..302b8e9 100644
--- a/pages/shopList/shopPage.vue
+++ b/pages/shopList/shopPage.vue
@@ -105,7 +105,8 @@
 			<view class="toTop" v-if="isTop" @click="openScrollTo()">
 				<image :src="$picUrl+'/static/toTop.png?=1'"></image>
 			</view>
-		</view><addShuiyin />
+		</view>
+		<addShuiyin />
 	</view>
 </template>
 
@@ -599,7 +600,9 @@
 						height: 100%;
 						width: calc(100% - 108rpx);
 						display: flex;
-						flex-direction: column;
+						display: flex;
+						flex-wrap: wrap;
+						justify-content: space-between;
 
 						.filter-box {
 							height: 88rpx;
@@ -664,7 +667,7 @@
 								border: 1px solid #EAEAEA;
 
 								&:nth-child(2n+1) {
-									margin-right: auto;
+									// margin-right: auto;
 								}
 
 								>image {