From f96ad6ec73b3da7df5c08471f0d567d46fc767e8 Mon Sep 17 00:00:00 2001
From: jyy <935090232@qq.com>
Date: Fri, 09 Apr 2021 14:34:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/score_shop' into score_shop
---
zq-erp/src/main/resources/templates/views/common/login.html | 10 +++++-----
1 files changed, 5 insertions(+), 5 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 2d33168..1d532e2 100644
--- a/zq-erp/src/main/resources/templates/views/common/login.html
+++ b/zq-erp/src/main/resources/templates/views/common/login.html
@@ -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;
@@ -300,7 +300,7 @@
//soket用户标识
let webClientId = "webClientId_" + MTools.randomStr();
-
+ let loginQrCodeKey="";
markQrcode();
@@ -310,7 +310,7 @@
width: 200,
height: 200
});
- let loginQrCodeKey="loginQrCodeKey_" + MTools.randomStr();
+ loginQrCodeKey="loginQrCodeKey_" + MTools.randomStr();
let qrInfo={webClientId:webClientId,loginQrCodeKey:loginQrCodeKey}
console.log(qrInfo);
qrcode.makeCode(JSON.stringify(qrInfo));
@@ -416,7 +416,7 @@
if(serverMsg.loginOperation==1){
$.AjaxProxy({
p: {
- webClientId: webClientId,
+ loginQrCodeKey: loginQrCodeKey,
loginType: 2
}
}).invoke("/common/dologin", function (loj) {
--
Gitblit v1.9.1