From b355bb315a183cee8339a6ef063b50b47dfd48aa Mon Sep 17 00:00:00 2001 From: gongfuxiang Date: Tue, 31 Jan 2023 18:44:32 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=8E=E5=8F=B0=E5=A4=9A=E8=AF=AD=E8=A8=80?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/admin/controller/Articlecategory.php | 2 - app/admin/controller/Brand.php | 2 - app/admin/controller/Brandcategory.php | 2 - app/admin/controller/Config.php | 12 +- app/admin/controller/Express.php | 4 +- app/admin/controller/Navigation.php | 4 + app/admin/controller/Pluginsadmin.php | 2 + app/admin/controller/Region.php | 1 - app/admin/controller/Screeningprice.php | 1 - app/admin/controller/Slide.php | 4 - app/admin/form/Appcenternav.php | 2 +- app/admin/form/Apphomenav.php | 2 +- app/admin/form/Article.php | 2 +- app/admin/form/Brand.php | 2 +- app/admin/form/Customview.php | 2 +- app/admin/form/Goodsparamstemplate.php | 2 +- app/admin/form/Goodsspectemplate.php | 2 +- app/admin/form/Link.php | 2 +- app/admin/form/Quicknav.php | 2 +- app/admin/form/Slide.php | 2 +- app/admin/form/Warehouse.php | 2 +- app/admin/form/Warehousegoods.php | 2 +- app/admin/lang/en-us.php | 486 +++- app/admin/lang/zh-cn.php | 489 +++- app/admin/view/default/admin/save_info.html | 76 +- app/admin/view/default/agreement/nav.html | 12 +- .../view/default/appcenternav/save_info.html | 11 +- .../view/default/apphomenav/save_info.html | 10 +- app/admin/view/default/appmini/base_nav.html | 4 +- app/admin/view/default/article/save_info.html | 5 +- .../view/default/articlecategory/index.html | 7 +- app/admin/view/default/brand/save_info.html | 10 +- .../view/default/brandcategory/index.html | 7 +- app/admin/view/default/config/index.html | 22 +- .../view/default/customview/save_info.html | 20 +- .../view/default/design/popup_saveinfo.html | 83 +- app/admin/view/default/email/nav.html | 14 +- app/admin/view/default/express/index.html | 7 +- .../view/default/goodscategory/index.html | 15 +- .../goodsparamstemplate/save_info.html | 5 +- .../default/goodsspectemplate/save_info.html | 5 +- app/admin/view/default/index/init.html | 134 +- app/admin/view/default/index/stats_where.html | 6 +- app/admin/view/default/lib/enable.html | 12 - .../view/default/lib/excel_win_html.html | 38 - app/admin/view/default/lib/excel_win_js.html | 43 - app/admin/view/default/lib/gender.html | 2 +- app/admin/view/default/lib/is_enable.html | 6 + app/admin/view/default/lib/is_footer.html | 10 +- .../view/default/lib/is_full_screen.html | 10 +- app/admin/view/default/lib/is_header.html | 10 +- .../view/default/lib/is_new_window_open.html | 10 +- app/admin/view/default/lib/is_show.html | 10 +- .../default/lib/module/goods_category.html | 2 +- app/admin/view/default/lib/module/user.html | 2 +- .../view/default/lib/region_linkage.html | 2 +- app/admin/view/default/lib/seo.html | 6 +- app/admin/view/default/lib/sort.html | 6 + app/admin/view/default/lib/user_status.html | 4 +- app/admin/view/default/link/index.html | 21 +- app/admin/view/default/map/index.html | 2 +- app/admin/view/default/navigation/index.html | 137 +- app/admin/view/default/navigation/nav.html | 17 +- app/admin/view/default/order/detail.html | 32 +- app/admin/view/default/order/index.html | 12 +- .../view/default/order/module/address.html | 10 +- .../view/default/order/module/aftersale.html | 10 +- .../view/default/order/module/goods.html | 6 +- .../default/order/module/is_comments.html | 2 +- .../view/default/order/module/operate.html | 12 +- .../view/default/order/module/status.html | 2 +- app/admin/view/default/order/module/take.html | 6 +- .../view/default/orderaftersale/index.html | 48 +- .../view/default/packageinstall/index.html | 10 +- app/admin/view/default/paylog/index.html | 2 +- app/admin/view/default/payment/index.html | 32 +- .../view/default/payment/module/operate.html | 4 +- app/admin/view/default/payment/save_info.html | 27 +- .../view/default/payrequestlog/index.html | 2 +- app/admin/view/default/plugins/index.html | 6 +- .../view/default/pluginsadmin/first_step.html | 10 +- .../view/default/pluginsadmin/index.html | 73 +- app/admin/view/default/pluginsadmin/nav.html | 15 +- .../view/default/pluginsadmin/save_info.html | 119 +- .../view/default/pluginsadmin/upload.html | 4 +- app/admin/view/default/power/index.html | 127 +- .../view/default/public/event_value_tips.html | 51 +- app/admin/view/default/public/footer.html | 16 +- app/admin/view/default/public/header.html | 2 +- app/admin/view/default/public/jump_error.html | 6 +- .../view/default/public/jump_success.html | 8 +- app/admin/view/default/public/loading.html | 2 +- app/admin/view/default/public/menu.html | 2 +- app/admin/view/default/public/nav.html | 18 +- app/admin/view/default/public/tips_error.html | 4 +- .../view/default/quicknav/save_info.html | 123 +- app/admin/view/default/region/index.html | 31 +- app/admin/view/default/role/detail.html | 4 +- app/admin/view/default/role/index.html | 2 +- app/admin/view/default/role/save_info.html | 34 +- .../view/default/screeningprice/index.html | 29 +- app/admin/view/default/seo/index.html | 4 +- .../view/default/site/attachment/index.html | 4 +- app/admin/view/default/site/base/index.html | 32 +- app/admin/view/default/site/cache/index.html | 22 +- .../view/default/site/extends/index.html | 16 +- .../view/default/site/forgetpwd/index.html | 8 +- app/admin/view/default/site/login/index.html | 8 +- .../default/site/orderaftersale/index.html | 4 +- .../default/site/public/goods_search.html | 2 +- app/admin/view/default/site/public/nav.html | 4 +- .../view/default/site/register/index.html | 2 +- .../view/default/site/siteset/discount.html | 2 +- .../view/default/site/siteset/extends.html | 6 +- .../view/default/site/siteset/goods.html | 16 +- .../view/default/site/siteset/index.html | 72 +- .../view/default/site/siteset/order.html | 10 +- .../view/default/site/siteset/search.html | 4 +- .../view/default/site/sitetype/index.html | 77 +- app/admin/view/default/site/verify/index.html | 6 +- app/admin/view/default/slide/save_info.html | 15 +- .../view/default/warehouse/save_info.html | 7 +- .../default/warehousegoods/goods_search.html | 2 +- .../default/warehousegoods/goods_spec.html | 2 +- .../view/default/warehousegoods/index.html | 8 +- app/index/lang/en-us.php | 1 - app/index/lang/zh-cn.php | 1 - app/index/view/default/lib/enable.html | 12 - app/index/view/default/lib/gender.html | 2 +- app/index/view/default/lib/is_enable.html | 6 + app/index/view/default/lib/is_footer.html | 6 + app/index/view/default/lib/is_header.html | 6 + .../view/default/lib/is_new_window_open.html | 10 +- app/index/view/default/lib/is_show.html | 10 +- .../default/lib/module/goods_category.html | 2 +- app/index/view/default/lib/seo.html | 6 +- app/index/view/default/lib/sort.html | 6 + app/index/view/default/public/header_nav.html | 2 +- app/index/view/default/public/jump_error.html | 6 +- .../view/default/public/jump_success.html | 6 +- app/index/view/default/public/loading.html | 2 +- app/index/view/default/public/user_menu.html | 2 +- app/lang/en-us.php | 2386 +++++++++-------- app/lang/zh-cn.php | 2303 ++++++++-------- app/layout/view/base.html | 2 +- .../view/public/common/goodssearch.html | 2 +- .../offcanvas_module_config_goods.html | 2 +- .../popup/popup_module_goods_search.html | 2 +- .../popup/popup_module_goods_select.html | 4 +- app/service/ConfigService.php | 2 +- app/service/CustomViewService.php | 4 +- public/favicon.ico | Bin 67646 -> 15406 bytes public/static/admin/default/css/common.css | 8 +- public/static/admin/default/js/index.js | 3 +- public/static/admin/default/js/site.js | 8 +- public/static/common/css/common.css | 3 +- 156 files changed, 4365 insertions(+), 3522 deletions(-) delete mode 100755 app/admin/view/default/lib/enable.html delete mode 100755 app/admin/view/default/lib/excel_win_html.html delete mode 100755 app/admin/view/default/lib/excel_win_js.html create mode 100755 app/admin/view/default/lib/is_enable.html create mode 100644 app/admin/view/default/lib/sort.html delete mode 100755 app/index/view/default/lib/enable.html create mode 100755 app/index/view/default/lib/is_enable.html create mode 100755 app/index/view/default/lib/is_footer.html create mode 100755 app/index/view/default/lib/is_header.html create mode 100644 app/index/view/default/lib/sort.html diff --git a/app/admin/controller/Articlecategory.php b/app/admin/controller/Articlecategory.php index 9c4887b7b..be5276386 100755 --- a/app/admin/controller/Articlecategory.php +++ b/app/admin/controller/Articlecategory.php @@ -32,8 +32,6 @@ class ArticleCategory extends Base */ public function Index() { - // 是否启用 - MyViewAssign('common_is_enable_list', MyLang('common_is_enable_list')); return MyView(); } diff --git a/app/admin/controller/Brand.php b/app/admin/controller/Brand.php index 43e9ded4a..5c1c87de7 100755 --- a/app/admin/controller/Brand.php +++ b/app/admin/controller/Brand.php @@ -60,8 +60,6 @@ class Brand extends Base { // 模板数据 $assign = [ - // 静态数据 - 'common_is_enable_list' => MyLang('common_is_enable_list'), // 编辑器文件存放地址 'editor_path_type' => ResourcesService::EditorPathTypeValue('brand'), ]; diff --git a/app/admin/controller/Brandcategory.php b/app/admin/controller/Brandcategory.php index 04a272471..abdce6934 100755 --- a/app/admin/controller/Brandcategory.php +++ b/app/admin/controller/Brandcategory.php @@ -32,8 +32,6 @@ class BrandCategory extends Base */ public function Index() { - // 是否启用 - MyViewAssign('common_is_enable_list', MyLang('common_is_enable_list')); return MyView(); } diff --git a/app/admin/controller/Config.php b/app/admin/controller/Config.php index 1e21468a7..2b365240b 100755 --- a/app/admin/controller/Config.php +++ b/app/admin/controller/Config.php @@ -34,18 +34,10 @@ class Config extends Base { // 模板数据 $assign = [ - // 静态数据 - 'common_excel_charset_list' => MyLang('common_excel_charset_list'), - 'common_excel_export_type_list' => MyLang('common_excel_export_type_list'), - 'common_map_type_list' => MyLang('common_map_type_list'), - 'common_is_enable_list' => MyLang('common_is_enable_list'), - 'common_login_type_list' => MyLang('common_login_type_list'), - 'common_close_open_list' => MyLang('common_close_open_list'), - 'common_is_text_list' => MyLang('common_is_text_list'), // 数据 - 'data' => ConfigService::ConfigList(), + 'data' => ConfigService::ConfigList(), // 页面类型 - 'view_type' => 'index', + 'view_type' => 'index', ]; MyViewAssign($assign); return MyView(); diff --git a/app/admin/controller/Express.php b/app/admin/controller/Express.php index 92458455a..7ddc02b3b 100755 --- a/app/admin/controller/Express.php +++ b/app/admin/controller/Express.php @@ -34,10 +34,8 @@ class Express extends Base public function Index() { $assign = [ - // 静态数据 - 'common_is_enable_list' => MyLang('common_is_enable_list'), // 编辑器文件存放地址 - 'editor_path_type' => ResourcesService::EditorPathTypeValue('express'), + 'editor_path_type' => ResourcesService::EditorPathTypeValue('express'), ]; MyViewAssign($assign); return MyView(); diff --git a/app/admin/controller/Navigation.php b/app/admin/controller/Navigation.php index 4af4a3b68..69f83a782 100755 --- a/app/admin/controller/Navigation.php +++ b/app/admin/controller/Navigation.php @@ -62,6 +62,10 @@ class Navigation extends Base 'nav_header_pid_list' => NavigationService::LevelOneNav(['nav_type'=>$this->nav_type]), // 商品分类 'goods_category_list' => GoodsService::GoodsCategoryAll(), + // 管理导航 + 'nav_data' => MyLang('navigation.base_nav_list'), + // 添加类型列表 + 'add_type_list' => MyLang('navigation.base_add_type_list'), ]; // 获取列表 diff --git a/app/admin/controller/Pluginsadmin.php b/app/admin/controller/Pluginsadmin.php index 2199571f1..30357f50c 100755 --- a/app/admin/controller/Pluginsadmin.php +++ b/app/admin/controller/Pluginsadmin.php @@ -58,6 +58,8 @@ class Pluginsadmin extends Base $assign = [ // 导航参数 'view_type' => $this->view_type, + // 管理导航 + 'nav_data' => MyLang('pluginsadmin.base_nav_list'), // 应用商店地址 'store_url' => StoreService::StoreUrl(), ]; diff --git a/app/admin/controller/Region.php b/app/admin/controller/Region.php index b02dadbdd..5045a62e4 100755 --- a/app/admin/controller/Region.php +++ b/app/admin/controller/Region.php @@ -32,7 +32,6 @@ class Region extends Base */ public function Index() { - MyViewAssign('common_is_enable_list', MyLang('common_is_enable_list')); return MyView(); } diff --git a/app/admin/controller/Screeningprice.php b/app/admin/controller/Screeningprice.php index cedd05161..ac0b63c40 100755 --- a/app/admin/controller/Screeningprice.php +++ b/app/admin/controller/Screeningprice.php @@ -32,7 +32,6 @@ class ScreeningPrice extends Base */ public function Index() { - MyViewAssign('common_is_enable_list', MyLang('common_is_enable_list')); return MyView(); } diff --git a/app/admin/controller/Slide.php b/app/admin/controller/Slide.php index b33c81fc8..6ebd0aaa8 100755 --- a/app/admin/controller/Slide.php +++ b/app/admin/controller/Slide.php @@ -61,10 +61,6 @@ class Slide extends Base $assign = [ // 当前数据 'data' => $this->data_detail, - // 静态资源 - 'common_is_enable_list' => MyLang('common_is_enable_list'), - 'common_platform_type' => MyLang('common_platform_type'), - 'common_app_event_type' => MyLang('common_app_event_type'), // 编辑器文件存放地址 'editor_path_type' => ResourcesService::EditorPathTypeValue('slide'), ]; diff --git a/app/admin/form/Appcenternav.php b/app/admin/form/Appcenternav.php index 02b9126d3..54552b92a 100644 --- a/app/admin/form/Appcenternav.php +++ b/app/admin/form/Appcenternav.php @@ -126,7 +126,7 @@ class AppCenterNav 'search_config' => [ 'form_type' => 'select', 'where_type' => 'in', - 'data' => MyLang('common_is_enable_list'), + 'data' => MyLang('common_is_text_list'), 'data_key' => 'id', 'data_name' => 'name', 'is_multiple' => 1, diff --git a/app/admin/form/Apphomenav.php b/app/admin/form/Apphomenav.php index 00f07ae89..3fbc7f574 100644 --- a/app/admin/form/Apphomenav.php +++ b/app/admin/form/Apphomenav.php @@ -126,7 +126,7 @@ class AppHomeNav 'search_config' => [ 'form_type' => 'select', 'where_type' => 'in', - 'data' => MyLang('common_is_enable_list'), + 'data' => MyLang('common_is_text_list'), 'data_key' => 'id', 'data_name' => 'name', 'is_multiple' => 1, diff --git a/app/admin/form/Article.php b/app/admin/form/Article.php index b3f76017e..d9b83dac2 100644 --- a/app/admin/form/Article.php +++ b/app/admin/form/Article.php @@ -106,7 +106,7 @@ class Article 'search_config' => [ 'form_type' => 'select', 'where_type' => 'in', - 'data' => MyLang('common_is_enable_list'), + 'data' => MyLang('common_is_text_list'), 'data_key' => 'id', 'data_name' => 'name', 'is_multiple' => 1, diff --git a/app/admin/form/Brand.php b/app/admin/form/Brand.php index 5d1939aec..899f13ed9 100644 --- a/app/admin/form/Brand.php +++ b/app/admin/form/Brand.php @@ -123,7 +123,7 @@ class Brand 'search_config' => [ 'form_type' => 'select', 'where_type' => 'in', - 'data' => MyLang('common_is_enable_list'), + 'data' => MyLang('common_is_text_list'), 'data_key' => 'id', 'data_name' => 'name', 'is_multiple' => 1, diff --git a/app/admin/form/Customview.php b/app/admin/form/Customview.php index 7eeb94167..47d4edeab 100644 --- a/app/admin/form/Customview.php +++ b/app/admin/form/Customview.php @@ -79,7 +79,7 @@ class CustomView 'search_config' => [ 'form_type' => 'select', 'where_type' => 'in', - 'data' => MyLang('common_is_enable_list'), + 'data' => MyLang('common_is_text_list'), 'data_key' => 'id', 'data_name' => 'name', 'is_multiple' => 1, diff --git a/app/admin/form/Goodsparamstemplate.php b/app/admin/form/Goodsparamstemplate.php index 501a2867f..bdc70d28d 100644 --- a/app/admin/form/Goodsparamstemplate.php +++ b/app/admin/form/Goodsparamstemplate.php @@ -109,7 +109,7 @@ class GoodsParamsTemplate 'search_config' => [ 'form_type' => 'select', 'where_type' => 'in', - 'data' => MyLang('common_is_enable_list'), + 'data' => MyLang('common_is_text_list'), 'data_key' => 'id', 'data_name' => 'name', 'is_multiple' => 1, diff --git a/app/admin/form/Goodsspectemplate.php b/app/admin/form/Goodsspectemplate.php index 5e7e07521..5b23d6947 100644 --- a/app/admin/form/Goodsspectemplate.php +++ b/app/admin/form/Goodsspectemplate.php @@ -108,7 +108,7 @@ class GoodsSpecTemplate 'search_config' => [ 'form_type' => 'select', 'where_type' => 'in', - 'data' => MyLang('common_is_enable_list'), + 'data' => MyLang('common_is_text_list'), 'data_key' => 'id', 'data_name' => 'name', 'is_multiple' => 1, diff --git a/app/admin/form/Link.php b/app/admin/form/Link.php index cc2c40e18..358d0a3c2 100644 --- a/app/admin/form/Link.php +++ b/app/admin/form/Link.php @@ -100,7 +100,7 @@ class Link 'search_config' => [ 'form_type' => 'select', 'where_type' => 'in', - 'data' => MyLang('common_is_enable_list'), + 'data' => MyLang('common_is_text_list'), 'data_key' => 'id', 'data_name' => 'name', 'is_multiple' => 1, diff --git a/app/admin/form/Quicknav.php b/app/admin/form/Quicknav.php index 76783f892..72c66e8fd 100644 --- a/app/admin/form/Quicknav.php +++ b/app/admin/form/Quicknav.php @@ -125,7 +125,7 @@ class QuickNav 'search_config' => [ 'form_type' => 'select', 'where_type' => 'in', - 'data' => MyLang('common_is_enable_list'), + 'data' => MyLang('common_is_text_list'), 'data_key' => 'id', 'data_name' => 'name', 'is_multiple' => 1, diff --git a/app/admin/form/Slide.php b/app/admin/form/Slide.php index de613e907..112a0a2e9 100644 --- a/app/admin/form/Slide.php +++ b/app/admin/form/Slide.php @@ -124,7 +124,7 @@ class Slide 'search_config' => [ 'form_type' => 'select', 'where_type' => 'in', - 'data' => MyLang('common_is_enable_list'), + 'data' => MyLang('common_is_text_list'), 'data_key' => 'id', 'data_name' => 'name', 'is_multiple' => 1, diff --git a/app/admin/form/Warehouse.php b/app/admin/form/Warehouse.php index b157773ac..372790626 100644 --- a/app/admin/form/Warehouse.php +++ b/app/admin/form/Warehouse.php @@ -94,7 +94,7 @@ class Warehouse 'search_config' => [ 'form_type' => 'select', 'where_type' => 'in', - 'data' => MyLang('common_is_enable_list'), + 'data' => MyLang('common_is_text_list'), 'data_key' => 'id', 'data_name' => 'name', 'is_multiple' => 1, diff --git a/app/admin/form/Warehousegoods.php b/app/admin/form/Warehousegoods.php index 1059312ca..3db061ecb 100644 --- a/app/admin/form/Warehousegoods.php +++ b/app/admin/form/Warehousegoods.php @@ -106,7 +106,7 @@ class WarehouseGoods 'form_type' => 'select', 'form_name' => 'wg.is_enable', 'where_type' => 'in', - 'data' => MyLang('common_is_enable_list'), + 'data' => MyLang('common_is_text_list'), 'data_key' => 'id', 'data_name' => 'name', 'is_multiple' => 1, diff --git a/app/admin/lang/en-us.php b/app/admin/lang/en-us.php index c6e607f7c..1bb0fbb34 100644 --- a/app/admin/lang/en-us.php +++ b/app/admin/lang/en-us.php @@ -32,24 +32,50 @@ return [ 'upgrade_version_name' => 'Updated Version：', 'upgrade_date_name' => 'Update Date：', ], - ], - - // 订单管理 - 'order' => [ - // 页面公共 - 'page_common' => [ - 'order_id_empty' => 'Wrong order ID', - 'express_choice_tips' => 'Please select express delivery method', - 'payment_choice_tips' => 'Please select payment method', - ], - ], - - // 插件管理 - 'pluginsadmin' => [ - // 页面公共 - 'page_common' => [ - 'not_enable_tips' => 'Please click tick to enable', - 'save_no_data_tips' => 'No plug-in data to save', + // 页面基础 + 'base_update_button_title' => 'Update Now', + 'base_item_base_stats_title' => 'Shop Statistics', + 'base_item_base_stats_tips' => 'Time filtering is only valid for totals', + 'base_item_user_title' => 'Total Users', + 'base_item_order_number_title' => 'Total Orders', + 'base_item_order_complete_number_title' => 'Total Transaction Volume', + 'base_item_order_complete_title' => 'Order Amount', + 'base_item_last_month_title' => 'LastMonth', + 'base_item_same_month_title' => 'SameMonth', + 'base_item_yesterday_title' => 'Yesterday', + 'base_item_today_title' => 'Today', + 'base_item_order_profit_title' => 'Trend of order transaction amount', + 'base_item_order_trading_title' => 'Order trading trend', + 'base_item_order_tips' => 'All Orders', + 'base_item_hot_sales_goods_title' => 'Hot Goods', + 'base_item_hot_sales_goods_tips' => 'Orders without cancelling closing', + 'base_item_payment_type_title' => 'Payment Type', + 'base_item_map_whole_country_title' => 'Order geographical distribution', + 'base_item_map_whole_country_tips' => 'Excluding orders and default dimensions (provinces) to cancel closing', + 'base_item_map_whole_country_province' => 'Province', + 'base_item_map_whole_country_city' => 'City', + 'base_item_map_whole_country_county' => 'County', + 'system_info_title' => 'System Info', + 'system_ver_title' => 'Software Version', + 'system_os_ver_title' => 'Operating System', + 'system_php_ver_title' => 'PHP Version', + 'system_mysql_ver_title' => 'MySQL Version', + 'system_server_ver_title' => 'Server Info', + 'system_host_title' => 'Current Domain', + 'development_team_title' => 'Development Team', + 'development_team_website_title' => 'Website', + 'development_team_website_value' => 'Shanghai Zongzhige Technology Co., Ltd', + 'development_team_support_title' => 'Support', + 'development_team_support_value' => 'ShopXO enterprise e-commerce system provider', + 'development_team_ask_title' => 'Questions', + 'development_team_ask_value' => 'ShopXO exchange questions', + 'development_team_agreement_title' => 'Agreement', + 'development_team_agreement_value' => 'View open source agreement', + 'development_team_update_log_title' => 'Update Log', + 'development_team_update_log_value' => 'View update log', + 'development_team_members_title' => 'R&D members', + 'development_team_members_value' => [ + ['name' => 'Brother Gong', 'url' => 'http://gong.gg/'] ], ], @@ -85,6 +111,80 @@ return [ ['name' => 'Discount', 'type' => 'discount'], ['name' => 'Extensions', 'type' => 'extends'], ], + // 页面基础 + 'base_item_site_status_title' => 'Site Status', + 'base_item_site_domain_title' => 'Site domain name address', + 'base_item_site_filing_title' => 'Filing Info', + 'base_item_site_other_title' => 'Other', + 'base_item_session_cache_title' => 'Session Cache Config', + 'base_item_data_cache_title' => 'Data Cache Config', + 'base_item_redis_cache_title' => 'Redis Cache Config', + 'base_item_crontab_config_title' => 'Timing Script Config', + 'base_item_quick_nav_title' => 'Quick Navigation', + 'base_item_user_address_title' => 'User Address', + 'base_item_site_auto_mode_title' => 'Automatic Mode', + 'base_item_site_manual_mode_title' => 'Manual Mode', + 'base_item_default_payment_title' => 'Default Payment Method', + 'base_item_display_type_title' => 'Display Type', + 'base_item_self_extraction_title' => 'Self-promotion', + 'base_item_fictitious_title' => 'Virtual Sales', + 'choice_upload_logo_title' => 'Choice Logo', + 'add_goods_title' => 'Goods Add', + 'add_self_extractio_address_title' => 'Add Address', + 'site_domain_tips_list' => [ + '1. If the site domain name is not set, the current site domain name and address will be used[ '.__MY_DOMAIN__.' ]', + '2. If the attachment and static address are not set, the static domain name address of the current site will be used[ '.__MY_PUBLIC_URL__.' ]', + '3. If public is not set as the root directory on the server side, the configuration of [attachment cdn domain name, css/js static file cdn domain name] needs to be followed by public, such as:'.__MY_PUBLIC_URL__.'public/', + '4. When running the project in command line mode, the address of the zone must be configured, otherwise some addresses in the project will be missing the domain name information', + '5. Do not randomly configure. The wrong address will cause the website to be inaccessible (the address configuration starts with http). If your own site is configured with https, it starts with https', + ], + 'site_cache_tips_list' => [ + '1. The default file cache and Redis cache PHP need to be installed first', + '2. Please ensure the stability of Redis service (after the session uses the cache, the unstable service may cause the background to be unable to log in)', + '3. In case of Redis service exception, you cannot log in to the management background and modify the [session.php, cache. php] file in the [config] directory of the configuration file', + ], + 'goods_tips_list' => [ + '1. By default, the WEB side displays 3 levels, the lowest level is 1 and the highest level is 3 (if set to 0, the default is 3)', + '2. Mobile terminal default display level 0 (commodity list mode), minimum level 0, and maximum level 3 (1~3 are classified display mode)', + '3. The style of the front category page will be different if the level is different', + ], + 'goods_auto_mode_max_count_tips_list' => [ + '1. Configure the maximum number of products displayed on each floor', + '2. It is not recommended to modify the quantity too large, which will lead to too large blank area on the left side of the PC', + ], + 'goods_auto_mode_order_by_tips_list' => [ + 'It can be summarized as follows: popularity ->sales volume ->descending order (desc) of the latest', + ], + 'goods_manual_mode_max_tips_list' => [ + '1. Click the title of the item to drag and sort it and display it in order', + '2. It is not recommended to add many products, which will lead to too large blank area on the left side of the PC', + ], + 'extends_crontab_tips' => 'It is recommended that you add the script address to the timing request of the Linux scheduled task (the result is SUCS: 0, FAIL: 0, followed by the colon is the number of data processed, SUCS succeeded, FALI failed)', + 'left_images_random_tips' => 'The left picture can upload up to 3 pictures, and one of them can be displayed randomly each time', + 'background_color_tips' => 'Customizable background image, default background gray', + 'site_setup_layout_tips' => 'The drag mode needs to enter the homepage design page by yourself. Please save the selected configuration before', + 'site_setup_layout_button_name' => 'Go to design page >>', + 'site_setup_goods_category_tips' => 'If you need more floor displays, please go to/Product Management ->Product Classification, Primary Classification Settings Home Page Recommendation', + 'site_setup_goods_category_no_data_tips'=> 'There is no data for the time being. Please go to/Product Management ->Product Classification, Primary Classification Settings Home Page for recommendation', + 'site_setup_order_default_payment_tips' => 'You can set the default payment method corresponding to different platforms. Please install the payment plug-in in [Website Management ->Payment Method] to enable and open it to users', + 'site_setup_choice_payment_message' => 'Please select {:name} default payment method', + 'sitetype_top_tips_list' => [ + '1. Express delivery, conventional e-commerce process, user selects the receiving address to place an order for payment ->merchant shipment ->confirmation of receipt ->order completion', + '2. Display type, only display products, can initiate consultation (cant place an order)', + '3. Select the self-pickup address when placing the order, and the user places the order for payment ->confirm the delivery ->order completion', + '4. Virtual sales, conventional e-commerce process, user order payment ->automatic delivery ->confirmation of delivery ->order completion', + ], + // 添加自提地址表单 + 'form_take_address_logo' => 'LOGO', + 'form_take_address_logo_tips' => '300 * 300px proposal', + 'form_take_address_alias' => 'Alias', + 'form_take_address_alias_message' => 'Alias format can be up to 16 characters', + 'form_take_address_name' => 'Contacts Name', + 'form_take_address_name_message' => 'Contact name format is between 2 and 16 characters', + 'form_take_address_tel' => 'Contact Tel', + 'form_take_address_tel_message' => 'Please fill in the contact number', + 'form_take_address_address' => 'Detail Address', + 'form_take_address_address_message' => 'Detailed address format is between 1 and 80 characters', ], // 后台配置信息 @@ -95,7 +195,6 @@ return [ '2. Naming rules for background pictures (1~50), such as 1.jpg', ], 'map_type_tips' => 'Due to the different map standards of each company, do not switch maps at will, which will lead to inaccurate map coordinates.', - 'view_config_course_name' => 'View the configuration tutorial', 'apply_map_baidu_name' => 'Please apply at Baidu Map Open Platform', 'apply_map_amap_name' => 'Please apply at the open platform of Gaode Map', 'apply_map_tencent_name' => 'Please apply at Tencent Map Open Platform', @@ -166,9 +265,6 @@ return [ // 表单 'form_item_title' => 'Title', 'form_item_title_message' => 'The title is 2~60 characters long', - 'form_item_is_header' => 'Including head', - 'form_item_is_footer' => 'Including tail', - 'form_item_is_full_screen' => 'Full screen', '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', @@ -185,8 +281,6 @@ return [ // 表单 'form_item_name' => 'Name', 'form_item_name_message' => 'The name is 2~16 characters long', - 'form_item_is_header' => 'Including head', - 'form_item_is_footer' => 'Including tail', 'form_logo_tips' => 'Recommended size 300 * 300px', ], @@ -272,9 +366,9 @@ return [ 'appmini' => [ // 基础导航 'base_nav_list' => [ - ['view_type' => 'index','name' => 'Current Theme'], - ['view_type' => 'upload','name' => 'Theme Install'], - ['view_type' => 'package','name' => 'Source Package Download'], + ['name' => 'Current Theme', 'type' => 'index'], + ['name' => 'Theme Install', 'type' => 'upload'], + ['name' => 'Source Package Download', 'type' => 'package'], ], 'nav_store_theme_name' => 'More topic downloads', 'nav_theme_download_name' => 'View the applet packaging tutorial', @@ -294,7 +388,6 @@ return [ ['name' => 'Mailbox Settings', 'type' => 'index'], ['name' => 'Message Template', 'type' => 'message'], ], - 'view_config_course_name' => 'View the configuration tutorial', 'top_tips' => 'Due to some differences between different mailbox platforms and different configurations, the specific configuration of the mailbox platform is subject to the tutorial', // 基础 'test_title' => 'Test', @@ -307,6 +400,11 @@ return [ 'form_item_test_button_title' => 'Test', ], + // seo设置 + 'seo' => [ + 'top_tips' => 'Configure corresponding pseudo-static rules according to different server environments [Nginx, Apache, IIS]', + ], + // 商品 'goods' => [ 'base_nav_title' => 'Goods', @@ -520,6 +618,142 @@ return [ 'form_item_content_message' => 'Specification value format: 1~1000 characters', ], + // 友情链接 + 'link' => [ + 'base_nav_title' => 'Friendly link', + // 表单 + 'form_item_name' => 'Name', + 'form_item_name_message' => 'Name format 2~16 characters', + 'form_item_url' => 'Link Address', + 'form_item_url_placeholder' => 'Link address, starting with http://or https://', + 'form_item_url_message' => 'Incorrect format of link address', + 'form_item_desc' => 'Describe', + 'form_item_desc_message' => 'Description can be up to 60 characters', + ], + + // 导航管理 + 'navigation' => [ + // 基础导航 + 'base_nav_list' => [ + ['name' => 'Header', 'type' => 'header'], + ['name' => 'Footer', 'type' => 'footer'], + ], + // 添加类型列表 + 'base_add_type_list' => [ + 'custom' => 'Custom', + 'article' => 'Article', + 'customview' => 'Custom Page', + 'goods_category' => 'Goods Category', + 'design' => 'Page Design', + ], + // 表单 + 'form_item_pid' => 'Navigation Level', + 'form_item_pid_placeholder' => 'Primary column...', + 'form_item_pid_message' => 'Please select the navigation level', + 'form_item_name' => 'Navigation Name', + 'form_item_name_tips' => 'Default {:type} name', + 'form_item_name_message' => 'Navigation name format 2~16 characters', + 'form_item_url' => 'Url Address', + 'form_item_url_placeholder' => 'Url address, starting with http://or https://', + 'form_item_url_message' => 'Incorrect format of url address', + 'form_item_value_article_message' => 'Wrong article selection', + 'form_item_value_customview_message' => 'Incorrect selection of custom page', + 'form_item_value_goods_category_message'=> 'Wrong selection of commodity classification', + 'form_item_value_design_message' => 'Incorrect selection of page design', + ], + + // 订单管理 + 'order' => [ + // 页面公共 + 'page_common' => [ + 'order_id_empty' => 'Wrong order ID', + 'express_choice_tips' => 'Please select express delivery method', + 'payment_choice_tips' => 'Please select payment method', + ], + // 页面基础 + 'form_delivery_title' => 'Delivery Operation', + 'form_payment_title' => 'Payment Operation', + 'form_item_take' => 'Take Code', + 'form_item_take_message' => 'Please fill in the 4-digit pickup code', + 'form_item_express_number' => 'Express Number', + 'form_item_express_number_message' => 'Please fill in the express bill number', + // 地址 + 'detail_user_address_title' => 'Shipping Address', + 'detail_user_address_name' => 'Receiving Name', + 'detail_user_address_tel' => 'Receiving Phone', + 'detail_user_address_value' => 'Address', + 'detail_user_address_idcard' => 'ID Card Info', + 'detail_user_address_idcard_name' => 'Full Name', + 'detail_user_address_idcard_number' => 'Number', + 'detail_user_address_idcard_pic' => 'Photo', + 'detail_take_address_title' => 'Take Address', + 'detail_take_address_contact' => 'Contact Info', + 'detail_take_address_value' => 'Detail Info', + 'detail_fictitious_title' => 'Key Info', + // 订单售后 + 'detail_aftersale_status' => 'Status', + 'detail_aftersale_type' => 'Type', + 'detail_aftersale_price' => 'Price', + 'detail_aftersale_number' => 'Number', + 'detail_aftersale_reason' => 'Reason', + // 商品 + 'detail_goods_title' => 'Order Goods', + 'detail_payment_amount_less_tips' => 'Please note that the order payment amount is less than the total amount', + 'detail_no_payment_tips' => 'Please note that the order has not been paid', + ], + + // 订单售后 + 'orderaftersale' => [ + 'form_audit_title' => 'Audit Operation', + 'form_refuse_title' => 'Reject Operation', + 'form_user_info_title' => 'User Info', + 'form_apply_info_title' => 'Apply Info', + 'forn_apply_info_type' => 'Type', + 'forn_apply_info_price' => 'Price', + 'forn_apply_info_number' => 'Number', + 'forn_apply_info_reason' => 'Reason', + 'forn_apply_info_msg' => 'Describe', + 'form_item_refundment' => 'Refund Method', + 'form_item_refundment_message' => 'Please select a refund method', + 'form_item_refuse_reason' => 'Reason for rejection', + 'form_item_refuse_reason_message' => 'Rejection reason format: 2~230 characters', + ], + + // 支付方式 + 'payment' => [ + 'base_nav_title' => 'PaymentMethod', + 'upload_top_list_tips' => [ + [ + 'name' => '1. The class name must be consistent with the file name (remove. php). If Alipay.php, Alipay is used' + ], + [ + 'name' => '2. The method that the class must define', + 'item' => [ + '2.1. Config configuration method', + '2.2. Pay payment method', + '2.3. Response callback method', + '2.4. Notify asynchronous callback method (optional, call Response method if not defined)', + '2.5. Refund refund method (optional, if not defined, the original refund cannot be initiated)', + ], + ], + [ + 'name' => '3. Customizable output content method', + 'item' => [ + '3.1. SuccessReturn payment succeeded (optional)', + '3.2. ErrorReturn payment failed (optional)', + ], + ] + ], + 'upload_top_tips_ps' => 'PS: If the above conditions are not met, the plug-in cannot be viewed. Put the plug-in into the. zip compression package to upload, and support multiple payment plug-ins in one compression', + // 表单 + 'form_item_name' => 'Name', + 'form_item_name_message' => 'Name format 2~30 characters', + 'form_item_apply_terminal' => 'Applicable Terminal', + 'form_item_apply_terminal_message' => 'Select at least one applicable terminal', + 'form_item_logo' => 'LOGO', + 'form_item_is_open_user' => 'Open to Users', + ], + // 快递 'express' => [ 'base_nav_title' => 'Express', @@ -553,8 +787,204 @@ return [ 'form_item_is_need_login' => 'Whether login is required', ], + // 支付日志 + 'paylog' => [ + 'pay_request_title' => 'Payment Request Log', + ], + + // 支付请求日志 + 'payrequestlog' => [ + 'base_nav_title' => 'Payment Request Log', + ], + + // 插件调用 + 'plugins' => [ + 'back_to_plugins_admin' => 'Return to application management >>' + ], + + // 插件管理 + 'pluginsadmin' => [ + // 页面公共 + 'page_common' => [ + 'not_enable_tips' => 'Please click tick to enable', + 'save_no_data_tips' => 'No plug-in data to save', + ], + // 基础导航 + 'base_nav_title' => 'Plugins', + 'base_nav_list' => [ + ['name' => 'Application Management', 'type' => 'index'], + ['name' => 'Upload Application', 'type' => 'upload'], + ], + 'base_nav_more_plugins_download_name' => 'More plug-in downloads', + // 基础页面 + 'base_search_input_placeholder' => 'Please enter a name/description', + 'base_top_tips_one' => 'List sorting method [custom sorting ->earliest installation]', + 'base_top_tips_two' => 'Click and drag icon button to adjust plug-in call and display order', + 'base_open_sort_title' => 'Enable sorting', + 'data_list_author_title' => 'Author', + 'data_list_author_url_title' => 'HomePage', + 'data_list_version_title' => 'Version', + 'uninstall_confirm_tips' => 'Uninstallation may lose the basic configuration data of the plug-in. Is it unrecoverable and confirm the operation?', + 'not_install_divide_title' => 'The following plug-ins are not installed', + 'delete_plugins_text' => '1. Delete apps only', + 'delete_plugins_text_tips' => '(Only delete the application code and keep the application data)', + 'delete_plugins_data_text' => '2. Delete app and delete data', + 'delete_plugins_data_text_tips' => '(Application code and application data will be deleted)', + 'delete_plugins_ps_tips' => 'PS: None of the following operations can be recovered. Please operate carefully!', + 'delete_plugins_button_name' => 'Delete apps only', + 'delete_plugins_data_button_name' => 'Delete apps and data', + 'cancel_delete_plugins_button_name' => 'Think again', + 'more_plugins_store_to_text' => 'Go to the app store to select more plug-ins to enrich the site >>', + 'no_data_store_to_text' => 'Go to the app store to select plug-in rich sites >>', + 'plugins_no_data_tips' => 'There is no relevant application yet', + // 表单 + 'form_item_upload_tips' => 'Upload an application installation package in zip compression format', + 'form_create_error_tips' => 'Please fill in again!', + 'form_create_first_step_button_name' => 'Next Step', + 'form_item_plugins' => 'Apply unique tags', + 'form_item_plugins_tips' => 'Use numbers, lowercase letters and underscores', + 'form_item_plugins_message' => 'Apply unique tag format of 2~60 characters', + 'form_item_logo' => 'LOGO', + 'form_item_logo_tips' => '600 * 600px proposal', + 'form_item_name' => 'Name', + 'form_item_name_message' => 'Name format: 2~30 characters', + 'form_item_author' => 'Author', + 'form_item_author_message' => 'Author format 2~30 characters', + 'form_item_author_url' => 'Author URI', + 'form_item_author_url_tips' => 'Start with http://or https://', + 'form_item_author_url_message' => 'Please fill in the authors homepage', + 'form_item_version' => 'Version', + 'form_item_version_tips' => 'Major version, minor version number and revision number, each segment shall not exceed 6 digits, such as 1.0.0', + 'form_item_version_message' => 'Incorrect version format', + 'form_item_desc' => 'Describe', + 'form_item_desc_message' => 'Description content format: 2~60 characters', + 'form_item_apply_terminal' => 'Applicable Terminal', + 'form_item_apply_terminal_message' => 'Select at least one applicable terminal', + 'form_item_apply_version' => 'Applicable system version', + 'form_item_apply_version_message' => 'Select at least one applicable system version', + 'form_item_is_home' => 'Whether there is front-end entrance', + 'form_item_is_home_tips' => 'Front independent page entry', + ], + + // 安装页面 + 'packageinstall' => [ + 'back_admin_title' => 'Back to Admin', + 'get_loading_tips' => 'Getting...', + ], + + // 角色管理 + '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', + ], + + // 权限管理 + 'power' => [ + 'base_nav_title' => 'Power', + 'top_tips_list' => [ + '1. Non-professional technical personnel should not operate the data on this page. The wrong operation may lead to confusion of the authority menu.', + '2. The permission menu is divided into two types: [Use and Operation]. The use menu is generally displayed, and the operation menu must be hidden.', + '3. If the permission menu is disordered, you can overwrite it again[ '.MyConfig('database.connections.mysql.prefix').'power ]Data recovery of data table.', + '4. [Super administrator, admin account] has all permissions by default and cannot be changed.', + ], + 'content_top_tips_list' => [ + '1. To fill in [controller name and method name], you need to create corresponding definitions of controller and method', + '2. Controller file location [app/admin/controller], this operation is only used by developers', + '3. One controller name/method name and user-defined url address must be filled in', + ], + // 表单 + 'form_item_pid' => 'Column Level', + 'form_item_pid_placeholder' => 'Primary column...', + 'form_item_pid_message' => 'Column level selection error', + 'form_item_name' => 'Power Name', + 'form_item_name_message' => 'Power name format 2~16 characters', + 'form_item_control' => 'Controller Name', + 'form_item_control_message' => 'The format of the controller name is between 1 and 30 characters (it must start with a letter and can be alphanumeric underscore)', + 'form_item_action' => 'Action Name', + 'form_item_action_message' => 'The format of the method name is between 1 and 30 characters (it must start with a letter and can be alphanumeric underscore)', + 'form_item_url' => 'Custom Url Address', + 'form_item_url_message' => 'Custom url address, starting with http://or https://', + 'form_item_icon' => 'Icon Class', + 'form_item_icon_message' => 'Icon format can be up to 30 characters', + 'form_item_icon_tips_list' => [ + '1. reference resources http://www.iconfont.cn/ Place the icon in the [/static/admin/default/cs/iconfontmenu. css] file', + '2. You can also directly use the icon and reference provided by the frame[ http://amazeui.shopxo.net/css/icon/ ]', + '3. You can also use the plug-in hook to import the css file of the custom icon, and then use the defined icon', + ], + ], + + // 快捷导航 + 'quicknav' => [ + 'base_nav_title' => 'QuickNavigation', + // 表单 + 'form_item_name' => 'Name', + 'form_item_name_message' => 'Name format: 2~60 characters', + 'form_item_images_url' => 'Navigation Icon', + ], + + // 地区管理 + 'region' => [ + 'base_nav_title' => 'Region', + // 表单 + 'form_item_id' => 'Unique Number', + 'form_item_id_tips' => [ + '1. If left blank, the system will automatically generate', + '2. Do not modify at will to avoid data confusion', + ], + 'form_item_id_message' => 'Please enter a unique number', + 'form_item_name' => 'Name', + 'form_item_name_message' => 'Name format 2~16 characters', + 'form_item_lng' => 'Longitude', + 'form_item_lng_message' => 'Please fill in the longitude', + 'form_item_lat' => 'Latitude', + 'form_item_lat_message' => 'Please fill in the latitude', + 'form_item_letters' => 'Initial', + 'form_item_letters_message' => 'Please fill in the initials', + ], + + // 筛选价格 + 'screeningprice' => [ + 'base_nav_title' => 'FilterPrice', + 'top_tips_list' => [ + 'Minimum price 0 - maximum price 100 is less than 100', + 'Minimum price 1000 - maximum price 0 is greater than 1000', + 'The minimum price of 100 - the maximum price of 500 is greater than or equal to 100 and less than 500', + ], + // 表单 + 'form_item_name' => 'Name', + 'form_item_name_message' => 'Name format 2~16 characters', + 'form_item_min_price' => 'Minimum Price', + 'form_item_min_price_message' => 'Incorrect minimum price', + 'form_item_max_price' => 'Maximum Price', + 'form_item_max_price_message' => 'Incorrect maximum price', + ], + // 公共 'common' => [ + // 公共 + 'admin_browser_title' => 'Background management system', + 'remove_cache_title' => 'Clear Cache', + // 商店绑定 + 'store_check_update_name' => 'Check for update', + 'store_bind_accounts_name' => 'Bind ShopXO store account', + 'store_bind_accounts_tips' => 'Bind ShopXO App Store account, get the latest version information of plug-in, install and update online', + 'store_bind_authorized_subject_name' => 'Authorized Subject', + 'store_bind_form_accounts' => 'Accounts', + 'store_bind_form_accounts_placeholder' => 'User name/mobile phone/email', + 'store_bind_form_accounts_message' => 'Account format 1~30 characters', + 'store_bind_form_password' => 'Password', + 'store_bind_form_password_placeholder' => 'Login Password', + 'store_bind_form_password_message' => 'Login password format 6~30 characters', + 'store_bind_form_regster_name' => 'No account, go to register', + 'store_bind_form_tips' => 'One account supports binding to multiple ShopXO stores', // 商品参数 'form_goods_params_config_error_tips' => 'Goods parameter configuration information', 'form_goods_params_copy_no_tips' => 'Please paste the configuration information first', diff --git a/app/admin/lang/zh-cn.php b/app/admin/lang/zh-cn.php index 85297e9c7..55ea62be1 100755 --- a/app/admin/lang/zh-cn.php +++ b/app/admin/lang/zh-cn.php @@ -32,24 +32,50 @@ return [ 'upgrade_version_name' => '更新版本：', 'upgrade_date_name' => '更新日期：', ], - ], - - // 订单管理 - 'order' => [ - // 页面公共 - 'page_common' => [ - 'order_id_empty' => '订单id有误', - 'express_choice_tips' => '请选择快递方式', - 'payment_choice_tips' => '请选择支付方式', - ], - ], - - // 插件管理 - 'pluginsadmin' => [ - // 页面公共 - 'page_common' => [ - 'not_enable_tips' => '请先点击勾勾启用', - 'save_no_data_tips' => '没有可保存的插件数据', + // 页面基础 + 'base_update_button_title' => '立即更新', + 'base_item_base_stats_title' => '商城统计', + 'base_item_base_stats_tips' => '时间筛选仅对总数有效', + 'base_item_user_title' => '用户总量', + 'base_item_order_number_title' => '订单总量', + 'base_item_order_complete_number_title' => '成交总量', + 'base_item_order_complete_title' => '订单总计', + 'base_item_last_month_title' => '上月', + 'base_item_same_month_title' => '当月', + 'base_item_yesterday_title' => '昨日', + 'base_item_today_title' => '今日', + 'base_item_order_profit_title' => '订单成交金额走势', + 'base_item_order_trading_title' => '订单交易走势', + 'base_item_order_tips' => '所有订单', + 'base_item_hot_sales_goods_title' => '热销商品', + 'base_item_hot_sales_goods_tips' => '不含取消关闭的订单', + 'base_item_payment_type_title' => '支付方式', + 'base_item_map_whole_country_title' => '订单地域分布', + 'base_item_map_whole_country_tips' => '不含取消关闭的订单、默认维度（省）', + 'base_item_map_whole_country_province' => '省', + 'base_item_map_whole_country_city' => '市', + 'base_item_map_whole_country_county' => '区/县', + 'system_info_title' => '系统信息', + 'system_ver_title' => '软件版本', + 'system_os_ver_title' => '操作系统', + 'system_php_ver_title' => 'PHP版本', + 'system_mysql_ver_title' => 'MySQL版本', + 'system_server_ver_title' => '服务器端信息', + 'system_host_title' => '当前域名', + 'development_team_title' => '开发团队', + 'development_team_website_title' => '公司官网', + 'development_team_website_value' => '上海纵之格科技有限公司', + 'development_team_support_title' => '技术支持', + 'development_team_support_value' => 'ShopXO企业级电商系统提供商', + 'development_team_ask_title' => '交流提问', + 'development_team_ask_value' => 'ShopXO交流提问', + 'development_team_agreement_title' => '开源协议', + 'development_team_agreement_value' => '查看开源协议', + 'development_team_update_log_title' => '更新日志', + 'development_team_update_log_value' => '查看更新日志', + 'development_team_members_title' => '研发成员', + 'development_team_members_value' => [ + ['name' => '龚哥哥', 'url' => 'http://gong.gg/'] ], ], @@ -85,6 +111,80 @@ return [ ['name' => '优惠', 'type' => 'discount'], ['name' => '扩展', 'type' => 'extends'], ], + // 页面基础 + 'base_item_site_status_title' => '站点状态', + 'base_item_site_domain_title' => '站点域名地址', + 'base_item_site_filing_title' => '备案信息', + 'base_item_site_other_title' => '其它', + 'base_item_session_cache_title' => 'Session缓存配置', + 'base_item_data_cache_title' => '数据缓存配置', + 'base_item_redis_cache_title' => 'redis缓存配置', + 'base_item_crontab_config_title' => '定时脚本配置', + 'base_item_quick_nav_title' => '快捷导航', + 'base_item_user_address_title' => '用户地址', + 'base_item_site_auto_mode_title' => '自动模式', + 'base_item_site_manual_mode_title' => '手动模式', + 'base_item_default_payment_title' => '默认支付方式', + 'base_item_display_type_title' => '展示型', + 'base_item_self_extraction_title' => '自提点', + 'base_item_fictitious_title' => '虚拟销售', + 'choice_upload_logo_title' => '选择logo', + 'add_goods_title' => '商品添加', + 'add_self_extractio_address_title' => '添加地址', + 'site_domain_tips_list' => [ + '1. 站点域名未设置则使用当前站点域名域名地址[ '.__MY_DOMAIN__.' ]', + '2. 附件和静态地址未设置则使用当前站点静态域名地址[ '.__MY_PUBLIC_URL__.' ]', + '3. 如服务器端不是以public设为根目录的、则这里配置【附件cdn域名、css/js静态文件cdn域名】需要后面再加public、如：'.__MY_PUBLIC_URL__.'public/', + '4. 在命令行模式下运行项目，该区域地址必须配置、否则项目中一些地址会缺失域名信息', + '5. 请勿乱配置、错误地址会导致网站无法访问（地址配置以http开头）、如果自己站的配置了https则以https开头', + ], + 'site_cache_tips_list' => [ + '1. 默认使用的文件缓存、使用Redis缓存PHP需要先安装Redis扩展', + '2. 请确保Redis服务稳定性（Session使用缓存后、服务不稳定可能导致后台也无法登录）', + '3. 如遇到Redis服务异常无法登录管理后台、修改配置文件[ config ]目录下[ session.php,cache.php ]文件', + ], + 'goods_tips_list' => [ + '1. WEB端默认展示3级，最低1级、最高3级(如设置为0级则默认为3级)', + '2. 手机端默认展示0级(商品列表模式)、最低0级、最高3级(1~3为分类展示模式)', + '3. 层级不一样、前端分类页样式也会不一样', + ], + 'goods_auto_mode_max_count_tips_list' => [ + '1. 配置每个楼层最多展示多少个商品', + '2. 不建议将数量修改的太大、会导致PC端左侧空白区域太大', + ], + 'goods_auto_mode_order_by_tips_list' => [ + '综合为：热度->销量->最新 进行 降序(desc)排序', + ], + 'goods_manual_mode_max_tips_list' => [ + '1. 可点击商品标题拖拽排序、按照顺序展示', + '2. 不建议添加很多商品、会导致PC端左侧空白区域太大', + ], + 'extends_crontab_tips' => '建议将脚本地址添加到linux定时任务定时请求即可（结果 sucs:0, fail:0 冒号后面则是处理的数据条数，sucs成功，fali失败）', + 'left_images_random_tips' => '左侧图片最多可上传3张图片、每次随机展示其中一张', + 'background_color_tips' => '可自定义背景图片、默认底灰色', + 'site_setup_layout_tips' => '拖拽模式需要自行进入首页设计页面、请先保存选中配置后再', + 'site_setup_layout_button_name' => '去设计页面 >>', + 'site_setup_goods_category_tips' => '如需更多楼层展示，请先到 / 商品管理->商品分类、一级分类设置首页推荐', + 'site_setup_goods_category_no_data_tips'=> '暂无数据，请先到 / 商品管理->商品分类、一级分类设置首页推荐', + 'site_setup_order_default_payment_tips' => '可以设置不同平台对应的默认支付方式、请先在[ 网站管理 -> 支付方式 ]中安装好支付插件启用并对用户开放', + 'site_setup_choice_payment_message' => '请选择{:name}默认支付方式', + 'sitetype_top_tips_list' => [ + '1. 快递、常规电商流程，用户选择收货地址下单支付 -> 商家发货 -> 确认收货 -> 订单完成', + '2. 展示型、仅展示产品，可发起咨询（不能下单）', + '3. 自提点、下单时选择自提货物地址，用户下单支付 -> 确认提货 -> 订单完成', + '4. 虚拟销售、常规电商流程，用户下单支付 -> 自动发货 -> 确认提货 -> 订单完成', + ], + // 添加自提地址表单 + 'form_take_address_logo' => 'LOGO', + 'form_take_address_logo_tips' => '建议300*300px', + 'form_take_address_alias' => '别名', + 'form_take_address_alias_message' => '别名格式最多16个字符', + 'form_take_address_name' => '联系人', + 'form_take_address_name_message' => '联系人格式2~16个字符之间', + 'form_take_address_tel' => '联系电话', + 'form_take_address_tel_message' => '请填写联系电话', + 'form_take_address_address' => '详细地址', + 'form_take_address_address_message' => '详细地址格式1~80个字符之间', ], // 后台配置信息 @@ -95,7 +195,6 @@ return [ '2. 背景图片命名规则(1~50)、如 1.jpg', ], 'map_type_tips' => '由于每一家的地图标准不一样、请勿随意切换地图、会导致地图坐标标注不准确的情况。', - 'view_config_course_name' => '查看配置教程', 'apply_map_baidu_name' => '请到百度地图开放平台申请', 'apply_map_amap_name' => '请到高德地图开放平台申请', 'apply_map_tencent_name' => '请到腾讯地图开放平台申请', @@ -166,9 +265,6 @@ return [ // 表单 'form_item_title' => '名称', 'form_item_title_message' => '名称长度2~60个字符', - 'form_item_is_header' => '是否含头部', - 'form_item_is_footer' => '是否含尾部', - 'form_item_is_full_screen' => '是否满屏', 'form_item_content_title' => '内容', 'form_item_content_placeholder' => '内容格式10~105000个字符之间更多编辑功能请使用电脑访问', 'form_item_content_message' => '内容格式10~105000个字符之间', @@ -185,9 +281,6 @@ return [ // 表单 'form_item_name' => '名称', 'form_item_name_message' => '名称长度2~16个字符', - 'form_item_is_header' => '是否含头部', - 'form_item_is_footer' => '是否含尾部', - 'form_item_is_full_screen' => '是否满屏', 'form_logo_tips' => '建议大小300*300px', ], @@ -273,9 +366,9 @@ return [ 'appmini' => [ // 基础导航 'base_nav_list' => [ - ['view_type' => 'index','name' => '当前主题'], - ['view_type' => 'upload','name' => '主题安装'], - ['view_type' => 'package','name' => '源码包下载'], + ['name' => '当前主题', 'type' => 'index'], + ['name' => '主题安装', 'type' => 'upload'], + ['name' => '源码包下载', 'type' => 'package'], ], 'nav_store_theme_name' => '更多主题下载', 'nav_theme_download_name' => '查看小程序打包教程', @@ -295,7 +388,6 @@ return [ ['name' => '邮箱设置', 'type' => 'index'], ['name' => '消息模板', 'type' => 'message'], ], - 'view_config_course_name' => '查看配置教程', 'top_tips' => '由于不同邮箱平台存在一些差异、配置也有所不同、具体以邮箱平台配置教程为准', // 基础 'test_title' => '测试', @@ -308,6 +400,11 @@ return [ 'form_item_test_button_title' => '测试', ], + // seo设置 + 'seo' => [ + 'top_tips' => '根据服务器环境[Nginx、Apache、IIS]不同配置相应的伪静态规则', + ], + // 商品 'goods' => [ 'base_nav_title' => '商品', @@ -521,6 +618,142 @@ return [ 'form_item_content_message' => '规格值格式1~1000个字符', ], + // 友情链接 + 'link' => [ + 'base_nav_title' => '友情链接', + // 表单 + 'form_item_name' => '名称', + 'form_item_name_message' => '名称格式2~16个字符', + 'form_item_url' => '链接地址', + 'form_item_url_placeholder' => '链接地址、以http://或https://开头', + 'form_item_url_message' => '链接地址格式有误', + 'form_item_desc' => '描述', + 'form_item_desc_message' => '描述最多60个字符', + ], + + // 导航管理 + 'navigation' => [ + // 基础导航 + 'base_nav_list' => [ + ['name' => '中间导航', 'type' => 'header'], + ['name' => '底部导航', 'type' => 'footer'], + ], + // 添加类型列表 + 'base_add_type_list' => [ + 'custom' => '自定义', + 'article' => '文章', + 'customview' => '自定义页面', + 'goods_category' => '商品分类', + 'design' => '页面设计', + ], + // 表单 + 'form_item_pid' => '导航级别', + 'form_item_pid_placeholder' => '一级栏目...', + 'form_item_pid_message' => '请选择导航级别', + 'form_item_name' => '导航名称', + 'form_item_name_tips' => '默认{:type}名称', + 'form_item_name_message' => '导航名称格式2~16个字符', + 'form_item_url' => 'url地址', + 'form_item_url_placeholder' => 'url地址、以http://或https://开头', + 'form_item_url_message' => 'url地址格式有误', + 'form_item_value_article_message' => '文章选择有误', + 'form_item_value_customview_message' => '自定义页面选择有误', + 'form_item_value_goods_category_message'=> '商品分类选择有误', + 'form_item_value_design_message' => '页面设计选择有误', + ], + + // 订单管理 + 'order' => [ + // 页面公共 + 'page_common' => [ + 'order_id_empty' => '订单id有误', + 'express_choice_tips' => '请选择快递方式', + 'payment_choice_tips' => '请选择支付方式', + ], + // 页面基础 + 'form_delivery_title' => '发货操作', + 'form_payment_title' => '支付操作', + 'form_item_take' => '取货码', + 'form_item_take_message' => '请填写4位数取货码', + 'form_item_express_number' => '快递单号', + 'form_item_express_number_message' => '请填写快递单号', + // 地址 + 'detail_user_address_title' => '收货地址', + 'detail_user_address_name' => '收件人', + 'detail_user_address_tel' => '收件电话', + 'detail_user_address_value' => '详细地址', + 'detail_user_address_idcard' => '身份证信息', + 'detail_user_address_idcard_name' => '姓名', + 'detail_user_address_idcard_number' => '姓名', + 'detail_user_address_idcard_pic' => '照片', + 'detail_take_address_title' => '取货地址', + 'detail_take_address_contact' => '联系信息', + 'detail_take_address_value' => '详细地址', + 'detail_fictitious_title' => '密钥信息', + // 订单售后 + 'detail_aftersale_status' => '状态', + 'detail_aftersale_type' => '类型', + 'detail_aftersale_price' => '金额', + 'detail_aftersale_number' => '数量', + 'detail_aftersale_reason' => '原因', + // 商品 + 'detail_goods_title' => '订单商品', + 'detail_payment_amount_less_tips' => '请注意、该订单支付金额小于总价金额', + 'detail_no_payment_tips' => '请注意、该订单还未支付', + ], + + // 订单售后 + 'orderaftersale' => [ + 'form_audit_title' => '审核操作', + 'form_refuse_title' => '拒绝操作', + 'form_user_info_title' => '用户信息', + 'form_apply_info_title' => '申请信息', + 'forn_apply_info_type' => '类型', + 'forn_apply_info_price' => '金额', + 'forn_apply_info_number' => '数量', + 'forn_apply_info_reason' => '原因', + 'forn_apply_info_msg' => '说明', + 'form_item_refundment' => '退款方式', + 'form_item_refundment_message' => '请选择退款方式', + 'form_item_refuse_reason' => '拒绝原因', + 'form_item_refuse_reason_message' => '拒绝原因格式2~230个字符', + ], + + // 支付方式 + 'payment' => [ + 'base_nav_title' => '支付方式', + 'upload_top_list_tips' => [ + [ + 'name' => '1. 类名必须于文件名一致（去除 .php ），如 Alipay.php 则取 Alipay' + ], + [ + 'name' => '2. 类必须定义的方法', + 'item' => [ + '2.1. Config 配置方法', + '2.2. Pay 支付方法', + '2.3. Respond 回调方法', + '2.4. Notify 异步回调方法（可选、未定义则调用Respond方法）', + '2.5. Refund 退款方法（可选、未定义则不能发起原路退款）', + ], + ], + [ + 'name' => '3. 可自定义输出内容方法', + 'item' => [ + '3.1. SuccessReturn 支付成功（可选）', + '3.2. ErrorReturn 支付失败（可选）', + ], + ] + ], + 'upload_top_tips_ps' => 'PS：以上条件不满足则无法查看插件，将插件放入.zip压缩包中上传、支持一个压缩中包含多个支付插件', + // 表单 + 'form_item_name' => '名称', + 'form_item_name_message' => '名称格式2~30个字符', + 'form_item_apply_terminal' => '适用终端', + 'form_item_apply_terminal_message' => '至少选择一个适用终端', + 'form_item_logo' => 'LOGO', + 'form_item_is_open_user' => '用户开放', + ], + // 快递 'express' => [ 'base_nav_title' => '快递', @@ -554,8 +787,206 @@ return [ 'form_item_is_need_login' => '是否需要登录', ], + // 支付日志 + 'paylog' => [ + 'pay_request_title' => '支付请求日志', + ], + + // 支付请求日志 + 'payrequestlog' => [ + 'base_nav_title' => '支付请求日志', + ], + + // 插件调用 + 'plugins' => [ + 'back_to_plugins_admin' => '返回到应用管理 >>' + ], + + // 插件管理 + 'pluginsadmin' => [ + // 页面公共 + 'page_common' => [ + 'not_enable_tips' => '请先点击勾勾启用', + 'save_no_data_tips' => '没有可保存的插件数据', + ], + // 基础导航 + 'base_nav_title' => '应用', + 'base_nav_list' => [ + ['name' => '应用管理', 'type' => 'index'], + ['name' => '上传应用', 'type' => 'upload'], + ], + 'base_nav_more_plugins_download_name' => '更多插件下载', + // 基础页面 + 'base_search_input_placeholder' => '请输入名称/描述', + 'base_top_tips_one' => '列表排序方式[ 自定义排序 -> 最早安装 ]', + 'base_top_tips_two' => '可点击拖动图标按钮调整插件调用和展示顺序', + 'base_open_sort_title' => '开启排序', + 'data_list_author_title' => '作者', + 'data_list_author_url_title' => '主页', + 'data_list_version_title' => '版本', + 'uninstall_confirm_tips' => '卸载可能会丢失插件基础配置数据不可恢复、确认操作吗？', + 'not_install_divide_title' => '以下插件未安装', + 'delete_plugins_text' => '1. 仅删除应用', + 'delete_plugins_text_tips' => '（仅删除应用代码，保留应用数据）', + 'delete_plugins_data_text' => '2. 删除应用并删除数据', + 'delete_plugins_data_text_tips' => '（将删除应用代码和应用数据）', + 'delete_plugins_ps_tips' => 'PS：以下操作后均不可恢复，请谨慎操作！', + 'delete_plugins_button_name' => '仅删除应用', + 'delete_plugins_data_button_name' => '删除应用和数据', + 'cancel_delete_plugins_button_name' => '再考虑一下', + 'more_plugins_store_to_text' => '去应用商店挑选更多插件丰富站点 >>', + 'no_data_store_to_text' => '到应用商店挑选插件丰富站点 >>', + 'plugins_no_data_tips' => '还没有相关应用', + // 表单 + 'form_item_upload_tips' => '上传一个zip压缩格式的应用安装包', + 'form_create_error_tips' => '请重新填写！', + 'form_create_first_step_button_name' => '下一步', + 'form_item_plugins' => '应用唯一标记', + 'form_item_plugins_tips' => '以数字、字母小写、下划线', + 'form_item_plugins_message' => '应用唯一标记格式2~60个字符', + 'form_item_logo' => 'LOGO', + 'form_item_logo_tips' => '建议600*600px', + 'form_item_name' => '名称', + 'form_item_name_message' => '名称格式2~30个字符', + 'form_item_author' => '作者', + 'form_item_author_message' => '作者格式2~30个字符', + 'form_item_author_url' => '作者主页', + 'form_item_author_url_tips' => '以http://或https://开头', + 'form_item_author_url_message' => '请填写作者主页', + 'form_item_version' => '版本', + 'form_item_version_tips' => '主版本.次版本号.修订号，每个段不超过6位，如 1.0.0', + 'form_item_version_message' => '版本格式有误', + 'form_item_desc' => '描述', + 'form_item_desc_message' => '描述内容格式2~60个字符', + 'form_item_apply_terminal' => '适用终端', + 'form_item_apply_terminal_message' => '至少选择一个适用终端', + 'form_item_apply_version' => '适用系统版本', + 'form_item_apply_version_message' => '至少选择一个适用系统版本', + 'form_item_is_home' => '是否有前端入口', + 'form_item_is_home_tips' => '前端独立页面入口', + ], + + // 安装页面 + 'packageinstall' => [ + 'back_admin_title' => '返回后台', + 'get_loading_tips' => '正在获取中...', + ], + + // 角色管理 + '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' => '无插件数据', + ], + + // 权限管理 + 'power' => [ + 'base_nav_title' => '权限', + 'top_tips_list' => [ + '1. 非专业技术人员请勿操作该页面数据、操作失误可能会导致权限菜单错乱。', + '2. 权限菜单分为[ 使用、操作 ]两种类型，使用菜单一般开启显示，操作菜单必须隐藏。', + '3. 如果出现权限菜单错乱，可以重新覆盖[ '.MyConfig('database.connections.mysql.prefix').'power ]数据表的数据恢复。', + '4. [ 超级管理员、admin账户 ]默认拥有所有权限，不可更改。', + ], + 'content_top_tips_list' => [ + '1. 填写[ 控制器名称 和 方法名称 ]需要对应创建相应的控制器和方法的定义', + '2. 控制器文件位置[ app/admin/controller ]、该操作仅开发人员使用', + '3. 控制器名称/方法名称 与 自定义url地址、两者必须填写一个', + ], + // 表单 + 'form_item_pid' => '栏目级别', + 'form_item_pid_placeholder' => '一级栏目...', + 'form_item_pid_message' => '栏目级别选择错误', + 'form_item_name' => '权限名称', + 'form_item_name_message' => '权限名称格式2~16个字符', + 'form_item_control' => '控制器名称', + 'form_item_control_message' => '控制器名格式1~30个字符之间（必须以字母开始，可以是字母数字下划线）', + 'form_item_action' => '方法名称', + 'form_item_action_message' => '法名格式1~30个字符之间（必须以字母开始，可以是字母数字下划线）', + 'form_item_url' => '自定义url地址', + 'form_item_url_message' => '自定义url地址、以http://或https://开头', + 'form_item_icon' => '图标class', + 'form_item_icon_message' => '图标格式最多30个字符', + 'form_item_icon_tips_list' => [ + '1. 参考 http://www.iconfont.cn/ 将icon放到 [ /static/admin/default/css/iconfontmenu.css ] 文件中', + '2. 也可以直接使用框架自带的icon、参考 [ http://amazeui.shopxo.net/css/icon/ ]', + '3. 也可以自己使用插件钩子引入自定义的icon图标的css文件，然后使用定义好的icon', + ], + ], + + // 快捷导航 + 'quicknav' => [ + 'base_nav_title' => '快捷导航', + // 表单 + 'form_item_name' => '名称', + 'form_item_name_message' => '名称格式2~60个字符', + 'form_item_images_url' => '导航图标', + ], + + // 地区管理 + 'region' => [ + 'base_nav_title' => '地区', + // 表单 + 'form_item_id' => '唯一编号', + 'form_item_id_tips' => [ + '1. 留空则系统自动生成', + '2. 不要随意修改、避免数据错乱', + ], + 'form_item_id_message' => '请输入唯一编号', + 'form_item_name' => '名称', + 'form_item_name_message' => '名称格式2~16个字符', + 'form_item_lng' => '经度', + 'form_item_lng_message' => '请填写经度', + 'form_item_lat' => '纬度', + 'form_item_lat_message' => '请填写纬度', + 'form_item_letters' => '首字母', + 'form_item_letters_message' => '请填写首字母', + ], + + // 筛选价格 + 'screeningprice' => [ + 'base_nav_title' => '筛选价格', + 'top_tips_list' => [ + '最小价格0 - 最大价格100 则是小于100', + '最小价格1000 - 最大价格0 则是大于1000', + '最小价格100 - 最大价格500 则是大于等于100并且小于500', + ], + // 表单 + 'form_item_name' => '名称', + 'form_item_name_message' => '名称格式2~16个字符', + 'form_item_min_price' => '最小价格', + 'form_item_min_price_message' => '最小价格有误', + 'form_item_max_price' => '最大价格', + 'form_item_max_price_message' => '最大价格有误', + ], + // 公共 'common' => [ + // 公共 + 'admin_browser_title' => '后台管理系统', + 'remove_cache_title' => '清除缓存', + 'user_status_title' => '用户状态', + 'user_status_message' => '请选择用户状态', + // 商店绑定 + 'store_check_update_name' => '检查更新', + 'store_bind_accounts_name' => '绑定ShopXO商店账户', + 'store_bind_accounts_tips' => '绑定ShopXO应用商店帐号、获取插件最新版本信息、在线安装及更新', + 'store_bind_authorized_subject_name' => '授权主体', + 'store_bind_form_accounts' => '账号', + 'store_bind_form_accounts_placeholder' => '用户名/手机/邮箱', + 'store_bind_form_accounts_message' => '账号格式1~30个字符', + 'store_bind_form_password' => '密码', + 'store_bind_form_password_placeholder' => '登录密码', + 'store_bind_form_password_message' => '登录密码格式6~30个字符', + 'store_bind_form_regster_name' => '未有账号，去注册', + 'store_bind_form_tips' => '一个账号支持绑定多台ShopXO商城', // 商品参数 'form_goods_params_config_error_tips' => '商品参数配置信息', 'form_goods_params_copy_no_tips' => '请先粘贴配置信息', diff --git a/app/admin/view/default/admin/save_info.html b/app/admin/view/default/admin/save_info.html index 48e66c1bc..d32fb06d9 100755 --- a/app/admin/view/default/admin/save_info.html +++ b/app/admin/view/default/admin/save_info.html @@ -4,28 +4,61 @@
-
+ {{:MyLang('admin.base_nav_title')}}{{if empty($data['id'])}}{{:MyLang('created_title')}}{{else /}}{{:MyLang('edit_title')}}{{/if}} {{:MyLang('retreat_title')}} -
- - -
-
- - -
-
- - -
-
- - +
+
+
+ + +
+
+
+
+ + +
+
- {{include file="lib/gender" /}} + +
+
+
+ + +
+
+
+
+ + +
+
+
+ +
+
+ {{include file="lib/gender" /}} +
+
+
+ + +
+
+
+ + + + + {{if !isset($data['id']) or $admin['id'] neq $data['id']}}
@@ -39,15 +72,6 @@
{{/if}} -
- - -
- {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true}}
diff --git a/app/admin/view/default/agreement/nav.html b/app/admin/view/default/agreement/nav.html index 8addc908e..19fd5ffad 100644 --- a/app/admin/view/default/agreement/nav.html +++ b/app/admin/view/default/agreement/nav.html @@ -1,9 +1,11 @@
    - {{foreach $nav_data as $v}} -
  • - {{$v.name}} -
    • - {{/foreach}} + {{if !empty($nav_data)}} + {{foreach $nav_data as $v}} +
  • + {{$v.name}} +
    • + {{/foreach}} + {{/if}}
diff --git a/app/admin/view/default/appcenternav/save_info.html b/app/admin/view/default/appcenternav/save_info.html index 5e39876c8..c31faa3a4 100755 --- a/app/admin/view/default/appcenternav/save_info.html +++ b/app/admin/view/default/appcenternav/save_info.html @@ -54,15 +54,8 @@
+ {{:MyLang('form_upload_images_title')}}
-
- - -
- -
- - -
+ {{include file="lib/sort" /}} + {{include file="lib/is_enable" /}}
diff --git a/app/admin/view/default/apphomenav/save_info.html b/app/admin/view/default/apphomenav/save_info.html index 5e4603d37..dece5e801 100755 --- a/app/admin/view/default/apphomenav/save_info.html +++ b/app/admin/view/default/apphomenav/save_info.html @@ -56,14 +56,8 @@
-
- - -
-
- - -
+ {{include file="lib/sort" /}} + {{include file="lib/is_enable" /}}
diff --git a/app/admin/view/default/appmini/base_nav.html b/app/admin/view/default/appmini/base_nav.html index 21fa647e9..6e549292c 100644 --- a/app/admin/view/default/appmini/base_nav.html +++ b/app/admin/view/default/appmini/base_nav.html @@ -1,8 +1,8 @@
    {{if !empty($base_nav)}} {{foreach $base_nav as $v}} -
  • - {{$v.name}} +
  • + {{$v.name}}
    • {{/foreach}} {{/if}} diff --git a/app/admin/view/default/article/save_info.html b/app/admin/view/default/article/save_info.html index 3b1ca138b..8fbb857ad 100755 --- a/app/admin/view/default/article/save_info.html +++ b/app/admin/view/default/article/save_info.html @@ -47,10 +47,7 @@
    -
    - - -
    + {{include file="lib/is_enable" /}}
    diff --git a/app/admin/view/default/articlecategory/index.html b/app/admin/view/default/articlecategory/index.html index cb90f42e4..037a7eeb4 100755 --- a/app/admin/view/default/articlecategory/index.html +++ b/app/admin/view/default/articlecategory/index.html @@ -23,11 +23,8 @@
    -
    - - -
    - {{include file="lib/enable" /}} + {{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 83a21af16..f893a549e 100755 --- a/app/admin/view/default/brand/save_info.html +++ b/app/admin/view/default/brand/save_info.html @@ -62,16 +62,10 @@
    -
    - - -
    + {{include file="lib/sort" /}}
    -
    - - -
    + {{include file="lib/is_enable" /}}
    diff --git a/app/admin/view/default/brandcategory/index.html b/app/admin/view/default/brandcategory/index.html index 809a2bebe..b9286b452 100755 --- a/app/admin/view/default/brandcategory/index.html +++ b/app/admin/view/default/brandcategory/index.html @@ -23,11 +23,8 @@
    -
    - - -
    - {{include file="lib/enable" /}} + {{include file="lib/sort" /}} + {{include file="lib/is_enable" /}}
    diff --git a/app/admin/view/default/config/index.html b/app/admin/view/default/config/index.html index 49074a321..3f047258a 100755 --- a/app/admin/view/default/config/index.html +++ b/app/admin/view/default/config/index.html @@ -14,7 +14,7 @@
    @@ -22,7 +22,7 @@
    @@ -47,7 +47,7 @@
    @@ -60,7 +60,7 @@
    @@ -68,7 +68,7 @@
    @@ -98,7 +98,7 @@
    @@ -110,7 +110,7 @@
    - {{:MyLang('config.apply_map_baidu_name')}} {{if !empty($site_store_links) and !empty($site_store_links['baidu_map_course'])}}{{:MyLang('config.view_config_course_name')}} {{/if}} + {{:MyLang('config.apply_map_baidu_name')}} {{if !empty($site_store_links) and !empty($site_store_links['baidu_map_course'])}}{{:MyLang('view_config_course_name')}} {{/if}}
    @@ -118,21 +118,21 @@
    - {{:MyLang('config.apply_map_amap_name')}} {{if !empty($site_store_links) and !empty($site_store_links['amap_map_course'])}}{{:MyLang('config.view_config_course_name')}} {{/if}} + {{:MyLang('config.apply_map_amap_name')}} {{if !empty($site_store_links) and !empty($site_store_links['amap_map_course'])}}{{:MyLang('view_config_course_name')}} {{/if}}
    - {{:MyLang('config.apply_map_tencent_name')}} {{if !empty($site_store_links) and !empty($site_store_links['tencent_map_course'])}}{{:MyLang('config.view_config_course_name')}} {{/if}} + {{:MyLang('config.apply_map_tencent_name')}} {{if !empty($site_store_links) and !empty($site_store_links['tencent_map_course'])}}{{:MyLang('view_config_course_name')}} {{/if}}
    - {{:MyLang('config.apply_map_tianditu_name')}} {{if !empty($site_store_links) and !empty($site_store_links['tianditu_map_course'])}}{{:MyLang('config.view_config_course_name')}} {{/if}} + {{:MyLang('config.apply_map_tianditu_name')}} {{if !empty($site_store_links) and !empty($site_store_links['tianditu_map_course'])}}{{:MyLang('view_config_course_name')}} {{/if}}
    @@ -147,7 +147,7 @@
    diff --git a/app/admin/view/default/customview/save_info.html b/app/admin/view/default/customview/save_info.html index ae52fd347..3e8abff22 100755 --- a/app/admin/view/default/customview/save_info.html +++ b/app/admin/view/default/customview/save_info.html @@ -17,32 +17,20 @@
    -
    - - -
    + {{include file="lib/is_enable" /}}
    -
    - - -
    + {{include file="lib/is_header" /}}
    -
    - - -
    + {{include file="lib/is_footer" /}}
    -
    - - -
    + {{include file="lib/is_full_screen" /}}
    diff --git a/app/admin/view/default/design/popup_saveinfo.html b/app/admin/view/default/design/popup_saveinfo.html index ca848ddc1..89316eef1 100644 --- a/app/admin/view/default/design/popup_saveinfo.html +++ b/app/admin/view/default/design/popup_saveinfo.html @@ -3,60 +3,51 @@
    - - -
    -
    -

    {{:MyLang('form_base_data_title')}}

    -
    -
    -
    - -
      - {{if !empty($data['logo'])}} -
    • - - - × -
      • - {{/if}} -
    -
    + {{:MyLang('form_upload_images_title')}}
    + +
    + +
    +
    +

    {{:MyLang('form_base_data_title')}}

    +
    +
    + +
      + {{if !empty($data['logo'])}} +
    • + + + × +
      • + {{/if}} +
    +
    + {{:MyLang('form_upload_images_title')}}
    +
    -
    - - -
    - -
    - - -
    -
    - - -
    - -
    - - +
    + + +
    + {{include file="lib/is_enable" /}} + {{include file="lib/is_header" /}} + {{include file="lib/is_footer" /}}
    -
    - - -
    -
    -

    {{:MyLang('form_seo_data_title')}}

    -
    -
    - {{include file="lib/seo" /}} + + +
    +
    +

    {{:MyLang('form_seo_data_title')}}

    +
    +
    + {{include file="lib/seo" /}} +
    -
    +
    -

    {{:MyLang('email.top_tips')}} {{if !empty($site_store_links) and !empty($site_store_links['email_set_course'])}}{{:MyLang('email.view_config_course_name')}} {{/if}}

    +

    {{:MyLang('email.top_tips')}} {{if !empty($site_store_links) and !empty($site_store_links['email_set_course'])}}{{:MyLang('view_config_course_name')}} {{/if}}

    \ No newline at end of file diff --git a/app/admin/view/default/express/index.html b/app/admin/view/default/express/index.html index 82933ff49..74b6e3cde 100755 --- a/app/admin/view/default/express/index.html +++ b/app/admin/view/default/express/index.html @@ -38,11 +38,8 @@
    -
    - - -
    - {{include file="lib/enable" /}} + {{include file="lib/sort" /}} + {{include file="lib/is_enable" /}}
    diff --git a/app/admin/view/default/goodscategory/index.html b/app/admin/view/default/goodscategory/index.html index fc144a52c..7f3eefe8e 100755 --- a/app/admin/view/default/goodscategory/index.html +++ b/app/admin/view/default/goodscategory/index.html @@ -84,10 +84,7 @@
    -
    - - -
    + {{include file="lib/sort" /}}
    @@ -95,17 +92,11 @@
    -
    - {{foreach $common_is_text_list as $v}} - - {{/foreach}} -
    +
    - {{include file="lib/enable" /}} + {{include file="lib/is_enable" /}}
    diff --git a/app/admin/view/default/goodsparamstemplate/save_info.html b/app/admin/view/default/goodsparamstemplate/save_info.html index b7024e42e..57fadffb6 100755 --- a/app/admin/view/default/goodsparamstemplate/save_info.html +++ b/app/admin/view/default/goodsparamstemplate/save_info.html @@ -54,10 +54,7 @@ {{:MyLang('goodsparamstemplate.form_item_config_list_content_tips')}} {{include file="public/goodsparamstemplate/table" /}}
    -
    - - -
    + {{include file="lib/is_enable" /}} {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true}} diff --git a/app/admin/view/default/goodsspectemplate/save_info.html b/app/admin/view/default/goodsspectemplate/save_info.html index ab2fbd7ee..d1907249e 100755 --- a/app/admin/view/default/goodsspectemplate/save_info.html +++ b/app/admin/view/default/goodsspectemplate/save_info.html @@ -31,10 +31,7 @@
    -
    - - -
    + {{include file="lib/is_enable" /}} {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true}} diff --git a/app/admin/view/default/index/init.html b/app/admin/view/default/index/init.html index 5fb6142fd..847759c86 100755 --- a/app/admin/view/default/index/init.html +++ b/app/admin/view/default/index/init.html @@ -33,9 +33,9 @@ {{if !empty($site_store_info) and !empty($site_store_info['user'])}} {{$site_store_info.user.user_name_view}} - 修改 + {{:MyLang('modify_title')}} {{else /}} - 绑定ShopXO商店账户 + {{:MyLang('common.store_bind_accounts_name')}} {{if !empty($site_store_error)}} {{$site_store_error}} @@ -50,13 +50,13 @@
    {{if !empty($site_store_info) and !empty($site_store_info['vip']) and !empty($site_store_info['vip']['auth_view'])}} - {{$site_store_info.vip.auth_view}} + {{$site_store_info.vip.auth_view}} {{/if}} {{$Think.APPLICATION_VERSION}} - 检查更新{{if !empty($site_store_info) and !empty($site_store_info['upgrade']) and !empty($site_store_info['upgrade']['version_old']) and $site_store_info['upgrade']['version_old'] eq $Think.APPLICATION_VERSION}}{{/if}} + {{:MyLang('common.store_check_update_name')}}{{if !empty($site_store_info) and !empty($site_store_info['upgrade']) and !empty($site_store_info['upgrade']['version_old']) and $site_store_info['upgrade']['version_old'] eq $Think.APPLICATION_VERSION}}{{/if}}
    @@ -118,8 +118,8 @@
    - 商城统计 - + {{:MyLang('index.base_item_base_stats_title')}} +
    {{if !empty($time_data)}} @@ -128,7 +128,7 @@ {{$v.name}} {{/if}} {{/foreach}} - 全部 + {{:MyLang('all_title')}} {{/if}} {{include file="/index/stats_where" /}} @@ -137,22 +137,22 @@
    • -

      用户总量

      +

      {{:MyLang('index.base_item_user_title')}}

      0

      - 上月 + {{:MyLang('index.base_item_last_month_title')}} 0
      - 当月 + {{:MyLang('index.base_item_same_month_title')}} 0
      - 昨日 + {{:MyLang('index.base_item_yesterday_title')}} 0
      - 今日 + {{:MyLang('index.base_item_today_title')}} 0
      @@ -160,22 +160,22 @@
    • -

      订单总量

      +

      {{:MyLang('index.base_item_order_number_title')}}

      0

      - 上月 + {{:MyLang('index.base_item_last_month_title')}} 0
      - 当月 + {{:MyLang('index.base_item_same_month_title')}} 0
      - 昨日 + {{:MyLang('index.base_item_yesterday_title')}} 0
      - 今日 + {{:MyLang('index.base_item_today_title')}} 0
      @@ -183,22 +183,22 @@
    • -

      成交总量

      +

      {{:MyLang('index.base_item_order_complete_number_title')}}

      0

      - 上月 + {{:MyLang('index.base_item_last_month_title')}} 0
      - 当月 + {{:MyLang('index.base_item_same_month_title')}} 0
      - 昨日 + {{:MyLang('index.base_item_yesterday_title')}} 0
      - 今日 + {{:MyLang('index.base_item_today_title')}} 0
      @@ -208,22 +208,22 @@ {{if isset($is_income) and $is_income eq true}}
    • -

      订单总计

      +

      {{:MyLang('index.base_item_order_complete_title')}}

      0.00

      - 上月 + {{:MyLang('index.base_item_last_month_title')}} 0
      - 当月 + {{:MyLang('index.base_item_same_month_title')}} 0
      - 昨日 + {{:MyLang('index.base_item_yesterday_title')}} 0.00
      - 今日 + {{:MyLang('index.base_item_today_title')}} 0.00
      @@ -252,8 +252,8 @@
      - 订单成交金额走势 - + {{:MyLang('index.base_item_order_profit_title')}} +
      {{if !empty($time_data)}} @@ -287,8 +287,8 @@
      - 订单交易走势 - + {{:MyLang('index.base_item_order_trading_title')}} +
      {{if !empty($time_data)}} @@ -323,15 +323,15 @@
      - 热销商品 - + {{:MyLang('index.base_item_hot_sales_goods_title')}} +
      {{if !empty($time_data)}} {{foreach $time_data as $k=>$v}} {{$v.name}} {{/foreach}} - 全部 + {{:MyLang('all_title')}} {{/if}} {{include file="/index/stats_where" /}} @@ -344,8 +344,8 @@
      - 支付方式 - + {{:MyLang('index.base_item_payment_type_title')}} +
      {{if !empty($time_data)}} @@ -380,12 +380,12 @@
      - 订单地域分布 - + {{:MyLang('index.base_item_map_whole_country_title')}} +
      {{if !empty($time_data)}} @@ -393,7 +393,7 @@ {{foreach $time_data as $k=>$v}} {{$v.name}} {{/foreach}} - 全部 + {{:MyLang('all_title')}} {{/if}} {{include file="/index/stats_where" /}} @@ -424,25 +424,25 @@
    • - 系统信息 + {{:MyLang('index.system_info_title')}}
      -
      软件版本
      +
      {{:MyLang('index.system_ver_title')}}
      {{$data.ver}}
      -
      操作系统
      +
      {{:MyLang('index.system_os_ver_title')}}
      {{$data.os_ver}}
      -
      PHP版本
      +
      {{:MyLang('index.system_php_ver_title')}}
      {{$data.php_ver}}
      -
      MySQL版本
      +
      {{:MyLang('index.system_mysql_ver_title')}}
      {{$data.mysql_ver}}
      -
      服务器端信息
      +
      {{:MyLang('index.system_server_ver_title')}}
      {{$data.server_ver}}
      -
      当前域名
      +
      {{:MyLang('index.system_host_title')}}
      {{$data.host}}
      • @@ -450,42 +450,46 @@
    • - 开发团队 + {{:MyLang('index.development_team_title')}}
      -
      公司官网
      +
      {{:MyLang('index.development_team_website_title')}}
      - 上海纵之格科技有限公司 + {{:MyLang('index.development_team_website_value')}}
      -
      技术支持
      +
      {{:MyLang('index.development_team_support_title')}}
      - ShopXO企业级电商系统提供商 + {{:MyLang('index.development_team_support_value')}}
      {{if !empty($site_store_links) and !empty($site_store_links['community_website'])}} -
      交流提问
      +
      {{:MyLang('index.development_team_ask_title')}}
      - ShopXO交流提问 + {{:MyLang('index.development_team_ask_value')}}
      {{/if}} -
      开源协议
      +
      {{:MyLang('index.development_team_agreement_title')}}
      - 查看开源协议 + {{:MyLang('index.development_team_agreement_value')}}
      {{if !empty($site_store_links) and !empty($site_store_links['system_update_log'])}} -
      更新日志
      +
      {{:MyLang('index.development_team_update_log_title')}}
      - 查看更新日志 + {{:MyLang('index.development_team_update_log_value')}}
      {{/if}} -
      研发成员
      -
      - 龚哥哥 -
      + {{if is_array(MyLang('index.development_team_members_value'))}} +
      {{:MyLang('index.development_team_members_title')}}
      +
      + {{foreach :MyLang('index.development_team_members_value') as $v}} + {{$v.name}} + {{/foreach}} +
      + {{/if}}
    @@ -517,7 +521,7 @@
    - +
    diff --git a/app/admin/view/default/index/stats_where.html b/app/admin/view/default/index/stats_where.html index d82599942..5d3a0249b 100644 --- a/app/admin/view/default/index/stats_where.html +++ b/app/admin/view/default/index/stats_where.html @@ -1,6 +1,6 @@ - + - - - + + \ No newline at end of file diff --git a/app/admin/view/default/lib/enable.html b/app/admin/view/default/lib/enable.html deleted file mode 100755 index 9ec7f6147..000000000 --- a/app/admin/view/default/lib/enable.html +++ /dev/null @@ -1,12 +0,0 @@ - -
    - -
    - {{foreach :MyLang('common_is_enable_list') as $v}} - - {{/foreach}} -
    -
    - \ No newline at end of file diff --git a/app/admin/view/default/lib/excel_win_html.html b/app/admin/view/default/lib/excel_win_html.html deleted file mode 100755 index 8cac00697..000000000 --- a/app/admin/view/default/lib/excel_win_html.html +++ /dev/null @@ -1,38 +0,0 @@ -
    -
    -
    -

    导入Excel

    - × -
    -
    - - -
    - {{if !empty($excel_import_format_url)}} -

    Excel格式下载

    - {{/if}} - {{if !empty($excel_import_tips)}} -

    {{$excel_import_tips}}

    - {{/if}} -

    PS：导入数据建议一次不要超过10万条。

    -
    -
    - - -
    -
    - -
    - - - - -
    导入成功 0 条
    -
    -
    导入失败 0 条
    -
    -
    - -
    -
    -
    \ No newline at end of file diff --git a/app/admin/view/default/lib/excel_win_js.html b/app/admin/view/default/lib/excel_win_js.html deleted file mode 100755 index cd26c51ad..000000000 --- a/app/admin/view/default/lib/excel_win_js.html +++ /dev/null @@ -1,43 +0,0 @@ - \ No newline at end of file diff --git a/app/admin/view/default/lib/gender.html b/app/admin/view/default/lib/gender.html index eb7885037..6458e887f 100755 --- a/app/admin/view/default/lib/gender.html +++ b/app/admin/view/default/lib/gender.html @@ -1,6 +1,6 @@
    - +
    {{foreach :MyLang('common_gender_list') as $v}}
    - + {{include file="public/footer" /}} \ No newline at end of file diff --git a/app/admin/view/default/site/siteset/discount.html b/app/admin/view/default/site/siteset/discount.html index a0a329006..11a9990a0 100644 --- a/app/admin/view/default/site/siteset/discount.html +++ b/app/admin/view/default/site/siteset/discount.html @@ -32,7 +32,7 @@
    - + {{include file="public/footer" /}} \ No newline at end of file diff --git a/app/admin/view/default/site/siteset/extends.html b/app/admin/view/default/site/siteset/extends.html index 7160cb5f0..57853f478 100644 --- a/app/admin/view/default/site/siteset/extends.html +++ b/app/admin/view/default/site/siteset/extends.html @@ -83,7 +83,7 @@
    -

    快捷导航

    +

    {{:MyLang('site.base_item_quick_nav_title')}}

    @@ -104,7 +104,7 @@
    -

    用户地址

    +

    {{:MyLang('site.base_item_user_address_title')}}

    @@ -145,7 +145,7 @@
    - + {{include file="public/footer" /}} \ No newline at end of file diff --git a/app/admin/view/default/site/siteset/goods.html b/app/admin/view/default/site/siteset/goods.html index e5a52f94c..52ed14365 100644 --- a/app/admin/view/default/site/siteset/goods.html +++ b/app/admin/view/default/site/siteset/goods.html @@ -36,15 +36,15 @@
    - +
    -
    - -

    1. WEB端默认展示3级，最低1级、最高3级(如设置为0级则默认为3级)

    -

    2. 手机端默认展示0级(商品列表模式)、最低0级、最高3级(1~3为分类展示模式)

    -

    3. 层级不一样、前端分类页样式也会不一样

    -
    + {{if is_array(MyLang('site.goods_tips_list'))}} +
    + +

    {{:implode('

    ', MyLang('site.goods_tips_list'))}}

    +
    + {{/if}}
    @@ -57,7 +57,7 @@
    - + {{include file="public/footer" /}} \ No newline at end of file diff --git a/app/admin/view/default/site/siteset/index.html b/app/admin/view/default/site/siteset/index.html index b7fc6e10e..283c29198 100644 --- a/app/admin/view/default/site/siteset/index.html +++ b/app/admin/view/default/site/siteset/index.html @@ -16,7 +16,7 @@
    -

    基础

    +

    {{:MyLang('base_title')}}

    @@ -44,7 +44,7 @@ {{/foreach}}
    - 拖拽模式需要自行进入首页设计页面、请先保存选中配置后再去设计页面 >> + {{:MyLang('site.site_setup_layout_tips')}}{{:MyLang('site.site_setup_layout_button_name')}}
    @@ -68,11 +68,11 @@ {{/foreach}}
-

如需更多楼层展示，请先到 / 商品管理->商品分类、一级分类设置首页推荐

+

{{:MyLang('site.site_setup_goods_category_tips')}}

{{else /}}
- 暂无数据，请先到 / 商品管理->商品分类、一级分类设置首页推荐 + {{:MyLang('site.site_setup_goods_category_no_data_tips')}}
{{/if}}
@@ -91,11 +91,11 @@ {{/foreach}} -

如需更多楼层展示，请先到 / 商品管理->商品分类、一级分类设置首页推荐

+

{{:MyLang('site.site_setup_goods_category_tips')}}

{{else /}}
- 暂无数据，请先到 / 商品管理->商品分类、一级分类设置首页推荐 + {{:MyLang('site.site_setup_goods_category_no_data_tips')}}
{{/if}}
@@ -105,7 +105,7 @@
-

自动模式

+

{{:MyLang('site.base_item_site_auto_mode_title')}}

@@ -116,11 +116,12 @@
-
- -

1. 配置每个楼层最多展示多少个商品

-

2. 不建议将数量修改的太大、会导致PC端左侧空白区域太大

-
+ {{if is_array(MyLang('site.goods_auto_mode_max_count_tips_list'))}} +
+ +

{{:implode('

', MyLang('site.goods_auto_mode_max_count_tips_list'))}}

+
+ {{/if}}
@@ -130,10 +131,12 @@ {{/foreach}} -
- -

综合为：热度->销量->最新 进行 降序(desc)排序

-
+ {{if is_array(MyLang('site.goods_auto_mode_order_by_tips_list'))}} +
+ +

{{:implode('

', MyLang('site.goods_auto_mode_order_by_tips_list'))}}

+
+ {{/if}}
@@ -149,16 +152,17 @@
-

手动模式

+

{{:MyLang('site.base_item_site_manual_mode_title')}}

-
- -

1. 可点击商品标题拖拽排序、按照顺序展示

-

2. 不建议添加很多商品、会导致PC端左侧空白区域太大

-
+ {{if is_array(MyLang('site.goods_manual_mode_max_tips_list'))}} +
+ +

{{:implode('

', MyLang('site.goods_manual_mode_max_tips_list'))}}

+
+ {{/if}} {{if !empty($goods_category_list)}}
    {{foreach $goods_category_list as $category}} @@ -181,15 +185,15 @@ {{/foreach}} {{/if}}
- +添加商品 + + {{:MyLang('site.add_goods_title')}} {{/foreach}} -

如需更多楼层展示，请先到 / 商品管理->商品分类、一级分类设置首页推荐

+

{{:MyLang('site.site_setup_goods_category_tips')}}

{{else /}}
- 暂无数据，请先到 / 商品管理->商品分类、一级分类设置首页推荐 + {{:MyLang('site.site_setup_goods_category_no_data_tips')}}
{{/if}}
@@ -211,7 +215,7 @@
-

商品添加

+

{{:MyLang('site.add_goods_title')}}

×
@@ -219,8 +223,8 @@
- + {{if !empty($goods_category_list)}} {{foreach $goods_category_list as $v}} @@ -237,15 +241,13 @@ {{/foreach}} {{/if}} - - + +
-
-
    -
    请搜索商品
    -
+
+
    @@ -254,7 +256,7 @@
    - + {{include file="public/footer" /}} \ No newline at end of file diff --git a/app/admin/view/default/site/siteset/order.html b/app/admin/view/default/site/siteset/order.html index fd23e7736..fe883c3b7 100644 --- a/app/admin/view/default/site/siteset/order.html +++ b/app/admin/view/default/site/siteset/order.html @@ -16,7 +16,7 @@
    -

    基础

    +

    {{:MyLang('base_title')}}

    @@ -100,17 +100,17 @@
    -

    默认支付方式

    +

    {{:MyLang('site.base_item_default_payment_title')}}

    -

    可以设置不同平台对应的默认支付方式、请先在[ 网站管理 -> 支付方式 ]中安装好支付插件启用并对用户开放

    +

    {{:MyLang('site.site_setup_order_default_payment_tips')}}

    {{foreach $common_platform_type as $v}}
    - {{if !empty($payment_list)}} {{foreach $payment_list as $pay}} @@ -136,7 +136,7 @@
    - + {{include file="public/footer" /}} \ No newline at end of file diff --git a/app/admin/view/default/site/siteset/search.html b/app/admin/view/default/site/siteset/search.html index 93717c83e..6f05dc7f0 100644 --- a/app/admin/view/default/site/siteset/search.html +++ b/app/admin/view/default/site/siteset/search.html @@ -39,7 +39,7 @@
    - +
    @@ -119,7 +119,7 @@
    - + {{include file="public/footer" /}} \ No newline at end of file diff --git a/app/admin/view/default/site/sitetype/index.html b/app/admin/view/default/site/sitetype/index.html index 2e78f2f84..5c37ec95d 100644 --- a/app/admin/view/default/site/sitetype/index.html +++ b/app/admin/view/default/site/sitetype/index.html @@ -16,13 +16,12 @@
    -
    - -

    1. 快递、常规电商流程，用户选择收货地址下单支付 -> 商家发货 -> 确认收货 -> 订单完成

    -

    2. 展示型、仅展示产品，可发起咨询（不能下单）

    -

    3. 自提点、下单时选择自提货物地址，用户下单支付 -> 确认提货 -> 订单完成

    -

    4. 虚拟销售、常规电商流程，用户下单支付 -> 自动发货 -> 确认提货 -> 订单完成

    -
    + {{if is_array(MyLang('site.sitetype_top_tips_list'))}} +
    + +

    {{:implode('

    ', MyLang('site.sitetype_top_tips_list'))}}

    +
    + {{/if}}
    @@ -39,7 +38,7 @@
    -

    展示型 +

    {{:MyLang('site.base_item_display_type_title')}}

    @@ -52,7 +51,7 @@
    -

    自提点

    +

    {{:MyLang('site.base_item_self_extraction_title')}}

      @@ -68,21 +67,21 @@ {{$address.alias}} {{/if}} - 移除 - 编辑 + {{:MyLang('remove_title')}} + {{:MyLang('edit_title')}} {{/foreach}} {{/if}}
    - +
    -

    虚拟销售

    +

    {{:MyLang('site.base_item_fictitious_title')}}

    @@ -107,40 +106,52 @@ - {{else /}} -
    没有相关商品
    +
    {{:MyLang('no_goods')}}
    {{/if}} \ No newline at end of file diff --git a/app/admin/view/default/warehousegoods/index.html b/app/admin/view/default/warehousegoods/index.html index 4b98cc6ac..e6b534d86 100644 --- a/app/admin/view/default/warehousegoods/index.html +++ b/app/admin/view/default/warehousegoods/index.html @@ -30,8 +30,8 @@ {{/foreach}} {{/if}} - + {{if !empty($goods_category_list)}} {{foreach $goods_category_list as $v}} @@ -48,8 +48,8 @@ {{/foreach}} {{/if}} - - + +
    diff --git a/app/index/lang/en-us.php b/app/index/lang/en-us.php index 8fcb09701..9d2bd5df6 100644 --- a/app/index/lang/en-us.php +++ b/app/index/lang/en-us.php @@ -23,7 +23,6 @@ return [ 'shop_home_title' => 'Mall homepage', 'back_to_the_home_title' => 'Back to the home', 'all_category_text' => 'All Category', - 'toggle_navigation_text' => 'Toggle navigation', 'login_title' => 'Login', 'register_title' => 'Register', 'logout_title' => 'Logout', diff --git a/app/index/lang/zh-cn.php b/app/index/lang/zh-cn.php index aae3b0019..2d598c0b8 100755 --- a/app/index/lang/zh-cn.php +++ b/app/index/lang/zh-cn.php @@ -23,7 +23,6 @@ return [ 'shop_home_title' => '商城首页', 'back_to_the_home_title' => '回到首页', 'all_category_text' => '全部分类', - 'toggle_navigation_text' => '导航切换', 'login_title' => '登录', 'register_title' => '注册', 'logout_title' => '退出', diff --git a/app/index/view/default/lib/enable.html b/app/index/view/default/lib/enable.html deleted file mode 100755 index 9ec7f6147..000000000 --- a/app/index/view/default/lib/enable.html +++ /dev/null @@ -1,12 +0,0 @@ - -
    - -
    - {{foreach :MyLang('common_is_enable_list') as $v}} - - {{/foreach}} -
    -
    - \ No newline at end of file diff --git a/app/index/view/default/lib/gender.html b/app/index/view/default/lib/gender.html index d75f40864..d7815b533 100755 --- a/app/index/view/default/lib/gender.html +++ b/app/index/view/default/lib/gender.html @@ -1,6 +1,6 @@
    - +
    {{foreach :MyLang('common_gender_list') as $v}}