diff --git a/css/oksub.css b/css/oksub.css
index 7c3b464..11ae9d7 100644
--- a/css/oksub.css
+++ b/css/oksub.css
@@ -55,6 +55,8 @@
 #login .layui-form-item input::placeholder{color:transparent!important}
 #login .layui-form-item.layui-input-focus input::placeholder{color:#757575!important}
 #login .layui-form-item.layui-input-active label,#login .layui-form-item.layui-input-focus label{top:-10px;font-size:12px;color:#ff6700;background:#fff!important}
+#login .login-link{display:block;font-size:12px}
+#login .login-link a{display:inline-block;margin-right:20px}
 
 /*基本资料*/
 .user-info .user_left{float:left;margin:20px 0 0 5%}
diff --git a/js/console.js b/js/console.js
index ba59f1a..750d396 100644
--- a/js/console.js
+++ b/js/console.js
@@ -21,7 +21,7 @@ layui.use(["okUtils", "table", "countUp", "okMock"], function () {
     }
 
     var userSourceOption = {
-        "title": {"text": "用户访问"},
+        "title": {"text": ""},
         "tooltip": {"trigger": "axis", "axisPointer": {"type": "cross", "label": {"backgroundColor": "#6a7985"}}},
         "legend": {"data": ["邮件营销", "联盟广告", "视频广告", "直接访问", "搜索引擎"]},
         "toolbox": {"feature": {"saveAsImage": {}}},
diff --git a/js/okadmin.js b/js/okadmin.js
index 9f411b2..4a08eb3 100644
--- a/js/okadmin.js
+++ b/js/okadmin.js
@@ -30,9 +30,43 @@ layui.use(["element", "layer", "okUtils", "okTab", "okLayer"], function () {
       if ($(this).siblings().length == 0) {
          okTab.tabAdd($(this));
       }
-      // 关闭其他的二级标签
-      $(this).parent("li").siblings().removeClass("layui-nav-itemed")
-      
+      // 关闭其他展开的二级标签
+      $(this).parent("li").siblings().removeClass("layui-nav-itemed");
+      if (!$(this).attr('lay-id')) {
+         var topLevelEle = $(this).parents("li.layui-nav-item");
+         var childs = $("#navBar > li > dl.layui-nav-child").not(topLevelEle.children("dl.layui-nav-child"));
+         childs.removeAttr('style');
+      }
+   });
+
+   /**
+    * 左侧菜单展开动画
+    */
+   $("#navBar").on('click', '.layui-nav-item a', function () {
+      if (!$(this).attr('lay-id')) {
+         var superEle = $(this).parent();
+         var ele = $(this).next('.layui-nav-child');
+         var height = ele.height();
+         ele.css({'display': 'block'});
+
+         if (superEle.is('.layui-nav-itemed')) {//是否是展开状态
+            ele.height(0);
+            ele.animate({
+               height: height + 'px'
+            }, function () {
+               ele.css({
+                  height: "auto"
+               });
+               //ele.removeAttr('style');
+            });
+         } else {
+            ele.animate({
+               height: 0
+            }, function () {
+               ele.removeAttr('style');
+            });
+         }
+      }
    });
    
    /**
@@ -109,31 +143,7 @@ layui.use(["element", "layer", "okUtils", "okTab", "okLayer"], function () {
       }
    });
    
-   /**
-    * 左侧菜单展开动画
-    */
-   $("#navBar").on('click', '.layui-nav-item a', function () {
-      if (!$(this).attr('lay-id')) {
-         var superEle = $(this).parent();
-         var ele = $(this).next('.layui-nav-child');
-         var height = ele.height();
-         if (superEle.is('.layui-nav-itemed')) {
-            ele.height(0);
-            ele.animate({
-               height: height + 'px'
-            }, function () {
-               ele.removeAttr('style');
-            });
-         } else {
-            ele.css({'display': 'block'});
-            ele.animate({
-               height: 0
-            }, function () {
-               ele.removeAttr('style');
-            });
-         }
-      }
-   });
+
    
    /**
     * 全屏和退出全屏的方法
diff --git a/lib/layui/lay/okmodules/okGVerify.js b/lib/layui/lay/okmodules/okGVerify.js
index b253517..d1718dc 100644
--- a/lib/layui/lay/okmodules/okGVerify.js
+++ b/lib/layui/lay/okmodules/okGVerify.js
@@ -110,8 +110,8 @@ layui.define(["jquery"], function (exprots) {
             } else {
                 return "验证码不正确，请重新输入";
             }
-        }
-    }
+        },
+    };
 
     function getAllLetter() {
         var letterStr = "a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z,A,B,C,D,E,F,G,H,I,J,K,L,M,N,O,P,Q,R,S,T,U,V,W,X,Y,Z";
diff --git a/lib/layui/lay/okmodules/okTab.js b/lib/layui/lay/okmodules/okTab.js
index 640a05a..072c12d 100644
--- a/lib/layui/lay/okmodules/okTab.js
+++ b/lib/layui/lay/okmodules/okTab.js
@@ -178,7 +178,7 @@ layui.define(["element", "jquery"], function (exports) {
       contEle = $(contEle);//tab内容存放的父元素
       ele = $(ele);//当前的tab
 
-      var menuSet = $(".okadmin-side a[lay-id]");//获取所有菜单集合
+      var menuSet = $("#navBar a[lay-id]");//获取所有菜单集合
       var thatLayId = ele.attr('lay-id');
 
       var contWidth = contEle.width(),//父级元素宽度
@@ -234,7 +234,8 @@ layui.define(["element", "jquery"], function (exports) {
       /**
        * 左侧菜单的样式和多级菜单的展开
        */
-      $(".okadmin-side").find("li,dd").removeClass("layui-this").removeClass("layui-nav-itemed");//关闭所有展开的菜单
+      $("#navBar").find("li,dd").removeClass("layui-this").removeClass("layui-nav-itemed");//关闭所有展开的菜单
+      $("#navBar > li dl.layui-nav-child").removeAttr('style');
       for (let i = 0; i < menuSet.length; i++) {
          if ($(menuSet[i]).attr('lay-id') == thatLayId) {
             $(menuSet[i]).parents("dd").addClass("layui-nav-itemed");
diff --git a/pages/console.html b/pages/console.html
index 924292d..fc698b4 100644
--- a/pages/console.html
+++ b/pages/console.html
@@ -79,6 +79,9 @@
    <div class="layui-row layui-col-space15">
       <div class="layui-col-md8">
          <div class="layui-card">
+            <div class="layui-card-header">
+               <div class="ok-card-title">用户排行榜</div>
+            </div>
             <div class="ok-card-body map-body">
                <div style="height: 100%;" id="userSourceMap"></div>
             </div>
@@ -88,9 +91,9 @@
       <div class="layui-col-md4">
          <div class="layui-card">
             <div class="layui-card-header">
-               <div class="ok-card-title">用户排行榜</div>
+               <div class="ok-card-title">用户访问</div>
             </div>
-            <div class="ok-card-body map-body" style="height: 320px">
+            <div class="ok-card-body map-body">
                <div class="progress-box ">
                   <div class="pro-head">
                      <img src="../images/face.jpg" alt="none"/>
diff --git a/pages/forget.html b/pages/forget.html
new file mode 100644
index 0000000..4903bdd
--- /dev/null
+++ b/pages/forget.html
@@ -0,0 +1,189 @@
+<!DOCTYPE html>
+<html lang="en" class="page-fill">
+<head>
+   <meta charset="UTF-8">
+   <title>ok-admin v2.0 | 很赞的后台模版 - 注册</title>
+   <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+   <meta name="keywords" content="ok-admin v2.0,ok-admin网站后台模版,后台模版下载,后台管理系统模版,HTML后台模版下载">
+   <meta name="description" content="ok-admin v2.0，顾名思义，很赞的后台模版，它是一款基于Layui框架的轻量级扁平化且完全免费开源的网站后台管理系统模板，适合中小型CMS后台系统。">
+   <link rel="shortcut icon" href="../images/favicon.ico" type="image/x-icon"/>
+   <link rel="stylesheet" href="../css/oksub.css"/>
+   <style>
+      .register .tit {
+         padding-top: 15px;
+         text-align: center;
+         font-size: 18px;
+      }
+      .register .code-box {
+         display: flex;
+      }
+      .register .code-box .btn-auth-code {
+         margin-left: 10px;
+      }
+      .form-reset{
+         display: none;
+      }
+   </style>
+</head>
+<body class="page-fill">
+<div class="page-fill register" id="login">
+   <form class="layui-form form-verify">
+      <div class="layui-form-item tit">忘记密码</div>
+      <div class="layui-form-item input-item">
+         <label for="username">用户名</label>
+         <input type="text" lay-verify="required" name="username" placeholder="请输入账号" autocomplete="off" id="username"
+                class="layui-input">
+      </div>
+      <div class="layui-form-item input-item">
+         <label for="phone">输入手机号</label>
+         <input type="text" lay-verify="required|phone" name="text" placeholder="请输入手机号"
+                autocomplete="off" id="phone" maxlength="11" class="layui-input">
+      </div>
+      <div class="layui-form-item input-item code-box">
+         <label for="authCode">验证码</label>
+         <input type="text" lay-verify="required" name="captcha" placeholder="请输入验证码"
+                id="authCode" autocomplete="off" maxlength="8" class="layui-input">
+         <button type="button" class="layui-btn btn-auth-code">获取验证码</button>
+      </div>
+      <div class="layui-form-item">
+         <button class="layui-btn layui-block" lay-filter="submitVerify" lay-submit="">提交</button>
+      </div>
+      <div class="login-link">
+         <a href="./login.html">再去登录试试</a>
+      </div>
+   </form>
+
+   <form class="layui-form form-reset">
+      <div class="layui-form-item tit">设置密码</div>
+      <div class="layui-form-item input-item">
+         <label for="password">新密码</label>
+         <input type="password" lay-verify="required|password" name="password" placeholder="请输入密码" autocomplete="off"
+                id="password" class="layui-input">
+      </div>
+      <div class="layui-form-item input-item">
+         <label for="comPassword">确认密码</label>
+         <input type="password" lay-verify="required|comPassword" name="password" placeholder="请确认密码" autocomplete="off"
+                id="comPassword" class="layui-input">
+      </div>
+      <div class="layui-form-item">
+         <button class="layui-btn layui-block" lay-filter="submitSetting" lay-submit="">确定设置</button>
+      </div>
+   </form>
+</div>
+<!--js逻辑-->
+<script src="../lib/layui/layui.js"></script>
+<script>
+   layui.use(["form", "okGVerify", "okLayer"], function () {
+      let form = layui.form;
+      let $ = layui.jquery;
+      let okGVerify = layui.okGVerify;
+      let okLayer = layui.okLayer;
+      let regPhone = /^[1][0-9]{10}$/;/**手机号验证**/
+      let setInter = '';/**定时器对象*/
+      let second = 60;//设置时间
+      let isSetPassword = false;//是否显示重设密码
+
+      /**
+       * 数据校验
+       */
+      form.verify({
+         password: [/^[\S]{6,12}$/, "密码必须6到12位，且不能出现空格"],
+         phone: [
+            regPhone,
+            '输入的手机号格式不正确，请重新输入'
+         ],
+         comPassword: function (val) {
+            let password = $("#password").val();
+            return password == val ? '' : "两次密码不一致";
+         }
+      });
+
+      /**
+       * 验证手机号表单提交
+       */
+      form.on("submit(submitVerify)", function (data) {
+         console.log("验证手机号",data);
+         okLayer.msg.greenTick("验证成功,重设密码", function () {
+            clearInterval(setInter);
+            clearInterval(setInter);
+            $('.btn-auth-code').removeClass("layui-btn-disabled");
+            $('.btn-auth-code').text("重新获取");
+            setInter = "";
+            $(".form-verify,.form-reset").toggle();
+         });
+         return false;
+      });
+
+      /**重新设置密码**/
+      form.on("submit(submitSetting)", function (data) {
+         console.log("重新设置密码",data);
+         okLayer.msg.greenTick("密码重置成功,马上去登录", function () {
+            window.location = "./login.html";
+         });
+         return false;
+      });
+
+      /**
+       * 表单input组件单击时
+       */
+      $("#login .input-item .layui-input").click(function (e) {
+         e.stopPropagation();
+         $(this).addClass("layui-input-focus").find(".layui-input").focus();
+      });
+
+      /**
+       * 表单input组件获取焦点时
+       */
+      $("#login .layui-form-item .layui-input").focus(function () {
+         $(this).parent().addClass("layui-input-focus");
+      });
+
+      /**
+       * 表单input组件失去焦点时
+       */
+      $("#login .layui-form-item .layui-input").blur(function () {
+         $(this).parent().removeClass("layui-input-focus");
+         if ($(this).val() != "") {
+            $(this).parent().addClass("layui-input-active");
+         } else {
+            $(this).parent().removeClass("layui-input-active");
+         }
+      });
+
+      /**获取验证码**/
+      $('.btn-auth-code').click(function () {
+         let that = $(this),
+            phone = $("#phone").val();
+         if($(this).hasClass("layui-btn-disabled")){
+            return;
+         }
+         if(regPhone.test(phone)){
+            if(!setInter){
+               clearInterval(setInter);
+               that.addClass("layui-btn-disabled");
+               that.text(second+"秒后获取");
+               setInter = setInterval(function () {
+                  second--;
+                  if(second < 1){
+                     clearInterval(setInter);
+                     that.removeClass("layui-btn-disabled");
+                     that.text("重新获取");
+                     setInter = "";
+                  }else{
+                     that.text(second+"秒后获取");
+                  }
+               },1000);
+            }
+         }else{
+            layer.msg("输入的手机号格式不正确，请重新输入",{
+               icon:"5",
+               anim:"6",
+            });
+            $("#phone").focus();
+         }
+      });
+
+   });
+</script>
+</body>
+</html>
diff --git a/pages/login.html b/pages/login.html
index a90aeda..1c77b9b 100644
--- a/pages/login.html
+++ b/pages/login.html
@@ -2,7 +2,7 @@
 <html lang="en" class="page-fill">
     <head>
         <meta charset="UTF-8">
-        <title>ok-admin v2.0 | 很赞的后台模版</title>
+        <title>ok-admin v2.0 | 很赞的后台模版 - 登录</title>
         <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
         <meta name="keywords" content="ok-admin v2.0,ok-admin网站后台模版,后台模版下载,后台管理系统模版,HTML后台模版下载">
         <meta name="description" content="ok-admin v2.0，顾名思义，很赞的后台模版，它是一款基于Layui框架的轻量级扁平化且完全免费开源的网站后台管理系统模板，适合中小型CMS后台系统。">
@@ -29,6 +29,10 @@
                 <div class="layui-form-item">
                     <button class="layui-btn layui-block" lay-filter="login" lay-submit="">登录</button>
                 </div>
+               <div class="login-link">
+                  <a href="./register.html">注册</a>
+                  <a href="./forget.html">忘记密码?</a>
+               </div>
             </form>
         </div>
         <!--js逻辑-->
diff --git a/pages/register.html b/pages/register.html
new file mode 100644
index 0000000..76c4676
--- /dev/null
+++ b/pages/register.html
@@ -0,0 +1,167 @@
+<!DOCTYPE html>
+<html lang="en" class="page-fill">
+<head>
+   <meta charset="UTF-8">
+   <title>ok-admin v2.0 | 很赞的后台模版 - 注册</title>
+   <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+   <meta name="keywords" content="ok-admin v2.0,ok-admin网站后台模版,后台模版下载,后台管理系统模版,HTML后台模版下载">
+   <meta name="description" content="ok-admin v2.0，顾名思义，很赞的后台模版，它是一款基于Layui框架的轻量级扁平化且完全免费开源的网站后台管理系统模板，适合中小型CMS后台系统。">
+   <link rel="shortcut icon" href="../images/favicon.ico" type="image/x-icon"/>
+   <link rel="stylesheet" href="../css/oksub.css"/>
+   <style>
+      .register .tit {
+         padding-top: 15px;
+         text-align: center;
+         font-size: 18px;
+      }
+      .register .code-box {
+         display: flex;
+      }
+      .register .code-box .btn-auth-code {
+         margin-left: 10px;
+      }
+   </style>
+</head>
+<body class="page-fill">
+<div class="page-fill register" id="login">
+   <form class="layui-form ">
+      <div class="layui-form-item tit">注册</div>
+      <div class="layui-form-item input-item">
+         <label for="username">用户名</label>
+         <input type="text" lay-verify="required" name="username" placeholder="请输入账号" autocomplete="off" id="username"
+                class="layui-input">
+      </div>
+      <div class="layui-form-item input-item">
+         <label for="password">密码</label>
+         <input type="password" lay-verify="required|password" name="password" placeholder="请输入密码" autocomplete="off"
+                id="password" class="layui-input">
+      </div>
+      <div class="layui-form-item input-item">
+         <label for="comPassword">确认密码</label>
+         <input type="password" lay-verify="required|comPassword" name="password" placeholder="请确认密码" autocomplete="off"
+                id="comPassword" class="layui-input">
+      </div>
+      <div class="layui-form-item input-item">
+         <label for="phone">输入手机号</label>
+         <input type="password" lay-verify="required|phone" name="text" placeholder="请输入手机号"
+                autocomplete="off" id="phone" maxlength="11" class="layui-input">
+      </div>
+      <div class="layui-form-item input-item code-box">
+         <label for="authCode">验证码</label>
+         <input type="text" lay-verify="required" name="captcha" placeholder="请输入验证码"
+                id="authCode" autocomplete="off" maxlength="8" class="layui-input">
+         <button type="button" class="layui-btn btn-auth-code">获取验证码</button>
+      </div>
+      <div class="layui-form-item">
+         <button class="layui-btn layui-block" lay-filter="login" lay-submit="">注册</button>
+      </div>
+      <div class="login-link">
+         <a href="./login.html">有账号去登录</a>
+      </div>
+   </form>
+</div>
+<!--js逻辑-->
+<script src="../lib/layui/layui.js"></script>
+<script>
+   layui.use(["form", "okGVerify", "okLayer"], function () {
+      let form = layui.form;
+      let $ = layui.jquery;
+      let okGVerify = layui.okGVerify;
+      let okLayer = layui.okLayer;
+      let regPhone = /^[1][0-9]{10}$/;/**手机号验证**/
+      let setInter = '';/**定时器对象*/
+      let second = 60;//设置时间
+      /**
+       * 初始化验证码
+       */
+      // let verifyCode = new okGVerify("#captchaImg");
+
+      /**
+       * 数据校验
+       */
+      form.verify({
+         password: [/^[\S]{6,12}$/, "密码必须6到12位，且不能出现空格"],
+         phone: [
+            regPhone,
+            '输入的手机号格式不正确，请重新输入'
+         ],
+         comPassword: function (val) {
+            let password = $("#password").val();
+            return password == val ? '' : "两次密码不一致";
+         }
+      });
+
+      /**
+       * 表单提交
+       */
+      form.on("submit(login)", function (data) {
+         okLayer.msg.greenTick("注册成功,去登陆", function () {
+            window.location = "./login.html";
+         });
+         return false;
+      });
+
+      /**
+       * 表单input组件单击时
+       */
+      $("#login .input-item .layui-input").click(function (e) {
+         e.stopPropagation();
+         $(this).addClass("layui-input-focus").find(".layui-input").focus();
+      });
+
+      /**
+       * 表单input组件获取焦点时
+       */
+      $("#login .layui-form-item .layui-input").focus(function () {
+         $(this).parent().addClass("layui-input-focus");
+      });
+
+      /**
+       * 表单input组件失去焦点时
+       */
+      $("#login .layui-form-item .layui-input").blur(function () {
+         $(this).parent().removeClass("layui-input-focus");
+         if ($(this).val() != "") {
+            $(this).parent().addClass("layui-input-active");
+         } else {
+            $(this).parent().removeClass("layui-input-active");
+         }
+      });
+
+      /**获取验证码**/
+      $('.btn-auth-code').click(function () {
+         let that = $(this),
+            phone = $("#phone").val();
+         if($(this).hasClass("layui-btn-disabled")){
+            return;
+         }
+         if(regPhone.test(phone)){
+            if(!setInter){
+               clearInterval(setInter);
+               that.addClass("layui-btn-disabled");
+               that.text(second+"秒后获取");
+               setInter = setInterval(function () {
+                  second--;
+                  if(second < 1){
+                     clearInterval(setInter);
+                     that.removeClass("layui-btn-disabled");
+                     that.text("重新获取");
+                     setInter = "";
+                  }else{
+                     that.text(second+"秒后获取");
+                  }
+               },1000);
+            }
+         }else{
+            layer.msg("输入的手机号格式不正确，请重新输入",{
+               icon:"5",
+               anim:"6",
+            });
+            $("#phone").focus();
+         }
+      });
+
+   });
+</script>
+</body>
+</html>