Merge pull request 'gdpao' (#255) from gyh into master

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

components/index/video-item/index.vue

@@ -15,7 +15,7 @@
                 <image :src="item.member_avatar"></image>
                 <text>{{ item.member_nickname }}</text>
             </view>
-            <image src="/static/image/common/4.png" @click.stop="showAction"></image>
+            <image class="img-imp" src="/static/image/common/4.png" @click.stop="showAction"></image>
 			<view class="action" v-if="show == item.article_id">
 				<view class="bubble">
 					<view @click.stop="articleLike">
@@ -105,6 +105,7 @@
         >image{
             width: 37rpx;
             height: 8rpx;
+            padding: 20rpx;
         }
 		.action {
 			z-index: 19;

pageB/video/video.nvue

@@ -52,7 +52,7 @@
                         <view class="comment-list-box">
                             <view class="comment-list-header">
                                 <image class="avatar" :src="item.member_avatar" mode=""></image>
-                                <view>
+                                <view class="comment-title-info">
                                     <text class="comment-title">{{ item.member_nickname }}</text>
                                     <text class="comment-time">{{ item.create_time }}</text>
                                 </view>
@@ -679,6 +679,10 @@
         margin-right: 20rpx;
         border-radius: 50%;
     }
+    
+    .comment-title-info {
+        justify-content: space-between;
+    }
 
     .comment-title {
         font-size: 26rpx;

pages/index/index.vue

@@ -39,7 +39,7 @@
 					</scroll-view>
 				</swiper-item>
 				<swiper-item>
-					<scroll-view style="width:100%;height:100%" scroll-y="true" @scrolltolower="swiperBottom">
+					<scroll-view style="width:100%;height:100%" scroll-y="true" @scrolltolower="swiperBottomLive(e)">
 						<view class="box">
 							<u-swiper mode="dot" :list="zhiboImageSwiper" name="adv_code" @click="clickSImage($event, 2)"></u-swiper>
 							<view class="list">
@@ -270,9 +270,6 @@
 			darenItem
 		},
 		onShow() {
-            this.page = 1;
-            if (this.page != 1) {
-			}
 			console.log(this.imService.status)
 			if(!this.imService.status && this.$store.state.hasLogin){
 				const user = uni.getStorageSync('user_info');
@@ -417,7 +414,7 @@
 			dianji(a) {
                 // console.log(a);
                 if (a.type == "change") {
-                    this.num = a.detail.current
+                    this.num = a.detail.current;
                 } else {
                     this.num = a;
                 }
@@ -427,16 +424,18 @@
                     if (this.num == 0) {
                         this.page = 1;
                         this.articleList = [];
-                        this.status = "loadmore";
+                        this.status = "nomore";
                         this.getArticlelist();
                         this.getSwiper();
                     } else if (this.num == 1) {
                         this.live_page = 1;
+                        this.status_live = "nomore";
                         this.getZhiBoSwiper(); // 直播轮播
                         this.tabLiveList();
                     } else if (this.num == 2) {
                         this.follow_page = 0;
                         this.fansList = [];
+                        this.status_1 = "nomore";
                         if (this.hasLogin) {
                             this.getFollowList(); // 关注列表
                         }
@@ -463,9 +462,9 @@
                         } else {
                             this.articleList = this.articleList.concat(res.data.list);
                         }
-                        this.page++;
                     }
 				})
+                console.log(this.page);
 			},
             // 屏蔽更新列表
             updateList() {
@@ -476,12 +475,11 @@
             },
             // 发现下拉加载
             swiperBottom(e) {
-				if(this.num == 0){
-	                this.getArticlelist();
-				}else if(this.num == 1){
-					this.tabLiveList();
-				}
-                // console.log(e);
+                this.page++;
+	            this.getArticlelist();
+            },
+            swiperBottomLive() {
+                this.tabLiveList();
             },
             swiperTop() {
                 // uni.startPullDownRefresh();