diff --git a/app/admin/view/admin/add.html b/app/admin/view/admin/add.html index 814a181..68bf694 100644 --- a/app/admin/view/admin/add.html +++ b/app/admin/view/admin/add.html @@ -175,10 +175,7 @@ let callback = function (e) { layer.msg(e.msg); if (e.code == 0) { - parent.layui.pageTable.reload(); - setTimeout(function () { - parent.layui.tool.close(); - }, 1000); + parent.layui.tool.close(1000); } } tool.post("/admin/admin/add", data.field, callback); diff --git a/app/admin/view/conf/add.html b/app/admin/view/conf/add.html index 678bb0f..18ebd0e 100644 --- a/app/admin/view/conf/add.html +++ b/app/admin/view/conf/add.html @@ -62,10 +62,7 @@ let callback = function (e) { layer.msg(e.msg); if (e.code == 0) { - parent.layui.pageTable.reload(); - setTimeout(function () { - parent.layui.tool.close(); - }, 1000); + parent.layui.tool.close(1000); } } tool.post("/admin/conf/add", data.field, callback); diff --git a/app/admin/view/conf/email.html b/app/admin/view/conf/email.html index 97d3147..489a999 100644 --- a/app/admin/view/conf/email.html +++ b/app/admin/view/conf/email.html @@ -100,9 +100,7 @@ let callback = function (e) { layer.msg(e.msg); if (e.code == 0) { - setTimeout(function () { - parent.layui.tool.close(); - }, 1000); + parent.layui.tool.close(1000); } } tool.post("/admin/conf/edit", data.field, callback); diff --git a/app/admin/view/conf/other.html b/app/admin/view/conf/other.html index d31cc9a..8acaaeb 100644 --- a/app/admin/view/conf/other.html +++ b/app/admin/view/conf/other.html @@ -58,9 +58,7 @@ let callback = function (e) { layer.msg(e.msg); if (e.code == 0) { - setTimeout(function () { - parent.layui.tool.close(); - }, 1000); + parent.layui.tool.close(1000); } } tool.post("/admin/conf/edit", data.field, callback); diff --git a/app/admin/view/conf/token.html b/app/admin/view/conf/token.html index a736895..0e4e7f2 100644 --- a/app/admin/view/conf/token.html +++ b/app/admin/view/conf/token.html @@ -60,9 +60,7 @@ let callback = function (e) { layer.msg(e.msg); if (e.code == 0) { - setTimeout(function () { - parent.layui.tool.close(); - }, 1000); + parent.layui.tool.close(1000); } } tool.post("/admin/conf/edit", data.field, callback); diff --git a/app/admin/view/conf/web.html b/app/admin/view/conf/web.html index f1d64df..b8ded04 100644 --- a/app/admin/view/conf/web.html +++ b/app/admin/view/conf/web.html @@ -112,9 +112,7 @@ let callback = function (e) { layer.msg(e.msg); if (e.code == 0) { - setTimeout(function () { - parent.layui.tool.close(); - }, 1000); + parent.layui.tool.close(1000); } } tool.post("/admin/conf/edit", data.field, callback); diff --git a/app/admin/view/conf/wechat.html b/app/admin/view/conf/wechat.html index 4fdb740..b51f699 100644 --- a/app/admin/view/conf/wechat.html +++ b/app/admin/view/conf/wechat.html @@ -93,9 +93,7 @@ let callback = function (e) { layer.msg(e.msg); if (e.code == 0) { - setTimeout(function () { - parent.layui.tool.close(); - }, 1000); + parent.layui.tool.close(1000); } } tool.post("/admin/conf/edit", data.field, callback); diff --git a/app/admin/view/keywords/add.html b/app/admin/view/keywords/add.html index caf2534..e749e5e 100644 --- a/app/admin/view/keywords/add.html +++ b/app/admin/view/keywords/add.html @@ -50,10 +50,7 @@ let callback = function (e) { layer.msg(e.msg); if (e.code == 0) { - parent.layui.pageTable.reload(); - setTimeout(function(){ - parent.layui.tool.close(); - },1000); + parent.layui.tool.close(1000); } } tool.post("/admin/keywords/add", data.field, callback); diff --git a/app/admin/view/links/add.html b/app/admin/view/links/add.html index a8538db..d4719b1 100644 --- a/app/admin/view/links/add.html +++ b/app/admin/view/links/add.html @@ -85,10 +85,7 @@ let callback = function (e) { layer.msg(e.msg); if (e.code == 0) { - parent.layui.pageTable.reload(); - setTimeout(function(){ - parent.layui.tool.close(); - },1000); + parent.layui.tool.close(1000); } } tool.post("/admin/links/add", data.field, callback); diff --git a/app/admin/view/nav/add.html b/app/admin/view/nav/add.html index 612e4a5..a4ac490 100644 --- a/app/admin/view/nav/add.html +++ b/app/admin/view/nav/add.html @@ -51,10 +51,7 @@ let callback = function (e) { layer.msg(e.msg); if (e.code == 0) { - parent.layui.pageTable.reload(); - setTimeout(function(){ - parent.layui.tool.close(); - },1000); + parent.layui.tool.close(1000); } } tool.post("/admin/nav/add", data.field, callback); diff --git a/app/admin/view/role/add.html b/app/admin/view/role/add.html index 4d1e60b..b6b2308 100644 --- a/app/admin/view/role/add.html +++ b/app/admin/view/role/add.html @@ -100,10 +100,7 @@ success: function (e) { layer.msg(e.msg); if (e.code == 0) { - parent.layui.pageTable.reload(); - setTimeout(function(){ - parent.layui.tool.close(); - },1000); + parent.layui.tool.close(1000); } } }); diff --git a/app/admin/view/sitemap/add.html b/app/admin/view/sitemap/add.html index dd29e90..8c62038 100644 --- a/app/admin/view/sitemap/add.html +++ b/app/admin/view/sitemap/add.html @@ -35,10 +35,7 @@ let callback = function (e) { layer.msg(e.msg); if (e.code == 0) { - parent.layui.pageTable.reload(); - setTimeout(function(){ - parent.layui.tool.close(); - },1000); + parent.layui.tool.close(1000); } } tool.post("/admin/sitemap/add", data.field, callback); diff --git a/app/admin/view/sitemap/sitemap_info_add.html b/app/admin/view/sitemap/sitemap_info_add.html index cce71e3..baa5051 100644 --- a/app/admin/view/sitemap/sitemap_info_add.html +++ b/app/admin/view/sitemap/sitemap_info_add.html @@ -100,10 +100,7 @@ let callback = function (e) { layer.msg(e.msg); if (e.code == 0) { - parent.layui.pageTable.reload(); - setTimeout(function(){ - parent.layui.tool.close(); - },1000); + parent.layui.tool.close(1000); } } tool.post("/admin/sitemap/sitemap_info_add", data.field, callback); diff --git a/app/admin/view/slide/add.html b/app/admin/view/slide/add.html index d2f1bdf..1ed65c5 100644 --- a/app/admin/view/slide/add.html +++ b/app/admin/view/slide/add.html @@ -52,10 +52,7 @@ let callback = function (e) { layer.msg(e.msg); if (e.code == 0) { - parent.layui.pageTable.reload(); - setTimeout(function(){ - parent.layui.tool.close(); - },1000); + parent.layui.tool.close(1000); } } tool.post("/admin/slide/add", data.field, callback); diff --git a/app/admin/view/slide/slide_info_add.html b/app/admin/view/slide/slide_info_add.html index 95cd667..08702cd 100644 --- a/app/admin/view/slide/slide_info_add.html +++ b/app/admin/view/slide/slide_info_add.html @@ -93,10 +93,7 @@ let callback = function (e) { layer.msg(e.msg); if (e.code == 0) { - parent.layui.pageTable.reload(); - setTimeout(function () { - parent.layui.tool.close(); - }, 1000); + parent.layui.tool.close(1000); } } tool.post("/admin/slide/slide_info_add", data.field, callback); diff --git a/app/admin/view/user/edit.html b/app/admin/view/user/edit.html index 9a66088..d1b1130 100644 --- a/app/admin/view/user/edit.html +++ b/app/admin/view/user/edit.html @@ -86,10 +86,7 @@ let callback = function (e) { layer.msg(e.msg); if (e.code == 0) { - parent.layui.pageTable.reload(); - setTimeout(function () { - parent.layui.tool.close(); - }, 1000); + parent.layui.tool.close(1000); } } tool.post("/admin/user/edit", data.field, callback); diff --git a/public/static/assets/gougu/module/tool.js b/public/static/assets/gougu/module/tool.js index ab5e46e..442c85b 100644 --- a/public/static/assets/gougu/module/tool.js +++ b/public/static/assets/gougu/module/tool.js @@ -2,6 +2,7 @@ layui.define([], function (exports) { var MOD_NAME = 'tool'; var tool = { loading: false, + //右侧iframe的方式打开页面，参考勾股CMS、勾股OA side: function (url, width) { var sideWidth = window.innerWidth > 1280 ? '1200px' : '996px'; if (width && width > 0) { @@ -16,7 +17,6 @@ layui.define([], function (exports) { content: url, area: [sideWidth, '100%'], success: function (obj, index) { - console.log(index); if ($('#expressClose').length < 1) { var btn = '
关闭
'; obj.append(btn); @@ -27,6 +27,9 @@ layui.define([], function (exports) { $('body').removeClass('right-open'); $('.layui-anim-rl').remove(); $('.layui-layer-shade').remove(); + if (layui.pageTable) { + layui.pageTable.resize(); + } }) }) $(window).resize(function () { @@ -37,6 +40,7 @@ layui.define([], function (exports) { } }) }, + //右侧ajax请求的方式打开页面参考勾股DEV open: function (url, width) { let that = this; if (that.loading == true) { @@ -44,7 +48,7 @@ layui.define([], function (exports) { } that.loading = true; if (width == 0) { - width = window.innerWidth > 1280 ? '1220px' : '1080px'; + width = window.innerWidth > 1280 ? '1200px' : '996px'; } $.ajax({ url: url, @@ -69,13 +73,10 @@ layui.define([], function (exports) { $('#expressLayer').animate({ 'right': '-100%' }, 100, 'linear', function () { $('#expressLayer').remove(); $('#expressMask').remove(); - if (layui.pageTable) { - layui.pageTable.resize(); - } }) }) $(window).resize(function () { - width = window.innerWidth > 1280 ? '1200' : '1000'; + width = window.innerWidth > 1280 ? '1200' : '996'; $('#expressLayer').width(width); }) } @@ -139,8 +140,18 @@ layui.define([], function (exports) { } }); }, - close: function () { - $('#expressClose').click(); + close: function (delay) { + //延迟关闭，一般是在编辑完页面数据后需要自动关闭页面用到 + if(delay && delay>0){ + setTimeout(function () { + $('#expressClose').click(); + }, delay); + }else{ + $('#expressClose').click(); + } + if (layui.pageTable) { + layui.pageTable.reload(); + } }, ajax: function (options, callback) { var format = 'json';