From 24f43454989b92a251d923e23948a9af83485931 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期三, 16 四月 2025 12:42:44 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI
---
WebTM/views/user/login.html | 18 +++++++++++++++---
1 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/WebTM/views/user/login.html b/WebTM/views/user/login.html
index 75efe5f..f8a6523 100644
--- a/WebTM/views/user/login.html
+++ b/WebTM/views/user/login.html
@@ -33,7 +33,7 @@
<select id="HTranSlate" style="width: 18%; margin-right: 1%; padding-left: 1px; font-size: 13px;">
<option value="1" selected>涓枃</option>
<option value="2">Eeglish</option>
- <option value="3">Espa帽ol</option>
+ <option value="3">Spanish</option>
</select>
<!--<li class="ax-col"></li>-->
</ul>
@@ -67,7 +67,7 @@
<input name="LAY-user-login-username" value="" placeholder="杈撳叆鐧诲綍鍚嶇О" type="text" id="LAY-user-login-username">
<span class="ax-pos-right"><a href="###" class="ax-iconfont ax-icon-close ax-val-none"></a></span>
</div>
- <button type="button" lay-submit="" class="layui-btn layui-btn-sm" id="LAY-user-loginICCard-submit" name="LAY-user-loginICCard-submit" lay-filter="LAY-user-loginICCard-submit" style="position: absolute;margin-top:-3.5rem;margin-left:36rem"><i class="layui-icon layui-icon-layer" style="width:20px"></i></button>
+ <button type="button" lay-submit="" class="layui-btn layui-btn-sm" id="LAY-user-loginICCard-submit" name="LAY-user-loginICCard-submit" lay-filter="LAY-user-loginICCard-submit" style="position: absolute;margin-top:-3.5rem;margin-left:36rem"><i class="layui-icon layui-icon-layer" style="width: 7px; margin-left: -4px"></i></button>
</div>
</div>
</div>
@@ -325,6 +325,10 @@
//鎻愪氦
form.on("submit(LAY-user-login-submit)", function (obj) {
+ if ($("#HTranSlate").val() == null) {
+ layer.msg("璇烽�夋嫨璇█!");
+ return false;
+ }
loging();
})
@@ -338,6 +342,10 @@
//瀵嗙爜妗嗗洖杞︽墽琛岀櫥褰�
$('#LAY-user-login-password').on('keydown', function (e) {
if (e.keyCode == 13) {
+ if ($("#HTranSlate").val() == null) {
+ layer.msg("璇烽�夋嫨璇█!");
+ return false;
+ }
loging();
//playSound();
}
@@ -542,9 +550,13 @@
//鑾峰彇鍩虹淇℃伅
function getBaseInfo(HTranSlate) {
+ if (HTranSlate == undefined) {
+ HTranSlate = "1";
+ }
+
$.ajax({
type: "get",
- url: GetWEBURL() + "/Web/BaseInfo",
+ url: GetWEBURL() + "Web/BaseInfo",
async: false,
data: {},
success: function (res) {
--
Gitblit v1.9.1