From a91fa4708b1cf79aa2f1f5eb52521eccea893fa5 Mon Sep 17 00:00:00 2001
From: ghusermoon <2673031505@qq.com>
Date: Thu, 20 Aug 2020 12:05:15 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E6=8B=BC=E5=9B=A2=E5=95=86?=
 =?UTF-8?q?=E5=93=81=E6=98=BE=E7=A4=BA=E4=B8=8D=E5=85=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/shop/group/index.vue | 14 ++++++++------
 pageE/setting/version.vue       |  4 ++--
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/components/shop/group/index.vue b/components/shop/group/index.vue
index f97a940..6d1ea1e 100644
--- a/components/shop/group/index.vue
+++ b/components/shop/group/index.vue
@@ -13,7 +13,7 @@
 		<swiper :current="swiperCurrent" @animationfinish="animationfinish" style="height: 340rpx;">
 			<swiper-item class="swiper-item list" v-for="(_, i) in classifyList" :key="i">
 				<!-- 最多显示3个 -->
-				<view v-if="groupList[i]">
+				<view v-if="groupList[i]" class="group-container">
 					<sitem :info="info" v-for="(info, index) in groupList[i].slice(0, 3)" :key="index"></sitem>
 				</view>
 				<u-empty text="暂无拼团商品" mode="list" color="#000" v-if="!groupList[i] || !groupList[i].length" style="margin: 0 auto;"></u-empty>
@@ -61,7 +61,7 @@ export default {
 				gc_id: id,
 			}).then(res => {
 				this.groupList[this.current] = res.data;
-				// console.log(this.groupList);
+				console.log(this.groupList);
 				this.$forceUpdate();
 			})
 		},
@@ -105,10 +105,12 @@ export default {
     .list {
 		box-sizing: border-box;
 		padding: 0 30rpx;
-        display: flex;
-		> view {
-			&:not(:nth-child(3n)) {
-				margin-right: 20rpx;
+		.group-container {
+			display: flex;
+			> view {
+				&:not(:nth-child(3n)) {
+					margin-right: 20rpx;
+				}
 			}
 		}
     }
diff --git a/pageE/setting/version.vue b/pageE/setting/version.vue
index 9fc76db..ca9f2a1 100644
--- a/pageE/setting/version.vue
+++ b/pageE/setting/version.vue
@@ -12,8 +12,8 @@
 			</view>
 			<view class="version-view">
 				<text class="title">版本更新</text>
-				<text class="tips" v-if="0">已是最新版本</text>
-				<text class="tips" v-else @click="updateVersion">1.1.10</text>
+				<text class="tips" v-if="1">已是最新版本</text>
+				<text class="tips" v-else @click="updateVersion">发现新版本</text>
 			</view>
 		</view>
 	</view>