From ba389833f9fbb043c3fa2df5aac8ed00d899e0fb Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期一, 02 二月 2026 11:44:13 +0800
Subject: [PATCH] 进销存升级app: 1.不需要登录公司

---
 src/pages/login.vue |   46 +++++++++++++++++++++-------------------------
 1 files changed, 21 insertions(+), 25 deletions(-)

diff --git a/src/pages/login.vue b/src/pages/login.vue
index ace9551..cae7ce2 100644
--- a/src/pages/login.vue
+++ b/src/pages/login.vue
@@ -7,20 +7,10 @@
 			<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>
+									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"
-					labelKey="name">
-				</up-picker-data>
 			</view>
 			<view>
 				<button @click="handleLogin" class="login-btn cu-btn block bg-blue lg round">鐧诲綍</button>
@@ -41,20 +31,27 @@
 </template>
 
 <script setup>
-import modal from '@/plugins/modal'
+import {modal} from "@/plugins";
+
+const showToast = (message) => {
+	uni.showToast({
+		title: message,
+		icon: 'none'
+	})
+}
 import { userLoginFacotryList} from '@/api/login'
 import { ref, onMounted } from "vue";
 import useUserStore from '@/store/modules/user'
 import { getWxCode } from '@/utils/geek';
 import { wxLogin } from '@/api/oauth';
 import { setToken } from '@/utils/auth';
+import View from "@/pages/procurementManagement/procurementLedger/view.vue";
 const userStore = useUserStore()
 const useWxLogin = ref(false); // 鏄惁浣跨敤寰俊鐧诲綍
 const rememberPassword = ref(false); // 璁颁綇瀵嗙爜
 const loginForm = ref({
-	username: "",
+	userName: "",
 	password: "",
-	factoryId: "",
 	currentFatoryName: "",
 });
 const factoryList = ref([]) // 鍏徃鍒楄〃
@@ -62,7 +59,7 @@
 // 淇濆瓨瀵嗙爜鍒版湰鍦板瓨鍌�
 function savePassword() {
 	if (rememberPassword.value) {
-		uni.setStorageSync('remembered_username', loginForm.value.username);
+		uni.setStorageSync('remembered_username', loginForm.value.userName);
 		uni.setStorageSync('remembered_password', loginForm.value.password);
 		uni.setStorageSync('remember_password', true);
 	} else {
@@ -80,7 +77,7 @@
 		const savedUsername = uni.getStorageSync('remembered_username');
 		const savedPassword = uni.getStorageSync('remembered_password');
 		if (savedUsername) {
-			loginForm.value.username = savedUsername;
+			loginForm.value.userName = savedUsername;
 		}
 		if (savedPassword) {
 			loginForm.value.password = savedPassword;
@@ -101,8 +98,9 @@
 }
 
 function getUserLoginFacotryList() {
-	if(loginForm.value.username){
-		userLoginFacotryList({userName:loginForm.value.username}).then(res => {
+	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
@@ -115,7 +113,7 @@
 				factoryList.value = []
 			}
 		}).catch(error => {
-			modal.msgError('鑾峰彇鍏徃鍒楄〃澶辫触:', error)
+			showToast('鑾峰彇鍏徃鍒楄〃澶辫触:', error)
 			factoryList.value = []
 		})
 	}else {
@@ -124,14 +122,12 @@
 }
 
 async function handleLogin() {
-	if (loginForm.value.username === "") {
-		modal.msgError("璇疯緭鍏ユ偍鐨勮处鍙�")
+	if (loginForm.value.userName === "") {
+		showToast("璇疯緭鍏ユ偍鐨勮处鍙�")
 	} else if (loginForm.value.password === "") {
-		modal.msgError("璇疯緭鍏ユ偍鐨勫瘑鐮�")
-	} else if (loginForm.value.factoryId === "") {
-		modal.msgError("璇烽�夋嫨鍏徃")
+		showToast("璇疯緭鍏ユ偍鐨勫瘑鐮�")
 	} else {
-		modal.loading("鐧诲綍涓紝璇疯�愬績绛夊緟...")
+		showToast("鐧诲綍涓紝璇疯�愬績绛夊緟...")
 		pwdLogin()
 	}
 };

--
Gitblit v1.9.3