okmudules

js/okadmin.js

@@ -1,10 +1,4 @@
-layui.config({
+layui.use(["element", "layer", "okTab", "okMenu"], function () {
-    base: "lib/okPlugins/"
-}).extend({
-    okTab: "okTab",
-    okUtils: "okUtils",
-    okMenu: "okMenu"
-}).use(["element", "layer", "okTab", "okMenu"], function () {
     var element = layui.element;
     var layer = layui.layer;
     var okTab = layui.okTab;

lib/layui/lay/okmodules/okProgress/nprogress.js

@@ -488,6 +488,6 @@ layui.define(function (exports) {
     });
 
     // layui.link("https://cdn.bootcss.com/nprogress/0.2.0/nprogress.css");
-    layui.link("../../lib/okPlugins/okProgress/nprogress.css");
+    layui.link("../../lib/layui/lay/okmodules/okProgress/nprogress.css");
     exports("nprogress", obj);
 });

lib/layui/lay/okmodules/okProgress/okProgress.js

@@ -1,5 +1,5 @@
 layui.config({
-    base: "../../lib/okPlugins/"
+    base: "../../lib/layui/lay/okmodules/"
 }).extend({
     nprogress: "okProgress/nprogress"
 }).define(["nprogress"], function (exports) {

lib/layui/lay/okmodules/treetable/treetable.js

@@ -190,7 +190,7 @@ layui.define(['layer', 'table'], function (exports) {
         }
     };
 
-    layui.link(layui.cache.base + 'treetable/treetable.css');
+    layui.link('../../lib/layui/lay/okmodules/treetable/treetable.css');
 
     // 给图标列绑定事件
     $('body').on('click', '.treeTable .treeTable-icon', function () {

pages/article/article-add.html

@@ -74,12 +74,7 @@
 <!--js逻辑-->
 <script src="../../lib/layui/layui.js"></script>
 <script>
-    layui.config({
+    layui.use(["element", "form", "layedit", "okLayer", "okUtils"], function () {
-        base: "../../lib/okPlugins/"
-    }).extend({
-        okLayer: "okLayer",
-        okUtils: "okUtils"
-    }).use(["element", "form", "layedit", "okLayer", "okUtils"], function () {
         var form = layui.form;
         var layedit = layui.layedit;
         var okLayer = layui.okLayer;

pages/article/article-edit.html

@@ -74,12 +74,7 @@
 <!--js逻辑-->
 <script src="../../lib/layui/layui.js"></script>
 <script>
-    layui.config({
+    layui.use(["element", "form", "layedit", "okLayer", "okUtils"], function () {
-        base: "../../lib/okPlugins/"
-    }).extend({
-        okLayer: "okLayer",
-        okUtils: "okUtils"
-    }).use(["element", "form", "layedit", "okLayer", "okUtils"], function () {
         var form = layui.form;
         var layedit = layui.layedit;
         var okLayer = layui.okLayer;

pages/article/article.html

@@ -36,12 +36,7 @@
 <!--js逻辑-->
 <script src="../../lib/layui/layui.js"></script>
 <script>
-    layui.config({
+    layui.use(["element", "table", "form", "laydate", "okLayer", "okUtils"], function () {
-        base: "../../lib/okPlugins/"
-    }).extend({
-        okLayer: "okLayer",
-        okUtils: "okUtils"
-    }).use(["element", "table", "form", "laydate", "okLayer", "okUtils"], function () {
         var table = layui.table;
         var form = layui.form;
         var $ = layui.jquery;

pages/permission/permission.html

@@ -47,13 +47,7 @@
 <script src="../../lib/layui/layui.js"></script>
 <script>
     // TODO 权限模块需要大改！！！！！！
-    layui.config({
+    layui.use(["element", "table", "form", "laydate", "treetable", "okLayer", "okUtils"], function () {
-        base: "../../lib/okPlugins/"
-    }).extend({
-        treetable: "treetable/treetable",
-		okLayer: "okLayer",
-		okUtils: "okUtils"
-    }).use(["element", "table", "form", "laydate", "treetable", "okLayer", "okUtils"], function () {
         var form = layui.form;
         var table = layui.table;
         var $ = layui.jquery;

pages/role/role-add.html

@@ -55,12 +55,7 @@
 <script src="https://cdn.bootcss.com/jquery/3.3.1/jquery.min.js"></script>
 <script src="../../lib/zTree_v3/js/jquery.ztree.all.js"></script>
 <script type="text/javascript">
-    layui.config({
+    layui.use(["element", "form", "okLayer", "okUtils"], function () {
-        base: "../../lib/okPlugins/"
-    }).extend({
-        okLayer: "okLayer",
-        okUtils: "okUtils"
-    }).use(["element", "form", "okLayer", "okUtils"], function () {
         var form = layui.form;
         var okLayer = layui.okLayer;
         var okUtils = layui.okUtils;

pages/role/role-edit.html

@@ -55,12 +55,7 @@
 <script src="https://cdn.bootcss.com/jquery/3.3.1/jquery.min.js"></script>
 <script src="../../lib/zTree_v3/js/jquery.ztree.all.js"></script>
 <script type="text/javascript">
-    layui.config({
+    layui.use(["element", "form", "okLayer", "okUtils"], function () {
-        base: "../../lib/okPlugins/"
-    }).extend({
-        okLayer: "okLayer",
-        okUtils: "okUtils"
-    }).use(["element", "form", "okLayer", "okUtils"], function () {
         var form = layui.form;
         var okLayer = layui.okLayer;
         var okUtils = layui.okUtils;

pages/role/role.html

@@ -36,12 +36,7 @@
 <!--js逻辑-->
 <script src="../../lib/layui/layui.js"></script>
 <script>
-    layui.config({
+    layui.use(["element", "table", "form", "laydate", "okLayer", "okUtils"], function () {
-        base: "../../lib/okPlugins/"
-    }).extend({
-        okLayer: "okLayer",
-        okUtils: "okUtils"
-    }).use(["element", "table", "form", "laydate", "okLayer", "okUtils"], function () {
         var table = layui.table;
         var form = layui.form;
         var laydate = layui.laydate;

pages/system/system-log.html

@@ -36,12 +36,7 @@
 <!--js逻辑-->
 <script src="../../lib/layui/layui.js"></script>
 <script>
-    layui.config({
+    layui.use(["element", "table", "form", "laydate", "okLayer", "okUtils"], function () {
-        base: "../../lib/okPlugins/"
-    }).extend({
-        okLayer: "okLayer",
-        okUtils: "okUtils"
-    }).use(["element", "table", "form", "laydate", "okLayer", "okUtils"], function () {
         var table = layui.table;
         var form = layui.form;
         var laydate = layui.laydate;

pages/system/system-setting.html

@@ -180,12 +180,7 @@
 <!--js逻辑-->
 <script src="../../lib/layui/layui.js"></script>
 <script>
-    layui.config({
+    layui.use(["element", "form", "okLayer", "okUtils"], function () {
-        base: "../../lib/okPlugins/"
-    }).extend({
-        okLayer: "okLayer",
-        okUtils: "okUtils"
-    }).use(["element", "form", "okLayer", "okUtils"], function () {
         var $ = layui.jquery;
 		var form = layui.form;
         var okLayer = layui.okLayer;

pages/test/okLayer.html

@@ -8,11 +8,7 @@
 
 <script src="../../lib/layui/layui.js"></script>
 <script type="text/javascript">
-    layui.config({
+    layui.use("okLayer", function () {
-        base: "../../lib/okPlugins/"
-    }).extend({
-        okLayer: "okLayer"
-    }).use("okLayer", function () {
         var okLayer = layui.okLayer;
         // okLayer.tableNotCheckMsg();
         // okLayer.tableNotCheckMsg("哈哈");

pages/test/okProgress.html

@@ -8,11 +8,7 @@
 
 <script src="../../lib/layui/layui.js"></script>
 <script type="text/javascript">
-    layui.config({
+    layui.use("okProgress", function () {
-        base: "../../lib/okPlugins/"
-    }).extend({
-        okProgress: "okProgress/okProgress"
-    }).use("okProgress", function () {
     });
 </script>
 </body>

pages/use/use-okTab-sub.html

@@ -40,12 +40,7 @@ okTab.tabAdd("ok-tool", "http://www.xlbweb.cn")
 <!--js逻辑-->
 <script src="../../lib/layui/layui.js"></script>
 <script>
-    layui.config({
+    layui.use(["element", "code", "okTab"], function () {
-        base: "../../lib/okPlugins/"
-    }).extend({
-        okTab: "okTab",
-		okLayer: "okLayer",
-    }).use(["element", "code", "okTab"], function () {
         var $ = layui.jquery;
 		var okTab = layui.okTab;
 

pages/use/use-okTab.html

@@ -71,12 +71,7 @@ okTab.tabAdd("ok-tool", "http://www.xlbweb.cn")
 <!--js逻辑-->
 <script src="../../lib/layui/layui.js"></script>
 <script>
-    layui.config({
+    layui.use(["element", "code", "okTab", "okLayer"], function () {
-        base: "../../lib/okPlugins/"
-    }).extend({
-        okTab: "okTab",
-		okLayer: "okLayer",
-    }).use(["element", "code", "okTab", "okLayer"], function () {
         var $ = layui.jquery;
 		var okTab = layui.okTab;
 		var okLayer = layui.okLayer;

pages/user/login.html

@@ -38,13 +38,7 @@
 <!--js逻辑-->
 <script src="../../lib/layui/layui.js"></script>
 <script type="text/javascript">
-    layui.config({
+    layui.use(["form", "okLayer", "okUtils", "okProgress"], function () {
-        base: "../../lib/okPlugins/"
-    }).extend({
-        okLayer: "okLayer",
-        okUtils: "okUtils",
-        okProgress: "okProgress/okProgress"
-    }).use(["form", "okLayer", "okUtils", "okProgress"], function () {
         var form = layui.form;
         var $ = layui.jquery;
         var okLayer = layui.okLayer;

pages/user/user-add.html

@@ -105,12 +105,7 @@
 <!--js逻辑-->
 <script src="../../lib/layui/layui.js"></script>
 <script>
-    layui.config({
+    layui.use(["element", "form", "laydate", "okLayer", "okUtils"], function () {
-        base: "../../lib/okPlugins/"
-    }).extend({
-        okLayer: "okLayer",
-        okUtils: "okUtils"
-    }).use(["element", "form", "laydate", "okLayer", "okUtils"], function () {
         var form = layui.form;
         var laydate = layui.laydate;
 		var okLayer = layui.okLayer;

pages/user/user-edit.html

@@ -112,12 +112,7 @@
 		initData = JSON.parse(jsonString);
 	}
 	
-    layui.config({
+    layui.use(["element", "form", "laydate", "okLayer", "okUtils"], function () {
-        base: "../../lib/okPlugins/"
-    }).extend({
-        okLayer: "okLayer",
-        okUtils: "okUtils"
-    }).use(["element", "form", "laydate", "okLayer", "okUtils"], function () {
         var form = layui.form;
         var laydate = layui.laydate;
 		var okLayer = layui.okLayer;

pages/user/user.html

@@ -36,13 +36,7 @@
 <!--js逻辑-->
 <script src="../../lib/layui/layui.js"></script>
 <script>
-    layui.config({
+    layui.use(["element", "table", "form", "laydate", "okLayer", "okUtils"], function () {
-        base: "../../lib/okPlugins/"
-    }).extend({
-        okLayer: "okLayer",
-        okUtils: "okUtils",
-        okProgress: "okProgress/okProgress"
-    }).use(["element", "table", "form", "laydate", "okLayer", "okUtils", "okProgress"], function () {
         var table = layui.table;
         var form = layui.form;
         var laydate = layui.laydate;