diff --git a/css/okadmin.css b/css/okadmin.css index 733063e..7e52cfb 100644 --- a/css/okadmin.css +++ b/css/okadmin.css @@ -84,5 +84,10 @@ okToolbar span{float:right;line-height:30px} ::-webkit-scrollbar-corner:vertical{background-color:#535353} ::-webkit-scrollbar-resizer:vertical{background-color:#FF6E00} +/* 公共样式 */ +.tal{text-align:left;} +.tac{text-align:center;} +.tar{text-align:right;} + diff --git a/lib/layui_plugins/okLayer/okLayer.js b/lib/layui_plugins/okLayer/okLayer.js index c00fb98..8155701 100644 --- a/lib/layui_plugins/okLayer/okLayer.js +++ b/lib/layui_plugins/okLayer/okLayer.js @@ -2,10 +2,6 @@ layui.define(["layer"], function (exports) { var $ = layui.jquery; var okLayer = { - // 控制了msg() confirm() open()方法的弹窗皮肤 - skinStyle: 3, - // 控制了msg() confirm() open()方法的弹窗动画 - animStyle: 2, /** * confirm()函数二次封装 * @param content @@ -85,15 +81,21 @@ layui.define(["layer"], function (exports) { * @returns {string} */ skinChoose: function () { - if (okLayer.skinStyle == 1) { + var storage = window.localStorage; + var skin = storage.getItem("skin"); + if (skin == 1) { // 默认皮肤 return ""; - } else if (okLayer.skinStyle == 2) { + } else if (skin == 2) { // 墨绿色 return "layui-layer-molv"; - } else if (okLayer.skinStyle == 3) { + } else if (skin == 3) { // 蓝色 return "layui-layer-lan"; + } else if (skin == 4) { + // 随机颜色 + var skinArray = ["", "layui-layer-molv", "layui-layer-lan"]; + return skinArray[Math.floor(Math.random() * skinArray.length)]; } }, /** @@ -101,12 +103,15 @@ layui.define(["layer"], function (exports) { * @returns {number} */ animChoose: function () { - if (okLayer.animStyle == 1) { - // 默认动画 - return 0; - } else if (okLayer.animStyle == 2) { + var storage = window.localStorage; + var anim = storage.getItem("anim"); + var animArray = ["0", "1", "2", "3", "4", "5", "6"]; + if (animArray.indexOf(anim) > -1) { + // 用户选择的动画 + return anim; + } else if (anim == 7) { // 随机动画 - return Math.floor(Math.random() * 7); + return Math.floor(Math.random() * animArray.length); } } } diff --git a/pages/system/system-setting.html b/pages/system/system-setting.html index 4681f45..f34024b 100644 --- a/pages/system/system-setting.html +++ b/pages/system/system-setting.html @@ -1,10 +1,216 @@ - +
+ 推荐配置:弹窗皮肤(墨绿色),弹窗动画(随机) ++ +