From 4c2836116a7ea09ec7f237b02fb0410832794240 Mon Sep 17 00:00:00 2001
From: zhangwencui <1064582902@qq.com>
Date: 星期四, 21 五月 2026 11:06:35 +0800
Subject: [PATCH] 登录问题修改
---
src/pages/login.vue | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 54 insertions(+), 6 deletions(-)
diff --git a/src/pages/login.vue b/src/pages/login.vue
index ee49113..2d96046 100644
--- a/src/pages/login.vue
+++ b/src/pages/login.vue
@@ -22,6 +22,21 @@
clearable
type="password"></up-input>
</view>
+ <!-- <view class="input-item flex align-center"
+ v-if="factoryList.length > 0">
+ <up-input prefixIcon="home"
+ placeholder="璇烽�夋嫨宸ュ巶"
+ border="bottom"
+ readonly
+ @click="showFactorySelect = true"
+ v-model="selectedFactoryName"
+ clearable></up-input>
+ <up-action-sheet :show="showFactorySelect"
+ :actions="factoryList"
+ title="璇烽�夋嫨宸ュ巶"
+ @close="showFactorySelect = false"
+ @select="handleFactorySelect"></up-action-sheet>
+ </view> -->
<view>
<button @click="handleLogin"
class="login-btn cu-btn block bg-blue lg round">鐧诲綍</button>
@@ -70,9 +85,17 @@
const loginForm = ref({
userName: "",
password: "",
- currentFatoryName: "",
+ factoryId: "",
});
const factoryList = ref([]); // 鍏徃鍒楄〃
+ const showFactorySelect = ref(false);
+ const selectedFactoryName = ref("");
+
+ const handleFactorySelect = e => {
+ loginForm.value.factoryId = e.id;
+ selectedFactoryName.value = e.name;
+ showFactorySelect.value = false;
+ };
// 淇濆瓨瀵嗙爜鍒版湰鍦板瓨鍌�
function savePassword() {
@@ -127,17 +150,28 @@
id: item.deptId,
name: item.deptName,
}));
+ // 濡傛灉鍙湁涓�涓伐鍘傦紝榛樿閫変腑
+ if (factoryList.value.length === 1) {
+ loginForm.value.factoryId = factoryList.value[0].id;
+ selectedFactoryName.value = factoryList.value[0].name;
+ }
} else {
// 濡傛灉res.data涓嶆槸鏁扮粍锛岃缃负绌烘暟缁�
factoryList.value = [];
+ loginForm.value.factoryId = "";
+ selectedFactoryName.value = "";
}
})
.catch(error => {
showToast("鑾峰彇鍏徃鍒楄〃澶辫触:", error);
factoryList.value = [];
+ loginForm.value.factoryId = "";
+ selectedFactoryName.value = "";
});
} else {
factoryList.value = [];
+ loginForm.value.factoryId = "";
+ selectedFactoryName.value = "";
}
}
@@ -146,6 +180,8 @@
showToast("璇疯緭鍏ユ偍鐨勮处鍙�");
} else if (loginForm.value.password === "") {
showToast("璇疯緭鍏ユ偍鐨勫瘑鐮�");
+ } else if (factoryList.value.length > 0 && loginForm.value.factoryId === "") {
+ showToast("璇烽�夋嫨宸ュ巶");
} else {
showToast("鐧诲綍涓紝璇疯�愬績绛夊緟...");
pwdLogin();
@@ -254,7 +290,10 @@
const accountInfo = uni.getAccountInfoSync();
if (accountInfo?.miniProgram?.version) {
versionName.value = accountInfo.miniProgram.version;
- console.log("[login-version] 褰撳墠鐜=MP-WEIXIN锛岀増鏈�=", versionName.value);
+ console.log(
+ "[login-version] 褰撳墠鐜=MP-WEIXIN锛岀増鏈�=",
+ versionName.value
+ );
}
} catch (e) {
// 鑾峰彇澶辫触鏃朵娇鐢ㄩ粯璁ゅ��
@@ -270,18 +309,27 @@
// @ts-ignore
const appid = plus.runtime.appid;
// @ts-ignore
- plus.runtime.getProperty(appid, (info) => {
+ plus.runtime.getProperty(appid, info => {
const v = info?.version || info?.versionName || "";
if (v) {
versionName.value = String(v);
- console.log("[login-version] 褰撳墠鐜=APP-PLUS锛岀増鏈�=", versionName.value);
+ console.log(
+ "[login-version] 褰撳墠鐜=APP-PLUS锛岀増鏈�=",
+ versionName.value
+ );
} else {
- console.log("[login-version] APP-PLUS 鑾峰彇鍒扮殑鐗堟湰瀛楁涓虹┖锛屼娇鐢ㄩ粯璁ゅ��:", versionName.value);
+ console.log(
+ "[login-version] APP-PLUS 鑾峰彇鍒扮殑鐗堟湰瀛楁涓虹┖锛屼娇鐢ㄩ粯璁ゅ��:",
+ versionName.value
+ );
}
console.log("[login-version] 鏈�缁堢増鏈彿:", versionName.value);
});
} else {
- console.log("[login-version] APP-PLUS 鐜涓嬬己灏� getProperty锛屼娇鐢ㄩ粯璁ゅ��:", versionName.value);
+ console.log(
+ "[login-version] APP-PLUS 鐜涓嬬己灏� getProperty锛屼娇鐢ㄩ粯璁ゅ��:",
+ versionName.value
+ );
console.log("[login-version] 鏈�缁堢増鏈彿:", versionName.value);
}
// #endif
--
Gitblit v1.9.3