diff --git a/src/admin/templets/ad_add.htm b/src/admin/templets/ad_add.htm index 38cc6731..f856366a 100644 --- a/src/admin/templets/ad_add.htm +++ b/src/admin/templets/ad_add.htm @@ -13,7 +13,7 @@ -
+ diff --git a/src/admin/templets/album_add.htm b/src/admin/templets/album_add.htm index 5c813caf..19004830 100644 --- a/src/admin/templets/album_add.htm +++ b/src/admin/templets/album_add.htm @@ -20,7 +20,7 @@ - + diff --git a/src/admin/templets/album_edit.htm b/src/admin/templets/album_edit.htm index 38080fd7..e9437dd6 100644 --- a/src/admin/templets/album_edit.htm +++ b/src/admin/templets/album_edit.htm @@ -20,7 +20,7 @@ - + diff --git a/src/admin/templets/archives_add.htm b/src/admin/templets/archives_add.htm index c68a7840..817de429 100644 --- a/src/admin/templets/archives_add.htm +++ b/src/admin/templets/archives_add.htm @@ -19,7 +19,7 @@ - + diff --git a/src/admin/templets/archives_edit.htm b/src/admin/templets/archives_edit.htm index 532e6a78..888bd5a4 100644 --- a/src/admin/templets/archives_edit.htm +++ b/src/admin/templets/archives_edit.htm @@ -19,7 +19,7 @@ - + diff --git a/src/admin/templets/archives_sg_add.htm b/src/admin/templets/archives_sg_add.htm index cb77ee38..7ce7a100 100644 --- a/src/admin/templets/archives_sg_add.htm +++ b/src/admin/templets/archives_sg_add.htm @@ -19,7 +19,7 @@ - + diff --git a/src/admin/templets/archives_sg_edit.htm b/src/admin/templets/archives_sg_edit.htm index 6e201535..78a3a812 100644 --- a/src/admin/templets/archives_sg_edit.htm +++ b/src/admin/templets/archives_sg_edit.htm @@ -19,7 +19,7 @@ - + diff --git a/src/admin/templets/article_add.htm b/src/admin/templets/article_add.htm index ac415f41..585e20df 100644 --- a/src/admin/templets/article_add.htm +++ b/src/admin/templets/article_add.htm @@ -19,7 +19,7 @@ - + diff --git a/src/admin/templets/article_edit.htm b/src/admin/templets/article_edit.htm index c2be35f2..387bc50a 100644 --- a/src/admin/templets/article_edit.htm +++ b/src/admin/templets/article_edit.htm @@ -19,7 +19,7 @@ - + diff --git a/src/admin/templets/catalog_add.htm b/src/admin/templets/catalog_add.htm index 3a7a1943..225b6afd 100644 --- a/src/admin/templets/catalog_add.htm +++ b/src/admin/templets/catalog_add.htm @@ -12,7 +12,7 @@ - + diff --git a/src/admin/templets/catalog_edit.htm b/src/admin/templets/catalog_edit.htm index 6f8602fc..9ae25f20 100644 --- a/src/admin/templets/catalog_edit.htm +++ b/src/admin/templets/catalog_edit.htm @@ -12,7 +12,7 @@ - + diff --git a/src/admin/templets/diy_add.htm b/src/admin/templets/diy_add.htm index 148c416f..8241a4a9 100644 --- a/src/admin/templets/diy_add.htm +++ b/src/admin/templets/diy_add.htm @@ -12,7 +12,7 @@ - +
diff --git a/src/admin/templets/diy_edit.htm b/src/admin/templets/diy_edit.htm index 70b3803d..ff670f54 100644 --- a/src/admin/templets/diy_edit.htm +++ b/src/admin/templets/diy_edit.htm @@ -12,7 +12,7 @@ - +
自定义表单管理 - 添加自定义表单
diff --git a/src/admin/templets/freelist_add.htm b/src/admin/templets/freelist_add.htm index fbb6985c..ad41d09a 100644 --- a/src/admin/templets/freelist_add.htm +++ b/src/admin/templets/freelist_add.htm @@ -22,7 +22,7 @@ - +
diff --git a/src/admin/templets/freelist_edit.htm b/src/admin/templets/freelist_edit.htm index 75b45c5e..6a0cef65 100644 --- a/src/admin/templets/freelist_edit.htm +++ b/src/admin/templets/freelist_edit.htm @@ -18,7 +18,7 @@ - +
diff --git a/src/admin/templets/friendlink_add.htm b/src/admin/templets/friendlink_add.htm index 8e18a77f..a1439204 100644 --- a/src/admin/templets/friendlink_add.htm +++ b/src/admin/templets/friendlink_add.htm @@ -12,7 +12,7 @@ - +
diff --git a/src/admin/templets/friendlink_main.htm b/src/admin/templets/friendlink_main.htm index 221af331..84d23bd7 100644 --- a/src/admin/templets/friendlink_main.htm +++ b/src/admin/templets/friendlink_main.htm @@ -35,7 +35,7 @@
-
+ diff --git a/src/admin/templets/media_add.htm b/src/admin/templets/media_add.htm index 70ee77c2..dd57150e 100644 --- a/src/admin/templets/media_add.htm +++ b/src/admin/templets/media_add.htm @@ -12,7 +12,7 @@ - +
diff --git a/src/admin/templets/media_edit.htm b/src/admin/templets/media_edit.htm index 367e1623..634da469 100644 --- a/src/admin/templets/media_edit.htm +++ b/src/admin/templets/media_edit.htm @@ -12,7 +12,7 @@ - + diff --git a/src/admin/templets/member_edit.htm b/src/admin/templets/member_edit.htm index 0a8bbbe4..27aea717 100644 --- a/src/admin/templets/member_edit.htm +++ b/src/admin/templets/member_edit.htm @@ -12,7 +12,7 @@ - +
diff --git a/src/admin/templets/member_toadmin.htm b/src/admin/templets/member_toadmin.htm index 5ea9f90d..ab6f8e05 100644 --- a/src/admin/templets/member_toadmin.htm +++ b/src/admin/templets/member_toadmin.htm @@ -12,7 +12,7 @@ - + diff --git a/src/admin/templets/mytag_add.htm b/src/admin/templets/mytag_add.htm index 7d74e666..38245f04 100644 --- a/src/admin/templets/mytag_add.htm +++ b/src/admin/templets/mytag_add.htm @@ -15,7 +15,7 @@ - +
diff --git a/src/admin/templets/soft_add.htm b/src/admin/templets/soft_add.htm index 79c2f57b..858e5302 100644 --- a/src/admin/templets/soft_add.htm +++ b/src/admin/templets/soft_add.htm @@ -35,7 +35,7 @@ - + diff --git a/src/admin/templets/soft_edit.htm b/src/admin/templets/soft_edit.htm index 2cdc63c8..f952255f 100644 --- a/src/admin/templets/soft_edit.htm +++ b/src/admin/templets/soft_edit.htm @@ -34,7 +34,7 @@ - + diff --git a/src/admin/templets/spec_add.htm b/src/admin/templets/spec_add.htm index 4c5de632..3ad98193 100644 --- a/src/admin/templets/spec_add.htm +++ b/src/admin/templets/spec_add.htm @@ -56,7 +56,7 @@ - + diff --git a/src/admin/templets/spec_edit.htm b/src/admin/templets/spec_edit.htm index 996c7589..b7d9af70 100644 --- a/src/admin/templets/spec_edit.htm +++ b/src/admin/templets/spec_edit.htm @@ -53,7 +53,7 @@ - + diff --git a/src/admin/templets/sys_admin_user_add.htm b/src/admin/templets/sys_admin_user_add.htm index 3b4fdd47..20410843 100644 --- a/src/admin/templets/sys_admin_user_add.htm +++ b/src/admin/templets/sys_admin_user_add.htm @@ -12,7 +12,7 @@ - +
diff --git a/src/admin/templets/sys_data_replace.htm b/src/admin/templets/sys_data_replace.htm index 63baef80..311ff561 100644 --- a/src/admin/templets/sys_data_replace.htm +++ b/src/admin/templets/sys_data_replace.htm @@ -13,7 +13,7 @@ - +
diff --git a/src/admin/templets/templets_one_add.htm b/src/admin/templets/templets_one_add.htm index d18b788d..c1aa84d0 100644 --- a/src/admin/templets/templets_one_add.htm +++ b/src/admin/templets/templets_one_add.htm @@ -12,7 +12,7 @@ - +
diff --git a/src/admin/templets/templets_one_edit.htm b/src/admin/templets/templets_one_edit.htm index f8b10fba..88d52679 100644 --- a/src/admin/templets/templets_one_edit.htm +++ b/src/admin/templets/templets_one_edit.htm @@ -12,7 +12,7 @@ - +
diff --git a/src/admin/templets/vote_add.htm b/src/admin/templets/vote_add.htm index 0ac48b87..4331c4db 100644 --- a/src/admin/templets/vote_add.htm +++ b/src/admin/templets/vote_add.htm @@ -32,7 +32,7 @@ - + diff --git a/src/static/web/js/admin.main.js b/src/static/web/js/admin.main.js index 4726dbe8..9defa8e4 100644 --- a/src/static/web/js/admin.main.js +++ b/src/static/web/js/admin.main.js @@ -230,95 +230,6 @@ function getSelCat(targetId) { HideObj("getCatMap"); ChangeFullDiv("hide"); } -//生成一个随机id -function guid() { - function S4() { - return (((1 + Math.random()) * 0x10000) | 0).toString(16).substring(1); - } - return (S4() + S4() + "-" + S4() + "-" + S4() + "-" + S4() + "-" + S4() + S4() + S4()); -} -var _DedeConfirmFuncs = {}; -var _DedeConfirmFuncsClose = {}; -function __DedeConfirmRun(modalID) { - _DedeConfirmFuncs[modalID](); -} -function __DedeConfirmRunClose(modalID) { - _DedeConfirmFuncsClose[modalID](); -} -function DedeConfirm(content = "", title = "确认提示") { - let modalID = guid(); - return new Promise((resolve, reject) => { - _DedeConfirmFuncs[modalID] = ()=>{ - resolve("success"); - CloseModal(`DedeModal${modalID}`); - } - _DedeConfirmFuncsClose[modalID] = ()=>{ - reject("cancel"); - CloseModal(`DedeModal${modalID}`); - } - let footer = ``; - let modal = ``; - $("body").append(modal) - $("#DedeModal" + modalID).modal({ - backdrop: 'static', - show: true - }); - $("#DedeModal" + modalID).on('hidden.bs.modal', function(e) { - $("#DedeModal" + modalID).remove(); - }) - }) -} -//函数会返回一个modalID，通过这个id可自已定义一些方法，这里用到了一个展开语法：https://developer.mozilla.org/zh-CN/docs/Web/JavaScript/Reference/Operators/Spread_syntax -function ShowMsg(content, ...args) { - title = "系统提示"; - size = ''; - if (typeof content == "undefined") content = ''; - modalID = guid(); - var footer = ``; - var noClose = false; - if (args.length == 1) { - //存在args参数 - if (typeof args[0].title !== 'undefined' && args[0].title != "") { - title = args[0].title; - } - if (typeof args[0].footer !== 'undefined' && args[0].footer != "") { - footer = args[0].footer; - } - if (typeof args[0].size !== 'undefined' && args[0].size != "") { - size = args[0].size; - } - if (typeof args[0].noClose !== 'undefined' && args[0].noClose == true) { - noClose = true; - } - } - footer = footer.replaceAll("~modalID~", modalID); - content = content.replaceAll("~modalID~", modalID); - var modal = ``; - $("body").append(modal) - $("#GKModal" + modalID).modal({ - backdrop: 'static', - show: true - }); - $("#GKModal" + modalID).on('hidden.bs.modal', function(e) { - $("#GKModal" + modalID).remove(); - }) - return modalID; -} -//隐藏并销毁modal -function CloseModal(modalID) { - $("#" + modalID).modal('hide'); - $("#" + modalID).on('hidden.bs.modal', function(e) { - if ($("#" + modalID).length > 0) { - $("#" + modalID).remove(); - } - }) -} //获取缩略图 var litpicImgSrc = ''; var litpicImg = ''; diff --git a/src/static/web/js/style.js b/src/static/web/js/style.js index 854e4c05..d226db28 100644 --- a/src/static/web/js/style.js +++ b/src/static/web/js/style.js @@ -18,93 +18,6 @@ function SetCookie(c_name, value, expiredays) { exdate.setDate(exdate.getDate() + expiredays); document.cookie = c_name + "=" + escape(value) + ((expiredays == null) ? "" : ";expires=" + exdate.toGMTString()); } -//全局消息提示框，生成一个随机id -function guid() { - function S4() { - return (((1 + Math.random()) * 0x10000) | 0).toString(16).substring(1); - } - return (S4() + S4() + "-" + S4() + "-" + S4() + "-" + S4() + "-" + S4() + S4() + S4()); -} -var _DedeConfirmFuncs = {}; -var _DedeConfirmFuncsClose = {}; -function __DedeConfirmRun(modalID) { - _DedeConfirmFuncs[modalID](); -} -function __DedeConfirmRunClose(modalID) { - _DedeConfirmFuncsClose[modalID](); -} -function DedeConfirm(content = "", title = "确认提示") { - let modalID = guid(); - return new Promise((resolve, reject) => { - _DedeConfirmFuncs[modalID] = () => { - resolve("success"); - CloseModal(`DedeModal${modalID}`); - } - _DedeConfirmFuncsClose[modalID] = () => { - reject("cancel"); - CloseModal(`DedeModal${modalID}`); - } - let footer = ``; - let modal = ``; - $("body").append(modal) - $("#DedeModal" + modalID).modal({ - backdrop: 'static', - show: true - }); - $("#DedeModal" + modalID).on('hidden.bs.modal', function(e) { - $("#DedeModal" + modalID).remove(); - }) - }) -} -//函数会返回一个modalID，通过这个id可自已定义一些方法，这里用到了一个展开语法：https://developer.mozilla.org/zh-CN/docs/Web/JavaScript/Reference/Operators/Spread_syntax -function ShowMsg(content, ...args) { - title = "系统提示"; - if (typeof content == "undefined") content = ''; - modalID = guid(); - var footer = ``; - var noClose = false; - if (args.length == 1) { - //存在args参数 - if (typeof args[0].title !== 'undefined' && args[0].title != "") { - title = args[0].title; - } - if (typeof args[0].footer !== 'undefined' && args[0].footer != "") { - footer = args[0].footer; - } - if (typeof args[0].noClose !== 'undefined' && args[0].noClose == true) { - noClose = true; - } - } - String.prototype.replaceAll = function(s1, s2) { - return this.replace(new RegExp(s1, "gm"), s2); - } - footer = footer.replaceAll("~modalID~", modalID); - content = content.replaceAll("~modalID~", modalID); - var modal = ``; - $("body").append(modal) - $("#DedeModal" + modalID).modal({ - backdrop: 'static', - show: true - }); - $("#DedeModal" + modalID).on('hidden.bs.modal', function(e) { - $("#DedeModal" + modalID).remove(); - }) - return modalID; -} -//隐藏并销毁modal -function CloseModal(modalID) { - $("#" + modalID).modal('hide'); - $("#" + modalID).on('hidden.bs.modal', function(e) { - if ($("#" + modalID).length > 0) { - $("#" + modalID).remove(); - } - }) -} //在某个元素内显示alert信息 function ShowAlert(ele, content, type, showtime = 3000) { let msg = ` - 0){?> + 0){?>
diff --git a/src/user/templets/index-notlogin.htm b/src/user/templets/index_notlogin.htm old mode 100755 new mode 100644 similarity index 100% rename from src/user/templets/index-notlogin.htm rename to src/user/templets/index_notlogin.htm diff --git a/src/user/templets/menu.htm b/src/user/templets/menu.htm index c020af93..f7ccba36 100644 --- a/src/user/templets/menu.htm +++ b/src/user/templets/menu.htm @@ -24,7 +24,7 @@ while ($channel = $dsql->GetArray('addmod')) {
    $channel) {?> - +
  • diff --git a/src/user/templets/soft_add.htm b/src/user/templets/soft_add.htm index a7fe0563..55a7f371 100755 --- a/src/user/templets/soft_add.htm +++ b/src/user/templets/soft_add.htm @@ -19,7 +19,7 @@
  • 发布
    • - + diff --git a/src/user/templets/soft_edit.htm b/src/user/templets/soft_edit.htm index c5b52ac5..b4c6751e 100755 --- a/src/user/templets/soft_edit.htm +++ b/src/user/templets/soft_edit.htm @@ -19,7 +19,7 @@
  • 修改
    • - +