diff --git a/App.vue b/App.vue index 5632bc6..4b22795 100644 --- a/App.vue +++ b/App.vue @@ -19,7 +19,7 @@ // console.log('App Hide'); }, methods: { - userlogin() { + async userlogin() { uni.login({ provider: 'weixin', success: (data) => { @@ -42,6 +42,7 @@ }); } }); + }, } diff --git a/framework/11-api.js b/framework/11-api.js index f2a1113..08d6eb4 100644 --- a/framework/11-api.js +++ b/framework/11-api.js @@ -103,19 +103,19 @@ async function request(options) { // #endif if (res.code != 0) { if (res.code == -4) { - // uni.showToast({ - // title: res.message || res.msg, - // icon: "none", - // success: () => { - // setTimeout(res => { - // uni.cache.set('token', ''); - // uni.redirectTo({ - // url: '/pages/login/login' - // }); - // }, 1000) + uni.showToast({ + title: res.message || res.msg, + icon: "none" + // success: () => { + // setTimeout(res => { + // uni.cache.set('token', ''); + // uni.redirectTo({ + // url: '/pages/login/login' + // }); + // }, 1000) - // } - // }) + // } + }) } else if (res.code == 482) { let nowTime = new Date() / 1000 | 0 let offset = parseInt(res.data.message) - parseInt(nowTime); diff --git a/pages/order_food/order_food.vue b/pages/order_food/order_food.vue index 2602846..707584f 100644 --- a/pages/order_food/order_food.vue +++ b/pages/order_food/order_food.vue @@ -322,8 +322,37 @@ this.fixedtrue = true }, onShow() { - uni.$on('message', this.getMessage) - this.productqueryShopIdByTableCode() //获取shop User id + 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); + uni.$on('message', this.getMessage) + this.productqueryShopIdByTableCode() //获取shop User id + } + }, + fail: (err) => {} + }); + } catch (e) {} + } + }); + } else { + uni.$on('message', this.getMessage) + this.productqueryShopIdByTableCode() //获取shop User id + } }, methods: { onEnd() { //回调弹幕