Merge branch 'master' of http://git.luyuan.tk/luyuan/deming into xbx

pages/index/index.vue

@@ -276,10 +276,10 @@
 				})
 			},
 			toSearchPage() {
-				
-				// uni.navigateTo({
-				// 	url: '/pageB/follow/index'
-				// })
+			console.log("22");
+			uni.navigateTo({
+			    url: '/pageB/follow/index'
+			});
 			},
 		},
 	}

pages/shop/index.vue

@@ -30,9 +30,6 @@
                 <text>上门取件</text>
             </view>
         </view>
-        <view class="fenlei">
-            <shopitem v-for="item in 5" class="item"></shopitem>
-        </view>
         <view class="fenlei">
             <shopitem v-for="item in goodsClassify" :key="item.gc_id" :info="item" class="item"></shopitem>
         </view>
@@ -43,9 +40,9 @@
         <seckill v-if="spikeList.length" :list="spikeList" :time="seckillTime"></seckill>
         <view v-if="spikeList.length" class="hr" style="margin-top:40rpx"></view>
 		<!-- 拼团 -->
-        <recommend v-if="JSON.stringify(pinTuanPush) != '{}'" :recommendData="pinTuanPush" type='group'></recommend>
+        <pintuan v-if="JSON.stringify(pinTuanPush) != '{}'" :recommendData="pinTuanPush"></pintuan>
         <view class="hr" style="margin-top:40rpx" v-if="JSON.stringify(pinTuanPush) != '{}'"></view>
-        <group></group>
+        <group :groupList="pinTuanList" :classifyList="couponGroupList"></group>
         <image class="lingquan"></image>
         <youhq></youhq>
         <view class="hr" style="margin-top:40rpx"></view>
@@ -59,6 +56,7 @@
 <script>
 import shopitem from "@/components/shop/shop-item/index"
 import recommend from "@/components/shop/recommend/index"
+import pintuan from "@/components/shop/recommend/pintuan"
 import seckill from "@/components/shop/seckill/index"
 import group from "@/components/shop/group/index"
 import youhq from "@/components/shop/youhq/index"
@@ -72,7 +70,8 @@ export default {
         seckill,
         group,
         youhq,
-        list
+		list,
+		pintuan
     },
     data(){
         return {
@@ -274,6 +273,7 @@ export default {
         background-color: #ececec;
     }
 	.cart {
+		z-index: 9;
 		position: fixed;
 		right: 30rpx;
 		bottom: 300rpx;