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

components/index/daren-item/index.vue

@@ -4,7 +4,7 @@
         <text class="name">{{ info.member_nickname }}</text>
         <text class="zhuangtai">状态: {{ info.live_status == 1 ? '正在直播' : '未开播' }}</text>
         <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 class="guanzhu action" @tap="changeType(info.member_id)" v-else >未关注</view>
     </view>
 </template>
 <script>
@@ -32,6 +32,7 @@ export default {
 			// })
 		},
 		changeType:function(type){
+			console.log("111")
 			this.$emit("pChangeType",type) 
 		},
 		
@@ -77,5 +78,8 @@ export default {
         margin-top: 19rpx;
         border-radius: 25rpx;
     }
+	.action{
+		background: #f3f3f3;
+	}
 }
 </style>

components/index/video-item/index.vue

@@ -2,7 +2,7 @@
     <view class="video-item" v-if="item" @click="toDetailsPage(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>
+			<view class="backes"></view>
 			<image class="head" :src="item.article_pic" ></image>
 		</view>
         <view class="title" v-if="!isguanzhu">{{ item.article_title }}</view>
@@ -172,7 +172,7 @@
 		.backes{
 			position: absolute;
 			top: 0;
-			background: #000000;
+			background: rgba(0,0,0,0.6);
 			width: 100%;
 			height: 100%;
 			color: #fff;