diff --git a/js/home.js b/js/home.js
index 7337462..bf83dab 100644
--- a/js/home.js
+++ b/js/home.js
@@ -2,10 +2,7 @@
var useModel = ["form", "table", "laytpl", "laydate",
"element", "jquery", "countUp", "echartsData"];//需要引入的模块
layui.config({
- base: "/lib/okplugins/"
-}).extend({//这里引入的的目录是根据base("/lib/okplugins/")这个目录来指向的
- "mapTest": "../../js/mapTest",
- "echartsData": "../../js/echartsData"
+ base: "../js/"
}).use(useModel, function () {
var $form = layui.form,
countUp = layui.countUp,
diff --git a/js/okadmin.js b/js/okadmin.js
index 3418bd8..42cec5c 100644
--- a/js/okadmin.js
+++ b/js/okadmin.js
@@ -1,13 +1,11 @@
/^http(s*):\/\//.test(location.href) || alert('请先部署到 localhost 下再访问');
-layui.config({
- base: "/lib/okplugins/"
-}).use(['element', 'layer', 'okUtils', 'okTab'], function () {
+layui.use(['element', 'layer', 'okUtils', 'okTab'], function () {
var element = layui.element,
okUtils = layui.okUtils,
$ = layui.jquery,
layer = layui.layer,
okTab = layui.okTab({
- url: "/data/navs.json",
+ url: "./data/navs.json",
openTabNum: 30, //允许同时选项卡的个数
});
diff --git a/lib/okplugins/countUp.js b/lib/layui/lay/okmodules/countUp.js
similarity index 100%
rename from lib/okplugins/countUp.js
rename to lib/layui/lay/okmodules/countUp.js
diff --git a/lib/okplugins/jQqrcode.js b/lib/layui/lay/okmodules/jQqrcode.js
similarity index 100%
rename from lib/okplugins/jQqrcode.js
rename to lib/layui/lay/okmodules/jQqrcode.js
diff --git a/lib/okplugins/okAddlink.js b/lib/layui/lay/okmodules/okAddlink.js
similarity index 100%
rename from lib/okplugins/okAddlink.js
rename to lib/layui/lay/okmodules/okAddlink.js
diff --git a/lib/okplugins/okGVerify.js b/lib/layui/lay/okmodules/okGVerify.js
similarity index 100%
rename from lib/okplugins/okGVerify.js
rename to lib/layui/lay/okmodules/okGVerify.js
diff --git a/lib/okplugins/okTab.js b/lib/layui/lay/okmodules/okTab.js
similarity index 100%
rename from lib/okplugins/okTab.js
rename to lib/layui/lay/okmodules/okTab.js
diff --git a/lib/okplugins/okUtils.js b/lib/layui/lay/okmodules/okUtils.js
similarity index 100%
rename from lib/okplugins/okUtils.js
rename to lib/layui/lay/okmodules/okUtils.js
diff --git a/lib/okplugins/qrcode.js b/lib/layui/lay/okmodules/qrcode.js
similarity index 100%
rename from lib/okplugins/qrcode.js
rename to lib/layui/lay/okmodules/qrcode.js
diff --git a/lib/layui/layui.js b/lib/layui/layui.js
index 7e08a99..b9e83b5 100644
--- a/lib/layui/layui.js
+++ b/lib/layui/layui.js
@@ -1,29 +1,18 @@
/** layui-v2.4.5 MIT License By https://www.layui.com */
;!function (e) {
"use strict";
- var modulePath = {
- layer: "modules/layer",
- laydate: "modules/laydate",
- laypage: "modules/laypage",
- laytpl: "modules/laytpl",
- layim: "modules/layim",
- layedit: "modules/layedit",
- form: "modules/form",
- upload: "modules/upload",
- tree: "modules/tree",
- table: "modules/table",
- element: "modules/element",
- rate: "modules/rate",
- colorpicker: "modules/colorpicker",
- slider: "modules/slider",
- carousel: "modules/carousel",
- flow: "modules/flow",
- util: "modules/util",
- code: "modules/code",
- jquery: "modules/jquery",
- mobile: "modules/mobile",
- "layui.all": "../layui.all"
+ var okmodules = {
+ "okTab": "okmodules/okTab",
+ "countUp": "okmodules/countUp",
+ "okUtils": "okmodules/okUtils",
+ "okGVerify": "okmodules/okGVerify",
+ "qrcode": "okmodules/qrcode",
+ "jQqrcode": "okmodules/jQqrcode",
+ "okAddlink": "okmodules/okAddlink",
};
+
+ var modulePath=Object.assign({layer:"modules/layer",laydate:"modules/laydate",laypage:"modules/laypage",laytpl:"modules/laytpl",layim:"modules/layim",layedit:"modules/layedit",form:"modules/form",upload:"modules/upload",tree:"modules/tree",table:"modules/table",element:"modules/element",rate:"modules/rate",colorpicker:"modules/colorpicker",slider:"modules/slider",carousel:"modules/carousel",flow:"modules/flow",util:"modules/util",code:"modules/code",jquery:"modules/jquery",mobile:"modules/mobile","layui.all":"../layui.all"},okmodules);
+
var t = document, o = {modules: {}, status: {}, timeout: 10, event: {}}, n = function () {
this.v = "2.4.5"
}, r = function () {
diff --git a/pages/echarts/mapchina.html b/pages/echarts/mapchina.html
index 96bae6d..b83d9b9 100644
--- a/pages/echarts/mapchina.html
+++ b/pages/echarts/mapchina.html
@@ -69,10 +69,7 @@
return JSON.parse(JSON.stringify(origin))
}
layui.config({
- base: "/lib/okplugins/"
- }).extend({
- "mapTest": "../../js/mapTest",
- "echartsData": "../../js/echartsData"
+ base: "../../js/"
}).use(["jquery", "mapTest", "echartsData"], function () {
var $ = layui.jquery,
mapTest = layui.mapTest,
diff --git a/pages/echarts/mapchina2.html b/pages/echarts/mapchina2.html
index 5a280cd..b5b8c49 100644
--- a/pages/echarts/mapchina2.html
+++ b/pages/echarts/mapchina2.html
@@ -59,10 +59,7 @@
return JSON.parse(JSON.stringify(origin))
}
layui.config({
- base: "/lib/okplugins/"
- }).extend({
- "mapTest": "../../js/mapTest",
- "echartsData": "../../js/echartsData"
+ base: "../../js/"
}).use(["jquery", "mapTest", "echartsData"], function () {
var $ = layui.jquery,
echartsData = layui.echartsData;
diff --git a/pages/help/navOperate.html b/pages/help/navOperate.html
index 16a8385..3cf8ac8 100644
--- a/pages/help/navOperate.html
+++ b/pages/help/navOperate.html
@@ -72,13 +72,7 @@
}