From c096c2d462cb39b51e5ed76f030927151fa9db33 Mon Sep 17 00:00:00 2001
From: luosongbai <15272473386@163.com>
Date: Fri, 11 Nov 2022 14:44:56 +0800
Subject: [PATCH] =?UTF-8?q?=E7=99=BB=E5=BD=95=E6=B7=BB=E5=8A=A0=E9=AA=8C?=
 =?UTF-8?q?=E8=AF=81=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 web/pages/login.html      | 76 +++++++++++++++++++++------------------
 web/src/x.min.js          | 38 ++++++++++++++++++--
 web/srczip/common.js      |  4 ++-
 web/srczip/logic/login.js | 34 +++++++++++++++++-
 web/static/css/style.css  | 22 ++++++++++++
 5 files changed, 135 insertions(+), 39 deletions(-)

diff --git a/web/pages/login.html b/web/pages/login.html
index e9efd98..75950e8 100644
--- a/web/pages/login.html
+++ b/web/pages/login.html
@@ -21,46 +21,52 @@
 <div class="login-bg">
     <div class="login-box">
         <div class="login-left">
-        <img src="./static/img/left_login.png" class="left_login">
+            <img src="./static/img/left_login.png" class="left_login">
         </div>
         <div class="login-right">
-        <div class="login-txt-box">
-            <div class="logo-box">
-                <img src="./static/img/logo_2.png">
-                <!-- <p>乐谷游戏</p> -->
+            <div class="login-txt-box">
+                <div class="logo-box">
+                    <img src="./static/img/logo_2.png">
+                    <!-- <p>乐谷游戏</p> -->
+                </div>
+                <form method="post" action="" id="formtest">
+                    <div class="login-text-box">
+                        <div class="login-text">
+                            <div class="login-left-img">
+                                <img src="./static/img/yonghuming.png">
+                            </div>
+                            <input type="text" class="login-form-control account" placeholder="输入用户名" name="username">
+                        </div>
+                        <div class="login-text" style="margin-top: 22px;">
+                            <input type="text" class="login-form-control verification" placeholder="内部号请获取钉钉验证码在登陆"><div class="get-verification-but" >获取验证码</div>
+                        </div>
+                        <div class="login-text" style="margin-top: 22px;">
+                            <div class="login-left-img">
+                                <img src="./static/img/mima.png" style="width: 16px;">
+                            </div>
+                            <input type="password" class="login-form-control password" placeholder="输入密码"
+                                name="password">
+                        </div>
+
+                        <div class="col-8">
+                            <div class="icheck-primary" style="text-align: right;">
+                                <!-- <input type="checkbox" id="remember" style="width: 20px; height: 20px;">
+                                    <label for="remember" style="font-size: 14px; color: #d9d9d9;">
+                                    记住密码
+                                    </label> 
+                                -->
+                            </div>
+                        </div>
+                        <div class="col-8" style="margin-top: 23px;">
+                            <input type="button" value="登录"
+                                class="login-btn btn-primary btn-block login-denglu"></button>
+                        </div>
+                    </div>
+                </form>
             </div>
-            <form method="post" action="sidebar.html" id="formtest">
-            <div class="login-text-box">
-                <div class="login-text">
-                <div class="login-left-img">
-                    <img src="./static/img/yonghuming.png">
-                </div>
-                <input type="text" class="login-form-control account" placeholder="输入用户名" name="username">
-                </div>
-                <div class="login-text" style="margin-top: 22px;">
-                <div class="login-left-img">
-                    <img src="./static/img/mima.png" style="width: 16px;">
-                </div>
-                <input type="password" class="login-form-control password" placeholder="输入密码" name="password">
-                </div>
-    
-                <div class="col-8">
-                <div class="icheck-primary" style="text-align: right;">
-                    <!-- <input type="checkbox" id="remember" style="width: 20px; height: 20px;">
-                    <label for="remember" style="font-size: 14px; color: #d9d9d9;">
-                    记住密码
-                    </label> -->
-                </div>
-                </div>
-                <div class="col-8" style="margin-top: 23px;">
-                <input type="button" value="登录" class="login-btn btn-primary btn-block login-denglu"></button>
-                </div>
-            </div>
-            </form>
-        </div>
         </div>
     </div>
-    
+
     <div class="login-bottom-box">
         <div class="login-bottom-left">Copyright © 2013-2022 乐谷数据分析平台. All rights reserved.</div>
         <div class="login-bottom-right">Version 1.0.0</div>
diff --git a/web/src/x.min.js b/web/src/x.min.js
index 088584d..2879140 100644
--- a/web/src/x.min.js
+++ b/web/src/x.min.js
@@ -193,7 +193,9 @@ var X = window.X || {
             }
             if(url == 'data_mana/list'){
                 var url = ipurl+url+"?game="+ X.DATA.game+"&"+parms || "";
-            }else {
+            }else if(url.indexOf("send_auth_code") != -1){
+                var url = ipurl+url;
+            } else {
                 var url = ipurl+url+"?game="+ X.DATA.game || "";
             }
         }
@@ -12030,12 +12032,44 @@ var X = window.X || {
       
                 }
             };
+            var timer = null;
+            var time = 60;
+            $(".get-verification-but").click(function(e){
+                var account = $(".login-txt-box .account").val();
+                if(account == ""){
+                    layer.msg('请输入用户名', { icon: 3, time: 1000 });
+                    return
+                }
+                if(time != 60){
+                    return
+                }
+                X.api('user/send_auth_code','post',{name:account},function(d){
+                    layer.msg('验证码已发送请在钉钉消息里查看！！！', {
+                        icon: 1,
+                        time: 1000
+                    }, function() {
+                        timer = setInterval(() => {
+                            time--
+                            $(".get-verification-but").html(time + 's');
+                            if (time == 0) {
+                                clearInterval(timer);
+                                $(".get-verification-but").html('获取验证码');
+                                $('.get-verification-but').removeClass('on-get-verification-but');
+                            } else {
+                                $('.get-verification-but').addClass('on-get-verification-but');
+                            }
+                        }, 1000)
+                    });
+                })
+                
+            })
 
             function postlogin(){
                 var account = $(".login-txt-box .account").val();
                 var password = $(".login-txt-box .password").val();
+                var code = $(".verification").val();
                 // X.gourl("dashboard");
-                X.api('user/login',"post",{username:account,password:password},function (d){
+                X.api('user/login',"post",{username:account,password:password,scope:code},function (d){
                     // console.log(d);
                     X.DATA["userinfo"] = d;
                     X.loginCache(d);
diff --git a/web/srczip/common.js b/web/srczip/common.js
index 3824401..e6d04c5 100644
--- a/web/srczip/common.js
+++ b/web/srczip/common.js
@@ -192,7 +192,9 @@ var X = window.X || {
             }
             if(url == 'data_mana/list'){
                 var url = ipurl+url+"?game="+ X.DATA.game+"&"+parms || "";
-            }else {
+            }else if(url.indexOf("send_auth_code") != -1){
+                var url = ipurl+url;
+            } else {
                 var url = ipurl+url+"?game="+ X.DATA.game || "";
             }
         }
diff --git a/web/srczip/logic/login.js b/web/srczip/logic/login.js
index a1acf73..22048b1 100644
--- a/web/srczip/logic/login.js
+++ b/web/srczip/logic/login.js
@@ -21,12 +21,44 @@
       
                 }
             };
+            var timer = null;
+            var time = 60;
+            $(".get-verification-but").click(function(e){
+                var account = $(".login-txt-box .account").val();
+                if(account == ""){
+                    layer.msg('请输入用户名', { icon: 3, time: 1000 });
+                    return
+                }
+                if(time != 60){
+                    return
+                }
+                X.api('user/send_auth_code','post',{name:account},function(d){
+                    layer.msg('验证码已发送请在钉钉消息里查看！！！', {
+                        icon: 1,
+                        time: 1000
+                    }, function() {
+                        timer = setInterval(() => {
+                            time--
+                            $(".get-verification-but").html(time + 's');
+                            if (time == 0) {
+                                clearInterval(timer);
+                                $(".get-verification-but").html('获取验证码');
+                                $('.get-verification-but').removeClass('on-get-verification-but');
+                            } else {
+                                $('.get-verification-but').addClass('on-get-verification-but');
+                            }
+                        }, 1000)
+                    });
+                })
+                
+            })
 
             function postlogin(){
                 var account = $(".login-txt-box .account").val();
                 var password = $(".login-txt-box .password").val();
+                var code = $(".verification").val();
                 // X.gourl("dashboard");
-                X.api('user/login',"post",{username:account,password:password},function (d){
+                X.api('user/login',"post",{username:account,password:password,scope:code},function (d){
                     // console.log(d);
                     X.DATA["userinfo"] = d;
                     X.loginCache(d);
diff --git a/web/static/css/style.css b/web/static/css/style.css
index 67e6ec3..8815f98 100644
--- a/web/static/css/style.css
+++ b/web/static/css/style.css
@@ -1186,3 +1186,25 @@ input.editable-select {
 .touserinfo { cursor: pointer; }
 .search_data-zwsj { text-align: center; }
 
+.get-verification-but { 
+    width: 80px;
+    background-color: #fff;
+    border: 0px;
+    border-left: 1px solid #d9d9d9;
+    height: calc(2.25rem + 2px);
+    padding: 8px 0;
+    cursor: pointer;
+    line-height: calc(2.25rem + 2px);
+    text-align: center;
+}
+
+.on-get-verification-but {
+    background: #f0f0f0;
+    
+}
+
+.verification {
+    width: calc(100% - 100px);
+    padding: 8px 10px;
+}
+