From cfa39f858d59fefcba6db0a69bb2a829cf08f56b Mon Sep 17 00:00:00 2001 From: gongfuxiang Date: Mon, 6 Feb 2023 18:30:08 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E7=AB=AF=E5=A4=9A=E8=AF=AD?= =?UTF-8?q?=E8=A8=80=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/admin/controller/Article.php | 3 +- app/admin/controller/Articlecategory.php | 8 +- app/admin/controller/Navigation.php | 4 +- app/admin/form/Admin.php | 53 ++-- app/admin/form/Article.php | 4 +- app/admin/form/User.php | 23 +- app/admin/lang/en-us.php | 83 ------ app/admin/lang/zh-cn.php | 83 ------ app/admin/view/default/admin/login_info.html | 16 +- app/admin/view/default/admin/save_info.html | 24 +- app/admin/view/default/answer/index.html | 2 +- .../view/default/appcenternav/save_info.html | 12 +- .../view/default/apphomenav/save_info.html | 6 +- app/admin/view/default/article/save_info.html | 20 +- .../view/default/articlecategory/index.html | 4 +- app/admin/view/default/brand/save_info.html | 18 +- .../view/default/brandcategory/index.html | 4 +- app/admin/view/default/power/index.html | 26 +- app/admin/view/default/role/detail.html | 4 +- app/admin/view/default/role/save_info.html | 12 +- app/api/controller/Article.php | 3 +- app/index/controller/Article.php | 7 +- app/lang/en-us.php | 233 ++++++++++++++++- app/lang/zh-cn.php | 238 ++++++++++++++++- app/service/AdminPowerService.php | 10 +- app/service/AdminRoleService.php | 18 +- app/service/AdminService.php | 135 ++++------ app/service/AgreementService.php | 2 +- app/service/AnswerService.php | 37 ++- app/service/AppCenterNavService.php | 10 +- app/service/AppHomeNavService.php | 5 +- app/service/AppMiniService.php | 65 +++-- app/service/AppMiniUserService.php | 76 +++--- app/service/AppService.php | 12 +- app/service/ArticleCategoryService.php | 242 ++++++++++++++++++ app/service/ArticleService.php | 228 +---------------- app/service/BrandCategoryService.php | 6 +- app/service/BrandService.php | 83 +++--- app/service/BuyService.php | 12 +- app/service/CustomViewService.php | 2 +- app/service/DesignService.php | 10 +- app/service/ExpressService.php | 4 +- app/service/FormTableService.php | 10 +- app/service/GoodsBrowseService.php | 4 +- app/service/GoodsCartService.php | 14 +- app/service/GoodsCommentsService.php | 8 +- app/service/GoodsFavorService.php | 8 +- app/service/GoodsParamsService.php | 2 +- app/service/GoodsService.php | 12 +- app/service/GoodsSpecService.php | 2 +- app/service/IntegralService.php | 4 +- app/service/LinkService.php | 2 +- app/service/MessageService.php | 4 +- app/service/NavigationService.php | 2 +- app/service/OrderAftersaleService.php | 8 +- app/service/OrderService.php | 36 +-- app/service/PackageInstallService.php | 2 +- app/service/PaymentService.php | 6 +- app/service/PluginsAdminService.php | 26 +- app/service/QuickNavService.php | 2 +- app/service/RegionService.php | 4 +- app/service/SafetyService.php | 26 +- app/service/ScreeningPriceService.php | 4 +- app/service/SlideService.php | 2 +- app/service/SystemUpgradeService.php | 4 +- app/service/ThemeService.php | 14 +- app/service/UserAddressService.php | 12 +- app/service/UserService.php | 92 +++---- app/service/WarehouseGoodsService.php | 10 +- app/service/WarehouseService.php | 2 +- 70 files changed, 1224 insertions(+), 945 deletions(-) create mode 100644 app/service/ArticleCategoryService.php diff --git a/app/admin/controller/Article.php b/app/admin/controller/Article.php index 419f40b41..e55cef723 100755 --- a/app/admin/controller/Article.php +++ b/app/admin/controller/Article.php @@ -13,6 +13,7 @@ namespace app\admin\controller; use app\admin\controller\Base; use app\service\ApiService; use app\service\ArticleService; +use app\service\ArticleCategoryService; use app\service\ResourcesService; /** @@ -64,7 +65,7 @@ class Article extends Base ]; // 文章分类 - $article_category = ArticleService::ArticleCategoryList(['field'=>'id,name']); + $article_category = ArticleCategoryService::ArticleCategoryList(['field'=>'id,name']); $assign['article_category_list'] = $article_category['data']; // 参数 diff --git a/app/admin/controller/Articlecategory.php b/app/admin/controller/Articlecategory.php index be5276386..70b6299df 100755 --- a/app/admin/controller/Articlecategory.php +++ b/app/admin/controller/Articlecategory.php @@ -12,7 +12,7 @@ namespace app\admin\controller; use app\admin\controller\Base; use app\service\ApiService; -use app\service\ArticleService; +use app\service\ArticleCategoryService; /** * 文章分类管理 @@ -44,7 +44,7 @@ class ArticleCategory extends Base */ public function GetNodeSon() { - return ApiService::ApiDataReturn(ArticleService::ArticleCategoryNodeSon($this->data_request)); + return ApiService::ApiDataReturn(ArticleCategoryService::ArticleCategoryNodeSon($this->data_request)); } /** @@ -56,7 +56,7 @@ class ArticleCategory extends Base */ public function Save() { - return ApiService::ApiDataReturn(ArticleService::ArticleCategorySave($this->data_request)); + return ApiService::ApiDataReturn(ArticleCategoryService::ArticleCategorySave($this->data_request)); } /** @@ -70,7 +70,7 @@ class ArticleCategory extends Base { $params = $this->data_post; $params['admin'] = $this->admin; - return ApiService::ApiDataReturn(ArticleService::ArticleCategoryDelete($params)); + return ApiService::ApiDataReturn(ArticleCategoryService::ArticleCategoryDelete($params)); } } ?> \ No newline at end of file diff --git a/app/admin/controller/Navigation.php b/app/admin/controller/Navigation.php index 69f83a782..1c79ebf25 100755 --- a/app/admin/controller/Navigation.php +++ b/app/admin/controller/Navigation.php @@ -12,7 +12,7 @@ namespace app\admin\controller; use app\admin\controller\Base; use app\service\ApiService; -use app\service\ArticleService; +use app\service\ArticleCategoryService; use app\service\NavigationService; use app\service\GoodsService; use app\service\CustomViewService; @@ -78,7 +78,7 @@ class Navigation extends Base $assign['data_list'] = $ret['data']; // 获取分类和文章 - $article_category_content = ArticleService::ArticleCategoryListContent(); + $article_category_content = ArticleCategoryService::ArticleCategoryListContent(); $assign['article_list'] = $article_category_content['data']; // 自定义页面 diff --git a/app/admin/form/Admin.php b/app/admin/form/Admin.php index 6d36ccfa2..336a3b9b1 100644 --- a/app/admin/form/Admin.php +++ b/app/admin/form/Admin.php @@ -25,6 +25,27 @@ class Admin // 基础条件 public $condition_base = []; + // 角色列表 + public $role_list; + + /** + * @author Devil + * @blog http://gong.gg/ + * @version 1.0.0 + * @date 2020-06-29 + * @desc description + * @param [array] $params [输入参数] + */ + public function __construct($params = []) + { + // 角色列表 + $res = AdminService::RoleList([ + 'where' => ['is_enable'=>1], + 'field' => 'id,name', + ]); + $this->role_list = empty($res['data']) ? [] : array_column($res['data'], null, 'id'); + } + /** * 入口 * @author Devil @@ -40,9 +61,10 @@ class Admin return [ // 基础配置 'base' => [ - 'key_field' => 'id', - 'is_search' => 1, - 'is_delete' => 1, + 'key_field' => 'id', + 'is_search' => 1, + 'is_delete' => 1, + 'is_data_export_excel' => 1, ], // 表单配置 'form' => [ @@ -67,7 +89,7 @@ class Admin ], ], [ - 'label' => $lang['username'], + 'label' => $lang['status'], 'view_type' => 'field', 'view_key' => 'status', 'view_data_key' => 'name', @@ -83,7 +105,7 @@ class Admin ], ], [ - 'label' => $lang['username'], + 'label' => $lang['gender'], 'view_type' => 'field', 'view_key' => 'gender', 'view_data_key' => 'name', @@ -121,13 +143,14 @@ class Admin [ 'label' => $lang['role_name'], 'view_type' => 'field', - 'view_key' => 'role_name', + 'view_key' => 'role_id', + 'view_data_key' => 'name', + 'view_data' => $this->role_list, 'is_sort' => 1, 'search_config' => [ 'form_type' => 'select', - 'form_name' => 'role_id', 'where_type' => 'in', - 'data' => $this->GetRoleList(), + 'data' => $this->role_list, 'data_key' => 'id', 'data_name' => 'name', 'is_multiple' => 1, @@ -179,9 +202,9 @@ class Admin ], // 数据配置 'data' => [ - 'table_name' => 'Admin', - 'data_handle' => 'AdminService::AdminListHandle', - 'is_page' => 1, + 'table_name' => 'Admin', + 'is_page' => 1, + 'is_handle_time_field' => 1, ], ]; } @@ -196,13 +219,7 @@ class Admin */ public function GetRoleList() { - // 角色 - $params = [ - 'where' => ['is_enable'=>1], - 'field' => 'id,name', - ]; - $res = AdminService::RoleList($params); - return $res['data']; + } } ?> \ No newline at end of file diff --git a/app/admin/form/Article.php b/app/admin/form/Article.php index 433c1a183..1976cc442 100644 --- a/app/admin/form/Article.php +++ b/app/admin/form/Article.php @@ -10,7 +10,7 @@ // +---------------------------------------------------------------------- namespace app\admin\form; -use app\service\ArticleService; +use app\service\ArticleCategoryService; /** * 文章动态表格 @@ -190,7 +190,7 @@ class Article */ public function ArticleCategoryList() { - $res = ArticleService::ArticleCategoryList(['field'=>'id,name']); + $res = ArticleCategoryService::ArticleCategoryList(['field'=>'id,name']); return $res['data']; } } diff --git a/app/admin/form/User.php b/app/admin/form/User.php index d0d95304e..9184d5fae 100644 --- a/app/admin/form/User.php +++ b/app/admin/form/User.php @@ -43,8 +43,8 @@ class User 'key_field' => 'id', 'is_search' => 1, 'is_delete' => 1, - 'is_data_export_excel' => 1, 'is_middle' => 0, + 'is_data_export_excel' => 1, ], // 表单配置 'form' => [ @@ -141,7 +141,9 @@ class User [ 'label' => $lang['gender_name'], 'view_type' => 'field', - 'view_key' => 'gender_name', + 'view_key' => 'gender', + 'view_data_key' => 'name', + 'view_data' => MyLang('common_gender_list'), 'is_sort' => 1, 'search_config' => [ 'form_type' => 'select', @@ -156,7 +158,9 @@ class User [ 'label' => $lang['status_name'], 'view_type' => 'field', - 'view_key' => 'status_name', + 'view_key' => 'status', + 'view_data_key' => 'name', + 'view_data' => MyLang('common_user_status_list'), 'is_sort' => 1, 'search_config' => [ 'form_type' => 'select', @@ -278,17 +282,8 @@ class User ], // 数据配置 'data' => [ - 'table_name' => 'User', - 'data_handle' => 'UserService::UserListHandle', - 'is_fixed_name_field' => 1, - 'fixed_name_data' => [ - 'status' => [ - 'data' => MyLang('common_user_status_list'), - ], - 'gender' => [ - 'data' => MyLang('common_gender_list'), - ], - ], + 'table_name' => 'User', + 'data_handle' => 'UserService::UserListHandle', ], ]; } diff --git a/app/admin/lang/en-us.php b/app/admin/lang/en-us.php index f52496bff..e7b362f07 100644 --- a/app/admin/lang/en-us.php +++ b/app/admin/lang/en-us.php @@ -336,18 +336,6 @@ return [ // 品牌 'brand' => [ 'base_nav_title' => 'Brand', - // 表单 - 'form_item_name' => 'Name', - 'form_item_name_message' => 'The name is 2~30 characters long', - 'form_item_brand_category_id' => 'Brand Category', - 'form_item_brand_category_id_message' => 'Please select brand category', - 'form_item_website_url' => 'Website address', - 'form_item_website_url_placeholder' => 'Official website address, starting with http://or https://', - 'form_item_website_url_message' => 'Incorrect format of official website address', - 'form_item_describe' => 'describe', - 'form_item_describe_message' => 'Description can be up to 230 characters', - 'form_item_logo' => 'LOGO', - 'form_item_logo_tips' => 'Recommended 150*50px', // 动态表格 'form_table' => [ 'name' => 'Name', @@ -365,9 +353,6 @@ return [ // 品牌分类 'brandcategory' => [ 'base_nav_title' => 'BrandCategory', - // 表单 - 'form_item_name' => 'Name', - 'form_item_name_message' => 'The name is 2~16 characters long', ], // 文章 @@ -375,18 +360,6 @@ return [ 'base_nav_title' => 'Article', 'detail_content_title' => 'Detail Content', 'detail_images_title' => 'Detail Picture', - // 表单 - 'form_item_title' => 'Title', - 'form_item_title_message' => 'The title is 2~60 characters long', - 'form_item_article_category' => 'Article Category', - 'form_item_article_category_message' => 'Please select an article category', - 'form_item_jump_url_title' => 'Jump url address', - 'form_item_jump_url_tips' => 'With http://or https://, only valid on the web side', - 'form_item_jump_url_message' => 'The jump url address format is incorrect', - 'form_item_is_home_recommended_title' => 'Home page recommendation', - 'form_item_content_title' => 'Content', - 'form_item_content_placeholder' => 'The content format is between 10 and 105000 characters. For more editing functions, please use the computer to access', - 'form_item_content_message' => 'Content format is between 10 and 105000 characters', // 动态表格 'form_table' => [ 'info' => 'Title', @@ -404,9 +377,6 @@ return [ // 文章分类 'articlecategory' => [ 'base_nav_title' => 'ArticleCategory', - // 表单 - 'form_item_name' => 'Name', - 'form_item_name_message' => 'The name is 2~16 characters long', ], // 自定义页面 @@ -467,20 +437,6 @@ return [ 'answer' => [ 'base_nav_title' => 'Q&A', 'user_info_title' => 'User Info', - // 表单 - 'form_item_name' => 'Contacts', - 'form_item_name_message' => 'Contact format can be up to 30 characters', - 'form_item_tel' => 'Telephone', - 'form_item_tel_message' => 'Please fill in a valid phone number', - 'form_item_title' => 'Title', - 'form_item_title_message' => 'Header format can be up to 60 characters', - 'form_item_access_count' => 'Number of visits', - 'form_item_access_count_message' => 'Number of visits in the format of 0~9', - 'form_item_content' => 'Content', - 'form_item_content_message' => 'Content format is between 5 and 1000 characters', - 'form_item_reply' => 'Reply Content', - 'form_item_reply_message' => 'Reply content format can be up to 1000 characters', - 'form_is_reply' => 'Reply or not', // 动态表格 'form_table' => [ 'user' => 'User Info', @@ -582,26 +538,6 @@ return [ // 忘记密码 'form_forget_password_name' => 'Forgot Password?', 'form_forget_password_tips' => 'Please contact the administrator to reset the password', - // 表单 - 'form_item_username' => 'Userame', - 'form_item_username_placeholder' => 'enter one username', - 'form_item_username_message' => 'Please use letters, numbers and underscores for 2~18 characters', - 'form_item_password' => 'Login Password', - 'form_item_password_placeholder' => 'Please enter the login password', - 'form_item_password_message' => 'Password format is between 6 and 18 characters', - 'form_item_mobile' => 'Phone Number', - 'form_item_mobile_placeholder' => 'Please enter your mobile number', - 'form_item_mobile_message' => 'Mobile number format error', - 'form_item_email' => 'E-mail', - 'form_item_email_placeholder' => 'Please enter email address', - 'form_item_email_message' => 'Email format error', - 'form_item_username_created_tips' => 'Cannot be changed after creation', - 'form_item_username_edit_tips' => 'Not changeable', - 'form_item_role' => 'Permission group', - 'form_item_role_message' => 'Please select the role group', - 'form_item_password_edit_tips' => 'Enter to change the password', - 'form_item_status' => 'Status', - 'form_item_status_message' => 'Please select user status', // 动态表格 'form_table' => [ 'username' => 'Admin', @@ -1272,12 +1208,6 @@ return [ // 用户中心导航 'appcenternav' => [ 'base_nav_title' => 'Mobile User Center Navigation', - // 表单 - 'form_item_name' => 'Name', - 'form_item_name_message' => 'Name format: 2~60 characters', - 'form_item_desc' => 'Describe', - 'form_item_desc_message' => 'Description can be up to 18 characters', - 'form_item_images_url' => 'Navigation Icon', // 动态表格 'form_table' => [ 'name' => 'Name', @@ -1296,11 +1226,6 @@ return [ // 手机首页导航 'apphomenav' => [ 'base_nav_title' => 'Home Navigation', - // 表单 - 'form_item_name' => 'Name', - 'form_item_name_message' => 'Name format: 2~60 characters', - 'form_item_images_url' => 'Navigation Icon', - 'form_item_is_need_login' => 'Whether login is required', // 动态表格 'form_table' => [ 'name' => 'Name', @@ -1461,14 +1386,6 @@ return [ 'role' => [ 'base_nav_title' => 'Role', 'admin_not_modify_tips' => 'The super administrator has all permissions by default and cannot be changed.', - // 表单 - 'form_item_name' => 'Role Name', - 'form_item_name_message' => 'Role name format 2~16 characters', - 'form_item_menu' => 'Menu Power', - 'form_item_menu_no_data_tips' => 'No menu data', - 'form_item_plugins' => 'Plugins Power', - 'form_item_plugins_tips' => 'The plug-in also needs to check [Application Center ->Application Management+Application Call Management] permission in the current menu permission', - 'form_item_plugins_no_data_tips' => 'No plugins data', // 动态表格 'form_table' => [ 'name' => 'Role Name', diff --git a/app/admin/lang/zh-cn.php b/app/admin/lang/zh-cn.php index ec6128552..0728454c7 100755 --- a/app/admin/lang/zh-cn.php +++ b/app/admin/lang/zh-cn.php @@ -336,18 +336,6 @@ return [ // 品牌 'brand' => [ 'base_nav_title' => '品牌', - // 表单 - 'form_item_name' => '名称', - 'form_item_name_message' => '名称长度2~30个字符', - 'form_item_brand_category_id' => '品牌分类', - 'form_item_brand_category_id_message' => '请选择品牌分类', - 'form_item_website_url' => '官网地址', - 'form_item_website_url_placeholder' => '官网地址、以http://或https://开头', - 'form_item_website_url_message' => '官网地址格式有误', - 'form_item_describe' => '描述', - 'form_item_describe_message' => '描述最多230个字符', - 'form_item_logo' => 'LOGO', - 'form_item_logo_tips' => '建议150*50px', // 动态表格 'form_table' => [ 'name' => '名称', @@ -365,9 +353,6 @@ return [ // 品牌分类 'brandcategory' => [ 'base_nav_title' => '品牌分类', - // 表单 - 'form_item_name' => '名称', - 'form_item_name_message' => '名称长度2~16个字符', ], // 文章 @@ -375,18 +360,6 @@ return [ 'base_nav_title' => '文章', 'detail_content_title' => '详情内容', 'detail_images_title' => '详情图片', - // 表单 - 'form_item_title' => '标题', - 'form_item_title_message' => '标题长度2~60个字符', - 'form_item_article_category' => '文章分类', - 'form_item_article_category_message' => '请选择文章分类', - 'form_item_jump_url_title' => '跳转url地址', - 'form_item_jump_url_tips' => '带http://或https://,仅web端有效', - 'form_item_jump_url_message' => '跳转url地址格式有误', - 'form_item_is_home_recommended_title' => '首页推荐', - 'form_item_content_title' => '内容', - 'form_item_content_placeholder' => '内容格式10~105000个字符之间更多编辑功能请使用电脑访问', - 'form_item_content_message' => '内容格式10~105000个字符之间', // 动态表格 'form_table' => [ 'info' => '标题', @@ -404,9 +377,6 @@ return [ // 文章分类 'articlecategory' => [ 'base_nav_title' => '文章分类', - // 表单 - 'form_item_name' => '名称', - 'form_item_name_message' => '名称长度2~16个字符', ], // 自定义页面 @@ -467,20 +437,6 @@ return [ 'answer' => [ 'base_nav_title' => '问答', 'user_info_title' => '用户信息', - // 表单 - 'form_item_name' => '联系人', - 'form_item_name_message' => '联系人格式最多30个字符', - 'form_item_tel' => '电话', - 'form_item_tel_message' => '请填写有效的电话', - 'form_item_title' => '标题', - 'form_item_title_message' => '标题格式最多60个字符', - 'form_item_access_count' => '访问次数', - 'form_item_access_count_message' => '访问次数格式0~9的数值', - 'form_item_content' => '内容', - 'form_item_content_message' => '内容格式5~1000个字符之间', - 'form_item_reply' => '回复内容', - 'form_item_reply_message' => '回复内容格式最多1000个字符', - 'form_is_reply' => '是否已回复', // 动态表格 'form_table' => [ 'user' => '用户信息', @@ -582,26 +538,6 @@ return [ // 忘记密码 'form_forget_password_name' => '忘记密码?', 'form_forget_password_tips' => '请联系管理员重置密码', - // 表单 - 'form_item_username' => '用户名', - 'form_item_username_placeholder' => '请输入用户名', - 'form_item_username_message' => '请使用字母、数字、下划线2~18个字符', - 'form_item_password' => '登录密码', - 'form_item_password_placeholder' => '请输入登录密码', - 'form_item_password_message' => '密码格式6~18个字符之间', - 'form_item_mobile' => '手机号码', - 'form_item_mobile_placeholder' => '请输入手机号码', - 'form_item_mobile_message' => '手机号码格式错误', - 'form_item_email' => '电子邮箱', - 'form_item_email_placeholder' => '请输入电子邮箱', - 'form_item_email_message' => '电子邮箱格式错误', - 'form_item_username_created_tips' => '创建后不可更改', - 'form_item_username_edit_tips' => '不可更改', - 'form_item_role' => '权限组', - 'form_item_role_message' => '请选择所属角色组', - 'form_item_password_edit_tips' => '输入则修改密码', - 'form_item_status' => '状态', - 'form_item_status_message' => '请选择用户状态', // 动态表格 'form_table' => [ 'username' => '管理员', @@ -1272,12 +1208,6 @@ return [ // 用户中心导航 'appcenternav' => [ 'base_nav_title' => '手机用户中心导航', - // 表单 - 'form_item_name' => '名称', - 'form_item_name_message' => '名称格式2~60个字符', - 'form_item_desc' => '描述', - 'form_item_desc_message' => '描述最多18个字符', - 'form_item_images_url' => '导航图标', // 动态表格 'form_table' => [ 'name' => '名称', @@ -1296,11 +1226,6 @@ return [ // 手机首页导航 'apphomenav' => [ 'base_nav_title' => '手机首页导航', - // 表单 - 'form_item_name' => '名称', - 'form_item_name_message' => '名称格式2~60个字符', - 'form_item_images_url' => '导航图标', - 'form_item_is_need_login' => '是否需要登录', // 动态表格 'form_table' => [ 'name' => '名称', @@ -1461,14 +1386,6 @@ return [ 'role' => [ 'base_nav_title' => '角色', 'admin_not_modify_tips' => '超级管理员默认拥有所有权限,不可更改。', - // 表单 - 'form_item_name' => '角色名称', - 'form_item_name_message' => '角色名称格式2~16个字符', - 'form_item_menu' => '菜单权限', - 'form_item_menu_no_data_tips' => '无菜单数据', - 'form_item_plugins' => '插件权限', - 'form_item_plugins_tips' => '插件还需在当前菜单权限中勾选[ 应用中心 -> 应用管理+应用调用管理 ]权限', - 'form_item_plugins_no_data_tips' => '无插件数据', // 动态表格 'form_table' => [ 'name' => '角色名称', diff --git a/app/admin/view/default/admin/login_info.html b/app/admin/view/default/admin/login_info.html index 3e078f6c1..a138d450b 100755 --- a/app/admin/view/default/admin/login_info.html +++ b/app/admin/view/default/admin/login_info.html @@ -28,14 +28,14 @@
- - + +
- +
- + @@ -69,8 +69,8 @@
- - + +
@@ -95,8 +95,8 @@
- - + +
diff --git a/app/admin/view/default/admin/save_info.html b/app/admin/view/default/admin/save_info.html index 56c098635..bf9ac91ab 100755 --- a/app/admin/view/default/admin/save_info.html +++ b/app/admin/view/default/admin/save_info.html @@ -12,14 +12,14 @@
- - + +
- - + +
@@ -27,14 +27,14 @@
- - + +
- - + +
@@ -45,8 +45,8 @@
- - {{foreach :MyLang('common_admin_status_list') as $v}} {{/foreach}} @@ -62,8 +62,8 @@ {{if !isset($data['id']) or $admin['id'] neq $data['id']}}
- - {{foreach $role_list as $v}} diff --git a/app/admin/view/default/answer/index.html b/app/admin/view/default/answer/index.html index 95f0f6168..0cf479c80 100755 --- a/app/admin/view/default/answer/index.html +++ b/app/admin/view/default/answer/index.html @@ -34,7 +34,7 @@
- +
diff --git a/app/admin/view/default/appcenternav/save_info.html b/app/admin/view/default/appcenternav/save_info.html index 79b411609..31c74c3dc 100755 --- a/app/admin/view/default/appcenternav/save_info.html +++ b/app/admin/view/default/appcenternav/save_info.html @@ -13,8 +13,8 @@
- - + +
@@ -44,22 +44,22 @@
- - + +
- + {{include file="public/event_value_tips" /}}
- +
  • diff --git a/app/admin/view/default/apphomenav/save_info.html b/app/admin/view/default/apphomenav/save_info.html index 190804c32..d666f11c5 100755 --- a/app/admin/view/default/apphomenav/save_info.html +++ b/app/admin/view/default/apphomenav/save_info.html @@ -13,8 +13,8 @@
    - - + +
    @@ -84,7 +84,7 @@
    - +
    diff --git a/app/admin/view/default/article/save_info.html b/app/admin/view/default/article/save_info.html index 8fbb857ad..bf3a87eee 100755 --- a/app/admin/view/default/article/save_info.html +++ b/app/admin/view/default/article/save_info.html @@ -12,10 +12,10 @@
    - +
    - +
    - - {{foreach $article_category_list as $v}} @@ -40,8 +40,8 @@
    - - + +
    @@ -51,7 +51,7 @@
    - +
    @@ -60,8 +60,8 @@
    - - + +
    @@ -87,7 +87,7 @@
    {{include file="lib/seo" /}}
    - +
    diff --git a/app/admin/view/default/articlecategory/index.html b/app/admin/view/default/articlecategory/index.html index a31018a6d..5b6203f6d 100755 --- a/app/admin/view/default/articlecategory/index.html +++ b/app/admin/view/default/articlecategory/index.html @@ -20,8 +20,8 @@
    - - + +
    {{include file="lib/sort" /}} {{include file="lib/is_enable" /}} diff --git a/app/admin/view/default/brand/save_info.html b/app/admin/view/default/brand/save_info.html index c43ad2788..027010c53 100755 --- a/app/admin/view/default/brand/save_info.html +++ b/app/admin/view/default/brand/save_info.html @@ -12,14 +12,14 @@
    - - + +
    - - {{foreach $brand_category as $v}} {{/foreach}} @@ -31,14 +31,14 @@
    - - + +
    - - + +
    @@ -46,7 +46,7 @@
    - +
      {{if !empty($data['logo'])}}
    • diff --git a/app/admin/view/default/brandcategory/index.html b/app/admin/view/default/brandcategory/index.html index ba5a763bf..99433af6a 100755 --- a/app/admin/view/default/brandcategory/index.html +++ b/app/admin/view/default/brandcategory/index.html @@ -20,8 +20,8 @@
      - - + +
      {{include file="lib/sort" /}} {{include file="lib/is_enable" /}} diff --git a/app/admin/view/default/power/index.html b/app/admin/view/default/power/index.html index 086ca7a3d..5dfddc068 100755 --- a/app/admin/view/default/power/index.html +++ b/app/admin/view/default/power/index.html @@ -37,9 +37,9 @@
      - - + {{foreach $data as $v}} {{/foreach}} @@ -48,8 +48,8 @@
      - - + +
      @@ -57,14 +57,14 @@
      - - + +
      - - + +
      @@ -72,14 +72,14 @@
      - - + +
      - - + +
      diff --git a/app/admin/view/default/role/detail.html b/app/admin/view/default/role/detail.html index 5b85943de..1bf273d86 100644 --- a/app/admin/view/default/role/detail.html +++ b/app/admin/view/default/role/detail.html @@ -8,7 +8,7 @@
      -
      {{:MyLang('role.form_item_menu')}}
      +
      {{:MyLang('common_service.role.form_item_menu')}}