From b633864380a152d4dc84f29362a30e52510afc7b Mon Sep 17 00:00:00 2001 From: xushubieli Date: Wed, 2 Nov 2022 15:39:48 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=BC=9A=E5=91=98=E5=A4=B4?= =?UTF-8?q?=E5=83=8F=EF=BC=8C=E5=88=A4=E6=96=AD=E6=A8=A1=E5=9E=8B=EF=BC=8C?= =?UTF-8?q?=E5=85=A8=E5=B1=80=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/admin/ad_edit.php | 8 +- src/admin/album_edit.php | 2 +- src/admin/catalog_do.php | 2 +- src/admin/css/menu.min.css | 1 - src/admin/dialog/select_images.php | 1 - src/admin/dialog/select_media.php | 1 - src/admin/dialog/select_soft.php | 1 - src/admin/dialog/select_soft_post.php | 2 +- src/admin/dialog/select_templets.php | 1 - src/admin/js/album.js | 9 - src/admin/js/dialog.js | 8 - src/admin/js/diy.js | 8 - src/admin/js/float.js | 8 - src/admin/js/global.js | 4 +- src/admin/js/handlers.js | 8 - src/admin/js/ieemu.js | 8 - src/admin/js/key.js | 16 +- src/admin/js/list.js | 36 +- src/admin/js/{member.js => user.js} | 20 +- src/admin/module_upload.php | 6 +- src/admin/mytag_edit.php | 4 +- src/admin/plus_main.php | 4 +- src/admin/sys_group_add.php | 2 +- src/admin/task_do.php | 4 +- src/admin/templets/action_search.htm | 2 +- src/admin/templets/ad_add.htm | 2 +- src/admin/templets/ad_edit.htm | 2 +- src/admin/templets/ad_main.htm | 2 +- src/admin/templets/adtype_main.htm | 2 +- src/admin/templets/album_add.htm | 2 +- src/admin/templets/album_edit.htm | 2 +- src/admin/templets/archives_add.htm | 2 +- src/admin/templets/archives_edit.htm | 2 +- src/admin/templets/archives_sg_add.htm | 2 +- src/admin/templets/archives_sg_edit.htm | 2 +- src/admin/templets/article_add.htm | 2 +- .../templets/article_description_main.htm | 2 +- src/admin/templets/article_edit.htm | 2 +- src/admin/templets/article_keywords_main.htm | 2 +- .../templets/article_keywords_select.htm | 2 +- src/admin/templets/article_test_same.htm | 2 +- src/admin/templets/cards_manmage.htm | 2 +- src/admin/templets/cards_type.htm | 2 +- src/admin/templets/catalog_add.htm | 2 +- src/admin/templets/catalog_add_quick.htm | 2 +- src/admin/templets/catalog_edit.htm | 2 +- src/admin/templets/catalog_main.htm | 3 +- src/admin/templets/content_att.htm | 2 +- src/admin/templets/content_batch_up.htm | 2 +- src/admin/templets/content_i_list.htm | 2 +- src/admin/templets/content_list.htm | 2 +- src/admin/templets/content_s_list.htm | 2 +- src/admin/templets/diy_add.htm | 2 +- src/admin/templets/diy_edit.htm | 2 +- src/admin/templets/diy_edit_content.htm | 2 +- src/admin/templets/diy_field_add.htm | 2 +- src/admin/templets/diy_field_edit.htm | 2 +- src/admin/templets/diy_list.htm | 2 +- src/admin/templets/diy_main.htm | 4 +- src/admin/templets/feedback_edit.htm | 2 +- src/admin/templets/file_edit.htm | 2 +- src/admin/templets/file_manage_main.htm | 34 +- src/admin/templets/freelist_add.htm | 2 +- src/admin/templets/freelist_edit.htm | 2 +- src/admin/templets/friendlink_add.htm | 2 +- src/admin/templets/friendlink_edit.htm | 2 +- src/admin/templets/friendlink_type.htm | 2 +- src/admin/templets/index.htm | 3 +- src/admin/templets/index_body.htm | 2 +- src/admin/templets/index_menu.htm | 1 - src/admin/templets/log_list.htm | 2 +- src/admin/templets/makehtml_all.htm | 2 +- src/admin/templets/makehtml_archives.htm | 2 +- src/admin/templets/makehtml_freelist.htm | 2 +- src/admin/templets/makehtml_homepage.htm | 2 +- src/admin/templets/makehtml_list.htm | 2 +- src/admin/templets/makehtml_spec.htm | 2 +- src/admin/templets/media_add.htm | 2 +- src/admin/templets/media_main.htm | 2 +- src/admin/templets/member_main.htm | 4 +- src/admin/templets/member_operations.htm | 2 +- src/admin/templets/member_pm.htm | 2 +- src/admin/templets/member_pmall.htm | 2 +- src/admin/templets/member_pmone.htm | 2 +- src/admin/templets/member_rank.htm | 2 +- src/admin/templets/member_scores.htm | 2 +- src/admin/templets/member_toadmin.htm | 2 +- src/admin/templets/member_type.htm | 2 +- src/admin/templets/member_view.htm | 2 +- src/admin/templets/module_edit.htm | 2 +- src/admin/templets/module_help.htm | 6 +- src/admin/templets/module_main.htm | 4 +- src/admin/templets/module_make.htm | 2 +- src/admin/templets/module_upload.htm | 2 +- src/admin/templets/mychannel_add.htm | 2 +- src/admin/templets/mychannel_edit.htm | 2 +- src/admin/templets/mychannel_field_add.htm | 2 +- src/admin/templets/mychannel_field_edit.htm | 2 +- src/admin/templets/mychannel_main.htm | 2 +- src/admin/templets/mychannel_modifysearch.htm | 2 +- src/admin/templets/mytag_add.htm | 2 +- src/admin/templets/mytag_main.htm | 2 +- src/admin/templets/mytag_tag_guide.htm | 2 +- src/admin/templets/plus_edit.htm | 2 +- src/admin/templets/plus_main.htm | 2 +- src/admin/templets/recycling.htm | 2 +- src/admin/templets/search_keywords_main.htm | 2 +- src/admin/templets/shops_delivery.htm | 2 +- src/admin/templets/shops_operations.htm | 2 +- src/admin/templets/shops_operations_cart.htm | 2 +- src/admin/templets/soft_add.htm | 2 +- src/admin/templets/soft_config.htm | 2 +- src/admin/templets/soft_edit.htm | 2 +- src/admin/templets/spec_add.htm | 2 +- src/admin/templets/spec_edit.htm | 2 +- src/admin/templets/sys_admin_user.htm | 2 +- src/admin/templets/sys_admin_user_add.htm | 2 +- src/admin/templets/sys_admin_user_edit.htm | 2 +- src/admin/templets/sys_admin_user_tj.htm | 2 +- src/admin/templets/sys_cache_up.htm | 2 +- src/admin/templets/sys_data.htm | 2 +- src/admin/templets/sys_data_replace.htm | 2 +- src/admin/templets/sys_data_revert.htm | 2 +- src/admin/templets/sys_group.htm | 2 +- src/admin/templets/sys_group_add.htm | 2 +- src/admin/templets/sys_group_edit.htm | 2 +- src/admin/templets/sys_info.htm | 2 +- src/admin/templets/sys_info_mark.htm | 2 +- src/admin/templets/sys_payment.htm | 2 +- src/admin/templets/sys_payment_install.htm | 2 +- src/admin/templets/sys_safetest.htm | 2 +- src/admin/templets/sys_sql_query.htm | 2 +- src/admin/templets/tag_test.htm | 2 +- src/admin/templets/tags_main.htm | 2 +- src/admin/templets/templets_default.htm | 4 +- src/admin/templets/templets_one.htm | 2 +- src/admin/templets/templets_one_add.htm | 2 +- src/admin/templets/templets_one_edit.htm | 2 +- src/admin/templets/templets_tagsource.htm | 2 +- src/admin/templets/tpl_edit.htm | 2 +- src/admin/templets/tpl_edit_tag.htm | 2 +- src/admin/templets/vote_add.htm | 2 +- src/admin/templets/vote_edit.htm | 2 +- src/admin/templets/vote_getcode.htm | 2 +- src/admin/templets/vote_main.htm | 2 +- src/static/web/css/admin.css | 72 +++- src/static/web/css/style.css | 54 ++- src/static/web/css/user.css | 31 +- src/static/web/js/enums.js | 2 +- src/static/web/js/qrcode.js | 2 - src/static/web/js/style.js | 22 +- src/system/dedemodule.class.php | 2 +- src/system/helpers/charset.helper.php | 2 +- src/system/helpers/upload.helper.php | 2 +- src/system/libraries/dedebiz.class.php | 3 +- src/system/memberlogin.class.php | 18 +- src/system/taglib/flinktype.lib.php | 2 +- src/system/typelink/typelink.class.php | 16 +- src/system/typelink/typeunit.class.admin.php | 8 +- src/system/typelink/typeunit.class.menu.php | 16 +- .../typelink/typeunit.class.selector.php | 4 +- src/theme/plus/win_templet.htm | 2 +- src/theme/templet-dirlist.inc | 4 +- src/theme/templet-filelist.inc | 57 ++- src/theme/templet-pluslist.inc | 25 +- src/theme/templets/foot.htm | 4 +- src/theme/templets/list_infos.htm | 2 +- src/theme/templets/top.htm | 6 +- src/theme/templets/widget_channels.htm | 2 +- src/theme/templets/widget_hot.htm | 2 +- src/theme/templets/widget_hot_sg.htm | 2 +- src/theme/templets/widget_qrcode.htm | 2 +- src/theme/templets/widget_recommend.htm | 2 +- src/theme/templets/widget_recommend_sg.htm | 2 +- src/theme/templets/widget_vote.htm | 2 +- src/user/config.php | 1 + src/user/templets/album_add.htm | 186 +++++---- src/user/templets/album_edit.htm | 240 ++++++------ src/user/templets/archives_add.htm | 144 ++++--- src/user/templets/archives_edit.htm | 118 +++--- src/user/templets/archives_sg_add.htm | 144 ++++--- src/user/templets/archives_sg_edit.htm | 108 +++--- src/user/templets/article_add.htm | 153 ++++---- src/user/templets/article_edit.htm | 134 +++---- src/user/templets/buy.htm | 200 +++++----- src/user/templets/buy_action_payment.htm | 141 ++++--- src/user/templets/content_list.htm | 140 ++++--- src/user/templets/content_sg_list.htm | 122 +++--- src/user/templets/edit_baseinfo.htm | 232 +++++------- src/user/templets/edit_email.htm | 64 ++-- src/user/templets/edit_face.htm | 70 ++-- src/user/templets/index-notlogin.htm | 42 +-- src/user/templets/index.htm | 170 ++++----- src/user/templets/info.htm | 24 +- src/user/templets/login.htm | 48 +-- src/user/templets/menu.htm | 27 +- src/user/templets/mypay.htm | 98 +++-- src/user/templets/mystow.htm | 78 ++-- src/user/templets/operation.htm | 92 +++-- src/user/templets/pm-main.htm | 151 ++++---- src/user/templets/reg-new.htm | 54 +-- src/user/templets/resetpassword.htm | 10 +- src/user/templets/resetpassword2.htm | 10 +- src/user/templets/resetpassword3.htm | 10 +- src/user/templets/shops_action_payment.htm | 100 ++--- src/user/templets/shops_orders.htm | 120 +++--- src/user/templets/shops_products.htm | 234 ++++++------ src/user/templets/soft_add.htm | 342 ++++++++--------- src/user/templets/soft_edit.htm | 352 +++++++++--------- src/user/templets/win_templet.htm | 2 +- 210 files changed, 2298 insertions(+), 2684 deletions(-) delete mode 100644 src/admin/css/menu.min.css rename src/admin/js/{member.js => user.js} (73%) diff --git a/src/admin/ad_edit.php b/src/admin/ad_edit.php index 165556ad..9ccd47a6 100644 --- a/src/admin/ad_edit.php +++ b/src/admin/ad_edit.php @@ -25,15 +25,15 @@ if ($dopost == 'delete') { $showhtml .= "预览："; $row = $dsql->GetOne("SELECT tagname from `#@__myad` WHERE aid='$aid' "); $showtag = '{'."dede:myad name='{$row['tagname']}'/".'}'; - $info = "说明：如果嵌入的是织梦CMS广告标签，那将会解析成标签中的内容到页面，广告修改后需要重新生成
- 如果不希望重新生成所有页面，则直接调用JS代码即可 + $info = "说明：如果嵌入的是织梦广告标签，那将会解析成标签中的内容到页面，广告修改后需要重新生成
+ 如果不希望重新生成所有页面，则直接调用js代码即可 "; $wintitle = "广告管理-获取广告标签"; - $wecome_info = "广告管理::获取JS"; + $wecome_info = "广告管理::获取js"; $win = new OxWindow(); $win->Init(); $winform = $win->GetWindow("hand", $info); - $win->AddTitle("织梦CMS标签调用代码："); + $win->AddTitle("织梦标签调用代码："); $winform = $win->GetWindow("hand", $showtag); $win->myWinItem = ''; $win->AddTitle("以下为选定广告的js调用代码："); diff --git a/src/admin/album_edit.php b/src/admin/album_edit.php index d5745e9d..f8467742 100644 --- a/src/admin/album_edit.php +++ b/src/admin/album_edit.php @@ -142,7 +142,7 @@ else if ($dopost == 'save') { //有上传文件的情况 if (isset(${'imgfile'.$i}) && is_uploaded_file(${'imgfile'.$i})) { $tmpFile = ${'imgfile'.$i}; - //检测上传的图片， 如果类型不对，保留原来图片 + //检测上传的图片，如果类型不对，保留原来图片 $imginfos = @GetImageSize($tmpFile, $info); if (!is_array($imginfos)) { $imginfos = @GetImageSize($imgfile, $info); diff --git a/src/admin/catalog_do.php b/src/admin/catalog_do.php index b0daba13..aa206004 100644 --- a/src/admin/catalog_do.php +++ b/src/admin/catalog_do.php @@ -162,7 +162,7 @@ else if ($dopost == "upcatcache") { exit(); } /*--------------------- -获取JS文件 +获取js文件 function GetJs ----------------------*/ else if ($dopost == "GetJs") { diff --git a/src/admin/css/menu.min.css b/src/admin/css/menu.min.css deleted file mode 100644 index 2d859235..00000000 --- a/src/admin/css/menu.min.css +++ /dev/null @@ -1 +0,0 @@ -.menu-box{margin:0;padding:1rem 5px;background:#ffff}.menu{width:100%;background:#fff;border-radius:.2rem;box-shadow:0 .125rem .25rem rgba(0,0,0,.075)}.menu .link{position:relative;padding-left:50px;display:block;height:40px;line-height:40px;cursor:pointer;transition:all .3s}.menu li:last-child .link{border-bottom:0}.menu li i{position:absolute;top:12px;left:20px;color:#545b62}.menu li i.fa-angle-down{right:20px;left:auto}.menu li.open .link,.menu li.open i{color:#28a745}.menu li.open i.fa-angle-down{transform:rotate(180deg)}.submenu{display:none;padding:5px 0;background:#adb5bd;border-radius:0 0 .2rem .2rem}.submenu li{height:40px;line-height:40px;transition:all .3s}.submenu li:hover{background:#28a745}.submenu a{float:left;display:block;padding:0 10px 0 50px;color:#fff}.submenu-right{float:right!important;padding:0 20px 0 10px!important} \ No newline at end of file diff --git a/src/admin/dialog/select_images.php b/src/admin/dialog/select_images.php index 2656a896..c7a5bda2 100644 --- a/src/admin/dialog/select_images.php +++ b/src/admin/dialog/select_images.php @@ -63,7 +63,6 @@ if (!empty($iseditor)) { html{background:#f6f6f6} .bg{margin:10px;border-radius:.2rem;box-shadow:0 1px 2px 0 rgba(0,0,0,.05)} .napisdiv{left:10;top:10;width:150px;height:100px;position:absolute;z-index:3;display:none} -.biz-td{border-bottom:1px solid #eee!important} "; $showhtml = "\r\n\r\n$jscode\r\n\r\n"; $showhtml .= "预览："; - $wintitle = "宏标记定义-获取JS"; - $wecome_info = "宏标记定义::获取JS"; + $wintitle = "宏标记定义-获取js"; + $wecome_info = "宏标记定义::获取js"; $win = new OxWindow(); $win->Init(); $win->AddTitle('以下为选定宏标记的js调用代码：'); diff --git a/src/admin/plus_main.php b/src/admin/plus_main.php index 9405e40a..f3808a05 100644 --- a/src/admin/plus_main.php +++ b/src/admin/plus_main.php @@ -20,9 +20,9 @@ $dlist->display(); function GetSta($sta, $id, $title) { if ($sta == 1) { - return "已启用禁用修改删除"; + return "已启用禁用修改删除"; } else { - return "已禁用启用修改册除"; + return "已禁用启用修改册除"; } } ?> \ No newline at end of file diff --git a/src/admin/sys_group_add.php b/src/admin/sys_group_add.php index 9a84163d..590a9471 100644 --- a/src/admin/sys_group_add.php +++ b/src/admin/sys_group_add.php @@ -17,7 +17,7 @@ if (!empty($dopost)) { exit(); } if ($rankid > 10) { - ShowMsg('组级别值不能大于10， 否则一切权限设置均无效!', '-1'); + ShowMsg('组级别值不能大于10，否则一切权限设置均无效!', '-1'); exit(); } $AllPurviews = ''; diff --git a/src/admin/task_do.php b/src/admin/task_do.php index 1fec6d54..0deb286d 100644 --- a/src/admin/task_do.php +++ b/src/admin/task_do.php @@ -14,7 +14,7 @@ $dopost = (!isset($dopost) ? '' : $dopost); 返回到下一任务的URL 特殊变量，除非知道作用，否则不能在任务传递中占用 f 临时，仅为了方便网址结构 -dopost 当前任务(指向下一个任务)， 由用户自行处理或在 nextdo 中自动获得 +dopost 当前任务(指向下一个任务)，由用户自行处理或在 nextdo 中自动获得 del 上一次任务删除的变量 morejob ，设定后，表示当前任务需请求多次，会把 dopost 和 nextdo 处理后转为 doposttmp, nextdotmp，然后由用户自行处理 ******************************/ @@ -31,7 +31,7 @@ function GetNextUrl($notallowArr = array('dopost', 'f', 'del')) $nextdo .= ($nextdo == '' ? $nextdos[$i] : ','.$nextdos[$i]); } } - //如果系统有多重任务， 把下一任务和任务列表参数提交给程序处理 + //如果系统有多重任务，把下一任务和任务列表参数提交给程序处理 if (in_array('morejob', $notallowArr)) { $reurl .= "&doposttmp=".$nextdos[0]; if ($nextdo != '') $reurl .= "&nextdotmp=$nextdo"; diff --git a/src/admin/templets/action_search.htm b/src/admin/templets/action_search.htm index 5af0454a..23f9dd15 100644 --- a/src/admin/templets/action_search.htm +++ b/src/admin/templets/action_search.htm @@ -4,8 +4,8 @@ 搜索结果 - + diff --git a/src/admin/templets/ad_add.htm b/src/admin/templets/ad_add.htm index 6aa48f16..55abfce1 100644 --- a/src/admin/templets/ad_add.htm +++ b/src/admin/templets/ad_add.htm @@ -4,8 +4,8 @@ 增加广告 - + diff --git a/src/admin/templets/ad_edit.htm b/src/admin/templets/ad_edit.htm index 18f792eb..f373c841 100644 --- a/src/admin/templets/ad_edit.htm +++ b/src/admin/templets/ad_edit.htm @@ -4,8 +4,8 @@ 修改广告 - + diff --git a/src/admin/templets/ad_main.htm b/src/admin/templets/ad_main.htm index afb5d6a2..5753f0a3 100644 --- a/src/admin/templets/ad_main.htm +++ b/src/admin/templets/ad_main.htm @@ -5,8 +5,8 @@ 广告管理 - + diff --git a/src/admin/templets/adtype_main.htm b/src/admin/templets/adtype_main.htm index f5eb907e..7304bdaf 100644 --- a/src/admin/templets/adtype_main.htm +++ b/src/admin/templets/adtype_main.htm @@ -4,8 +4,8 @@ 广告分类管理 - + diff --git a/src/admin/templets/album_add.htm b/src/admin/templets/album_add.htm index df29e101..64b29a32 100644 --- a/src/admin/templets/album_add.htm +++ b/src/admin/templets/album_add.htm @@ -4,8 +4,8 @@ 发布图集 - + diff --git a/src/admin/templets/album_edit.htm b/src/admin/templets/album_edit.htm index 92c32d49..6aff5b08 100644 --- a/src/admin/templets/album_edit.htm +++ b/src/admin/templets/album_edit.htm @@ -4,8 +4,8 @@ 修改图集 - + diff --git a/src/admin/templets/archives_add.htm b/src/admin/templets/archives_add.htm index 32e6ee6b..1c7ef145 100644 --- a/src/admin/templets/archives_add.htm +++ b/src/admin/templets/archives_add.htm @@ -4,8 +4,8 @@ 发布商品 - + diff --git a/src/admin/templets/archives_edit.htm b/src/admin/templets/archives_edit.htm index 7bb8eb1c..4a2c5d31 100644 --- a/src/admin/templets/archives_edit.htm +++ b/src/admin/templets/archives_edit.htm @@ -4,8 +4,8 @@ 修改商品 - + diff --git a/src/admin/templets/archives_sg_add.htm b/src/admin/templets/archives_sg_add.htm index fa5b43ba..18ca6e1d 100644 --- a/src/admin/templets/archives_sg_add.htm +++ b/src/admin/templets/archives_sg_add.htm @@ -4,8 +4,8 @@ 发布分类 - + diff --git a/src/admin/templets/archives_sg_edit.htm b/src/admin/templets/archives_sg_edit.htm index 6332812c..622a60e1 100644 --- a/src/admin/templets/archives_sg_edit.htm +++ b/src/admin/templets/archives_sg_edit.htm @@ -4,8 +4,8 @@ 修改分类 - + diff --git a/src/admin/templets/article_add.htm b/src/admin/templets/article_add.htm index f719d5e0..c5765dac 100644 --- a/src/admin/templets/article_add.htm +++ b/src/admin/templets/article_add.htm @@ -4,8 +4,8 @@ 发布文档 - + diff --git a/src/admin/templets/article_description_main.htm b/src/admin/templets/article_description_main.htm index f4141025..61fee806 100644 --- a/src/admin/templets/article_description_main.htm +++ b/src/admin/templets/article_description_main.htm @@ -4,8 +4,8 @@ 自动摘要分页 - + diff --git a/src/admin/templets/article_edit.htm b/src/admin/templets/article_edit.htm index 691ee371..fd0ec44f 100644 --- a/src/admin/templets/article_edit.htm +++ b/src/admin/templets/article_edit.htm @@ -4,8 +4,8 @@ 修改文档 - + diff --git a/src/admin/templets/article_keywords_main.htm b/src/admin/templets/article_keywords_main.htm index c3e51276..5055c53a 100644 --- a/src/admin/templets/article_keywords_main.htm +++ b/src/admin/templets/article_keywords_main.htm @@ -4,8 +4,8 @@ 文档关键词维护 - + diff --git a/src/admin/templets/catalog_add_quick.htm b/src/admin/templets/catalog_add_quick.htm index f83d54d2..c068eadb 100644 --- a/src/admin/templets/catalog_add_quick.htm +++ b/src/admin/templets/catalog_add_quick.htm @@ -4,8 +4,8 @@ 批量添加栏目 - + diff --git a/src/admin/templets/catalog_main.htm b/src/admin/templets/catalog_main.htm index 39fca269..9ed66b68 100644 --- a/src/admin/templets/catalog_main.htm +++ b/src/admin/templets/catalog_main.htm @@ -4,14 +4,13 @@ 栏目管理 - + - diff --git a/src/admin/templets/content_i_list.htm b/src/admin/templets/content_i_list.htm index b5cec770..826806dc 100644 --- a/src/admin/templets/content_i_list.htm +++ b/src/admin/templets/content_i_list.htm @@ -4,8 +4,8 @@ 图片文档管理 - + diff --git a/src/admin/templets/content_list.htm b/src/admin/templets/content_list.htm index 7b2e8925..311ce21b 100644 --- a/src/admin/templets/content_list.htm +++ b/src/admin/templets/content_list.htm @@ -4,8 +4,8 @@ 所有文档管理 - + diff --git a/src/admin/templets/content_s_list.htm b/src/admin/templets/content_s_list.htm index 4093e2c0..e3fd4980 100644 --- a/src/admin/templets/content_s_list.htm +++ b/src/admin/templets/content_s_list.htm @@ -4,8 +4,8 @@ 专题文档管理 - + diff --git a/src/admin/templets/diy_edit.htm b/src/admin/templets/diy_edit.htm index 4f15cbc8..c8131f0f 100644 --- a/src/admin/templets/diy_edit.htm +++ b/src/admin/templets/diy_edit.htm @@ -4,8 +4,8 @@ 修改自定义表单 - + diff --git a/src/admin/templets/diy_edit_content.htm b/src/admin/templets/diy_edit_content.htm index d5c95570..610d7fd7 100644 --- a/src/admin/templets/diy_edit_content.htm +++ b/src/admin/templets/diy_edit_content.htm @@ -4,8 +4,8 @@ 编辑评论 - + diff --git a/src/admin/templets/diy_field_add.htm b/src/admin/templets/diy_field_add.htm index 0a095e5f..7a369641 100644 --- a/src/admin/templets/diy_field_add.htm +++ b/src/admin/templets/diy_field_add.htm @@ -4,8 +4,8 @@ 自定义表单增加字段 - + diff --git a/src/admin/templets/diy_field_edit.htm b/src/admin/templets/diy_field_edit.htm index 709c751d..f01130fb 100644 --- a/src/admin/templets/diy_field_edit.htm +++ b/src/admin/templets/diy_field_edit.htm @@ -4,8 +4,8 @@ 自定义表单修改字段 - + diff --git a/src/admin/templets/diy_list.htm b/src/admin/templets/diy_list.htm index a30a2409..0d7274db 100644 --- a/src/admin/templets/diy_list.htm +++ b/src/admin/templets/diy_list.htm @@ -4,8 +4,8 @@ <?php echo $diy->name;?> - + diff --git a/src/admin/templets/file_manage_main.htm b/src/admin/templets/file_manage_main.htm index 70fe1bf0..f59de849 100644 --- a/src/admin/templets/file_manage_main.htm +++ b/src/admin/templets/file_manage_main.htm @@ -4,8 +4,8 @@ 文件管理器 - + @@ -27,7 +27,7 @@ if ($file!="." && $file!=".." && !is_dir("$inpath/$file")) { @$filesize = filesize("$inpath/$file"); - @$filesize=$filesize/1024; + @$filesize = $filesize/1024; @$filetime = filemtime("$inpath/$file"); @$filetime = MyDate("Y-m-d H:i:s",$filetime); if ($filesize<0.1) @@ -66,7 +66,7 @@ 改名 - 删除 + 删除 "; @@ -80,8 +80,8 @@ $filetime 改名 - 删除 移动 + 删除 "; $files[] = $line; @@ -94,8 +94,8 @@ $filetime 改名 - 删除 移动 + 删除 "; $files[] = $line; @@ -108,8 +108,8 @@ $filetime 改名 - 删除 移动 + 删除 "; $files[] = $line; @@ -122,8 +122,8 @@ $filetime 改名 - 删除 移动 + 删除 "; $files[] = $line; @@ -136,8 +136,8 @@ $filetime 改名 - 删除 移动 + 删除 "; $files[] = $line; @@ -150,8 +150,8 @@ $filetime 改名 - 删除 移动 + 删除 "; $files[] = $line; @@ -164,8 +164,8 @@ $filetime 改名 - 删除 移动 + 删除 "; $files[] = $line; @@ -178,8 +178,8 @@ $filetime 改名 - 删除 移动 + 删除 "; $files[] = $line; @@ -194,8 +194,8 @@ 编辑 改名 - 删除 移动 + 删除 "; $files[] = $line; @@ -210,8 +210,8 @@ 编辑 改名 - 删除 移动 + 删除 "; $files[] = $line; @@ -226,8 +226,8 @@ 编辑 改名 - 删除 移动 + 删除 "; $files[] = $line; @@ -242,8 +242,8 @@ 编辑 改名 - 删除 移动 + 删除 "; $files[] = $line; @@ -258,8 +258,8 @@ 编辑 改名 - 删除 移动 + 删除 "; $files[] = $line; @@ -270,8 +270,8 @@ $filetime 改名 - 删除 移动 + 删除 "; $files[] = $line; diff --git a/src/admin/templets/freelist_add.htm b/src/admin/templets/freelist_add.htm index c4080614..4e67dbf2 100644 --- a/src/admin/templets/freelist_add.htm +++ b/src/admin/templets/freelist_add.htm @@ -4,8 +4,8 @@ 新增自由列表 - + diff --git a/src/admin/templets/freelist_edit.htm b/src/admin/templets/freelist_edit.htm index 5f95a694..c436c72d 100644 --- a/src/admin/templets/freelist_edit.htm +++ b/src/admin/templets/freelist_edit.htm @@ -4,8 +4,8 @@ 修改自由列表 - + diff --git a/src/admin/templets/friendlink_add.htm b/src/admin/templets/friendlink_add.htm index d91eabff..516ece1c 100644 --- a/src/admin/templets/friendlink_add.htm +++ b/src/admin/templets/friendlink_add.htm @@ -4,8 +4,8 @@ 友情链接管理 - + diff --git a/src/admin/templets/friendlink_edit.htm b/src/admin/templets/friendlink_edit.htm index a951b811..ba10bf8f 100644 --- a/src/admin/templets/friendlink_edit.htm +++ b/src/admin/templets/friendlink_edit.htm @@ -4,8 +4,8 @@ 友情链接修改 - + diff --git a/src/admin/templets/friendlink_type.htm b/src/admin/templets/friendlink_type.htm index 7662f88f..318f2ce9 100644 --- a/src/admin/templets/friendlink_type.htm +++ b/src/admin/templets/friendlink_type.htm @@ -4,8 +4,8 @@ 网站类型管理 - + diff --git a/src/admin/templets/index.htm b/src/admin/templets/index.htm index 7138a68b..aef60802 100644 --- a/src/admin/templets/index.htm +++ b/src/admin/templets/index.htm @@ -6,10 +6,9 @@ <?php echo $cfg_webname;?>后台管理 - + - diff --git a/src/admin/templets/index_body.htm b/src/admin/templets/index_body.htm index ce1c3514..25b500ad 100644 --- a/src/admin/templets/index_body.htm +++ b/src/admin/templets/index_body.htm @@ -5,8 +5,8 @@ 系统主页 - + diff --git a/src/admin/templets/index_menu.htm b/src/admin/templets/index_menu.htm index 08219154..c24654c2 100644 --- a/src/admin/templets/index_menu.htm +++ b/src/admin/templets/index_menu.htm @@ -6,7 +6,6 @@ 系统菜单 - diff --git a/src/admin/templets/log_list.htm b/src/admin/templets/log_list.htm index 86f66e77..e9ce0aae 100644 --- a/src/admin/templets/log_list.htm +++ b/src/admin/templets/log_list.htm @@ -4,8 +4,8 @@ 采集内容管理 - + diff --git a/src/admin/templets/makehtml_archives.htm b/src/admin/templets/makehtml_archives.htm index 2baa245a..2b1117a4 100644 --- a/src/admin/templets/makehtml_archives.htm +++ b/src/admin/templets/makehtml_archives.htm @@ -4,8 +4,8 @@ 更新文档 - + diff --git a/src/admin/templets/makehtml_freelist.htm b/src/admin/templets/makehtml_freelist.htm index df145d14..a1108cb8 100644 --- a/src/admin/templets/makehtml_freelist.htm +++ b/src/admin/templets/makehtml_freelist.htm @@ -4,8 +4,8 @@ 更新自由列表 - + diff --git a/src/admin/templets/makehtml_homepage.htm b/src/admin/templets/makehtml_homepage.htm index 0ecf2670..a7e16970 100644 --- a/src/admin/templets/makehtml_homepage.htm +++ b/src/admin/templets/makehtml_homepage.htm @@ -5,8 +5,8 @@ 更新首页 - + diff --git a/src/admin/templets/media_main.htm b/src/admin/templets/media_main.htm index fc3d8d11e..dccb194f 100644 --- a/src/admin/templets/media_main.htm +++ b/src/admin/templets/media_main.htm @@ -4,8 +4,8 @@ 附件数据管理 - + - +
diff --git a/src/admin/templets/member_operations.htm b/src/admin/templets/member_operations.htm index 3f1a13cc..c13523d7 100644 --- a/src/admin/templets/member_operations.htm +++ b/src/admin/templets/member_operations.htm @@ -4,8 +4,8 @@ 业务管理 - + diff --git a/src/admin/templets/member_toadmin.htm b/src/admin/templets/member_toadmin.htm index d83be8f4..7512d230 100644 --- a/src/admin/templets/member_toadmin.htm +++ b/src/admin/templets/member_toadmin.htm @@ -4,8 +4,8 @@ 提升为管理员 - + diff --git a/src/admin/templets/member_type.htm b/src/admin/templets/member_type.htm index 5e5939ec..83f67fc4 100644 --- a/src/admin/templets/member_type.htm +++ b/src/admin/templets/member_type.htm @@ -4,8 +4,8 @@ 会员产品分类 - + diff --git a/src/admin/templets/member_view.htm b/src/admin/templets/member_view.htm index 1a9aecae..21b9f577 100644 --- a/src/admin/templets/member_view.htm +++ b/src/admin/templets/member_view.htm @@ -4,8 +4,8 @@ 查看会员 - + diff --git a/src/admin/templets/module_edit.htm b/src/admin/templets/module_edit.htm index 900549ed..368339bd 100644 --- a/src/admin/templets/module_edit.htm +++ b/src/admin/templets/module_edit.htm @@ -4,8 +4,8 @@ 模块打包 - + @@ -37,7 +37,7 @@ -
DedeBIZV6开始启动DedeBIZ商业开发者计划，为了保障系统及技术服务安全，请认准DedeBIZ商业认证开发者
+
DedeBIZ开始启动DedeBIZ商业开发者计划，为了保障系统及技术服务安全，请认准DedeBIZ商业认证开发者
模块名称 diff --git a/src/admin/templets/module_make.htm b/src/admin/templets/module_make.htm index 0a1bb75b..17b09308 100644 --- a/src/admin/templets/module_make.htm +++ b/src/admin/templets/module_make.htm @@ -4,8 +4,8 @@ 模块打包 - + diff --git a/src/admin/templets/mychannel_field_add.htm b/src/admin/templets/mychannel_field_add.htm index fdf8d01d..6934aeed 100644 --- a/src/admin/templets/mychannel_field_add.htm +++ b/src/admin/templets/mychannel_field_add.htm @@ -4,8 +4,8 @@ 内容模型增加字段 - + diff --git a/src/admin/templets/mychannel_field_edit.htm b/src/admin/templets/mychannel_field_edit.htm index bf7f069c..ee4aae14 100644 --- a/src/admin/templets/mychannel_field_edit.htm +++ b/src/admin/templets/mychannel_field_edit.htm @@ -4,8 +4,8 @@ 内容模型修改字段 - + diff --git a/src/admin/templets/mychannel_main.htm b/src/admin/templets/mychannel_main.htm index 7e2a9532..7c84b78c 100644 --- a/src/admin/templets/mychannel_main.htm +++ b/src/admin/templets/mychannel_main.htm @@ -5,8 +5,8 @@ 内容模型管理 - + diff --git a/src/admin/templets/mychannel_modifysearch.htm b/src/admin/templets/mychannel_modifysearch.htm index 2830b67a..3dfbe1de 100644 --- a/src/admin/templets/mychannel_modifysearch.htm +++ b/src/admin/templets/mychannel_modifysearch.htm @@ -6,8 +6,8 @@ 自定义搜索管理 - + diff --git a/src/admin/templets/mytag_add.htm b/src/admin/templets/mytag_add.htm index 371695a7..4c9f967b 100644 --- a/src/admin/templets/mytag_add.htm +++ b/src/admin/templets/mytag_add.htm @@ -4,8 +4,8 @@ 增加自定义标记 - + diff --git a/src/admin/templets/mytag_main.htm b/src/admin/templets/mytag_main.htm index eba41657..99f58da6 100644 --- a/src/admin/templets/mytag_main.htm +++ b/src/admin/templets/mytag_main.htm @@ -5,8 +5,8 @@ 自定义标记 - + diff --git a/src/admin/templets/mytag_tag_guide.htm b/src/admin/templets/mytag_tag_guide.htm index 6a045b84..620f45eb 100644 --- a/src/admin/templets/mytag_tag_guide.htm +++ b/src/admin/templets/mytag_tag_guide.htm @@ -4,8 +4,8 @@ 智能标记向导 - + diff --git a/src/admin/templets/plus_edit.htm b/src/admin/templets/plus_edit.htm index 6b00a516..6451ae34 100644 --- a/src/admin/templets/plus_edit.htm +++ b/src/admin/templets/plus_edit.htm @@ -4,8 +4,8 @@ 修改插件 - + diff --git a/src/admin/templets/plus_main.htm b/src/admin/templets/plus_main.htm index aff8ca22..b8428569 100644 --- a/src/admin/templets/plus_main.htm +++ b/src/admin/templets/plus_main.htm @@ -5,8 +5,8 @@ 插件管理 - + diff --git a/src/admin/templets/recycling.htm b/src/admin/templets/recycling.htm index de9ade56..e422252c 100644 --- a/src/admin/templets/recycling.htm +++ b/src/admin/templets/recycling.htm @@ -4,8 +4,8 @@ 文档回收站 - + diff --git a/src/admin/templets/shops_delivery.htm b/src/admin/templets/shops_delivery.htm index 00cf9598..fc02c93c 100644 --- a/src/admin/templets/shops_delivery.htm +++ b/src/admin/templets/shops_delivery.htm @@ -4,8 +4,8 @@ 配送方式配置 - + diff --git a/src/admin/templets/shops_operations.htm b/src/admin/templets/shops_operations.htm index a1a98315..67233c4b 100644 --- a/src/admin/templets/shops_operations.htm +++ b/src/admin/templets/shops_operations.htm @@ -4,8 +4,8 @@ 商店订单记录 - + diff --git a/src/admin/templets/shops_operations_cart.htm b/src/admin/templets/shops_operations_cart.htm index 2720c289..fd7f2b59 100644 --- a/src/admin/templets/shops_operations_cart.htm +++ b/src/admin/templets/shops_operations_cart.htm @@ -4,8 +4,8 @@ <?php echo $oid;?> - + diff --git a/src/admin/templets/soft_add.htm b/src/admin/templets/soft_add.htm index 4e9090ce..be499d09 100644 --- a/src/admin/templets/soft_add.htm +++ b/src/admin/templets/soft_add.htm @@ -4,8 +4,8 @@ 发布软件 - + diff --git a/src/admin/templets/soft_config.htm b/src/admin/templets/soft_config.htm index 1a0b42b2..725fed9a 100644 --- a/src/admin/templets/soft_config.htm +++ b/src/admin/templets/soft_config.htm @@ -4,8 +4,8 @@ 软件频道设置 - + diff --git a/src/admin/templets/soft_edit.htm b/src/admin/templets/soft_edit.htm index b2609810..0578baaf 100644 --- a/src/admin/templets/soft_edit.htm +++ b/src/admin/templets/soft_edit.htm @@ -4,8 +4,8 @@ 修改软件 - + diff --git a/src/admin/templets/spec_add.htm b/src/admin/templets/spec_add.htm index d52c4095..db416c6d 100644 --- a/src/admin/templets/spec_add.htm +++ b/src/admin/templets/spec_add.htm @@ -4,8 +4,8 @@ 发布专题 - + diff --git a/src/admin/templets/spec_edit.htm b/src/admin/templets/spec_edit.htm index 5e952e9f..5140f4d7 100644 --- a/src/admin/templets/spec_edit.htm +++ b/src/admin/templets/spec_edit.htm @@ -4,8 +4,8 @@ 修改专题 - + diff --git a/src/admin/templets/sys_admin_user.htm b/src/admin/templets/sys_admin_user.htm index d7b7d884..78c971a1 100644 --- a/src/admin/templets/sys_admin_user.htm +++ b/src/admin/templets/sys_admin_user.htm @@ -5,8 +5,8 @@ 管理员帐号 - + diff --git a/src/admin/templets/sys_admin_user_add.htm b/src/admin/templets/sys_admin_user_add.htm index 5d5f11a5..2b296676 100644 --- a/src/admin/templets/sys_admin_user_add.htm +++ b/src/admin/templets/sys_admin_user_add.htm @@ -4,8 +4,8 @@ 新增帐号 - + diff --git a/src/admin/templets/sys_admin_user_edit.htm b/src/admin/templets/sys_admin_user_edit.htm index 95e92b1d..9fc4d881 100644 --- a/src/admin/templets/sys_admin_user_edit.htm +++ b/src/admin/templets/sys_admin_user_edit.htm @@ -4,8 +4,8 @@ 修改帐号 - + diff --git a/src/admin/templets/sys_admin_user_tj.htm b/src/admin/templets/sys_admin_user_tj.htm index d35626e0..cd3c1d35 100644 --- a/src/admin/templets/sys_admin_user_tj.htm +++ b/src/admin/templets/sys_admin_user_tj.htm @@ -4,8 +4,8 @@ 绩效统计 - + diff --git a/src/admin/templets/sys_cache_up.htm b/src/admin/templets/sys_cache_up.htm index 2cadb816..f4ebba17 100644 --- a/src/admin/templets/sys_cache_up.htm +++ b/src/admin/templets/sys_cache_up.htm @@ -4,8 +4,8 @@ 更新系统缓存 - + diff --git a/src/admin/templets/sys_data.htm b/src/admin/templets/sys_data.htm index 00843033..25b79384 100644 --- a/src/admin/templets/sys_data.htm +++ b/src/admin/templets/sys_data.htm @@ -4,8 +4,8 @@ 数据库维护 - + diff --git a/src/admin/templets/sys_data_replace.htm b/src/admin/templets/sys_data_replace.htm index 16a5d640..d9a497c2 100644 --- a/src/admin/templets/sys_data_replace.htm +++ b/src/admin/templets/sys_data_replace.htm @@ -4,8 +4,8 @@ 数据批量替换 - + diff --git a/src/admin/templets/sys_data_revert.htm b/src/admin/templets/sys_data_revert.htm index 9a5675d9..62ea1170 100644 --- a/src/admin/templets/sys_data_revert.htm +++ b/src/admin/templets/sys_data_revert.htm @@ -4,8 +4,8 @@ 数据还原 - + diff --git a/src/admin/templets/sys_info_mark.htm b/src/admin/templets/sys_info_mark.htm index f0af7422..5171a21a 100644 --- a/src/admin/templets/sys_info_mark.htm +++ b/src/admin/templets/sys_info_mark.htm @@ -4,8 +4,8 @@ 图片水印设置 - + diff --git a/src/admin/templets/sys_payment.htm b/src/admin/templets/sys_payment.htm index 329e4e91..386814f0 100644 --- a/src/admin/templets/sys_payment.htm +++ b/src/admin/templets/sys_payment.htm @@ -4,8 +4,8 @@ 支付接口设置 - + diff --git a/src/admin/templets/sys_payment_install.htm b/src/admin/templets/sys_payment_install.htm index 0ea62c74..9cae26e4 100644 --- a/src/admin/templets/sys_payment_install.htm +++ b/src/admin/templets/sys_payment_install.htm @@ -4,8 +4,8 @@ 安装支付接口 - + diff --git a/src/admin/templets/sys_safetest.htm b/src/admin/templets/sys_safetest.htm index 2583eacf..8a6552eb 100644 --- a/src/admin/templets/sys_safetest.htm +++ b/src/admin/templets/sys_safetest.htm @@ -4,8 +4,8 @@ 病毒文件扫描 - + diff --git a/src/admin/templets/sys_sql_query.htm b/src/admin/templets/sys_sql_query.htm index 988b8b55..c6af6a6c 100644 --- a/src/admin/templets/sys_sql_query.htm +++ b/src/admin/templets/sys_sql_query.htm @@ -4,8 +4,8 @@ SQL命令行工具 - + diff --git a/src/admin/templets/tag_test.htm b/src/admin/templets/tag_test.htm index 0695a4e6..5507afeb 100644 --- a/src/admin/templets/tag_test.htm +++ b/src/admin/templets/tag_test.htm @@ -4,8 +4,8 @@ 全局标记测试 - + diff --git a/src/admin/templets/tags_main.htm b/src/admin/templets/tags_main.htm index 9697ae3f..192d618c 100644 --- a/src/admin/templets/tags_main.htm +++ b/src/admin/templets/tags_main.htm @@ -4,8 +4,8 @@ 标签管理 - + diff --git a/src/admin/templets/templets_default.htm b/src/admin/templets/templets_default.htm index 47d96942..648ef391 100644 --- a/src/admin/templets/templets_default.htm +++ b/src/admin/templets/templets_default.htm @@ -4,8 +4,8 @@ 模板管理器 - + diff --git a/src/admin/templets/templets_one_edit.htm b/src/admin/templets/templets_one_edit.htm index 9e360cff..a8d8afb1 100644 --- a/src/admin/templets/templets_one_edit.htm +++ b/src/admin/templets/templets_one_edit.htm @@ -4,8 +4,8 @@ 修改自定义页面 - + diff --git a/src/admin/templets/templets_tagsource.htm b/src/admin/templets/templets_tagsource.htm index edb2d3db..9fe301fd 100644 --- a/src/admin/templets/templets_tagsource.htm +++ b/src/admin/templets/templets_tagsource.htm @@ -4,8 +4,8 @@ 标签源码碎片管理 - + diff --git a/src/admin/templets/tpl_edit.htm b/src/admin/templets/tpl_edit.htm index eee65614..cb8d8803 100644 --- a/src/admin/templets/tpl_edit.htm +++ b/src/admin/templets/tpl_edit.htm @@ -4,8 +4,8 @@ 修改新建模板 - + diff --git a/src/admin/templets/tpl_edit_tag.htm b/src/admin/templets/tpl_edit_tag.htm index a6e389f4..81bcf7c4 100644 --- a/src/admin/templets/tpl_edit_tag.htm +++ b/src/admin/templets/tpl_edit_tag.htm @@ -4,8 +4,8 @@ 标签源码碎片管理 - + diff --git a/src/admin/templets/vote_add.htm b/src/admin/templets/vote_add.htm index 294ebf91..b7273380 100644 --- a/src/admin/templets/vote_add.htm +++ b/src/admin/templets/vote_add.htm @@ -4,8 +4,8 @@ 增加投票 - + diff --git a/src/admin/templets/vote_edit.htm b/src/admin/templets/vote_edit.htm index 36822016..bc612045 100644 --- a/src/admin/templets/vote_edit.htm +++ b/src/admin/templets/vote_edit.htm @@ -4,8 +4,8 @@ 投票管理 - + diff --git a/src/admin/templets/vote_getcode.htm b/src/admin/templets/vote_getcode.htm index ed8f98ea..6c775a1f 100644 --- a/src/admin/templets/vote_getcode.htm +++ b/src/admin/templets/vote_getcode.htm @@ -4,8 +4,8 @@ 获取代码 - + diff --git a/src/admin/templets/vote_main.htm b/src/admin/templets/vote_main.htm index 13327c4f..d06fa3f5 100644 --- a/src/admin/templets/vote_main.htm +++ b/src/admin/templets/vote_main.htm @@ -5,8 +5,8 @@ 投票管理 - + diff --git a/src/static/web/css/admin.css b/src/static/web/css/admin.css index 13d9226d..6c4fec1a 100644 --- a/src/static/web/css/admin.css +++ b/src/static/web/css/admin.css @@ -239,6 +239,69 @@ body.hidemenu .body-right { height:60px; line-height:60px } +.menu-box { + margin:0; + padding:1rem 5px; + background:#ffff +} +.menu { + width:100%; + background:#fff; + border-radius:.2rem; + box-shadow:0 .125rem .25rem rgba(0,0,0,.075) +} +.menu .link { + position:relative; + padding-left:50px; + display:block; + height:40px; + line-height:40px; + cursor:pointer; + transition:all .3s +} +.menu li:last-child .link { + border-bottom:0 +} +.menu li i { + position:absolute; + top:12px; + left:20px; + color:#545b62 +} +.menu li i.fa-angle-down { + right:20px; + left:auto +} +.menu li.open .link,.menu li.open i { + color:#28a745 +} +.menu li.open i.fa-angle-down { + transform:rotate(180deg) +} +.submenu { + display:none; + padding:5px 0; + background:#adb5bd; + border-radius:0 0 .2rem .2rem +} +.submenu li { + height:40px; + line-height:40px; + transition:all .3s +} +.submenu li:hover { + background:#28a745 +} +.submenu a { + float:left; + display:block; + padding:0 10px 0 50px; + color:#fff +} +.submenu-right { + float:right!important; + padding:0 20px 0 10px!important +} .coolbg { padding:.25rem .5rem; background:#f8f8f8; @@ -463,7 +526,7 @@ span.page-link { .biz-border { border:1px solid #dee2e6 } -.biz-td { +.biz-td,.nbiz-td { padding:.65rem; vertical-align:middle; border-bottom:1px solid #dee2e6 @@ -501,8 +564,8 @@ span.page-link { border-radius:.2rem; text-align:center } -#text { - font-size:0 +.card-body { + padding:1rem } .thumbnail { max-width:160px; @@ -514,6 +577,9 @@ span.page-link { height:20px; border-radius:.2rem } +#text { + font-size:0 +} #browsehappy { padding:20px 30px; font-size:14px; diff --git a/src/static/web/css/style.css b/src/static/web/css/style.css index d5d6832a..0ff5e76f 100644 --- a/src/static/web/css/style.css +++ b/src/static/web/css/style.css @@ -331,32 +331,38 @@ ul.items > li .source { .spec .card-body { padding:.25rem } -.flink,.flink a,.copyright,.copyright a { - color:#fff +.biz-title::before { + content:" "; + background:#28a745; + padding:6px; + margin-right:10px; + border-radius:.2rem +} +.breadcrumb { + margin-bottom:0 +} +.article-main h1,.article-main h2,.article-main h3,.article-main h4,.article-main h5,.article-main h6 { + margin-bottom:1rem; + font-size:24px +} +.article-meta span { + margin-right:1rem } .copyright { padding:.5rem; background:#12451F } -.btn-xs { - padding:2px; - line-height:12px; - font-size:12px +.flink,.flink a,.copyright,.copyright a { + color:#fff } .btn+.btn,.btn-text+.btn-text { margin-left:1rem } -.fa { - font-size:14px!important; - color:inherit -} .table { color:#545b62 } -.form-control { - height:36px; - line-height:36px; - font-size:14px +.form-control,.btn,.fa { + font-size:14px!important } .nav-link { padding:0 10px; @@ -369,22 +375,12 @@ ul.items > li .source { .user-login { line-height:40px } -.biz-title::before { - content:" "; - background:#28a745; - padding:6px; +.user-admin img { margin-right:10px; - border-radius:.2rem -} -.breadcrumb { - margin-bottom:0 -} -.article-main h1,.article-main h2,.article-main h3,.article-main h4,.article-main h5,.article-main h6 { - margin-bottom:1rem; - font-size:24px -} -.article-meta span { - margin-right:1rem + width:30px; + height:30px; + border-radius:50%; + border-bottom:1px solid #eee } #btnScrollTop { display:none; diff --git a/src/static/web/css/user.css b/src/static/web/css/user.css index 3a1a0105..fb3d94ac 100644 --- a/src/static/web/css/user.css +++ b/src/static/web/css/user.css @@ -1,6 +1,8 @@ -main.login-from { - padding-top:5rem; - height:600px; +body { + background:#f8f8f8 +} +.login-bg { + padding:6rem 0; background-image:url(../img/member_bg.jpg); background-repeat:no-repeat; background-position:top center @@ -27,20 +29,19 @@ main.login-from { line-height:40px; text-align:right } -.member .member-logo { +.member-logo { max-width:60px; min-height:60px; border-radius:50% } -.member .member-type span { +.member-type span { position:relative; - padding:.6rem; - top:-12px -} -.member .pannel { - background:#f8f8f8 + padding:.3rem; + font-size:14px; + font-weight:400; + top:-10px } -.member .pannel .dropdown { +.dropdown { display:inline-block; margin-left:.25rem; content:""; @@ -50,17 +51,17 @@ main.login-from { border-left:.3em solid transparent; vertical-align:.25rem } -.member .pannel .pannel-main .pannel-main-container { +.pannel-main .pannel-main-container { padding:1rem; background:#fff } -.member .list-group-item.active a { +.list-group-item.active a { color:#fff } -.member .member-menu .list-group-flush>.list-group-item { +.member-menu .list-group-flush>.list-group-item { cursor:pointer } -.member .pannel-main .nav-link.active { +.pannel-main .nav-link.active { font-weight:600 } .user-meter i { diff --git a/src/static/web/js/enums.js b/src/static/web/js/enums.js index f15a4c6a..014b093a 100644 --- a/src/static/web/js/enums.js +++ b/src/static/web/js/enums.js @@ -1,4 +1,4 @@ -//选择地区的二级分类(非通用调用) +//选择地区的二级分类 function selNext(oj, v) { var newobj = oj.options; diff --git a/src/static/web/js/qrcode.js b/src/static/web/js/qrcode.js index 0b63215a..f161226f 100644 --- a/src/static/web/js/qrcode.js +++ b/src/static/web/js/qrcode.js @@ -2,8 +2,6 @@ var dedeqrcodeLink = document.getElementById('__dedeqrcode_'+__dedeqrcode_id); dedeqrcodeLink.style.display = 'none'; var randNum = Math.floor(Math.random() * 2147483648).toString(36); var __dedeqrcode_src = "\""+__dedeqrcode_dir+"/qrcode.php?id="+__dedeqrcode_aid+"&type="+__dedeqrcode_type+"\""; - - document.writeln(""); document.writeln(" "); document.writeln(""); diff --git a/src/static/web/js/style.js b/src/static/web/js/style.js index f7e2b8be..c76aa5da 100644 --- a/src/static/web/js/style.js +++ b/src/static/web/js/style.js @@ -1,6 +1,4 @@ -/* Copyright 2020 The DedeBIZ.COM Authors. All rights reserved. -license that can be found in the LICENSE file. */ -// 滚动到页面顶部 +//滚动到页面顶部 function gotop() { $('html, body').animate({ scrollTop: 0 }, 'slow'); } @@ -24,19 +22,14 @@ function SetCookie(c_name, value, expiredays) { exdate.setDate(exdate.getDate() + expiredays); document.cookie = c_name + "=" + escape(value) + ((expiredays == null) ? "" : ";expires=" + exdate.toGMTString()); //使设置的有效时间正确。增加toGMTString() } -//------------------------------------------------------------------------------------------- -// 全局消息提示框 -//------------------------------------------------------------------------------------------- -//生成一个随机ID +//全局消息提示框，生成一个随机id function guid() { function S4() { return (((1 + Math.random()) * 0x10000) | 0).toString(16).substring(1); } return (S4() + S4() + "-" + S4() + "-" + S4() + "-" + S4() + "-" + S4() + S4() + S4()); } -//函数会返回一个modalID，通过这个ID可自已定义一些方法 -//这里用到了一个展开语法 -//https://developer.mozilla.org/zh-CN/docs/Web/JavaScript/Reference/Operators/Spread_syntax +//函数会返回一个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 = ""; @@ -44,7 +37,7 @@ function ShowMsg(content, ...args) { var footer = ``; var noClose = false; if (args.length == 1) { - // 存在args参数 + //存在args参数 if (typeof args[0].title !== 'undefined' && args[0].title != "") { title = args[0].title; } @@ -100,10 +93,7 @@ function ShowAlert(ele, content, type, showtime = 3000) { $(ele).html(""); }, showtime); } -//------------------------------------------------------------------------------------------- -// 纠错扩展 -//------------------------------------------------------------------------------------------- -// 提交纠错信息 +//提交纠错信息 function ErrAddSaveDo(modalID) { let aid = $("#iptID").val(); let title = $("#iptTitle").val(); @@ -172,7 +162,7 @@ function ErrorAddSave(id, title) { 'footer': footer, }); } -// 页面加载触发 +//页面加载触发 $(document).ready(function () { window.onscroll = function () { scrollFunction() }; function scrollFunction() { diff --git a/src/system/dedemodule.class.php b/src/system/dedemodule.class.php index 61dd73a4..96b70c53 100755 --- a/src/system/dedemodule.class.php +++ b/src/system/dedemodule.class.php @@ -1,7 +1,7 @@ M_ID)) return; if ($cfg_ml->M_Spacesta == -2) { ShowMsg("您已经被禁言，请与管理员联系", "-1"); @@ -458,12 +458,24 @@ class MemberLogin $sta .= "您目前的身份是：".$row['membername']; $rs = $dsql->GetOne("Select id From `#@__admin` where userid='".$this->M_LoginID."'"); if (!is_array($rs)) { - if ($this->M_Rank > 10 && $this->M_HasDay > 0) $sta .= " 剩余天数: ".$this->M_HasDay." 天 "; + if ($this->M_Rank > 10 && $this->M_HasDay > 0) $sta .= " 剩余天数：".$this->M_HasDay."天"; elseif ($this->M_Rank > 10) $sta .= " 会员升级已经到期 "; } } - $sta .= " 拥有金币：{$this->M_Money} 个， 积分：{$this->M_Scores} 分"; + $sta .= " 拥有金币：{$this->M_Money} 个，积分：{$this->M_Scores}分"; return $sta; } + //获取能够发布内容的频道 + public static function GetEnabledChannels() { + global $dsql; + $result = array(); + $dsql->SetQuery("SELECT channeltype FROM `#@__arctype` GROUP BY channeltype"); + $dsql->Execute(); + $candoChannel = ''; + while ($row = $dsql->GetObject()) { + $result[] = $row->channeltype; + } + return $result; + } }//End Class ?> \ No newline at end of file diff --git a/src/system/taglib/flinktype.lib.php b/src/system/taglib/flinktype.lib.php index f4214c84..1f6ac255 100755 --- a/src/system/taglib/flinktype.lib.php +++ b/src/system/taglib/flinktype.lib.php @@ -18,7 +18,7 @@ function lib_flinktype(&$ctag, &$refObj) extract($ctag->CAttribute->Items, EXTR_SKIP); $totalrow = $row; $revalue = ''; - $equery = "SELECT * FROM `#@__flinktype` order by id asc limit 0,$totalrow"; + $equery = "SELECT * FROM `#@__flinktype` ORDER BY id ASC LIMIT 0,$totalrow"; if (trim($ctag->GetInnerText()) == '') $innertext = "
  • [field:typename/]
    • "; else $innertext = $ctag->GetInnerText(); if (!isset($type)) $type = ''; diff --git a/src/system/typelink/typelink.class.php b/src/system/typelink/typelink.class.php index b50ad93a..31df2bc0 100755 --- a/src/system/typelink/typelink.class.php +++ b/src/system/typelink/typelink.class.php @@ -1,7 +1,7 @@ typeDir = ''; $this->OptionArrayList = ''; //载入类目信息 - $query = "SELECT tp.*,ch.typename as ctypename,ch.addtable,ch.issystem FROM `#@__arctype` tp left join `#@__channeltype` ch on ch.id=tp.channeltype WHERE tp.id='$typeid' "; + $query = "SELECT tp.*,ch.typename as ctypename,ch.addtable,ch.issystem FROM `#@__arctype` tp LEFT JOIN `#@__channeltype` ch on ch.id=tp.channeltype WHERE tp.id='$typeid' "; if ($typeid > 0) { $this->TypeInfos = $this->dsql->GetOne($query); if (is_array($this->TypeInfos)) { @@ -75,7 +75,7 @@ class TypeLink $this->typeDir = ""; $this->OptionArrayList = ""; //载入类目信息 - $query = " SELECT `#@__arctype`.*,`#@__channeltype`.typename as ctypename FROM `#@__arctype` LEFT JOIN `#@__channeltype` on `#@__channeltype`.id=`#@__arctype`.channeltype WHERE `#@__arctype`.id='$typeid' "; + $query = "SELECT `#@__arctype`.*,`#@__channeltype`.typename as ctypename FROM `#@__arctype` LEFT JOIN `#@__channeltype` on `#@__channeltype`.id=`#@__arctype`.channeltype WHERE `#@__arctype`.id='$typeid'"; $this->dsql->SetQuery($query); $this->TypeInfos = $this->dsql->GetOne(); } @@ -166,9 +166,9 @@ class TypeLink ); } //获得类别列表 - //hid 是指默认选中类目，0 表示“请选择类目”或“不限类目” - //oper 是用户允许管理的类目，0 表示所有类目 - //channeltype 是指类目的内容类型，0 表示不限频道 + //hid是指默认选中类目，0表示“请选择类目”或“不限类目” + //oper是用户允许管理的类目，0表示所有类目 + //channeltype是指类目的内容类型，0表示不限频道 function GetOptionArray($hid = 0, $oper = 0, $channeltype = 0, $usersg = 0) { return $this->GetOptionList($hid, $oper, $channeltype, $usersg); @@ -255,7 +255,7 @@ class TypeLink } /** * 获得与该类相关的类目，本函数应用于模板标记{dede:channel}{/dede:channel}中 - * $typetype 的值为：sun 下级分类 self 同级分类 top 顶级分类 + * $typetype 的值为：sun下级分类 self同级分类 top顶级分类 * * @access public * @param int $typeid 栏目id diff --git a/src/system/typelink/typeunit.class.admin.php b/src/system/typelink/typeunit.class.admin.php index 9296d682..0e834cfc 100755 --- a/src/system/typelink/typeunit.class.admin.php +++ b/src/system/typelink/typeunit.class.admin.php @@ -1,7 +1,7 @@ "; echo "
    "; } - echo ""; + echo ""; $lastid = GetCookie('lastCid'); if ($channel == $id || $lastid == $id || isset($GLOBALS['exallct']) || $cfg_admin_channel == 'array') { echo ""; @@ -192,7 +192,7 @@ class TypeUnit } $rank = $row->sortrank; if ($row->ishidden == '1') { - $nss = "[隐藏]"; + $nss = "隐藏"; } else { $nss = ''; } diff --git a/src/system/typelink/typeunit.class.menu.php b/src/system/typelink/typeunit.class.menu.php index 4ae122a9..697a317a 100755 --- a/src/system/typelink/typeunit.class.menu.php +++ b/src/system/typelink/typeunit.class.menu.php @@ -1,7 +1,7 @@ aChannels = explode(',', $catlogs); foreach ($this->aChannels as $cid) { if ($cfg_Cs[$cid][0] == 0) { - $this->dsql->SetQuery("Select id,ispart From `#@__arctype` where reid=$cid"); + $this->dsql->SetQuery("SELECT id,ispart FROM `#@__arctype` WHERE reid=$cid"); $this->dsql->Execute(); while ($row = $this->dsql->GetObject()) { //if ($row->ispart==1) @@ -104,11 +104,11 @@ class TypeUnit else { continue; } - echo "
    \r\n"; - echo "
    \r\n"; - echo "
    ".$typeName."
    \r\n"; + echo "
    \r\n"; + echo "
    \r\n"; + echo "
    ".$typeName."
    \r\n"; echo "
    \r\n"; - echo "
    "; + echo "
    "; if ($lastid == $id || $cfg_admin_channel == 'array') { $this->LogicListAllSunType($id, "　"); } @@ -161,7 +161,7 @@ class TypeUnit else { continue; } - echo "
    \r\n"; + echo "
    \r\n"; echo "\r\n"; echo "\r\n"; echo "\r\n"; diff --git a/src/system/typelink/typeunit.class.selector.php b/src/system/typelink/typeunit.class.selector.php index 4026c819..cbdf5461 100755 --- a/src/system/typelink/typeunit.class.selector.php +++ b/src/system/typelink/typeunit.class.selector.php @@ -1,7 +1,7 @@ {dede:wintitle/} - + diff --git a/src/theme/templet-dirlist.inc b/src/theme/templet-dirlist.inc index bee315ae..e66527e7 100644 --- a/src/theme/templet-dirlist.inc +++ b/src/theme/templet-dirlist.inc @@ -1,3 +1,3 @@ -default,默认模板文件目录 -plus,附加插件模板目录 +templets,默认模板文件目录 +plus,插件模板目录 system,默认底层模板目录 \ No newline at end of file diff --git a/src/theme/templet-filelist.inc b/src/theme/templet-filelist.inc index d23505b4..69cb56ff 100644 --- a/src/theme/templet-filelist.inc +++ b/src/theme/templet-filelist.inc @@ -1,38 +1,33 @@ -head.htm,列表页头部模板 -foot.htm,列表页底部模板 -index.htm,主页模板 -ajaxfeedback.htm,评论模板 -article_article.htm,文档内容页模板 -article_article1.htm,文档内容页模板 -article_article_frame.htm,文档内容页模板框架版 +advancedsearch.htm,高级搜索模板 +article_article.htm,文档内容模板 article_default.htm,自定义文档内容模板 -article_default_sg.htm,自定义单表文档内容模板 -article_image.htm,图片集内容页模板 -article_image_cl.htm,图片集内容页模板图集版 -article_image_frame.htm,图片集内容页模板框架版 -article_shop.htm,商品模型内容页模板 -article_soft.htm,软件内容页模板 -article_soft_frame.htm,软件内容页模板框架版 +article_default_sg.htm,自定义表单文档内容模板 +article_image.htm,图片集内容模板 article_infos.htm,分类信息内容模板 -article_spec.htm,专题内容页模板 -index_article.htm,文档频道封面 -index_default.htm,默认频道封面 -index_default_sg.htm,默认单表模型频道封面 -index_image.htm,默认图片模型封面 -index_shop.htm,默认网店模型封面 -index_soft.htm,默认软件模型封面 +article_shop.htm,商品内容模板 +article_soft.htm,软件内容模板 +article_spec.htm,专题内容模板 +foot.htm,底部模板 +head.htm,头部模板 +index.htm,主页模板 +index_article.htm,文档封面模板 +index_default.htm,频道封面模板 +index_default_sg.htm,频道表单封面模板 +index_image.htm,图片封面模板 index_infos.htm,分类信息封面模板 -list_article.htm,默认文档列表模板 -list_default.htm,默认自定义模型列表模板 -list_default_sg.htm,默认单表自定义模型列表模板 -list_free.htm,默认自由列表模板 -list_image.htm,默认图片列表模板 -list_soft.htm,默认软件列表模板 +index_shop.htm,商品封面模板 +index_soft.htm,软件封面模板 +list_article.htm,文档列表模板 +list_default.htm,自定义列表模板 +list_default_sg.htm,自定义列表表单模板 +list_free.htm,自由列表模板 +list_image.htm,图片列表模板 list_infos.htm,分类信息列表模板 -list_spec.htm,默认专题列表模板 -list_shop.htm,默认商城列表模板 +list_soft.htm,软件列表模板 +list_spec.htm,专题列表模板 +list_shop.htm,商城列表模板 search.htm,普通搜索模板 -advancedsearch.htm,高级搜索模板 singlepage.htm,单独页面模板 tag.htm,标签首页模板 -taglist.htm,特定标签内容列表模板 \ No newline at end of file +taglist.htm,特定标签内容列表模板 +top.htm,顶部模板 \ No newline at end of file diff --git a/src/theme/templet-pluslist.inc b/src/theme/templet-pluslist.inc index c1ec0a6c..60158be5 100644 --- a/src/theme/templet-pluslist.inc +++ b/src/theme/templet-pluslist.inc @@ -1,28 +1,13 @@ -start,默认插件模板说明 carbuyaction.htm,订单信息 download_links_templet.htm,下载地址列表 -erraddsave.htm,挑错处理 -feedback_confirm.htm,评论重确认页面 -feedback_quote.htm,评论回复页面 -feedback_templet.htm,评论页 -feedback_templet_js.htm,评论js调用模板 flink-add.htm,增加友情链接 flink-list.htm,友情链接列表 heightsearch.htm,高级搜索 -js.htm,js调用默认模板 -list_diyform.htm,自定义表单默认内容列表 -post_diyform.htm,自定义表单发送内容页 +list_diyform.htm,自定义表单内容列表 +post_diyform.htm,自定义表单发送内容 recommend.htm,文档推荐 -rss.htm,RSS模板 -rssmap.htm,RSS地图模板 -shops_action_alipay.htm,支付宝支付模板 -shops_action_cbpayment.htm,网银在线支付模板 -shops_action_nps.htm,NPS支付模板 -shops_action_tenpay.htm,财付通支付模板 -shops_bank.htm,银行账号信息 showphoto.htm,图集图片展示页 -sitemap.htm,网站地图 -view_diyform.htm,自定义表单内容查看页 -view_msg.htm,需要权限的文档提示信息 +view_diyform.htm,自定义表单内容查看 +view_msg.htm,权限文档提示信息 vote.htm,投票模板 -win_templet.htm,默认通用窗口 \ No newline at end of file +win_templet.htm,通用窗口 \ No newline at end of file diff --git a/src/theme/templets/foot.htm b/src/theme/templets/foot.htm index 14607527..76d85652 100644 --- a/src/theme/templets/foot.htm +++ b/src/theme/templets/foot.htm @@ -1,4 +1,4 @@ -
    +

    {dede:global.cfg_powerby/} Powered by DedeBIZ开发团队

    友情连接：{dede:flink row='20'/}

    @@ -16,7 +16,7 @@ $.get("{dede:global.cfg_cmsurl/}/user/ajax_loginsta.php?format=json",function(data) { let result = JSON.parse(data); if (result.code === 200) { - $("#_login").html(`${result.data.username}`); + $("#_login").html(`${result.data.username}${result.data.username}`); $("#iptUsername").val(result.data.username); $("#iptUsername").attr("disabled", "disabled"); $(".areaValidate").hide(); diff --git a/src/theme/templets/list_infos.htm b/src/theme/templets/list_infos.htm index 04827564..6412fbad 100644 --- a/src/theme/templets/list_infos.htm +++ b/src/theme/templets/list_infos.htm @@ -72,7 +72,7 @@
    {dede:include comment='栏目列表' filename='widget_channels.htm'/} -
    +
    信息搜索
    diff --git a/src/theme/templets/top.htm b/src/theme/templets/top.htm index 36f19c97..6fb4655b 100644 --- a/src/theme/templets/top.htm +++ b/src/theme/templets/top.htm @@ -1,8 +1,8 @@ -
    +
    - -
    ".$step.$timg."".$typeName."
    - - - -
    显示隐藏图片[]的选框
    - - - - - - - - - - - - -
    图片
    本地上传： -
    - -
    简介：
    - Clear(); - ?> -

    - -
    - - -
    - - +
    +
    +
    +
    + +
    + + + + + + + +
    + +
    -
    +
    + +
    +
    +
    + +
    +
    +
    + +
    + "; + echo $typeOptions; + echo ""; + ?> + *（不能选择带颜色的分类） +
    +
    +
    + +
    +
    + + + + + +
    + + + + +
    每页图片数：
    +
    +
    + + 图片数目： + （最大60幅） +
    +
    + CTags)) + { + foreach($dtp->CTags as $ctag){ + if ($ctag->GetName()=="img"){ + ?> + + + + +
    显示隐藏图片[]的选框
    + + + + + + + + + + + + +
    图片
    本地上传： +
    + +
    简介：
    + Clear(); + ?> +

    + +
    + + +
    +
    - + \ No newline at end of file diff --git a/src/user/templets/archives_add.htm b/src/user/templets/archives_add.htm index e0a97e8e..3d81396d 100755 --- a/src/user/templets/archives_add.htm +++ b/src/user/templets/archives_add.htm @@ -12,90 +12,74 @@ -
    -
    -
    -
    -
    -
    - -
    - - -
    -
    - -
    - -
    -
    -
    - -
    - -
    -
    -
    - -
    - -
    -
    -
    - -
    - "; - echo ""; - echo $typeOptions; - echo ""; - ?> - *（不能选择带颜色的分类） -
    -
    -
    - -
    - -
    -
    - - M_ID === 0){ - ?> -
    - -
    - - -
    -
    - -
    - - -
    -
    +
    +
    +
    +
    + + + + +
    + +
    +
    +
    + +
    +
    +
    + +
    +
    +
    + +
    + "; + echo ""; + echo $typeOptions; + echo ""; + ?> + *（不能选择带颜色的分类）
    - +
    +
    + +
    +
    + + M_ID === 0){ + ?> +
    + +
    + + +
    +
    + +
    + + +
    -
    +
    -
    + @@ -12,146 +12,106 @@ -
    -
    -
    -
    - - -
    -
    - -
    - - -
    - -
    - -
    -
    -
    - -
    - M_LoginID;?> -
    -
    -
    - -
    - -
    - - 个人会员该项为昵称，企业会员填写公司名称 - -
    -
    - -
    - -
    -
    -
    - -
    - -
    - - 不修改密码请保留此项为空 - -
    -
    - -
    - -
    - - 不修改密码请保留此项为空 - -
    -
    - -
    - -
    - - 忘记密码时重设密码用 - -
    -
    - -
    - -
    -
    -
    - -
    - -
    - - 不修改不用填写 - -
    -
    - -
    - -
    -
    -
    - -
    - -
    - - 每个电子邮邮箱只能注册一个帐号，要修改电子邮箱必须填写正确安全问题的答案 - -
    -
    - -
    - - - -
    -
    -
    - -
    -
    - - -
    -
    -
    -
    -
    +
    +
    + + +
    +
    + + + + +
    + +
    +
    +
    + +
    M_LoginID;?>
    +
    +
    + +
    + 个人会员该项为昵称，企业会员填写公司名称 +
    +
    + +
    +
    +
    + +
    + 不修改密码请保留此项为空 +
    +
    + +
    + 不修改密码请保留此项为空 +
    +
    + +
    + +
    + 忘记密码时重设密码用 +
    +
    + +
    +
    +
    + +
    + +
    + 不修改不用填写 +
    +
    + +
    +
    +
    + +
    + 每个电子邮邮箱只能注册一个帐号，要修改电子邮箱必须填写正确安全问题的答案 +
    +
    + +
    + + + +
    +
    +
    + +
    +
    + +
    - +
    +
    +
    +
    -
    +
    -
    + - - - -
    -
    - -
    -
    - - - \ No newline at end of file + \ No newline at end of file diff --git a/src/user/templets/index.htm b/src/user/templets/index.htm index 318c8170..555e8078 100755 --- a/src/user/templets/index.htm +++ b/src/user/templets/index.htm @@ -12,104 +12,96 @@ -
    -
    -
    -
    - - -
    -
    -
    -
    - -
    M_MbType;?>
    -
    -
    -

    M_LoginID;?>

    -

    积分：M_Scores;?> 金币：M_Money;?> 充值

    -
    -
    +
    +
    + + +
    +
    +
    +
    + +
    M_LoginID;?>
    -
    -
    - -
    +
    +

    M_MbType;?>积分：M_Scores;?> 金币：M_Money;?>

    +
    -
    -
    -
    -
    最新内容
    -
    -
      - -
      • - -
    +
    +
    +
    +
    +
    +
    钱包积分
    +     + +
  • + +
    + +
    +
    订单管理
    +     +
    • +
  • + +
    + +
    +
    我的收藏
    +     +
    • +
  • + +
    + +
    +
    账号安全
    +     +
    • + +
    +
    +
    +
    +
    +

    最新内容

    +
    +
      + +
      • + +
    -
    -
    + \ No newline at end of file diff --git a/src/user/templets/info.htm b/src/user/templets/info.htm index 097baffd..37cf1bd9 100644 --- a/src/user/templets/info.htm +++ b/src/user/templets/info.htm @@ -1,25 +1,13 @@
    - - - +
    M_MbType;?>用户
    -
    -

    M_LoginID;?>

    -
    -
    积分：M_Scores;?> - 金币：M_Money;?> 充值 -
    +

    M_LoginID;?>

    +
    积分：M_Scores;?> 金币：M_Money;?> 充值
    \ No newline at end of file diff --git a/src/user/templets/login.htm b/src/user/templets/login.htm index f654d7ca..29cd010e 100755 --- a/src/user/templets/login.htm +++ b/src/user/templets/login.htm @@ -3,7 +3,7 @@ - <?php echo $cfg_webname;?>-会员登录 + 会员登录-<?php echo $cfg_webname;?> @@ -12,30 +12,34 @@ -
    -
    -
    + \ No newline at end of file diff --git a/src/user/templets/menu.htm b/src/user/templets/menu.htm index 5fa8541b..32b6bb41 100644 --- a/src/user/templets/menu.htm +++ b/src/user/templets/menu.htm @@ -6,17 +6,18 @@ while ($channel = $dsql->GetArray('addmod')) { } ?>
    -
    @@ -12,33 +12,37 @@ -
    -
    -
    + @@ -43,9 +43,9 @@ -
    -
    -
    +
    +
    +

    找回密码第一步还没注册

    @@ -70,7 +70,7 @@
    -
    + \ No newline at end of file diff --git a/src/user/templets/resetpassword2.htm b/src/user/templets/resetpassword2.htm index 32cb7e34..8bf813b8 100755 --- a/src/user/templets/resetpassword2.htm +++ b/src/user/templets/resetpassword2.htm @@ -3,7 +3,7 @@ - 密码帮手-找回密码第二步 + 找回密码第二步-<?php echo $cfg_webname;?> @@ -12,9 +12,9 @@ -
    -
    -
    +
    +
    +

    找回密码第二步还没注册

    @@ -34,7 +34,7 @@
    -
    + diff --git a/src/user/templets/resetpassword3.htm b/src/user/templets/resetpassword3.htm index ea8385da..ef44a86b 100755 --- a/src/user/templets/resetpassword3.htm +++ b/src/user/templets/resetpassword3.htm @@ -3,7 +3,7 @@ - 密码帮手-找回密码第三步 + 找回密码第三步-<?php echo $cfg_webname;?> @@ -12,9 +12,9 @@ -
    -
    -
    +
    +
    +

    找回密码第三步还没注册

    @@ -34,7 +34,7 @@
    -
    + \ No newline at end of file diff --git a/src/user/templets/shops_action_payment.htm b/src/user/templets/shops_action_payment.htm index dff3c5b8..9d1e61a2 100755 --- a/src/user/templets/shops_action_payment.htm +++ b/src/user/templets/shops_action_payment.htm @@ -10,59 +10,61 @@ - +
    -
    商品购买
    -
    - - - - - - - -
    下单购买买家付款确认收货交易结束
    - - +
    +
    +

    商品购买

    +
    - + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    确认订单并付款下单购买买家付款确认收货交易结束
    订单编号:{dede:var.carts.orders_id/}
    商品总数:{dede:var.carts.cart_count/}件
    商品名称:{dede:var.pay_name/}
    订单价格:{dede:var.carts.price_count/} 元
    支付方式:{dede:var.pay_way/}
    支付信息:{dede:var.description/}
    - {dede:var.button/} -
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    确认订单并付款
    订单编号:{dede:var.carts.orders_id/}
    商品总数:{dede:var.carts.cart_count/}件
    商品名称:{dede:var.pay_name/}
    订单价格:{dede:var.carts.price_count/} 元
    支付方式:{dede:var.pay_way/}
    支付信息:{dede:var.description/}
    + {dede:var.button/} +
    +
    diff --git a/src/user/templets/shops_orders.htm b/src/user/templets/shops_orders.htm index d83e4096..0e09f3be 100755 --- a/src/user/templets/shops_orders.htm +++ b/src/user/templets/shops_orders.htm @@ -12,76 +12,66 @@ -
    -
    -
    -
    - - -
    -
    -
    - -
    -
    -
    - -
    - -
    -
    -
    -
    - - - - - - - - - - - - - - {dede:datalist} - - - - - - - - - {/dede:datalist} - - - - - -
    订单号状态数量总计时间
    {dede:field.oid/}{dede:field.cartcount/}{dede:field.priceCount/}{dede:field.stime function="Mydate('Y-m-d h:i:s',@me)"/}
    - - -
    - +
    +
    + + +
    +
    +
    + +
    +
    +
    +
    + +
    -
    +
    + + + + + + + + + + + + + + {dede:datalist} + + + + + + + + + {/dede:datalist} + + + + + +
    订单号状态数量总计时间
    {dede:field.oid/}{dede:field.cartcount/}{dede:field.priceCount/}{dede:field.stime function="Mydate('Y-m-d h:i:s',@me)"/}
    + + +
    +
    -
    +