From 14949fa18f86dac67fbd5330b73299af539c3140 Mon Sep 17 00:00:00 2001
From: damonyuan <404054358@qq.com>
Date: Wed, 13 Nov 2024 23:03:19 +0800
Subject: [PATCH] =?UTF-8?q?feat=20=E5=90=8E=E5=8F=B0=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E6=89=8B=E6=9C=BA=E5=8F=B7=E5=A2=9E=E5=8A=A0=E5=94=AF=E4=B8=80?=
 =?UTF-8?q?=E6=A0=A1=E9=AA=8C=20feat=20=E7=A7=BB=E5=8A=A8=E7=AB=AF?=
 =?UTF-8?q?=E7=99=BB=E5=BD=95UI=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mdd/admin/service/impl/UserServiceImpl.java   |  7 +++++++
 uniapp/src/pages/login/login.vue                  | 15 +++++++++++----
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/server/like-admin/src/main/java/com/mdd/admin/service/impl/UserServiceImpl.java b/server/like-admin/src/main/java/com/mdd/admin/service/impl/UserServiceImpl.java
index b7a9a8d0..22a3c2be 100644
--- a/server/like-admin/src/main/java/com/mdd/admin/service/impl/UserServiceImpl.java
+++ b/server/like-admin/src/main/java/com/mdd/admin/service/impl/UserServiceImpl.java
@@ -189,6 +189,13 @@ public class UserServiceImpl implements IUserService {
                 if (!Pattern.matches("^[1][3-9][0-9]{9}$", value)) {
                     throw new OperateException("手机号格式不正确!");
                 }
+                User uMobile = userMapper.selectOne(new QueryWrapper<User>()
+                        .eq("mobile", value)
+                        .isNull("delete_time")
+                        .last("limit 1"));
+                if (StringUtils.isNotNull(uMobile) && uMobile.getId().equals(id) == false) {
+                    throw new OperateException("手机号已被其它账号绑定!");
+                }
                 user.setMobile(value);
                 break;
             default:
diff --git a/uniapp/src/pages/login/login.vue b/uniapp/src/pages/login/login.vue
index d697d53f..026916b0 100644
--- a/uniapp/src/pages/login/login.vue
+++ b/uniapp/src/pages/login/login.vue
@@ -164,16 +164,23 @@
                 </view>
                 <view class="flex justify-between mt-[40rpx]">
                     <view
+						v-if="
+						    formData.scene == LoginWayEnum.MOBILE &&
+						    includeLoginWay(LoginWayEnum.ACCOUNT)
+						"
                         >已有账号，使用
                         <span
                             class="text-primary"
                             @click="changeLoginWay(LoginWayEnum.ACCOUNT)"
-                            v-if="
-                                formData.scene == LoginWayEnum.MOBILE &&
-                                includeLoginWay(LoginWayEnum.ACCOUNT)
-                            "
                             >密码登录</span
                         >
+					</view>
+					<view
+						v-if="
+						    formData.scene == LoginWayEnum.ACCOUNT &&
+						    includeLoginWay(LoginWayEnum.MOBILE)
+						"
+					    >已有账号，使用
                         <span
                             class="text-primary"
                             @click="changeLoginWay(LoginWayEnum.MOBILE)"