Merge pull request 'zmr' (#70) from zmr into master

Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/70

common/api/user.js

@@ -286,6 +286,12 @@ export default {
 			snsfriendList({ }) {
 				return vm.$u.post('message/snsfriendList', { });
 			},
+			// 关注达人
+			attentionMember({ member_id }) {
+				return vm.$u.post('member/attentionMember', { 
+					member_id : member_id
+				});
+			},
 			// 公告消息列表
 			informationInfo({ }) {
 				return vm.$u.post('message/informationInfo', { });

components/index/daren-item/index.vue

@@ -3,7 +3,8 @@
         <image class="head" :src="info.member_avatar"></image>
         <text class="name">{{ info.member_nickname }}</text>
         <text class="zhuangtai">状态: {{ info.live_status == 1 ? '正在直播' : '未开播' }}</text>
-        <view class="guanzhu">关注</view>
+        <view class="guanzhu"  @tap="changeType(info.member_id)" v-if="info.is_attention == 1">关注</view>
+        <view class="guanzhu" @tap="changeType(info.member_id)" v-else>未关注</view>
     </view>
 </template>
 <script>
@@ -14,13 +15,26 @@ export default {
 	},
 	methods: {
 		toDetailsPage() {
-			this.$u.route({
-				url: '',
-				params: {
-					name: 'lisa'
-				}
-			})
+			// 判断是否登录
+			const toke = uni.getStorageSync('token');
+			if (toke) {
+				console.log(toke);
+			}else{
+				uni.navigateTo({
+					url: '/pageA/login/login'
+				})
+			}
+			// this.$u.route({
+			// 	url: '',
+			// 	params: {
+			// 		name: 'lisa'
+			// 	}
+			// })
 		},
+		changeType:function(type){
+			this.$emit("pChangeType",type) 
+		},
+		
 	},
 }
 </script>

components/index/video-item/index.vue

@@ -1,5 +1,5 @@
 <template>
-    <view class="video-item" v-if="item" @click="toDetailsPage">
+    <view class="video-item" v-if="item" @click="toDetailsPage()" data-article_id="item.article_id" >
         <image class="head" :src="item.article_pic" v-if="item.type == 1" ></image>
 		<view class="header_fist"  v-else>
 			<view class="backes">111</view>
@@ -175,7 +175,9 @@
 			background: #000000;
 			width: 100%;
 			height: 100%;
+			color: #fff;
 		}
+		
 	}
 }
 </style>
@@ -227,9 +229,11 @@ export default {
 				}
 			})
 		},
-		toDetailsPage() {
+		toDetailsPage(e) {
+			console.log(e)
+			let article_id = '2'
 			 uni.navigateTo({
-				url: '/pageB/photo/index',
+				url: '/pageB/photo/index?article_id=' + article_id,
 			});
 
 		},

pageB/photo/index.vue

@@ -113,6 +113,9 @@ import shoplist from "../components/shoplist/index"
 
 export default {
     name:"photo",
+	onLoad(e) {
+		console.log('dhdhdhdhd',e)
+	},
     components:{
         userinfo,
         shpoone,

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">
@@ -225,6 +225,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) {
@@ -260,9 +270,10 @@
 				})
 			},
 			toSearchPage() {
-				uni.navigateTo({
-					url: '/pageB/follow/index'
-				})
+				
+				// uni.navigateTo({
+				// 	url: '/pageB/follow/index'
+				// })
 			},
 		},
 	}