From 397c398f55d43f085fd76298492e66258888fca3 Mon Sep 17 00:00:00 2001 From: starsphp <2368302435@qq.com> Date: Mon, 2 Aug 2021 15:46:20 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0layui=E5=88=B02.6.8=EF=BC=9B?= =?UTF-8?q?=E7=9B=B8=E5=AF=B9=E8=B7=AF=E5=BE=84=E6=94=B9=E4=B8=BA=E7=BB=9D?= =?UTF-8?q?=E5=AF=B9=E8=B7=AF=E5=BE=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 5 +- css/common.css | 2 +- css/okadmin.css | 10 +- .../okmodules/jquery.contextMenu.css | 0 {lib/layui/css => css}/okmodules/layx.min.css | 0 .../layui/css => css}/okmodules/nprogress.css | 0 .../css => css}/okmodules/toastr.min.css | 0 css/oksub.css | 8 +- index.html | 17 +- indexstatic.html | 14 +- js/initOkmodules.js | 26 ++ js/okadmin.js | 2 +- {lib/layui/lay => js}/okmodules/jqprint.js | 0 {lib/layui/lay => js}/okmodules/okAddlink.js | 0 {lib/layui/lay => js}/okmodules/okBarcode.js | 0 .../lay => js}/okmodules/okContextMenu.js | 0 {lib/layui/lay => js}/okmodules/okCookie.js | 0 {lib/layui/lay => js}/okmodules/okCountUp.js | 0 {lib/layui/lay => js}/okmodules/okFly.js | 0 {lib/layui/lay => js}/okmodules/okGVerify.js | 0 {lib/layui/lay => js}/okmodules/okHoliday.js | 0 {lib/layui/lay => js}/okmodules/okLayer.js | 0 {lib/layui/lay => js}/okmodules/okLayx.js | 4 +- {lib/layui/lay => js}/okmodules/okMd5.js | 0 {lib/layui/lay => js}/okmodules/okMock.js | 0 .../layui/lay => js}/okmodules/okNprogress.js | 4 +- {lib/layui/lay => js}/okmodules/okQrcode.js | 0 .../lay => js}/okmodules/okSweetAlert2.js | 0 {lib/layui/lay => js}/okmodules/okTab.js | 0 {lib/layui/lay => js}/okmodules/okToastr.js | 4 +- {lib/layui/lay => js}/okmodules/okUtils.js | 0 {lib/layui/lay => js}/okmodules/qrcode.js | 0 lib/layui-v2.6.8/layui/css/layui.css | 1 + lib/layui-v2.6.8/layui/css/modules/code.css | 1 + .../css/modules/laydate/default/laydate.css | 1 + .../css/modules/layer/default/icon-ext.png | Bin .../layui/css/modules/layer/default/icon.png | Bin .../layui/css/modules/layer/default/layer.css | 1 + .../css/modules/layer/default/loading-0.gif | Bin .../css/modules/layer/default/loading-1.gif | Bin .../css/modules/layer/default/loading-2.gif | Bin .../layui/font/iconfont.eot | Bin .../layui/font/iconfont.svg | 0 .../layui/font/iconfont.ttf | Bin .../layui/font/iconfont.woff | Bin .../layui/font/iconfont.woff2 | Bin lib/layui-v2.6.8/layui/layui.js | 5 + lib/layui-v2.6.8/test.html | 102 ++++++ lib/layui-v2.6.8/免责声明.url | 6 + lib/layui/css/layui.css | 2 - lib/layui/css/layui.mobile.css | 2 - lib/layui/css/modules/code.css | 2 - .../css/modules/laydate/default/laydate.css | 2 - lib/layui/css/modules/layer/default/layer.css | 2 - lib/layui/images/face/0.gif | Bin 2689 -> 0 bytes lib/layui/images/face/1.gif | Bin 5514 -> 0 bytes lib/layui/images/face/10.gif | Bin 2797 -> 0 bytes lib/layui/images/face/11.gif | Bin 4121 -> 0 bytes lib/layui/images/face/12.gif | Bin 3361 -> 0 bytes lib/layui/images/face/13.gif | Bin 7425 -> 0 bytes lib/layui/images/face/14.gif | Bin 2375 -> 0 bytes lib/layui/images/face/15.gif | Bin 1793 -> 0 bytes lib/layui/images/face/16.gif | Bin 6721 -> 0 bytes lib/layui/images/face/17.gif | Bin 4439 -> 0 bytes lib/layui/images/face/18.gif | Bin 3017 -> 0 bytes lib/layui/images/face/19.gif | Bin 3040 -> 0 bytes lib/layui/images/face/2.gif | Bin 3222 -> 0 bytes lib/layui/images/face/20.gif | Bin 5144 -> 0 bytes lib/layui/images/face/21.gif | Bin 5191 -> 0 bytes lib/layui/images/face/22.gif | Bin 9823 -> 0 bytes lib/layui/images/face/23.gif | Bin 3792 -> 0 bytes lib/layui/images/face/24.gif | Bin 8096 -> 0 bytes lib/layui/images/face/25.gif | Bin 3127 -> 0 bytes lib/layui/images/face/26.gif | Bin 3291 -> 0 bytes lib/layui/images/face/27.gif | Bin 4377 -> 0 bytes lib/layui/images/face/28.gif | Bin 2793 -> 0 bytes lib/layui/images/face/29.gif | Bin 4854 -> 0 bytes lib/layui/images/face/3.gif | Bin 4017 -> 0 bytes lib/layui/images/face/30.gif | Bin 2555 -> 0 bytes lib/layui/images/face/31.gif | Bin 2002 -> 0 bytes lib/layui/images/face/32.gif | Bin 3481 -> 0 bytes lib/layui/images/face/33.gif | Bin 2454 -> 0 bytes lib/layui/images/face/34.gif | Bin 3700 -> 0 bytes lib/layui/images/face/35.gif | Bin 1800 -> 0 bytes lib/layui/images/face/36.gif | Bin 2331 -> 0 bytes lib/layui/images/face/37.gif | Bin 1513 -> 0 bytes lib/layui/images/face/38.gif | Bin 3615 -> 0 bytes lib/layui/images/face/39.gif | Bin 6495 -> 0 bytes lib/layui/images/face/4.gif | Bin 5689 -> 0 bytes lib/layui/images/face/40.gif | Bin 3154 -> 0 bytes lib/layui/images/face/41.gif | Bin 3644 -> 0 bytes lib/layui/images/face/42.gif | Bin 5305 -> 0 bytes lib/layui/images/face/43.gif | Bin 2674 -> 0 bytes lib/layui/images/face/44.gif | Bin 4126 -> 0 bytes lib/layui/images/face/45.gif | Bin 3417 -> 0 bytes lib/layui/images/face/46.gif | Bin 3007 -> 0 bytes lib/layui/images/face/47.gif | Bin 2333 -> 0 bytes lib/layui/images/face/48.gif | Bin 2689 -> 0 bytes lib/layui/images/face/49.gif | Bin 2315 -> 0 bytes lib/layui/images/face/5.gif | Bin 4567 -> 0 bytes lib/layui/images/face/50.gif | Bin 5866 -> 0 bytes lib/layui/images/face/51.gif | Bin 2785 -> 0 bytes lib/layui/images/face/52.gif | Bin 777 -> 0 bytes lib/layui/images/face/53.gif | Bin 2127 -> 0 bytes lib/layui/images/face/54.gif | Bin 2196 -> 0 bytes lib/layui/images/face/55.gif | Bin 1971 -> 0 bytes lib/layui/images/face/56.gif | Bin 2034 -> 0 bytes lib/layui/images/face/57.gif | Bin 2705 -> 0 bytes lib/layui/images/face/58.gif | Bin 2258 -> 0 bytes lib/layui/images/face/59.gif | Bin 10311 -> 0 bytes lib/layui/images/face/6.gif | Bin 2213 -> 0 bytes lib/layui/images/face/60.gif | Bin 3245 -> 0 bytes lib/layui/images/face/61.gif | Bin 2495 -> 0 bytes lib/layui/images/face/62.gif | Bin 2017 -> 0 bytes lib/layui/images/face/63.gif | Bin 5871 -> 0 bytes lib/layui/images/face/64.gif | Bin 6448 -> 0 bytes lib/layui/images/face/65.gif | Bin 3576 -> 0 bytes lib/layui/images/face/66.gif | Bin 3029 -> 0 bytes lib/layui/images/face/67.gif | Bin 2701 -> 0 bytes lib/layui/images/face/68.gif | Bin 1424 -> 0 bytes lib/layui/images/face/69.gif | Bin 2431 -> 0 bytes lib/layui/images/face/7.gif | Bin 3398 -> 0 bytes lib/layui/images/face/70.gif | Bin 4590 -> 0 bytes lib/layui/images/face/71.gif | Bin 5304 -> 0 bytes lib/layui/images/face/8.gif | Bin 4050 -> 0 bytes lib/layui/images/face/9.gif | Bin 4221 -> 0 bytes lib/layui/lay/modules/carousel.js | 2 - lib/layui/lay/modules/code.js | 2 - lib/layui/lay/modules/colorpicker.js | 2 - lib/layui/lay/modules/element.js | 2 - lib/layui/lay/modules/flow.js | 2 - lib/layui/lay/modules/form.js | 2 - lib/layui/lay/modules/jquery.js | 5 - lib/layui/lay/modules/laydate.js | 2 - lib/layui/lay/modules/layedit.js | 2 - lib/layui/lay/modules/layer.js | 2 - lib/layui/lay/modules/laypage.js | 2 - lib/layui/lay/modules/laytpl.js | 2 - lib/layui/lay/modules/mobile.js | 2 - lib/layui/lay/modules/rate.js | 2 - lib/layui/lay/modules/slider.js | 2 - lib/layui/lay/modules/table.js | 2 - lib/layui/lay/modules/transfer.js | 2 - lib/layui/lay/modules/tree.js | 2 - lib/layui/lay/modules/upload.js | 2 - lib/layui/lay/modules/util.js | 2 - lib/layui/layui.all.js | 5 - lib/layui/layui.js | 322 ------------------ pages/chart/chart-area.html | 23 +- pages/chart/chart-china.html | 13 +- pages/chart/chart1.html | 6 +- pages/chart/chart2.html | 6 +- pages/chart/chart3.html | 6 +- pages/chart/chart4.html | 6 +- pages/chart/chart5.html | 4 +- pages/chart/chart6.html | 6 +- pages/console.html | 13 +- pages/console1.html | 13 +- pages/datatable/bsgrid.html | 15 +- pages/datatable/datatables.html | 7 +- pages/forget.html | 9 +- pages/help/nav_icon.html | 5 +- pages/help/nav_operate.html | 5 +- pages/help/nav_parameter.html | 5 +- pages/help/okFly.html | 5 +- pages/help/okLayer.html | 5 +- pages/help/okUtils.html | 5 +- pages/help/ok_font.html | 6 +- pages/help/plug_directory.html | 5 +- pages/help/test.html | 5 +- pages/login.html | 5 +- pages/member/permission-list.html | 7 +- pages/member/role-insert.html | 7 +- pages/member/role-list.html | 7 +- pages/member/role-update.html | 7 +- pages/member/user-info.html | 7 +- pages/member/user-insert.html | 7 +- pages/member/user-list.html | 7 +- pages/member/user-pwd.html | 7 +- pages/member/user-update.html | 7 +- pages/often/article-add.html | 7 +- pages/often/article-edit.html | 7 +- pages/often/article.html | 7 +- pages/often/bbs.html | 7 +- pages/often/download.html | 7 +- pages/often/form-complex1.html | 7 +- pages/often/form-complex2.html | 7 +- pages/often/image.html | 7 +- pages/often/link.html | 7 +- pages/often/message.html | 7 +- pages/often/product.html | 7 +- pages/often/task.html | 7 +- pages/other/donate.html | 9 +- pages/register.html | 7 +- pages/system/alertSkin.html | 5 +- pages/system/log.html | 5 +- pages/system/setting.html | 8 +- pages/system/setup.html | 5 +- pages/system/shield.html | 5 +- pages/tripartite/countup.html | 7 +- pages/tripartite/cropper.html | 7 +- pages/tripartite/jqprint.html | 7 +- pages/tripartite/okAnimate.html | 5 +- pages/tripartite/okBarcode.html | 5 +- pages/tripartite/okCookie.html | 5 +- pages/tripartite/okLayx.html | 5 +- pages/tripartite/okMd5.html | 5 +- pages/tripartite/okNprogress.html | 5 +- pages/tripartite/okSweetAlert2.html | 5 +- pages/tripartite/okToastr.html | 5 +- pages/tripartite/qrcode.html | 5 +- pages/txtedit/CKEditor.html | 2 +- pages/txtedit/layedit.html | 5 +- pages/txtedit/wangEditor.html | 2 +- 214 files changed, 431 insertions(+), 606 deletions(-) rename {lib/layui/css => css}/okmodules/jquery.contextMenu.css (100%) rename {lib/layui/css => css}/okmodules/layx.min.css (100%) rename {lib/layui/css => css}/okmodules/nprogress.css (100%) rename {lib/layui/css => css}/okmodules/toastr.min.css (100%) create mode 100644 js/initOkmodules.js rename {lib/layui/lay => js}/okmodules/jqprint.js (100%) rename {lib/layui/lay => js}/okmodules/okAddlink.js (100%) rename {lib/layui/lay => js}/okmodules/okBarcode.js (100%) rename {lib/layui/lay => js}/okmodules/okContextMenu.js (100%) rename {lib/layui/lay => js}/okmodules/okCookie.js (100%) rename {lib/layui/lay => js}/okmodules/okCountUp.js (100%) rename {lib/layui/lay => js}/okmodules/okFly.js (100%) rename {lib/layui/lay => js}/okmodules/okGVerify.js (100%) rename {lib/layui/lay => js}/okmodules/okHoliday.js (100%) rename {lib/layui/lay => js}/okmodules/okLayer.js (100%) rename {lib/layui/lay => js}/okmodules/okLayx.js (99%) rename {lib/layui/lay => js}/okmodules/okMd5.js (100%) rename {lib/layui/lay => js}/okmodules/okMock.js (100%) rename {lib/layui/lay => js}/okmodules/okNprogress.js (99%) rename {lib/layui/lay => js}/okmodules/okQrcode.js (100%) rename {lib/layui/lay => js}/okmodules/okSweetAlert2.js (100%) rename {lib/layui/lay => js}/okmodules/okTab.js (100%) rename {lib/layui/lay => js}/okmodules/okToastr.js (99%) rename {lib/layui/lay => js}/okmodules/okUtils.js (100%) rename {lib/layui/lay => js}/okmodules/qrcode.js (100%) create mode 100644 lib/layui-v2.6.8/layui/css/layui.css create mode 100644 lib/layui-v2.6.8/layui/css/modules/code.css create mode 100644 lib/layui-v2.6.8/layui/css/modules/laydate/default/laydate.css rename lib/{ => layui-v2.6.8}/layui/css/modules/layer/default/icon-ext.png (100%) rename lib/{ => layui-v2.6.8}/layui/css/modules/layer/default/icon.png (100%) create mode 100644 lib/layui-v2.6.8/layui/css/modules/layer/default/layer.css rename lib/{ => layui-v2.6.8}/layui/css/modules/layer/default/loading-0.gif (100%) rename lib/{ => layui-v2.6.8}/layui/css/modules/layer/default/loading-1.gif (100%) rename lib/{ => layui-v2.6.8}/layui/css/modules/layer/default/loading-2.gif (100%) rename lib/{ => layui-v2.6.8}/layui/font/iconfont.eot (100%) rename lib/{ => layui-v2.6.8}/layui/font/iconfont.svg (100%) rename lib/{ => layui-v2.6.8}/layui/font/iconfont.ttf (100%) rename lib/{ => layui-v2.6.8}/layui/font/iconfont.woff (100%) rename lib/{ => layui-v2.6.8}/layui/font/iconfont.woff2 (100%) create mode 100644 lib/layui-v2.6.8/layui/layui.js create mode 100644 lib/layui-v2.6.8/test.html create mode 100644 lib/layui-v2.6.8/免责声明.url delete mode 100644 lib/layui/css/layui.css delete mode 100644 lib/layui/css/layui.mobile.css delete mode 100644 lib/layui/css/modules/code.css delete mode 100644 lib/layui/css/modules/laydate/default/laydate.css delete mode 100644 lib/layui/css/modules/layer/default/layer.css delete mode 100644 lib/layui/images/face/0.gif delete mode 100644 lib/layui/images/face/1.gif delete mode 100644 lib/layui/images/face/10.gif delete mode 100644 lib/layui/images/face/11.gif delete mode 100644 lib/layui/images/face/12.gif delete mode 100644 lib/layui/images/face/13.gif delete mode 100644 lib/layui/images/face/14.gif delete mode 100644 lib/layui/images/face/15.gif delete mode 100644 lib/layui/images/face/16.gif delete mode 100644 lib/layui/images/face/17.gif delete mode 100644 lib/layui/images/face/18.gif delete mode 100644 lib/layui/images/face/19.gif delete mode 100644 lib/layui/images/face/2.gif delete mode 100644 lib/layui/images/face/20.gif delete mode 100644 lib/layui/images/face/21.gif delete mode 100644 lib/layui/images/face/22.gif delete mode 100644 lib/layui/images/face/23.gif delete mode 100644 lib/layui/images/face/24.gif delete mode 100644 lib/layui/images/face/25.gif delete mode 100644 lib/layui/images/face/26.gif delete mode 100644 lib/layui/images/face/27.gif delete mode 100644 lib/layui/images/face/28.gif delete mode 100644 lib/layui/images/face/29.gif delete mode 100644 lib/layui/images/face/3.gif delete mode 100644 lib/layui/images/face/30.gif delete mode 100644 lib/layui/images/face/31.gif delete mode 100644 lib/layui/images/face/32.gif delete mode 100644 lib/layui/images/face/33.gif delete mode 100644 lib/layui/images/face/34.gif delete mode 100644 lib/layui/images/face/35.gif delete mode 100644 lib/layui/images/face/36.gif delete mode 100644 lib/layui/images/face/37.gif delete mode 100644 lib/layui/images/face/38.gif delete mode 100644 lib/layui/images/face/39.gif delete mode 100644 lib/layui/images/face/4.gif delete mode 100644 lib/layui/images/face/40.gif delete mode 100644 lib/layui/images/face/41.gif delete mode 100644 lib/layui/images/face/42.gif delete mode 100644 lib/layui/images/face/43.gif delete mode 100644 lib/layui/images/face/44.gif delete mode 100644 lib/layui/images/face/45.gif delete mode 100644 lib/layui/images/face/46.gif delete mode 100644 lib/layui/images/face/47.gif delete mode 100644 lib/layui/images/face/48.gif delete mode 100644 lib/layui/images/face/49.gif delete mode 100644 lib/layui/images/face/5.gif delete mode 100644 lib/layui/images/face/50.gif delete mode 100644 lib/layui/images/face/51.gif delete mode 100644 lib/layui/images/face/52.gif delete mode 100644 lib/layui/images/face/53.gif delete mode 100644 lib/layui/images/face/54.gif delete mode 100644 lib/layui/images/face/55.gif delete mode 100644 lib/layui/images/face/56.gif delete mode 100644 lib/layui/images/face/57.gif delete mode 100644 lib/layui/images/face/58.gif delete mode 100644 lib/layui/images/face/59.gif delete mode 100644 lib/layui/images/face/6.gif delete mode 100644 lib/layui/images/face/60.gif delete mode 100644 lib/layui/images/face/61.gif delete mode 100644 lib/layui/images/face/62.gif delete mode 100644 lib/layui/images/face/63.gif delete mode 100644 lib/layui/images/face/64.gif delete mode 100644 lib/layui/images/face/65.gif delete mode 100644 lib/layui/images/face/66.gif delete mode 100644 lib/layui/images/face/67.gif delete mode 100644 lib/layui/images/face/68.gif delete mode 100644 lib/layui/images/face/69.gif delete mode 100644 lib/layui/images/face/7.gif delete mode 100644 lib/layui/images/face/70.gif delete mode 100644 lib/layui/images/face/71.gif delete mode 100644 lib/layui/images/face/8.gif delete mode 100644 lib/layui/images/face/9.gif delete mode 100644 lib/layui/lay/modules/carousel.js delete mode 100644 lib/layui/lay/modules/code.js delete mode 100644 lib/layui/lay/modules/colorpicker.js delete mode 100644 lib/layui/lay/modules/element.js delete mode 100644 lib/layui/lay/modules/flow.js delete mode 100644 lib/layui/lay/modules/form.js delete mode 100644 lib/layui/lay/modules/jquery.js delete mode 100644 lib/layui/lay/modules/laydate.js delete mode 100644 lib/layui/lay/modules/layedit.js delete mode 100644 lib/layui/lay/modules/layer.js delete mode 100644 lib/layui/lay/modules/laypage.js delete mode 100644 lib/layui/lay/modules/laytpl.js delete mode 100644 lib/layui/lay/modules/mobile.js delete mode 100644 lib/layui/lay/modules/rate.js delete mode 100644 lib/layui/lay/modules/slider.js delete mode 100644 lib/layui/lay/modules/table.js delete mode 100644 lib/layui/lay/modules/transfer.js delete mode 100644 lib/layui/lay/modules/tree.js delete mode 100644 lib/layui/lay/modules/upload.js delete mode 100644 lib/layui/lay/modules/util.js delete mode 100644 lib/layui/layui.all.js delete mode 100644 lib/layui/layui.js diff --git a/.gitignore b/.gitignore index a1c1735..14c8ba0 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ -# 忽略.idea目录及其子目录、子文件 +# 忽略.idea目录及其子目录、子文件 .idea/ -node_modules/ \ No newline at end of file +node_modules/ +*.htaccess diff --git a/css/common.css b/css/common.css index cc8032b..671326c 100644 --- a/css/common.css +++ b/css/common.css @@ -1,4 +1,4 @@ -@import "../lib/fonts/iconfont.css"; +@import "/lib/fonts/iconfont.css"; /*html{ webkit-filter: grayscale(100%); -moz-filter: grayscale(100%); diff --git a/css/okadmin.css b/css/okadmin.css index 3b12091..c925eff 100644 --- a/css/okadmin.css +++ b/css/okadmin.css @@ -1,8 +1,8 @@ -@import "../lib/layui/css/layui.css"; -@import "../lib/fonts/iconfont.css"; -@import "./okadmin.theme.css"; -@import "./okadmin.animate.css"; -@import "../lib/layui/css/okmodules/jquery.contextMenu.css"; +@import "/lib/layui-v2.6.8/layui/css/layui.css"; +@import "/lib/fonts/iconfont.css"; +@import "/css/okadmin.theme.css"; +@import "/css/okadmin.animate.css"; +@import "/css/okmodules/jquery.contextMenu.css"; /*html{ webkit-filter: grayscale(100%); diff --git a/lib/layui/css/okmodules/jquery.contextMenu.css b/css/okmodules/jquery.contextMenu.css similarity index 100% rename from lib/layui/css/okmodules/jquery.contextMenu.css rename to css/okmodules/jquery.contextMenu.css diff --git a/lib/layui/css/okmodules/layx.min.css b/css/okmodules/layx.min.css similarity index 100% rename from lib/layui/css/okmodules/layx.min.css rename to css/okmodules/layx.min.css diff --git a/lib/layui/css/okmodules/nprogress.css b/css/okmodules/nprogress.css similarity index 100% rename from lib/layui/css/okmodules/nprogress.css rename to css/okmodules/nprogress.css diff --git a/lib/layui/css/okmodules/toastr.min.css b/css/okmodules/toastr.min.css similarity index 100% rename from lib/layui/css/okmodules/toastr.min.css rename to css/okmodules/toastr.min.css diff --git a/css/oksub.css b/css/oksub.css index d0306f3..8996b96 100644 --- a/css/oksub.css +++ b/css/oksub.css @@ -1,7 +1,7 @@ -@import "../css/common.css"; -@import "../lib/layui/css/layui.css"; -@import "okadmin.animate.css"; -@import "../lib/loading/okLoading.css"; +@import "/css/common.css"; +@import "/lib/layui-v2.6.8/layui/css/layui.css"; +@import "/css/okadmin.animate.css"; +@import "/lib/loading/okLoading.css"; /**控制台样式*/ .console .map-body{height:360px} diff --git a/index.html b/index.html index 99c26bf..1ee57f9 100644 --- a/index.html +++ b/index.html @@ -7,11 +7,11 @@ - - - - - + + + + +
@@ -218,8 +218,9 @@ - - - + + + +