Merge branch 'master' of http://git.cc-lotus.info/pointToNetwork/point-app

pages/index/index.vue

@@ -17,10 +17,10 @@
 			};
 		},
 		onLoad: function() {},
-		onShow: function() {
+		onShow: async function() {
 			const that = this;
-			that.searchConfig();
-			that.search();
+			await that.searchConfig();
+			await that.search();
 		},
 		methods: {
 			// 查询基本设置