diff --git a/js/okconfig.js b/js/okconfig.js
index ca98093..c5a2a4a 100644
--- a/js/okconfig.js
+++ b/js/okconfig.js
@@ -1,6 +1,10 @@
var okConfig = {
- theme: "blue_theme", //主题色orange_theme|blue_theme
- menuArrow: "ok-arrow2", //导航箭头ok-arrow2|ok-arrow3,不填为默认样式
- isTabMenu: true, //刷新后是否记住上次打开tab菜单
- isTabRefresh: false, //是否开启切换刷新
-};
\ No newline at end of file
+ // 主题色orange_theme|blue_theme
+ theme: "blue_theme",
+ // 导航箭头ok-arrow2|ok-arrow3,不填为默认样式
+ menuArrow: "ok-arrow2",
+ //刷新后是否记住上次打开tab菜单
+ isTabMenu: true,
+ // 是否开启切换刷新
+ isTabRefresh: false
+};
diff --git a/lib/loading/okLoading.js b/lib/loading/okLoading.js
index 870fa11..0f66f04 100644
--- a/lib/loading/okLoading.js
+++ b/lib/loading/okLoading.js
@@ -1,53 +1,52 @@
var ok_load_options = {
- time: 1000,
- content: "ok-admin..."
+ time: 1000,
+ content: "ok-admin..."
};
!function (content, options) {
- var load_config = localStorage.getItem("okConfig") || window.okConfig || {};
+ var load_config = localStorage.getItem("okConfig") || window.okConfig || {};
- if (typeof load_config == "string") {
- load_config = JSON.parse(load_config);
- }
+ if (typeof load_config == "string") {
+ load_config = JSON.parse(load_config);
+ }
- function templateFun(options) {
- return "
" +
- "
" +
- "" +
- "
" +
- "
";
- }
+ function templateFun(options) {
+ return "" +
+ "
" +
+ "" +
+ "
" +
+ "
";
+ }
- function headerInit(content, options) {
- options = options || {};
- if (typeof content == "string") {
- options["content"] = content || ok_load_options.content;
- } else if (typeof content == "object") {
- options = content;
- }
- options.time = options.time || ok_load_options.time;
- options.content = options.content || ok_load_options.content;
- return options;
- }
+ function headerInit(content, options) {
+ options = options || {};
+ if (typeof content == "string") {
+ options["content"] = content || ok_load_options.content;
+ } else if (typeof content == "object") {
+ options = content;
+ }
+ options.time = options.time || ok_load_options.time;
+ options.content = options.content || ok_load_options.content;
+ return options;
+ }
- ok_load_options = headerInit(content, options);
- var template = templateFun(ok_load_options);
- document.writeln(template);
+ ok_load_options = headerInit(content, options);
+ var template = templateFun(ok_load_options);
+ document.writeln(template);
}();
var okLoading = {
- close: function (time, dom) {
- time = time || ok_load_options.time;
- dom = dom || document.getElementsByClassName("ok-loading")[0];
- var setTime1 = setTimeout(function () {
- clearTimeout(setTime1);
- dom.classList.add("close");
- var setTime2 = setTimeout(function () {
- clearTimeout(setTime2);
- dom.parentNode.removeChild(dom);/**删除当前节点*/
- }, 800);
- }, time);
- }
+ close: function (time, dom) {
+ time = time || ok_load_options.time;
+ dom = dom || document.getElementsByClassName("ok-loading")[0];
+ var setTime1 = setTimeout(function () {
+ clearTimeout(setTime1);
+ dom.classList.add("close");
+ var setTime2 = setTimeout(function () {
+ clearTimeout(setTime2);
+ // 删除当前节点
+ dom.parentNode.removeChild(dom);
+ }, 800);
+ }, time);
+ }
};
-
-
diff --git a/pages/member/user-list.html b/pages/member/user-list.html
index fdb2531..59cd664 100644
--- a/pages/member/user-list.html
+++ b/pages/member/user-list.html
@@ -98,6 +98,7 @@
laydate.render({elem: "#startTime", type: "datetime"});
laydate.render({elem: "#endTime", type: "datetime"});
+
let userTable = table.render({
elem: '#tableId',
url: okMock.api.listUser,
@@ -252,7 +253,7 @@
-
+
+