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

pages/index/index.vue

@@ -39,7 +39,8 @@
 					</scroll-view>
 				</swiper-item>
 				<swiper-item>
-					<scroll-view style="width:100%;height:100%" scroll-y="true" @scrolltolower="swiperBottomLive(e)">
+					<scroll-view style="width:100%;height:100%" scroll-y="true" @scrolltolower="swiperBottomLive(e)" :refresher-enabled="true" @refresherrefresh="dianji(1)" :refresher-triggered="refresher"  @refresherpulling="onPulling"
+            @refresherrestore="onRestore" @refresherabort="onAbort">
 						<view class="box">
 							<u-swiper mode="dot" :list="zhiboImageSwiper" name="adv_code" @click="clickSImage($event, 2)"></u-swiper>
 							<view class="list">
@@ -261,6 +262,7 @@
                     loading: '努力加载中',
                     nomore: '实在没有了'
 				},
+				refresher:true
 			}
 		},
 		components: {
@@ -356,6 +358,7 @@
 				this.$u.api.tabLiveList({page:this.live_page}).then((res) => {
 					 // uni.stopPullDownRefresh();
 					this.status_live = "loading";
+					this.refresher = false;
 					console.log(res)
                     if (res.errCode == 0) {
                         uni.hideLoading();
@@ -410,7 +413,8 @@
 			},
             // 切换导航
 			dianji(a) {
-                // console.log(a);
+				console.log(a);
+
                 if (a.type == "change") {
                     this.num = a.detail.current;
                 } else {
@@ -418,7 +422,7 @@
                 }
                 // console.log(this.num);
                 // 状态请求
-                if (a.type == "change") { // 强制请求一次
+                if (a.type == "change" || this.num == 1) { // 强制请求一次
                     if (this.num == 0) {
                         this.page = 1;
                         this.articleList = [];
@@ -429,7 +433,7 @@
                         this.live_page = 1;
                         this.status_live = "nomore";
                         this.getZhiBoSwiper(); // 直播轮播
-                        this.tabLiveList();
+						this.tabLiveList();
                     } else if (this.num == 2) {
                         this.follow_page = 0;
                         this.fansList = [];
@@ -558,6 +562,16 @@
 					}
 				})
 			},
+			onPulling(e) {
+                console.log("onpulling", e);
+            },
+            onRestore() {
+                this.refresher = 'restore'; // 需要重置
+                console.log("onRestore");
+            },
+            onAbort() {
+                console.log("onAbort");
+            },
 			jumpPage(uri) {
 				// console.log(uri);
 				common.jumpPage({ type: uri.type, id: uri.id });

pages/mine/index.vue

@@ -211,7 +211,7 @@ export default {
 		this.getOrderNumber();
 	},
 	onNavigationBarButtonTap(e) {
-		console.log(e);
+		// console.log(e);
 		if(e.index == 0) this.$u.route('/pageE/setting/Index');
 	},
     methods: {
@@ -239,7 +239,7 @@ export default {
 			})
 		},
 		toOtherPage(url) {
-			console.log(url);
+			// console.log(url);
 			uni.navigateTo({
 				url: '/pageE' + url
 			});