From f349a505e76ef51101ea38f330e954dd676b2b74 Mon Sep 17 00:00:00 2001 From: xushubieli Date: Wed, 27 Apr 2022 14:23:14 +0800 Subject: [PATCH 1/2] admin --- src/admin/templets/adtype_main.htm | 18 +- src/admin/templets/cards_make.htm | 14 +- src/admin/templets/cards_type.htm | 14 +- src/admin/templets/catalog_add.htm | 186 +++++++++--------- src/admin/templets/catalog_edit.htm | 170 ++++++++-------- src/admin/templets/content_s_list.htm | 174 ++++++++-------- src/admin/templets/content_tj.htm | 46 ++--- src/admin/templets/diy_edit_content.htm | 58 +++--- src/admin/templets/diy_field_add.htm | 100 +++++----- src/admin/templets/diy_field_edit.htm | 70 +++---- src/admin/templets/diy_post.htm | 12 +- src/admin/templets/member_view.htm | 44 ++--- src/admin/templets/module_edit.htm | 48 ++--- src/admin/templets/mychannel_field_add.htm | 134 ++++++------- src/admin/templets/mytag_add.htm | 2 - src/admin/templets/mytag_tag_guide_ok.htm | 2 +- src/admin/templets/shops_operations_cart.htm | 2 +- .../templets/shops_operations_userinfo.htm | 1 - src/admin/templets/stepselect_main.htm | 20 +- src/admin/templets/stepselect_showajax.htm | 61 +++--- src/admin/templets/sys_info_pay.htm | 183 ----------------- src/admin/templets/sys_payment.htm | 14 +- src/admin/templets/sys_safetest.htm | 40 ++-- src/admin/templets/templets_one.htm | 22 +-- src/admin/templets/templets_tagsource.htm | 26 +-- src/admin/templets/update_guide_getlist.htm | 18 +- src/admin/templets/vote_edit.htm | 3 +- src/admin/templets/winmode.htm | 8 +- 28 files changed, 642 insertions(+), 848 deletions(-) delete mode 100644 src/admin/templets/sys_info_pay.htm diff --git a/src/admin/templets/adtype_main.htm b/src/admin/templets/adtype_main.htm index 38f667d1..126e47fd 100644 --- a/src/admin/templets/adtype_main.htm +++ b/src/admin/templets/adtype_main.htm @@ -20,21 +20,21 @@ 状态 SetQuery("Select * From #@__myadtype"); - $dsql->Execute(); - $k=0; - while($row = $dsql->GetObject()) - { - $k++; - ?> + $dsql->SetQuery("Select * From #@__myadtype"); + $dsql->Execute(); + $k=0; + while($row = $dsql->GetObject()) + { + $k++; + ?> id; ?> 保留 + } + ?> 新增一个广告类型： diff --git a/src/admin/templets/cards_make.htm b/src/admin/templets/cards_make.htm index a42d2bc4..439bfa3b 100644 --- a/src/admin/templets/cards_make.htm +++ b/src/admin/templets/cards_make.htm @@ -33,13 +33,13 @@ 生成数量： diff --git a/src/admin/templets/cards_type.htm b/src/admin/templets/cards_type.htm index e1662dc3..0f44f8e5 100644 --- a/src/admin/templets/cards_type.htm +++ b/src/admin/templets/cards_type.htm @@ -22,13 +22,13 @@ 状态 SetQuery("Select * From #@__moneycard_type"); - $dsql->Execute(); - $k=0; - while($row = $dsql->GetObject()) - { - $k++; - ?> + $dsql->SetQuery("Select * From #@__moneycard_type"); + $dsql->Execute(); + $k=0; + while($row = $dsql->GetObject()) + { + $k++; + ?> diff --git a/src/admin/templets/catalog_add.htm b/src/admin/templets/catalog_add.htm index dea2a033..d9f82b64 100644 --- a/src/admin/templets/catalog_add.htm +++ b/src/admin/templets/catalog_add.htm @@ -9,106 +9,106 @@ - + diff --git a/src/admin/templets/catalog_edit.htm b/src/admin/templets/catalog_edit.htm index e60d5efa..5c181f35 100644 --- a/src/admin/templets/catalog_edit.htm +++ b/src/admin/templets/catalog_edit.htm @@ -10,95 +10,95 @@ - +
diff --git a/src/admin/templets/content_s_list.htm b/src/admin/templets/content_s_list.htm index 5abe0abb..8704ce60 100644 --- a/src/admin/templets/content_s_list.htm +++ b/src/admin/templets/content_s_list.htm @@ -9,101 +9,101 @@ - +
diff --git a/src/admin/templets/content_tj.htm b/src/admin/templets/content_tj.htm index 17ba2562..79b41e1b 100644 --- a/src/admin/templets/content_tj.htm +++ b/src/admin/templets/content_tj.htm @@ -7,41 +7,36 @@ -
+
- + - + -
文档信息统计
- - -
+ 		- - -
综合信息统计： + +
+ - + - + - + -
 文档总数：文档总数： []
 评论总数：评论总数： []
 会员总数：会员总数： []
+
频道信息统计： - - - -
- + + +
频道信息统计： + @@ -55,23 +50,18 @@ ?> - + -
频道名称 文档总数
typename?> - ［id]) ? $arcs[$row->id] : 0 ); ?>］ - [id]) ? $arcs[$row->id] : 0 ); ?>]
+
- - - - -
+ \ No newline at end of file diff --git a/src/admin/templets/diy_edit_content.htm b/src/admin/templets/diy_edit_content.htm index 3f2c82da..324d7905 100644 --- a/src/admin/templets/diy_edit_content.htm +++ b/src/admin/templets/diy_edit_content.htm @@ -17,34 +17,34 @@ -
- - - - $fielddata) - { - $allowhtml = array('htmltext'); - if($row[$field]=='') continue; - if($fielddata[1]=='img') - { - $row[$field] = " 浏览原图删除原图"; - } - else if($fielddata[1]=='addon') - { - $row[$field] = " 浏览原附件删除原附件"; - } else { - if(!in_array($fielddata[1],$allowhtml)){ - $row[$field] = dede_htmlspecialchars($row[$field]); - $row[$field] = ""; - } - } - echo ''; - $formfields .= $formfields == ''? $field.','.$fielddata[1] : ';'.$field.','.$fielddata[1]; - } - echo ""; - ?> + + + +
'.$fielddata[0].':'.''.$row[$field].'
+ $fielddata) + { + $allowhtml = array('htmltext'); + if($row[$field]=='') continue; + if($fielddata[1]=='img') + { + $row[$field] = " 浏览原图删除原图"; + } + else if($fielddata[1]=='addon') + { + $row[$field] = " 浏览原附件删除原附件"; + } else { + if(!in_array($fielddata[1],$allowhtml)){ + $row[$field] = dede_htmlspecialchars($row[$field]); + $row[$field] = ""; + } + } + echo ''; + $formfields .= $formfields == ''? $field.','.$fielddata[1] : ';'.$field.','.$fielddata[1]; + } + echo ""; + ?>
'.$fielddata[0].':'.''.$row[$field].'
@@ -52,7 +52,7 @@
-
+ diff --git a/src/admin/templets/diy_field_add.htm b/src/admin/templets/diy_field_add.htm index e6c9cb93..89a6208d 100644 --- a/src/admin/templets/diy_field_add.htm +++ b/src/admin/templets/diy_field_add.htm @@ -10,60 +10,60 @@ - - + diff --git a/src/admin/templets/diy_field_edit.htm b/src/admin/templets/diy_field_edit.htm index 9db841a5..832cd377 100644 --- a/src/admin/templets/diy_field_edit.htm +++ b/src/admin/templets/diy_field_edit.htm @@ -10,46 +10,46 @@ - - +
diff --git a/src/admin/templets/diy_post.htm b/src/admin/templets/diy_post.htm index e82be58a..d6d989db 100644 --- a/src/admin/templets/diy_post.htm +++ b/src/admin/templets/diy_post.htm @@ -7,12 +7,12 @@ - + diff --git a/src/admin/templets/member_view.htm b/src/admin/templets/member_view.htm index 578546f7..0aaf540a 100644 --- a/src/admin/templets/member_view.htm +++ b/src/admin/templets/member_view.htm @@ -3,30 +3,30 @@ -查看会员 - - - - - - - + + + +
diff --git a/src/admin/templets/module_edit.htm b/src/admin/templets/module_edit.htm index c7c46de6..084ed5b5 100644 --- a/src/admin/templets/module_edit.htm +++ b/src/admin/templets/module_edit.htm @@ -8,30 +8,30 @@ - +
diff --git a/src/admin/templets/mychannel_field_add.htm b/src/admin/templets/mychannel_field_add.htm index 32248795..185ffb86 100644 --- a/src/admin/templets/mychannel_field_add.htm +++ b/src/admin/templets/mychannel_field_add.htm @@ -10,78 +10,78 @@ - - + diff --git a/src/admin/templets/mytag_add.htm b/src/admin/templets/mytag_add.htm index fc58b670..22af5413 100644 --- a/src/admin/templets/mytag_add.htm +++ b/src/admin/templets/mytag_add.htm @@ -21,7 +21,6 @@ return false; } } - $(document).ready(function () { $('.datepicker').daterangepicker({ "singleDatePicker": true, @@ -50,7 +49,6 @@ }, function (start) { $(this).val(start.format("YYYY-MM-DD HH:mm:ss")); }); - }) diff --git a/src/admin/templets/mytag_tag_guide_ok.htm b/src/admin/templets/mytag_tag_guide_ok.htm index 4dc2587a..fdc7b2ba 100644 --- a/src/admin/templets/mytag_tag_guide_ok.htm +++ b/src/admin/templets/mytag_tag_guide_ok.htm @@ -9,7 +9,7 @@
- + - diff --git a/src/admin/templets/stepselect_main.htm b/src/admin/templets/stepselect_main.htm index 45fd8aaf..ab841506 100644 --- a/src/admin/templets/stepselect_main.htm +++ b/src/admin/templets/stepselect_main.htm @@ -8,17 +8,11 @@ - - + - - + + +
diff --git a/src/admin/templets/stepselect_showajax.htm b/src/admin/templets/stepselect_showajax.htm index 24752666..f1ae3fae 100644 --- a/src/admin/templets/stepselect_showajax.htm +++ b/src/admin/templets/stepselect_showajax.htm @@ -5,30 +5,30 @@ $sbjs = " onsubmit=\"alert('该分类是系统内置枚举，不允许修改'); if($arr['issystem']==0) $sbjs = ''; ?> -
修改类别
-
关闭
-
-> +
修改类别
+
关闭
+
+> -
类 别 名：
-
缓存组名：
+
类 别 名：
+
缓存组名：
缓存组名必须为英文或数字组合
-
+
-
新增类别
-
关闭
-
-
+
新增类别
+
关闭
+
+ -
类 别 名：
-
缓存组名：
+
类 别 名：
+
缓存组名：
缓存组名必须为英文或数字组合
-
+
-
添加枚举
-
关闭
-
-
+
添加枚举
+
关闭
+
+
-隶属枚举： +
-
枚举名：
-
排序值：
+
枚举名：
+
排序值：
如果不指定，默认以枚举添加先后来排序
-
+
{$row1['ename']}"; } else { - $options .= ""; + $options .= ""; } } ?> -
预览联动表单
-
关闭
-
+
预览联动表单
+
关闭
+
类别关系： - +
-
这里仅显示数据关系，实际应用中，二级联动生成的表单是支持级连的，并非全部列出
-
+
\ No newline at end of file diff --git a/src/admin/templets/sys_info_pay.htm b/src/admin/templets/sys_info_pay.htm deleted file mode 100644 index acddef47..00000000 --- a/src/admin/templets/sys_info_pay.htm +++ /dev/null @@ -1,183 +0,0 @@ - - - - - - 支付接口配置 - - - - - -
-
- - $val){ - if(!isset(${'payment_'.$value}[$k])) $payment_temp = ''; - else $payment_temp = ${'payment_'.$value}[$k]; - echo ''."\n"; - } -} -?> -
diff --git a/src/admin/templets/shops_operations_cart.htm b/src/admin/templets/shops_operations_cart.htm index 2ef42c84..0eed7c1b 100644 --- a/src/admin/templets/shops_operations_cart.htm +++ b/src/admin/templets/shops_operations_cart.htm @@ -72,7 +72,7 @@ {/dede:datalist}
-
+
订单总计: {dede:field.priceCount/}元，{dede:pagelist listsize='6'/}
diff --git a/src/admin/templets/shops_operations_userinfo.htm b/src/admin/templets/shops_operations_userinfo.htm index bb92fda5..dd7465d6 100644 --- a/src/admin/templets/shops_operations_userinfo.htm +++ b/src/admin/templets/shops_operations_userinfo.htm @@ -11,7 +11,6 @@
订单号：  
配送：  方式: 费用:元
- - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
支付接口配置参数 -
-  
-  接口类型： -
- $val) { ?> -
  • -> -
    • - -
    -
    -  商户号： - -  此处填写您的支付帐号、客户号或客户id等，此帐号在支付服务提供商处取得
    -  邮箱： -  使用支付宝接口时,需填写支付宝账号邮箱
    -  私钥： - -
    -  签约商家请填写“交易安全校验码(key)”；未签约商家不用填写此项.(该项只支持数字和英文字母)
    -  支持交易货币： - - 人民币 *现只支持人民币,根据支付接口与银行卡决定,默认为人民币.
    -  支付手续费： - - 以百分比计算,手续费将计算在产品价格内.如果3% 则填0.03
    -  支付接口申请地址： - 点击申请 -
    - -

    - 财付通是腾讯公司为促进中国电子商务的发展需要，满足互联网用户价值需求，针对网上交易安全而精心推出的一系列服务 -

    -
    - - - - - - - - -
     如果该配置无效要手动修改,可打开/data/sys_pay.cache.php文件进行手工配置
    - - - - -
    - - - - \ No newline at end of file diff --git a/src/admin/templets/sys_payment.htm b/src/admin/templets/sys_payment.htm index f5c949d0..4900445d 100644 --- a/src/admin/templets/sys_payment.htm +++ b/src/admin/templets/sys_payment.htm @@ -40,18 +40,18 @@ {dede:field.rank /} + if($fields['enabled'] == 0) { + ?> 安装 + } + if($fields['enabled'] == 1) { + ?> 修改 删除 + } + ?> {/dede:datalist} diff --git a/src/admin/templets/sys_safetest.htm b/src/admin/templets/sys_safetest.htm index 38c4de9b..76f0261b 100644 --- a/src/admin/templets/sys_safetest.htm +++ b/src/admin/templets/sys_safetest.htm @@ -17,30 +17,30 @@ var info = $Obj('info').value; $Obj('loaddiv').style.display = 'block'; fetch('sys_safetest.php?action=test&filetype=' + filetype + "&info=" + info).then(resp=>{ - if (resp.ok) { - return resp.text() - } - throw new Error('系统错误，无法获取数据'); - }).then((d)=>{ - $DE('messagetd').innerHTML = d; - $Obj('loaddiv').style.display = 'none'; - }).catch((error) => { - console.log(error); - }); + if (resp.ok) { + return resp.text() + } + throw new Error('系统错误，无法获取数据'); + }).then((d)=>{ + $DE('messagetd').innerHTML = d; + $Obj('loaddiv').style.display = 'none'; + }).catch((error) => { + console.log(error); + }); } function LoadCtClear() { $Obj('loaddiv').style.display = 'block'; fetch('sys_safetest.php?action=clear').then(resp=>{ - if (resp.ok) { - return resp.text() - } - throw new Error('系统错误，无法获取数据'); - }).then((d)=>{ - $DE('messagetd').innerHTML = d; - $Obj('loaddiv').style.display = 'none'; - }).catch((error) => { - $DE('messagetd').innerHTML = errMsg; - }); + if (resp.ok) { + return resp.text() + } + throw new Error('系统错误，无法获取数据'); + }).then((d)=>{ + $DE('messagetd').innerHTML = d; + $Obj('loaddiv').style.display = 'none'; + }).catch((error) => { + $DE('messagetd').innerHTML = errMsg; + }); } diff --git a/src/admin/templets/templets_one.htm b/src/admin/templets/templets_one.htm index dbdbd780..fcb3c6fe 100644 --- a/src/admin/templets/templets_one.htm +++ b/src/admin/templets/templets_one.htm @@ -28,17 +28,17 @@ diff --git a/src/admin/templets/templets_tagsource.htm b/src/admin/templets/templets_tagsource.htm index c910240a..4619cf8d 100644 --- a/src/admin/templets/templets_tagsource.htm +++ b/src/admin/templets/templets_tagsource.htm @@ -28,7 +28,7 @@
    当前位置：标签源码碎片管理（文件存放在 ../system/taglib 文件夹）
    - 增加一个新的标签 + 增加一个新的标签
    @@ -38,27 +38,19 @@ read()) - { + $dh = dir($libdir); + while($filename=$dh->read()) + { if(!preg_match("#\.php$#", $filename)) continue; $filetime = filemtime($libdir.'/'.$filename); $filetime = MyDate("Y-m-d H:i",$filetime); $fileinfo = GetHelpInfo(str_replace('.lib.php','',$filename)); - ?> + ?> - - - - - - - - - - - 编辑 - + + + + 编辑 diff --git a/src/admin/templets/update_guide_getlist.htm b/src/admin/templets/update_guide_getlist.htm index ae95b3bf..2b680fad 100644 --- a/src/admin/templets/update_guide_getlist.htm +++ b/src/admin/templets/update_guide_getlist.htm @@ -11,21 +11,21 @@ - + - - - - + + + +
    自动更新程序::待下载文件列表
    - -
    + +
    \ No newline at end of file diff --git a/src/admin/templets/vote_edit.htm b/src/admin/templets/vote_edit.htm index 26ad6e98..b1bbe597 100644 --- a/src/admin/templets/vote_edit.htm +++ b/src/admin/templets/vote_edit.htm @@ -79,7 +79,8 @@ 　 + 否 + 是否允许查看投票： diff --git a/src/admin/templets/winmode.htm b/src/admin/templets/winmode.htm index dace49a8..2ae2a479 100644 --- a/src/admin/templets/winmode.htm +++ b/src/admin/templets/winmode.htm @@ -16,9 +16,7 @@ - +
    -  {dede:wecome_info/} - {dede:wecome_info/}
    @@ -27,7 +25,7 @@ - + {dede:winform/} @@ -36,7 +34,7 @@ -

    +

    {dede:lang_cms_powerby/}

    From a57b5ce252a6f3ae0a34ff1830534907ee0663ba Mon Sep 17 00:00:00 2001 From: xushubieli Date: Wed, 27 Apr 2022 14:28:58 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=96=87=E5=AD=97=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/admin/dialog/select_images.php | 2 +- src/admin/dialog/select_media.php | 2 +- src/admin/dialog/select_soft.php | 2 +- src/admin/dialog/select_templets.php | 2 +- src/admin/js/album.js | 4 ++-- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/admin/dialog/select_images.php b/src/admin/dialog/select_images.php index d82e5962..f8fcd112 100644 --- a/src/admin/dialog/select_images.php +++ b/src/admin/dialog/select_images.php @@ -143,7 +143,7 @@ a{text-decoration:none!important} 宽： 高： - + diff --git a/src/admin/dialog/select_media.php b/src/admin/dialog/select_media.php index caa88bd1..4623f45c 100644 --- a/src/admin/dialog/select_media.php +++ b/src/admin/dialog/select_media.php @@ -82,7 +82,7 @@ a{text-decoration:none!important} 上传： - + diff --git a/src/admin/dialog/select_soft.php b/src/admin/dialog/select_soft.php index f5c8cbb5..6e87dd0d 100644 --- a/src/admin/dialog/select_soft.php +++ b/src/admin/dialog/select_soft.php @@ -87,7 +87,7 @@ a{text-decoration:none!important} 上传： 改名： - + diff --git a/src/admin/dialog/select_templets.php b/src/admin/dialog/select_templets.php index 3186180c..ab6df315 100644 --- a/src/admin/dialog/select_templets.php +++ b/src/admin/dialog/select_templets.php @@ -68,7 +68,7 @@ a{text-decoration:none!important} 上传： 改名： - + diff --git a/src/admin/js/album.js b/src/admin/js/album.js index 9f7ff58d..0ee23189 100644 --- a/src/admin/js/album.js +++ b/src/admin/js/album.js @@ -9,11 +9,11 @@ */ function checkSubmitAlb() { if (document.form1.title.value == '') { - ShowMsg("档案标题不能为空"); + ShowMsg("标题不能为空"); return false; } if (document.form1.typeid.value == 0) { - ShowMsg("请选择档案的主类别"); + ShowMsg("请选择主类别"); return false; } document.form1.imagebody.value = $Obj('copyhtml').innerHTML;