From 5db00dd4398540b0b25d88dfbd990c9eed2a2a81 Mon Sep 17 00:00:00 2001
From: suwings <suwings@outlook.com>
Date: Sat, 18 Nov 2017 20:29:35 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=8A=A0=E8=BD=BD=E8=BF=9B?=
 =?UTF-8?q?=E5=BA=A6=E6=9D=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore                   |  3 +-
 public/common/css/common.css | 12 ++++++
 public/common/css/unit.css   |  5 +++
 public/common/js/common.js   | 18 ---------
 public/common/js/response.js | 52 +++++++++++++++++-------
 public/index.html            | 77 ++++++++++++++++++++----------------
 6 files changed, 99 insertions(+), 68 deletions(-)

diff --git a/.gitignore b/.gitignore
index 2880e03b..00ab8519 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,4 +7,5 @@ users/*.json
 server/*.json
 public/*.json
 McserverConfig.json
-core/*.json
\ No newline at end of file
+core/*.json
+node_modules/
\ No newline at end of file
diff --git a/public/common/css/common.css b/public/common/css/common.css
index 7929377e..8b4f11d9 100644
--- a/public/common/css/common.css
+++ b/public/common/css/common.css
@@ -261,3 +261,15 @@ a,input{outline:none;}
 	margin-left: -20px;
 }
 
+/*进度条CSS*/
+.Toolscon{
+	position: fixed;
+    top: 0px;
+    left: 0px;
+    /*background-color: #00cc06;*/
+    height: 4px;
+    z-index: 999;
+    width: 100%;
+    overflow: hidden;
+    line-height: 3px;
+}
diff --git a/public/common/css/unit.css b/public/common/css/unit.css
index 44f5fa3f..196d205f 100644
--- a/public/common/css/unit.css
+++ b/public/common/css/unit.css
@@ -18,3 +18,8 @@
 	box-shadow: 2px 0px 6px #888888;
 }
 
+.width-100{
+	width: 100%;
+}
+
+
diff --git a/public/common/js/common.js b/public/common/js/common.js
index bf82b4d8..05e95aad 100644
--- a/public/common/js/common.js
+++ b/public/common/js/common.js
@@ -173,7 +173,6 @@
 						}, 200, function() {
 							MI.on('colmchangeEnd', null); //触发事件
 						});
-					//					$SideCol.removeAttr('style')
 					$Container.removeAttr('style')
 				});
 		}
@@ -203,20 +202,3 @@
 
 	//	if(document.body.clientWidth <)
 })();
-
-//logo
-$(function() {
-
-	//	var MasterLogo = $('#MasterLogo');
-	//
-	//	function logoAnimate() {
-	//		MasterLogo.animate({
-	//			'letter-spacing': '2.0px'
-	//		}, 15000, function() {
-	//			MasterLogo.animate({
-	//				'letter-spacing': '1px'
-	//			}, 15000, logoAnimate);
-	//		});
-	//	}
-	//	logoAnimate();
-})
\ No newline at end of file
diff --git a/public/common/js/response.js b/public/common/js/response.js
index 46aff65d..69abb950 100644
--- a/public/common/js/response.js
+++ b/public/common/js/response.js
@@ -89,34 +89,56 @@
 			});
 		}
 	}
-	
-	var PageMain = $('#ConsoleMain');
-	RES.redirectPage = function(url, key, body, callback) {
-		PageMain.stop(true, true).animate({
-			'opacity': '0'
-			// 'margin-left':'50px'
-		}, 150, MmDoing);
 
-		//切换事件处理
-		function MmDoing() {
+	RES.redirectPage = function(url, key, body, callback) {
+
+		ToolsLoadingStart(function() {
 			MI.rOn('onend');
+			PageLoading();
 			//替換掉原先存在的 函数。防止新的单页没有这些函数而导致代码二次执行
 			MI.rListener('onend', function() {});
 			MI.rListener('onload', function() {});
 			RES.redirectHTML(url, key, body, function() {
-				MI.on('page/live'); //MCSERVER.URL(
+				MI.on('page/live');
 				//赋予的单页刷新
 				PAGE.refresh = function() {
 					RES.redirectPage(url, key, body, callback);
 				}
+				ToolsLoadingEnd();
 				MI.rOn('onload');
 				callback && callback();
-				PageMain.stop(true, true).animate({
-					'opacity': '1'
-					// 'margin-left':'0px'
-				}, 150);
+				
 			});
-		}
+		});
 
 	}
+
+	var PageMain = $('#ConsoleMain');
+	var ToolsLoading = $('#ToolsLoading'); //进度条
+	var ToolsPageLoading = $("#ToolsPageLoading"); //进度条容器
+
+	function ToolsLoadingStart(callback) {
+		ToolsLoading.css("width", "0%");
+		ToolsPageLoading.css("display", "block");
+		PageMain.stop(true, true).animate({
+			'opacity': '0'
+		}, 150, callback);
+	}
+
+	function PageLoading() {
+		ToolsLoading.css("width", "80%");
+	}
+
+	function ToolsLoadingEnd() {
+		ToolsLoading.css("width", "100%");
+
+		
+		
+		PageMain.stop(true, true).animate({
+			'opacity': '1'
+		}, 150, function() {
+			ToolsPageLoading.css("display", "none");
+		});
+	}
+
 })();
\ No newline at end of file
diff --git a/public/index.html b/public/index.html
index 8c3d078b..9e305653 100644
--- a/public/index.html
+++ b/public/index.html
@@ -1,45 +1,45 @@
 <!DOCTYPE html>
 <html lang="zh-CN">
 
-<head>
-	<meta charset="utf-8" />
-	<meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1" />
-	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-	<meta http-equiv="Content-Language" content="zh-CN" />
-	<meta name="renderer" content="webkit" />
-	<meta name="viewport" content="initial-scale=1, maximum-scale=3, minimum-scale=1, user-scalable=no" />
+	<head>
+		<meta charset="utf-8" />
+		<meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1" />
+		<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+		<meta http-equiv="Content-Language" content="zh-CN" />
+		<meta name="renderer" content="webkit" />
+		<meta name="viewport" content="initial-scale=1, maximum-scale=3, minimum-scale=1, user-scalable=no" />
 
-	<title>Mcserver 管理面板</title>
-	<link href="./common/bootstrap/css/bootstrap.min.css" rel="stylesheet">
+		<title>Mcserver 管理面板</title>
+		<link href="./common/bootstrap/css/bootstrap.min.css" rel="stylesheet">
 
-	<link href="./common/css/common.css" rel="stylesheet">
-	<link href="./common/css/block.css" rel="stylesheet">
-	<link href="./favicon.ico" rel="shortcut icon">
-	<link rel="stylesheet" href="common/css/unit.css" />
-		
-	<!--[if lt IE 9]>
+		<link href="./common/css/common.css" rel="stylesheet">
+		<link href="./common/css/block.css" rel="stylesheet">
+		<link href="./favicon.ico" rel="shortcut icon">
+		<link rel="stylesheet" href="common/css/unit.css" />
+
+		<!--[if lt IE 9]>
       		<div id='Not_' class="show-ui" style="height: 40px;background-color: rgb(221,79,67);text-align:center;line-height: 40px;color: white;">
             	<b>无法访问! 您的浏览器版本过低或是兼容模式,请使用最新/更高版本的浏览器: IE10+ chrome FireFox 等，如果是国内浏览器请打开极速浏览模式（webkit内核）。</b>
         	</div>
    		<![endif]-->
 
-	<!--前端完全开源，您可以自由更改，但仅限于使用在 Mcserver Manager 程序-->
-	<!--版权所有 Mcserver Manager 8     开发者 (Suwings) 双羽 -->
-	<!--前端开源使用 请遵循 MIT 协议即可已经其他额外附属条件，勿删除版权信息-->
-</head>
+		<!--前端完全开源，您可以自由更改，但仅限于使用在 Mcserver Manager 程序-->
+		<!--版权所有 Mcserver Manager 8     开发者 (Suwings) 双羽 -->
+		<!--前端开源使用 请遵循 MIT 协议即可已经其他额外附属条件，勿删除版权信息-->
+	</head>
 
-<!--百度数据统计,如果您不想被统计,请删除这段代码-->
-<script>
-var _hmt = _hmt || [];
-(function() {
-  var hm = document.createElement("script");
-  hm.src = "https://hm.baidu.com/hm.js?242b21aa18712872e0775282aaeae0a5";
-  var s = document.getElementsByTagName("script")[0]; 
-  s.parentNode.insertBefore(hm, s);
-})();
-</script>
+	<!--百度数据统计,如果您不想被统计,请删除这段代码-->
+	<script>
+		var _hmt = _hmt || [];
+		(function() {
+			var hm = document.createElement("script");
+			hm.src = "https://hm.baidu.com/hm.js?242b21aa18712872e0775282aaeae0a5";
+			var s = document.getElementsByTagName("script")[0];
+			s.parentNode.insertBefore(hm, s);
+		})();
+	</script>
 
-<!-- 
+	<!-- 
     __  ___                                       __  ___                                 
    /  |/  /____________  ______   _____  _____   /  |/  /___ _____  ____ _____ ____  _____
   / /|_/ / ___/ ___/ _ \/ ___/ | / / _ \/ ___/  / /|_/ / __ `/ __ \/ __ `/ __ `/ _ \/ ___/
@@ -49,10 +49,10 @@ var _hmt = _hmt || [];
  Only you.
 -->
 
-<body>
-	<div id='Header' class="box-shadow">
-		<div id='MasterLogo' class="HeaderItem" onclick="MCSERVER.colmDo()" style="cursor: pointer;">
-			<b>Mcserver
+	<body>
+		<div id='Header' class="box-shadow">
+			<div id='MasterLogo' class="HeaderItem" onclick="MCSERVER.colmDo()" style="cursor: pointer;">
+				<b>Mcserver
 				<b> 管理面板</div>
 		<div class="HeaderR">
 			<div id='websocket' v-text="status">
@@ -117,6 +117,15 @@ var _hmt = _hmt || [];
 	<div id='ShowMenu' onclick="MCSERVER.colmDo()">
 		<h4></h4>
 	</div>
+	
+	<!--页面加载进度条-->
+	<div class="Toolscon" id="ToolsPageLoading">
+		<div class="progress" style="height: 4px;line-height: 4px;">
+		  <div id="ToolsLoading" class="progress-bar progress-bar-success progress-bar-striped"  style="width: 0%;height: 4px;">
+		  </div>
+		</div>
+	</div>
+	
 
 
 	<!--Js文件引用，顺序不能乱，所有js都是依赖于前js的-->