接口顺序调整，会员充值调整

pages/member/index.vue

@@ -46,44 +46,23 @@
 				usershopUserinfo: null,
 			}
 		},
-		onLoad(e) {
+		async onLoad(e) {
 			console.log(e)
-			if ( e.type == 'list' || e.type == 'index') {
-				this.shopId = e.shopId;
-				this.init();
-			}
+			// if ( e.type == 'list' || e.type == 'index') {
+			// 	this.shopId = e.shopId;
+			// 	this.init();
+			// }
 			if (e.q) {
 				this.shopId = this.getQueryString(decodeURIComponent(e.q), 'shopId')
+				this.tokenShow = false;
+				 // 等待登录结果返回
 				if (!uni.cache.get('token')) {
-					uni.login({
-						provider: 'weixin',
-						success: async (data) => {
-							try {
-								uni.getUserInfo({
-									provider: 'weixin',
-									success: async (infoRes) => {
-										uni.cache.set('weixincode', data.code);
-										let res = await this.api.userwxlogin({
-											code: uni.cache.get('weixincode'), //临时登录凭证
-											rawData: infoRes.rawData
-										})
-										if (res.code == 0) {
-											uni.cache.set('token', res.data.token);
-											uni.cache.set('miniAppOpenId', res.data.userInfo
-												.miniAppOpenId)
-											uni.cache.set('userInfo', res.data.userInfo);
-											this.tokenShow = false;
-											this.init();
-										}
-									},
-									fail: (err) => {}
-								});
-							} catch (e) {}
-						}
-					});
-				} else {
-					this.init();
+					await this.$onLaunched;
 				}
+				this.init();
+			} else{
+				this.shopId = e.shopId;
+				this.init();
 			}
 			console.log(this.shopId)
 		},

pages/order_food/order_food.vue

@@ -409,40 +409,18 @@
 			uni.$off('message')
 			this.fixedtrue = true
 		},
-		onShow() {
+		async onShow() {
 			let _this = this;
 			this.orderdetailFlag = true;
 			uni.pageScrollTo({
 				scrollTop: 0,
 				duration: 0
 			});
-			uni.login({
-				provider: 'weixin',
-				success: async (data) => {
-					try {
-						uni.getUserInfo({
-							provider: 'weixin',
-							success: async (infoRes) => {
-								uni.cache.set('weixincode', data.code);
-								let res = await this.api.userwxlogin({
-									code: uni.cache.get('weixincode'), //临时登录凭证
-									rawData: infoRes.rawData
-								})
-								if (res.code == 0) {
-									uni.cache.set('token', res.data.token);
-									uni.cache.set('miniAppOpenId', res.data.userInfo
-										.miniAppOpenId)
-									uni.cache.set('userInfo', res.data.userInfo);
-									uni.$on('message', this.getMessage)
-
-									_this.getLocation()
-								}
-							},
-							fail: (err) => {}
-						});
-					} catch (e) {}
-				}
-			});
+			if (!uni.cache.get('token')) {
+				await this.$onLaunched;
+			}
+			uni.$on('message', this.getMessage)
+			_this.getLocation()
 		},
 		methods: {
 			navigateBacknav() {