From 78ec243f7fc510299200bcc82fcd16775da08a3c Mon Sep 17 00:00:00 2001
From: 18516761980 <56479841@qq.com>
Date: 星期五, 17 六月 2022 14:39:09 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/luxiaotao1123/zy-asrs into hylyasrs
---
src/main/webapp/views/waitPakin/waitPakin.html | 2 +-
src/main/webapp/views/pda/login.html | 11 ++++++-----
2 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/src/main/webapp/views/pda/login.html b/src/main/webapp/views/pda/login.html
index 4aa73f5..a03b30f 100644
--- a/src/main/webapp/views/pda/login.html
+++ b/src/main/webapp/views/pda/login.html
@@ -78,7 +78,7 @@
</header>
<div class="layui-form layadmin-user-login-body">
<div class="layui-form-item">
- <input id="mobile" class="layui-input" type="text" name="mobile" lay-verify="mobile" placeholder="璐﹀彿" autocomplete="off">
+ <input id="username" class="layui-input" type="text" name="username" lay-verify="username" placeholder="璐﹀彿" autocomplete="off">
</div>
<div class="layui-form-item">
<input id="password" class="layui-input" type="password" name="password" lay-verify="password" placeholder="瀵嗙爜" autocomplete="off">
@@ -103,10 +103,10 @@
$ = layui.jquery;
form.on('submit(login)', function (data) {
- var mobile = $("#mobile").val();
- if (mobile === "") {
+ var username = $("#username").val();
+ if (username === "") {
layer.msg("璇疯緭鍏ヨ处鍙�", {icon: 2})
- $("#mobile").focus();
+ $("#username").focus();
return;
}
var password = $("#password").val();
@@ -117,9 +117,10 @@
}
var user = {
- mobile: mobile,
+ username: username,
password: hex_md5(password)
};
+ debugger
$.ajax({
url: baseUrl+"/login.action",
data: user,
diff --git a/src/main/webapp/views/waitPakin/waitPakin.html b/src/main/webapp/views/waitPakin/waitPakin.html
index 8b052f7..331f54d 100644
--- a/src/main/webapp/views/waitPakin/waitPakin.html
+++ b/src/main/webapp/views/waitPakin/waitPakin.html
@@ -43,7 +43,7 @@
</div>
<script type="text/html" id="toolbar">
<div class="layui-btn-container">
- <button class="layui-btn layui-btn-sm" id="btn-wrk" lay-event="addWrk">鐢熸垚浠诲姟</button>
+<!-- <button class="layui-btn layui-btn-sm" id="btn-wrk" lay-event="addWrk">鐢熸垚浠诲姟</button>-->
<button class="layui-btn layui-btn-sm" id="btn-add" lay-event="addData">鏂板</button>
<button class="layui-btn layui-btn-sm" id="btn-delete" lay-event="deleteData">鍒犻櫎</button>
<button class="layui-btn layui-btn-primary layui-btn-sm" id="btn-export" lay-event="exportData" style="">瀵煎嚭</button>
--
Gitblit v1.9.1