From 5abb3f2496eb0e5b41d6d8702cd5b0804f125cef Mon Sep 17 00:00:00 2001
From: ghusermoon <2673031505@qq.com>
Date: Fri, 24 Jul 2020 20:35:28 +0800
Subject: [PATCH] comment 7.24

---
 components/shop/group/index.vue       | 17 ++++++++++++-----
 components/shop/list/index.vue        |  2 +-
 components/shop/recommend/pintuan.vue |  2 +-
 pageB/sdetails/index.vue              | 24 +++++++++++++++---------
 pages/shop/index.vue                  | 15 +++------------
 5 files changed, 32 insertions(+), 28 deletions(-)

diff --git a/components/shop/group/index.vue b/components/shop/group/index.vue
index fba5f4f..062151c 100644
--- a/components/shop/group/index.vue
+++ b/components/shop/group/index.vue
@@ -23,14 +23,12 @@ export default {
     components:{
         sitem
 	},
-	props: {
-		classifyList: Array,
-	},
     data(){
         return {
 			current: -1,
 			swiperCurrent: 0,
 			groupList: [], // 拼团商品
+			classifyList: [],
         }
 	},
 	watch: {
@@ -39,9 +37,18 @@ export default {
 		}
 	},
 	created() {
-		this.current = 0;
+		this.getGoodsClass();
 	},
 	methods: {
+		// 获取优惠券拼团分类
+		getGoodsClass() {
+			this.$u.api.getGoodsClass().then(res => {
+				if(res.errCode == 0) {
+					this.classifyList = res.data;
+					this.current = 0;
+				}
+			})
+		},
 		// 拼团列表
 		getPinTuanList(id) {
 			this.$u.api.getPinTuanList({
@@ -88,7 +95,7 @@ export default {
     }
     .list {
 		box-sizing: border-box;
-		padding: 30rpx;
+		padding: 0 30rpx;
         display: flex;
         justify-content: space-between;
     }
diff --git a/components/shop/list/index.vue b/components/shop/list/index.vue
index 9a0d72f..55d8653 100644
--- a/components/shop/list/index.vue
+++ b/components/shop/list/index.vue
@@ -57,7 +57,7 @@ export default {
 				page: this.page, 
 				reload: false,
 			}).then(length => {
-				console.log(length);
+				// console.log(length);
 				if(length == 0) {
 					this.page--;
 					this.loadStatus = 'nomore';
diff --git a/components/shop/recommend/pintuan.vue b/components/shop/recommend/pintuan.vue
index fa3193f..cfa60a9 100644
--- a/components/shop/recommend/pintuan.vue
+++ b/components/shop/recommend/pintuan.vue
@@ -35,7 +35,7 @@ export default {
 	props: ['recommendData', 'type'],
 	created() {
 		this.info = this.recommendData;
-		console.log(this.recommendData);
+		// console.log(this.recommendData);
 	},
 	methods: {
 		toDetailsPage() {
diff --git a/pageB/sdetails/index.vue b/pageB/sdetails/index.vue
index 5443d92..4656f7c 100644
--- a/pageB/sdetails/index.vue
+++ b/pageB/sdetails/index.vue
@@ -72,7 +72,7 @@
 				</view>
 			</view>
 		</view>
-		<u-popup v-model="showGroupUser" mode="center">
+		<u-popup v-model="showGroupUser" mode="center" z-index="10078">
 			<view class="launch-container">
 				<view class="title u-line-1">正在拼团</view>
 				<scroll-view class="launch-view">
@@ -81,6 +81,7 @@
 							<image class="avatar" :src="user[0].member_avatar"></image>
 							<view class="name u-line-1">{{ user[0].member_nickname }}</view>
 						</view>
+						<view class="pintuan-none" v-if="!groupUser.length">暂无拼团</view>
 					</view>
 				</scroll-view>
 				<image class="close" src="/static/image/common/17.png" @click="showGroupUser=false"></image>
@@ -209,11 +210,6 @@ export default {
 			this.xuanze(value);
 		},
 	},
-	onShow() {
-		this.showSpec = false;
-		this.showGroupUser = false;
-		this.showInvolvementUser = false;
-	},
 	onLoad(option) {
 		// this.init();
 		// console.log(option);
@@ -222,6 +218,11 @@ export default {
 		this.getGoodsDetails(this.id);
 		this.setTitle();
 	},
+	onShow() {
+		this.showSpec = false;
+		this.showGroupUser = false;
+		this.showInvolvementUser = false;
+	},
 	beforeDestroy() {
 		clearInterval(this.timer);
 	},
@@ -747,6 +748,11 @@ export default {
 						margin-right: 80rpx;
 					}
 				}
+				.pintuan-none {
+					font-size: 36rpx;
+					color: #333;
+					margin: 100rpx auto 0;
+				}
 			}
 			
 		}
@@ -852,7 +858,7 @@ export default {
 		display: flex;
 		font-size: 32rpx;
 		color: rgba(255,255,255,1);
-		z-index: 99;
+		z-index: 10076;
 		.launch {
 			flex: 1;
 			background: rgba(253,211,96,1);
@@ -873,7 +879,7 @@ export default {
 		width: 100%;
 		height: 98rpx;
 		display: flex;
-		z-index: 99;
+		z-index: 10076;
 		.left {
 			width: 190rpx;
 			display: flex;
@@ -914,7 +920,7 @@ export default {
 		width: 100%;
 		bottom:0;
 		border-top: 1rpx solid #ececec;
-		z-index: 1000000;
+		z-index: 10076;
 		.navs{
 			display: flex;
 			flex-direction: column;
diff --git a/pages/shop/index.vue b/pages/shop/index.vue
index 606f152..994e236 100644
--- a/pages/shop/index.vue
+++ b/pages/shop/index.vue
@@ -42,7 +42,7 @@
 		<!-- 拼团推荐 -->
         <pintuan v-if="JSON.stringify(pinTuanPush) != '{}'" :recommendData="pinTuanPush"></pintuan>
 		<!-- 拼团列表 -->
-        <group :classifyList="couponGroupList"></group>
+        <group></group>
         <image class="lingquan"></image>
         <youhq></youhq>
         <list ref="recommendGoods"></list>
@@ -83,11 +83,11 @@ export default {
             keyword: "",
 			list: [],
 			goodsClassify: [], // 商品分类
-			classifyList: [],
+			// classifyList: [],
 			recommendedSpike: {}, // 秒杀推荐
 			spikeList: [], // 全部秒杀列表
 			seckillTime: {}, // 秒杀时间
-			couponGroupList: [], // 优惠券拼团分类
+			// couponGroupList: [], // 优惠券拼团分类
 			pinTuanPush: {}, // 拼团推荐
         }
 	},
@@ -97,7 +97,6 @@ export default {
 	onShow() {
 		this.getRecommendedSpike();
 		this.getSpikeList();
-		this.getGoodsClass();
 		this.getPinTuanPush();
 	},
 	methods: {
@@ -137,14 +136,6 @@ export default {
 				}
 			})
 		},
-		// 获取优惠券拼团分类
-		getGoodsClass() {
-			this.$u.api.getGoodsClass().then(res => {
-				if(res.errCode == 0) {
-					this.couponGroupList = res.data;
-				}
-			})
-		},
 		// 全部秒杀
 		getSpikeList() {
 			this.$u.api.getSpikeList({ page: 0 }).then(res => {