Merge pull request '修改返回店铺首页数据不出现的问题' (#337) from zhy into master

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

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>

pageE/order/Index.vue

@@ -78,8 +78,8 @@ export default {
 	},
 	// 下拉刷新
 	onPullDownRefresh() {
-        this.refreshOrderList();
+		this.refreshOrderList();
-    },
+	},
 	methods: {
 		setOrderType() {
 			let type;