From 952240909a036a341300ec25a2259e6faed33362 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期四, 04 九月 2025 16:09:49 +0800
Subject: [PATCH] 设备保修真机测试，bug修改
---
src/pages/login.vue | 34 +++++++++++++++++++++-------------
1 files changed, 21 insertions(+), 13 deletions(-)
diff --git a/src/pages/login.vue b/src/pages/login.vue
index f702371..860fd09 100644
--- a/src/pages/login.vue
+++ b/src/pages/login.vue
@@ -7,7 +7,7 @@
<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>
@@ -42,7 +42,14 @@
</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'
@@ -54,7 +61,7 @@
const useWxLogin = ref(false); // 鏄惁浣跨敤寰俊鐧诲綍
const rememberPassword = ref(false); // 璁颁綇瀵嗙爜
const loginForm = ref({
- username: "",
+ userName: "",
password: "",
factoryId: "",
currentFatoryName: "",
@@ -64,7 +71,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 {
@@ -82,7 +89,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;
@@ -103,8 +110,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
@@ -117,7 +125,7 @@
factoryList.value = []
}
}).catch(error => {
- modal.msgError('鑾峰彇鍏徃鍒楄〃澶辫触:', error)
+ showToast('鑾峰彇鍏徃鍒楄〃澶辫触:', error)
factoryList.value = []
})
}else {
@@ -126,14 +134,14 @@
}
async function handleLogin() {
- if (loginForm.value.username === "") {
- modal.msgError("璇疯緭鍏ユ偍鐨勮处鍙�")
+ if (loginForm.value.userName === "") {
+ showToast("璇疯緭鍏ユ偍鐨勮处鍙�")
} else if (loginForm.value.password === "") {
- modal.msgError("璇疯緭鍏ユ偍鐨勫瘑鐮�")
+ showToast("璇疯緭鍏ユ偍鐨勫瘑鐮�")
} else if (loginForm.value.factoryId === "") {
- modal.msgError("璇烽�夋嫨鍏徃")
+ showToast("璇烽�夋嫨鍏徃")
} else {
- modal.loading("鐧诲綍涓紝璇疯�愬績绛夊緟...")
+ showToast("鐧诲綍涓紝璇疯�愬績绛夊緟...")
pwdLogin()
}
};
--
Gitblit v1.9.3