From e7aa4f606baa25c1430098f35c2011500a9b247d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=8F=99=E8=BF=B0=E3=80=81=E5=88=AB=E7=A6=BB?=
 <93301500+xushubieli@users.noreply.github.com>
Date: Fri, 28 Apr 2023 15:37:52 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=8D=E7=A7=B0=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/admin/inc/inc_menu.php        | 24 ++++++++++++------------
 src/admin/inc/inc_menu_func.php   |  2 +-
 src/admin/inc/inc_menu_module.php |  4 ++--
 3 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/src/admin/inc/inc_menu.php b/src/admin/inc/inc_menu.php
index 47d2439c..8e7fdf81 100644
--- a/src/admin/inc/inc_menu.php
+++ b/src/admin/inc/inc_menu.php
@@ -35,13 +35,13 @@ $gitUrl = DEDEBIZURL."/git";
 $dedebizUrl = DEDEBIZURL;
 $adminMenu1 = $adminMenu2 = '';
 if ($cuserLogin->getUserType() >= 10) {
-    $adminMenu1 = (DEDEBIZ_SAFE_MODE? "" : "<m:top item='11_' name='模板管理' rank='temp_One,temp_Other,temp_MyTag,temp_test,temp_All' icon='fa-cube'>
+    $adminMenu1 = (DEDEBIZ_SAFE_MODE? "" : "<m:top item='11_' name='模板管理' rank='temp_One,temp_Other,temp_MyTag,temp_test,temp_All' icon='fa fa-cube'>
     <m:item name='默认模板管理' link='templets_main.php' rank='temp_All' target='main' />
     <m:item name='标签源码管理' link='templets_tagsource.php' rank='temp_All' target='main' />
     <m:item name='智能标记向导' link='mytag_tag_guide.php' rank='temp_Other' target='main' />
     <m:item name='全局标记测试' link='tag_test.php' rank='temp_Test' target='main' />
 </m:top>")."
-<m:top item='4_' name='模型管理' rank='t_List,t_AccList,c_List,temp_One' icon='fa-area-chart'>
+<m:top item='4_' name='模型管理' rank='t_List,t_AccList,c_List,temp_One' icon='fa fa-area-chart'>
     <m:item name='文档模型管理' link='mychannel_main.php' rank='c_List' target='main' />
     <m:item name='文档单页管理' link='templets_one.php' rank='temp_One' target='main' />
     <m:item name='联动类别管理' link='stepselect_main.php' rank='c_Stepseclect' target='main' />
@@ -50,14 +50,14 @@ if ($cuserLogin->getUserType() >= 10) {
     <m:item name='自定义文档属性' link='content_att.php' rank='sys_Att' target='main' />
     <m:item name='自定义表单管理' link='diy_main.php' rank='c_List' target='main' />
 </m:top>";
-  $adminMenu2 = "<m:top item='10_' name='支付工具' rank='sys_Data' icon='fa-credit-card'>
+  $adminMenu2 = "<m:top item='10_' name='财务管理' rank='sys_Data' icon='fa fa-credit-card'>
     <m:item name='积分产品管理' link='cards_manage.php' rank='sys_Data' target='main' />
     <m:item name='积分产品分类' link='cards_type.php' rank='sys_Data' target='main' />
     <m:item name='会员消费记录' link='member_operations.php' rank='sys_Data' target='main' />
     <m:item name='会员等级分类' link='member_type.php' rank='sys_Data' target='main' />
     <m:item name='支付接口设置' link='sys_payment.php' .php' rank='sys_Data' target='main' />
 </m:top>
-<m:top item='12_' name='系统设置' rank='sys_User,sys_Group,sys_Edit,sys_Log,sys_Data' icon='fa-cog'>
+<m:top item='12_' name='系统设置' rank='sys_User,sys_Group,sys_Edit,sys_Log,sys_Data' icon='fa fa-cog'>
     <m:item name='系统变量设置' link='sys_info.php' rank='sys_Edit' target='main' />
     <m:item name='系统日志管理' link='log_list.php' rank='sys_Log' target='main' />
     <m:item name='系统会员管理' link='sys_admin_user.php' rank='sys_User' target='main' />
@@ -71,7 +71,7 @@ if ($cuserLogin->getUserType() >= 10) {
     <m:item name='系统修复工具' link='sys_repair.php' rank='sys_verify' target='main' />
 </m:top>";
 }
-$menusMain = "<m:top item='1_' name='常用操作' icon='fa-desktop'>
+$menusMain = "<m:top item='1_' name='常用功能' icon='fa fa-desktop'>
     <m:item name='网站栏目管理' link='catalog_main.php' ischannel='1' addalt='创建栏目' linkadd='catalog_add.php?listtype=all' rank='t_List,t_AccList' target='main' />
     <m:item name='所有文档列表' link='content_list.php' rank='a_List,a_AccList' target='main' />
     <m:item name='待审核的文档' link='content_list.php?arcrank=-1' rank='a_Check,a_AccCheck' target='main' />
@@ -79,18 +79,18 @@ $menusMain = "<m:top item='1_' name='常用操作' icon='fa-desktop'>
     <m:item name='标签管理' link='tags_main.php' rank='sys_Keyword' target='main' />
     <m:item name='评论管理' link='feedback_main.php' rank='sys_Feedback' target='main' />
     <m:item name='专题管理' ischannel='1' link='content_s_list.php' linkadd='spec_add.php' channelid='-1' rank='spec_New' target='main' />
-    <m:item name='文档回收站' link='recycling.php' ischannel='1' addalt='清空文档' addico='fa-minus-circle' linkadd='archives_do.php?dopost=clear&aid=no&recycle=1' rank='a_List,a_AccList,a_MyList' target='main' />
+    <m:item name='文档回收站' link='recycling.php' ischannel='1' addalt='清空文档' addico='fa fa-minus-circle' linkadd='archives_do.php?dopost=clear&aid=no&recycle=1' rank='a_List,a_AccList,a_MyList' target='main' />
 </m:top>
-<m:top item='2_' name='文档管理' icon='fa-file-text'>
+<m:top item='2_' name='文档管理' icon='fa fa-file-text'>
     $addset
 </m:top>
-<m:top item='3_' name='附件管理' rank='sys_Upload,sys_MyUpload,plus_文件管理器' icon='fa-folder'>
+<m:top item='3_' name='附件管理' rank='sys_Upload,sys_MyUpload,plus_文件管理器' icon='fa fa-folder'>
     <m:item name='上传新文件' link='media_add.php' rank='' target='main' />
     <m:item name='附件管理' link='media_main.php' rank='sys_Upload,sys_MyUpload' target='main' />
     <m:item name='文件管理器' link='media_main.php?dopost=filemanager' rank='plus_文件管理器' target='main' />
 </m:top>
 $adminMenu1
-<m:top item='5_' name='批量维护' icon='fa-circle-o-notch'>
+<m:top item='5_' name='文档维护' icon='fa fa-circle-o-notch'>
     <m:item name='文档批量维护' link='content_batch_up.php' rank='sys_ArcBatch' target='main' />
     <m:item name='文档重复检测' link='article_test_same.php' rank='sys_ArcBatch' target='main' />
     <m:item name='文档关键词维护' link='article_keywords_main.php' rank='sys_Keyword' target='main' />
@@ -99,7 +99,7 @@ $adminMenu1
     ".(DEDEBIZ_SAFE_MODE? "" : "<m:item name='数据库字段替换' link='sys_data_replace.php' rank='sys_ArcBatch' target='main' />")."
 </m:top>
 {$GLOBALS['menusMoudle']}
-<m:top item='8_' name='更新网站' rank='sys_MakeHtml' icon='fa-repeat'>
+<m:top item='8_' name='更新网站' rank='sys_MakeHtml' icon='fa fa-repeat'>
     <m:item name='更新整站' link='makehtml_all.php' rank='sys_MakeHtml' target='main' />
     <m:item name='更新首页' link='makehtml_homepage.php' rank='sys_MakeHtml' target='main' />
     <m:item name='更新栏目' link='makehtml_list.php' rank='sys_MakeHtml' target='main' />
@@ -109,14 +109,14 @@ $adminMenu1
     <m:item name='更新列表' link='makehtml_freelist.php' rank='sys_MakeHtml' target='main' />
     <m:item name='更新缓存' link='sys_cache_up.php' rank='sys_ArcBatch' target='main' />
 </m:top>
-<m:top item='9_' name='会员管理' rank='member_List,member_Type' icon='fa-user-circle'>
+<m:top item='9_' name='会员管理' rank='member_List,member_Type' icon='fa fa-user-circle'>
     <m:item name='所有会员列表' link='member_main.php' rank='member_List' target='main' />
     <m:item name='会员短信管理' link='member_pm.php' rank='member_Type' target='main' />
     <m:item name='会员级别设置' link='member_rank.php' rank='member_Type' target='main' />
     <m:item name='积分头衔设置' link='member_scores.php' rank='member_Type' target='main' />
 </m:top>
 $adminMenu2
-<m:top item='12_' name='系统帮助' icon='fa-info-circle'>
+<m:top item='12_' name='系统帮助' icon='fa fa-info-circle'>
     <m:item name='系统概况' link='$cfg_biz_helpUrl' rank='' target='_blank' />
     <m:item name='代码托管' link='$cfg_biz_gitUrl' rank='' target='_blank' />
 </m:top>";
diff --git a/src/admin/inc/inc_menu_func.php b/src/admin/inc/inc_menu_func.php
index 6a279d79..804eb258 100644
--- a/src/admin/inc/inc_menu_func.php
+++ b/src/admin/inc/inc_menu_func.php
@@ -10,7 +10,7 @@
  */
 require_once(dirname(__FILE__)."/../config.php");
 require_once(DEDEINC."/dedetag.class.php");
-$headTemplet = '<li><div class="link"><i class="fa ~icon~"></i>~channelname~<i class="fa fa-angle-down"></i></div><ul class="submenu">';
+$headTemplet = '<li><div class="link"><i class="~icon~"></i><span>~channelname~</span><i class="fa fa-angle-down"></i></div><ul class="submenu">';
 $footTemplet = "</ul></li>";
 $itemTemplet = "<li>~link~</li>";
 function GetMenus($userrank, $topos = 'main')
diff --git a/src/admin/inc/inc_menu_module.php b/src/admin/inc/inc_menu_module.php
index 29f57105..523afab1 100644
--- a/src/admin/inc/inc_menu_module.php
+++ b/src/admin/inc/inc_menu_module.php
@@ -26,14 +26,14 @@ while ($row = $dsql->GetObject()) {
 }
 $adminMenu = '';
 if ($cuserLogin->getUserType() >= 10) {
-    $adminMenu = DEDEBIZ_SAFE_MODE? "" : "<m:top item='6_' name='模块管理' icon='fa-database'>
+    $adminMenu = DEDEBIZ_SAFE_MODE? "" : "<m:top item='6_' name='模块管理' icon='fa fa-database'>
     <m:item name='模块管理' link='module_main.php' rank='sys_module' target='main' />
     <m:item name='模块打包' link='module_make.php' rank='sys_module' target='main' />
     </m:top>";
 }
 $menusMoudle = "
 $adminMenu
-<m:top item='7_' name='插件管理' icon='fa-plug'>
+<m:top item='7_' name='插件管理' icon='fa fa-plug'>
     <m:item name='插件列表' link='plus_main.php' rank='10' target='main' />
     <m:item name='上传插件' link='module_upload.php' rank='sys_module' target='main' />
     $plusset