From ec87cf1ee2b9382bf9d089711f0ff82ae8e7077c Mon Sep 17 00:00:00 2001
From: jyy <jyy>
Date: Wed, 09 Jun 2021 20:44:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/api_score_meger' into api_score_meger
---
zq-erp/src/main/resources/templates/views/common/login.html | 17 +++++++++--------
1 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/zq-erp/src/main/resources/templates/views/common/login.html b/zq-erp/src/main/resources/templates/views/common/login.html
index 987ecb3..3ae470b 100644
--- a/zq-erp/src/main/resources/templates/views/common/login.html
+++ b/zq-erp/src/main/resources/templates/views/common/login.html
@@ -37,7 +37,7 @@
.download-bar a:hover {
text-decoration: underline;
- color: #fff;
+ color: #4968bd;
}
</style>
<script>
@@ -205,7 +205,7 @@
src="../../images/qrcode.png"></div>
<form method="post" class="dataForm">
<h3 class="no-margins text-center title" style="color: #666666;font-size: 24px;font-weight: bold">
- 欢迎登录</h3>
+ 密码登录</h3>
<div>
<input autocomplete="off" id="account" type="text" placeholder="请输入用户名"
class="form-control uname"/>
@@ -228,7 +228,7 @@
</form>
</div>
<div id="qrCodeWarp">
- <div onclick="changeLoginType()" class="qrloginBox"><span class="qrloginSpan">账号登录</span><img
+ <div onclick="changeLoginType()" class="qrloginBox"><span class="qrloginSpan">密码登录</span><img
class="qrImg"
src="../../images/pc.png"></div>
<div style="border-radius: 3px;
@@ -260,7 +260,7 @@
</div>
<div class="signup-footer" style="color: #4968bd;">
- <div class="" style="font-size: 16px;">HIVE管理系统V2.2.0</div>
+ <div class="" style="font-size: 16px;">讯聪管理系统V2.3.0</div>
<div class="">
<p class="download-bar" style="font-size: 12px;"><strong>浏览器：</strong>Win7以上<a
@@ -271,7 +271,9 @@
href="https://pubstorage-bucket.oss-cn-shenzhen.aliyuncs.com/tools/xp/49.0.2623.112_chrome_installer.exe "
target="_blank">谷歌浏览器（推荐）</a><span>|</span><strong>打印控件：</strong><a
href="https://pubstorage-bucket.oss-cn-shenzhen.aliyuncs.com/tools/CLodop_Setup_for_Win32NT_https_3.056Extend.exe"
- target="_blank">下载控件</a><span>|</span>
+ target="_blank">下载控件</a><span>|</span><strong>APP：</strong><a
+ href="http://testfile.hive.jyymatrix.cc/mobile/download.html"
+ target="_blank">下载APP客户端</a>
</p>
</div>
</div>
@@ -312,7 +314,6 @@
});
loginQrCodeKey="loginQrCodeKey_" + MTools.randomStr();
let qrInfo={webClientId:webClientId,loginQrCodeKey:loginQrCodeKey}
- console.log(qrInfo);
qrcode.makeCode(JSON.stringify(qrInfo));
$('#qrCodeIcon canvas').show();
@@ -390,7 +391,7 @@
//实现化WebSocket对象，指定要连接的服务器地址与端口 建立连接
let wsPath= getRootPath();
var socketUrl= wsPath.replace("http","ws")+ "/webSocketServer?userId="+webClientId;
- console.log(socketUrl);
+
if(socket!=null){
socket.close();
socket=null;
@@ -403,7 +404,7 @@
};
//获得消息事件
socket.onmessage = function(msg) {
- console.log(msg);
+
var serverMsg = JSON.parse(msg.data);
if(serverMsg.msgType==1){
--
Gitblit v1.9.1