From 7a4b8764b68e0dbaeb90e292a8a4bd47cb379e68 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期一, 27 四月 2026 17:26:02 +0800
Subject: [PATCH] 小程序端和PC端bug修复
---
small-program/shop/pages/login/login.vue | 33 +++++++++++++++------------------
1 files changed, 15 insertions(+), 18 deletions(-)
diff --git a/small-program/shop/pages/login/login.vue b/small-program/shop/pages/login/login.vue
index 79b3d35..105b659 100644
--- a/small-program/shop/pages/login/login.vue
+++ b/small-program/shop/pages/login/login.vue
@@ -26,9 +26,9 @@
<image class="agree-icon" :src="agreed ? '/static/icon/ic_accept_sel@2x.png' : '/static/icon/ic_accept@2x.png'" mode="aspectFit" @tap="agreed = !agreed"></image>
<view class="agreement-text-wrap">
<text class="agreement-text">鎴戝凡闃呰骞跺悓鎰�</text>
- <text class="agreement-link" @click="goToService">銆婄敤鎴锋湇鍔″崗璁��</text>
+ <text class="agreement-link" @click="goToService(0)">銆婄敤鎴锋湇鍔″崗璁��</text>
<text class="agreement-text">鍙�</text>
- <text class="agreement-link" @click="goToPrivacy">銆婄敤鎴烽殣绉佹斂绛栥��</text>
+ <text class="agreement-link" @click="goToService(1)">銆婄敤鎴烽殣绉佹斂绛栥��</text>
</view>
</view>
</view>
@@ -61,7 +61,7 @@
console.log(this.userType,"============================================")
this.$u.api.shopSilentLogin({})
.then( res => {
- if (res.code === 200) {
+ if (res.code === 200 && res.data) {
this.$store.commit('setUserType', 1)
this.$store.commit('setShopToken', res.data.token)
// 鑾峰彇闂ㄥ簵淇℃伅
@@ -77,6 +77,7 @@
// }, 1000)
})
}
+ uni.hideLoading()
})
}catch(e){
uni.hideLoading()
@@ -88,13 +89,6 @@
},
methods: {
async handleLogin() {
- if (!this.agreed) {
- uni.showToast({
- title: '璇峰厛闃呰骞跺悓鎰忓崗璁�',
- icon: 'none'
- })
- return
- }
if (!this.form.telephone) {
uni.showToast({
title: '璇疯緭鍏ヨ处鍙�',
@@ -105,6 +99,13 @@
if (!this.form.password) {
uni.showToast({
title: '璇疯緭鍏ュ瘑鐮�',
+ icon: 'none'
+ })
+ return
+ }
+ if (!this.agreed) {
+ uni.showToast({
+ title: '璇峰厛闃呰骞跺悓鎰忓崗璁�',
icon: 'none'
})
return
@@ -145,16 +146,11 @@
})
}
},
- goToService() {
+ goToService(type) {
uni.navigateTo({
- url: '/pages/rich-text/rich-text?type=userAgreement'
+ url: '/pages/rich-text/rich-text?type='+type
})
- },
- goToPrivacy() {
- uni.navigateTo({
- url: '/pages/rich-text/rich-text?type=privacyPolicy'
- })
- }
+ }
}
}
</script>
@@ -233,6 +229,7 @@
}
.agreement-row {
+ background: #D9F3FF;
margin-top: 60rpx;
display: flex;
align-items: flex-start;
--
Gitblit v1.9.3