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

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

@@ -175,7 +175,9 @@
 			background: #000000;
 			width: 100%;
 			height: 100%;
+			color: #fff;
 		}
+		
 	}
 }
 </style>
@@ -221,7 +223,7 @@ export default {
 				article_id: this.item.article_id,
 				member_id: this.item.member_id,
 			}).then(res => {
-				console.log(res)
+				// console.log(res)
 				if(res.errCode == 0) {
 					this.$emit("getArticlelist");
 				}