From 3c34ae44fe4ed2930fcef693fe25a6d51242fd56 Mon Sep 17 00:00:00 2001
From: gongfuxiang <2499232802@qq.com>
Date: Sat, 2 Mar 2019 19:19:07 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=8E=E5=8F=B0=E7=AE=A1=E7=90=86=E6=89=8B?=
 =?UTF-8?q?=E6=9C=BA=E6=A8=A1=E5=BC=8F=E4=B8=8B=E5=8D=A1=E5=8A=A8=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../admin/view/default/public/header.html     |  4 +--
 .../admin/view/default/public/nav.html        | 15 +++++------
 public/static/admin/default/css/common.css    | 26 +++++++++----------
 public/static/admin/default/css/index.css     |  3 ---
 public/static/admin/default/js/index.js       | 25 +++++++++++-------
 5 files changed, 37 insertions(+), 36 deletions(-)
 delete mode 100755 public/static/admin/default/css/index.css

diff --git a/application/admin/view/default/public/header.html b/application/admin/view/default/public/header.html
index 6c9f39fba..43d931343 100755
--- a/application/admin/view/default/public/header.html
+++ b/application/admin/view/default/public/header.html
@@ -10,10 +10,10 @@
 	<link rel="stylesheet" type="text/css" href="{{$Think.__MY_ROOT_PUBLIC__}}static/common/lib/amazeui-chosen/amazeui.chosen.css" />
 	<link rel="stylesheet" type="text/css" href="{{$Think.__MY_ROOT_PUBLIC__}}static/common/lib/amazeui-tagsinput/amazeui.tagsinput.css" />
 	<link rel="stylesheet" type="text/css" href="{{$Think.__MY_ROOT_PUBLIC__}}static/common/css/common.css" />
-	<link rel="stylesheet" type="text/css" href="{{$Think.__MY_ROOT_PUBLIC__}}static/admin/{{$default_theme}}/css/common.css" />
+	<link rel="stylesheet" type="text/css" href="{{$Think.__MY_ROOT_PUBLIC__}}static/admin/{{$default_theme}}/css/common.css?v=1117" />
 	<link rel="stylesheet" type="text/css" href="{{$Think.__MY_ROOT_PUBLIC__}}static/admin/{{$default_theme}}/css/iconfontmenu.css" />
 	{{if !empty($module_css)}}
-		<link rel="stylesheet" type="text/css" href="{{$Think.__MY_ROOT_PUBLIC__}}static/{{$module_css}}" />
+		<link rel="stylesheet" type="text/css" href="{{$Think.__MY_ROOT_PUBLIC__}}static/{{$module_css}}?v=1117" />
 	{{/if}}
 <meta http-equiv='Content-Security-Policy' content='upgrade-insecure-requests'/></head>
 <script type="text/javascript">
diff --git a/application/admin/view/default/public/nav.html b/application/admin/view/default/public/nav.html
index b62c8326e..3b416e05a 100755
--- a/application/admin/view/default/public/nav.html
+++ b/application/admin/view/default/public/nav.html
@@ -16,15 +16,14 @@
 					<span>查看首页</span>
 				</a>
 			</li>
+
+			<li class="am-dropdown am-hide-sm-only">
+				<a href="javascript:;" class="fullscreen-event" data-fulltext-open="开启全屏" data-fulltext-exit="退出全屏">
+					<i class="am-icon-arrows-alt"></i>
+					<span class="fullscreen-text">开启全屏</span>
+				</a>
+			</li>
 			
-			{{if !IsMobile()}}
-				<li class="am-dropdown am-hide-sm-only">
-					<a href="javascript:;" class="fullscreen-event" data-fulltext-open="开启全屏" data-fulltext-exit="退出全屏">
-						<i class="am-icon-arrows-alt"></i>
-						<span class="fullscreen-text">开启全屏</span>
-					</a>
-				</li>
-			{{/if}}
 			<li class="am-dropdown common-nav-top" data-am-dropdown data-am-dropdown-toggle>
 				<a class="am-dropdown-toggle tpl-header-list-link" href="javascript:;">
 					<i class="am-icon-user"></i>
diff --git a/public/static/admin/default/css/common.css b/public/static/admin/default/css/common.css
index 547e7d73d..c0bd21fd9 100755
--- a/public/static/admin/default/css/common.css
+++ b/public/static/admin/default/css/common.css
@@ -364,15 +364,14 @@ a:focus {outline:0;text-decoration:none;}
 @media only screen and (max-width:641px) {.am-dropdown-content {border:0px;}
   header .tpl-header-list-user-nick {color:#fff;}
 }
-header { background-color:#4386fb !important; border-color:#4386fb; color:#fff;}
+header { background-color:#4386fb !important; border-color:#4386fb; color:#fff; }
 header, header.am-topbar { min-height:35px; }
 header .am-topbar-brand  { height:35px; }
 header .am-dropdown-content {border-radius:2px;}
-header .am-topbar-brand, .am-topbar-nav > li > a { line-height: 35px; }
 header .am-topbar-brand h2 { margin: 0; }
 header .header-nav-submit { margin: 4px 10px 0 0; }
 ul {margin-top:0;}
-.admin-header {position:fixed;top:0;left:0;right:0;z-index:1000;font-size:1.4rem;margin-bottom:0;}
+.admin-header {position:fixed;top:0;right:0;z-index:1000;font-size:1.4rem;margin-bottom:0;}
 .admin-sidebar {width:260px;min-height:100%;float:left;border-right:1px solid #cecece;}
 .admin-sidebar.am-active {z-index:1600;}
 .admin-sidebar-list {margin-bottom:0;}
@@ -383,12 +382,15 @@ ul {margin-top:0;}
 .admin-sidebar {height:100%;overflow-x:hidden;overflow-y:scroll;-webkit-overflow-scrolling:touch;}
 .admin-sidebar .am-icon-angle-down {margin-top: 5px;}
 @media only screen and (min-width:641px) {
-  .admin-sidebar {display:block;width:170px;z-index:1;position: static;}
+    header { left: 169px; }
+    header .am-topbar-brand, .am-topbar-nav > li > a { line-height: 35px; }
+  .admin-sidebar {display:block;width:170px;z-index:1; position: fixed; top: 0; left: 0;}
   .admin-offcanvas-bar {position:static;width:auto;background:none;-webkit-transform:translate3d(0,0,0);-ms-transform:translate3d(0,0,0);transform:translate3d(0,0,0);overflow-y:visible;min-height:100%;}
   .admin-offcanvas-bar:after {content:none;}
-  #ifcontent { width: calc(100% - 170px); }
+  #ifcontent { padding-left: 170px; }
 }
 @media only screen and (max-width:640px) {
+    header { left: 0; }
   .admin-sidebar {width:inherit;}
   .admin-offcanvas-bar {background:#f3f3f3;}
   .admin-offcanvas-bar:after {background:#BABABA;}
@@ -404,7 +406,7 @@ ul {margin-top:0;}
 .admin-sidebar-list li a {padding:0.6rem;}
 .common-left-menu a:hover { background:rgba(118, 119, 120, 0.1); }
 .common-left-menu-active {background:rgba(118, 119, 120, 0.3) !important;color:#fff !important;}
-#ifcontent {border:0px;overflow-x:hidden;}
+#ifcontent {border:0px;}
 .am-table > tbody > tr > td {vertical-align:top;}
 .admin-offcanvas-bar, .admin-offcanvas-bar .am-list > li { background: #36373c; }
 .admin-offcanvas-bar .am-list > li { border: 1px solid #2e2e31; }
@@ -434,9 +436,7 @@ ul {margin-top:0;}
  * 手机
  */
 @media only screen and (max-width: 641px) {
-  html, body {
-    overflow-x: hidden;
-  }
+  
 }
 
 /**
@@ -448,19 +448,19 @@ ul {margin-top:0;}
 /**
  * mini开关
  */
-.menu-scaling-submit{position:absolute;left:175px;top:40px;opacity:.6;width:30px;height:25px;padding:2px 10px;box-shadow:0 0 3px 1px #208fd5;font-size: 18px;}
+.menu-scaling-submit{position:fixed;left:174px;top:40px;opacity:.6;width:30px;height:25px;padding:2px 10px;box-shadow:0 0 3px 1px #208fd5;font-size: 18px;}
 
 /**
  * mini小icon
  */
-.menu-mini-container-tips{position:absolute;left:63px;top:0;padding:0 10px;width:auto;height:35px;line-height:35px;text-align:center;color:#fff;background-color:#4884ff;-webkit-box-shadow:0 0 5px rgba(0,0,0,.2);-moz-box-shadow:0 0 5px rgba(0,0,0,.2);box-shadow:0 0 5px rgba(0,0,0,.2);font-weight:700;display:none}
+.menu-mini-container-tips{position:absolute;left:63px;top:0;padding:0 10px;width:auto;height:35px;line-height:35px;text-align:center;color:#fff;background-color:#01bcd4;-webkit-box-shadow:0 0 5px rgba(0,0,0,.2);-moz-box-shadow:0 0 5px rgba(0,0,0,.2);box-shadow:0 0 5px rgba(0,0,0,.2);font-weight:700;display:none;z-index:1001;}
 .menu-mini-container-tips span{font-size:12px}
-.menu-mini-container-tips .mui-mbar-tab-tip,.menu-mini-container-popup .mui-mbar-tab-tip{position:absolute;width:16px;height:16px;line-height:16px;text-align:center;font-size:16px;font-family:"\5b8b\4f53";top:10px;left:-8px;z-index:0;color:#4884ff}
+.menu-mini-container-tips .mui-mbar-tab-tip,.menu-mini-container-popup .mui-mbar-tab-tip{position:absolute;width:16px;height:16px;line-height:16px;text-align:center;font-size:16px;font-family:"\5b8b\4f53";top:10px;left:-8px;z-index:0;color:#01bcd4}
 
 /**
  * mini子菜单
  */
-.menu-mini-container-popup{background:#36373c;position:absolute;left:63px;top:0;min-width:120px;height:auto;display:none}
+.menu-mini-container-popup{background:#36373c;position:absolute;left:63px;top:0;min-width:120px;height:auto;display:none;z-index:1001;}
 .menu-mini-container-popup ul{margin:0;padding:0}
 .menu-mini-container-popup ul li{line-height:35px;list-style-type:none}
 .menu-mini-container-popup ul li a{padding:0 10px;display:block;color:#fff}
diff --git a/public/static/admin/default/css/index.css b/public/static/admin/default/css/index.css
deleted file mode 100755
index 9f2803599..000000000
--- a/public/static/admin/default/css/index.css
+++ /dev/null
@@ -1,3 +0,0 @@
-html,body {
-	overflow: hidden;
-}
\ No newline at end of file
diff --git a/public/static/admin/default/js/index.js b/public/static/admin/default/js/index.js
index 94c7742b1..daf546217 100755
--- a/public/static/admin/default/js/index.js
+++ b/public/static/admin/default/js/index.js
@@ -62,16 +62,19 @@ $(function()
         {
             $(this).animate({left: "59px"}, 300);
             $(this).removeClass('am-icon-angle-double-left').addClass('am-icon-angle-double-right');
-            $('#admin-offcanvas').addClass('menu-mini');
+            $('#admin-offcanvas').addClass('menu-mini').addClass('menu-mini-event');
             $('#admin-offcanvas').animate({width: "55px"}, 300);
-            $('#ifcontent').css({"width":"calc(100% - 55px)"});
+            $('#ifcontent').animate({paddingLeft: "55px"}, 300);
+            $('header.admin-header').animate({left: "54px"}, 300);
         } else {
-            $(this).animate({left: "175px"}, 300);
+            $(this).animate({left: "174px"}, 300);
             $(this).removeClass('am-icon-angle-double-right').addClass('am-icon-angle-double-left');
             $('#admin-offcanvas').animate({width: "170px"}, 300);
+            $('#ifcontent').animate({paddingLeft: "170px"}, 300);
+            $('header.admin-header').animate({left: "169px"}, 300);
+            $('#admin-offcanvas').removeClass('menu-mini-event');
             setTimeout(function() {
                 $('#admin-offcanvas').removeClass('menu-mini');
-                $('#ifcontent').css({"width":"calc(100% - 170px)"});
             }, 300);
         }
         $('#admin-offcanvas ul').animate({opacity: 1}, 300);
@@ -82,7 +85,7 @@ $(function()
      * mini菜单操作
      */
     var timer_menu = null;
-    $(document).on('mouseenter', '.menu-mini li', function()
+    $(document).on('mouseenter', '.menu-mini-event li', function()
     {
         clearTimeout(timer_menu);
         var html = $(this).find('ul.admin-sidebar-sub').html() || null;
@@ -109,7 +112,7 @@ $(function()
             }
         }
     });
-    $(document).on('mouseleave', '.menu-mini li', function()
+    $(document).on('mouseleave', '.menu-mini-event li', function()
     {
         $('.menu-mini-container-tips').hide();
         clearTimeout(timer_menu);
@@ -155,16 +158,18 @@ $(function()
         if($(document).width() <= 640)
         {
             $('.menu-scaling-submit').attr('data-status', 0);
-            $('.menu-scaling-submit').css({"left": "175px"});
+            $('.menu-scaling-submit').css({"left": "174px"});
             $('.menu-scaling-submit').removeClass('am-icon-angle-double-right').addClass('am-icon-angle-double-left');
             $('#admin-offcanvas').css({"width": "inherit"});
-            $('#admin-offcanvas').removeClass('menu-mini');
-            $('#ifcontent').css({"width":"100%"});
+            $('#admin-offcanvas').removeClass('menu-mini').removeClass('menu-mini-event');
+            $('#ifcontent').css({"padding-left":0});
+            $('header.admin-header').css({"left": 0});
         } else {
             if(($('.menu-scaling-submit').attr('data-status') || 0) == 0)
             {
                 $('#admin-offcanvas').css({"width": "170px"});
-                $('#ifcontent').css({"width":"calc(100% - 170px)"});
+                $('#ifcontent').css({"padding-left":"170px"});
+                $('header.admin-header').css({"left": "169px"});
             }
         }
     });