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

pages/index/index.vue

@@ -53,7 +53,7 @@
 				<scroll-view style="width:100%;height:100%" scroll-y="true">
 					<view class="box">
 						<view class="tuijian">
-							<view class="title" @click="toSearchPage">
+							<view class="title" @click="toSearchPage"  >
 								<view class="left">
 									<view></view>
 									<text>推荐达人</text>
@@ -63,7 +63,7 @@
 							<view class="tuijianlist">
 								<!-- <darenItem style="margin-right:23rpx"></darenItem>
                                 <darenItem style="margin-right:23rpx"></darenItem> -->
-								<darenItem v-for="item in recommendList.slice(0,3)" :key="item.id" :info="item"></darenItem>
+								<darenItem v-for="item in recommendList.slice(0,3)" :key="item.id" :info="item" v-on:pChangeType="changeType" ></darenItem>
 							</view>
 						</view>
 						<view class="list">
@@ -231,6 +231,16 @@
 					}
 				})
 			},
+			changeType(member_id){
+				console.log(member_id);
+				this.$emit("pChangeType")
+				this.$u.api.attentionMember({
+					member_id: member_id
+				}).then((res)=>{
+					console.log(res)
+					this.getRecommendList();
+				})
+			},
 			getZhiBoSwiper() {
 				this.$u.api.getZhiBoSwiper().then(res => {
 					if (res.errCode == 0) {
@@ -266,9 +276,10 @@
 				})
 			},
 			toSearchPage() {
-				uni.navigateTo({
-					url: '/pageB/follow/index'
-				})
+				
+				// uni.navigateTo({
+				// 	url: '/pageB/follow/index'
+				// })
 			},
 		},
 	}

pages/shop/index.vue

@@ -30,17 +30,19 @@
                 <text>上门取件</text>
             </view>
         </view>
-        <!-- <view class="fenlei">
+        <view class="fenlei">
             <shopitem v-for="item in 5" class="item"></shopitem>
-        </view> -->
+        </view>
         <view class="fenlei">
             <shopitem v-for="item in goodsClassify" :key="item.gc_id" :info="item" class="item"></shopitem>
         </view>
         <view class="hr" style="margin-top:80rpx"></view>
+		<!-- 秒杀 -->
         <recommend v-if="JSON.stringify(recommendedSpike) != '{}'" :recommendData="recommendedSpike" type="spike"></recommend>
         <view v-if="JSON.stringify(recommendedSpike) != '{}'" class="hr" style="margin-top:40rpx"></view>
         <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>
         <view class="hr" style="margin-top:40rpx" v-if="JSON.stringify(pinTuanPush) != '{}'"></view>
         <group></group>