diff --git a/components/index/zhibo-item/index.vue b/components/index/zhibo-item/index.vue
index 880a107..11dcc71 100644
--- a/components/index/zhibo-item/index.vue
+++ b/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>
\ No newline at end of file
diff --git a/pageB/search/searchGoods.vue b/pageB/search/searchGoods.vue
index 0eb6f71..053a741 100644
--- a/pageB/search/searchGoods.vue
+++ b/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;
 		},
diff --git a/pages/index/index.vue b/pages/index/index.vue
index ebe81d0..c9ec856 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -1,507 +1,508 @@
-<template>
-	<view>
-		<view class="status_bar"></view>
-		<view class="index">
-			<view class="top">
-				<view class="sosuo" @click="goSearch">
-                    <u-icon name="search" color="#555" size="34rpx"></u-icon>
-                </view>
-				<view class="tabs">
-					<u-tabs :is-scroll="false" bar-width="70" ref="tabs" :list="list" :current="num" :bar-style="{
-                    'background-color':'#FF780F',
-                    'bottom':'10rpx'
-                }"
-					 inactive-color="#333" :active-item-style="{
-                    'color':'#333'
-                }" :bold="false"
-					 @change="dianji($event)"></u-tabs>
-				</view>
-				<view class="sosuo"></view>
-			</view>
-			<swiper class="card" @change="dianji" :current="num" @touchmove.stop.prevent="moveHandle">
-				<swiper-item>
-					<scroll-view style="width:100%;height:100%" scroll-y="true" lower-threshold="200" upper-threshold="100" @scrolltolower="swiperBottom" @scrolltoupper="swiperTop">
-						<view class="box">
-							<!-- <indexad style="width:690rpx"></indexad> -->
-							<u-swiper mode="dot" :list="indexImageSwiper" name="adv_code" @click="clickFImage"></u-swiper>
-							<view class="list">
-								<view>
-									<videoItem v-for="(item,id) in articleList.filter((_, index) => !(index&1))" :key="id" :item="item"
-									 @updateList="updateList"></videoItem>
-								</view>
-								<view style="margin-left:20rpx">
-									<videoItem v-for="(item,id) in articleList.filter((_, index) => index&1)" :key="id" :item="item"
-									 @updateList="updateList"></videoItem>
-								</view>
-							</view>
-                            <u-loadmore class="load-size" color="#999999" :status="status" icon-type="iconType" margin-top="50" margin-bottom="50" :load-text="loadText" />
-						</view>
-					</scroll-view>
-				</swiper-item>
-				<swiper-item>
-					<scroll-view style="width:100%;height:100%" scroll-y="true">
-						<view class="box">
-							<u-swiper mode="dot" :list="zhiboImageSwiper" name="adv_code" @click="clickSImage($event, 2)"></u-swiper>
-							<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>
-								</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>
-								</view>
-							</view>
-						</view>
-					</scroll-view>
-				</swiper-item>
-				<swiper-item>
-					<scroll-view style="width:100%;height:100%" scroll-y="true" @scrolltolower="followBotton" lower-threshold="200">
-						<view class="box">
-							<view class="tuijian">
-								<view class="title" @click="toSearchPage">
-									<view class="left">
-										<view></view>
-										<text>推荐达人</text>
-									</view>
-									<u-icon name="arrow-right" color="#666" size="28"></u-icon>
-								</view>
-								<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" v-on:pChangeType="changeType"></darenItem>
-								</view>
-							</view>
-							<view class="rec-list">
-								<view class="rec-box">
-                                    <!-- {{ fansList }} -->
-                                    <view class="item">
-                                        <videoItem isguanzhu="true" v-for="(item,id) in fansList" :key="id" :item="item"></videoItem>
-                                    </view>
-                                     <view class="no-data" v-if="!fansList.length">您还没有关注哦，赶紧去点点关注！</view>
-                                     <u-loadmore class="load-size" v-else :status="status_1" icon-type="iconType" margin-top="50" :load-text="loadText" />
-								</view>
-							</view>
-						</view>
-					</scroll-view>
-				</swiper-item>
-			</swiper>
-		</view>
-	</view>
-
-</template>
-<style lang="scss" scoped>
-    page {
-        background-color: #fff;
-    }
-	.index {
-		width: 750rpx;
-		display: flex;
-		flex-direction: column;
-
-		.top {
-            z-index: 10000;
-            position: fixed;
-            top: var(--status-bar-height);
-            left: 0;
-			display: flex;
-			flex-shrink: 0;
-			align-items: center;
-			justify-content: space-between;
-			width: 100%;
-			height: 88rpx;
-			padding: 0 30rpx;
-            background-color: #fff;
-
-			.sosuo {
-				width: 32rpx;
-				height: 32rpx;
-			}
-
-			.tabs {
-				width: 334rpx;
-                // pointer-events: none;
-                
-				/deep/ .u-tab-item {
-					font-weight: bold;
-				}
-			}
-		}
-
-		.card {
-			width: 100%;
+<template>
+	<view>
+		<view class="status_bar"></view>
+		<view class="index">
+			<view class="top">
+				<view class="sosuo" @click="goSearch">
+                    <u-icon name="search" color="#555" size="34rpx"></u-icon>
+                </view>
+				<view class="tabs">
+					<u-tabs :is-scroll="false" bar-width="70" ref="tabs" :list="list" :current="num" :bar-style="{
+                    'background-color':'#FF780F',
+                    'bottom':'10rpx'
+                }"
+					 inactive-color="#333" :active-item-style="{
+                    'color':'#333'
+                }" :bold="false"
+					 @change="dianji($event)"></u-tabs>
+				</view>
+				<view class="sosuo"></view>
+			</view>
+			<swiper class="card" @change="dianji" :current="num" @touchmove.stop.prevent="moveHandle">
+				<swiper-item>
+					<scroll-view style="width:100%;height:100%" scroll-y="true" lower-threshold="200" upper-threshold="100" @scrolltolower="swiperBottom" @scrolltoupper="swiperTop">
+						<view class="box">
+							<!-- <indexad style="width:690rpx"></indexad> -->
+							<u-swiper mode="dot" :list="indexImageSwiper" name="adv_code" @click="clickFImage"></u-swiper>
+							<view class="list">
+								<view>
+									<videoItem v-for="(item,id) in articleList.filter((_, index) => !(index&1))" :key="id" :item="item"
+									 @updateList="updateList"></videoItem>
+								</view>
+								<view style="margin-left:20rpx">
+									<videoItem v-for="(item,id) in articleList.filter((_, index) => index&1)" :key="id" :item="item"
+									 @updateList="updateList"></videoItem>
+								</view>
+							</view>
+                            <u-loadmore class="load-size" color="#999999" :status="status" icon-type="iconType" margin-top="50" margin-bottom="50" :load-text="loadText" />
+						</view>
+					</scroll-view>
+				</swiper-item>
+				<swiper-item>
+					<scroll-view style="width:100%;height:100%" scroll-y="true">
+						<view class="box">
+							<u-swiper mode="dot" :list="zhiboImageSwiper" name="adv_code" @click="clickSImage($event, 2)"></u-swiper>
+							<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"  :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"  :item="item" @updateList="updateList"></zhiboItem>
+								</view>
+							</view>
+						</view>
+					</scroll-view>
+				</swiper-item>
+				<swiper-item>
+					<scroll-view style="width:100%;height:100%" scroll-y="true" @scrolltolower="followBotton" lower-threshold="200">
+						<view class="box">
+							<view class="tuijian">
+								<view class="title" @click="toSearchPage">
+									<view class="left">
+										<view></view>
+										<text>推荐达人</text>
+									</view>
+									<u-icon name="arrow-right" color="#666" size="28"></u-icon>
+								</view>
+								<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" v-on:pChangeType="changeType"></darenItem>
+								</view>
+							</view>
+							<view class="rec-list">
+								<view class="rec-box">
+                                    <!-- {{ fansList }} -->
+                                    <view class="item">
+                                        <videoItem isguanzhu="true" v-for="(item,id) in fansList" :key="id" :item="item"></videoItem>
+                                    </view>
+                                     <view class="no-data" v-if="!fansList.length">您还没有关注哦，赶紧去点点关注！</view>
+                                     <u-loadmore class="load-size" v-else :status="status_1" icon-type="iconType" margin-top="50" :load-text="loadText" />
+								</view>
+							</view>
+						</view>
+					</scroll-view>
+				</swiper-item>
+			</swiper>
+		</view>
+	</view>
+
+</template>
+<style lang="scss" scoped>
+    page {
+        background-color: #fff;
+    }
+	.index {
+		width: 750rpx;
+		display: flex;
+		flex-direction: column;
+
+		.top {
+            z-index: 10000;
+            position: fixed;
+            top: var(--status-bar-height);
+            left: 0;
+			display: flex;
+			flex-shrink: 0;
+			align-items: center;
+			justify-content: space-between;
+			width: 100%;
+			height: 88rpx;
+			padding: 0 30rpx;
+            background-color: #fff;
+
+			.sosuo {
+				width: 32rpx;
+				height: 32rpx;
+			}
+
+			.tabs {
+				width: 334rpx;
+                // pointer-events: none;
+                
+				/deep/ .u-tab-item {
+					font-weight: bold;
+				}
+			}
+		}
+
+		.card {
+			width: 100%;
 			height: calc(100vh - 150rpx);
-            margin-top: 100rpx;
+            margin-top: 100rpx;
             // padding-top: 100rpx;
-
-			.box {
-				width: 100%;
-                height: 100%;
+
+			.box {
+				width: 100%;
+                height: 100%;
 				padding: 0 30rpx 0;
-                // margin-top: 30rpx;
-			}
-
-			.list {
-				display: flex;
-                // height: 100vh;
-                // padding-bottom: 100rpx;
-                // margin-bottom: 50rpx;
-			}
-		}
-
-		.tuijian {
-			width: 750rpx;
-			padding: 30rpx;
-			margin-left: -30rpx;
-			height: 400rpx;
-			background-color: #ececec;
-
-			.title {
-				width: 100%;
-				display: flex;
-				align-items: center;
-				justify-content: space-between;
-
-				.left {
-					display: flex;
-					align-items: center;
-
-					>view {
-						width: 6rpx;
-						height: 30rpx;
-						background-color: #FF780F;
-					}
-
-					>text {
-						font-size: 30rpx;
-						color: 30rpx;
-						margin-left: 14rpx;
-					}
-				}
-
-				.right {
-					width: 14rpx;
-					height: 24rpx;
-				}
-			}
-
-			.tuijianlist {
-				width: 100%;
-				height: 282rpx;
-				margin-top: 30rpx;
-				display: flex;
-
-				>view:not(:last-child) {
-					margin-right: 23rpx;
-				}
-			}
-		}
-        .rec-list {
-            width: 100%;
-            .rec-box {
-                width: 100%;
-                .item {
-                    display: flex;
-                    flex-wrap: wrap;
-                    justify-content: space-between;
-                }
-            }
-        }
-	}
-    .no-data {
-        margin: 200rpx auto 0;
-        text-align: center;
-    }
-	
-    
-</style>
-<script>
-    import { mapState } from 'vuex'
-	import videoItem from "@/components/index/video-item/index"
-	import zhiboItem from "@/components/index/zhibo-item/index"
-	import indexad from "@/components/index/ad/index"
-	import darenItem from "@/components/index/daren-item/index"
-
-	export default {
-		name: "index",
-        computed: {
-            ...mapState(["hasLogin"])
-        },
-		data() {
-			return {
-				list: [{
-					name: '发现'
-				}, {
-					name: '直播'
-				}, {
-					name: '关注'
-				}],
-				num: 0,
-				page: 1, // 0即第一页
-                follow_page: 0, //
-				articleList: [],
-				recommendList: [], // 推荐达人
-				indexImageSwiper: [],
-				zhiboImageSwiper: [],
-				tabLiveLists: [],
-                fansList: [], // 关注的发现列表
-                status: 'loadmore',
-                status_1: 'loadmore',
-                iconType: 'circle',
-                loadText: {
-                    loadmore: '轻轻上拉',
-                    loading: '努力加载中',
-                    nomore: '实在没有了'
-				},
-			}
-		},
-		components: {
-			videoItem,
-			zhiboItem,
-			indexad,
-			darenItem
-		},
-		onShow() {
-            this.page = 1;
-            if (this.page != 1) {
-                this.articleList = [];
-            }
-            this.getArticlelist();
-            // if (this.hasLogin) {
-            //     this.isNewmembervoucher();
-            // }
-		},
-		onLoad(){
-            this.getSwiper();
-            // 优惠券
-			if(this.$store.state.hasLogin){
-				this.isNewmembervoucher();
-				const user = uni.getStorageSync('user_info');
-				// console.log(user)
-				this.imService.login(user.member.member_id,user.member.member_nickname,user.member.member_avatar)
-				this.imService.connectIM()
-				let that = this
-				setTimeout(function(){
-					that.imService.disconnect()
-					// console.log("guanbi")
-				},1000)
-				setTimeout(function(){
-					// console.log("lianjie")
-					that.imService.connectIM()
-				},2000)
-			}
-		},
-		onPullDownRefresh() {
-            this.page = 1;
-            this.getArticlelist();
-			// this.getManicureList({ load: 'reload' });
-		},
-		methods: {
-            moveHandle() {
-                return;
-            },
-            // 直播列表
-			tabLiveList() {
-				this.$u.api.tabLiveList().then((res) => {
-					console.log(res)
-					this.tabLiveLists = res.data;
-				})
-			},
-            // 轮播图
-			getSwiper() {
-				this.$u.api.getIndexSwiper().then(res => {
-					if (res.errCode == 0) {
-						this.indexImageSwiper = res.data;
-					}
-				})
-			},
-            // 关注
-			changeType(member_id) {
-				// console.log(member_id);
-				// this.$emit("pChangeType");
-				this.$u.api.attentionMember({
-					member_id: member_id
-				}).then((res) => {
-                    this.follow_page = 0;
-					this.getRecommendList(); // 关注列表
-                    this.getFollowList(); // 刷新发现的列表
-				})
-			},
-			getZhiBoSwiper() {
-				this.$u.api.getZhiBoSwiper().then(res => {
-					if (res.errCode == 0) {
-						this.zhiboImageSwiper = res.data;
-					}
-				})
-			},
-            // 切换导航
-			dianji(a) {
-                // console.log(a);
-                if (a.type == "change") {
-                    this.num = a.detail.current
-                } else {
-                    this.num = a;
-                }
-                // console.log(this.num);
-                // 状态请求
-                if (a.type == "change") { // 强制请求一次
-                    if (this.num == 0) {
-                        this.page = 1;
-                        this.articleList = [];
-                        this.status = "loadmore";
-                        this.getArticlelist();
-                        this.getSwiper();
-                    } else if (this.num == 1) {
-                        this.getZhiBoSwiper(); // 直播轮播
-                        this.tabLiveList();
-                    } else if (this.num == 2) {
-                        this.follow_page = 0;
-                        this.fansList = [];
-                        if (this.hasLogin) {
-                            this.getFollowList(); // 关注列表
-                        }
-                        this.getRecommendList(); // 推荐达人
-                    }
-                }
-			},
-            // 发现别表
-			getArticlelist() {
-                uni.showLoading({
-                    title: "loading..."
-                })
-				this.$u.api.getArticlelist({
-					page: this.page,
-					is_video_img: 0, // 查询视频1 图文2 都查0
-				}).then(res => {
-                    // uni.stopPullDownRefresh();
-                    this.status = "loading";
-                    if (res.errCode == 0) {
-                        uni.hideLoading();
-                        if (this.page == 1) {
-                        	this.articleList = res.data.list;
-                            this.status = "loadmore";
-                        } else if (res.data.length == 0 && this.page > 1) {
-                            this.status = "nomore";
-                        } else {
-                            this.articleList = this.articleList.concat(res.data.list);
-                        }
-                        if (res.data.length == 0 && this.page > 1) {
-                        } else {
-                            this.page++;
-                        }
-                    } else {
-                        this.status = "nomore"
-                    }
-				})
-			},
-            // 屏蔽更新列表
-            updateList() {
-                this.page = 1;
-                this.getArticlelist();
-            },
-            // 发现下拉加载
-            swiperBottom(e) {
-                this.getArticlelist();
-                // console.log(e);
-            },
-            swiperTop() {
-                // uni.startPullDownRefresh();
-            },
-            // 关注下拉
-            followBotton(e) {
-                this.getFollowList();
-              // console.log(e);
-            },
-            // 达人列表
-			getRecommendList() {
-				this.$u.api.getRecommendList().then(res => {
-					console.log(res);
-					if (res.errCode == 0) {
-						this.recommendList = res.data.list;
-					}
-				})
-			},
-            // 关注发现列表
-            getFollowList() {
-                this.$u.post("article/attentionArticleList",{
-                    page: this.follow_page,
-                }).then(res => {
-                    this.status_1 = "loading";
-                    if (res.errCode == 0) {
-                        if (this.fansList.length < 4) {
-                            this.status_1 = "nomore";
-                        }
-                        // uni.stopPullDownRefresh();
-                        // console.log('37647744ghj', res)
-                        if (this.follow_page == 0) {
-                            this.fansList = res.data.list;
-                            // this.status_1 = "loadmore";
-                        } else if (res.data.list.length == 0 && this.follow_page > 0) {
-                            this.status_1 = "nomore";
-                        } else {
-                            this.fansList = this.fansList.concat(res.data.list);
-                        }
-                        this.follow_page++;
-                    } else {
-                        this.status_1 = "nomore"
-                    }
-                })
-            },
-			toSearchPage() {
-				uni.navigateTo({
-					url: '/pageB/follow/index'
-				});
-			},
-			clickFImage(index) {
-				const item = this.indexImageSwiper[index];
-				console.log(item);
-				this.activityLink({
-					type: item.url_type,
-					id: item.info_id
-				});
-			},
-			clickSImage(index) {
-				const item = this.zhiboImageSwiper[index];
-				console.log(item);
-				this.activityLink({
-					type: item.url_type,
-					id: item.info_id
-				});
-			},
-			activityLink({
-				type,
-				id
-			}) {
-                console.log(type,id);
-				if (type == 0) return false;
-				// type 1 商品详情页, 2 店铺详情页
-				const url = type == 1 ? 'pageB/sdetails/index' : 'pageC/merchant/index';
-				let params = {
-					id: id
-				};
-				// type: 1 // 商品详情 1普通 2拼团 3秒杀 4优惠券
-				if (type == 1) Object.assign(params, {
-					type: 1
-				});
-				this.$u.route({
-					url: url,
-					params: params
-				})
-			},
-            goSearch() {
-                this.$u.route("/pageB/search/index", {
-					type: 2,
-					curent:2
-				});
-			},
-			// 是否显示新人优惠券
-			isNewmembervoucher() {
-				this.$u.api.isNewmembervoucher().then(res => {
-					if(res.errCode == 0) {
-						this.$u.route('/pageB/coupon/index');
-					}
-				})
-			},
-		},
-	}
-</script>
+                // margin-top: 30rpx;
+			}
+
+			.list {
+				display: flex;
+                // height: 100vh;
+                // padding-bottom: 100rpx;
+                // margin-bottom: 50rpx;
+			}
+		}
+
+		.tuijian {
+			width: 750rpx;
+			padding: 30rpx;
+			margin-left: -30rpx;
+			height: 400rpx;
+			background-color: #ececec;
+
+			.title {
+				width: 100%;
+				display: flex;
+				align-items: center;
+				justify-content: space-between;
+
+				.left {
+					display: flex;
+					align-items: center;
+
+					>view {
+						width: 6rpx;
+						height: 30rpx;
+						background-color: #FF780F;
+					}
+
+					>text {
+						font-size: 30rpx;
+						color: 30rpx;
+						margin-left: 14rpx;
+					}
+				}
+
+				.right {
+					width: 14rpx;
+					height: 24rpx;
+				}
+			}
+
+			.tuijianlist {
+				width: 100%;
+				height: 282rpx;
+				margin-top: 30rpx;
+				display: flex;
+
+				>view:not(:last-child) {
+					margin-right: 23rpx;
+				}
+			}
+		}
+        .rec-list {
+            width: 100%;
+            .rec-box {
+                width: 100%;
+                .item {
+                    display: flex;
+                    flex-wrap: wrap;
+                    justify-content: space-between;
+                }
+            }
+        }
+	}
+    .no-data {
+        margin: 200rpx auto 0;
+        text-align: center;
+    }
+	
+    
+</style>
+<script>
+    import { mapState } from 'vuex'
+	import videoItem from "@/components/index/video-item/index"
+	import zhiboItem from "@/components/index/zhibo-item/index"
+	import indexad from "@/components/index/ad/index"
+	import darenItem from "@/components/index/daren-item/index"
+
+	export default {
+		name: "index",
+        computed: {
+            ...mapState(["hasLogin"])
+        },
+		data() {
+			return {
+				list: [{
+					name: '发现'
+				}, {
+					name: '直播'
+				}, {
+					name: '关注'
+				}],
+				num: 0,
+				page: 1, // 0即第一页
+                follow_page: 0, //
+				articleList: [],
+				recommendList: [], // 推荐达人
+				indexImageSwiper: [],
+				zhiboImageSwiper: [],
+				tabLiveLists: [],
+                fansList: [], // 关注的发现列表
+                status: 'loadmore',
+                status_1: 'loadmore',
+                iconType: 'circle',
+                loadText: {
+                    loadmore: '轻轻上拉',
+                    loading: '努力加载中',
+                    nomore: '实在没有了'
+				},
+			}
+		},
+		components: {
+			videoItem,
+			zhiboItem,
+			indexad,
+			darenItem
+		},
+		onShow() {
+            this.page = 1;
+            if (this.page != 1) {
+                this.articleList = [];
+            }
+            this.getArticlelist();
+            // if (this.hasLogin) {
+            //     this.isNewmembervoucher();
+            // }
+		},
+		onLoad(){
+            this.getSwiper();
+            // 优惠券
+			if(this.$store.state.hasLogin){
+				this.isNewmembervoucher();
+				const user = uni.getStorageSync('user_info');
+				// console.log(user)
+				this.imService.login(user.member.member_id,user.member.member_nickname,user.member.member_avatar)
+				this.imService.connectIM()
+				let that = this
+				setTimeout(function(){
+					that.imService.disconnect()
+					// console.log("guanbi")
+				},1000)
+				setTimeout(function(){
+					// console.log("lianjie")
+					that.imService.connectIM()
+				},2000)
+			}
+		},
+		onPullDownRefresh() {
+            this.page = 1;
+            this.getArticlelist();
+			// this.getManicureList({ load: 'reload' });
+		},
+		methods: {
+            moveHandle() {
+                return;
+            },
+            // 直播列表
+			tabLiveList() {
+				this.$u.api.tabLiveList().then((res) => {
+					console.log(res)
+					this.tabLiveLists = res.data;
+				})
+			},
+            // 轮播图
+			getSwiper() {
+				this.$u.api.getIndexSwiper().then(res => {
+					if (res.errCode == 0) {
+						this.indexImageSwiper = res.data;
+					}
+				})
+			},
+            // 关注
+			changeType(member_id) {
+				// console.log(member_id);
+				// this.$emit("pChangeType");
+				this.$u.api.attentionMember({
+					member_id: member_id
+				}).then((res) => {
+                    this.follow_page = 0;
+					this.getRecommendList(); // 关注列表
+                    this.getFollowList(); // 刷新发现的列表
+				})
+			},
+			getZhiBoSwiper() {
+				this.$u.api.getZhiBoSwiper().then(res => {
+					if (res.errCode == 0) {
+						this.zhiboImageSwiper = res.data;
+					}
+				})
+			},
+            // 切换导航
+			dianji(a) {
+                // console.log(a);
+                if (a.type == "change") {
+                    this.num = a.detail.current
+                } else {
+                    this.num = a;
+                }
+                // console.log(this.num);
+                // 状态请求
+                if (a.type == "change") { // 强制请求一次
+                    if (this.num == 0) {
+                        this.page = 1;
+                        this.articleList = [];
+                        this.status = "loadmore";
+                        this.getArticlelist();
+                        this.getSwiper();
+                    } else if (this.num == 1) {
+                        this.getZhiBoSwiper(); // 直播轮播
+                        this.tabLiveList();
+                    } else if (this.num == 2) {
+                        this.follow_page = 0;
+                        this.fansList = [];
+                        if (this.hasLogin) {
+                            this.getFollowList(); // 关注列表
+                        }
+                        this.getRecommendList(); // 推荐达人
+                    }
+                }
+			},
+            // 发现别表
+			getArticlelist() {
+                uni.showLoading({
+                    title: "loading..."
+                })
+				this.$u.api.getArticlelist({
+					page: this.page,
+					is_video_img: 0, // 查询视频1 图文2 都查0
+				}).then(res => {
+                    // uni.stopPullDownRefresh();
+                    this.status = "loading";
+                    if (res.errCode == 0) {
+                        uni.hideLoading();
+                        if (this.page == 1) {
+                        	this.articleList = res.data.list;
+                            this.status = "loadmore";
+                        } else if (res.data.length == 0 && this.page > 1) {
+                            this.status = "nomore";
+                        } else {
+                            this.articleList = this.articleList.concat(res.data.list);
+                        }
+                        if (res.data.length == 0 && this.page > 1) {
+                        } else {
+                            this.page++;
+                        }
+                    } else {
+                        this.status = "nomore"
+                    }
+				})
+			},
+            // 屏蔽更新列表
+            updateList() {
+                this.page = 1;
+				this.getArticlelist();
+				this.tabLiveList()
+            },
+            // 发现下拉加载
+            swiperBottom(e) {
+                this.getArticlelist();
+                // console.log(e);
+            },
+            swiperTop() {
+                // uni.startPullDownRefresh();
+            },
+            // 关注下拉
+            followBotton(e) {
+                this.getFollowList();
+              // console.log(e);
+            },
+            // 达人列表
+			getRecommendList() {
+				this.$u.api.getRecommendList().then(res => {
+					console.log(res);
+					if (res.errCode == 0) {
+						this.recommendList = res.data.list;
+					}
+				})
+			},
+            // 关注发现列表
+            getFollowList() {
+                this.$u.post("article/attentionArticleList",{
+                    page: this.follow_page,
+                }).then(res => {
+                    this.status_1 = "loading";
+                    if (res.errCode == 0) {
+                        if (this.fansList.length < 4) {
+                            this.status_1 = "nomore";
+                        }
+                        // uni.stopPullDownRefresh();
+                        // console.log('37647744ghj', res)
+                        if (this.follow_page == 0) {
+                            this.fansList = res.data.list;
+                            // this.status_1 = "loadmore";
+                        } else if (res.data.list.length == 0 && this.follow_page > 0) {
+                            this.status_1 = "nomore";
+                        } else {
+                            this.fansList = this.fansList.concat(res.data.list);
+                        }
+                        this.follow_page++;
+                    } else {
+                        this.status_1 = "nomore"
+                    }
+                })
+            },
+			toSearchPage() {
+				uni.navigateTo({
+					url: '/pageB/follow/index'
+				});
+			},
+			clickFImage(index) {
+				const item = this.indexImageSwiper[index];
+				console.log(item);
+				this.activityLink({
+					type: item.url_type,
+					id: item.info_id
+				});
+			},
+			clickSImage(index) {
+				const item = this.zhiboImageSwiper[index];
+				console.log(item);
+				this.activityLink({
+					type: item.url_type,
+					id: item.info_id
+				});
+			},
+			activityLink({
+				type,
+				id
+			}) {
+                console.log(type,id);
+				if (type == 0) return false;
+				// type 1 商品详情页, 2 店铺详情页
+				const url = type == 1 ? 'pageB/sdetails/index' : 'pageC/merchant/index';
+				let params = {
+					id: id
+				};
+				// type: 1 // 商品详情 1普通 2拼团 3秒杀 4优惠券
+				if (type == 1) Object.assign(params, {
+					type: 1
+				});
+				this.$u.route({
+					url: url,
+					params: params
+				})
+			},
+            goSearch() {
+                this.$u.route("/pageB/search/index", {
+					type: 2,
+					curent:2
+				});
+			},
+			// 是否显示新人优惠券
+			isNewmembervoucher() {
+				this.$u.api.isNewmembervoucher().then(res => {
+					if(res.errCode == 0) {
+						this.$u.route('/pageB/coupon/index');
+					}
+				})
+			},
+		},
+	}
+</script>
diff --git a/pages/zhibo/index.nvue b/pages/zhibo/index.nvue
index cf05ced..031496c 100644
--- a/pages/zhibo/index.nvue
+++ b/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){