From 12337399b538547d0675253efb3e8e60990cb68d Mon Sep 17 00:00:00 2001
From: erdanergou <p17686264821@163.com>
Date: Mon, 27 Mar 2023 16:26:35 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=BC=81=E4=B8=9A=E5=BE=AE?=
 =?UTF-8?q?=E4=BF=A1=E6=89=AB=E7=A0=81=E7=99=BB=E5=BD=95=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/templates/pages/user/login.html | 58 ++++++++-----------
 .../classes/templates/pages/user/login.html   | 58 ++++++++-----------
 2 files changed, 46 insertions(+), 70 deletions(-)

diff --git a/src/main/resources/templates/pages/user/login.html b/src/main/resources/templates/pages/user/login.html
index 7ae72a51..72d2f505 100644
--- a/src/main/resources/templates/pages/user/login.html
+++ b/src/main/resources/templates/pages/user/login.html
@@ -114,17 +114,17 @@
             width: 100%;
         }
 
-        #scanQrCodeLogin {
+        #scanQrCodeLogin{
             float: right;
             display: block;
-            padding: 9px 0 !important;
+            padding: 9px 0!important;
             line-height: 20px;
             margin-right: 10px;
             color: #666;
             cursor: pointer;
         }
 
-        #login_panle {
+        #login_panle{
             background-color: #fff;
             padding: 40px 40px 40px 40px;
             border-radius: 10px;
@@ -135,12 +135,11 @@
             margin-top: -100px;
         }
 
-        #nameAndPwdLogin {
-            color: #338cff;
-            font-size: larger;
+        #nameAndPwdLogin{
+            color: #666;
             cursor: pointer;
             position: absolute;
-            top: 0%;
+            bottom: 10%;
             left: 40%;
         }
     </style>
@@ -188,24 +187,25 @@
 
         </div>
     </div>
-    <div id="login_panle">
-        <span id="nameAndPwdLogin">账号登录</span>
+    <div id="login_panle" style="display:none;" >
         <div id="login_mainPanle">
 
         </div>
+        <div class="layui-form-item">
+            <span id="nameAndPwdLogin">账号密码登录</span>
+        </div>
     </div>
 </div>
 <script src="static/lib/jquery-3.4.1/jquery-3.4.1.min.js" charset="utf-8"></script>
 <script src="static/lib/layui-v2.6.3/layui.js" charset="utf-8"></script>
 <script src="static/lib/jq-module/jquery.particleground.min.js" charset="utf-8"></script>
 <script src="https://wwcdn.weixin.qq.com/node/open/js/wecom-jssdk-1.3.1.js"></script>
+<script src="http://wwcdn.weixin.qq.com/node/wework/wwopen/js/wwLogin-1.2.4.js"></script>
 <script>
     layui.use(['layer', 'form'], function () {
         var form = layui.form,
             layer = layui.layer;
 
-        let wwLogin = null;
-
         // 登录过期的时候，跳出ifram框架
         if (top.location != self.location) top.location = self.location;
 
@@ -215,11 +215,8 @@
                 dotColor: '#7ec7fd',
                 lineColor: '#7ec7fd'
             });
-            createLoginPanel()
         });
 
-
-
         // 进行登录操作
         form.on('submit(login)', function (data) {
             data = data.field;
@@ -277,36 +274,27 @@
             return false;
         });
 
-        $("#scanQrCodeLogin").click(function () {
+        $("#scanQrCodeLogin").click(function() {
 
             $("#login_panle").show();
-            // 初始化
-            createLoginPanel()
+            let url = "https://jy.hxgk.group/QyWxLogin";
+
+            var wwLogin =  new WwLogin({
+                "id": "login_mainPanle", // 登录页面显示二维码的容器id
+                "appid": "ww02f310301953277a",  // 企业微信的CorpID，在企业微信管理端查看
+                "agentid": "1000037", // 授权方的网页应用id，在具体的网页应用中查看
+                "redirect_uri": encodeURIComponent(url), // 重定向的地址，需要进行encode
+                "state": "loginState",
+                "href": "",  //自定义样式链接，只支持https协议的资源地址
+                "lang": "zh",
+            });
         });
 
         $("#nameAndPwdLogin").click(function () {
             $("#login_panle").hide();
-            // 卸载
-            wwLogin.unmount()
         })
 
 
-        createLoginPanel = function () {
-            wwLogin = ww.createWWLoginPanel({
-                el: '#login_mainPanle',
-                params: {
-                    login_type: 'CorpApp',
-                    appid: 'ww02f310301953277a',
-                    agentid: '1000037',
-                    redirect_uri: 'https://jy.hxgk.group/QyWxLogin',
-                    state: 'loginState',
-                    redirect_type: 'Callback',
-                    panel_size:'small'
-                }
-            });
-        }
-
-
 // 卸载
 
     });
diff --git a/target/classes/templates/pages/user/login.html b/target/classes/templates/pages/user/login.html
index 7ae72a51..72d2f505 100644
--- a/target/classes/templates/pages/user/login.html
+++ b/target/classes/templates/pages/user/login.html
@@ -114,17 +114,17 @@
             width: 100%;
         }
 
-        #scanQrCodeLogin {
+        #scanQrCodeLogin{
             float: right;
             display: block;
-            padding: 9px 0 !important;
+            padding: 9px 0!important;
             line-height: 20px;
             margin-right: 10px;
             color: #666;
             cursor: pointer;
         }
 
-        #login_panle {
+        #login_panle{
             background-color: #fff;
             padding: 40px 40px 40px 40px;
             border-radius: 10px;
@@ -135,12 +135,11 @@
             margin-top: -100px;
         }
 
-        #nameAndPwdLogin {
-            color: #338cff;
-            font-size: larger;
+        #nameAndPwdLogin{
+            color: #666;
             cursor: pointer;
             position: absolute;
-            top: 0%;
+            bottom: 10%;
             left: 40%;
         }
     </style>
@@ -188,24 +187,25 @@
 
         </div>
     </div>
-    <div id="login_panle">
-        <span id="nameAndPwdLogin">账号登录</span>
+    <div id="login_panle" style="display:none;" >
         <div id="login_mainPanle">
 
         </div>
+        <div class="layui-form-item">
+            <span id="nameAndPwdLogin">账号密码登录</span>
+        </div>
     </div>
 </div>
 <script src="static/lib/jquery-3.4.1/jquery-3.4.1.min.js" charset="utf-8"></script>
 <script src="static/lib/layui-v2.6.3/layui.js" charset="utf-8"></script>
 <script src="static/lib/jq-module/jquery.particleground.min.js" charset="utf-8"></script>
 <script src="https://wwcdn.weixin.qq.com/node/open/js/wecom-jssdk-1.3.1.js"></script>
+<script src="http://wwcdn.weixin.qq.com/node/wework/wwopen/js/wwLogin-1.2.4.js"></script>
 <script>
     layui.use(['layer', 'form'], function () {
         var form = layui.form,
             layer = layui.layer;
 
-        let wwLogin = null;
-
         // 登录过期的时候，跳出ifram框架
         if (top.location != self.location) top.location = self.location;
 
@@ -215,11 +215,8 @@
                 dotColor: '#7ec7fd',
                 lineColor: '#7ec7fd'
             });
-            createLoginPanel()
         });
 
-
-
         // 进行登录操作
         form.on('submit(login)', function (data) {
             data = data.field;
@@ -277,36 +274,27 @@
             return false;
         });
 
-        $("#scanQrCodeLogin").click(function () {
+        $("#scanQrCodeLogin").click(function() {
 
             $("#login_panle").show();
-            // 初始化
-            createLoginPanel()
+            let url = "https://jy.hxgk.group/QyWxLogin";
+
+            var wwLogin =  new WwLogin({
+                "id": "login_mainPanle", // 登录页面显示二维码的容器id
+                "appid": "ww02f310301953277a",  // 企业微信的CorpID，在企业微信管理端查看
+                "agentid": "1000037", // 授权方的网页应用id，在具体的网页应用中查看
+                "redirect_uri": encodeURIComponent(url), // 重定向的地址，需要进行encode
+                "state": "loginState",
+                "href": "",  //自定义样式链接，只支持https协议的资源地址
+                "lang": "zh",
+            });
         });
 
         $("#nameAndPwdLogin").click(function () {
             $("#login_panle").hide();
-            // 卸载
-            wwLogin.unmount()
         })
 
 
-        createLoginPanel = function () {
-            wwLogin = ww.createWWLoginPanel({
-                el: '#login_mainPanle',
-                params: {
-                    login_type: 'CorpApp',
-                    appid: 'ww02f310301953277a',
-                    agentid: '1000037',
-                    redirect_uri: 'https://jy.hxgk.group/QyWxLogin',
-                    state: 'loginState',
-                    redirect_type: 'Callback',
-                    panel_size:'small'
-                }
-            });
-        }
-
-
 // 卸载
 
     });