diff --git a/css/oksub.css b/css/oksub.css index aa97864..7c3b464 100644 --- a/css/oksub.css +++ b/css/oksub.css @@ -73,17 +73,9 @@ /*响应样式*/ -@media screen and (max-width: 750px) { - /*控制台*/ - .ok-in-hide-md { - display: none !important; - } +@media screen and (max-width:750px){ + .ok-in-hide-md{display:none!important} } - -@media screen and (max-width: 548px) { - /**显隐样式**/ - [ok-pc-in-show], - .ok-in-hide-xs { - display: none !important; - } +@media screen and (max-width:548px){ + .ok-in-hide-xs,[ok-pc-in-show]{display:none!important} } diff --git a/data/navs.json b/data/navs.json index e71db45..4f2aecd 100644 --- a/data/navs.json +++ b/data/navs.json @@ -121,43 +121,43 @@ "children": [ { "title": "文章列表", - "href": "pages/article/article.html", + "href": "pages/often/article.html", "icon": "", "spread": false }, { "title": "留言列表", - "href": "pages/article/article.html", + "href": "pages/often/message.html", "icon": "", "spread": false }, { "title": "产品列表", - "href": "pages/article/article.html", + "href": "pages/often/product.html", "icon": "", "spread": false }, { "title": "下载列表", - "href": "pages/article/article.html", + "href": "pages/often/download.html", "icon": "", "spread": false }, { "title": "链接列表", - "href": "pages/article/article.html", + "href": "pages/often/link.html", "icon": "", "spread": false }, { "title": "任务列表", - "href": "pages/article/article.html", + "href": "pages/often/task.html", "icon": "", "spread": false }, { "title": "图片列表", - "href": "pages/article/article.html", + "href": "pages/often/image.html", "icon": "", "spread": false } diff --git a/lib/layui/lay/okmodules/okMock.js b/lib/layui/lay/okmodules/okMock.js index dbd7b8f..b605df2 100644 --- a/lib/layui/lay/okmodules/okMock.js +++ b/lib/layui/lay/okmodules/okMock.js @@ -9,11 +9,11 @@ layui.define([], function(exprots) { user: { list: "https://www.easy-mock.com/mock/5d5d0dd46cfcbd1b8627bf1d/ok-admin-v2.0/user/list", list2: "https://www.easy-mock.com/mock/5d5d0dd46cfcbd1b8627bf1d/ok-admin-v2.0/user/list2", - batchNormal: "https://easy-mock.com/mock/5d0ce725424f15399a6c2068/okadmin/user/batchNormal", - batchStop: "https://easy-mock.com/mock/5d0ce725424f15399a6c2068/okadmin/user/batchStop", - batchDel: "https://easy-mock.com/mock/5d0ce725424f15399a6c2068/okadmin/user/batchDel", - add: "https://easy-mock.com/mock/5d0ce725424f15399a6c2068/okadmin/user/add", - edit: "https://easy-mock.com/mock/5d0ce725424f15399a6c2068/okadmin/user/edit" + batchNormal: "https://www.easy-mock.com/mock/5d5d0dd46cfcbd1b8627bf1d/ok-admin-v2.0/user/batchNormal", + batchStop: "https://www.easy-mock.com/mock/5d5d0dd46cfcbd1b8627bf1d/ok-admin-v2.0/user/batchStop", + batchDel: "https://www.easy-mock.com/mock/5d5d0dd46cfcbd1b8627bf1d/ok-admin-v2.0/user/batchDel", + add: "https://www.easy-mock.com/mock/5d5d0dd46cfcbd1b8627bf1d/ok-admin-v2.0/user/add", + edit: "https://www.easy-mock.com/mock/5d5d0dd46cfcbd1b8627bf1d/ok-admin-v2.0/user/edit" }, role: { list: "https://www.easy-mock.com/mock/5d5d0dd46cfcbd1b8627bf1d/ok-admin-v2.0/role/list" diff --git a/lib/layui/lay/okmodules/okUtils.js b/lib/layui/lay/okmodules/okUtils.js index 6bcd6a1..124400e 100644 --- a/lib/layui/lay/okmodules/okUtils.js +++ b/lib/layui/lay/okmodules/okUtils.js @@ -35,7 +35,8 @@ layui.define(["layer"], function (exprots) { * @param url * @param type * @param param - * @returns {*|*|*} + * @param load + * @returns {*|never|{always, promise, state, then}} */ ajax: function (url, type, param, load) { var deferred = $.Deferred(); diff --git a/pages/login.html b/pages/login.html index 3c0d218..fd4886a 100644 --- a/pages/login.html +++ b/pages/login.html @@ -68,7 +68,7 @@ * 表单提交 */ form.on("submit(login)", function (data) { - okUtils.ajax(okMock.api.login, "post", data.field).done(function (response) { + okUtils.ajax(okMock.api.login, "post", data.field, true).done(function (response) { console.log(response); okLayer.msg.greenTick(response.msg, function () { window.location = "../index.html"; diff --git a/pages/member/user.html b/pages/member/user.html index 8be531e..ae9afdd 100644 --- a/pages/member/user.html +++ b/pages/member/user.html @@ -58,7 +58,7 @@ size: "sm", cols: [[ {type: "checkbox", fixed: "left"}, - {field: "id", title: "ID", width: 80, sort: true}, + {field: "guid", title: "GUID", width: 280, sort: true}, {field: "username", title: "账号", width: 100}, {field: "password", title: "密码", width: 100}, {field: "reallyName", title: "姓名", width: 100}, @@ -66,9 +66,12 @@ {field: "role", title: "角色", width: 100, templet: "#roleTpl"}, {field: "status", title: "状态", width: 100, templet: "#statusTpl"}, {field: "email", title: "邮箱", width: 200}, + {field: "province", title: "省份", width: 120}, + {field: "city", title: "城市", width: 100}, + {field: "county", title: "区县", width: 120}, {field: "createTime", title: "创建时间", width: 150}, {field: "logins", title: "登陆次数", width: 100}, - {title: "操作", width: 100, templet: "#operationTpl", align: "center", fixed: "right"} + {title: "操作", width: 100, align: "center", fixed: "right", templet: "#operationTpl"} ]], done: function (res, curr, count) { console.info(res, curr, count); @@ -118,7 +121,7 @@ layer.close(index); var idsStr = okUtils.table.batchCheck(table); if (idsStr) { - okUtils.ajax(okUtils.mockApi.user.batchNormal, "put", {idsStr: idsStr}).done(function (response) { + okUtils.ajax(okMock.api.user.batchNormal, "put", {idsStr: idsStr}).done(function (response) { console.log(response); okUtils.table.successMsg("批量启用成功"); }).fail(function (error) { @@ -133,7 +136,7 @@ layer.close(index); var idsStr = okUtils.table.batchCheck(table); if (idsStr) { - okUtils.ajax(okUtils.mockApi.user.batchStop, "put", {idsStr: idsStr}).done(function (response) { + okUtils.ajax(okMock.api.user.batchStop, "put", {idsStr: idsStr}).done(function (response) { console.log(response); okUtils.table.successMsg("批量停用成功"); }).fail(function (error) { @@ -148,7 +151,7 @@ layer.close(index); var idsStr = okUtils.table.batchCheck(table); if (idsStr) { - okUtils.ajax(okUtils.mockApi.user.batchDel, "delete", {idsStr: idsStr}).done(function (response) { + okUtils.ajax(okMock.api.user.batchDel, "delete", {idsStr: idsStr}).done(function (response) { console.log(response); okUtils.table.successMsg("批量删除成功"); }).fail(function (error) { @@ -175,7 +178,7 @@ function del(id) { okLayer.confirm("确定要删除吗?", function () { - okUtils.ajax(okUtils.mockApi.user.batchDel, "delete", {idsStr: id}).done(function (response) { + okUtils.ajax(okMock.api.user.batchDel, "delete", {idsStr: id}).done(function (response) { console.log(response); okUtils.table.successMsg("删除成功"); }).fail(function (error) { diff --git a/pages/article/article-add.html b/pages/often/article-add.html similarity index 100% rename from pages/article/article-add.html rename to pages/often/article-add.html diff --git a/pages/article/article-edit.html b/pages/often/article-edit.html similarity index 100% rename from pages/article/article-edit.html rename to pages/often/article-edit.html diff --git a/pages/article/article.html b/pages/often/article.html similarity index 96% rename from pages/article/article.html rename to pages/often/article.html index 71c3376..f071028 100644 --- a/pages/article/article.html +++ b/pages/often/article.html @@ -59,15 +59,15 @@ toolbar: "#toolbarTpl", size: "sm", cols: [[ - {type: "checkbox"}, - {field: "id", title: "ID", width: 80, sort: true}, + {type: "checkbox", fixed: "left"}, + {field: "guid", title: "GUID", width: 280, sort: true}, {field: "title", title: "标题", width: 350}, {field: "url", title: "链接", width: 250, templet: "#urlTpl"}, - {field: "readSize", title: "阅读量", width: 80}, {field: "publisher", title: "发布者", width: 100}, + {field: "readSize", title: "阅读量", width: 80}, {field: "isTop", title: "是否置顶", width: 100, align: "center", templet: "#topTpl"}, {field: "status", title: "发布状态", width: 110, align: "center", templet: "#statusTpl"}, - {title: "操作", width: 200, align: "center", templet: "#operationTpl"} + {title: "操作", width: 100, align: "center", fixed: "right", templet: "#operationTpl"} ]], done: function (res, curr, count) { console.log(res, curr, count) diff --git a/pages/often/download.html b/pages/often/download.html new file mode 100644 index 0000000..74a2f5e --- /dev/null +++ b/pages/often/download.html @@ -0,0 +1,222 @@ + + + + + 文章列表 + + + + +
+ +
+ + 首页 + 常用页面 + 下载列表 + + + + +
+ +
+ +
+ +
+
+ + + + + + + + + + + + + + + diff --git a/pages/often/image.html b/pages/often/image.html new file mode 100644 index 0000000..7c98df2 --- /dev/null +++ b/pages/often/image.html @@ -0,0 +1,222 @@ + + + + + 文章列表 + + + + +
+ +
+ + 首页 + 常用页面 + 图片列表 + + + + +
+ +
+ +
+ +
+
+ + + + + + + + + + + + + + + diff --git a/pages/often/link.html b/pages/often/link.html new file mode 100644 index 0000000..b2c9163 --- /dev/null +++ b/pages/often/link.html @@ -0,0 +1,222 @@ + + + + + 文章列表 + + + + +
+ +
+ + 首页 + 常用页面 + 链接列表 + + + + +
+ +
+ +
+ +
+
+ + + + + + + + + + + + + + + diff --git a/pages/often/message.html b/pages/often/message.html new file mode 100644 index 0000000..fa2e0a2 --- /dev/null +++ b/pages/often/message.html @@ -0,0 +1,222 @@ + + + + + 文章列表 + + + + +
+ +
+ + 首页 + 常用页面 + 留言列表 + + + + +
+ +
+ +
+ +
+
+ + + + + + + + + + + + + + + diff --git a/pages/often/product.html b/pages/often/product.html new file mode 100644 index 0000000..a8a9a1d --- /dev/null +++ b/pages/often/product.html @@ -0,0 +1,222 @@ + + + + + 文章列表 + + + + +
+ +
+ + 首页 + 常用页面 + 产品列表 + + + + +
+ +
+ +
+ +
+
+ + + + + + + + + + + + + + + diff --git a/pages/often/task.html b/pages/often/task.html new file mode 100644 index 0000000..4879e46 --- /dev/null +++ b/pages/often/task.html @@ -0,0 +1,222 @@ + + + + + 文章列表 + + + + +
+ +
+ + 首页 + 常用页面 + 任务列表 + + + + +
+ +
+ +
+ +
+
+ + + + + + + + + + + + + + +