From 2cd31915236257e325b49f2e86f6912512e1f7ce Mon Sep 17 00:00:00 2001
From: wlzboy <66905212@qq.com>
Date: 星期日, 02 十一月 2025 14:27:15 +0800
Subject: [PATCH] fix:app 用户登录，默认不勾选用户协议
---
app/pages/task/create-emergency.vue | 2
app/pages/index.vue | 14 +++++++
app/pages/login.vue | 46 +++++++++++++++++++++-
ruoyi-admin/src/main/resources/application-prod.yml | 3 +
app/App.vue | 15 +++++++
5 files changed, 75 insertions(+), 5 deletions(-)
diff --git a/app/App.vue b/app/App.vue
index 298be3a..0e788bc 100644
--- a/app/App.vue
+++ b/app/App.vue
@@ -53,7 +53,8 @@
}
// 搴旂敤鏄剧ず鏃跺埛鏂版湭璇绘秷鎭暟閲�
- if (currentToken) {
+ // 娉ㄦ剰锛氬彧鏈夊凡鐧诲綍涓斾笉鍦ㄧ櫥褰曢〉闈㈡椂鎵嶈皟鐢�
+ if (currentToken && !this.isLoginPage()) {
this.updateUnreadMessageBadge()
// 閲嶆柊鍚姩杞锛堝鏋滀箣鍓嶅凡鍋滄锛�
if (!this.messagePollingTimer) {
@@ -87,6 +88,18 @@
}
},
+ // 鍒ゆ柇褰撳墠鏄惁鍦ㄧ櫥褰曢〉闈�
+ isLoginPage() {
+ const pages = getCurrentPages()
+ if (pages.length === 0) {
+ return false
+ }
+ const currentPage = pages[pages.length - 1]
+ const route = currentPage.route || ''
+ // 鍒ゆ柇鏄惁涓虹櫥褰曠浉鍏抽〉闈�
+ return route.includes('login') || route.includes('register')
+ },
+
// 鏇存柊鏈娑堟伅寰芥爣
updateUnreadMessageBadge() {
// 妫�鏌ユ槸鍚﹀凡鐧诲綍锛屾湭鐧诲綍鍒欎笉璇锋眰
diff --git a/app/pages/index.vue b/app/pages/index.vue
index 27abff0..72efa8a 100644
--- a/app/pages/index.vue
+++ b/app/pages/index.vue
@@ -196,6 +196,13 @@
}
},
onLoad() {
+ // 妫�鏌ョ敤鎴锋槸鍚﹀凡鐧诲綍
+ const userId = this.currentUser.userId
+ if (!userId) {
+ console.log('鐢ㄦ埛鏈櫥褰曪紝璺宠繃鍔犺浇鏁版嵁')
+ return
+ }
+
// 鍔犺浇鐢ㄦ埛缁戝畾杞﹁締淇℃伅
this.loadUserVehicle()
// 鍔犺浇姝ｅ湪杩愯鐨勪换鍔�
@@ -204,6 +211,13 @@
this.loadUnreadMessageCount()
},
onShow() {
+ // 妫�鏌ョ敤鎴锋槸鍚﹀凡鐧诲綍
+ const userId = this.currentUser.userId
+ if (!userId) {
+ console.log('鐢ㄦ埛鏈櫥褰曪紝璺宠繃鍔犺浇鏁版嵁')
+ return
+ }
+
// 姣忔鏄剧ず椤甸潰鏃跺埛鏂颁换鍔″垪琛ㄣ�佺粦瀹氳溅杈嗗拰娑堟伅鏁伴噺
this.loadUserVehicle()
this.loadRunningTasks()
diff --git a/app/pages/login.vue b/app/pages/login.vue
index 3e85fce..94efe80 100644
--- a/app/pages/login.vue
+++ b/app/pages/login.vue
@@ -24,7 +24,7 @@
<view class="agreement-checkbox">
<checkbox-group @change="onAgreementChange">
<label class="checkbox-label">
- <checkbox :checked="agreedToPolicy" value="agreed" color="#007AFF" style="margin-top: 0;" />
+ <checkbox :checked="agreedToPolicy" value="agreed" color="#007AFF" class="round-checkbox" style="margin-top: 0;" />
<text class="agreement-text">
<text class="text-grey1">鍚屾剰</text>
<text @click.stop="handleUserAgrement" class="text-blue agreement-link">銆婄敤鎴峰崗璁��</text>
@@ -52,8 +52,8 @@
captchaEnabled: true,
// 鐢ㄦ埛娉ㄥ唽寮�鍏�
register: false,
- // 闅愮鏀跨瓥鍚屾剰鐘舵�侊紙榛樿閫変腑锛�
- agreedToPolicy: true,
+ // 闅愮鏀跨瓥鍚屾剰鐘舵��(榛樿鏈�変腑,闇�瑕佺敤鎴蜂富鍔ㄥ嬀閫�)
+ agreedToPolicy: false,
globalConfig: getApp().globalData.config,
loginForm: {
username: "",
@@ -285,6 +285,46 @@
vertical-align: middle;
}
+ // 鍦嗗舰澶嶉�夋鏍峰紡
+ .round-checkbox {
+ border-radius: 50% !important;
+ }
+
+ // 閽堝寰俊灏忕▼搴忕殑鍦嗗舰鏍峰紡
+ ::v-deep .uni-checkbox-input,
+ ::v-deep .wx-checkbox-input {
+ border-radius: 50% !important;
+ }
+
+ // 閽堝H5鐨勫渾褰㈡牱寮�
+ ::v-deep input[type="checkbox"] {
+ border-radius: 50% !important;
+ -webkit-appearance: none;
+ appearance: none;
+ width: 36rpx;
+ height: 36rpx;
+ border: 2rpx solid #d1d1d1;
+ background-color: #fff;
+ position: relative;
+
+ &:checked {
+ background-color: #007AFF;
+ border-color: #007AFF;
+
+ &::after {
+ content: '';
+ position: absolute;
+ top: 50%;
+ left: 50%;
+ transform: translate(-50%, -50%);
+ width: 12rpx;
+ height: 12rpx;
+ background-color: #fff;
+ border-radius: 50%;
+ }
+ }
+ }
+
.agreement-text {
display: inline-flex;
align-items: center;
diff --git a/app/pages/task/create-emergency.vue b/app/pages/task/create-emergency.vue
index a0f758a..21fa1c0 100644
--- a/app/pages/task/create-emergency.vue
+++ b/app/pages/task/create-emergency.vue
@@ -1498,7 +1498,7 @@
this.taskForm.transferDistance = distanceInKm
console.log('璺濈璁＄畻鎴愬姛:', distanceInKm, 'km')
- this.$modal.showToast(`璺濈璁＄畻鎴愬姛: ${distanceInKm}鍏噷`)
+ // this.$modal.showToast(`璺濈璁＄畻鎴愬姛: ${distanceInKm}鍏噷`)
} else {
console.error('璺濈璁＄畻澶辫触:', response.msg)
this.$modal.showToast('璺濈璁＄畻澶辫触锛岃鎵嬪姩杈撳叆')
diff --git a/ruoyi-admin/src/main/resources/application-prod.yml b/ruoyi-admin/src/main/resources/application-prod.yml
index 09b5b22..d9fdcc9 100644
--- a/ruoyi-admin/src/main/resources/application-prod.yml
+++ b/ruoyi-admin/src/main/resources/application-prod.yml
@@ -96,6 +96,9 @@
tencent:
map:
key: 6YVBZ-ZJDLQ-JMY5F-BR7XG-H3TAV-C3FXC
+baidu:
+ map:
+ ak: GX7G1RmAbTEQHor9NKpzRiB2jerqaY1E
# 鏃х郴缁熼厤缃�
legacy:
system:
--
Gitblit v1.9.1