From 33c2164b1785a4b3c128f71ff577a989e2d91bdc Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期三, 29 四月 2026 15:09:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
small-program/shop/pages/login/login.vue | 37 ++++++++++++++++++-------------------
1 files changed, 18 insertions(+), 19 deletions(-)
diff --git a/small-program/shop/pages/login/login.vue b/small-program/shop/pages/login/login.vue
index 954e918..2673499 100644
--- a/small-program/shop/pages/login/login.vue
+++ b/small-program/shop/pages/login/login.vue
@@ -87,7 +87,7 @@
}
},
methods: {
- async handleLogin() {
+ handleLogin() {
if (!this.form.telephone) {
uni.showToast({
title: '璇疯緭鍏ヨ处鍙�',
@@ -109,28 +109,27 @@
})
return
}
- uni.showLoading({ title: '鐧诲綍涓�...', mask: true })
- const res = await this.$u.api.shopLogin({
+ this.$u.api.shopLogin({
openid: this.openid,
password: this.form.password,
telephone: this.form.telephone
- })
- uni.hideLoading()
- if (res.code === 200) {
- this.$store.commit('setUserType', 1)
- this.$store.commit('setShopToken', res.data.token)
- // 鑾峰彇闂ㄥ簵淇℃伅
- const shopInfoRes = await this.$u.api.getShopInfo({})
- if (shopInfoRes.code === 200) {
- this.$store.commit('setShopInfo', shopInfoRes.data)
+ }).then(async res => {
+ if (res.code === 200) {
+ this.$store.commit('setUserType', 1)
+ this.$store.commit('setShopToken', res.data.token)
+ // 鑾峰彇闂ㄥ簵淇℃伅
+ const shopInfoRes = await this.$u.api.getShopInfo({})
+ if (shopInfoRes.code === 200) {
+ this.$store.commit('setShopInfo', shopInfoRes.data)
+ }
+ uni.showToast({ title: '鐧诲綍鎴愬姛', icon: 'success' })
+ setTimeout(() => {
+ uni.reLaunch({
+ url: '/shop/pages/store-home/store-home'
+ });
+ }, 1500)
}
- uni.showToast({ title: '鐧诲綍鎴愬姛', icon: 'success' })
- setTimeout(() => {
- uni.reLaunch({
- url: '/shop/pages/store-home/store-home'
- });
- }, 1500)
- }
+ })
},
goToService(type) {
uni.navigateTo({
--
Gitblit v1.9.3