From 8c383fda066ba6166ec3bf622d44d8b17bfac71f Mon Sep 17 00:00:00 2001
From: jyy <935090232@qq.com>
Date: Tue, 13 Apr 2021 15:27:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/score_shop' into score_shop
---
zq-erp/src/main/resources/templates/views/common/login.html | 7 +++----
1 files changed, 3 insertions(+), 4 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 1d532e2..6750c36 100644
--- a/zq-erp/src/main/resources/templates/views/common/login.html
+++ b/zq-erp/src/main/resources/templates/views/common/login.html
@@ -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
@@ -312,7 +312,6 @@
});
loginQrCodeKey="loginQrCodeKey_" + MTools.randomStr();
let qrInfo={webClientId:webClientId,loginQrCodeKey:loginQrCodeKey}
- console.log(qrInfo);
qrcode.makeCode(JSON.stringify(qrInfo));
$('#qrCodeIcon canvas').show();
@@ -390,7 +389,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 +402,7 @@
};
//获得消息事件
socket.onmessage = function(msg) {
- console.log(msg);
+
var serverMsg = JSON.parse(msg.data);
if(serverMsg.msgType==1){
--
Gitblit v1.9.1