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

pages/index/index.vue

@@ -222,7 +222,6 @@
 	import zhiboItem from "@/components/index/zhibo-item/index"
 	import indexad from "@/components/index/ad/index"
 	import darenItem from "@/components/index/daren-item/index"
-import chatVue from '../../pageD/chat/chat.vue'
 
 	export default {
 		name: "index",
@@ -266,14 +265,14 @@ import chatVue from '../../pageD/chat/chat.vue'
 		onShow() {
             this.page = 1;
             if (this.page != 1) {
-                this.articleList = [];
             }
-            this.getArticlelist();
             // if (this.hasLogin) {
             //     this.isNewmembervoucher();
             // }
 		},
 		async onLoad(){
+            this.articleList = [];
+            this.getArticlelist();
             this.getSwiper();
             // 优惠券
 			if(this.$store.state.hasLogin){
@@ -402,16 +401,18 @@ import chatVue from '../../pageD/chat/chat.vue'
                     }
                 }
 			},
-            // 发现别表
+            // 发现列表
 			getArticlelist() {
-                uni.showLoading({
-                    title: "loading..."
-                })
+                if (this.page > 1) {
+                    uni.showLoading({
+                        title: "loading..."
+                    })
+                }
 				this.$u.api.getArticlelist({
 					page: this.page,
 					is_video_img: 0, // 查询视频1 图文2 都查0
 				}).then(res => {
-                    // uni.stopPullDownRefresh();
+                    uni.stopPullDownRefresh();
                     this.status = "loading";
                     if (res.errCode == 0) {
                         uni.hideLoading();