setting: okLoading

css/oksub.css

@@ -1,6 +1,7 @@
 @import "../css/common.css";
 @import "../lib/layui/css/layui.css";
 @import "okadmin.animate.css";
+@import "../lib/loading/okLoading.css";
 
 /**控制台样式*/
 .console .map-body{height:360px}

data/navs.json

@@ -7,6 +7,12 @@
     "spread": true,
     "isCheck": true
   },
+  {
+    "title": "测试",
+    "href": "pages/help/test.html",
+    "fontFamily": "ok-icon",
+    "icon": ""
+  },
   {
     "title": "控制台示例",
     "href": "",

js/console.js

@@ -5,7 +5,7 @@ layui.use(["okUtils", "table", "okCountUp", "okMock"], function () {
     var okUtils = layui.okUtils;
     var okMock = layui.okMock;
     var $ = layui.jquery;
-
+    okLoading.close($);
     /**
      * 收入、商品、博客、用户
      */

js/console1.js

@@ -3,7 +3,7 @@ layui.use(["okUtils", "okCountUp"], function () {
     var countUp = layui.okCountUp;
     var okUtils = layui.okUtils;
     var $ = layui.jquery;
-
+    okLoading.close($);
     /**
      * 收入、商品、博客、用户
      */

lib/layui/css/okmodules/index.css

@@ -1,4 +1,3 @@
-@import "okLoading.css";
 @import "nprogress.css";
 @import "toastr.min.css";
 @import "jquery.contextMenu.css";

lib/layui/lay/okmodules/okTab.js

@@ -52,12 +52,11 @@ function saveTabMenuPosition(num) {
 	sessionStorage.setItem('tabMenuLeft', num);
 }
 
-layui.define(["element", "jquery", "okLoading"], function (exports) {
+layui.define(["element", "jquery"], function (exports) {
 	var layui = parent.layui || layui;
 	$ = layui.jquery;
 	var element = layui.element,
-		layer = layui.layer,
+		layer = layui.layer;
-		okLoading = layui.okLoading;
 	okTab = function () {
 		this.tabConfig = {
 			openTabNum: 30, //最大可打开窗口数量默认30
@@ -337,17 +336,6 @@ layui.define(["element", "jquery", "okLoading"], function (exports) {
 			// 切换选项卡
 			element.tabChange(tabFilter, tabId);
 
-			/**页面加载动画*/
-			/*var iframeObj = $("iframe[lay-id=" + tabId + "]");
-			iframeObj[0].onload = function() {
-				var ibody = $("iframe[lay-id=" + tabId + "]").contents().find("body");
-				okLoading("", "", ibody[0]);
-			};*/
-			setTimeout(function () {
-				var ibody = $("iframe[lay-id=" + tabId + "]").contents().find("body");
-				okLoading("", "", ibody[0]);
-			},20);
-
 			this.navMove("rightmax");
 			/**保存展开的tab**/
 			// saveTabMenuFun($);

lib/layui/layui.js

@@ -41,8 +41,7 @@ if (!Object.assign) {
         "okToastr": "okmodules/okToastr",
         "okBarcode": "okmodules/okBarcode",
         "okNprogress": "okmodules/okNprogress",
-		    "okSweetAlert2": "okmodules/okSweetAlert2",
+		    "okSweetAlert2": "okmodules/okSweetAlert2"
-		    "okLoading": "okmodules/okLoading",
     };
     var modulePath = Object.assign({
         layer: "modules/layer",

lib/loading/okLoading.css

@@ -1,4 +1,4 @@
-#okLoadering {
+.ok-loading {
     background: #fbfbfb;
     color:#333333;
     font-size:100%;

pages/console.html

@@ -11,6 +11,7 @@
    <meta name="apple-mobile-web-app-status-bar-style" content="black">
    <meta name="apple-mobile-web-app-capable" content="yes">
    <meta name="format-detection" content="telephone=no">
+   <script type="text/javascript" src="../lib/loading/okLoading.js"></script>
    <script type="text/javascript" src="../lib/echarts/echarts.min.js"></script>
    <script type="text/javascript" src="../lib/echarts/echarts.theme.js"></script>
    <script type="text/javascript" src="../lib/echarts/world/js/china.js"></script>

pages/console1.html

@@ -11,6 +11,7 @@
     <meta name="apple-mobile-web-app-status-bar-style" content="black">
     <meta name="apple-mobile-web-app-capable" content="yes">
     <meta name="format-detection" content="telephone=no">
+    <script type="text/javascript" src="../lib/loading/okLoading.js"></script>
     <script type="text/javascript" src="../lib/echarts/echarts.min.js"></script>
     <script type="text/javascript" src="../lib/echarts/echarts.themez.js"></script>
     <link rel="stylesheet" href="../css/oksub.css" media="all"/>

pages/forget.html

@@ -8,6 +8,7 @@
     <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"/>
+    <script type="text/javascript" src="../lib/loading/okLoading.js"></script>
     <style>
         .forget .tit {
             padding-top: 15px;
@@ -76,11 +77,12 @@
             let form = layui.form;
             let okLayer = layui.okLayer;
             let okUtils = layui.okUtils;
-
             let phoneRegex = /^[1][0-9]{10}$/;
             let timer = "";
             let intervalTime = 60;
 
+            okLoading.close($);
+
             /**
              * 数据校验
              */

pages/help/test.html

@@ -4,15 +4,18 @@
 	<meta charset="UTF-8">
 	<title>Title</title>
 	<link rel="stylesheet" href="../../lib/layui/css/layui.css"/>
+	<link rel="stylesheet" href="../../lib/loading/okLoading.css"/>
+	<script type="text/javascript" src="../../lib/loading/okLoading.js"></script>
 </head>
 <body>
+
 dsafasdf
 </body>
 </html>
 <script src="../../lib/layui/layui.js"></script>
 <script type="text/javascript">
-	layui.use(["okLoading"], function () {
+	layui.use(["jquery"], function () {
-		let okLoading = layui.okLoading;
+		let $ = layui.jquery;
-		okLoading();
+		okLoading.close($);
 	});
 </script>