From 89469f566f4ad8602def16aef6744d205a3d20a8 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期一, 29 十二月 2025 14:32:54 +0800
Subject: [PATCH] 昭德app需求修改

---
 src/pages/login.vue |   43 +------------------------------------------
 1 files changed, 1 insertions(+), 42 deletions(-)

diff --git a/src/pages/login.vue b/src/pages/login.vue
index 860fd09..c4eafd9 100644
--- a/src/pages/login.vue
+++ b/src/pages/login.vue
@@ -6,22 +6,10 @@
 		<view class="login-form-content">
 			<view class="input-item flex align-center">
 				<up-input prefixIcon="account" placeholder="璇疯緭鍏ヨ处鍙�" border="bottom"
-									@blur="getUserLoginFacotryList"
 									maxlength="30" v-model="loginForm.userName" clearable></up-input>
 			</view>
 			<view class="input-item flex align-center">
 				<up-input prefixIcon="lock" placeholder="璇疯緭鍏ュ瘑鐮�" border="bottom" maxlength="20" v-model="loginForm.password" clearable type="password"></up-input>
-			</view>
-			<view class="input-item flex align-center select-container">
-				<up-icon name="tags" size="18"></up-icon>
-				<up-picker-data
-					v-model="loginForm.factoryId"
-					title="璇烽�夋嫨鍏徃"
-					:options="factoryList"
-					valueKey="id"
-					style="width: 100%;"
-					labelKey="name">
-				</up-picker-data>
 			</view>
 			<view>
 				<button @click="handleLogin" class="login-btn cu-btn block bg-blue lg round">鐧诲綍</button>
@@ -50,7 +38,6 @@
 		icon: 'none'
 	})
 }
-import { userLoginFacotryList} from '@/api/login'
 import { ref, onMounted } from "vue";
 import useUserStore from '@/store/modules/user'
 import { getWxCode } from '@/utils/geek';
@@ -63,7 +50,6 @@
 const loginForm = ref({
 	userName: "",
 	password: "",
-	factoryId: "",
 	currentFatoryName: "",
 });
 const factoryList = ref([]) // 鍏徃鍒楄〃
@@ -109,37 +95,11 @@
 	})
 }
 
-function getUserLoginFacotryList() {
-	if(loginForm.value.userName){
-		userLoginFacotryList({userName:loginForm.value.userName}).then(res => {
-			console.log('res',res)
-			// 妫�鏌es.data鏄惁涓烘暟缁�
-			if (res.data && Array.isArray(res.data)) {
-				// 閲嶆柊缁勮鏁版嵁鏍煎紡锛歞eptId鍙樻垚id锛宒eptName鍙樻垚name
-				factoryList.value = res.data.map(item => ({
-					id: item.deptId,
-					name: item.deptName
-				}))
-			} else {
-				// 濡傛灉res.data涓嶆槸鏁扮粍锛岃缃负绌烘暟缁�
-				factoryList.value = []
-			}
-		}).catch(error => {
-			showToast('鑾峰彇鍏徃鍒楄〃澶辫触:', error)
-			factoryList.value = []
-		})
-	}else {
-		factoryList.value = []
-	}
-}
-
 async function handleLogin() {
 	if (loginForm.value.userName === "") {
 		showToast("璇疯緭鍏ユ偍鐨勮处鍙�")
 	} else if (loginForm.value.password === "") {
 		showToast("璇疯緭鍏ユ偍鐨勫瘑鐮�")
-	} else if (loginForm.value.factoryId === "") {
-		showToast("璇烽�夋嫨鍏徃")
 	} else {
 		showToast("鐧诲綍涓紝璇疯�愬績绛夊緟...")
 		pwdLogin()
@@ -147,7 +107,7 @@
 };
 // 瀵嗙爜鐧诲綍
 async function pwdLogin() {
-	userStore.loginCheckFactory(loginForm.value).then(() => {
+	userStore.login(loginForm.value).then(() => {
 		modal.closeLoading()
 		// 鐧诲綍鎴愬姛鍚庝繚瀛樺瘑鐮�
 		savePassword();
@@ -168,7 +128,6 @@
 // 椤甸潰鍔犺浇鏃舵鏌ユ槸鍚︽湁淇濆瓨鐨勫瘑鐮�
 onMounted(() => {
 	loadPassword();
-	getUserLoginFacotryList()
 });
 </script>
 

--
Gitblit v1.9.3