From 027b07baeb4457295009994fbf5232a2f7c59219 Mon Sep 17 00:00:00 2001
From: ghusermoon <2673031505@qq.com>
Date: Sat, 5 Sep 2020 15:18:48 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=BF=94=E5=9B=9E=E5=BA=97?=
 =?UTF-8?q?=E9=93=BA=E9=A6=96=E9=A1=B5=E6=95=B0=E6=8D=AE=E4=B8=8D=E5=87=BA?=
 =?UTF-8?q?=E7=8E=B0=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pageC/merchant/index.vue | 19 +++++++++++--------
 pageE/order/Index.vue    |  4 ++--
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/pageC/merchant/index.vue b/pageC/merchant/index.vue
index fb9e050..f7070a9 100644
--- a/pageC/merchant/index.vue
+++ b/pageC/merchant/index.vue
@@ -118,6 +118,17 @@ export default {
 			id:this.sid
 		});
 	},
+	onLoad(option){
+		this.sid = option.id;
+		// console.log(this.sid);
+		this.getStoreInfo();
+		this.getArticlelist();
+		this.setViewHeight();
+		// this.getStoreImgVideoList();
+	},
+	onShow() {
+		this.cur = 0;
+	},
 	methods: {
 		customers(){
 			console.log(this.$store.state.hasLogin)
@@ -225,14 +236,6 @@ export default {
             // console.log(this.paddingTop);
 		}
 	},
-	onLoad(option){
-		this.sid = option.id;
-		// console.log(this.sid);
-		this.getStoreInfo();
-		this.getArticlelist();
-		this.setViewHeight();
-		// this.getStoreImgVideoList();
-	}
 };
 </script>
 <style lang="scss" scoped>
diff --git a/pageE/order/Index.vue b/pageE/order/Index.vue
index e04e4b2..4222680 100644
--- a/pageE/order/Index.vue
+++ b/pageE/order/Index.vue
@@ -78,8 +78,8 @@ export default {
 	},
 	// 下拉刷新
 	onPullDownRefresh() {
-        this.refreshOrderList();
-    },
+		this.refreshOrderList();
+	},
 	methods: {
 		setOrderType() {
 			let type;