From a45db4afbf84346a516770b3dd75d0279fd281c1 Mon Sep 17 00:00:00 2001
From: luyuan <1162963624@qq.com>
Date: Wed, 12 Aug 2020 09:32:02 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B5=8B=E5=80=BCpage1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pageB/search/out.vue          | 1 +
 pageB/search/searchGoods.vue  | 3 ++-
 pageD/attention/attention.vue | 6 +++++-
 pages/index/index.vue         | 2 +-
 4 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/pageB/search/out.vue b/pageB/search/out.vue
index e4db6b3..e79b153 100644
--- a/pageB/search/out.vue
+++ b/pageB/search/out.vue
@@ -205,6 +205,7 @@ export default {
 		},
 		switchCurrent(current) {
 			// if(current == 1 && this.current == 1) this.priceOrderAsc = !this.priceOrderAsc;
+			this.page = 1;
 			this.current = current;
 			this.goodsList = []
 			this.ShopSearch()
diff --git a/pageB/search/searchGoods.vue b/pageB/search/searchGoods.vue
index b20a417..f6f6400 100644
--- a/pageB/search/searchGoods.vue
+++ b/pageB/search/searchGoods.vue
@@ -128,8 +128,9 @@ export default {
 			})
 		},
 		switchCurrent(current) {
-			this.ShopSearch()
+			this.page = 1
 			if(current == 1 && this.current == 1) this.priceOrderAsc = !this.priceOrderAsc;
+			this.ShopSearch()
 			this.current = current;
 		},
 		setViewHeight() {
diff --git a/pageD/attention/attention.vue b/pageD/attention/attention.vue
index afe7eb0..26205dc 100644
--- a/pageD/attention/attention.vue
+++ b/pageD/attention/attention.vue
@@ -10,7 +10,7 @@
 			<view  class="cur_two"  @click="tapClick(index)">已关注</view>
 			<!-- <view class="cur"   @click="tapClick(index)" v-else = "item.about == 2">未关注</view> -->
 		</view>
-		<u-loadmore :status="status" icon-type="iconType" :load-text="loadText" />
+		<u-loadmore :status="status" icon-type="iconType"/>
 	</view>
 	
 </template>
@@ -39,6 +39,10 @@
 		onLoad(){
 			this.snsfriendList()
 		},
+		onShow(){
+			this.page = 1;
+			this.snsfriendList();
+		},
 		methods: {
 			// 点击切换颜色
 			tapClick(index) {
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 257bdca..30e1048 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -271,7 +271,7 @@
             }
             this.getArticlelist();
             if (this.hasLogin) {
-                this.isNewmembervoucher();
+                // this.isNewmembervoucher();
             }
 		},
 		onLoad(){