From d8eba3c7c48bb6115f99beab6726a78b2e34c772 Mon Sep 17 00:00:00 2001
From: Iruka <1017819588@qq.com>
Date: Wed, 19 Feb 2025 17:38:03 +0800
Subject: [PATCH] .

---
 api/login.js             | 12 +++++++-----
 pages/dev-ops/device.vue |  2 +-
 pages/login.vue          | 27 +++++++++++++++++++++++----
 store/modules/user.js    |  6 ++++--
 utils/request.js         |  2 ++
 5 files changed, 37 insertions(+), 12 deletions(-)

diff --git a/api/login.js b/api/login.js
index 484df95..796f384 100644
--- a/api/login.js
+++ b/api/login.js
@@ -1,7 +1,7 @@
 import request from '@/utils/request'
 
 // 登录方法
-export function login(username, password, code, uuid) {
+export function login(username, password, code, uuid, forceLogin = false) {
 	return request({
 		url: '/auth/loginApp',
 		headers: {
@@ -12,7 +12,8 @@ export function login(username, password, code, uuid) {
 			username,
 			password,
 			code,
-			uuid
+			uuid,
+			forceLogin
 		}
 	})
 }
@@ -26,7 +27,7 @@ export function getCodePhone(data) {
 }
 
 //手机号登录
-export function phoneLogin(mobilePhone,code, uuid,appType) {
+export function phoneLogin(mobilePhone, code, uuid, appType, forceLogin = false) {
 	return request({
 		url: '/auth/loginPhone',
 		headers: {
@@ -34,10 +35,11 @@ export function phoneLogin(mobilePhone,code, uuid,appType) {
 		},
 		method: 'post',
 		data: {
-			mobilePhone,
+			username,
+			password,
 			code,
 			uuid,
-			appType
+			forceLogin
 		}
 	})
 }
diff --git a/pages/dev-ops/device.vue b/pages/dev-ops/device.vue
index 523af38..acb02c1 100644
--- a/pages/dev-ops/device.vue
+++ b/pages/dev-ops/device.vue
@@ -510,7 +510,7 @@
 	</custom-popup>
 </template>
 <script>
-	import plugins from "../../plugins";
+	import plugins from "@/plugins";
 	import * as DevOpsApi from "@/api/dev-ops/index.js"
 
 	export default {
diff --git a/pages/login.vue b/pages/login.vue
index 3fae3e8..d5ad87d 100644
--- a/pages/login.vue
+++ b/pages/login.vue
@@ -77,7 +77,7 @@
 		onLoad,
 	} from "@dcloudio/uni-app"
 	import store from '@/store'
-	import plugin from "@/plugins"
+	import plugins from "@/plugins";
 	import {
 		loginHandle
 	} from '@/utils/login.js'
@@ -251,7 +251,8 @@
 				url: "Login",
 				data: {
 					loginName: loginObj.loginName,
-					password: loginObj.password
+					password: loginObj.password,
+					forceLogin: loginObj.forceLogin || false,
 				}
 			}
 		} else {
@@ -260,7 +261,8 @@
 				data: {
 					mobilePhone: loginObj.phone,
 					uuid: loginObj.uuid,
-					code: loginObj.code
+					code: loginObj.code,
+					forceLogin: loginObj.forceLogin || false,
 				}
 			}
 		}
@@ -283,9 +285,26 @@
 				url: '/pages/index',
 			});
 		}).catch(error => {
-			proxy.$toast(error);
+			if (error === 'error409') {
+				forceLogin();
+			} else {
+				proxy.$toast(error);
+			}
 		})
 	}
+
+	function forceLogin() {
+		uni.showModal({
+			title: '提示',
+			content: '该账号已登录，是否强制登录？',
+			success: function(res) {
+				if (res.confirm) {
+					loginForm.value.forceLogin = true;
+					handleLogin();
+				}
+			}
+		});
+	}
 </script>
 
 <style lang="scss" scoped>
diff --git a/store/modules/user.js b/store/modules/user.js
index 081f46b..015c1c7 100644
--- a/store/modules/user.js
+++ b/store/modules/user.js
@@ -67,8 +67,9 @@ const user = {
 			const password = userInfo.password
 			const code = userInfo.code
 			const uuid = userInfo.uuid
+			const forceLogin = userInfo.forceLogin || false
 			return new Promise((resolve, reject) => {
-				login(loginName, password, code, uuid)
+				login(loginName, password, code, uuid, forceLogin)
 					.then(res => {
 						setToken(res.data.access_token)
 						commit("SET_TOKEN", res.data.access_token)
@@ -98,8 +99,9 @@ const user = {
 			const mobilePhone = data.mobilePhone;
 			const code = data.code;
 			const uuid = data.uuid;
+			const forceLogin = userInfo.forceLogin || false
 			return new Promise((resolve, reject) => {
-				phoneLogin(mobilePhone,code, uuid,2)
+				phoneLogin(mobilePhone, code, uuid, 2, forceLogin)
 					.then(res => {
 						setToken(res.data.access_token)
 						commit("SET_TOKEN", res.data.access_token)
diff --git a/utils/request.js b/utils/request.js
index abf7f3c..c663ff7 100644
--- a/utils/request.js
+++ b/utils/request.js
@@ -66,6 +66,8 @@ const request = config => {
 					}
 				} else if (code === 601) {
 					reject(res.data)
+				} else if (code === 409) {
+					reject("error409")
 				} else if (code !== 200) {
 					// toast(msg)
 					reject(msg)