diff --git a/src/admin/templets/album_add.htm b/src/admin/templets/album_add.htm index 406769ca..82f538bb 100644 --- a/src/admin/templets/album_add.htm +++ b/src/admin/templets/album_add.htm @@ -409,7 +409,7 @@ - + diff --git a/src/admin/templets/album_edit.htm b/src/admin/templets/album_edit.htm index 5785dc54..02221ccf 100644 --- a/src/admin/templets/album_edit.htm +++ b/src/admin/templets/album_edit.htm @@ -459,7 +459,7 @@ - + diff --git a/src/admin/templets/archives_add.htm b/src/admin/templets/archives_add.htm index d756617f..c2c98c49 100644 --- a/src/admin/templets/archives_add.htm +++ b/src/admin/templets/archives_add.htm @@ -322,7 +322,7 @@ - + diff --git a/src/admin/templets/archives_edit.htm b/src/admin/templets/archives_edit.htm index fdae0740..957b9d59 100644 --- a/src/admin/templets/archives_edit.htm +++ b/src/admin/templets/archives_edit.htm @@ -312,7 +312,7 @@ - + diff --git a/src/admin/templets/archives_sg_add.htm b/src/admin/templets/archives_sg_add.htm index c01f3a5c..5db227fa 100644 --- a/src/admin/templets/archives_sg_add.htm +++ b/src/admin/templets/archives_sg_add.htm @@ -153,7 +153,7 @@ - + diff --git a/src/admin/templets/archives_sg_edit.htm b/src/admin/templets/archives_sg_edit.htm index 50b480a8..80c903da 100644 --- a/src/admin/templets/archives_sg_edit.htm +++ b/src/admin/templets/archives_sg_edit.htm @@ -152,7 +152,7 @@ - + diff --git a/src/admin/templets/article_add.htm b/src/admin/templets/article_add.htm index 3b1d8b7e..fa9074aa 100644 --- a/src/admin/templets/article_add.htm +++ b/src/admin/templets/article_add.htm @@ -355,7 +355,7 @@ - + diff --git a/src/admin/templets/article_edit.htm b/src/admin/templets/article_edit.htm index c2e9f6f6..35267204 100644 --- a/src/admin/templets/article_edit.htm +++ b/src/admin/templets/article_edit.htm @@ -333,7 +333,7 @@ - + diff --git a/src/admin/templets/catalog_add.htm b/src/admin/templets/catalog_add.htm index 3a93d8c1..aac80406 100644 --- a/src/admin/templets/catalog_add.htm +++ b/src/admin/templets/catalog_add.htm @@ -461,7 +461,7 @@ - 返回 + 返回 diff --git a/src/admin/templets/catalog_add_quick.htm b/src/admin/templets/catalog_add_quick.htm index d849d38e..002e6d16 100644 --- a/src/admin/templets/catalog_add_quick.htm +++ b/src/admin/templets/catalog_add_quick.htm @@ -257,7 +257,7 @@ - 返回 + 返回 diff --git a/src/admin/templets/catalog_edit.htm b/src/admin/templets/catalog_edit.htm index 58082676..b1d95734 100644 --- a/src/admin/templets/catalog_edit.htm +++ b/src/admin/templets/catalog_edit.htm @@ -418,7 +418,7 @@ - 返回 + 返回 diff --git a/src/admin/templets/diy_add.htm b/src/admin/templets/diy_add.htm index 1c2f21e5..231ecc39 100644 --- a/src/admin/templets/diy_add.htm +++ b/src/admin/templets/diy_add.htm @@ -65,7 +65,7 @@ - + diff --git a/src/admin/templets/diy_edit.htm b/src/admin/templets/diy_edit.htm index 6b789867..56418192 100644 --- a/src/admin/templets/diy_edit.htm +++ b/src/admin/templets/diy_edit.htm @@ -127,7 +127,7 @@ - + diff --git a/src/admin/templets/diy_edit_content.htm b/src/admin/templets/diy_edit_content.htm index 71ad6725..d4be9e80 100644 --- a/src/admin/templets/diy_edit_content.htm +++ b/src/admin/templets/diy_edit_content.htm @@ -48,8 +48,7 @@ - + diff --git a/src/admin/templets/diy_field_add.htm b/src/admin/templets/diy_field_add.htm index 813468cf..df9b1816 100644 --- a/src/admin/templets/diy_field_add.htm +++ b/src/admin/templets/diy_field_add.htm @@ -135,7 +135,7 @@ - + diff --git a/src/admin/templets/diy_field_edit.htm b/src/admin/templets/diy_field_edit.htm index 0329087d..13a5b7f7 100644 --- a/src/admin/templets/diy_field_edit.htm +++ b/src/admin/templets/diy_field_edit.htm @@ -130,7 +130,7 @@ - + diff --git a/src/admin/templets/diy_post.htm b/src/admin/templets/diy_post.htm index e4bf3707..4ed0fefe 100644 --- a/src/admin/templets/diy_post.htm +++ b/src/admin/templets/diy_post.htm @@ -27,8 +27,8 @@
- - + +
diff --git a/src/admin/templets/feedback_edit.htm b/src/admin/templets/feedback_edit.htm index 662e26ab..e486fe7c 100644 --- a/src/admin/templets/feedback_edit.htm +++ b/src/admin/templets/feedback_edit.htm @@ -51,7 +51,7 @@ - + diff --git a/src/admin/templets/file_edit.htm b/src/admin/templets/file_edit.htm index 186c77e3..ffcc75ca 100644 --- a/src/admin/templets/file_edit.htm +++ b/src/admin/templets/file_edit.htm @@ -51,7 +51,7 @@ - + diff --git a/src/admin/templets/file_upload.htm b/src/admin/templets/file_upload.htm index 9712f36e..9def09de 100644 --- a/src/admin/templets/file_upload.htm +++ b/src/admin/templets/file_upload.htm @@ -30,7 +30,7 @@

- 返回{dede:global name='activepath'/}目录 + 返回{dede:global name='activepath'/}目录

diff --git a/src/admin/templets/friendlink_add.htm b/src/admin/templets/friendlink_add.htm index 3f3bf4c5..291b52a7 100644 --- a/src/admin/templets/friendlink_add.htm +++ b/src/admin/templets/friendlink_add.htm @@ -87,7 +87,7 @@ - + diff --git a/src/admin/templets/friendlink_edit.htm b/src/admin/templets/friendlink_edit.htm index 8dff2f04..3f86c7de 100644 --- a/src/admin/templets/friendlink_edit.htm +++ b/src/admin/templets/friendlink_edit.htm @@ -70,7 +70,7 @@ - + diff --git a/src/admin/templets/member_toadmin.htm b/src/admin/templets/member_toadmin.htm index bc0d4d31..38245ec9 100644 --- a/src/admin/templets/member_toadmin.htm +++ b/src/admin/templets/member_toadmin.htm @@ -95,7 +95,7 @@ - + diff --git a/src/admin/templets/member_view.htm b/src/admin/templets/member_view.htm index eabd1e0b..4329ffd1 100644 --- a/src/admin/templets/member_view.htm +++ b/src/admin/templets/member_view.htm @@ -174,7 +174,7 @@ - + diff --git a/src/admin/templets/module_edit.htm b/src/admin/templets/module_edit.htm index 8e93a86a..7f045ad0 100644 --- a/src/admin/templets/module_edit.htm +++ b/src/admin/templets/module_edit.htm @@ -165,8 +165,8 @@ - - + + diff --git a/src/admin/templets/module_make.htm b/src/admin/templets/module_make.htm index 079363dd..2d082f4b 100644 --- a/src/admin/templets/module_make.htm +++ b/src/admin/templets/module_make.htm @@ -157,8 +157,8 @@ - - + + diff --git a/src/admin/templets/mychannel_add.htm b/src/admin/templets/mychannel_add.htm index faf7a6a9..4da05c22 100644 --- a/src/admin/templets/mychannel_add.htm +++ b/src/admin/templets/mychannel_add.htm @@ -171,7 +171,7 @@ - + diff --git a/src/admin/templets/mychannel_edit.htm b/src/admin/templets/mychannel_edit.htm index 1be3d3dd..1ec17f08 100644 --- a/src/admin/templets/mychannel_edit.htm +++ b/src/admin/templets/mychannel_edit.htm @@ -279,7 +279,7 @@ - + diff --git a/src/admin/templets/mychannel_field_add.htm b/src/admin/templets/mychannel_field_add.htm index b8aeec29..74a1e531 100644 --- a/src/admin/templets/mychannel_field_add.htm +++ b/src/admin/templets/mychannel_field_add.htm @@ -198,7 +198,7 @@ - + diff --git a/src/admin/templets/mychannel_field_edit.htm b/src/admin/templets/mychannel_field_edit.htm index 0421cf0d..411bc1c4 100644 --- a/src/admin/templets/mychannel_field_edit.htm +++ b/src/admin/templets/mychannel_field_edit.htm @@ -192,7 +192,7 @@ - + diff --git a/src/admin/templets/mychannel_modifysearch.htm b/src/admin/templets/mychannel_modifysearch.htm index ca03f296..e1c13072 100644 --- a/src/admin/templets/mychannel_modifysearch.htm +++ b/src/admin/templets/mychannel_modifysearch.htm @@ -46,7 +46,7 @@ - + diff --git a/src/admin/templets/soft_add.htm b/src/admin/templets/soft_add.htm index 8ecaeafd..0615acfd 100644 --- a/src/admin/templets/soft_add.htm +++ b/src/admin/templets/soft_add.htm @@ -503,7 +503,7 @@ - + diff --git a/src/admin/templets/soft_config.htm b/src/admin/templets/soft_config.htm index d6883078..b4858d1c 100644 --- a/src/admin/templets/soft_config.htm +++ b/src/admin/templets/soft_config.htm @@ -115,7 +115,7 @@ - + diff --git a/src/admin/templets/soft_edit.htm b/src/admin/templets/soft_edit.htm index 630bfa37..d5f5c179 100644 --- a/src/admin/templets/soft_edit.htm +++ b/src/admin/templets/soft_edit.htm @@ -461,7 +461,7 @@ - + diff --git a/src/admin/templets/spec_add.htm b/src/admin/templets/spec_add.htm index b20aacd0..29857d7c 100644 --- a/src/admin/templets/spec_add.htm +++ b/src/admin/templets/spec_add.htm @@ -349,7 +349,7 @@ - + diff --git a/src/admin/templets/spec_edit.htm b/src/admin/templets/spec_edit.htm index 0c2222d9..090ca852 100644 --- a/src/admin/templets/spec_edit.htm +++ b/src/admin/templets/spec_edit.htm @@ -414,7 +414,7 @@ - + diff --git a/src/admin/templets/sys_admin_user_edit.htm b/src/admin/templets/sys_admin_user_edit.htm index c8e84a68..9bcda97f 100644 --- a/src/admin/templets/sys_admin_user_edit.htm +++ b/src/admin/templets/sys_admin_user_edit.htm @@ -79,7 +79,7 @@ - + diff --git a/src/admin/templets/sys_info.htm b/src/admin/templets/sys_info.htm index 928826e3..e076c935 100644 --- a/src/admin/templets/sys_info.htm +++ b/src/admin/templets/sys_info.htm @@ -209,7 +209,7 @@ - + diff --git a/src/admin/templets/sys_info_mark.htm b/src/admin/templets/sys_info_mark.htm index 1d5b74d3..997b7868 100644 --- a/src/admin/templets/sys_info_mark.htm +++ b/src/admin/templets/sys_info_mark.htm @@ -117,7 +117,7 @@ - + diff --git a/src/admin/templets/templets_one_add.htm b/src/admin/templets/templets_one_add.htm index 7a2df293..d3661ad3 100644 --- a/src/admin/templets/templets_one_add.htm +++ b/src/admin/templets/templets_one_add.htm @@ -86,7 +86,7 @@ - + diff --git a/src/admin/templets/templets_one_edit.htm b/src/admin/templets/templets_one_edit.htm index fe050571..eb664bd1 100644 --- a/src/admin/templets/templets_one_edit.htm +++ b/src/admin/templets/templets_one_edit.htm @@ -92,7 +92,7 @@ - + diff --git a/src/admin/templets/tpl_edit.htm b/src/admin/templets/tpl_edit.htm index d92e733e..56a307e9 100644 --- a/src/admin/templets/tpl_edit.htm +++ b/src/admin/templets/tpl_edit.htm @@ -95,7 +95,7 @@ - + diff --git a/src/admin/templets/tpl_edit_tag.htm b/src/admin/templets/tpl_edit_tag.htm index 8142ddc5..9da84083 100644 --- a/src/admin/templets/tpl_edit_tag.htm +++ b/src/admin/templets/tpl_edit_tag.htm @@ -53,7 +53,7 @@ - + diff --git a/src/admin/templets/tpl_newfile.htm b/src/admin/templets/tpl_newfile.htm index 174d4570..433dd553 100644 --- a/src/admin/templets/tpl_newfile.htm +++ b/src/admin/templets/tpl_newfile.htm @@ -33,8 +33,8 @@ - - + + diff --git a/src/admin/templets/vote_add.htm b/src/admin/templets/vote_add.htm index 012946e3..e2402362 100644 --- a/src/admin/templets/vote_add.htm +++ b/src/admin/templets/vote_add.htm @@ -117,8 +117,8 @@ 投票项: - - + + @@ -137,7 +137,7 @@ - + diff --git a/src/admin/templets/vote_edit.htm b/src/admin/templets/vote_edit.htm index aa1f409f..a7a8cb19 100644 --- a/src/admin/templets/vote_edit.htm +++ b/src/admin/templets/vote_edit.htm @@ -108,7 +108,7 @@ - + diff --git a/src/static/web/css/style.css b/src/static/web/css/style.css index 10581632..15662ad5 100644 --- a/src/static/web/css/style.css +++ b/src/static/web/css/style.css @@ -276,7 +276,7 @@ form.search { } .copyright { padding:.5rem; - background:#1e7e34 + background:#1eb867 } .flink,.flink a,.copyright,.copyright a { color:#fff diff --git a/src/system/helpers/channelunit.helper.php b/src/system/helpers/channelunit.helper.php index 95d6474d..f9eaea47 100755 --- a/src/system/helpers/channelunit.helper.php +++ b/src/system/helpers/channelunit.helper.php @@ -309,7 +309,7 @@ if (!function_exists('IsParent')) { } } /** - * 获取一个类目的顶级类目id + * 获取一个类目的顶级栏目id * * @param string $tid 栏目id * @return string diff --git a/src/system/libraries/oxwindow.class.php b/src/system/libraries/oxwindow.class.php index 8c4efb16..f37fa731 100755 --- a/src/system/libraries/oxwindow.class.php +++ b/src/system/libraries/oxwindow.class.php @@ -192,7 +192,7 @@ class OxWindow - + "; } else { diff --git a/src/system/taglib/channel.lib.php b/src/system/taglib/channel.lib.php index bf9e3713..ee1af800 100755 --- a/src/system/taglib/channel.lib.php +++ b/src/system/taglib/channel.lib.php @@ -61,7 +61,7 @@ function lib_channel(&$ctag, &$refObj) $dtp2 = new DedeTagParse(); $dtp2->SetNameSpace('field', '[', ']'); $dtp2->LoadSource($innertext); - //检查是否有子栏目,并返回rel提示(用于二级菜单) + //检查是否有子栏目,并返回rel提示用于二级菜单 if (preg_match('#:rel#', $innertext)) $needRel = true; if (empty($sql)) return ''; $dsql->SetQuery($sql); diff --git a/src/system/tpllib/plus_channel.php b/src/system/tpllib/plus_channel.php index fced8b9e..ff8c344c 100755 --- a/src/system/tpllib/plus_channel.php +++ b/src/system/tpllib/plus_channel.php @@ -49,7 +49,7 @@ function plus_channel(&$atts, &$refObj, &$fields) if ($reid == 0) return $reArray; $sql = "SELECT id,typename,typedir,isdefault,ispart,defaultname,namerule2,moresite,siteurl,sitepath FROM `#@__arctype` WHERE reid='$reid' AND ishidden<>1 ORDER BY sortrank ASC LIMIT 0, $line "; } - //检查是否有子栏目,并返回rel提示(用于二级菜单) + //检查是否有子栏目,并返回rel提示用于二级菜单 $needRel = true; if (empty($sql)) return $reArray; $dsql->Execute('me', $sql); diff --git a/src/system/typelink/typelink.class.php b/src/system/typelink/typelink.class.php index 3365b519..d018fba6 100755 --- a/src/system/typelink/typelink.class.php +++ b/src/system/typelink/typelink.class.php @@ -66,7 +66,7 @@ class TypeLink function Close() { } - //重设类目ID + //重设栏目id function SETtypeid($typeid) { $this->TypeID = $typeid; diff --git a/src/system/typelink/typeunit.class.admin.php b/src/system/typelink/typeunit.class.admin.php index 8b340b81..253bd610 100755 --- a/src/system/typelink/typeunit.class.admin.php +++ b/src/system/typelink/typeunit.class.admin.php @@ -243,7 +243,7 @@ class TypeUnit } } /** - * 返回与某个目相关的下级目录的类目ID列表(删除类目或文档时调用) + * 返回与某个目相关的下级目录的栏目id列表删除类目或文档时调用 * * @access public * @param int $id 栏目id diff --git a/src/system/userlogin.class.php b/src/system/userlogin.class.php index 2a74873d..9a9ca58a 100755 --- a/src/system/userlogin.class.php +++ b/src/system/userlogin.class.php @@ -54,7 +54,7 @@ function TestPurview($n) function CheckPurview($n) { if (!TestPurview($n)) { - ShowMsg("对不起,您没有权限执行此操作

点击此返回上一页>", 'javascript:;'); + ShowMsg("对不起,您没有权限执行此操作

点击返回上一页", 'javascript:;'); exit(); } } diff --git a/src/theme/plus/flink-add.htm b/src/theme/plus/flink-add.htm index 34659471..d04f870d 100644 --- a/src/theme/plus/flink-add.htm +++ b/src/theme/plus/flink-add.htm @@ -72,7 +72,7 @@ - + diff --git a/src/theme/plus/post_diyform.htm b/src/theme/plus/post_diyform.htm index 6145fcfe..47435851 100644 --- a/src/theme/plus/post_diyform.htm +++ b/src/theme/plus/post_diyform.htm @@ -24,7 +24,7 @@
- +
diff --git a/src/user/login.php b/src/user/login.php index 41923eff..7a58abfa 100755 --- a/src/user/login.php +++ b/src/user/login.php @@ -9,7 +9,7 @@ require_once(dirname(__FILE__)."/config.php"); $gourl = RemoveXSS($gourl); if ($cfg_ml->IsLogin()) { - ShowMsg('您已经登录系统,无需重新注册', 'index.php'); + ShowMsg('您已经登录,无需重新注册', 'index.php'); exit(); } require_once(dirname(__FILE__)."/templets/login.htm"); diff --git a/src/user/reg_new.php b/src/user/reg_new.php index 8c89989e..d209ac0b 100755 --- a/src/user/reg_new.php +++ b/src/user/reg_new.php @@ -15,7 +15,7 @@ if (!isset($dopost)) $dopost = ''; $step = empty($step) ? 1 : intval($step); if ($step == 1) { if ($cfg_ml->IsLogin()) { - ShowMsg('您已经登录系统,无需重新注册', 'index.php'); + ShowMsg('您已经登录,无需重新注册', 'index.php'); exit(); } if ($dopost == 'regbase') { @@ -96,7 +96,7 @@ if ($step == 1) { //模拟登录 $cfg_ml = new MemberLogin(7 * 3600); $rs = $cfg_ml->CheckUser($userid, $userpwd); - ShowMsg('您已经登录系统,无需重新注册', 'index.php'); + ShowMsg('您已经登录,无需重新注册', 'index.php'); exit; } else { ShowMsg("注册失败,请检查资料是否有误或与管理员联系", "-1"); @@ -106,10 +106,10 @@ if ($step == 1) { require_once(DEDEMEMBER."/templets/reg-new.htm"); } else { if (!$cfg_ml->IsLogin()) { - ShowMsg("尚未完成基本信息的注册,请返回重新填写", "index_do.php?fmdo=user&dopost=regnew"); + ShowMsg("您未填写基本信息,请填写基本信息", "index_do.php?fmdo=user&dopost=regnew"); exit; } else { - ShowMsg('您已经登录系统,无需重新注册', 'index.php'); + ShowMsg('您已经登录,无需重新注册', 'index.php'); exit; } } diff --git a/src/user/templets/album_add.htm b/src/user/templets/album_add.htm index 04ca7311..809d55bf 100755 --- a/src/user/templets/album_add.htm +++ b/src/user/templets/album_add.htm @@ -22,7 +22,7 @@ - 返回 + 返回
@@ -80,7 +80,7 @@
- +
diff --git a/src/user/templets/album_edit.htm b/src/user/templets/album_edit.htm index c132decd..ddffea39 100755 --- a/src/user/templets/album_edit.htm +++ b/src/user/templets/album_edit.htm @@ -22,7 +22,7 @@ - 返回 + 返回
@@ -109,7 +109,7 @@
- +
diff --git a/src/user/templets/archives_add.htm b/src/user/templets/archives_add.htm index b18c7e38..1aba3344 100755 --- a/src/user/templets/archives_add.htm +++ b/src/user/templets/archives_add.htm @@ -22,7 +22,7 @@ - 返回 + 返回
@@ -59,7 +59,7 @@
- +
diff --git a/src/user/templets/archives_edit.htm b/src/user/templets/archives_edit.htm index 8774aeab..ee71bad6 100755 --- a/src/user/templets/archives_edit.htm +++ b/src/user/templets/archives_edit.htm @@ -22,7 +22,7 @@ - 返回 + 返回
@@ -61,7 +61,7 @@ ?>
- +
diff --git a/src/user/templets/archives_sg_add.htm b/src/user/templets/archives_sg_add.htm index 4fb62df5..c1c95968 100755 --- a/src/user/templets/archives_sg_add.htm +++ b/src/user/templets/archives_sg_add.htm @@ -22,7 +22,7 @@ - 返回 + 返回
@@ -59,7 +59,7 @@
- +
diff --git a/src/user/templets/archives_sg_edit.htm b/src/user/templets/archives_sg_edit.htm index cb6de420..e112963c 100755 --- a/src/user/templets/archives_sg_edit.htm +++ b/src/user/templets/archives_sg_edit.htm @@ -22,7 +22,7 @@ - 返回 + 返回
@@ -57,7 +57,7 @@ ?>
- +
diff --git a/src/user/templets/article_add.htm b/src/user/templets/article_add.htm index 6c609c96..26b3e940 100755 --- a/src/user/templets/article_add.htm +++ b/src/user/templets/article_add.htm @@ -22,7 +22,7 @@ - 返回 + 返回
@@ -63,7 +63,7 @@
- +
diff --git a/src/user/templets/article_edit.htm b/src/user/templets/article_edit.htm index f501ecbf..587213f2 100755 --- a/src/user/templets/article_edit.htm +++ b/src/user/templets/article_edit.htm @@ -22,7 +22,7 @@ - 返回 + 返回
@@ -69,7 +69,7 @@
- +
diff --git a/src/user/templets/buy.htm b/src/user/templets/buy.htm index 5f337a5b..03e0f0c3 100755 --- a/src/user/templets/buy.htm +++ b/src/user/templets/buy.htm @@ -21,7 +21,7 @@ - 返回 + 返回
GetSta($dsql);?>
钱包积分 - 返回 + 返回
您申请购买的产品如下,确认无误后请点击“购买并支付”按钮,进行网上支付,如果支付失败,请与管理员联系其它支付方式

订单确认

diff --git a/src/user/templets/soft_add.htm b/src/user/templets/soft_add.htm index 30a86ae8..87c4550f 100755 --- a/src/user/templets/soft_add.htm +++ b/src/user/templets/soft_add.htm @@ -39,7 +39,7 @@ - 返回 + 返回
@@ -178,7 +178,7 @@
- +
diff --git a/src/user/templets/soft_edit.htm b/src/user/templets/soft_edit.htm index 0f7f8784..ab1fc54f 100755 --- a/src/user/templets/soft_edit.htm +++ b/src/user/templets/soft_edit.htm @@ -39,7 +39,7 @@ - 返回 + 返回
@@ -197,7 +197,7 @@
- +