Merge pull request '一部分完成' (#168) from xbx into master

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

components/index/zhibo-item/index.vue

@@ -6,9 +6,9 @@
                 <image></image>
                 <text class="u-line-1" style="width:130rpx">{{name}}</text>
             </view>
-            <view class="pingbi">
-                <image></image>
-                <text>1屏蔽用户</text>
+            <view class="pingbi" @click.stop="articleAddShield">
+                <image src="/static/image/common/7.png"></image>
+                <text>屏蔽用户</text>
             </view>
         </view>
     </view>    
@@ -81,8 +81,20 @@ export default {
                    rid:this.rid
                } 
             })
-        }
+        },
+        articleAddShield() {
+            console.log(this.item)
+			this.$u.api.articleAddShield({
+				member_id: this.item.user_id,
+			}).then(res => {
+				// console.log(res)
+				if(res.errCode == 0) {
+                    this.$u.toast(res.message);
+					this.$emit("updateList");
+				}
+			})
+		},
     },
-    props:['name','image','url','zid','rid']
+    props:['name','image','url','zid','rid','item']
 }
 </script>

pageB/search/searchGoods.vue

@@ -11,7 +11,7 @@
 			</view>
 			<view class="evaluation" :class="{ 'current' : current == 2 }" @click="switchCurrent(2)">好评</view>
 		</view>
-		<scroll-view scroll-y class="goods-container" :style="{ height: scrollHeight }" @scrolltolower="loadMore">
+		<scroll-view scroll-y class="goods-container" :style="{ height: scrollHeight }" @scrolltolower="loadMore" :scroll-top="top">
 			<view v-for="goods in goodsList" :key="goods.goods_id" class="goods-item" @click="toDetailsPage(goods.goods_id)">
 				<image :src="goods.goods_image"></image>
 				<view class="right">
@@ -38,7 +38,8 @@ export default {
 			scrollHeight: '',
 			loadStatus: 'loadmore',
 			timer: true, // 防止上拉加载短时间内多次调用,
-			value:""
+			value:"",
+			top:0
 		}
 	},
 	watch: {
@@ -131,6 +132,7 @@ export default {
 		switchCurrent(current) {
 			this.page = 1
 			if(current == 1 && this.current == 1) this.priceOrderAsc = !this.priceOrderAsc;
+			this.top=0
 			this.ShopSearch()
 			this.current = current;
 		},

pages/index/index.vue

@@ -45,11 +45,11 @@
 							<view class="list">
 								<view>
 									<zhiboItem v-for="item in tabLiveLists.filter((_, index) => !(index&1))" :zid="item.live_id" :rid="item.chatroom_id"
-									 :key="item.live_id" :name="item.store_name" :image="item.cover_img" :url="item.url"></zhiboItem>
+									 :key="item.live_id" :name="item.store_name" :image="item.cover_img" :url="item.url"  :item="item" @updateList="updateList"></zhiboItem>
 								</view>
 								<view style="margin-left:20rpx">
 									<zhiboItem v-for="item in tabLiveLists.filter((_, index) => index&1)" :zid="item.live_id" :rid="item.chatroom_id"
-									 :key="item.live_id" :name="item.store_name" :image="item.cover_img" :url="item.url"></zhiboItem>
+									 :key="item.live_id" :name="item.store_name" :image="item.cover_img" :url="item.url"  :item="item" @updateList="updateList"></zhiboItem>
 								</view>
 							</view>
 						</view>
@@ -397,7 +397,8 @@
             // 屏蔽更新列表
             updateList() {
                 this.page = 1;
-                this.getArticlelist();
+				this.getArticlelist();
+				this.tabLiveList()
             },
             // 发现下拉加载
             swiperBottom(e) {

pages/zhibo/index.nvue

@@ -26,7 +26,7 @@
       <image src="../../static/danmu.png" class="danmubianji"></image>
       <text style="font-size:26rpx;color:#fff;margin-left:20rpx">{{ $store.state.hasLogin ? '想说点什么' : '请先登录'}}</text>
     </view>
-    <image class="liketap" src="../../static/like.png" @click="">
+    <!-- <image class="liketap" src="../../static/like.png" @click=""> -->
 
     <view class="danmuinputbox" v-if="danmu">
       <input type="text" focus="true" style="width:600rpx;margin-left:30rpx;font-size:26rpx" maxlength="20" @blur="danmu=false" v-model="danmutext">
@@ -86,7 +86,7 @@
 .shopimg{
     width: 160rpx;
     height: 160rpx;
-    background-color: #0f0;
+    // background-color: #0f0;
     
 
 }
@@ -158,7 +158,9 @@
   height: 46rpx;
   position: fixed;
   bottom: 36rpx;
-  right: 154rpx;
+  // right: 154rpx;
+  right: 54rpx;
+
 }
 .hottext{
   font-size: 20rpx;
@@ -275,7 +277,7 @@
   left: 0;
   width: 308rpx;
   height: 58rpx;
-  background-color: #0f0;
+  background-color: #000;
   opacity: 0.4;
   border-radius: 29rpx;
 }
@@ -460,7 +462,8 @@ export default {
 					content : content
 				}
 				this.chatRoomService.sendMessages(this.room.id, message);
-				this.danmutext = ""
+        this.danmutext = ""
+        this.danmu = false
 			},
     whenNewMessage (message) {//新消息监听
       // if(message.type == this.room.MessageType.PROP){