From 4282e1cc35d85e2f84fe37b7f51fde22b374c7c9 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期二, 24 二月 2026 11:27:18 +0800
Subject: [PATCH] 合并
---
mini-program/pages/login/login.vue | 29 +++++++++++++++++++----------
1 files changed, 19 insertions(+), 10 deletions(-)
diff --git a/mini-program/pages/login/login.vue b/mini-program/pages/login/login.vue
index 3ca97f4..2aa3441 100644
--- a/mini-program/pages/login/login.vue
+++ b/mini-program/pages/login/login.vue
@@ -48,11 +48,14 @@
radio:false
};
},
- onShow() {
+ async onLoad() {
+ },
+ async onShow() {
+ await this.$onLaunched;
this.focus=false
this.focus1=false
this.form.openid=this.openid
- this.checkShopLogin()
+ this.checkShopLogin()
},
methods:{
jumpService(flag) {
@@ -61,27 +64,33 @@
})
},
async checkShopLogin(){
+ uni.showLoading( )
var that =this
- console.log("shopInfo",this.shopInfo)
- console.log("shopToken",this.shopToken)
-
- console.log("openid",this.openid)
if( this.shopInfo !=null && this.shopInfo.id!=null && (this.shopToken!=null &&this.shopToken!='')){
//楠岃瘉token鏄惁鏈夋晥
let res = await that.$u.api.getShopInfo({tokenType:1 })
if (res.code === 200) {
await that.$store.commit('setShopInfo', res.data)
that.jumpShopIndex()
+ }else if( this.openid !=null && this.openid !=''){
+ let res = await that.$u.api.shopOpenidLogin(this.form)
+ if (res.code === 200 && res.data.shop!=null && res.data.token!=null) {
+ await that.$store.commit('setShopInfo', res.data.shop)
+ await that.$store.commit('setShopToken', res.data.token)
+ that.jumpShopIndex()
+ }
}
}else if( this.openid !=null && this.openid !=''){
- //浼樺厛闈欓粯鐧婚檰
let res = await that.$u.api.shopOpenidLogin(this.form)
- if (res.code === 200 && res.shop!=null && res.token!=null) {
+ if (res.code === 200 && res.data.shop!=null && res.data.token!=null) {
await that.$store.commit('setShopInfo', res.data.shop)
await that.$store.commit('setShopToken', res.data.token)
that.jumpShopIndex()
}
- }
+ }
+ setTimeout(function () {
+ uni.hideLoading();
+ }, 1000);
},
changeRadio(){
this.radio = !this.radio
@@ -121,7 +130,7 @@
})
},
jumpShopIndex() {
- uni.navigateTo({
+ uni.redirectTo({
url: '/pages/distributor/distributor'
})
}
--
Gitblit v1.9.3