From f847ebaf83417524ac3b075d605ad818c6891ba1 Mon Sep 17 00:00:00 2001
From: zhuguifei <zhuguifei@zhuguifeideiMac.local>
Date: 星期四, 17 四月 2025 10:23:50 +0800
Subject: [PATCH] Merge branch 'main' of http://lanpucloud.cn:1111/r/eims-master
---
eims-ui/packages/effects/common-ui/src/ui/authentication/login.vue | 12 ++++++------
eims-ui/apps/web-antd/.env | 2 +-
eims-ui/packages/locales/src/langs/zh-CN/authentication.json | 8 ++++----
3 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/eims-ui/apps/web-antd/.env b/eims-ui/apps/web-antd/.env
index a69ae12..2ea3a9f 100644
--- a/eims-ui/apps/web-antd/.env
+++ b/eims-ui/apps/web-antd/.env
@@ -1,5 +1,5 @@
# 搴旂敤鏍囬
-VITE_APP_TITLE=eims-ui
+VITE_APP_TITLE=璁惧鏅鸿兘绠＄悊绯荤粺
# 搴旂敤鍛藉悕绌洪棿锛岀敤浜庣紦瀛樸�乻tore绛夊姛鑳界殑鍓嶇紑锛岀‘淇濋殧绂�
VITE_APP_NAMESPACE=eims-ui
diff --git a/eims-ui/packages/effects/common-ui/src/ui/authentication/login.vue b/eims-ui/packages/effects/common-ui/src/ui/authentication/login.vue
index 0905074..0269a7f 100644
--- a/eims-ui/packages/effects/common-ui/src/ui/authentication/login.vue
+++ b/eims-ui/packages/effects/common-ui/src/ui/authentication/login.vue
@@ -29,12 +29,12 @@
loading: false,
qrCodeLoginPath: '/auth/qrcode-login',
registerPath: '/auth/register',
- showCodeLogin: true,
+ showCodeLogin: false,
showForgetPassword: true,
- showQrcodeLogin: true,
+ showQrcodeLogin: false,
showRegister: true,
showRememberMe: true,
- showThirdPartyLogin: true,
+ showThirdPartyLogin: false,
submitButtonText: '',
subTitle: '',
title: '',
@@ -167,9 +167,9 @@
</div>
<!-- 绗笁鏂圭櫥褰� -->
- <slot v-if="showThirdPartyLogin" name="third-party-login">
- <ThirdPartyLogin />
- </slot>
+<!-- <slot v-if="showThirdPartyLogin" name="third-party-login">-->
+<!-- <ThirdPartyLogin />-->
+<!-- </slot>-->
<slot name="to-register">
<div v-if="showRegister" class="mt-3 text-center text-sm">
diff --git a/eims-ui/packages/locales/src/langs/zh-CN/authentication.json b/eims-ui/packages/locales/src/langs/zh-CN/authentication.json
index 4533db8..0c05e4c 100644
--- a/eims-ui/packages/locales/src/langs/zh-CN/authentication.json
+++ b/eims-ui/packages/locales/src/langs/zh-CN/authentication.json
@@ -1,10 +1,10 @@
{
"welcomeBack": "娆㈣繋鍥炴潵",
- "pageTitle": "寮�绠卞嵆鐢ㄧ殑澶у瀷涓悗鍙扮鐞嗙郴缁�",
- "pageDesc": "宸ョ▼鍖栥�侀珮鎬ц兘銆佽法缁勪欢搴撶殑鍓嶇妯＄増",
+ "pageTitle": "鍏板疂璁惧鏅鸿兘绠＄悊绯荤粺",
+ "pageDesc": "鏅鸿仈涓囩墿锛屾収绠¤澶�",
"loginSuccess": "鐧诲綍鎴愬姛",
"loginSuccessDesc": "娆㈣繋鍥炴潵",
- "loginSubtitle": "璇疯緭鍏ユ偍鐨勫笎鎴蜂俊鎭互寮�濮嬬鐞嗘偍鐨勯」鐩�",
+ "loginSubtitle": "璇疯緭鍏ユ偍鐨勫笎鎴蜂俊鎭互寮�濮嬬鐞嗘偍鐨勮澶�",
"selectAccount": "蹇�熼�夋嫨璐﹀彿",
"username": "璐﹀彿",
"password": "瀵嗙爜",
@@ -36,7 +36,7 @@
"qrcodeSubtitle": "璇风敤鎵嬫満鎵弿浜岀淮鐮佺櫥褰�",
"qrcodePrompt": "鎵爜鍚庣偣鍑� '纭'锛屽嵆鍙畬鎴愮櫥褰�",
"qrcodeLogin": "鎵爜鐧诲綍",
- "codeSubtitle": "璇疯緭鍏ユ偍鐨勬墜鏈哄彿鐮佷互寮�濮嬬鐞嗘偍鐨勯」鐩�",
+ "codeSubtitle": "璇疯緭鍏ユ偍鐨勬墜鏈哄彿鐮佷互寮�濮嬬鐞嗘偍鐨勮澶�",
"code": "楠岃瘉鐮�",
"codeTip": "璇疯緭鍏ラ獙璇佺爜",
"mobile": "鎵嬫満鍙风爜",
--
Gitblit v1.9.3