Merge pull request 'xbx' (#266) from xbx into master

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

pageC/components/merchant/list-item.vue

@@ -3,6 +3,7 @@
         <!-- <video  :src="url" :show-fullscreen-btn="true"></video> -->
 		<view v-if="type == '2'" class="video-container">
 			<image :src="url" mode="aspectFill" class="video"></image>
+			<view class="backs"></view>
 			<image src="/static/videoPlay.png" mode="aspectFill" class="play-video"></image>
 		</view>
         <image v-else :src="url" mode="aspectFill"></image>
@@ -27,6 +28,15 @@
 			width: 100%;
         	height: 100%;
 		}
+		.backs {
+			width: 100%;
+        	height: 100%;
+			position: absolute;
+			top: 0;
+			right: 0;
+			background-color: rgba($color: #000000, $alpha: 0.35);
+			z-index: 9;
+		}
 		.play-video {
 			position: absolute;
 			width: 100rpx;

pageC/components/merchant/video-top.vue

@@ -1,6 +1,7 @@
 <template>
     <view class="videoTop">
 		  <image :src="url" mode="aspectFill" class="video"></image>
+		  <view class="backs"></view>
 		  <image src="/static/videoPlay.png" mode="aspectFill" class="play-video"></image>
     </view>
 </template>
@@ -15,6 +16,15 @@
         width: 100%;
         height: 100%;
 		z-index: 9;
+    }
+	.backs {
+		width: 100%;
+		height: 100%;
+		position: absolute;
+		top: 0;
+		right: 0;
+		background-color: rgba(0, 0, 0, 0.35);
+		z-index: 9;
 	}
 	.play-video {
 		position: absolute;

pages/index/index.vue

@@ -400,7 +400,12 @@
 					member_id: member_id
 				}).then((res) => {
                     this.follow_page = 0;
-					this.getRecommendList(); // 关注列表
+					// this.getRecommendList(); // 关注列表
+					for(let i in this.recommendList){
+						if(this.recommendList[i].member_id == member_id){
+							this.recommendList[i].is_attention == 1 ? this.recommendList[i].is_attention = 0 : this.recommendList[i].is_attention = 1
+						}
+					}
                     this.getFollowList(); // 刷新发现的列表
 				})
 			},

pages/mine/index.vue

@@ -181,7 +181,7 @@ export default {
 				{
 					name: 'wait_evaluation',
 					title: '待评价',
-					img: '/static/image/mine/3.png',
+					img: '/static/image/mine/40.png',
 					link: '/order/Index?current=6',
 					number: '',
 				},
@@ -447,7 +447,7 @@ export default {
 					@include image-size($image-width: 35rpx, $image-height: 35rpx);
 				}
 				> view:nth-child(5){
-					@include image-size($image-width: 37rpx, $image-height: 37rpx);
+					@include image-size($image-width: 43rpx, $image-height: 35rpx);
 				}
 				> view:nth-child(6){
 					@include image-size($image-width: 33rpx, $image-height: 35rpx);