From 0cd61f7b848c04e2fc431e03272e1b27c3a171cd Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 09 Apr 2021 17:01:20 +0800
Subject: [PATCH] modify

---
 zq-erp/src/main/resources/templates/views/common/login.html |   12 ++++++------
 1 files changed, 6 insertions(+), 6 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..8331941 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;
@@ -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.2.0</div>
         <div class="">
 
             <p class="download-bar" style="font-size: 12px;"><strong>浏览器:</strong>Win7以上<a
@@ -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