diff --git a/app/admin/controller/Admin.php b/app/admin/controller/Admin.php index d6a7df49b..0bd76bc78 100755 --- a/app/admin/controller/Admin.php +++ b/app/admin/controller/Admin.php @@ -109,8 +109,8 @@ class Admin extends Common // 模板数据 $assign = [ 'id' => isset($params['id']) ? $params['id'] : 0, - 'common_gender_list' => MyConst('common_gender_list'), - 'common_admin_status_list' => MyConst('common_admin_status_list'), + 'common_gender_list' => MyLang('common_gender_list'), + 'common_admin_status_list' => MyLang('common_admin_status_list'), ]; // 角色 diff --git a/app/admin/controller/Answer.php b/app/admin/controller/Answer.php index 905927b54..ddcf52fa0 100755 --- a/app/admin/controller/Answer.php +++ b/app/admin/controller/Answer.php @@ -60,8 +60,8 @@ class Answer extends Base // 模板数据 $assign = [ // 静态数据 - 'common_is_show_list' => MyConst('common_is_show_list'), - 'common_is_text_list' => MyConst('common_is_text_list'), + 'common_is_show_list' => MyLang('common_is_show_list'), + 'common_is_text_list' => MyLang('common_is_text_list'), ]; // 数据 $data = $this->data_detail; diff --git a/app/admin/controller/Appcenternav.php b/app/admin/controller/Appcenternav.php index 1f68eaa82..e4b0cc52b 100755 --- a/app/admin/controller/Appcenternav.php +++ b/app/admin/controller/Appcenternav.php @@ -62,8 +62,8 @@ class AppCenterNav extends Base // 当前数据 'data' => $this->data_detail, // 静态数据 - 'common_platform_type' => MyConst('common_platform_type'), - 'common_app_event_type' => MyConst('common_app_event_type'), + 'common_platform_type' => MyLang('common_platform_type'), + 'common_app_event_type' => MyLang('common_app_event_type'), // 编辑器文件存放地址 'editor_path_type' => ResourcesService::EditorPathTypeValue('app_center_nav'), diff --git a/app/admin/controller/Appconfig.php b/app/admin/controller/Appconfig.php index bfe0e7427..cbab7b4b4 100755 --- a/app/admin/controller/Appconfig.php +++ b/app/admin/controller/Appconfig.php @@ -37,8 +37,8 @@ class AppConfig extends Base // 配置数据 'data' => ConfigService::ConfigList(), // 静态数据 - 'common_platform_type' => MyConst('common_platform_type'), - 'common_is_text_list' => MyConst('common_is_text_list'), + 'common_platform_type' => MyLang('common_platform_type'), + 'common_is_text_list' => MyLang('common_is_text_list'), ]; // 导航/视图 diff --git a/app/admin/controller/Apphomenav.php b/app/admin/controller/Apphomenav.php index d89484022..a4dc67106 100755 --- a/app/admin/controller/Apphomenav.php +++ b/app/admin/controller/Apphomenav.php @@ -62,8 +62,8 @@ class AppHomeNav extends Base // 当前数据 'data' => $this->data_detail, // 静态数据 - 'common_platform_type' => MyConst('common_platform_type'), - 'common_app_event_type' => MyConst('common_app_event_type'), + 'common_platform_type' => MyLang('common_platform_type'), + 'common_app_event_type' => MyLang('common_app_event_type'), // 编辑器文件存放地址 'editor_path_type' => ResourcesService::EditorPathTypeValue('app_nav'), diff --git a/app/admin/controller/Appmini.php b/app/admin/controller/Appmini.php index 2c9e6a87f..4fca7394c 100755 --- a/app/admin/controller/Appmini.php +++ b/app/admin/controller/Appmini.php @@ -162,10 +162,10 @@ class Appmini extends Base 'store_theme_url' => StoreService::StoreThemeUrl(), // 小程序平台 - 'common_appmini_type' => MyConst('common_appmini_type'), + 'common_appmini_type' => MyLang('common_appmini_type'), // 是否 - 'common_is_text_list' => MyConst('common_is_text_list'), + 'common_is_text_list' => MyLang('common_is_text_list'), // 基础导航 'base_nav' => [ diff --git a/app/admin/controller/Articlecategory.php b/app/admin/controller/Articlecategory.php index e4f1dd321..9c4887b7b 100755 --- a/app/admin/controller/Articlecategory.php +++ b/app/admin/controller/Articlecategory.php @@ -33,7 +33,7 @@ class ArticleCategory extends Base public function Index() { // 是否启用 - MyViewAssign('common_is_enable_list', MyConst('common_is_enable_list')); + 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 3d5661c99..43e9ded4a 100755 --- a/app/admin/controller/Brand.php +++ b/app/admin/controller/Brand.php @@ -61,7 +61,7 @@ class Brand extends Base // 模板数据 $assign = [ // 静态数据 - 'common_is_enable_list' => MyConst('common_is_enable_list'), + '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 c2ffe717e..04a272471 100755 --- a/app/admin/controller/Brandcategory.php +++ b/app/admin/controller/Brandcategory.php @@ -33,7 +33,7 @@ class BrandCategory extends Base public function Index() { // 是否启用 - MyViewAssign('common_is_enable_list', MyConst('common_is_enable_list')); + MyViewAssign('common_is_enable_list', MyLang('common_is_enable_list')); return MyView(); } diff --git a/app/admin/controller/Common.php b/app/admin/controller/Common.php index 6bf31c38f..188bb2129 100755 --- a/app/admin/controller/Common.php +++ b/app/admin/controller/Common.php @@ -149,7 +149,7 @@ class Common extends BaseController { if(IS_AJAX) { - exit(json_encode(DataReturn('登录失效,请重新登录', -400))); + exit(json_encode(DataReturn(MyLang('login_failure_tips'), -400))); } else { die(''); } diff --git a/app/admin/controller/Config.php b/app/admin/controller/Config.php index 2e4aeef5e..e4eec1d8f 100755 --- a/app/admin/controller/Config.php +++ b/app/admin/controller/Config.php @@ -35,13 +35,13 @@ class Config extends Base // 模板数据 $assign = [ // 静态数据 - 'common_excel_charset_list' => MyConst('common_excel_charset_list'), - 'common_excel_export_type_list' => MyConst('common_excel_export_type_list'), - 'common_map_type_list' => MyConst('common_map_type_list'), - 'common_is_enable_list' => MyConst('common_is_enable_list'), - 'common_login_type_list' => MyConst('common_login_type_list'), - 'common_close_open_list' => MyConst('common_close_open_list'), - 'common_is_text_list' => MyConst('common_is_text_list'), + '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(), diff --git a/app/admin/controller/Design.php b/app/admin/controller/Design.php index b7acb5ece..22e8872c4 100644 --- a/app/admin/controller/Design.php +++ b/app/admin/controller/Design.php @@ -101,8 +101,8 @@ class Design extends Base 'images_magic_cube_view_list_show_style' => BaseLayout::$images_magic_cube_view_list_show_style, // 首页商品排序规则 - 'goods_order_by_type_list' => MyConst('goods_order_by_type_list'), - 'goods_order_by_rule_list' => MyConst('goods_order_by_rule_list'), + 'goods_order_by_type_list' => MyLang('goods_order_by_type_list'), + 'goods_order_by_rule_list' => MyLang('goods_order_by_rule_list'), // 加载布局样式+管理 'is_load_layout' => 1, diff --git a/app/admin/controller/Email.php b/app/admin/controller/Email.php index 7f7be7426..390149b33 100755 --- a/app/admin/controller/Email.php +++ b/app/admin/controller/Email.php @@ -37,7 +37,7 @@ class Email extends Base $assign = [ // 静态数据 - 'common_is_text_list' => MyConst('common_is_text_list'), + 'common_is_text_list' => MyLang('common_is_text_list'), // 配置信息 'data' => ConfigService::ConfigList(), diff --git a/app/admin/controller/Express.php b/app/admin/controller/Express.php index 40ee0a0a3..388f70bce 100755 --- a/app/admin/controller/Express.php +++ b/app/admin/controller/Express.php @@ -36,7 +36,7 @@ class Express extends Base // 模板数据 $assign = [ // 静态数据 - 'common_is_enable_list' => MyConst('common_is_enable_list'), + 'common_is_enable_list' => MyLang('common_is_enable_list'), // 编辑器文件存放地址 'editor_path_type' => ResourcesService::EditorPathTypeValue('express'), diff --git a/app/admin/controller/Goods.php b/app/admin/controller/Goods.php index e31fa705f..8220dd06a 100755 --- a/app/admin/controller/Goods.php +++ b/app/admin/controller/Goods.php @@ -54,7 +54,7 @@ class Goods extends Base // 模板数据 $assign = [ // 商品参数类型 - 'common_goods_parameters_type_list' => MyConst('common_goods_parameters_type_list'), + 'common_goods_parameters_type_list' => MyLang('common_goods_parameters_type_list'), ]; if(!empty($this->data_detail)) { @@ -91,9 +91,9 @@ class Goods extends Base // 模板信息 $assign = [ // 商品参数类型 - 'common_goods_parameters_type_list' => MyConst('common_goods_parameters_type_list'), + 'common_goods_parameters_type_list' => MyLang('common_goods_parameters_type_list'), // 站点类型 - 'common_site_type_list' => MyConst('common_site_type_list'), + 'common_site_type_list' => MyLang('common_site_type_list'), // 当前系统设置的站点类型 'common_site_type' => SystemBaseService::SiteTypeValue(), // 地区信息 diff --git a/app/admin/controller/Goodscategory.php b/app/admin/controller/Goodscategory.php index 1ab2e3348..c6959e020 100755 --- a/app/admin/controller/Goodscategory.php +++ b/app/admin/controller/Goodscategory.php @@ -36,7 +36,7 @@ class GoodsCategory extends Base // 模板数据 $assign = [ // 静态数据 - 'common_is_text_list' => MyConst('common_is_text_list'), + 'common_is_text_list' => MyLang('common_is_text_list'), // 商品分类 'goods_category_list' => GoodsService::GoodsCategoryAll(), diff --git a/app/admin/controller/Goodscomments.php b/app/admin/controller/Goodscomments.php index 2ce5513b2..9a5b7f1a1 100644 --- a/app/admin/controller/Goodscomments.php +++ b/app/admin/controller/Goodscomments.php @@ -44,7 +44,7 @@ class Goodscomments extends Base */ public function Detail() { - MyViewAssign('common_goods_comments_rating_list', MyConst('common_goods_comments_rating_list')); + MyViewAssign('common_goods_comments_rating_list', MyLang('common_goods_comments_rating_list')); return MyView(); } @@ -62,10 +62,10 @@ class Goodscomments extends Base // 当前数据 'data' => $this->data_detail, // 静态数据 - 'common_is_show_list' => MyConst('common_is_show_list'), - 'common_is_text_list' => MyConst('common_is_text_list'), - 'common_goods_comments_rating_list' => MyConst('common_goods_comments_rating_list'), - 'common_goods_comments_business_type_list' => MyConst('common_goods_comments_business_type_list'), + 'common_is_show_list' => MyLang('common_is_show_list'), + 'common_is_text_list' => MyLang('common_is_text_list'), + 'common_goods_comments_rating_list' => MyLang('common_goods_comments_rating_list'), + 'common_goods_comments_business_type_list' => MyLang('common_goods_comments_business_type_list'), ]; // 参数 diff --git a/app/admin/controller/Goodsparamstemplate.php b/app/admin/controller/Goodsparamstemplate.php index 309742047..b18606dc7 100755 --- a/app/admin/controller/Goodsparamstemplate.php +++ b/app/admin/controller/Goodsparamstemplate.php @@ -51,7 +51,7 @@ class GoodsParamsTemplate extends Base // 模板数据 $assign = [ // 商品参数类型 - 'common_goods_parameters_type_list' => MyConst('common_goods_parameters_type_list'), + 'common_goods_parameters_type_list' => MyLang('common_goods_parameters_type_list'), // 数据 'data' => $this->data_detail, @@ -82,7 +82,7 @@ class GoodsParamsTemplate extends Base // 模板数据 $assign = [ // 商品参数类型 - 'common_goods_parameters_type_list' => MyConst('common_goods_parameters_type_list'), + 'common_goods_parameters_type_list' => MyLang('common_goods_parameters_type_list'), // 参数配置 'parameters' => empty($data['config_data']) ? [] : $data['config_data'], diff --git a/app/admin/controller/Orderaftersale.php b/app/admin/controller/Orderaftersale.php index 52d5bbd0f..23a92b978 100644 --- a/app/admin/controller/Orderaftersale.php +++ b/app/admin/controller/Orderaftersale.php @@ -34,7 +34,7 @@ class Orderaftersale extends Base public function Index() { // 静态数据 - MyViewAssign('common_order_aftersale_refundment_list', MyConst('common_order_aftersale_refundment_list')); + MyViewAssign('common_order_aftersale_refundment_list', MyLang('common_order_aftersale_refundment_list')); return MyView(); } diff --git a/app/admin/controller/Payment.php b/app/admin/controller/Payment.php index 60fd46eef..29f04d2ee 100755 --- a/app/admin/controller/Payment.php +++ b/app/admin/controller/Payment.php @@ -46,7 +46,7 @@ class Payment extends Base 'cannot_deleted_list' => PaymentService::$cannot_deleted_list, // 适用平台 - 'common_platform_type' => MyConst('common_platform_type'), + 'common_platform_type' => MyLang('common_platform_type'), // 应用商店 'store_payment_url' => StoreService::StorePaymentUrl(), @@ -90,7 +90,7 @@ class Payment extends Base 'data' => $data, // 适用平台 - 'common_platform_type' => MyConst('common_platform_type'), + 'common_platform_type' => MyLang('common_platform_type'), // 编辑器文件存放地址 'editor_path_type' => ResourcesService::EditorPathTypeValue('payment'), diff --git a/app/admin/controller/Power.php b/app/admin/controller/Power.php index 86634d8c6..7576ff8b7 100755 --- a/app/admin/controller/Power.php +++ b/app/admin/controller/Power.php @@ -41,7 +41,7 @@ class Power extends Base ]; $assign = [ 'data' => AdminPowerService::PowerList($data_params), - 'common_is_show_list' => MyConst('common_is_show_list'), + 'common_is_show_list' => MyLang('common_is_show_list'), ]; MyViewAssign($assign); return MyView(); diff --git a/app/admin/controller/Quicknav.php b/app/admin/controller/Quicknav.php index ba592656f..dd0b21d04 100755 --- a/app/admin/controller/Quicknav.php +++ b/app/admin/controller/Quicknav.php @@ -63,8 +63,8 @@ class QuickNav extends Base 'data' => $this->data_detail, // 静态数据 - 'common_platform_type' => MyConst('common_platform_type'), - 'common_app_event_type' => MyConst('common_app_event_type'), + 'common_platform_type' => MyLang('common_platform_type'), + 'common_app_event_type' => MyLang('common_app_event_type'), // 编辑器文件存放地址 'editor_path_type' => ResourcesService::EditorPathTypeValue('quick_nav'), diff --git a/app/admin/controller/Region.php b/app/admin/controller/Region.php index 30b21c2f9..6aa433ac4 100755 --- a/app/admin/controller/Region.php +++ b/app/admin/controller/Region.php @@ -33,7 +33,7 @@ class Region extends Base public function Index() { // 是否启用 - MyViewAssign('common_is_enable_list', MyConst('common_is_enable_list')); + 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 c8030158b..128ff5341 100755 --- a/app/admin/controller/Screeningprice.php +++ b/app/admin/controller/Screeningprice.php @@ -33,7 +33,7 @@ class ScreeningPrice extends Base public function Index() { // 是否启用 - MyViewAssign('common_is_enable_list', MyConst('common_is_enable_list')); + MyViewAssign('common_is_enable_list', MyLang('common_is_enable_list')); return MyView(); } diff --git a/app/admin/controller/Seo.php b/app/admin/controller/Seo.php index 1f499370c..68a987b58 100755 --- a/app/admin/controller/Seo.php +++ b/app/admin/controller/Seo.php @@ -35,7 +35,7 @@ class Seo extends Base // 模板数据 $assign = [ // url模式 - 'seo_url_model_list' => MyConst('seo_url_model_list'), + 'seo_url_model_list' => MyLang('seo_url_model_list'), // 文章标题seo方案 'seo_article_browser_list' => MyConst('seo_article_browser_list'), diff --git a/app/admin/controller/Site.php b/app/admin/controller/Site.php index cbf4a9435..99f3cf124 100755 --- a/app/admin/controller/Site.php +++ b/app/admin/controller/Site.php @@ -160,47 +160,47 @@ class Site extends Base 'view_type' => $this->view_type, // 时区 - 'site_timezone_list' => MyConst('site_timezone_list'), + 'site_timezone_list' => MyLang('site_timezone_list'), // 平台 - 'common_platform_type' => MyConst('common_platform_type'), + 'common_platform_type' => MyLang('common_platform_type'), // 关闭开启 - 'common_close_open_list' => MyConst('common_close_open_list'), + 'common_close_open_list' => MyLang('common_close_open_list'), // 登录方式 - 'common_login_type_list' => MyConst('common_login_type_list'), + 'common_login_type_list' => MyLang('common_login_type_list'), // 用户注册类型列表 - 'common_user_reg_type_list' => MyConst('common_user_reg_type_list'), + 'common_user_reg_type_list' => MyLang('common_user_reg_type_list'), // 图片验证码规则 - 'site_images_verify_rules_list' => MyConst('site_images_verify_rules_list'), + 'site_images_verify_rules_list' => MyLang('site_images_verify_rules_list'), // 热门搜索关键字 - 'common_search_keywords_type_list' => MyConst('common_search_keywords_type_list'), + 'common_search_keywords_type_list' => MyLang('common_search_keywords_type_list'), // 是否 - 'common_is_text_list' => MyConst('common_is_text_list'), + 'common_is_text_list' => MyLang('common_is_text_list'), // 站点类型 - 'common_site_type_list' => MyConst('common_site_type_list'), + 'common_site_type_list' => MyLang('common_site_type_list'), // 扣除库存规则 - 'common_deduction_inventory_rules_list' => MyConst('common_deduction_inventory_rules_list'), + 'common_deduction_inventory_rules_list' => MyLang('common_deduction_inventory_rules_list'), // 增加销量规则 - 'common_sales_count_inc_rules_list' => MyConst('common_sales_count_inc_rules_list'), + 'common_sales_count_inc_rules_list' => MyLang('common_sales_count_inc_rules_list'), // 首页商品排序规则 - 'goods_order_by_type_list' => MyConst('goods_order_by_type_list'), - 'goods_order_by_rule_list' => MyConst('goods_order_by_rule_list'), + 'goods_order_by_type_list' => MyLang('goods_order_by_type_list'), + 'goods_order_by_rule_list' => MyLang('goods_order_by_rule_list'), // 首页楼层数据类型 - 'common_site_floor_data_type_list' => MyConst('common_site_floor_data_type_list'), + 'common_site_floor_data_type_list' => MyLang('common_site_floor_data_type_list'), // 搜索参数类型 - 'common_goods_parameters_type_list' => MyConst('common_goods_parameters_type_list'), + 'common_goods_parameters_type_list' => MyLang('common_goods_parameters_type_list'), ]; // 主导航 diff --git a/app/admin/controller/Slide.php b/app/admin/controller/Slide.php index e1b3ba5e9..b33c81fc8 100755 --- a/app/admin/controller/Slide.php +++ b/app/admin/controller/Slide.php @@ -62,9 +62,9 @@ class Slide extends Base // 当前数据 'data' => $this->data_detail, // 静态资源 - 'common_is_enable_list' => MyConst('common_is_enable_list'), - 'common_platform_type' => MyConst('common_platform_type'), - 'common_app_event_type' => MyConst('common_app_event_type'), + '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/controller/User.php b/app/admin/controller/User.php index 0d2bdc33f..634a9f61c 100755 --- a/app/admin/controller/User.php +++ b/app/admin/controller/User.php @@ -72,7 +72,7 @@ class User extends Base // 模板数据 $assign = [ // 静态数据 - 'common_gender_list' => MyConst('common_gender_list'), + 'common_gender_list' => MyLang('common_gender_list'), ]; // 用户编辑页面钩子 diff --git a/app/admin/form/Admin.php b/app/admin/form/Admin.php index 22a1932c4..5d8d5c0e7 100644 --- a/app/admin/form/Admin.php +++ b/app/admin/form/Admin.php @@ -72,12 +72,12 @@ class Admin 'view_type' => 'field', 'view_key' => 'status', 'view_data_key' => 'name', - 'view_data' => MyConst('common_admin_status_list'), + 'view_data' => MyLang('common_admin_status_list'), 'is_sort' => 1, 'search_config' => [ 'form_type' => 'select', 'where_type' => 'in', - 'data' => MyConst('common_admin_status_list'), + 'data' => MyLang('common_admin_status_list'), 'data_key' => 'value', 'data_name' => 'name', 'is_multiple' => 1, @@ -88,12 +88,12 @@ class Admin 'view_type' => 'field', 'view_key' => 'gender', 'view_data_key' => 'name', - 'view_data' => MyConst('common_gender_list'), + 'view_data' => MyLang('common_gender_list'), 'is_sort' => 1, 'search_config' => [ 'form_type' => 'select', 'where_type' => 'in', - 'data' => MyConst('common_gender_list'), + 'data' => MyLang('common_gender_list'), 'data_key' => 'id', 'data_name' => 'name', 'is_multiple' => 1, diff --git a/app/admin/form/Answer.php b/app/admin/form/Answer.php index 6bc8a41d4..db5784c68 100644 --- a/app/admin/form/Answer.php +++ b/app/admin/form/Answer.php @@ -124,7 +124,7 @@ class Answer 'search_config' => [ 'form_type' => 'select', 'where_type' => 'in', - 'data' => MyConst('common_is_show_list'), + 'data' => MyLang('common_is_show_list'), 'data_key' => 'id', 'data_name' => 'name', 'is_multiple' => 1, @@ -140,7 +140,7 @@ class Answer 'search_config' => [ 'form_type' => 'select', 'where_type' => 'in', - 'data' => MyConst('common_is_text_list'), + 'data' => MyLang('common_is_text_list'), 'data_key' => 'id', 'data_name' => 'name', 'is_multiple' => 1, diff --git a/app/admin/form/Appcenternav.php b/app/admin/form/Appcenternav.php index 421c7b3a8..456ef1f72 100644 --- a/app/admin/form/Appcenternav.php +++ b/app/admin/form/Appcenternav.php @@ -70,12 +70,12 @@ class AppCenterNav 'view_type' => 'field', 'view_key' => 'platform', 'view_data_key' => 'name', - 'view_data' => MyConst('common_platform_type'), + 'view_data' => MyLang('common_platform_type'), 'is_sort' => 1, 'search_config' => [ 'form_type' => 'select', 'where_type' => 'in', - 'data' => MyConst('common_platform_type'), + 'data' => MyLang('common_platform_type'), 'data_key' => 'value', 'data_name' => 'name', 'is_multiple' => 1, @@ -92,13 +92,13 @@ class AppCenterNav 'view_type' => 'field', 'view_key' => 'event_type', 'view_data_key' => 'name', - 'view_data' => MyConst('common_app_event_type'), + 'view_data' => MyLang('common_app_event_type'), 'grid_size' => 'sm', 'is_sort' => 1, 'search_config' => [ 'form_type' => 'select', 'where_type' => 'in', - 'data' => MyConst('common_app_event_type'), + 'data' => MyLang('common_app_event_type'), 'data_key' => 'value', 'data_name' => 'name', 'is_multiple' => 1, @@ -126,7 +126,7 @@ class AppCenterNav 'search_config' => [ 'form_type' => 'select', 'where_type' => 'in', - 'data' => MyConst('common_is_enable_list'), + 'data' => MyLang('common_is_enable_list'), 'data_key' => 'id', 'data_name' => 'name', 'is_multiple' => 1, @@ -142,7 +142,7 @@ class AppCenterNav 'search_config' => [ 'form_type' => 'select', 'where_type' => 'in', - 'data' => MyConst('common_is_text_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 7403cc761..81291f31f 100644 --- a/app/admin/form/Apphomenav.php +++ b/app/admin/form/Apphomenav.php @@ -70,12 +70,12 @@ class AppHomeNav 'view_type' => 'field', 'view_key' => 'platform', 'view_data_key' => 'name', - 'view_data' => MyConst('common_platform_type'), + 'view_data' => MyLang('common_platform_type'), 'is_sort' => 1, 'search_config' => [ 'form_type' => 'select', 'where_type' => 'in', - 'data' => MyConst('common_platform_type'), + 'data' => MyLang('common_platform_type'), 'data_key' => 'value', 'data_name' => 'name', 'is_multiple' => 1, @@ -92,13 +92,13 @@ class AppHomeNav 'view_type' => 'field', 'view_key' => 'event_type', 'view_data_key' => 'name', - 'view_data' => MyConst('common_app_event_type'), + 'view_data' => MyLang('common_app_event_type'), 'grid_size' => 'sm', 'is_sort' => 1, 'search_config' => [ 'form_type' => 'select', 'where_type' => 'in', - 'data' => MyConst('common_app_event_type'), + 'data' => MyLang('common_app_event_type'), 'data_key' => 'value', 'data_name' => 'name', 'is_multiple' => 1, @@ -126,7 +126,7 @@ class AppHomeNav 'search_config' => [ 'form_type' => 'select', 'where_type' => 'in', - 'data' => MyConst('common_is_enable_list'), + 'data' => MyLang('common_is_enable_list'), 'data_key' => 'id', 'data_name' => 'name', 'is_multiple' => 1, @@ -142,7 +142,7 @@ class AppHomeNav 'search_config' => [ 'form_type' => 'select', 'where_type' => 'in', - 'data' => MyConst('common_is_text_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 8f61a80f2..274c9703d 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' => MyConst('common_is_enable_list'), + 'data' => MyLang('common_is_enable_list'), 'data_key' => 'id', 'data_name' => 'name', 'is_multiple' => 1, @@ -122,7 +122,7 @@ class Article 'search_config' => [ 'form_type' => 'select', 'where_type' => 'in', - 'data' => MyConst('common_is_text_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 94f75e367..f8f0f4d30 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' => MyConst('common_is_enable_list'), + 'data' => MyLang('common_is_enable_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 b5709116e..8aa844a0e 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' => MyConst('common_is_enable_list'), + 'data' => MyLang('common_is_enable_list'), 'data_key' => 'id', 'data_name' => 'name', 'is_multiple' => 1, @@ -95,7 +95,7 @@ class CustomView 'search_config' => [ 'form_type' => 'select', 'where_type' => 'in', - 'data' => MyConst('common_is_text_list'), + 'data' => MyLang('common_is_text_list'), 'data_key' => 'id', 'data_name' => 'name', 'is_multiple' => 1, @@ -111,7 +111,7 @@ class CustomView 'search_config' => [ 'form_type' => 'select', 'where_type' => 'in', - 'data' => MyConst('common_is_text_list'), + 'data' => MyLang('common_is_text_list'), 'data_key' => 'id', 'data_name' => 'name', 'is_multiple' => 1, @@ -127,7 +127,7 @@ class CustomView 'search_config' => [ 'form_type' => 'select', 'where_type' => 'in', - 'data' => MyConst('common_is_text_list'), + 'data' => MyLang('common_is_text_list'), 'data_key' => 'id', 'data_name' => 'name', 'is_multiple' => 1, diff --git a/app/admin/form/Design.php b/app/admin/form/Design.php index 60b317348..935b83a41 100644 --- a/app/admin/form/Design.php +++ b/app/admin/form/Design.php @@ -99,7 +99,7 @@ class Design 'search_config' => [ 'form_type' => 'select', 'where_type' => 'in', - 'data' => MyConst('common_is_text_list'), + 'data' => MyLang('common_is_text_list'), 'data_key' => 'id', 'data_name' => 'name', 'is_multiple' => 1, @@ -115,7 +115,7 @@ class Design 'search_config' => [ 'form_type' => 'select', 'where_type' => 'in', - 'data' => MyConst('common_is_text_list'), + 'data' => MyLang('common_is_text_list'), 'data_key' => 'id', 'data_name' => 'name', 'is_multiple' => 1, @@ -131,7 +131,7 @@ class Design 'search_config' => [ 'form_type' => 'select', 'where_type' => 'in', - 'data' => MyConst('common_is_text_list'), + 'data' => MyLang('common_is_text_list'), 'data_key' => 'id', 'data_name' => 'name', 'is_multiple' => 1, diff --git a/app/admin/form/Goods.php b/app/admin/form/Goods.php index 2c937c7a2..e0b3338b5 100644 --- a/app/admin/form/Goods.php +++ b/app/admin/form/Goods.php @@ -160,7 +160,7 @@ class Goods 'search_config' => [ 'form_type' => 'select', 'where_type' => 'in', - 'data' => MyConst('common_is_shelves_list'), + 'data' => MyLang('common_is_shelves_list'), 'data_key' => 'id', 'data_name' => 'name', 'is_multiple' => 1, @@ -176,7 +176,7 @@ class Goods 'search_config' => [ 'form_type' => 'select', 'where_type' => 'in', - 'data' => MyConst('common_is_text_list'), + 'data' => MyLang('common_is_text_list'), 'data_key' => 'id', 'data_name' => 'name', 'is_multiple' => 1, @@ -187,12 +187,12 @@ class Goods 'view_type' => 'field', 'view_key' => 'site_type', 'view_data_key' => 'name', - 'view_data' => MyConst('common_site_type_list'), + 'view_data' => MyLang('common_site_type_list'), 'is_sort' => 1, 'search_config' => [ 'form_type' => 'select', 'where_type' => 'in', - 'data' => MyConst('common_site_type_list'), + 'data' => MyLang('common_site_type_list'), 'data_key' => 'value', 'data_name' => 'name', 'is_multiple' => 1, diff --git a/app/admin/form/Goodscomments.php b/app/admin/form/Goodscomments.php index b2fb7e993..6a5d22264 100644 --- a/app/admin/form/Goodscomments.php +++ b/app/admin/form/Goodscomments.php @@ -92,13 +92,13 @@ class GoodsComments 'view_type' => 'field', 'view_key' => 'business_type', 'view_data_key' => 'name', - 'view_data' => MyConst('common_goods_comments_business_type_list'), + 'view_data' => MyLang('common_goods_comments_business_type_list'), 'width' => 120, 'is_sort' => 1, 'search_config' => [ 'form_type' => 'select', 'where_type' => 'in', - 'data' => MyConst('common_goods_comments_business_type_list'), + 'data' => MyLang('common_goods_comments_business_type_list'), 'data_key' => 'value', 'data_name' => 'name', 'is_multiple' => 1, @@ -131,7 +131,7 @@ class GoodsComments 'form_type' => 'select', 'form_name' => 'rating', 'where_type' => 'in', - 'data' => MyConst('common_goods_comments_rating_list'), + 'data' => MyLang('common_goods_comments_rating_list'), 'data_key' => 'value', 'data_name' => 'name', 'is_multiple' => 1, @@ -159,7 +159,7 @@ class GoodsComments 'search_config' => [ 'form_type' => 'select', 'where_type' => 'in', - 'data' => MyConst('common_is_text_list'), + 'data' => MyLang('common_is_text_list'), 'data_key' => 'id', 'data_name' => 'name', 'is_multiple' => 1, @@ -175,7 +175,7 @@ class GoodsComments 'search_config' => [ 'form_type' => 'select', 'where_type' => 'in', - 'data' => MyConst('common_is_text_list'), + 'data' => MyLang('common_is_text_list'), 'data_key' => 'id', 'data_name' => 'name', 'is_multiple' => 1, @@ -191,7 +191,7 @@ class GoodsComments 'search_config' => [ 'form_type' => 'select', 'where_type' => 'in', - 'data' => MyConst('common_is_text_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 48db797e2..3d578c0ea 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' => MyConst('common_is_enable_list'), + 'data' => MyLang('common_is_enable_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 d3167d707..f40bede39 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' => MyConst('common_is_enable_list'), + 'data' => MyLang('common_is_enable_list'), 'data_key' => 'id', 'data_name' => 'name', 'is_multiple' => 1, diff --git a/app/admin/form/Integrallog.php b/app/admin/form/Integrallog.php index 708339bf3..c9ba8ee84 100644 --- a/app/admin/form/Integrallog.php +++ b/app/admin/form/Integrallog.php @@ -64,12 +64,12 @@ class IntegralLog 'view_type' => 'field', 'view_key' => 'type', 'view_data_key' => 'name', - 'view_data' => MyConst('common_integral_log_type_list'), + 'view_data' => MyLang('common_integral_log_type_list'), 'is_sort' => 1, 'search_config' => [ 'form_type' => 'select', 'where_type' => 'in', - 'data' => MyConst('common_integral_log_type_list'), + 'data' => MyLang('common_integral_log_type_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 a39943f67..53b5677d6 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' => MyConst('common_is_enable_list'), + 'data' => MyLang('common_is_enable_list'), 'data_key' => 'id', 'data_name' => 'name', 'is_multiple' => 1, @@ -116,7 +116,7 @@ class Link 'search_config' => [ 'form_type' => 'select', 'where_type' => 'in', - 'data' => MyConst('common_is_text_list'), + 'data' => MyLang('common_is_text_list'), 'data_key' => 'id', 'data_name' => 'name', 'is_multiple' => 1, diff --git a/app/admin/form/Message.php b/app/admin/form/Message.php index 58bffecc2..c0e5c0732 100644 --- a/app/admin/form/Message.php +++ b/app/admin/form/Message.php @@ -77,12 +77,12 @@ class Message 'view_type' => 'field', 'view_key' => 'type', 'view_data_key' => 'name', - 'view_data' => MyConst('common_message_type_list'), + 'view_data' => MyLang('common_message_type_list'), 'is_sort' => 1, 'search_config' => [ 'form_type' => 'select', 'where_type' => 'in', - 'data' => MyConst('common_message_type_list'), + 'data' => MyLang('common_message_type_list'), 'data_key' => 'id', 'data_name' => 'name', 'is_multiple' => 1, @@ -128,12 +128,12 @@ class Message 'view_type' => 'field', 'view_key' => 'is_read', 'view_data_key' => 'name', - 'view_data' => MyConst('common_is_read_list'), + 'view_data' => MyLang('common_is_read_list'), 'is_sort' => 1, 'search_config' => [ 'form_type' => 'select', 'where_type' => 'in', - 'data' => MyConst('common_is_read_list'), + 'data' => MyLang('common_is_read_list'), 'data_key' => 'id', 'data_name' => 'name', 'is_multiple' => 1, @@ -148,7 +148,7 @@ class Message 'form_type' => 'select', 'where_type' => 'in', 'form_name' => 'user_is_delete_time', - 'data' => MyConst('common_is_text_list'), + 'data' => MyLang('common_is_text_list'), 'data_key' => 'id', 'data_name' => 'name', 'where_type_custom' => 'WhereTypeUserIsDelete', diff --git a/app/admin/form/Navigation.php b/app/admin/form/Navigation.php index ee2dc286c..936a53aa4 100644 --- a/app/admin/form/Navigation.php +++ b/app/admin/form/Navigation.php @@ -76,12 +76,12 @@ class Navigation 'view_type' => 'field', 'view_key' => 'data_type', 'view_data_key' => 'name', - 'view_data' => MyConst('common_nav_type_list'), + 'view_data' => MyLang('common_nav_type_list'), 'is_sort' => 1, 'search_config' => [ 'form_type' => 'select', 'where_type' => 'in', - 'data' => MyConst('common_nav_type_list'), + 'data' => MyLang('common_nav_type_list'), 'data_key' => 'value', 'data_name' => 'name', 'is_multiple' => 1, @@ -98,7 +98,7 @@ class Navigation 'search_config' => [ 'form_type' => 'select', 'where_type' => 'in', - 'data' => MyConst('common_is_show_list'), + 'data' => MyLang('common_is_show_list'), 'data_key' => 'id', 'data_name' => 'name', 'is_multiple' => 1, @@ -114,7 +114,7 @@ class Navigation 'search_config' => [ 'form_type' => 'select', 'where_type' => 'in', - 'data' => MyConst('common_is_text_list'), + 'data' => MyLang('common_is_text_list'), 'data_key' => 'id', 'data_name' => 'name', 'is_multiple' => 1, diff --git a/app/admin/form/Order.php b/app/admin/form/Order.php index 129859a18..04bf8eec3 100644 --- a/app/admin/form/Order.php +++ b/app/admin/form/Order.php @@ -88,7 +88,7 @@ class Order 'form_type' => 'select', 'form_name' => 'status', 'where_type' => 'in', - 'data' => MyConst('common_order_status'), + 'data' => MyLang('common_order_status'), 'data_key' => 'id', 'data_name' => 'name', 'is_multiple' => 1, @@ -103,7 +103,7 @@ class Order 'form_type' => 'select', 'form_name' => 'pay_status', 'where_type' => 'in', - 'data' => MyConst('common_order_pay_status'), + 'data' => MyLang('common_order_pay_status'), 'data_key' => 'id', 'data_name' => 'name', 'is_multiple' => 1, @@ -159,12 +159,12 @@ class Order 'view_type' => 'field', 'view_key' => 'order_model', 'view_data_key' => 'name', - 'view_data' => MyConst('common_order_type_list'), + 'view_data' => MyLang('common_order_type_list'), 'is_sort' => 1, 'search_config' => [ 'form_type' => 'select', 'where_type' => 'in', - 'data' => MyConst('common_order_type_list'), + 'data' => MyLang('common_order_type_list'), 'data_key' => 'value', 'data_name' => 'name', 'is_multiple' => 1, @@ -175,12 +175,12 @@ class Order 'view_type' => 'field', 'view_key' => 'client_type', 'view_data_key' => 'name', - 'view_data' => MyConst('common_platform_type'), + 'view_data' => MyLang('common_platform_type'), 'is_sort' => 1, 'search_config' => [ 'form_type' => 'select', 'where_type' => 'in', - 'data' => MyConst('common_platform_type'), + 'data' => MyLang('common_platform_type'), 'data_key' => 'value', 'data_name' => 'name', 'is_multiple' => 1, @@ -336,7 +336,7 @@ class Order 'form_type' => 'select', 'where_type' => 'in', 'form_name' => 'user_is_comments', - 'data' => MyConst('common_is_text_list'), + 'data' => MyLang('common_is_text_list'), 'data_key' => 'id', 'data_name' => 'name', 'where_type_custom' => 'WhereTypyUserIsComments', diff --git a/app/admin/form/Orderaftersale.php b/app/admin/form/Orderaftersale.php index cfacc293c..36bae4ae8 100644 --- a/app/admin/form/Orderaftersale.php +++ b/app/admin/form/Orderaftersale.php @@ -79,13 +79,13 @@ class OrderAftersale 'view_type' => 'field', 'view_key' => 'status', 'view_data_key' => 'name', - 'view_data' => MyConst('common_order_aftersale_status_list'), + 'view_data' => MyLang('common_order_aftersale_status_list'), 'width' => 120, 'is_sort' => 1, 'search_config' => [ 'form_type' => 'select', 'where_type' => 'in', - 'data' => MyConst('common_order_aftersale_status_list'), + 'data' => MyLang('common_order_aftersale_status_list'), 'data_key' => 'value', 'data_name' => 'name', 'is_multiple' => 1, @@ -96,13 +96,13 @@ class OrderAftersale 'view_type' => 'field', 'view_key' => 'type', 'view_data_key' => 'name', - 'view_data' => MyConst('common_order_aftersale_type_list'), + 'view_data' => MyLang('common_order_aftersale_type_list'), 'width' => 120, 'is_sort' => 1, 'search_config' => [ 'form_type' => 'select', 'where_type' => 'in', - 'data' => MyConst('common_order_aftersale_type_list'), + 'data' => MyLang('common_order_aftersale_type_list'), 'data_key' => 'value', 'data_name' => 'name', 'is_multiple' => 1, @@ -153,13 +153,13 @@ class OrderAftersale 'view_type' => 'field', 'view_key' => 'refundment', 'view_data_key' => 'name', - 'view_data' => MyConst('common_order_aftersale_refundment_list'), + 'view_data' => MyLang('common_order_aftersale_refundment_list'), 'width' => 120, 'is_sort' => 1, 'search_config' => [ 'form_type' => 'select', 'where_type' => 'in', - 'data' => MyConst('common_order_aftersale_refundment_list'), + 'data' => MyLang('common_order_aftersale_refundment_list'), 'data_key' => 'value', 'data_name' => 'name', 'is_multiple' => 1, diff --git a/app/admin/form/Paylog.php b/app/admin/form/Paylog.php index fafdef703..153d6fdd2 100644 --- a/app/admin/form/Paylog.php +++ b/app/admin/form/Paylog.php @@ -92,12 +92,12 @@ class PayLog 'view_type' => 'field', 'view_key' => 'status', 'view_data_key' => 'name', - 'view_data' => MyConst('common_pay_log_status_list'), + 'view_data' => MyLang('common_pay_log_status_list'), 'is_sort' => 1, 'search_config' => [ 'form_type' => 'select', 'where_type' => 'in', - 'data' => MyConst('common_pay_log_status_list'), + 'data' => MyLang('common_pay_log_status_list'), 'data_key' => 'value', 'data_name' => 'name', 'is_multiple' => 1, diff --git a/app/admin/form/Quicknav.php b/app/admin/form/Quicknav.php index 9b03efbdc..6cce7fd59 100644 --- a/app/admin/form/Quicknav.php +++ b/app/admin/form/Quicknav.php @@ -69,12 +69,12 @@ class QuickNav 'view_type' => 'field', 'view_key' => 'platform', 'view_data_key' => 'name', - 'view_data' => MyConst('common_platform_type'), + 'view_data' => MyLang('common_platform_type'), 'is_sort' => 1, 'search_config' => [ 'form_type' => 'select', 'where_type' => 'in', - 'data' => MyConst('common_platform_type'), + 'data' => MyLang('common_platform_type'), 'data_key' => 'value', 'data_name' => 'name', 'is_multiple' => 1, @@ -91,13 +91,13 @@ class QuickNav 'view_type' => 'field', 'view_key' => 'event_type', 'view_data_key' => 'name', - 'view_data' => MyConst('common_app_event_type'), + 'view_data' => MyLang('common_app_event_type'), 'grid_size' => 'sm', 'is_sort' => 1, 'search_config' => [ 'form_type' => 'select', 'where_type' => 'in', - 'data' => MyConst('common_app_event_type'), + 'data' => MyLang('common_app_event_type'), 'data_key' => 'value', 'data_name' => 'name', 'is_multiple' => 1, @@ -125,7 +125,7 @@ class QuickNav 'search_config' => [ 'form_type' => 'select', 'where_type' => 'in', - 'data' => MyConst('common_is_enable_list'), + 'data' => MyLang('common_is_enable_list'), 'data_key' => 'id', 'data_name' => 'name', 'is_multiple' => 1, diff --git a/app/admin/form/Refundlog.php b/app/admin/form/Refundlog.php index 6e6bfd4df..fec013cf9 100644 --- a/app/admin/form/Refundlog.php +++ b/app/admin/form/Refundlog.php @@ -131,7 +131,7 @@ class RefundLog 'form_type' => 'select', 'form_name' => 'refundment', 'where_type' => 'in', - 'data' => MyConst('common_order_aftersale_refundment_list'), + 'data' => MyLang('common_order_aftersale_refundment_list'), 'data_key' => 'id', 'data_name' => 'name', 'is_multiple' => 1, diff --git a/app/admin/form/Role.php b/app/admin/form/Role.php index e6f7bc1c2..8eeba082d 100644 --- a/app/admin/form/Role.php +++ b/app/admin/form/Role.php @@ -79,7 +79,7 @@ class Role 'search_config' => [ 'form_type' => 'select', 'where_type' => 'in', - 'data' => MyConst('common_is_text_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 bbceaa917..46d4bf4b8 100644 --- a/app/admin/form/Slide.php +++ b/app/admin/form/Slide.php @@ -69,12 +69,12 @@ class Slide 'view_type' => 'field', 'view_key' => 'platform', 'view_data_key' => 'name', - 'view_data' => MyConst('common_platform_type'), + 'view_data' => MyLang('common_platform_type'), 'is_sort' => 1, 'search_config' => [ 'form_type' => 'select', 'where_type' => 'in', - 'data' => MyConst('common_platform_type'), + 'data' => MyLang('common_platform_type'), 'data_key' => 'value', 'data_name' => 'name', 'is_multiple' => 1, @@ -91,12 +91,12 @@ class Slide 'view_type' => 'field', 'view_key' => 'event_type', 'view_data_key' => 'name', - 'view_data' => MyConst('common_app_event_type'), + 'view_data' => MyLang('common_app_event_type'), 'is_sort' => 1, 'search_config' => [ 'form_type' => 'select', 'where_type' => 'in', - 'data' => MyConst('common_app_event_type'), + 'data' => MyLang('common_app_event_type'), 'data_key' => 'value', 'data_name' => 'name', 'is_multiple' => 1, @@ -124,7 +124,7 @@ class Slide 'search_config' => [ 'form_type' => 'select', 'where_type' => 'in', - 'data' => MyConst('common_is_enable_list'), + 'data' => MyLang('common_is_enable_list'), 'data_key' => 'id', 'data_name' => 'name', 'is_multiple' => 1, diff --git a/app/admin/form/User.php b/app/admin/form/User.php index 3000cbcb3..6e105c229 100644 --- a/app/admin/form/User.php +++ b/app/admin/form/User.php @@ -146,7 +146,7 @@ class User 'form_type' => 'select', 'form_name' => 'gender', 'where_type' => 'in', - 'data' => MyConst('common_gender_list'), + 'data' => MyLang('common_gender_list'), 'data_key' => 'id', 'data_name' => 'name', 'is_multiple' => 1, @@ -161,7 +161,7 @@ class User 'form_type' => 'select', 'form_name' => 'status', 'where_type' => 'in', - 'data' => MyConst('common_user_status_list'), + 'data' => MyLang('common_user_status_list'), 'data_key' => 'id', 'data_name' => 'name', 'is_multiple' => 1, @@ -282,10 +282,10 @@ class User 'is_fixed_name_field' => 1, 'fixed_name_data' => [ 'status' => [ - 'data' => MyConst('common_user_status_list'), + 'data' => MyLang('common_user_status_list'), ], 'gender' => [ - 'data' => MyConst('common_gender_list'), + 'data' => MyLang('common_gender_list'), ], ], ], diff --git a/app/admin/form/Useraddress.php b/app/admin/form/Useraddress.php index 1c8743fe2..5cac16b27 100644 --- a/app/admin/form/Useraddress.php +++ b/app/admin/form/Useraddress.php @@ -169,7 +169,7 @@ class UserAddress 'form_type' => 'select', 'form_name' => 'is_default', 'where_type' => 'in', - 'data' => MyConst('common_is_text_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 46bfcc66c..aa2c5c44c 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' => MyConst('common_is_enable_list'), + 'data' => MyLang('common_is_enable_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 12f1e8dcd..f6e64a148 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' => MyConst('common_is_enable_list'), + 'data' => MyLang('common_is_enable_list'), 'data_key' => 'id', 'data_name' => 'name', 'is_multiple' => 1, diff --git a/app/admin/lang/zh-cn.php b/app/admin/lang/zh-cn.php index bb827fe35..f8dcc9123 100755 --- a/app/admin/lang/zh-cn.php +++ b/app/admin/lang/zh-cn.php @@ -18,43 +18,58 @@ */ return [ // 首页 - 'page_index' => [ - 'order_transaction_amount_name' => '订单成交金额走势', - 'order_trading_trend_name' => '订单交易走势', - 'goods_hot_name' => '热销商品', - 'goods_hot_tips' => '仅显示前30条商品', - 'payment_name' => '支付方式', - 'order_region_name' => '订单地域分布', - 'order_region_tips' => '仅显示30条数据', - 'upgrade_check_loading_tips' => '正在获取最新内容、请稍候...', - 'upgrade_version_name' => '更新版本:', - 'upgrade_date_name' => '更新日期:', + 'index' => [ + // 页面公共 + 'page_common' => [ + 'order_transaction_amount_name' => '订单成交金额走势', + 'order_trading_trend_name' => '订单交易走势', + 'goods_hot_name' => '热销商品', + 'goods_hot_tips' => '仅显示前30条商品', + 'payment_name' => '支付方式', + 'order_region_name' => '订单地域分布', + 'order_region_tips' => '仅显示30条数据', + 'upgrade_check_loading_tips' => '正在获取最新内容、请稍候...', + 'upgrade_version_name' => '更新版本:', + 'upgrade_date_name' => '更新日期:', + ], ], // 订单管理 - 'page_order' => [ - 'order_id_empty' => '订单id有误', - 'express_choice_tips' => '请选择快递方式', - 'payment_choice_tips' => '请选择支付方式', + 'order' => [ + // 页面公共 + 'page_common' => [ + 'order_id_empty' => '订单id有误', + 'express_choice_tips' => '请选择快递方式', + 'payment_choice_tips' => '请选择支付方式', + ], ], // 插件管理 - 'page_pluginsadmin' => [ - 'not_enable_tips' => '请先点击勾勾启用', - 'save_no_data_tips' => '没有可保存的插件数据', + 'pluginsadmin' => [ + // 页面公共 + 'page_common' => [ + 'not_enable_tips' => '请先点击勾勾启用', + 'save_no_data_tips' => '没有可保存的插件数据', + ], ], // 站点设置 - 'page_site' => [ - 'remove_confirm_tips' => '移除后保存生效、确认继续吗?', - 'address_no_data' => '地址数据为空', - 'address_not_exist' => '地址不存在', - 'address_logo_message' => '请上传logo图片', + 'site' => [ + // 页面公共 + 'page_common' => [ + 'remove_confirm_tips' => '移除后保存生效、确认继续吗?', + 'address_no_data' => '地址数据为空', + 'address_not_exist' => '地址不存在', + 'address_logo_message' => '请上传logo图片', + ], ], // 仓库商品 - 'page_warehousegoods' => [ - 'warehouse_choice_tips' => '请选择仓库', + 'warehousegoods' => [ + // 页面公共 + 'page_common' => [ + 'warehouse_choice_tips' => '请选择仓库', + ], ], ]; ?> \ No newline at end of file diff --git a/app/admin/view/default/admin/save_info.html b/app/admin/view/default/admin/save_info.html index 22ad4eb3e..12da29431 100755 --- a/app/admin/view/default/admin/save_info.html +++ b/app/admin/view/default/admin/save_info.html @@ -42,7 +42,7 @@
diff --git a/app/admin/view/default/lib/enable.html b/app/admin/view/default/lib/enable.html index 076cdd2a9..666709eab 100755 --- a/app/admin/view/default/lib/enable.html +++ b/app/admin/view/default/lib/enable.html @@ -2,7 +2,7 @@
- {{foreach :MyConst('common_is_enable_list') as $v}} + {{foreach :MyLang('common_is_enable_list') as $v}} diff --git a/app/admin/view/default/lib/gender.html b/app/admin/view/default/lib/gender.html index de847fd78..f6b8d1d25 100755 --- a/app/admin/view/default/lib/gender.html +++ b/app/admin/view/default/lib/gender.html @@ -2,7 +2,7 @@
- {{foreach :MyConst('common_gender_list') as $v}} + {{foreach :MyLang('common_gender_list') as $v}} diff --git a/app/admin/view/default/lib/is_footer.html b/app/admin/view/default/lib/is_footer.html index db7246401..70da6b6c4 100755 --- a/app/admin/view/default/lib/is_footer.html +++ b/app/admin/view/default/lib/is_footer.html @@ -2,7 +2,7 @@
- {{foreach :MyConst('common_is_text_list') as $v}} + {{foreach :MyLang('common_is_text_list') as $v}} diff --git a/app/admin/view/default/lib/is_full_screen.html b/app/admin/view/default/lib/is_full_screen.html index 8f8bd1d09..23f110a8c 100755 --- a/app/admin/view/default/lib/is_full_screen.html +++ b/app/admin/view/default/lib/is_full_screen.html @@ -2,7 +2,7 @@
- {{foreach :MyConst('common_is_text_list') as $v}} + {{foreach :MyLang('common_is_text_list') as $v}} diff --git a/app/admin/view/default/lib/is_header.html b/app/admin/view/default/lib/is_header.html index 411178877..8e3139751 100755 --- a/app/admin/view/default/lib/is_header.html +++ b/app/admin/view/default/lib/is_header.html @@ -2,7 +2,7 @@
- {{foreach :MyConst('common_is_text_list') as $v}} + {{foreach :MyLang('common_is_text_list') as $v}} diff --git a/app/admin/view/default/lib/is_new_window_open.html b/app/admin/view/default/lib/is_new_window_open.html index 47fc0fe47..d85f9376d 100755 --- a/app/admin/view/default/lib/is_new_window_open.html +++ b/app/admin/view/default/lib/is_new_window_open.html @@ -2,7 +2,7 @@
- {{foreach :MyConst('common_is_text_list') as $v}} + {{foreach :MyLang('common_is_text_list') as $v}} diff --git a/app/admin/view/default/lib/is_show.html b/app/admin/view/default/lib/is_show.html index 8b6ca0484..7d3f1e746 100755 --- a/app/admin/view/default/lib/is_show.html +++ b/app/admin/view/default/lib/is_show.html @@ -2,7 +2,7 @@
- {{foreach :MyConst('common_is_show_list') as $v}} + {{foreach :MyLang('common_is_show_list') as $v}} diff --git a/app/admin/view/default/lib/region_linkage.html b/app/admin/view/default/lib/region_linkage.html index b787cf622..f6a2a81ad 100755 --- a/app/admin/view/default/lib/region_linkage.html +++ b/app/admin/view/default/lib/region_linkage.html @@ -5,7 +5,7 @@
- +
diff --git a/app/admin/view/default/lib/user_status.html b/app/admin/view/default/lib/user_status.html index 0a70029ac..b2ebb854d 100755 --- a/app/admin/view/default/lib/user_status.html +++ b/app/admin/view/default/lib/user_status.html @@ -2,7 +2,7 @@
diff --git a/app/admin/view/default/pluginsadmin/save_info.html b/app/admin/view/default/pluginsadmin/save_info.html index 63896fbfb..d02945c7b 100755 --- a/app/admin/view/default/pluginsadmin/save_info.html +++ b/app/admin/view/default/pluginsadmin/save_info.html @@ -54,7 +54,7 @@
diff --git a/app/admin/view/default/public/module/detail_nav_operate.html b/app/admin/view/default/public/module/detail_nav_operate.html index 6f8dd2f7f..791fdf1c4 100644 --- a/app/admin/view/default/public/module/detail_nav_operate.html +++ b/app/admin/view/default/public/module/detail_nav_operate.html @@ -2,17 +2,17 @@
{{if isset($form_table['base']['is_data_print']) and $form_table['base']['is_data_print'] eq 1}} - + {{/if}} {{if isset($form_table['base']['is_data_export_pdf']) and $form_table['base']['is_data_export_pdf'] eq 1}} - + {{/if}} {{if isset($form_table['base']['is_data_export_excel']) and $form_table['base']['is_data_export_excel'] eq 1}} - + {{/if}}
diff --git a/app/admin/view/default/public/module/form.html b/app/admin/view/default/public/module/form.html index 106e7c7c2..7c97cd9ca 100644 --- a/app/admin/view/default/public/module/form.html +++ b/app/admin/view/default/public/module/form.html @@ -82,7 +82,7 @@ {{include file="public/module/form_fields_select" /}} {{else /}} -
{{if empty($form_error)}}动态表格配置有误{{else /}}{{$form_error}}{{/if}}
+
{{if empty($form_error)}}{{:MyLang('form_table_config_error_tips')}}{{else /}}{{$form_error}}{{/if}}
{{/if}} diff --git a/app/admin/view/default/public/module/form_fields_select.html b/app/admin/view/default/public/module/form_fields_select.html index ad3d104f4..0ab917aff 100644 --- a/app/admin/view/default/public/module/form_fields_select.html +++ b/app/admin/view/default/public/module/form_fields_select.html @@ -7,7 +7,7 @@
{{if !empty($form_user_fields)}}
-

可点击拖拽调整显示顺序、如需恢复点击重置即可

+

{{:MyLang('form_table_column_sort_tips')}}

    {{foreach $form_user_fields as $v}} @@ -24,9 +24,9 @@ {{/if}}
- - - + + +
diff --git a/app/admin/view/default/public/module/form_operate_top.html b/app/admin/view/default/public/module/form_operate_top.html index 53fee4d70..a1d628686 100644 --- a/app/admin/view/default/public/module/form_operate_top.html +++ b/app/admin/view/default/public/module/form_operate_top.html @@ -21,17 +21,17 @@ {{if isset($form_table['base']['is_data_print']) and $form_table['base']['is_data_print'] eq 1}} - + {{/if}} {{if isset($form_table['base']['is_data_export_pdf']) and $form_table['base']['is_data_export_pdf'] eq 1}} - + {{/if}} {{if isset($form_table['base']['is_data_export_excel']) and $form_table['base']['is_data_export_excel'] eq 1}} - + {{/if}} @@ -45,14 +45,14 @@ data-confirm-title="{{if isset($form_table['base']['confirm_title'])}}{{$form_table.base.confirm_title}}{{/if}}" data-confirm-msg="{{if isset($form_table['base']['confirm_msg'])}}{{$form_table.base.confirm_msg}}{{/if}}" data-timeout="{{if isset($form_table['base']['timeout'])}}{{$form_table.base.timeout}}{{/if}}" - data-am-popover="{content: '选中列表需要删除的数据(可多选)', trigger: 'hover focus', theme: 'warning sm'}" - > 删除 + data-am-popover="{content: '{{:MyLang('form_table_nav_operate_data_list_delete_tips')}}', trigger: 'hover focus', theme: 'warning sm'}" + > {{:MyLang('delete_title')}} {{/if}} {{if isset($form_table['base']['is_search']) and $form_table['base']['is_search'] eq 1}} - 重置 - + {{:MyLang('reset_title')}} + @@ -62,6 +62,6 @@ {{if !empty($admin) and (!isset($form_table['base']['is_fields_sel']) or $form_table['base']['is_fields_sel'] eq 1)}}
- +
{{/if}} \ No newline at end of file diff --git a/app/admin/view/default/useraddress/save_info.html b/app/admin/view/default/useraddress/save_info.html index e671dfd03..6132084e9 100644 --- a/app/admin/view/default/useraddress/save_info.html +++ b/app/admin/view/default/useraddress/save_info.html @@ -28,29 +28,24 @@
-
-
-
- - -
-
-
-
- - -
-
+
+ +
- - + +
+
+ + +
+ {{include file="lib/region_linkage" /}}
diff --git a/app/api/controller/Common.php b/app/api/controller/Common.php index 6e9d1581b..571ffac8e 100755 --- a/app/api/controller/Common.php +++ b/app/api/controller/Common.php @@ -145,7 +145,7 @@ class Common extends BaseController { if(empty($this->user)) { - exit(json_encode(DataReturn('登录失效,请重新登录', -400))); + exit(json_encode(DataReturn(MyLang('login_failure_tips'), -400))); } } diff --git a/app/api/controller/Orderaftersale.php b/app/api/controller/Orderaftersale.php index c48ae0de8..299189adf 100644 --- a/app/api/controller/Orderaftersale.php +++ b/app/api/controller/Orderaftersale.php @@ -141,7 +141,7 @@ class Orderaftersale extends Common 'returned_data' => $returned['data'], 'return_only_money_reason' => empty($return_only_money_reason) ? [] : explode("\n", $return_only_money_reason), 'return_money_goods_reason' => empty($return_money_goods_reason) ? [] : explode("\n", $return_money_goods_reason), - 'aftersale_type_list' => MyConst('common_order_aftersale_type_list'), + 'aftersale_type_list' => MyLang('common_order_aftersale_type_list'), 'return_goods_address' => $return_goods_address, 'editor_path_type' => ResourcesService::EditorPathTypeValue(OrderAftersaleService::EditorAttachmentPathType($this->user['id'], $order_id, $order_detail_id)), ]; diff --git a/app/api/controller/Personal.php b/app/api/controller/Personal.php index 675624f1c..f4fd07118 100644 --- a/app/api/controller/Personal.php +++ b/app/api/controller/Personal.php @@ -52,7 +52,7 @@ class Personal extends Common // 用户数据 'data' => UserService::UserHandle(UserService::UserInfo('id', $this->user['id'])), // 性别 - 'gender_list' => MyConst('common_gender_list'), + 'gender_list' => MyLang('common_gender_list'), ]; return ApiService::ApiDataReturn(DataReturn('success', 0, $data)); } diff --git a/app/common.php b/app/common.php index 2255b1513..5d7d7f1b8 100755 --- a/app/common.php +++ b/app/common.php @@ -2042,7 +2042,7 @@ function FileUploadError($name, $index = false) } // 错误码对应的错误信息 - $file_error_list = MyConst('common_file_upload_error_list'); + $file_error_list = MyLang('common_file_upload_error_list'); if(isset($file_error_list[$error])) { return $file_error_list[$error]; diff --git a/app/index/controller/Answer.php b/app/index/controller/Answer.php index 10e0037f9..d8c991e9b 100755 --- a/app/index/controller/Answer.php +++ b/app/index/controller/Answer.php @@ -51,7 +51,7 @@ class Answer extends Common public function Index() { // 浏览器名称 - MyViewAssign('home_seo_site_title', SeoService::BrowserSeoTitle('问答/留言', 1)); + MyViewAssign('home_seo_site_title', SeoService::BrowserSeoTitle(MyLang('answer.browser_seo_title'), 1)); return MyView(); } diff --git a/app/index/controller/Article.php b/app/index/controller/Article.php index aac4db423..10756ee66 100755 --- a/app/index/controller/Article.php +++ b/app/index/controller/Article.php @@ -49,7 +49,7 @@ class Article extends Common // 获取文章 if(empty($this->data_request['id'])) { - MyViewAssign('msg', '文章ID有误'); + MyViewAssign('msg', MyLang('article.article_id_params_tips')); return MyView('public/tips_error'); } @@ -110,7 +110,7 @@ class Article extends Common } // 无数据 - MyViewAssign('msg', '文章不存在或已删除'); + MyViewAssign('msg', MyLang('article.article_no_data_tips')); return MyView('public/tips_error'); } @@ -164,7 +164,7 @@ class Article extends Common $assign['category_info'] = $category_info; // 浏览器名称 - $assign['home_seo_site_title'] = SeoService::BrowserSeoTitle(empty($category_info) ? '所有文章' : $category_info['name'], 1); + $assign['home_seo_site_title'] = SeoService::BrowserSeoTitle(empty($category_info) ? MyLang('article.category_browser_seo_title') : $category_info['name'], 1); // 数据赋值 MyViewAssign($assign); diff --git a/app/index/controller/Buy.php b/app/index/controller/Buy.php index c8ead994e..d34589e15 100755 --- a/app/index/controller/Buy.php +++ b/app/index/controller/Buy.php @@ -61,7 +61,7 @@ class Buy extends Common // 站点类型,是否开启了展示型 if(SystemBaseService::SiteTypeValue() == 1) { - MyViewAssign('msg', '展示型不允许提交订单'); + MyViewAssign('msg', MyLang('buy.show_mode_not_allow_submit_order_tips')); return MyView('public/tips_error'); } @@ -69,7 +69,7 @@ class Buy extends Common $buy_data = MySession('buy_post_data'); if(empty($buy_data) || (empty($buy_data['goods_data']) && empty($buy_data['ids']))) { - MyViewAssign('msg', '商品信息为空'); + MyViewAssign('msg', MyLang('buy.gooods_data_no_data_tips')); return MyView('public/tips_error'); } @@ -100,11 +100,13 @@ class Buy extends Common 'buy_goods' => $buy_goods, 'buy_data' => $buy_data, // 浏览器名称 - 'home_seo_site_title' => SeoService::BrowserSeoTitle('订单确认', 1), + 'home_seo_site_title' => SeoService::BrowserSeoTitle(MyLang('buy.browser_seo_title'), 1), // 公共销售模式 'common_site_type' => $buy_base['common_site_type'], // 支付方式 'payment_list' => PaymentService::BuyPaymentList(['is_enable'=>1, 'is_open_user'=>1]), + // 下单类型模式 + 'buy_site_model_list' => MyLang('common_buy_site_model_list'), ]; // 用户地址 @@ -126,7 +128,7 @@ class Buy extends Common $this->PluginsHook($ret['data'], $params); return MyView(); } - MyViewAssign('msg', isset($ret['msg']) ? $ret['msg'] : '参数错误'); + MyViewAssign('msg', isset($ret['msg']) ? $ret['msg'] : MyLang('params_error_tips')); return MyView('public/tips_error'); } } @@ -204,7 +206,7 @@ class Buy extends Common $params['user'] = $this->user; return ApiService::ApiDataReturn(BuyService::OrderInsert($params)); } - MyViewAssign('msg', '非法访问'); + MyViewAssign('msg', MyLang('illegal_access_tips')); return MyView('public/tips_error'); } } diff --git a/app/index/controller/Cart.php b/app/index/controller/Cart.php index df0ae9855..62cc588b8 100755 --- a/app/index/controller/Cart.php +++ b/app/index/controller/Cart.php @@ -61,7 +61,7 @@ class Cart extends Common $assign = [ 'base' => $base, 'cart_list' => $cart_list['data'], - 'home_seo_site_title' => SeoService::BrowserSeoTitle('购物车', 1), + 'home_seo_site_title' => SeoService::BrowserSeoTitle(MyLang('cart.browser_seo_title'), 1), ]; MyViewAssign($assign); return MyView(); diff --git a/app/index/controller/Category.php b/app/index/controller/Category.php index 45e0f6925..be9d2a323 100755 --- a/app/index/controller/Category.php +++ b/app/index/controller/Category.php @@ -44,7 +44,7 @@ class Category extends Common public function Index() { // 浏览器名称 - MyViewAssign('home_seo_site_title', SeoService::BrowserSeoTitle('商品分类', 1)); + MyViewAssign('home_seo_site_title', SeoService::BrowserSeoTitle(MyLang('category.browser_seo_title'), 1)); return MyView(); } } diff --git a/app/index/controller/Common.php b/app/index/controller/Common.php index 9a5741fbd..96e4bc5f3 100755 --- a/app/index/controller/Common.php +++ b/app/index/controller/Common.php @@ -192,7 +192,7 @@ class Common extends BaseController { if(IS_AJAX) { - exit(json_encode(DataReturn('登录失效,请重新登录', -400))); + exit(json_encode(DataReturn(MyLang('login_failure_tips'), -400))); } else { MyRedirect('index/user/logininfo', true); } @@ -566,7 +566,7 @@ class Common extends BaseController if(MyC('home_site'.$type.'_state') != 1) { // 提示信息 - $reason = MyC('home_site_close_reason', '升级中...', true); + $reason = MyC('home_site_close_reason', MyLang('upgrading_tips'), true); // 是否ajax请求 if(IS_AJAX) @@ -574,7 +574,7 @@ class Common extends BaseController exit(json_encode(DataReturn($reason, -10000))); } else { // 默认提示信息增加样式,则使用用户自定义信息展示 - if($reason == '升级中...') + if(stripos($reason, '') === false) { exit(''.MyC('home_site_name').'
'.$reason.'
'); } else { diff --git a/app/index/controller/Customview.php b/app/index/controller/Customview.php index 16b6a47a8..b1c79e9df 100755 --- a/app/index/controller/Customview.php +++ b/app/index/controller/Customview.php @@ -71,7 +71,7 @@ class CustomView extends Common return MyView(); } } - MyViewAssign('msg', '页面不存在或已删除'); + MyViewAssign('msg', MyLang('custom_view.custom_view_no_data_tips')); return MyView('public/tips_error'); } } diff --git a/app/index/controller/Design.php b/app/index/controller/Design.php index 54130cfb2..1470ced09 100644 --- a/app/index/controller/Design.php +++ b/app/index/controller/Design.php @@ -93,7 +93,7 @@ class Design extends Common return MyView(); } } - MyViewAssign('msg', '页面不存在或已删除'); + MyViewAssign('msg', MyLang('design.design_no_data_tips')); return MyView('public/tips_error'); } } diff --git a/app/index/controller/Error.php b/app/index/controller/Error.php index b59134151..a165698dd 100755 --- a/app/index/controller/Error.php +++ b/app/index/controller/Error.php @@ -34,11 +34,12 @@ class Error extends Common */ public function __call($method, $args) { + $msg = MyLang('controller_not_exist_tips').'('.RequestController().')'; if(IS_AJAX) { - return ApiService::ApiDataReturn(DataReturn(RequestController().' 控制器不存在', -1000)); + return ApiService::ApiDataReturn(DataReturn($msg, -1000)); } else { - MyViewAssign('msg', RequestController().' 控制器不存在'); + MyViewAssign('msg', $msg); return MyView('public/tips_error'); } } diff --git a/app/index/controller/Goods.php b/app/index/controller/Goods.php index 6fe9071ef..7d5b75aa5 100755 --- a/app/index/controller/Goods.php +++ b/app/index/controller/Goods.php @@ -159,7 +159,7 @@ class Goods extends Common $this->PluginsHook($goods_id, $goods); return MyView(); } - MyViewAssign('msg', '资源不存在或已被删除'); + MyViewAssign('msg', MyLang('goods.goods_no_data_tips')); return MyView('/public/tips_error'); } @@ -194,7 +194,7 @@ class Goods extends Common return MyView(); } MyViewAssign([ - 'msg' => '商品不存在或已删除', + 'msg' => MyLang('goods.goods_no_data_tips'), 'is_header' => 0, 'is_footer' => 0, 'is_to_home' => 0, @@ -276,7 +276,7 @@ class Goods extends Common $params = $this->data_request; if(empty($params['goods_id'])) { - return ApiService::ApiDataReturn(DataReturn('参数有误', -1)); + return ApiService::ApiDataReturn(DataReturn(MyLang('params_error_tips'), -1)); } // 分页 @@ -310,7 +310,7 @@ class Goods extends Common 'page_total' => $page_total, 'data' => MyView('', ['data'=>$data['data']]), ]; - return ApiService::ApiDataReturn(DataReturn('请求成功', 0, $result)); + return ApiService::ApiDataReturn(DataReturn('success', 0, $result)); } /** diff --git a/app/index/controller/Index.php b/app/index/controller/Index.php index affb9f24e..48e3ea089 100755 --- a/app/index/controller/Index.php +++ b/app/index/controller/Index.php @@ -114,11 +114,11 @@ class Index extends Common $assign['images_magic_cube_view_list_show_style'] = BaseLayout::$images_magic_cube_view_list_show_style; // 首页商品排序规则 - $assign['goods_order_by_type_list'] = MyConst('goods_order_by_type_list'); - $assign['goods_order_by_rule_list'] = MyConst('goods_order_by_rule_list'); + $assign['goods_order_by_type_list'] = MyLang('goods_order_by_type_list'); + $assign['goods_order_by_rule_list'] = MyLang('goods_order_by_rule_list'); // 浏览器名称 - $assign['home_seo_site_title'] = SeoService::BrowserSeoTitle('首页设计', 1); + $assign['home_seo_site_title'] = SeoService::BrowserSeoTitle(MyLang('index.design_browser_seo_title'), 1); // 编辑器文件存放地址定义 $assign['editor_path_type'] = 'index-design'; diff --git a/app/index/controller/Message.php b/app/index/controller/Message.php index ed0638bcb..07bcf6c71 100755 --- a/app/index/controller/Message.php +++ b/app/index/controller/Message.php @@ -52,7 +52,7 @@ class Message extends Common MessageService::MessageRead(['user'=>$this->user]); // 浏览器名称 - MyViewAssign('home_seo_site_title', SeoService::BrowserSeoTitle('我的消息', 1)); + MyViewAssign('home_seo_site_title', SeoService::BrowserSeoTitle(MyLang('message.browser_seo_title'), 1)); return MyView(); } diff --git a/app/index/controller/Order.php b/app/index/controller/Order.php index e939295a4..61ddae3c4 100755 --- a/app/index/controller/Order.php +++ b/app/index/controller/Order.php @@ -64,7 +64,7 @@ class Order extends Common // 支付方式 'buy_payment_list' => PaymentService::BuyPaymentList(['is_enable'=>1, 'is_open_user'=>1]), // 浏览器名称 - 'home_seo_site_title' => SeoService::BrowserSeoTitle('我的订单', 1), + 'home_seo_site_title' => SeoService::BrowserSeoTitle(MyLang('order.browser_seo_title'), 1), ]; MyViewAssign($assign); return MyView(); @@ -83,7 +83,7 @@ class Order extends Common // 订单信息 if(empty($this->data_detail)) { - MyViewAssign('msg', '没有相关数据'); + MyViewAssign('msg', MyLang('no_data')); return MyView('public/tips_error'); } @@ -98,7 +98,7 @@ class Order extends Common // 虚拟销售配置 'site_fictitious' => $site_fictitious['data'], // 浏览器名称 - 'home_seo_site_title' => SeoService::BrowserSeoTitle('订单详情', 1), + 'home_seo_site_title' => SeoService::BrowserSeoTitle(MyLang('order.detail_browser_seo_title'), 1), ]; MyViewAssign($assign); return MyView(); @@ -118,7 +118,7 @@ class Order extends Common $data = $this->OrderFirst(); if(empty($data)) { - MyViewAssign('msg', '没有相关数据'); + MyViewAssign('msg', MyLang('no_data')); return MyView('public/tips_error'); } @@ -128,7 +128,7 @@ class Order extends Common // 上一个页面url地址 'referer_url' => empty($_SERVER['HTTP_REFERER']) ? MyUrl('index/order/index') : htmlentities($_SERVER['HTTP_REFERER']), // 浏览器名称 - 'home_seo_site_title' => SeoService::BrowserSeoTitle('订单评论', 1), + 'home_seo_site_title' => SeoService::BrowserSeoTitle(MyLang('order.comments_browser_seo_title'), 1), // 编辑器文件存放地址 'editor_path_type' => ResourcesService::EditorPathTypeValue('order_comments-'.$this->user['id'].'-'.$data['id']), ]; @@ -189,7 +189,7 @@ class Order extends Common $params['business_type'] = 'order'; return GoodsCommentsService::Comments($params); } - MyViewAssign('msg', '非法访问'); + MyViewAssign('msg', MyLang('illegal_access_tips')); return MyView('public/tips_error'); } @@ -236,9 +236,7 @@ class Order extends Common // 是否自定义状态 if(isset($params['appoint_status'])) { - $ret = ($params['appoint_status'] == 0) ? DataReturn('支付成功', 0) : DataReturn('支付失败', -100); - - // 获取支付回调数据 + $ret = ($params['appoint_status'] == 0) ? DataReturn(MyLang('pay_success'), 0) : DataReturn(MyLang('pay_fail'), -100); } else { $params['user'] = $this->user; $ret = OrderService::Respond($params); @@ -248,7 +246,7 @@ class Order extends Common $assign = [ // 自定义链接 'to_url' => MyUrl('index/order/index'), - 'to_title' => '我的订单', + 'to_title' => MyLang('order.browser_seo_title'), // 状态信息 'msg' => $ret['msg'], ]; @@ -280,7 +278,7 @@ class Order extends Common $params['creator_name'] = $this->user['user_name_view']; return ApiService::ApiDataReturn(OrderService::OrderCancel($params)); } - MyViewAssign('msg', '非法访问'); + MyViewAssign('msg', MyLang('illegal_access_tips')); return MyView('public/tips_error'); } @@ -302,7 +300,7 @@ class Order extends Common $params['creator_name'] = $this->user['user_name_view']; return ApiService::ApiDataReturn(OrderService::OrderCollect($params)); } - MyViewAssign('msg', '非法访问'); + MyViewAssign('msg', MyLang('illegal_access_tips')); return MyView('public/tips_error'); } @@ -325,7 +323,7 @@ class Order extends Common $params['user_type'] = 'user'; return ApiService::ApiDataReturn(OrderService::OrderDelete($params)); } - MyViewAssign('msg', '非法访问'); + MyViewAssign('msg', MyLang('illegal_access_tips')); return MyView('public/tips_error'); } @@ -345,7 +343,7 @@ class Order extends Common $params['user'] = $this->user; return ApiService::ApiDataReturn(OrderService::OrderPayCheck($params)); } - MyViewAssign('msg', '非法访问'); + MyViewAssign('msg', MyLang('illegal_access_tips')); return MyView('public/tips_error'); } } diff --git a/app/index/controller/Orderaftersale.php b/app/index/controller/Orderaftersale.php index cc7e7d379..bcf17d929 100644 --- a/app/index/controller/Orderaftersale.php +++ b/app/index/controller/Orderaftersale.php @@ -51,7 +51,7 @@ class Orderaftersale extends Common public function Index() { // 浏览器名称 - MyViewAssign('home_seo_site_title', SeoService::BrowserSeoTitle('订单售后', 1)); + MyViewAssign('home_seo_site_title', SeoService::BrowserSeoTitle(MyLang('orderaftersale.browser_seo_title'), 1)); return MyView(); } @@ -78,7 +78,7 @@ class Orderaftersale extends Common // 订单售后搜索form key 'form_search_keywords_form_key' => 'f0p', // 浏览器名称 - 'home_seo_site_title' => SeoService::BrowserSeoTitle('订单售后详情', 1), + 'home_seo_site_title' => SeoService::BrowserSeoTitle(MyLang('orderaftersale.detail_browser_seo_title'), 1), ]; // 仅退款原因 @@ -120,7 +120,7 @@ class Orderaftersale extends Common $assign['return_goods_address'] = $return_goods_address; // 静态数据 - $assign['common_order_aftersale_type_list'] = MyConst('common_order_aftersale_type_list'); + $assign['common_order_aftersale_type_list'] = MyLang('common_order_aftersale_type_list'); // 编辑器文件存放地址 $assign['editor_path_type'] = ResourcesService::EditorPathTypeValue(OrderAftersaleService::EditorAttachmentPathType($this->user['id'], $order_id, $order_detail_id)); @@ -146,7 +146,7 @@ class Orderaftersale extends Common // 是否ajax请求 if(!IS_AJAX) { - MyViewAssign('msg', '非法访问'); + MyViewAssign('msg', MyLang('illegal_access_tips')); return MyView('public/tips_error'); } @@ -168,7 +168,7 @@ class Orderaftersale extends Common // 是否ajax请求 if(!IS_AJAX) { - MyViewAssign('msg', '非法访问'); + MyViewAssign('msg', MyLang('illegal_access_tips')); return MyView('public/tips_error'); } @@ -190,7 +190,7 @@ class Orderaftersale extends Common // 是否ajax请求 if(!IS_AJAX) { - MyViewAssign('msg', '非法访问'); + MyViewAssign('msg', MyLang('illegal_access_tips')); return MyView('public/tips_error'); } diff --git a/app/index/controller/Pay.php b/app/index/controller/Pay.php index 0c6dee67c..6748d9102 100644 --- a/app/index/controller/Pay.php +++ b/app/index/controller/Pay.php @@ -46,7 +46,7 @@ class Pay extends Common { return MyView(); } - MyViewAssign('msg', '参数有误'); + MyViewAssign('msg', MyLang('params_error_tips')); return MyView('public/tips_error'); } } diff --git a/app/index/controller/Personal.php b/app/index/controller/Personal.php index cea772c8d..60314c2b8 100755 --- a/app/index/controller/Personal.php +++ b/app/index/controller/Personal.php @@ -52,9 +52,9 @@ class Personal extends Common // 模板数据 $assign = [ // 用户展示数据 - 'personal_show_list' => NavigationService::UsersPersonalShowFieldList(), + 'personal_show_list' => NavigationService::UsersPersonalShowFieldList(), // 浏览器名称 - 'home_seo_site_title' => SeoService::BrowserSeoTitle('个人资料', 1), + 'home_seo_site_title' => SeoService::BrowserSeoTitle(MyLang('personal.browser_seo_title'), 1), ]; MyViewAssign($assign); return MyView(); @@ -74,9 +74,9 @@ class Personal extends Common // 用户数据 'data' => UserService::UserHandle(UserService::UserInfo('id', $this->user['id'])), // 性别 - 'common_gender_list' => MyConst('common_gender_list'), + 'common_gender_list' => MyLang('common_gender_list'), // 浏览器名称 - 'home_seo_site_title' => SeoService::BrowserSeoTitle('个人资料编辑', 1), + 'home_seo_site_title' => SeoService::BrowserSeoTitle(MyLang('personal.edit_browser_seo_title'), 1), ]; MyViewAssign($assign); return MyView(); diff --git a/app/index/controller/Plugins.php b/app/index/controller/Plugins.php index 2a16b49e0..42a53dbd0 100755 --- a/app/index/controller/Plugins.php +++ b/app/index/controller/Plugins.php @@ -53,7 +53,7 @@ class Plugins extends Common [ 'checked_type' => 'empty', 'key_name' => 'pluginsname', - 'error_msg' => '应用名称有误', + 'error_msg' => MyLang('plugins_name_tips'), ], ]; $ret = ParamsChecked($params['data_request'], $p); diff --git a/app/index/controller/Qrcode.php b/app/index/controller/Qrcode.php index 1c5bcccf3..536751dd9 100755 --- a/app/index/controller/Qrcode.php +++ b/app/index/controller/Qrcode.php @@ -43,7 +43,7 @@ class QrCode extends Common { if(empty($this->data_request['content'])) { - MyViewAssign('msg', '内容参数为空'); + MyViewAssign('msg', MyLang('content_params_empty_tips')); return MyView('public/tips_error'); } (new \base\Qrcode())->View($this->data_request); diff --git a/app/index/controller/Safety.php b/app/index/controller/Safety.php index 3d2f461f2..6454d9cbc 100755 --- a/app/index/controller/Safety.php +++ b/app/index/controller/Safety.php @@ -60,7 +60,7 @@ class Safety extends Common // 安全信息列表 'safety_panel_list' => NavigationService::UsersSafetyPanelList(), // 浏览器名称 - 'home_seo_site_title' => SeoService::BrowserSeoTitle('安全设置', 1), + 'home_seo_site_title' => SeoService::BrowserSeoTitle(MyLang('safety.browser_seo_title'), 1), ]; MyViewAssign($assign); return MyView(); @@ -76,7 +76,7 @@ class Safety extends Common public function LoginPwdInfo() { // 浏览器名称 - MyViewAssign('home_seo_site_title', SeoService::BrowserSeoTitle('登录密码修改 - 安全设置', 1)); + MyViewAssign('home_seo_site_title', SeoService::BrowserSeoTitle(MyLang('safety.password_update_browser_seo_title'), 1)); return MyView(); } @@ -95,7 +95,7 @@ class Safety extends Common } // 浏览器名称 - MyViewAssign('home_seo_site_title', SeoService::BrowserSeoTitle('手机号码修改 - 安全设置', 1)); + MyViewAssign('home_seo_site_title', SeoService::BrowserSeoTitle(MyLang('safety.mobile_update_browser_seo_title'), 1)); return MyView(); } @@ -110,11 +110,11 @@ class Safety extends Common { if(MySession('safety_sms') == null && !empty($this->user['mobile'])) { - return $this->error('原帐号校验失败', MyUrl('index/safety/mobileinfo')); + return $this->error(MyLang('safety.original_account_check_error_tips'), MyUrl('index/safety/mobileinfo')); } // 浏览器名称 - MyViewAssign('home_seo_site_title', SeoService::BrowserSeoTitle('手机号码修改 - 安全设置', 1)); + MyViewAssign('home_seo_site_title', SeoService::BrowserSeoTitle(MyLang('safety.mobile_update_browser_seo_title'), 1)); return MyView(); } @@ -133,7 +133,7 @@ class Safety extends Common } // 浏览器名称 - MyViewAssign('home_seo_site_title', SeoService::BrowserSeoTitle('电子邮箱修改 - 安全设置', 1)); + MyViewAssign('home_seo_site_title', SeoService::BrowserSeoTitle(MyLang('safety.email_update_browser_seo_title'), 1)); return MyView(); } @@ -148,11 +148,11 @@ class Safety extends Common { if(MySession('safety_email') == null && !empty($this->user['email'])) { - return $this->error('原帐号校验失败', MyUrl('index/safety/emailinfo')); + return $this->error(MyLang('safety.original_account_check_error_tips'), MyUrl('index/safety/emailinfo')); } // 浏览器名称 - MyViewAssign('home_seo_site_title', SeoService::BrowserSeoTitle('电子邮箱修改 - 安全设置', 1)); + MyViewAssign('home_seo_site_title', SeoService::BrowserSeoTitle(MyLang('safety.email_update_browser_seo_title'), 1)); return MyView(); } @@ -173,7 +173,7 @@ class Safety extends Common // 协议内容 'document_data' => $document['data'], // 浏览器名称 - 'home_seo_site_title' => SeoService::BrowserSeoTitle('账号注销 - 安全设置', 1), + 'home_seo_site_title' => SeoService::BrowserSeoTitle(MyLang('safety.logout_browser_seo_title'), 1), ]; MyViewAssign($assign); return MyView(); diff --git a/app/index/controller/Search.php b/app/index/controller/Search.php index f41ebe7cc..6af1561ee 100755 --- a/app/index/controller/Search.php +++ b/app/index/controller/Search.php @@ -133,7 +133,7 @@ class Search extends Common } } } - $assign['home_seo_site_title'] = SeoService::BrowserSeoTitle(empty($seo_title) ? '商品搜索' : $seo_title, 1); + $assign['home_seo_site_title'] = SeoService::BrowserSeoTitle(empty($seo_title) ? MyLang('search.browser_seo_title') : $seo_title, 1); // 模板赋值 MyViewAssign($assign); diff --git a/app/index/controller/User.php b/app/index/controller/User.php index 840d3ae1e..2f7b904cd 100755 --- a/app/index/controller/User.php +++ b/app/index/controller/User.php @@ -103,7 +103,7 @@ class User extends Common 'form_search_order_status_form_key' => 'status', 'form_search_order_user_is_comments_form_key' => 'user_is_comments', // 浏览器名称 - 'home_seo_site_title' => SeoService::BrowserSeoTitle('用户中心', 1), + 'home_seo_site_title' => SeoService::BrowserSeoTitle(MyLang('user.browser_seo_title'), 1), ]; // 用户中心基础信息 mini 导航 @@ -230,12 +230,12 @@ class User extends Common // 左侧图片、随机其中一个 'user_forgetpwd_left_data' => empty($left_data['data']) ? [] : $left_data['data'][array_rand($left_data['data'], 1)], // 浏览器名称 - 'home_seo_site_title' => SeoService::BrowserSeoTitle('密码找回', 1), + 'home_seo_site_title' => SeoService::BrowserSeoTitle(MyLang('user.forget_password_browser_seo_title'), 1), ]; MyViewAssign($assign); return MyView(); } - MyViewAssign('msg', '已经登录了,如要重置密码,请先退出当前账户'); + MyViewAssign('msg', MyLang('user.password_reset_illegal_error_tips')); return MyView('public/tips_error'); } @@ -261,15 +261,15 @@ class User extends Common // 注册背景图片 'user_register_bg_images' => MyC('home_site_user_register_bg_images'), // 浏览器名称 - 'home_seo_site_title' => SeoService::BrowserSeoTitle('用户注册', 1), + 'home_seo_site_title' => SeoService::BrowserSeoTitle(MyLang('user.user_register_browser_seo_title'), 1), ]; MyViewAssign($assign); return MyView(); } - MyViewAssign('msg', '已经登录了,如要注册新账户,请先退出当前账户'); + MyViewAssign('msg', MyLang('user.register_illegal_error_tips')); return MyView('public/tips_error'); } - MyViewAssign('msg', '暂时关闭用户注册'); + MyViewAssign('msg', MyLang('common.close_user_register_tips')); return MyView('public/tips_error'); } @@ -297,15 +297,15 @@ class User extends Common // 注册背景图片 'user_login_left_data' => empty($left_data['data']) ? [] : $left_data['data'][array_rand($left_data['data'], 1)], // 浏览器名称 - 'home_seo_site_title' => SeoService::BrowserSeoTitle('用户登录', 1), + 'home_seo_site_title' => SeoService::BrowserSeoTitle(MyLang('user.user_login_browser_seo_title'), 1), ]; MyViewAssign($assign); return MyView(); } - MyViewAssign('msg', '已经登录了,请勿重复登录'); + MyViewAssign('msg', MyLang('user.login_illegal_error_tips')); return MyView('public/tips_error'); } - MyViewAssign('msg', '暂时关闭用户登录'); + MyViewAssign('msg', MyLang('common.close_user_login_tips')); return MyView('public/tips_error'); } @@ -330,18 +330,18 @@ class User extends Common if(empty($this->user)) { // 浏览器名称 - $assign['home_seo_site_title'] = SeoService::BrowserSeoTitle('用户登录', 1); + $assign['home_seo_site_title'] = SeoService::BrowserSeoTitle(MyLang('user.user_login_browser_seo_title'), 1); // 返回地址 $assign['referer_url'] = $this->GetrefererUrl(); MyViewAssign($assign); return MyView(); } - $assign['msg'] = '已经登录了,请勿重复登录'; + $assign['msg'] = MyLang('user.login_illegal_error_tips'); MyViewAssign($assign); return MyView('public/tips_error'); } - $assign['msg'] = '暂时关闭用户登录'; + $assign['msg'] = MyLang('common.close_user_login_tips'); MyViewAssign($assign); return MyView('public/tips_error'); } diff --git a/app/index/controller/Useraddress.php b/app/index/controller/Useraddress.php index 15d5b7827..65e995ece 100755 --- a/app/index/controller/Useraddress.php +++ b/app/index/controller/Useraddress.php @@ -52,7 +52,7 @@ class UserAddress extends Common // 模板数据 $assign = [ // 浏览器名称 - 'home_seo_site_title' => SeoService::BrowserSeoTitle('我的地址', 1), + 'home_seo_site_title' => SeoService::BrowserSeoTitle(MyLang('user_address.browser_seo_title'), 1), ]; // 用户地址列表 $data = UserAddressService::UserAddressList(['user'=>$this->user]); diff --git a/app/index/controller/Usergoodsbrowse.php b/app/index/controller/Usergoodsbrowse.php index 8bda4a1a6..8421a6f8a 100755 --- a/app/index/controller/Usergoodsbrowse.php +++ b/app/index/controller/Usergoodsbrowse.php @@ -50,7 +50,7 @@ class UserGoodsBrowse extends Common public function Index() { // 浏览器名称 - MyViewAssign('home_seo_site_title', SeoService::BrowserSeoTitle('我的足迹', 1)); + MyViewAssign('home_seo_site_title', SeoService::BrowserSeoTitle(MyLang('user_goods_browse.browser_seo_title'), 1)); return MyView(); } diff --git a/app/index/controller/Usergoodsfavor.php b/app/index/controller/Usergoodsfavor.php index 269661b0f..a81106d54 100755 --- a/app/index/controller/Usergoodsfavor.php +++ b/app/index/controller/Usergoodsfavor.php @@ -50,7 +50,7 @@ class UserGoodsFavor extends Common public function Index() { // 浏览器名称 - MyViewAssign('home_seo_site_title', SeoService::BrowserSeoTitle('商品收藏', 1)); + MyViewAssign('home_seo_site_title', SeoService::BrowserSeoTitle(MyLang('user_goods_favor.browser_seo_title'), 1)); return MyView(); } diff --git a/app/index/controller/Userintegral.php b/app/index/controller/Userintegral.php index c91ed9dd3..fae6438d3 100755 --- a/app/index/controller/Userintegral.php +++ b/app/index/controller/Userintegral.php @@ -55,7 +55,7 @@ class UserIntegral extends Common 'user_integral_data' => IntegralService::UserIntegral($this->user['id']), // 浏览器名称 - 'home_seo_site_title' => SeoService::BrowserSeoTitle('我的积分', 1), + 'home_seo_site_title' => SeoService::BrowserSeoTitle(MyLang('user_integral.browser_seo_title'), 1), ]; MyViewAssign($assign); return MyView(); diff --git a/app/index/form/Answer.php b/app/index/form/Answer.php index 3e073f39f..8d5fa5c38 100644 --- a/app/index/form/Answer.php +++ b/app/index/form/Answer.php @@ -53,6 +53,7 @@ class Answer */ public function Run($params = []) { + $lang = MyLang('answer.form_table'); return [ // 基础配置 'base' => [ @@ -62,7 +63,7 @@ class Answer // 表单配置 'form' => [ [ - 'label' => '联系人', + 'label' => $lang['name'], 'view_type' => 'field', 'view_key' => 'name', 'is_sort' => 1, @@ -72,7 +73,7 @@ class Answer ], ], [ - 'label' => '联系电话', + 'label' => $lang['tel'], 'view_type' => 'field', 'view_key' => 'tel', 'is_sort' => 1, @@ -82,7 +83,7 @@ class Answer ], ], [ - 'label' => '内容', + 'label' => $lang['content'], 'view_type' => 'module', 'view_key' => 'answer/module/content', 'grid_size' => 'lg', @@ -93,7 +94,7 @@ class Answer ], ], [ - 'label' => '回复内容', + 'label' => $lang['reply'], 'view_type' => 'module', 'view_key' => 'answer/module/reply', 'grid_size' => 'lg', @@ -104,7 +105,7 @@ class Answer ], ], [ - 'label' => '回复时间', + 'label' => $lang['reply_time_time'], 'view_type' => 'field', 'view_key' => 'reply_time_time', 'is_sort' => 1, @@ -114,7 +115,7 @@ class Answer ], ], [ - 'label' => '创建时间', + 'label' => $lang['add_time_time'], 'view_type' => 'field', 'view_key' => 'add_time_time', 'is_sort' => 1, @@ -124,7 +125,7 @@ class Answer ], ], [ - 'label' => '操作', + 'label' => MyLang('operate_title'), 'view_type' => 'operate', 'view_key' => 'answer/module/operate', 'align' => 'center', diff --git a/app/index/form/Message.php b/app/index/form/Message.php index 9caf1033b..43e827f89 100644 --- a/app/index/form/Message.php +++ b/app/index/form/Message.php @@ -55,6 +55,7 @@ class Message */ public function Run($params = []) { + $lang = MyLang('message.form_table'); return [ // 基础配置 'base' => [ @@ -64,23 +65,23 @@ class Message // 表单配置 'form' => [ [ - 'label' => '消息类型', + 'label' => $lang['type'], 'view_type' => 'field', 'view_key' => 'type', 'view_data_key' => 'name', - 'view_data' => MyConst('common_message_type_list'), + 'view_data' => MyLang('common_message_type_list'), 'is_sort' => 1, 'search_config' => [ 'form_type' => 'select', 'where_type' => 'in', - 'data' => MyConst('common_message_type_list'), + 'data' => MyLang('common_message_type_list'), 'data_key' => 'id', 'data_name' => 'name', 'is_multiple' => 1, ], ], [ - 'label' => '业务类型', + 'label' => $lang['business_type'], 'view_type' => 'field', 'view_key' => 'business_type', 'is_sort' => 1, @@ -94,7 +95,7 @@ class Message ], ], [ - 'label' => '标题', + 'label' => $lang['title'], 'view_type' => 'field', 'view_key' => 'title', 'is_sort' => 1, @@ -104,7 +105,7 @@ class Message ], ], [ - 'label' => '详情', + 'label' => $lang['detail'], 'view_type' => 'field', 'view_key' => 'detail', 'grid_size' => 'lg', @@ -115,23 +116,23 @@ class Message ], ], [ - 'label' => '状态', + 'label' => $lang['is_read'], 'view_type' => 'field', 'view_key' => 'is_read', 'view_data_key' => 'name', - 'view_data' => MyConst('common_is_read_list'), + 'view_data' => MyLang('common_is_read_list'), 'is_sort' => 1, 'search_config' => [ 'form_type' => 'select', 'where_type' => 'in', - 'data' => MyConst('common_is_read_list'), + 'data' => MyLang('common_is_read_list'), 'data_key' => 'id', 'data_name' => 'name', 'is_multiple' => 1, ], ], [ - 'label' => '时间', + 'label' => $lang['add_time_time'], 'view_type' => 'field', 'view_key' => 'add_time_time', 'is_sort' => 1, @@ -141,7 +142,7 @@ class Message ], ], [ - 'label' => '操作', + 'label' => MyLang('operate_title'), 'view_type' => 'operate', 'view_key' => 'message/module/operate', 'align' => 'center', diff --git a/app/index/form/Order.php b/app/index/form/Order.php index 6bd689849..466773bed 100644 --- a/app/index/form/Order.php +++ b/app/index/form/Order.php @@ -62,14 +62,16 @@ class Order $base = [ 'key_field' => 'id', 'is_search' => 1, - 'detail_title' => '基础信息', + 'detail_title' => MyLang('form_table_base_detail_title'), 'is_middle' => 0, ]; // 表单配置 + $lang = MyLang('order.form_table'); + $lang_page_stats = MyLang('order.form_table_page_stats'); $form = [ [ - 'label' => '基础信息', + 'label' => $lang['goods'], 'view_type' => 'module', 'view_key' => 'order/module/goods', 'grid_size' => 'xl', @@ -79,27 +81,27 @@ class Order 'where_type' => 'like', 'where_type_custom' => 'in', 'where_value_custom' => 'WhereBaseGoodsInfo', - 'placeholder' => '请输入订单号/商品名称/型号', + 'placeholder' => $lang['goods_placeholder'], ], ], [ - 'label' => '订单状态', + 'label' => $lang['status'], 'view_type' => 'field', 'view_key' => 'status', 'view_data_key' => 'name', - 'view_data' => MyConst('common_order_status'), + 'view_data' => MyLang('common_order_status'), 'is_sort' => 1, 'search_config' => [ 'form_type' => 'select', 'where_type' => 'in', - 'data' => MyConst('common_order_status'), + 'data' => MyLang('common_order_status'), 'data_key' => 'id', 'data_name' => 'name', 'is_multiple' => 1, ], ], [ - 'label' => '支付状态', + 'label' => $lang['pay_status'], 'view_type' => 'module', 'view_key' => 'order/module/pay_status', 'is_sort' => 1, @@ -107,14 +109,14 @@ class Order 'form_type' => 'select', 'form_name' => 'pay_status', 'where_type' => 'in', - 'data' => MyConst('common_order_pay_status'), + 'data' => MyLang('common_order_pay_status'), 'data_key' => 'id', 'data_name' => 'name', 'is_multiple' => 1, ], ], [ - 'label' => '总价(元)', + 'label' => $lang['total_price'], 'view_type' => 'field', 'view_key' => 'total_price', 'is_sort' => 1, @@ -124,7 +126,7 @@ class Order ], ], [ - 'label' => '支付金额(元)', + 'label' => $lang['pay_price'], 'view_type' => 'field', 'view_key' => 'pay_price', 'is_sort' => 1, @@ -134,7 +136,7 @@ class Order ], ], [ - 'label' => '单价(元)', + 'label' => $lang['price'], 'view_type' => 'field', 'view_key' => 'price', 'is_sort' => 1, @@ -144,39 +146,39 @@ class Order ], ], [ - 'label' => '订单模式', + 'label' => $lang['order_model'], 'view_type' => 'field', 'view_key' => 'order_model', 'view_data_key' => 'name', - 'view_data' => MyConst('common_order_type_list'), + 'view_data' => MyLang('common_order_type_list'), 'is_sort' => 1, 'search_config' => [ 'form_type' => 'select', 'where_type' => 'in', - 'data' => MyConst('common_order_type_list'), + 'data' => MyLang('common_order_type_list'), 'data_key' => 'value', 'data_name' => 'name', 'is_multiple' => 1, ], ], [ - 'label' => '下单平台', + 'label' => $lang['client_type'], 'view_type' => 'field', 'view_key' => 'client_type', 'view_data_key' => 'name', - 'view_data' => MyConst('common_platform_type'), + 'view_data' => MyLang('common_platform_type'), 'is_sort' => 1, 'search_config' => [ 'form_type' => 'select', 'where_type' => 'in', - 'data' => MyConst('common_platform_type'), + 'data' => MyLang('common_platform_type'), 'data_key' => 'value', 'data_name' => 'name', 'is_multiple' => 1, ], ], [ - 'label' => '地址信息', + 'label' => $lang['address'], 'view_type' => 'module', 'view_key' => 'order/module/address', 'grid_size' => 'sm', @@ -189,7 +191,7 @@ class Order ], ], [ - 'label' => '取货信息', + 'label' => $lang['take'], 'view_type' => 'module', 'view_key' => 'order/module/take', 'width' => 125, @@ -202,7 +204,7 @@ class Order ], ], [ - 'label' => '退款金额(元)', + 'label' => $lang['refund_price'], 'view_type' => 'field', 'view_key' => 'refund_price', 'is_sort' => 1, @@ -212,7 +214,7 @@ class Order ], ], [ - 'label' => '退货数量', + 'label' => $lang['returned_quantity'], 'view_type' => 'field', 'view_key' => 'returned_quantity', 'is_sort' => 1, @@ -221,7 +223,7 @@ class Order ], ], [ - 'label' => '购买总数', + 'label' => $lang['buy_number_count'], 'view_type' => 'field', 'view_key' => 'buy_number_count', 'is_sort' => 1, @@ -230,7 +232,7 @@ class Order ], ], [ - 'label' => '增加金额(元)', + 'label' => $lang['increase_price'], 'view_type' => 'field', 'view_key' => 'increase_price', 'is_sort' => 1, @@ -240,7 +242,7 @@ class Order ], ], [ - 'label' => '优惠金额(元)', + 'label' => $lang['preferential_price'], 'view_type' => 'field', 'view_key' => 'preferential_price', 'is_sort' => 1, @@ -250,7 +252,7 @@ class Order ], ], [ - 'label' => '支付方式', + 'label' => $lang['payment_name'], 'view_type' => 'field', 'view_key' => 'payment_name', 'is_sort' => 1, @@ -265,7 +267,7 @@ class Order ], ], [ - 'label' => '留言信息', + 'label' => $lang['user_note'], 'view_type' => 'field', 'view_key' => 'user_note', 'is_sort' => 1, @@ -275,7 +277,7 @@ class Order ], ], [ - 'label' => '扩展信息', + 'label' => $lang['extension'], 'view_type' => 'module', 'view_key' => 'order/module/extension', 'grid_size' => 'sm', @@ -286,7 +288,7 @@ class Order ], ], [ - 'label' => '快递公司', + 'label' => $lang['express_name'], 'view_type' => 'field', 'view_key' => 'express_name', 'is_sort' => 1, @@ -301,7 +303,7 @@ class Order ], ], [ - 'label' => '快递单号', + 'label' => $lang['express_number'], 'view_type' => 'field', 'view_key' => 'express_number', 'is_sort' => 1, @@ -311,7 +313,7 @@ class Order ], ], [ - 'label' => '是否评论', + 'label' => $lang['is_comments'], 'view_type' => 'module', 'view_key' => 'order/module/is_comments', 'is_sort' => 1, @@ -319,7 +321,7 @@ class Order 'form_type' => 'select', 'where_type' => 'in', 'form_name' => 'user_is_comments', - 'data' => MyConst('common_is_text_list'), + 'data' => MyLang('common_is_text_list'), 'data_key' => 'id', 'data_name' => 'name', 'where_type_custom' => 'WhereTypyUserIsComments', @@ -328,7 +330,7 @@ class Order ], ], [ - 'label' => '确认时间', + 'label' => $lang['confirm_time'], 'view_type' => 'field', 'view_key' => 'confirm_time', 'is_sort' => 1, @@ -337,7 +339,7 @@ class Order ], ], [ - 'label' => '支付时间', + 'label' => $lang['pay_time'], 'view_type' => 'field', 'view_key' => 'pay_time', 'is_sort' => 1, @@ -346,7 +348,7 @@ class Order ], ], [ - 'label' => '发货时间', + 'label' => $lang['delivery_time'], 'view_type' => 'field', 'view_key' => 'delivery_time', 'is_sort' => 1, @@ -355,7 +357,7 @@ class Order ], ], [ - 'label' => '完成时间', + 'label' => $lang['collect_time'], 'view_type' => 'field', 'view_key' => 'collect_time', 'is_sort' => 1, @@ -364,7 +366,7 @@ class Order ], ], [ - 'label' => '取消时间', + 'label' => $lang['cancel_time'], 'view_type' => 'field', 'view_key' => 'cancel_time', 'is_sort' => 1, @@ -373,7 +375,7 @@ class Order ], ], [ - 'label' => '关闭时间', + 'label' => $lang['close_time'], 'view_type' => 'field', 'view_key' => 'close_time', 'is_sort' => 1, @@ -382,7 +384,7 @@ class Order ], ], [ - 'label' => '创建时间', + 'label' => $lang['add_time'], 'view_type' => 'field', 'view_key' => 'add_time', 'is_sort' => 1, @@ -391,7 +393,7 @@ class Order ], ], [ - 'label' => '更新时间', + 'label' => $lang['upd_time'], 'view_type' => 'field', 'view_key' => 'upd_time', 'is_sort' => 1, @@ -400,7 +402,7 @@ class Order ], ], [ - 'label' => '操作', + 'label' => MyLang('operate_title'), 'view_type' => 'operate', 'view_key' => 'order/module/operate', 'align' => 'center', @@ -414,8 +416,8 @@ class Order array_unshift($form, [ 'view_type' => 'checkbox', 'is_checked' => 0, - 'checked_text' => '反选', - 'not_checked_text' => '全选', + 'checked_text' => MyLang('reverse_select_title'), + 'not_checked_text' => MyLang('select_all_title'), 'not_show_key' => 'status', 'not_show_data' => [0,2,3,4,5,6], 'align' => 'center', @@ -433,11 +435,11 @@ class Order ], 'is_page_stats' => 1, 'page_stats_data' => [ - ['name'=>'订单总额', 'field'=>'total_price', 'unit'=>'元'], - ['name'=>'支付总额', 'field'=>'pay_price', 'unit'=>'元'], - ['name'=>'商品总数', 'field'=>'buy_number_count'], - ['name'=>'退款', 'field'=>'refund_price', 'unit'=>'元'], - ['name'=>'退货', 'field'=>'returned_quantity'], + ['name'=>$lang_page_stats['total_price'], 'field'=>'total_price', 'unit'=>$lang_page_stats['price_unit']], + ['name'=>$lang_page_stats['pay_price'], 'field'=>'pay_price', 'unit'=>$lang_page_stats['price_unit']], + ['name'=>$lang_page_stats['buy_number_count'], 'field'=>'buy_number_count'], + ['name'=>$lang_page_stats['refund_price'], 'field'=>'refund_price', 'unit'=>$lang_page_stats['price_unit']], + ['name'=>$lang_page_stats['returned_quantity'], 'field'=>'returned_quantity'], ], 'data_params' => [ 'is_operate' => 1, diff --git a/app/index/form/Orderaftersale.php b/app/index/form/Orderaftersale.php index b1cc8d7f2..b1cbe9a2b 100644 --- a/app/index/form/Orderaftersale.php +++ b/app/index/form/Orderaftersale.php @@ -82,13 +82,13 @@ class OrderAftersale 'view_type' => 'field', 'view_key' => 'status', 'view_data_key' => 'name', - 'view_data' => MyConst('common_order_aftersale_status_list'), + 'view_data' => MyLang('common_order_aftersale_status_list'), 'width' => 120, 'is_sort' => 1, 'search_config' => [ 'form_type' => 'select', 'where_type' => 'in', - 'data' => MyConst('common_order_aftersale_status_list'), + 'data' => MyLang('common_order_aftersale_status_list'), 'data_key' => 'value', 'data_name' => 'name', 'is_multiple' => 1, @@ -99,13 +99,13 @@ class OrderAftersale 'view_type' => 'field', 'view_key' => 'type', 'view_data_key' => 'name', - 'view_data' => MyConst('common_order_aftersale_type_list'), + 'view_data' => MyLang('common_order_aftersale_type_list'), 'width' => 120, 'is_sort' => 1, 'search_config' => [ 'form_type' => 'select', 'where_type' => 'in', - 'data' => MyConst('common_order_aftersale_type_list'), + 'data' => MyLang('common_order_aftersale_type_list'), 'data_key' => 'value', 'data_name' => 'name', 'is_multiple' => 1, @@ -156,13 +156,13 @@ class OrderAftersale 'view_type' => 'field', 'view_key' => 'refundment', 'view_data_key' => 'name', - 'view_data' => MyConst('common_order_aftersale_refundment_list'), + 'view_data' => MyLang('common_order_aftersale_refundment_list'), 'width' => 120, 'is_sort' => 1, 'search_config' => [ 'form_type' => 'select', 'where_type' => 'in', - 'data' => MyConst('common_order_aftersale_refundment_list'), + 'data' => MyLang('common_order_aftersale_refundment_list'), 'data_key' => 'value', 'data_name' => 'name', 'is_multiple' => 1, diff --git a/app/index/form/Usergoodsbrowse.php b/app/index/form/Usergoodsbrowse.php index c5da08802..81961bfa1 100644 --- a/app/index/form/Usergoodsbrowse.php +++ b/app/index/form/Usergoodsbrowse.php @@ -67,8 +67,8 @@ class UserGoodsBrowse [ 'view_type' => 'checkbox', 'is_checked' => 0, - 'checked_text' => '反选', - 'not_checked_text' => '全选', + 'checked_text' => MyLang('reverse_select_title'), + 'not_checked_text' => MyLang('select_all_title'), 'align' => 'center', 'width' => 80, ], diff --git a/app/index/form/Usergoodsfavor.php b/app/index/form/Usergoodsfavor.php index f2a9fb4d5..896b00ad2 100644 --- a/app/index/form/Usergoodsfavor.php +++ b/app/index/form/Usergoodsfavor.php @@ -68,8 +68,8 @@ class UserGoodsFavor [ 'view_type' => 'checkbox', 'is_checked' => 0, - 'checked_text' => '反选', - 'not_checked_text' => '全选', + 'checked_text' => MyLang('reverse_select_title'), + 'not_checked_text' => MyLang('select_all_title'), 'align' => 'center', 'width' => 80, ], diff --git a/app/index/form/Userintegral.php b/app/index/form/Userintegral.php index 006b3bc2a..52b02ca0d 100644 --- a/app/index/form/Userintegral.php +++ b/app/index/form/Userintegral.php @@ -66,12 +66,12 @@ class UserIntegral 'view_type' => 'field', 'view_key' => 'type', 'view_data_key' => 'name', - 'view_data' => MyConst('common_integral_log_type_list'), + 'view_data' => MyLang('common_integral_log_type_list'), 'is_sort' => 1, 'search_config' => [ 'form_type' => 'select', 'where_type' => 'in', - 'data' => MyConst('common_integral_log_type_list'), + 'data' => MyLang('common_integral_log_type_list'), 'data_key' => 'id', 'data_name' => 'name', 'is_multiple' => 1, diff --git a/app/index/lang/en-us.php b/app/index/lang/en-us.php new file mode 100644 index 000000000..3a83385ef --- /dev/null +++ b/app/index/lang/en-us.php @@ -0,0 +1,336 @@ + [ + // 公共 + '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', + 'cancel_text' => 'Cancel', + 'save_text' => 'Save', + 'more_text' => 'More', + 'processing_in_text' => 'Processing in...', + 'upload_in_text' => 'Upload in...', + 'navigation_main_quick_name' => 'Treasure chest', + 'no_relevant_data_tips' => 'No relevant data', + 'avatar_upload_title' => 'Avatar Upload', + 'choice_images_text' => 'Choice Pic', + 'choice_images_error_tips' => 'Please select the image to upload', + 'confirm_upload_title' => 'Confirm Upload', + // 公共顶部小导航-左侧导航 + 'header_top_nav_left_not_login_first' => 'Hello, welcome to', + 'header_top_nav_left_login_first' => 'Hello!', + 'header_top_nav_left_login_last' => ', Welcome to', + // 搜索 + 'search_input_placeholder' => 'Actually, the search is very simple ^ _ ^!', + 'search_button_text' => 'Search', + // 用户 + 'avatar_upload_tips' => [ + 'Please zoom in and out in the working area and move the selection box to select the range to be cut. The cutting width and height ratio are fixed;', + 'The effect after cutting is shown in the preview image on the right. It takes effect after confirmation of submission;' + ], + 'close_user_register_tips' => 'Temporarily close user registration', + 'close_user_login_tips' => 'Temporarily close user login', + ], + + // 首页 + 'index' => [ + 'banner_right_already_login_first' => 'Hi,', + 'banner_right_not_login_first' => 'Hello, welcome to', + 'banner_right_article_title' => 'News headlines', + 'design_browser_seo_title' => 'Home page design', + ], + + // 商品 + 'goods' => [ + // 页面公共 + 'page_common' => [ + 'comment_no_data_tips' => 'No comment data', + ], + // 基础 + 'goods_no_data_tips' => 'Goods does not exist or has been deleted', + 'panel_can_choice_spec_name' => 'Optional specifications', + 'recommend_goods_title' => 'Look and see', + 'dynamic_scoring_name' => 'Scoring', + 'no_scoring_data_tips' => 'No scoring data', + 'no_comments_data_tips' => 'No evaluation data', + 'comments_first_name' => 'Comment on', + 'admin_reply_name' => 'Admin reply:', + ], + + // 商品搜索 + 'search' => [ + 'browser_seo_title' => 'Goods Search', + ], + + // 商品分类 + 'category' => [ + 'browser_seo_title' => 'Goods Category', + 'no_category_data_tips' => 'No classification data', + 'no_sub_category_data_tips' => 'No subcategory data', + 'view_category_sub_goods_name' => 'View products under category', + ], + + // 购物车 + 'cart' => [ + // 页面公共 + 'page_common' => [ + 'goods_no_choice_tips' => 'Please select an item', + ], + // 基础 + 'browser_seo_title' => 'Cart', + 'goods_list_thead_base' => 'Goods Info', + 'goods_list_thead_price' => 'Price', + 'goods_list_thead_number' => 'Number', + 'goods_list_thead_total' => 'Amount of Money', + 'goods_item_total_name' => 'Total', + 'summary_selected_goods_name' => 'Selected Goods', + 'summary_selected_goods_unit' => 'Piece', + 'summary_nav_goods_total' => 'Total:', + 'summary_nav_button_name' => 'Settlement', + 'no_cart_data_tips' => 'Your shopping cart is still empty. You can', + 'no_cart_data_my_favor_name' => 'My Favor', + 'no_cart_data_my_order_name' => 'My Order', + ], + + // 订单确认 + 'buy' => [ + // 页面公共 + 'page_common' => [ + 'address_choice_tips' => 'Please select an address', + 'payment_choice_tips' => 'Please select payment', + ], + // 基础 + 'browser_seo_title' => 'Order Confirm', + 'show_mode_not_allow_submit_order_tips' => 'Order submission is not allowed for display type', + 'gooods_data_no_data_tips' => 'Goods Info is empty', + 'buy_item_order_title' => 'Order Info', + 'buy_item_payment_title' => 'Choice Payment', + 'confirm_delivery_address_name' => 'Confirm delivery address', + 'use_new_address_name' => 'Use New Address', + 'no_delivery_address_tips' => 'No shipping address', + 'confirm_extraction_address_name' => 'Confirm the self-pickup address', + 'choice_take_address_name' => 'Select pickup address', + 'no_take_address_tips' => 'Please contact the administrator to configure the self-service address', + 'no_address_tips' => 'No address', + 'extraction_list_choice_title' => 'Self-service selection', + 'goods_list_thead_base' => 'Goods Info', + 'goods_list_thead_price' => 'Price', + 'goods_list_thead_number' => 'Number', + 'goods_list_thead_total' => 'Amount of Money', + 'goods_item_total_name' => 'Total', + 'not_goods_tips' => 'No Goods', + 'not_payment_tips' => 'No payment method', + 'user_message_title' => 'Buyer message', + 'user_message_placeholder' => 'Instructions agreed with the seller for optional and recommended filling', + 'summary_title' => 'Actual payment:', + 'summary_contact_name' => 'contacts:', + 'summary_address' => 'Address:', + 'summary_submit_order_name' => 'Submit Order', + 'payment_layer_title' => 'Payment jump, please do not close the page', + 'payment_layer_content' => 'Payment failed or did not respond for a long time', + 'payment_layer_order_button_text' => 'My Order', + 'payment_layer_tips' => 'Payment can be re-initiated after', + ], + + // 文章 + 'article' => [ + 'category_browser_seo_title' => 'All Articles', + 'article_no_data_tips' => 'Article does not exist or has been deleted', + 'article_id_params_tips' => 'Incorrect Article ID', + 'release_time' => 'Release Time:', + 'view_number' => 'View Number:', + 'prev_article' => 'Previous:', + 'next_article' => 'Next:', + 'article_category_name' => 'Article Category', + 'article_nav_text' => 'Sidebar Nav', + ], + + // 自定义页面 + 'custom_view' => [ + 'custom_view_no_data_tips' => 'Page does not exist or has been deleted', + ], + + // 页面设计 + 'design' => [ + 'design_no_data_tips' => 'Page does not exist or has been deleted', + ], + + // 订单管理 + 'order' => [ + // 页面公共 + 'page_common' => [ + 'order_id_empty' => 'Wrong order ID', + 'payment_choice_tips' => 'Please select payment method', + 'rating_string' => 'Very poor, poor, average, good, very good', + 'not_choice_data_tips' => 'Please select data first', + 'pay_url_empty_tips' => 'The payment url address is incorrect', + ], + // 基础 + 'browser_seo_title' => 'My Order', + 'detail_browser_seo_title' => 'Order Detail', + 'comments_browser_seo_title' => 'Order Comments', + // 动态表格 + 'form_table' => [ + 'goods' => 'Base Info', + 'goods_placeholder' => 'Please enter the order number/product name/model', + 'status' => 'Order Status', + 'pay_status' => 'Payment Status', + 'total_price' => 'Total Price(yuan)', + 'pay_price' => 'Payment Price(yuan)', + 'price' => 'Price(yuan)', + 'order_model' => 'Order Mode', + 'client_type' => 'Ordering Platform', + 'address' => 'Address Info', + 'take' => 'Take Info', + 'refund_price' => 'Refund Amount(yuan)', + 'returned_quantity' => 'Refund Number', + 'buy_number_count' => 'Buy Number', + 'increase_price' => 'Increase Price(yuan)', + 'preferential_price' => 'Discount Price(yuan)', + 'payment_name' => 'Payment Type', + 'user_note' => 'User Message', + 'extension' => 'Extended Info', + 'express_name' => 'Express Company', + 'express_number' => 'Express Number', + 'is_comments' => 'Whether Comment', + 'confirm_time' => 'Confirm Time', + 'pay_time' => 'Payment Time', + 'delivery_time' => 'Delivery Time', + 'collect_time' => 'Success Time', + 'cancel_time' => 'Cancel Time', + 'close_time' => 'Close Time', + 'add_time' => 'Creation Time', + 'upd_time' => 'Update Time', + ], + // 动态表格统计数据 + 'form_table_page_stats' => [ + 'total_price' => 'TotalPrice', + 'pay_price' => 'PaymentPrice', + 'buy_number_count' => 'GoodsNumber', + 'refund_price' => 'RefundAmount', + 'returned_quantity' => 'RefundNumber', + 'price_unit' => 'yuan', + ], + ], + + // 订单售后 + 'orderaftersale' => [ + // 页面公共 + 'page_common' => [ + 'refund_reason_empty_tips' => 'Refund reason data is empty', + ], + // 基础 + 'browser_seo_title' => 'Order AfterSales', + 'detail_browser_seo_title' => 'Order AfterSales Detail', + ], + + // 用户 + 'user' => [ + 'browser_seo_title' => 'User Center', + 'forget_password_browser_seo_title' => 'Password Recovery', + 'user_register_browser_seo_title' => 'User Register', + 'user_login_browser_seo_title' => 'User Login', + 'password_reset_illegal_error_tips' => 'You have logged in. If you want to reset your password, please log out of your current account first', + 'register_illegal_error_tips' => 'You have logged in. If you want to register a new account, please exit the current account first', + 'login_illegal_error_tips' => 'Already logged in, please do not log in again', + ], + + // 用户地址 + 'user_address' => [ + 'browser_seo_title' => 'My Address', + ], + + // 用户足迹 + 'user_goods_browse' => [ + 'browser_seo_title' => 'My Browse', + ], + + // 用户商品收藏 + 'user_goods_favor' => [ + 'browser_seo_title' => 'Goods Favor', + ], + + // 用户积分 + 'user_integral' => [ + 'browser_seo_title' => 'My Integral', + ], + + // 个人资料 + 'personal' => [ + 'browser_seo_title' => 'Personal Data', + 'edit_browser_seo_title' => 'Personal Data Edit', + ], + + // 消息管理 + 'message' => [ + // 基础 + 'browser_seo_title' => 'My Message', + // 动态表格 + 'form_table' => [ + 'type' => 'Message Type', + 'business_type' => 'Business Type', + 'title' => 'Title', + 'detail' => 'Detail', + 'is_read' => 'Status', + 'add_time_time' => 'Creation Time', + ], + ], + + // 问答/留言 + 'answer' => [ + // 基础 + 'browser_seo_title' => 'Q&A/Message', + // 表单 + 'form_title' => 'Q&A/Message', + 'form_item_name' => 'Nickname', + 'form_item_name_message' => 'Nickname format is between 1 and 30 characters', + 'form_item_tel' => 'Phone', + 'form_item_tel_message' => 'Please fill in the phone number', + 'form_item_title' => 'Title', + 'form_item_title_message' => 'Title format is between 1 and 60 characters', + 'form_item_content' => 'Content', + 'form_item_content_message' => 'Content format is between 5 and 1000 characters', + // 动态表格 + 'form_table' => [ + 'name' => 'Contacts', + 'tel' => 'Contact Number', + 'content' => 'Content', + 'reply' => 'Reply Content', + 'reply_time_time' => 'Reply Time', + 'add_time_time' => 'Creation Time', + ], + ], + + // 安全 + 'safety' => [ + 'browser_seo_title' => 'Security settings', + 'password_update_browser_seo_title' => 'Login password modification - security settings', + 'mobile_update_browser_seo_title' => 'Mobile number modification - security settings', + 'email_update_browser_seo_title' => 'E-mail modification - security settings', + 'logout_browser_seo_title' => 'Account logout - security settings', + 'original_account_check_error_tips' => 'Original account verification failed', + ], +]; +?> \ No newline at end of file diff --git a/app/index/lang/zh-cn.php b/app/index/lang/zh-cn.php index 689a857a7..80c05e4f4 100755 --- a/app/index/lang/zh-cn.php +++ b/app/index/lang/zh-cn.php @@ -10,41 +10,327 @@ // +---------------------------------------------------------------------- /** - * 模块语言包 + * 模块语言包-中文 * @author Devil * @blog http://gong.gg/ * @version 0.0.1 * @datetime 2016-12-01T21:51:08+0800 */ return [ + // 页面公共 + 'common' => [ + // 公共 + 'shop_home_title' => '商城首页', + 'back_to_the_home_title' => '回到首页', + 'all_category_text' => '全部分类', + 'toggle_navigation_text' => '导航切换', + 'login_title' => '登录', + 'register_title' => '注册', + 'logout_title' => '退出', + 'cancel_text' => '取消', + 'save_text' => '保存', + 'more_text' => '更多', + 'processing_in_text' => '处理中...', + 'upload_in_text' => '上传中...', + 'navigation_main_quick_name' => '百宝箱', + 'no_relevant_data_tips' => '没有相关数据', + 'avatar_upload_title' => '头像上传', + 'choice_images_text' => '选择图片', + 'choice_images_error_tips' => '请选择需要上传的图片', + 'confirm_upload_title' => '确认上传', + // 公共顶部小导航-左侧导航 + 'header_top_nav_left_not_login_first' => '您好,欢迎来到', + 'header_top_nav_left_login_first' => '您好', + 'header_top_nav_left_login_last' => ',欢迎来到', + // 搜索 + 'search_input_placeholder' => '其实搜索很简单^_^ !', + 'search_button_text' => '搜索', + // 用户 + 'avatar_upload_tips' => [ + '请在工作区域放大缩小及移动选取框,选择要裁剪的范围,裁切宽高比例固定;', + '裁切后的效果为右侧预览图所显示,确认提交后生效;' + ], + 'close_user_register_tips' => '暂时关闭用户注册', + 'close_user_login_tips' => '暂时关闭用户登录', + ], + + // 首页 + 'index' => [ + 'banner_right_already_login_first' => 'Hi,', + 'banner_right_not_login_first' => '您好,欢迎来到', + 'banner_right_article_title' => '新闻头条', + 'design_browser_seo_title' => '首页设计', + ], + // 商品 - 'page_goods' => [ - 'comment_no_data_tips' => '没有评论数据', + 'goods' => [ + // 页面公共 + 'page_common' => [ + 'comment_no_data_tips' => '没有评论数据', + ], + // 基础 + 'goods_no_data_tips' => '商品不存在或已删除', + 'panel_can_choice_spec_name' => '可选规格', + 'recommend_goods_title' => '看了又看', + 'dynamic_scoring_name' => '动态评分', + 'no_scoring_data_tips' => '没有评分数据', + 'no_comments_data_tips' => '没有评价数据', + 'comments_first_name' => '评论于', + 'admin_reply_name' => '管理员回复:', + ], + + // 商品搜索 + 'search' => [ + 'browser_seo_title' => '商品搜索', + ], + + // 商品分类 + 'category' => [ + 'browser_seo_title' => '商品分类', + 'no_category_data_tips' => '没有分类数据', + 'no_sub_category_data_tips' => '没有子分类数据', + 'view_category_sub_goods_name' => '查看分类下商品', ], // 购物车 - 'page_cart' => [ - 'goods_no_choice_tips' => '请选择商品', + 'cart' => [ + // 页面公共 + 'page_common' => [ + 'goods_no_choice_tips' => '请选择商品', + ], + // 基础 + 'browser_seo_title' => '购物车', + 'goods_list_thead_base' => '商品信息', + 'goods_list_thead_price' => '单价', + 'goods_list_thead_number' => '数量', + 'goods_list_thead_total' => '金额', + 'goods_item_total_name' => '合计', + 'summary_selected_goods_name' => '已选商品', + 'summary_selected_goods_unit' => '件', + 'summary_nav_goods_total' => '合计:', + 'summary_nav_button_name' => '结算', + 'no_cart_data_tips' => '您的购物车还是空的,您可以', + 'no_cart_data_my_favor_name' => '我的收藏夹', + 'no_cart_data_my_order_name' => '我的订单', ], // 订单确认 - 'page_buy' => [ - 'address_choice_tips' => '请选择地址', - 'payment_choice_tips' => '请选择支付', + 'buy' => [ + // 页面公共 + 'page_common' => [ + 'address_choice_tips' => '请选择地址', + 'payment_choice_tips' => '请选择支付', + ], + // 基础 + 'browser_seo_title' => '订单确认', + 'show_mode_not_allow_submit_order_tips' => '展示型不允许提交订单', + 'gooods_data_no_data_tips' => '商品信息为空', + 'buy_item_order_title' => '订单信息', + 'buy_item_payment_title' => '选择支付', + 'confirm_delivery_address_name' => '确认收货地址', + 'use_new_address_name' => '使用新地址', + 'no_delivery_address_tips' => '没有收货地址', + 'confirm_extraction_address_name' => '确认自提点地址', + 'choice_take_address_name' => '选择取货地址', + 'no_take_address_tips' => '请联系管理员配置自提点地址', + 'no_address_tips' => '没有地址', + 'extraction_list_choice_title' => '自提点选择', + 'goods_list_thead_base' => '商品信息', + 'goods_list_thead_price' => '单价', + 'goods_list_thead_number' => '数量', + 'goods_list_thead_total' => '金额', + 'goods_item_total_name' => '合计', + 'not_goods_tips' => '没有商品', + 'not_payment_tips' => '没有支付方式', + 'user_message_title' => '买家留言', + 'user_message_placeholder' => '选填、建议填写和卖家达成一致的说明', + 'summary_title' => '实付款:', + 'summary_contact_name' => '联系人:', + 'summary_address' => '地址:', + 'summary_submit_order_name' => '提交订单', + 'payment_layer_title' => '支付跳转中、请勿关闭页面', + 'payment_layer_content' => '支付失败或长时间未响应', + 'payment_layer_order_button_text' => '我的订单', + 'payment_layer_tips' => '后可以重新发起支付', + ], + + // 文章 + 'article' => [ + 'category_browser_seo_title' => '所有文章', + 'article_no_data_tips' => '文章不存在或已删除', + 'article_id_params_tips' => '文章ID有误', + 'release_time' => '发布时间:', + 'view_number' => '浏览次数:', + 'prev_article' => '上一篇:', + 'next_article' => '下一篇:', + 'article_category_name' => '文章分类', + 'article_nav_text' => '侧栏导航', + ], + + // 自定义页面 + 'custom_view' => [ + 'custom_view_no_data_tips' => '页面不存在或已删除', + ], + + // 页面设计 + 'design' => [ + 'design_no_data_tips' => '页面不存在或已删除', ], // 订单管理 - 'page_order' => [ - 'order_id_empty' => '订单id有误', - 'payment_choice_tips' => '请选择支付方式', - 'rating_string' => '非常差,差,一般,好,非常好', - 'not_choice_data_tips' => '请先选中数据', - 'pay_url_empty_tips' => '支付url地址有误', + 'order' => [ + // 页面公共 + 'page_common' => [ + 'order_id_empty' => '订单id有误', + 'payment_choice_tips' => '请选择支付方式', + 'rating_string' => '非常差,差,一般,好,非常好', + 'not_choice_data_tips' => '请先选中数据', + 'pay_url_empty_tips' => '支付url地址有误', + ], + // 基础 + 'browser_seo_title' => '我的订单', + 'detail_browser_seo_title' => '订单详情', + 'comments_browser_seo_title' => '订单评论', + // 动态表格 + 'form_table' => [ + 'goods' => '基础信息', + 'goods_placeholder' => '请输入订单号/商品名称/型号', + 'status' => '订单状态', + 'pay_status' => '支付状态', + 'total_price' => '总价(元)', + 'pay_price' => '支付金额(元)', + 'price' => '单价(元)', + 'order_model' => '订单模式', + 'client_type' => '下单平台', + 'address' => '地址信息', + 'take' => '取货信息', + 'refund_price' => '退款金额(元)', + 'returned_quantity' => '退货数量', + 'buy_number_count' => '购买总数', + 'increase_price' => '增加金额(元)', + 'preferential_price' => '优惠金额(元)', + 'payment_name' => '支付方式', + 'user_note' => '留言信息', + 'extension' => '扩展信息', + 'express_name' => '快递公司', + 'express_number' => '快递单号', + 'is_comments' => '是否评论', + 'confirm_time' => '确认时间', + 'pay_time' => '支付时间', + 'delivery_time' => '发货时间', + 'collect_time' => '完成时间', + 'cancel_time' => '取消时间', + 'close_time' => '关闭时间', + 'add_time' => '创建时间', + 'upd_time' => '更新时间', + ], + // 动态表格统计数据 + 'form_table_page_stats' => [ + 'total_price' => '订单总额', + 'pay_price' => '支付总额', + 'buy_number_count' => '商品总数', + 'refund_price' => '退款', + 'returned_quantity' => '退货', + 'price_unit' => '元', + ], ], // 订单售后 - 'page_orderaftersale' => [ - 'refund_reason_empty_tips' => '退款原因数据为空', + 'orderaftersale' => [ + // 页面公共 + 'page_common' => [ + 'refund_reason_empty_tips' => '退款原因数据为空', + ], + // 基础 + 'browser_seo_title' => '订单售后', + 'detail_browser_seo_title' => '订单售后详情', + ], + + // 用户 + 'user' => [ + 'browser_seo_title' => '用户中心', + 'forget_password_browser_seo_title' => '密码找回', + 'user_register_browser_seo_title' => '用户注册', + 'user_login_browser_seo_title' => '用户登录', + 'password_reset_illegal_error_tips' => '已经登录了,如要重置密码,请先退出当前账户', + 'register_illegal_error_tips' => '已经登录了,如要注册新账户,请先退出当前账户', + 'login_illegal_error_tips' => '已经登录了,请勿重复登录', + ], + + // 用户地址 + 'user_address' => [ + 'browser_seo_title' => '我的地址', + ], + + // 用户足迹 + 'user_goods_browse' => [ + 'browser_seo_title' => '我的足迹', + ], + + // 用户商品收藏 + 'user_goods_favor' => [ + 'browser_seo_title' => '商品收藏', + ], + + // 用户积分 + 'user_integral' => [ + 'browser_seo_title' => '我的积分', + ], + + // 个人资料 + 'personal' => [ + 'browser_seo_title' => '个人资料', + 'edit_browser_seo_title' => '个人资料编辑', + ], + + // 消息管理 + 'message' => [ + // 基础 + 'browser_seo_title' => '我的消息', + // 动态表格 + 'form_table' => [ + 'type' => '消息类型', + 'business_type' => '业务类型', + 'title' => '标题', + 'detail' => '详情', + 'is_read' => '状态', + 'add_time_time' => '时间', + ], + ], + + // 问答/留言 + 'answer' => [ + // 基础 + 'browser_seo_title' => '问答/留言', + // 表单 + 'form_title' => '提问/留言', + 'form_item_name' => '昵称', + 'form_item_name_message' => '昵称格式1~30个字符之间', + 'form_item_tel' => '电话', + 'form_item_tel_message' => '请填写电话', + 'form_item_title' => '标题', + 'form_item_title_message' => '标题格式1~60个字符之间', + 'form_item_content' => '内容', + 'form_item_content_message' => '内容格式5~1000个字符之间', + // 动态表格 + 'form_table' => [ + 'name' => '联系人', + 'tel' => '联系电话', + 'content' => '内容', + 'reply' => '回复内容', + 'reply_time_time' => '回复时间', + 'add_time_time' => '创建时间', + ], + ], + + // 安全 + 'safety' => [ + 'browser_seo_title' => '安全设置', + 'password_update_browser_seo_title' => '登录密码修改 - 安全设置', + 'mobile_update_browser_seo_title' => '手机号码修改 - 安全设置', + 'email_update_browser_seo_title' => '电子邮箱修改 - 安全设置', + 'logout_browser_seo_title' => '账号注销 - 安全设置', + 'original_account_check_error_tips' => '原帐号校验失败', ], ]; ?> \ No newline at end of file diff --git a/app/index/view/default/answer/index.html b/app/index/view/default/answer/index.html index ba6a98c33..c532f9ec6 100755 --- a/app/index/view/default/answer/index.html +++ b/app/index/view/default/answer/index.html @@ -3,7 +3,7 @@ {{block name="form_operate_top"}} - 新增 + {{:MyLang('add_title')}} {__block__} {{/block}} @@ -11,28 +11,29 @@ {{block name="form_extend"}} -
+
-

提问/留言

+

{{:MyLang('answer.form_title')}}

×
- -
+ +
- -
+ +
- -
+ +
- - + +
-
+ +
diff --git a/app/index/view/default/answer/module/operate.html b/app/index/view/default/answer/module/operate.html index db4394bc4..69cee16d7 100644 --- a/app/index/view/default/answer/module/operate.html +++ b/app/index/view/default/answer/module/operate.html @@ -1,5 +1,5 @@ \ No newline at end of file diff --git a/app/index/view/default/article/index.html b/app/index/view/default/article/index.html index e658264a3..c1266e9d4 100755 --- a/app/index/view/default/article/index.html +++ b/app/index/view/default/article/index.html @@ -33,8 +33,8 @@

{{$article.title}}


@@ -60,24 +60,20 @@

-
- 上一篇: - {{if !empty($last_next_data['last'])}} - {{$last_next_data.last.title}} - {{$last_next_data.last.add_time}} - {{else /}} - 没有符合条件的文章 - {{/if}} -
-
- 下一篇: - {{if !empty($last_next_data['next'])}} - {{$last_next_data.next.title}} - {{$last_next_data.next.add_time}} - {{else /}} - 没有符合条件的文章 - {{/if}} -
+ {{if !empty($last_next_data['last'])}} +
+ {{:MyLang('article.prev_article')}} + {{$last_next_data.last.title}} + {{$last_next_data.last.add_time}} +
+ {{/if}} + {{if !empty($last_next_data['next'])}} +
+ {{:MyLang('article.next_article')}} + {{$last_next_data.next.title}} + {{$last_next_data.next.add_time}} +
+ {{/if}}
@@ -120,7 +116,7 @@
-

文章分类

+

{{:MyLang('article.article_category_name')}}

    {{foreach $category_list as $v}} @@ -150,7 +146,7 @@
- 侧栏导航 + {{:MyLang('article.article_nav_text')}}
diff --git a/app/index/view/default/buy/index.html b/app/index/view/default/buy/index.html index 8d212dc65..b2fa25c91 100755 --- a/app/index/view/default/buy/index.html +++ b/app/index/view/default/buy/index.html @@ -49,8 +49,11 @@ {{if $common_site_type eq 4}}
{{/if}} @@ -60,11 +63,11 @@

- 确认收货地址 + {{:MyLang('buy.confirm_delivery_address_name')}}

{{if !empty($user_address_list)}} - + {{/if}}
{{if !empty($user_address_list)}} @@ -77,7 +80,7 @@ {{$address.alias}} {{/if}} {{if isset($address['is_default']) and $address['is_default'] eq 1}} - 默认 + {{:MyLang('default_title')}} {{/if}} {{$address.name}} @@ -96,21 +99,21 @@
{{if isset($address['is_default']) and $address['is_default'] neq 1}} - 设为默认 + {{:MyLang('setup_default_title')}} | {{/if}} - 编辑 + {{:MyLang('edit_title')}} | - 删除 + {{:MyLang('delete_title')}}
{{/foreach}} {{else /}}
- -

没有地址

- + +

{{:MyLang('buy.no_delivery_address_tips')}}

+
{{/if}}
@@ -120,13 +123,13 @@ {{if isset($base['site_model']) and $base['site_model'] eq 2}}
-

确认自提点地址

+

{{:MyLang('buy.confirm_extraction_address_name')}}

{{if !empty($base['address'])}} - + {{/if}}
{{if empty($base['extraction_address'])}} -

请联系管理员配置自提点地址

+

{{:MyLang('buy.no_take_address_tips')}}

{{else /}} {{if !empty($base['address'])}} @@ -157,9 +160,9 @@
{{else /}}
- -

没有地址

- + +

{{:MyLang('buy.no_address_tips')}}

+
{{/if}} @@ -167,7 +170,7 @@
-

自提点选择

+

{{:MyLang('buy.extraction_list_choice_title')}}

×
@@ -193,14 +196,14 @@ {{$address.county_name}} {{$address.address}} {{if isset($address['lng']) and isset($address['lat']) and $address['lng'] neq 0 and $address['lat'] neq 0}} - 查看地图 + {{:MyLang('view_map_title')}} {{/if}}

{{if (isset($params['address_id']) and $params['address_id'] eq $key) or (!empty($base['address']) and $base.address.id eq $key)}} - + {{else /}} - + {{/if}} {{/foreach}} @@ -229,7 +232,7 @@
-

订单信息

+

{{:MyLang('buy.buy_item_order_title')}}

{{if !empty($buy_goods)}}
{{foreach $buy_goods as $v}} @@ -301,7 +304,7 @@ {{if isset($v['lng']) and isset($v['lat']) and $v['lng'] neq 0 and $v['lat'] neq 0}} {{/if}} @@ -355,10 +358,10 @@ - - - - + + + + @@ -447,7 +450,10 @@
商品信息单价数量金额{{:MyLang('buy.goods_list_thead_base')}}{{:MyLang('buy.goods_list_thead_price')}}{{:MyLang('buy.goods_list_thead_number')}}{{:MyLang('buy.goods_list_thead_total')}}
{{else /}} -
没有商品
+
+ +

{{:MyLang('buy.not_goods_tips')}}

+
{{/if}} @@ -493,7 +499,10 @@ {{$currency_symbol}}{{$v.order_base.total_price}} {{/if}} - 合计 {{$currency_symbol}}{{$v.order_base.actual_price}} + {{:MyLang('buy.goods_item_total_name')}} + + {{$currency_symbol}}{{$v.order_base.actual_price}} +
@@ -501,7 +510,10 @@ {{/foreach}}
{{else /}} -
没有商品
+
+ +

{{:MyLang('buy.not_goods_tips')}}

+
{{/if}}
@@ -523,7 +535,7 @@ {{if $base['actual_price'] gt 0 and $common_order_is_booking neq 1}}
-

选择支付

+

{{:MyLang('buy.buy_item_payment_title')}}

{{if !empty($payment_list)}}
    @@ -543,7 +555,10 @@ {{/if}}
{{if empty($payment_list)}} -
没有支付方式
+
+ +

{{:MyLang('buy.not_payment_tips')}}

+
{{/if}}
{{/if}} @@ -566,8 +581,8 @@
- - + +
@@ -606,7 +621,7 @@
- 实付款 : + {{:MyLang('buy.summary_title')}} {{$currency_symbol}}{{$base.actual_price}} @@ -616,29 +631,21 @@ {{if in_array($common_site_type, [0,2,4]) and !empty($base['address'])}}
@@ -668,7 +675,7 @@ {{/if}}
- +
@@ -711,12 +718,12 @@
-

支付跳转中、请勿关闭页面

-

支付失败或长时间未响应

+

{{:MyLang('buy.payment_layer_title')}}

+

{{:MyLang('buy.payment_layer_content')}}

- 进入 - 我的订单 - 后可以重新发起支付 + {{:MyLang('enter_title')}} + {{:MyLang('buy.payment_layer_order_button_text')}} + {{:MyLang('buy.payment_layer_tips')}}

diff --git a/app/index/view/default/cart/index.html b/app/index/view/default/cart/index.html index 9eafd8d82..3b226bc48 100755 --- a/app/index/view/default/cart/index.html +++ b/app/index/view/default/cart/index.html @@ -23,11 +23,11 @@ - - - - - + + + + + @@ -263,7 +263,7 @@
商品信息单价数量金额操作{{:MyLang('cart.goods_list_thead_base')}}{{:MyLang('cart.goods_list_thead_price')}}{{:MyLang('cart.goods_list_thead_number')}}{{:MyLang('cart.goods_list_thead_total')}}{{:MyLang('operate_title')}}
- 删除 + {{:MyLang('delete_title')}} {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true}} @@ -297,9 +297,9 @@ - {{/if}} - {{if empty($cart_list)}} + {{else /}}
-

您的购物车还是空的,您可以

+

{{:MyLang('cart.no_cart_data_tips')}}

diff --git a/app/index/view/default/category/index.html b/app/index/view/default/category/index.html index 93d1dea98..b1974acdc 100755 --- a/app/index/view/default/category/index.html +++ b/app/index/view/default/category/index.html @@ -104,9 +104,9 @@ {{else /}}
- 没有子分类数据 + {{:MyLang('category.no_sub_category_data_tips')}}

- 查看分类下商品 >> + {{:MyLang('category.view_category_sub_goods_name')}} >>

{{/if}} @@ -114,7 +114,10 @@ {{/foreach}} {{/if}} {{else /}} -
没有分类数据
+
+ +

{{:MyLang('category.no_category_data_tips')}}

+
{{/if}}
diff --git a/app/index/view/default/goods/cart_info.html b/app/index/view/default/goods/cart_info.html index 971230d0b..aa339c537 100644 --- a/app/index/view/default/goods/cart_info.html +++ b/app/index/view/default/goods/cart_info.html @@ -33,7 +33,7 @@ {{/foreach}} {{/if}}
-
销售价
+
{{:MyLang('goods_sales_price_title')}}
{{$currency_symbol}}{{$goods.price}} {{if !empty($goods['original_price']) and $goods['original_price'] gt 0}} @@ -48,14 +48,14 @@ +
- 库存{{$goods.inventory}}{{$goods.inventory_unit}} + {{:MyLang('inventory_title')}}{{$goods.inventory}}{{$goods.inventory_unit}}
{{else /}} -

库存不足起购数({{$goods.inventory}}<{{$goods.buy_min_number}})

+

{{:MyLang('goods_inventory_insufficient_min_number_tips')}}({{$goods.inventory}}<{{$goods.buy_min_number}})

{{/if}} {{else /}} -

没货了

+

{{:MyLang('goods_no_inventory_title')}}

{{/if}} @@ -63,9 +63,9 @@ {{if empty($user) or $buy_button['is_cart'] eq 0}} - + {{else /}} - + {{/if}} diff --git a/app/index/view/default/goods/comments.html b/app/index/view/default/goods/comments.html index f77ef32ee..b8dd2684e 100644 --- a/app/index/view/default/goods/comments.html +++ b/app/index/view/default/goods/comments.html @@ -5,7 +5,8 @@
- {{$v.user.user_name_view}} 评论于 + {{$v.user.user_name_view}} + {{:MyLang('goods.comments_first_name')}}
@@ -29,7 +30,7 @@ {{/if}} {{if $v['is_reply'] eq 1 and !empty($v['reply'])}}
- 管理员回复: + {{:MyLang('goods.admin_reply_name')}} {{$v.reply}}
{{/if}} diff --git a/app/index/view/default/goods/index.html b/app/index/view/default/goods/index.html index e6e3d29b4..66330e946 100755 --- a/app/index/view/default/goods/index.html +++ b/app/index/view/default/goods/index.html @@ -280,13 +280,13 @@
  • -
    库存{{$goods.inventory}}
    +
    {{:MyLang('inventory_title')}}{{$goods.inventory}}
  • -
    销量{{$goods.sales_count}}
    +
    {{:MyLang('sales_title')}}{{$goods.sales_count}}
  • -
    热度{{$goods.access_count}}
    +
    {{:MyLang('hot_title')}}{{$goods.access_count}}
@@ -307,7 +307,7 @@
- 可选规格 + {{:MyLang('goods.panel_can_choice_spec_name')}}
@@ -317,7 +317,7 @@
- +
@@ -611,12 +611,12 @@ {{/if}} -
-
    -
    -

    看了又看

    + {{if !empty($left_goods)}} +
    +
    +

    {{:MyLang('goods.recommend_goods_title')}}

    - {{if !empty($left_goods)}} +
      {{foreach $left_goods as $key=>$v}}
    • @@ -629,10 +629,10 @@
      {{$currency_symbol}}{{$v.price}}
    • - {{/foreach}} - {{/if}} -
    -
    + {{/foreach}} +
+
+ {{/if}}
@@ -733,7 +733,7 @@
-

动态评分

+

{{:MyLang('goods.dynamic_scoring_name')}}

{{$goods_score.avg}}

@@ -759,14 +759,14 @@ {{/if}} {{/foreach}} {{else /}} - 没有评分数据 + {{:MyLang('goods.no_scoring_data_tips')}} {{/if}}
- - 没有评价数据 + +

{{:MyLang('goods.no_comments_data_tips')}}

@@ -780,17 +780,15 @@ {{if !empty($detail_like_goods)}} {{foreach $detail_like_goods as $key=>$v}}
  • -
    - - {{$v.title}} - - -

    {{$v.title}}

    -
    -

    - {{$currency_symbol}}{{$v.price}} -

    -
    + + {{$v.title}} + + +

    {{$v.title}}

    +
    +

    + {{$currency_symbol}}{{$v.price}} +

  • {{/foreach}} {{/if}} diff --git a/app/index/view/default/index/index.html b/app/index/view/default/index/index.html index d48d21fb3..31a322485 100755 --- a/app/index/view/default/index/index.html +++ b/app/index/view/default/index/index.html @@ -31,28 +31,28 @@ {{if !empty($user)}} - Hi, + {{:MyLang('index.banner_right_already_login_first')}} {{if !empty($user['icon'])}} {{/if}} {{$user.user_name_view}} {{else /}} - 您好,欢迎来到 + {{:MyLang('index.banner_right_not_login_first')}} {{:MyC('home_site_name')}} {{/if}} {{if !empty($user)}} - 退出 + {{:MyLang('common.logout_title')}} {{/if}}
    {{if empty($user) and (!empty($home_user_login_type) or !empty($home_user_reg_type))}} {{/if}} @@ -72,7 +72,7 @@ {{if !empty($article_list)}} - 更多 + {{:MyLang('common.more_text')}} diff --git a/app/index/view/default/lib/enable.html b/app/index/view/default/lib/enable.html index 076cdd2a9..666709eab 100755 --- a/app/index/view/default/lib/enable.html +++ b/app/index/view/default/lib/enable.html @@ -2,7 +2,7 @@
    - {{foreach :MyConst('common_is_enable_list') as $v}} + {{foreach :MyLang('common_is_enable_list') as $v}} diff --git a/app/index/view/default/lib/gender.html b/app/index/view/default/lib/gender.html index c3b0865b6..86b61bce0 100755 --- a/app/index/view/default/lib/gender.html +++ b/app/index/view/default/lib/gender.html @@ -2,7 +2,7 @@
    - {{foreach :MyConst('common_gender_list') as $v}} + {{foreach :MyLang('common_gender_list') as $v}} diff --git a/app/index/view/default/lib/is_new_window_open.html b/app/index/view/default/lib/is_new_window_open.html index 345558a6f..bed1712e8 100755 --- a/app/index/view/default/lib/is_new_window_open.html +++ b/app/index/view/default/lib/is_new_window_open.html @@ -2,7 +2,7 @@
    - {{foreach :MyConst('common_is_text_list') as $v}} + {{foreach :MyLang('common_is_text_list') as $v}} diff --git a/app/index/view/default/lib/is_show.html b/app/index/view/default/lib/is_show.html index 9859a2be9..0ac46c12e 100755 --- a/app/index/view/default/lib/is_show.html +++ b/app/index/view/default/lib/is_show.html @@ -2,7 +2,7 @@
    - {{foreach :MyConst('common_is_show_list') as $v}} + {{foreach :MyLang('common_is_show_list') as $v}} diff --git a/app/index/view/default/lib/region_linkage.html b/app/index/view/default/lib/region_linkage.html index 4c132e551..5d9480cb5 100755 --- a/app/index/view/default/lib/region_linkage.html +++ b/app/index/view/default/lib/region_linkage.html @@ -5,7 +5,7 @@
    - +
    diff --git a/app/index/view/default/public/event_value_tips.html b/app/index/view/default/public/event_value_tips.html index dd0a0868f..cac432838 100644 --- a/app/index/view/default/public/event_value_tips.html +++ b/app/index/view/default/public/event_value_tips.html @@ -1,4 +1,4 @@ -
    +

    WEB页面

    diff --git a/app/index/view/default/public/goods_category.html b/app/index/view/default/public/goods_category.html index a526b4849..a84eb5916 100755 --- a/app/index/view/default/public/goods_category.html +++ b/app/index/view/default/public/goods_category.html @@ -4,7 +4,7 @@ {{if MyC('home_main_header_status', 1) eq 1}}
    - 全部分类 + {{:MyLang('common.all_category_text')}}
    {{/if}} diff --git a/app/index/view/default/public/header_nav.html b/app/index/view/default/public/header_nav.html index aa182894a..5ba920e06 100755 --- a/app/index/view/default/public/header_nav.html +++ b/app/index/view/default/public/header_nav.html @@ -16,7 +16,7 @@ {{/if}} - +

    @@ -28,14 +28,14 @@
    - 全部分类 + {{:MyLang('common.all_category_text')}}

    diff --git a/app/index/view/default/public/login_success.html b/app/index/view/default/public/login_success.html index c00ef1165..196d6978c 100644 --- a/app/index/view/default/public/login_success.html +++ b/app/index/view/default/public/login_success.html @@ -23,7 +23,7 @@ {{$msg}} {{if !isset($is_home) or $is_home eq 1}} {{/if}}
    diff --git a/app/index/view/default/public/module/detail_nav_operate.html b/app/index/view/default/public/module/detail_nav_operate.html index 6f8dd2f7f..791fdf1c4 100644 --- a/app/index/view/default/public/module/detail_nav_operate.html +++ b/app/index/view/default/public/module/detail_nav_operate.html @@ -2,17 +2,17 @@
    {{if isset($form_table['base']['is_data_print']) and $form_table['base']['is_data_print'] eq 1}} - + {{/if}} {{if isset($form_table['base']['is_data_export_pdf']) and $form_table['base']['is_data_export_pdf'] eq 1}} - + {{/if}} {{if isset($form_table['base']['is_data_export_excel']) and $form_table['base']['is_data_export_excel'] eq 1}} - + {{/if}}
    diff --git a/app/index/view/default/public/module/form.html b/app/index/view/default/public/module/form.html index c8c493a5f..a9ffdb946 100644 --- a/app/index/view/default/public/module/form.html +++ b/app/index/view/default/public/module/form.html @@ -95,7 +95,7 @@ {{include file="public/module/form_fields_select" /}} {{else /}} -
    {{if empty($form_error)}}动态表格配置有误{{else /}}{{$form_error}}{{/if}}
    +
    {{if empty($form_error)}}{{:MyLang('form_table_config_error_tips')}}{{else /}}{{$form_error}}{{/if}}
    {{/if}} diff --git a/app/index/view/default/public/module/form_fields_select.html b/app/index/view/default/public/module/form_fields_select.html index 8fa734972..8e99d6406 100644 --- a/app/index/view/default/public/module/form_fields_select.html +++ b/app/index/view/default/public/module/form_fields_select.html @@ -7,7 +7,7 @@
    {{if !empty($form_user_fields)}}
    -

    可点击拖拽调整显示顺序、如需恢复点击重置即可

    +

    {{:MyLang('form_table_column_sort_tips')}}

      {{foreach $form_user_fields as $v}} @@ -24,9 +24,9 @@ {{/if}}
    - - - + + +
    diff --git a/app/index/view/default/public/module/form_operate_top.html b/app/index/view/default/public/module/form_operate_top.html index 0ee54282a..a1d628686 100644 --- a/app/index/view/default/public/module/form_operate_top.html +++ b/app/index/view/default/public/module/form_operate_top.html @@ -21,17 +21,17 @@ {{if isset($form_table['base']['is_data_print']) and $form_table['base']['is_data_print'] eq 1}} - + {{/if}} {{if isset($form_table['base']['is_data_export_pdf']) and $form_table['base']['is_data_export_pdf'] eq 1}} - + {{/if}} {{if isset($form_table['base']['is_data_export_excel']) and $form_table['base']['is_data_export_excel'] eq 1}} - + {{/if}} @@ -45,14 +45,14 @@ data-confirm-title="{{if isset($form_table['base']['confirm_title'])}}{{$form_table.base.confirm_title}}{{/if}}" data-confirm-msg="{{if isset($form_table['base']['confirm_msg'])}}{{$form_table.base.confirm_msg}}{{/if}}" data-timeout="{{if isset($form_table['base']['timeout'])}}{{$form_table.base.timeout}}{{/if}}" - data-am-popover="{content: '选中列表需要删除的数据(可多选)', trigger: 'hover focus', theme: 'warning sm'}" - > 删除 + data-am-popover="{content: '{{:MyLang('form_table_nav_operate_data_list_delete_tips')}}', trigger: 'hover focus', theme: 'warning sm'}" + > {{:MyLang('delete_title')}} {{/if}} {{if isset($form_table['base']['is_search']) and $form_table['base']['is_search'] eq 1}} - 重置 - + {{:MyLang('reset_title')}} + @@ -60,8 +60,8 @@ {{/if}} -{{if !empty($user) and (!isset($form_table['base']['is_fields_sel']) or $form_table['base']['is_fields_sel'] eq 1)}} +{{if !empty($admin) and (!isset($form_table['base']['is_fields_sel']) or $form_table['base']['is_fields_sel'] eq 1)}}
    - +
    {{/if}} \ No newline at end of file diff --git a/app/index/view/default/public/nav_search.html b/app/index/view/default/public/nav_search.html index ed717198d..e0723502a 100755 --- a/app/index/view/default/public/nav_search.html +++ b/app/index/view/default/public/nav_search.html @@ -45,10 +45,10 @@
    - +
    {{if !empty($home_search_keywords)}} diff --git a/app/index/view/default/public/not_data.html b/app/index/view/default/public/not_data.html index 6526d0d40..80da30336 100755 --- a/app/index/view/default/public/not_data.html +++ b/app/index/view/default/public/not_data.html @@ -1,4 +1,4 @@
    -

    没有相关数据

    +

    {{:MyLang('no_data')}}

    \ No newline at end of file diff --git a/app/index/view/default/public/tips_error.html b/app/index/view/default/public/tips_error.html index 79504b46f..25ed3b121 100755 --- a/app/index/view/default/public/tips_error.html +++ b/app/index/view/default/public/tips_error.html @@ -23,7 +23,7 @@ {{$msg}}
    {{if !isset($is_to_home) or $is_to_home eq 1}} - 回到首页 + {{:MyLang('common.back_to_the_home_title')}} {{/if}} {{if !empty($to_url) and !empty($to_title)}} {{$to_title}} diff --git a/app/index/view/default/public/tips_success.html b/app/index/view/default/public/tips_success.html index eb9d00773..b25c052a7 100755 --- a/app/index/view/default/public/tips_success.html +++ b/app/index/view/default/public/tips_success.html @@ -23,7 +23,7 @@ {{$msg}}
    {{if !isset($is_to_home) or $is_to_home eq 1}} - 回到首页 + {{:MyLang('common.back_to_the_home_title')}} {{/if}} {{if !empty($to_url) and !empty($to_title)}} {{$to_title}} diff --git a/app/index/view/default/public/user_menu.html b/app/index/view/default/public/user_menu.html index 62c551249..6038c02ab 100755 --- a/app/index/view/default/public/user_menu.html +++ b/app/index/view/default/public/user_menu.html @@ -35,7 +35,7 @@
    -

    头像上传

    +

    {{:MyLang('common.avatar_upload_title')}}

    ×
    @@ -54,22 +54,22 @@
    - +
    - - + +
    - +
    - + -
    -

    请在工作区域放大缩小及移动选取框,选择要裁剪的范围,裁切宽高比例固定;

    -

    裁切后的效果为右侧预览图所显示;

    -

    确认提交后生效。

    -
    + {{if is_array(MyLang('common.avatar_upload_tips'))}} +
    + {{:implode('
    ', MyLang('common.avatar_upload_tips'))}} +
    + {{/if}}
    \ No newline at end of file diff --git a/app/index/view/default/useraddress/save_info.html b/app/index/view/default/useraddress/save_info.html index f594967af..23326e39a 100755 --- a/app/index/view/default/useraddress/save_info.html +++ b/app/index/view/default/useraddress/save_info.html @@ -6,29 +6,24 @@
    -
    -
    -
    - - -
    -
    -
    -
    - - -
    -
    +
    + +
    - - + +
    +
    + + +
    + {{include file="lib/region_linkage" /}}
    diff --git a/app/lang/en-us.php b/app/lang/en-us.php new file mode 100644 index 000000000..54cd326d4 --- /dev/null +++ b/app/lang/en-us.php @@ -0,0 +1,537 @@ + [ + // 基础 + 'chosen_select_no_results_text' => 'No matching results', + 'error_text' => 'Abnormal error', + 'reminder_title' => 'Warm prompt', + 'operate_params_error' => 'Incorrect operation parameters', + 'not_operate_error' => 'No related operation', + 'not_data_error' => 'No relevant data', + 'select_reverse_name' => 'Reverse selection', + 'select_all_name' => 'Select All', + 'loading_tips' => 'Loading...', + 'goods_stock_max_tips' => 'Maximum purchase limit', + 'goods_stock_min_tips' => 'Minimum purchase quantity', + 'goods_inventory_number_tips' => 'Inventory quantity', + 'goods_no_choice_spec_tips' => 'Please select a specification', + 'goods_spec_empty_tips' => 'No specification data', + 'goods_id_empty_tips' => 'Item ID data', + 'input_empty_tips' => 'Please enter data', + 'store_enabled_tips' => 'Your browser does not support local storage. Please disable Private Mode or upgrade to a modern browser.', + // 上传下载 + 'get_loading_tips' => 'Getting...', + 'download_loading_tips' => 'Downloading...', + 'update_loading_tips' => 'Updating...', + 'install_loading_tips' => 'Installing...', + 'system_download_loading_tips' => 'The system package is being downloaded...', + 'upgrade_download_loading_tips' => 'The upgrade package is being downloaded...', + // 公共common.js + 'select_not_chosen_tips' => 'Please select an item', + 'select_chosen_min_tips' => 'Select at least {value} items', + 'select_chosen_max_tips' => 'Select at most {value} items', + 'upload_images_max_tips' => 'Upload up to {value} pictures', + 'upload_video_max_tips' => 'Upload {value} videos at most', + 'upload_annex_max_tips' => 'Upload up to {value} attachments', + 'form_config_type_params_tips' => 'The form [type] parameter configuration is incorrect', + 'form_config_value_params_tips' => 'The form [type] parameter configuration is incorrect', + 'form_call_fun_not_exist_tips' => 'The method defined by the form is not defined', + 'form_config_main_tips' => 'The form [action or method] parameter configuration is incorrect', + 'max_input_vars_tips' => 'The number of request parameters has exceeded the php.ini limit', + 'operate_add_name' => 'Add', + 'operate_edit_name' => 'Edit', + 'operate_delete_name' => 'Delete', + 'upload_images_format_tips' => 'Image format error, please upload again', + 'upload_video_format_tips' => 'Video format error, please upload again', + 'ie_browser_tips' => 'ie browser is not available', + 'browser_api_error_tips' => 'The browser does not support full-screen API or has been disabled', + 'request_handle_loading_tips' => 'Processing, please wait...', + 'params_error_tips' => 'Parameter configuration error', + 'config_fun_not_exist_tips' => 'Configuration method is not defined', + 'delete_confirm_tips' => 'Cannot recover after deletion. Are you sure?', + 'operate_confirm_tips' => 'Cannot recover after operation. Are you sure to continue?', + 'window_close_confirm_tips' => 'Are you sure you want to close this page?', + 'fullscreen_open_name' => 'Enable full screen', + 'fullscreen_exit_name' => 'Exit full screen', + 'map_dragging_icon_tips' => 'Drag the red icon to locate directly', + 'map_type_not_exist_tips' => 'The map function is not defined', + 'map_address_analysis_tips' => 'The address you selected did not resolve to the result!', + 'map_coordinate_tips' => 'Incorrect coordinates', + 'before_choice_data_tips' => 'Please select data first', + 'address_data_empty_tips' => 'The address is empty', + 'assembly_not_init_tips' => 'Component not initialized', + 'not_specified_container_tips' => 'No container specified', + 'not_specified_assembly_tips' => 'No load component specified', + 'not_specified_form_name_tips' => 'No form name specified', + 'not_load_lib_hiprint_error' => 'Please introduce the hiprint component library first', + ], + + // 公共基础 + 'error' => 'Exception Error', + 'operate_fail' => 'Operation Failed', + 'operate_success' => 'Operation Succeeded', + 'get_fail' => 'Get Failed', + 'get_success' => 'Success', + 'update_fail' => 'Update Failed', + 'update_success' => 'Update Succeeded', + 'insert_fail' => 'Add Failed', + 'insert_success' => 'Successfully added', + 'edit_fail' => 'Edit Failed', + 'edit_success' => 'Edit Succeeded', + 'change_fail' => 'Modification Failed', + 'change_success' => 'Modification Succeeded', + 'delete_fail' => 'Delete Failed', + 'delete_success' => 'Delete Succeeded', + 'cancel_fail' => 'Cancel Failed', + 'cancel_success' => 'Cancel successfully', + 'close_fail' => 'Close Failed', + 'close_success' => 'Close successfully', + 'send_fail' => 'Sending Failed', + 'send_success' => 'Sending Succeeded', + 'join_fail' => 'Join Failed', + 'join_success' => 'Join successfully', + 'created_fail' => 'Generation Failed', + 'created_success' => 'Generation Succeeded', + 'auth_fail' => 'Authorization Failed', + 'auth_success' => 'Authorization Succeeded', + 'upload_fail' => 'Upload Failed', + 'upload_success' => 'Upload Succeeded', + 'apply_fail' => 'Application Failed', + 'apply_success' => 'Application Succeeded', + 'handle_fail' => 'Processing Failed', + 'handle_success' => 'Processing Succeeded', + 'handle_none' => 'No need to process', + 'loading_fail' => 'Load Failed', + 'loading_success' => 'Loading Succeeded', + 'request_fail' => 'Request Failed', + 'request_success' => 'Request Succeeded', + 'logout_fail' => 'Logout Failed', + 'logout_success' => 'Logoff Succeeded', + 'pay_fail' => 'Pay Failed', + 'pay_success' => 'Pay Succeeded', + 'no_data' => 'No Relevant Data', + 'params_error_tips' => 'Params Error', + 'content_params_empty_tips' => 'Content parameter is empty', + 'illegal_access_tips' => 'illegal access', + 'login_failure_tips' => 'Login Failed, please login again', + 'upgrading_tips' => 'Upgrading...', + 'processing_tips' => 'Processing...', + 'searching_tips' => 'Searching...', + 'controller_not_exist_tips' => 'Controller does not exist', + 'plugins_name_tips' => 'Plugins Name Wrong', + // 常用 + 'clear_search_where' => 'Clear Search Where', + 'operate_delete_tips' => 'Cant you confirm the operation after deletion?', + 'home_title' => 'Home', + 'operate_title' => 'operate', + 'select_all_title' => 'Select All', + 'reverse_select_title' => 'Reverse Select', + 'reset_title' => 'Reset', + 'confirm_title' => 'Confirm', + 'cancel_title' => 'Cancel', + 'search_title' => 'Search', + 'setup_title' => 'Setup', + 'edit_title' => 'Edit', + 'delete_title' => 'Delete', + 'add_title' => 'Add', + 'submit_title' => 'Submit', + 'detail_title' => 'Detail', + 'view_title' => 'View', + 'choice_title' => 'Choice', + 'already_choice_title' => 'Already Choice', + 'enter_title' => 'Enter', + 'map_title' => 'Map', + 'view_map_title' => 'View Map', + 'see_title' => 'See', + 'close_title' => 'Close', + 'open_title' => 'Open', + 'number_title' => 'Number', + 'spec_title' => 'Spec', + 'inventory_title' => 'Inventory', + 'sales_title' => 'Sales', + 'access_title' => 'Access', + 'hot_title' => 'Hot', + 'favor_title' => 'Favor', + 'already_favor_title' => 'Already Favor', + 'comment_title' => 'Comment', + 'default_title' => 'Default', + 'setup_default_title' => 'Setup Default', + // 商品基础相关 + 'goods_stop_sale_title' => 'Stop Sale', + 'goods_buy_title' => 'Buy', + 'goods_booking_title' => 'Booking', + 'goods_show_title' => 'Consult', + 'goods_cart_title' => 'Add Cart', + 'goods_no_inventory_title' => 'Out of stock', + 'goods_already_shelves_title' => 'Off shelf', + 'goods_only_show_title' => 'Show only', + 'goods_sales_price_title' => 'Sales Price', + 'goods_original_price_title' => 'Original Price', + 'goods_main_title' => 'Goods', + 'goods_guess_you_like_title' => 'Guess you like it', + 'goods_category_title' => 'Goods Category', + 'goods_inventory_insufficient_min_number_tips' => 'Initial purchase quantity of insufficient inventory', + // 用户基础相关 + 'user_no_login_tips' => 'Please log in first', + // 分页 + 'page_each_page_name' => 'Each Page', + 'page_page_unit' => 'Strip', + 'page_jump_to_text' => 'Jump to', + 'page_data_total' => 'Total {:total} Data', + 'page_page_total' => 'Total {:total} Page', + // 动态表格 + 'form_table_search_first' => [ + 'input' => 'Please enter', + 'select' => 'Please select', + 'section_min' => 'minimum', + 'section_max' => 'Maximum', + 'date_start' => 'start', + 'date_end' => 'end', + 'ym' => 'Please select the month and year', + ], + 'form_table_base_detail_title' => 'Base Info', + 'form_table_config_error_tips' => 'Dynamic table configuration error', + 'form_table_column_sort_tips' => 'You can click drag to adjust the display order, and click reset if you need to restore', + 'form_table_nav_operate_data_print_name' => 'DataPrint', + 'form_table_nav_operate_data_print_tips' => 'Print Current Data', + 'form_table_nav_operate_data_export_pdf_name' => 'Export PDF', + 'form_table_nav_operate_data_export_excel_name' => 'Export Excel', + 'form_table_nav_operate_data_export_tips' => 'Export Current Data', + 'form_table_nav_operate_data_list_print_tips' => 'Select the data to be printed in the list (multiple choices are allowed)', + 'form_table_nav_operate_data_list_export_excel_tips' => 'Export all data by search criteria', + 'form_table_nav_operate_data_list_export_pdf_tips' => 'Select the data to be exported from the list (multiple choices are allowed)', + 'form_table_nav_operate_data_list_delete_tips' => 'Select the data to be deleted from the list (multiple choices are allowed)', + // 前端顶部小导航-右侧 + 'header_top_nav_right' => [ + 'user_center' => 'Personal Center', + 'user_shop' => 'My Mall', + 'user_order' => 'My Order', + 'favor' => 'My Favor', + 'goods_favor' => 'Goods Favor', + 'cart' => 'Cart', + 'message' => 'Message', + ], + // 用户注册类型列表 + 'common_user_reg_type_list' => [ + 0 => ['value' => 'username', 'name' => 'account'], + 1 => ['value' => 'sms', 'name' => 'sms'], + 2 => ['value' => 'email', 'name' => 'email'], + ], + // 登录方式 + 'common_login_type_list' => [ + 0 => ['value' => 'username', 'name' => 'Account password', 'checked' => true], + 1 => ['value' => 'email', 'name' => 'Email verification code'], + 2 => ['value' => 'sms', 'name' => 'Mobile verification code'], + ], + // 性别 + 'common_gender_list' => [ + 0 => ['id' => 0, 'name' => 'Secrecy', 'checked' => true], + 1 => ['id' => 1, 'name' => 'Female'], + 2 => ['id' => 2, 'name' => 'Male'], + ], + // 关闭开启状态 + 'common_close_open_list' => [ + 0 => ['value' => 0, 'name' => 'Close'], + 1 => ['value' => 1, 'name' => 'Open'], + ], + // 是否启用 + 'common_is_enable_tips' => [ + 0 => ['id' => 0, 'name' => 'Not Enabled'], + 1 => ['id' => 1, 'name' => 'Enabled'], + ], + 'common_is_enable_list' => [ + 0 => ['id' => 0, 'name' => 'No Enabled'], + 1 => ['id' => 1, 'name' => 'Enabled', 'checked' => true], + ], + // 是否显示 + 'common_is_show_list' => [ + 0 => ['id' => 0, 'name' => 'No Show'], + 1 => ['id' => 1, 'name' => 'Show', 'checked' => true], + ], + // excel编码列表 + 'common_excel_charset_list' => [ + 0 => ['id' => 0, 'value' => 'utf-8', 'name' => 'utf-8', 'checked' => true], + 1 => ['id' => 1, 'value' => 'gbk', 'name' => 'gbk'], + ], + // excel导出类型列表 + 'common_excel_export_type_list' => [ + 0 => ['id' => 0, 'name' => 'CSV', 'checked' => true], + 1 => ['id' => 1, 'name' => 'Excel'], + ], + // 地图类型列表 + 'common_map_type_list' => [ + 'baidu' => ['id' => 'baidu', 'name' => 'Baidu Map', 'checked' => true], + 'amap' => ['id' => 'amap', 'name' => 'Gaud Map'], + 'tencent' => ['id' => 'tencent', 'name' => 'Tencent Map'], + 'tianditu' => ['id' => 'tianditu', 'name' => 'Sky Map'], + ], + // 支付支付状态 + 'common_order_pay_status' => [ + 0 => ['id' => 0, 'name' => 'To be paid', 'checked' => true], + 1 => ['id' => 1, 'name' => 'Paid'], + 2 => ['id' => 2, 'name' => 'Refunded'], + 3 => ['id' => 3, 'name' => 'Partial refund'], + ], + // 订单状态 + 'common_order_status' => [ + 0 => ['id' => 0, 'name' => 'To be confirmed', 'checked' => true], + 1 => ['id' => 1, 'name' => 'To be paid'], + 2 => ['id' => 2, 'name' => 'To be shipped'], + 3 => ['id' => 3, 'name' => 'Goods to be received'], + 4 => ['id' => 4, 'name' => 'Completed'], + 5 => ['id' => 5, 'name' => 'Canceled'], + 6 => ['id' => 6, 'name' => 'Closed'], + ], + // 所属平台 + 'common_platform_type' => [ + 'pc' => ['value' => 'pc', 'name' => 'PC Website'], + 'h5' => ['value' => 'h5', 'name' => 'H5 Website'], + 'ios' => ['value' => 'ios', 'name' => 'Apple APP'], + 'android' => ['value' => 'android', 'name' => 'Android APP'], + 'weixin' => ['value' => 'weixin', 'name' => 'WeChat applet'], + 'alipay' => ['value' => 'alipay', 'name' => 'Alipay applet'], + 'baidu' => ['value' => 'baidu', 'name' => 'Baidu applet'], + 'toutiao' => ['value' => 'toutiao', 'name' => 'Toutiao applet'], + 'qq' => ['value' => 'qq', 'name' => 'QQ applet'], + 'kuaishou' => ['value' => 'kuaishou', 'name' => 'Kwai applet'], + ], + // app平台 + 'common_app_type' => [ + 'ios' => ['value' => 'ios', 'name' => 'Apple APP'], + 'android' => ['value' => 'android', 'name' => 'Android APP'], + ], + // 小程序平台 + 'common_appmini_type' => [ + 'weixin' => ['value' => 'weixin', 'name' => 'WeChat applet'], + 'alipay' => ['value' => 'alipay', 'name' => 'Alipay applet'], + 'baidu' => ['value' => 'baidu', 'name' => 'Baidu applet'], + 'toutiao' => ['value' => 'toutiao', 'name' => 'Toutiao applet'], + 'qq' => ['value' => 'qq', 'name' => 'QQ applet'], + 'kuaishou' => ['value' => 'kuaishou', 'name' => 'Kwai applet'], + ], + // 扣除库存规则 + 'common_deduction_inventory_rules_list' => [ + 0 => ['id' => 0, 'name' => 'Order confirmed successfully'], + 1 => ['id' => 1, 'name' => 'Order payment Succeeded'], + 2 => ['id' => 2, 'name' => 'Order shipment'], + ], + // 商品增加销量规则 + 'common_sales_count_inc_rules_list' => [ + 0 => ['id' => 0, 'name' => 'Order payment'], + 1 => ['id' => 1, 'name' => 'Order receipt'], + ], + // 是否已读 + 'common_is_read_list' => [ + 0 => ['id' => 0, 'name' => 'Unread', 'checked' => true], + 1 => ['id' => 1, 'name' => 'Read'], + ], + // 消息类型 + 'common_message_type_list' => [ + 0 => ['id' => 0, 'name' => 'Default', 'checked' => true], + ], + // 用户积分 - 操作类型 + 'common_integral_log_type_list' => [ + 0 => ['id' => 0, 'name' => 'Reduce', 'checked' => true], + 1 => ['id' => 1, 'name' => 'Increase'], + ], + // 是否上架/下架 + 'common_is_shelves_list' => [ + 0 => ['id' => 0, 'name' => 'Off shelf'], + 1 => ['id' => 1, 'name' => 'Put on the shelf', 'checked' => true], + ], + // 是否 + 'common_is_text_list' => [ + 0 => ['id' => 0, 'name' => 'No', 'checked' => true], + 1 => ['id' => 1, 'name' => 'Yes'], + ], + // 用户状态 + 'common_user_status_list' => [ + 0 => ['id' => 0, 'name' => 'normal', 'checked' => true], + 1 => ['id' => 1, 'name' => 'No speaking', 'tips' => 'User is forbidden to speak'], + 2 => ['id' => 2, 'name' => 'Disable login', 'tips' => 'User is prohibited from logging in'], + 3 => ['id' => 3, 'name' => 'To be reviewed', 'tips' => 'User waiting for approval'], + ], + // 导航数据类型 + 'common_nav_type_list' => [ + 'custom' => ['value'=>'custom', 'name'=>'Custom'], + 'article' => ['value'=>'article', 'name'=>'Article'], + 'customview' => ['value'=>'customview', 'name'=>'Custom Page'], + 'goods_category' => ['value'=>'goods_category', 'name'=>'Goods Category'], + ], + // 搜索框下热门关键字类型 + 'common_search_keywords_type_list' => [ + 0 => ['value' => 0, 'name' => 'Close'], + 1 => ['value' => 1, 'name' => 'Auto'], + 2 => ['value' => 2, 'name' => 'Custom'], + ], + // app事件类型 + 'common_app_event_type' => [ + 0 => ['value' => 0, 'name' => 'WEB Page'], + 1 => ['value' => 1, 'name' => 'Internal page (applet/APP internal address)'], + 2 => ['value' => 2, 'name' => 'External applet (applet appid under the same principal)'], + 3 => ['value' => 3, 'name' => 'Jump to the native map to view the specified location'], + 4 => ['value' => 4, 'name' => 'Make a call'], + ], + // 订单售后类型 + 'common_order_aftersale_type_list' => [ + 0 => ['value' => 0, 'name' => 'Refund only', 'desc' => 'If the goods are not received (not signed), it is agreed that', 'icon' => 'am-icon-random', 'class' => 'am-fl'], + 1 => ['value' => 1, 'name' => 'Refund return', 'desc' => 'Received goods, need to return and exchange the received goods', 'icon' => 'am-icon-retweet', 'class' => 'am-fr'], + ], + // 订单售后状态 + 'common_order_aftersale_status_list' => [ + 0 => ['value' => 0, 'name' => 'To be confirmed'], + 1 => ['value' => 1, 'name' => 'To be returned'], + 2 => ['value' => 2, 'name' => 'To be reviewed'], + 3 => ['value' => 3, 'name' => 'Completed'], + 4 => ['value' => 4, 'name' => 'Rejected'], + 5 => ['value' => 5, 'name' => 'Canceled'], + ], + // 订单售后退款方式 + 'common_order_aftersale_refundment_list' => [ + 0 => ['value' => 0, 'name' => 'Retrace'], + 1 => ['value' => 1, 'name' => 'Return to wallet'], + 2 => ['value' => 2, 'name' => 'Manual processing'], + ], + // 商品评分 + 'common_goods_comments_rating_list' => [ + 0 => ['value'=>0, 'name'=>'No Score', 'badge'=>''], + 1 => ['value'=>1, 'name'=>'1 Score', 'badge'=>'danger'], + 2 => ['value'=>2, 'name'=>'2 Score', 'badge'=>'warning'], + 3 => ['value'=>3, 'name'=>'3 Score', 'badge'=>'secondary'], + 4 => ['value'=>4, 'name'=>'4 Score', 'badge'=>'primary'], + 5 => ['value'=>5, 'name'=>'5 Score', 'badge'=>'success'], + ], + // 商品评论业务类型 + 'common_goods_comments_business_type_list' => [ + 'order' => ['value' => 'order', 'name' => 'Order'], + ], + // 站点类型 + 'common_site_type_list' => [ + 0 => ['value' => 0, 'name' => 'Express'], + 1 => ['value' => 1, 'name' => 'Exhibition'], + 2 => ['value' => 2, 'name' => 'SelfDelivery'], + 3 => ['value' => 3, 'name' => 'VirtualSales'], + 4 => ['value' => 4, 'name' => 'Express+SelfDelivery', 'is_ext' => 1], + ], + // 订单类型 + 'common_order_type_list' => [ + 0 => ['value' => 0, 'name' => 'Express'], + 1 => ['value' => 1, 'name' => 'Exhibition'], + 2 => ['value' => 2, 'name' => 'SelfDelivery'], + 3 => ['value' => 3, 'name' => 'VirtualSales'], + ], + // 下单站点类型列表 + 'common_buy_site_model_list' => [ + ['value' => 0, 'name' => 'Express'], + ['value' => 2, 'name' => 'Extraction'], + ], + // 管理员状态 + 'common_admin_status_list' => [ + 0 => ['value' => 0, 'name' => 'Normal', 'checked' => true], + 1 => ['value' => 1, 'name' => 'Suspend'], + 2 => ['value' => 2, 'name' => 'Resigned'], + ], + // 支付日志状态 + 'common_pay_log_status_list' => [ + 0 => ['value' => 0, 'name' => 'To be paid', 'checked' => true], + 1 => ['value' => 1, 'name' => 'Paid'], + 2 => ['value' => 2, 'name' => 'Closed'], + ], + // 商品参数组件类型 + 'common_goods_parameters_type_list' => [ + 0 => ['value' => 0, 'name' => 'Whole'], + 1 => ['value' => 1, 'name' => 'Detail', 'checked' => true], + 2 => ['value' => 2, 'name' => 'Base'], + ], + // 商品关联排序类型 + 'goods_order_by_type_list' => [ + 0 => ['value' => 'g.access_count,g.sales_count,g.id', 'name' => 'Synthesize', 'checked' => true], + 1 => ['value' => 'g.sales_count', 'name' => 'Sales'], + 2 => ['value' => 'g.access_count', 'name' => 'Hot'], + 3 => ['value' => 'g.min_price', 'name' => 'Price'], + 4 => ['value' => 'g.id', 'name' => 'New'], + ], + // 商品关联排序规则 + 'goods_order_by_rule_list' => [ + 0 => ['value' => 'desc', 'name' => 'Desc(desc)', 'checked' => true], + 1 => ['value' => 'asc', 'name' => 'Asc(asc)'], + ], + // 首页数据类型 + 'common_site_floor_data_type_list' => [ + 0 => ['value' => 0, 'name' => 'Auto Mode', 'checked' => true], + 1 => ['value' => 1, 'name' => 'Manual Mode'], + 2 => ['value' => 2, 'name' => 'Move Mode'], + ], + // 文件上传错误码 + 'common_file_upload_error_list' => [ + 1 => 'The file size exceeds the maximum upload allowed by the server', + 2 => 'The file size exceeds the browser limit. Check whether it exceeds [Site Settings ->Maximum Attachment Limit]', + 3 => 'The file is only partially uploaded', + 4 => 'No file to upload found', + 5 => 'Server temporary folder not found', + 6 => 'Error writing file to temporary folder ', + 7 => 'File write Failed', + 8 => 'File upload extension is not opened', + ], + // -------------------- 后端相关 -------------------- + // 图片验证码 + 'site_images_verify_rules_list' => [ + 0 => ['value' => 'bgcolor', 'name' => 'Color Background'], + 1 => ['value' => 'textcolor', 'name' => 'Colored Text'], + 2 => ['value' => 'point', 'name' => 'Jamming Point'], + 3 => ['value' => 'line', 'name' => 'Jamming Line'], + ], + // 时区 + 'site_timezone_list' => [ + 'Pacific/Pago_Pago' => '(Standard Time 11:00) Midway Island, Samoa', + 'Pacific/Rarotonga' => '(Standard Time 10:00) Hawaii', + 'Pacific/Gambier' => '(Standard Time 9:00) Alaska', + 'America/Dawson' => '(Standard Time -8:00) Pacific Time (US and Canada)', + 'America/Creston' => '(Standard Time -7:00) Mountain Time (US and Canada)', + 'America/Belize' => '(Standard Time -6:00) Central Time (US and Canada), Mexico City', + 'America/Eirunepe' => '(Standard Time -5:00) Eastern Time (United States and Canada), Bogota', + 'America/Antigua' => '(Standard Time -4:00) Atlantic Time (Canada), Caracas', + 'America/Argentina/Buenos_Aires' => '(Standard Time 3:00) Brazil, Buenos Aires, Georgetown', + 'America/Noronha' => '(Standard Time 2:00) Mid-Atlantic', + 'Atlantic/Cape_Verde' => '(Standard Time -1:00) Azores, Cape Verde', + 'Africa/Ouagadougou' => '(Greenwich Mean Time) Western European Time, London, Casablanca', + 'Europe/Andorra' => '(Standard Time +1:00) Central European Time, Angola, Libya', + 'Europe/Mariehamn' => '(Standard Time +2:00) Eastern European Time, Cairo, Athens', + 'Asia/Bahrain' => '(Standard Time +3:00) Baghdad, Kuwait, Moscow', + 'Asia/Dubai' => '(Standard time +4:00) Abu Dhabi, Muscat, Baku', + 'Asia/Kolkata' => '(Standard Time +5:00) Yekaterinburg, Islamabad, Karachi', + 'Asia/Dhaka' => '(Standard Time +6:00) Almaty, Dhaka, New Siberia', + 'Indian/Christmas' => '(Standard time +7:00) Bangkok, Hanoi, Jakarta', + 'Asia/Shanghai' => '(Standard time +8:00) Beijing, Chongqing, Hong Kong, Singapore', + 'Australia/Darwin' => '(Standard time +9:00) Tokyo, Seoul, Osaka, Yakutsk', + 'Australia/Adelaide' => '(Standard Time +10:00) Sydney, Guam', + 'Australia/Currie' => '(Standard time +11:00) Magadan, Solomon Islands', + 'Pacific/Fiji' => '(Standard Time +12:00) Auckland, Wellington, Kamchatka Peninsula' + ], + // seo + // url模式列表 + 'seo_url_model_list' => [ + 0 => ['value' => 0, 'name' => 'Compatibility Mode', 'checked' => true], + 1 => ['value' => 1, 'name' => 'PATHINFO Mode'], + 2 => ['value' => 2, 'name' => 'PATHINFO Mode+ShortAddress'], + ], +]; +?> \ No newline at end of file diff --git a/app/lang/index.html b/app/lang/index.html new file mode 100644 index 000000000..e69de29bb diff --git a/app/lang/zh-cn.php b/app/lang/zh-cn.php index a0260ad94..7593b90e6 100755 --- a/app/lang/zh-cn.php +++ b/app/lang/zh-cn.php @@ -10,7 +10,7 @@ // +---------------------------------------------------------------------- /** - * 公共语言包 + * 公共语言包-中文 * @author Devil * @blog http://gong.gg/ * @version 0.0.1 @@ -38,10 +38,10 @@ return [ 'input_empty_tips' => '请输入数据', 'store_enabled_tips' => '您的浏览器不支持本地存储。请禁用“专用模式”,或升级到现代浏览器。', // 上传下载 - 'get_loading_tips' => '正在获取中..', - 'download_loading_tips' => '正在下载中..', - 'update_loading_tips' => '正在更新中..', - 'install_loading_tips' => '正在安装中..', + 'get_loading_tips' => '正在获取中...', + 'download_loading_tips' => '正在下载中...', + 'update_loading_tips' => '正在更新中...', + 'install_loading_tips' => '正在安装中...', 'system_download_loading_tips' => '系统包正在下载中...', 'upgrade_download_loading_tips' => '升级包正在下载中...', // 公共common.js @@ -85,48 +85,453 @@ return [ ], // 公共基础 - 'common' => [ - 'error' => '异常错误', - 'operate_fail' => '操作失败', - 'operate_success' => '操作成功', - 'get_fail' => '获取失败', - 'get_success' => '获取成功', - 'update_fail' => '更新失败', - 'update_success' => '更新成功', - 'insert_fail' => '添加失败', - 'insert_success' => '添加成功', - 'edit_fail' => '编辑失败', - 'edit_success' => '编辑成功', - 'change_fail' => '修改失败', - 'change_success' => '修改成功', - 'delete_fail' => '删除失败', - 'delete_success' => '删除成功', - 'cancel_fail' => '取消失败', - 'cancel_success' => '取消成功', - 'close_fail' => '关闭失败', - 'close_success' => '关闭成功', - 'send_fail' => '发送失败', - 'send_success' => '发送成功', - 'join_fail' => '加入失败', - 'join_success' => '加入成功', - 'created_fail' => '生成失败', - 'created_success' => '生成成功', - 'auth_fail' => '授权失败', - 'auth_success' => '授权成功', - 'upload_fail' => '上传失败', - 'upload_success' => '上传成功', - 'apply_fail' => '申请失败', - 'apply_success' => '申请成功', - 'handle_fail' => '处理失败', - 'handle_success' => '处理成功', - 'handle_noneed' => '无需处理', - 'loading_fail' => '加载失败', - 'loading_success' => '加载成功', - 'request_fail' => '请求失败', - 'request_success' => '请求成功', - 'logout_fail' => '注销失败', - 'logout_success' => '注销成功', - 'no_data' => '没有相关数据', + 'error' => '异常错误', + 'operate_fail' => '操作失败', + 'operate_success' => '操作成功', + 'get_fail' => '获取失败', + 'get_success' => '获取成功', + 'update_fail' => '更新失败', + 'update_success' => '更新成功', + 'insert_fail' => '添加失败', + 'insert_success' => '添加成功', + 'edit_fail' => '编辑失败', + 'edit_success' => '编辑成功', + 'change_fail' => '修改失败', + 'change_success' => '修改成功', + 'delete_fail' => '删除失败', + 'delete_success' => '删除成功', + 'cancel_fail' => '取消失败', + 'cancel_success' => '取消成功', + 'close_fail' => '关闭失败', + 'close_success' => '关闭成功', + 'send_fail' => '发送失败', + 'send_success' => '发送成功', + 'join_fail' => '加入失败', + 'join_success' => '加入成功', + 'created_fail' => '生成失败', + 'created_success' => '生成成功', + 'auth_fail' => '授权失败', + 'auth_success' => '授权成功', + 'upload_fail' => '上传失败', + 'upload_success' => '上传成功', + 'apply_fail' => '申请失败', + 'apply_success' => '申请成功', + 'handle_fail' => '处理失败', + 'handle_success' => '处理成功', + 'handle_noneed' => '无需处理', + 'loading_fail' => '加载失败', + 'loading_success' => '加载成功', + 'request_fail' => '请求失败', + 'request_success' => '请求成功', + 'logout_fail' => '注销失败', + 'logout_success' => '注销成功', + 'pay_fail' => '支付失败', + 'pay_success' => '支付成功', + 'no_data' => '没有相关数据', + 'params_error_tips' => '参数错误', + 'content_params_empty_tips' => '内容参数为空', + 'illegal_access_tips' => '非法访问', + 'login_failure_tips' => '登录失效,请重新登录', + 'upgrading_tips' => '升级中...', + 'processing_tips' => '处理中...', + 'searching_tips' => '搜索中...', + 'controller_not_exist_tips' => '控制器不存在', + 'plugins_name_tips' => '应用名称有误', + // 常用 + 'clear_search_where' => '清除搜索条件', + 'operate_delete_tips' => '删除后不可恢复、确认操作吗?', + 'home_title' => '首页', + 'operate_title' => '操作', + 'select_all_title' => '全选', + 'reverse_select_title' => '反选', + 'reverse_select_title' => '反选', + 'reset_title' => '重置', + 'confirm_title' => '确认', + 'cancel_title' => '取消', + 'search_title' => '搜索', + 'setup_title' => '设置', + 'edit_title' => '编辑', + 'delete_title' => '删除', + 'add_title' => '新增', + 'submit_title' => '提交', + 'detail_title' => '详情', + 'view_title' => '查看', + 'choice_title' => '选择', + 'already_choice_title' => '已选', + 'enter_title' => '进入', + 'map_title' => '地图', + 'view_map_title' => '查看地图', + 'see_title' => '看看', + 'close_title' => '关闭', + 'open_title' => '打开', + 'number_title' => '数量', + 'spec_title' => '规格', + 'inventory_title' => '库存', + 'sales_title' => '销量', + 'access_title' => '访问', + 'hot_title' => '热度', + 'favor_title' => '收藏', + 'already_favor_title' => '已收藏', + 'comment_title' => '评价', + 'default_title' => '默认', + 'setup_default_title' => '设为默认', + // 商品基础相关 + 'goods_stop_sale_title' => '暂停销售', + 'goods_buy_title' => '立即购买', + 'goods_booking_title' => '立即预约', + 'goods_show_title' => '立即咨询', + 'goods_cart_title' => '加入购物车', + 'goods_no_inventory_title' => '没货了', + 'goods_already_shelves_title' => '已下架', + 'goods_only_show_title' => '仅展示', + 'goods_sales_price_title' => '销售价', + 'goods_original_price_title' => '原价', + 'goods_main_title' => '商品', + 'goods_guess_you_like_title' => '猜你喜欢', + 'goods_category_title' => '商品分类', + 'goods_inventory_insufficient_min_number_tips' => '库存不足起购数', + // 用户基础相关 + 'user_no_login_tips' => '请先登录', + // 分页 + 'page_each_page_name' => '每页', + 'page_page_unit' => '条', + 'page_data_total' => '共 {:total} 条数据', + 'page_page_total' => '共 {:total} 页', + // 动态表格 + 'form_table_search_first' => [ + 'input' => '请输入', + 'select' => '请选择', + 'section_min' => '最小值', + 'section_max' => '最大值', + 'date_start' => '开始', + 'date_end' => '结束', + 'ym' => '请选择年月', + ], + 'form_table_base_detail_title' => '基础信息', + 'form_table_config_error_tips' => '动态表格配置有误', + 'form_table_column_sort_tips' => '可点击拖拽调整显示顺序、如需恢复点击重置即可', + 'form_table_nav_operate_data_print_name' => '数据打印', + 'form_table_nav_operate_data_print_tips' => '打印当前数据', + 'form_table_nav_operate_data_export_pdf_name' => '导出PDF', + 'form_table_nav_operate_data_export_excel_name' => '导出Excel', + 'form_table_nav_operate_data_export_tips' => '导出当前数据', + 'form_table_nav_operate_data_list_print_tips' => '选中列表需要打印的数据(可多选)', + 'form_table_nav_operate_data_list_export_excel_tips' => '以搜索条件导出全部数据', + 'form_table_nav_operate_data_list_export_pdf_tips' => '选中列表需要导出的数据(可多选)', + 'form_table_nav_operate_data_list_delete_tips' => '选中列表需要删除的数据(可多选)', + // 右侧导航 + 'header_top_nav_right' => [ + 'user_center' => '个人中心', + 'user_shop' => '我的商城', + 'user_order' => '我的订单', + 'favor' => '我的收藏', + 'goods_favor' => '商品收藏', + 'cart' => '购物车', + 'message' => '消息', + ], + // 用户注册类型列表 + 'common_user_reg_type_list' => [ + 0 => ['value' => 'username', 'name' => '账号'], + 1 => ['value' => 'sms', 'name' => '短信'], + 2 => ['value' => 'email', 'name' => '邮箱'], + ], + // 登录方式 + 'common_login_type_list' => [ + 0 => ['value' => 'username', 'name' => '帐号密码', 'checked' => true], + 1 => ['value' => 'email', 'name' => '邮箱验证码'], + 2 => ['value' => 'sms', 'name' => '手机验证码'], + ], + // 性别 + 'common_gender_list' => [ + 0 => ['id' => 0, 'name' => '保密', 'checked' => true], + 1 => ['id' => 1, 'name' => '女'], + 2 => ['id' => 2, 'name' => '男'], + ], + // 关闭开启状态 + 'common_close_open_list' => [ + 0 => ['value' => 0, 'name' => '关闭'], + 1 => ['value' => 1, 'name' => '开启'], + ], + // 是否启用 + 'common_is_enable_tips' => [ + 0 => ['id' => 0, 'name' => '未启用'], + 1 => ['id' => 1, 'name' => '已启用'], + ], + 'common_is_enable_list' => [ + 0 => ['id' => 0, 'name' => '不启用'], + 1 => ['id' => 1, 'name' => '启用', 'checked' => true], + ], + // 是否显示 + 'common_is_show_list' => [ + 0 => ['id' => 0, 'name' => '不显示'], + 1 => ['id' => 1, 'name' => '显示', 'checked' => true], + ], + // excel编码列表 + 'common_excel_charset_list' => [ + 0 => ['id' => 0, 'value' => 'utf-8', 'name' => 'utf-8', 'checked' => true], + 1 => ['id' => 1, 'value' => 'gbk', 'name' => 'gbk'], + ], + // excel导出类型列表 + 'common_excel_export_type_list' => [ + 0 => ['id' => 0, 'name' => 'CSV', 'checked' => true], + 1 => ['id' => 1, 'name' => 'Excel'], + ], + // 地图类型列表 + 'common_map_type_list' => [ + 'baidu' => ['id' => 'baidu', 'name' => '百度地图', 'checked' => true], + 'amap' => ['id' => 'amap', 'name' => '高德地图'], + 'tencent' => ['id' => 'tencent', 'name' => '腾讯地图'], + 'tianditu' => ['id' => 'tianditu', 'name' => '天地图'], + ], + // 支付支付状态 + 'common_order_pay_status' => [ + 0 => ['id' => 0, 'name' => '待支付', 'checked' => true], + 1 => ['id' => 1, 'name' => '已支付'], + 2 => ['id' => 2, 'name' => '已退款'], + 3 => ['id' => 3, 'name' => '部分退款'], + ], + // 订单状态 + 'common_order_status' => [ + 0 => ['id' => 0, 'name' => '待确认', 'checked' => true], + 1 => ['id' => 1, 'name' => '待付款'], + 2 => ['id' => 2, 'name' => '待发货'], + 3 => ['id' => 3, 'name' => '待收货'], + 4 => ['id' => 4, 'name' => '已完成'], + 5 => ['id' => 5, 'name' => '已取消'], + 6 => ['id' => 6, 'name' => '已关闭'], + ], + // 所属平台 + 'common_platform_type' => [ + 'pc' => ['value' => 'pc', 'name' => 'PC网站'], + 'h5' => ['value' => 'h5', 'name' => 'H5手机网站'], + 'ios' => ['value' => 'ios', 'name' => '苹果APP'], + 'android' => ['value' => 'android', 'name' => '安卓APP'], + 'weixin' => ['value' => 'weixin', 'name' => '微信小程序'], + 'alipay' => ['value' => 'alipay', 'name' => '支付宝小程序'], + 'baidu' => ['value' => 'baidu', 'name' => '百度小程序'], + 'toutiao' => ['value' => 'toutiao', 'name' => '头条小程序'], + 'qq' => ['value' => 'qq', 'name' => 'QQ小程序'], + 'kuaishou' => ['value' => 'kuaishou', 'name' => '快手小程序'], + ], + // app平台 + 'common_app_type' => [ + 'ios' => ['value' => 'ios', 'name' => '苹果APP'], + 'android' => ['value' => 'android', 'name' => '安卓APP'], + ], + // 小程序平台 + 'common_appmini_type' => [ + 'weixin' => ['value' => 'weixin', 'name' => '微信小程序'], + 'alipay' => ['value' => 'alipay', 'name' => '支付宝小程序'], + 'baidu' => ['value' => 'baidu', 'name' => '百度小程序'], + 'toutiao' => ['value' => 'toutiao', 'name' => '头条小程序'], + 'qq' => ['value' => 'qq', 'name' => 'QQ小程序'], + 'kuaishou' => ['value' => 'kuaishou', 'name' => '快手小程序'], + ], + // 扣除库存规则 + 'common_deduction_inventory_rules_list' => [ + 0 => ['id' => 0, 'name' => '订单确认成功'], + 1 => ['id' => 1, 'name' => '订单支付成功'], + 2 => ['id' => 2, 'name' => '订单发货'], + ], + // 商品增加销量规则 + 'common_sales_count_inc_rules_list' => [ + 0 => ['id' => 0, 'name' => '订单支付'], + 1 => ['id' => 1, 'name' => '订单收货'], + ], + // 是否已读 + 'common_is_read_list' => [ + 0 => ['id' => 0, 'name' => '未读', 'checked' => true], + 1 => ['id' => 1, 'name' => '已读'], + ], + // 消息类型 + 'common_message_type_list' => [ + 0 => ['id' => 0, 'name' => '默认', 'checked' => true], + ], + // 用户积分 - 操作类型 + 'common_integral_log_type_list' => [ + 0 => ['id' => 0, 'name' => '减少', 'checked' => true], + 1 => ['id' => 1, 'name' => '增加'], + ], + // 是否上架/下架 + 'common_is_shelves_list' => [ + 0 => ['id' => 0, 'name' => '下架'], + 1 => ['id' => 1, 'name' => '上架', 'checked' => true], + ], + // 是否 + 'common_is_text_list' => [ + 0 => ['id' => 0, 'name' => '否', 'checked' => true], + 1 => ['id' => 1, 'name' => '是'], + ], + // 用户状态 + 'common_user_status_list' => [ + 0 => ['id' => 0, 'name' => '正常', 'checked' => true], + 1 => ['id' => 1, 'name' => '禁止发言', 'tips' => '用户被禁止发言'], + 2 => ['id' => 2, 'name' => '禁止登录', 'tips' => '用户被禁止登录'], + 3 => ['id' => 3, 'name' => '待审核', 'tips' => '用户等待审核中'], + ], + // 导航数据类型 + 'common_nav_type_list' => [ + 'custom' => ['value'=>'custom', 'name'=>'自定义'], + 'article' => ['value'=>'article', 'name'=>'文章'], + 'customview' => ['value'=>'customview', 'name'=>'自定义页面'], + 'goods_category' => ['value'=>'goods_category', 'name'=>'商品分类'], + ], + // 搜索框下热门关键字类型 + 'common_search_keywords_type_list' => [ + 0 => ['value' => 0, 'name' => '关闭'], + 1 => ['value' => 1, 'name' => '自动'], + 2 => ['value' => 2, 'name' => '自定义'], + ], + // app事件类型 + 'common_app_event_type' => [ + 0 => ['value' => 0, 'name' => 'WEB页面'], + 1 => ['value' => 1, 'name' => '内部页面(小程序/APP内部地址)'], + 2 => ['value' => 2, 'name' => '外部小程序(同一个主体下的小程序appid)'], + 3 => ['value' => 3, 'name' => '跳转原生地图查看指定位置'], + 4 => ['value' => 4, 'name' => '拨打电话'], + ], + // 订单售后类型 + 'common_order_aftersale_type_list' => [ + 0 => ['value' => 0, 'name' => '仅退款', 'desc' => '未收到货(未签收),协商同意前提下', 'icon' => 'am-icon-random', 'class' => 'am-fl'], + 1 => ['value' => 1, 'name' => '退款退货', 'desc' => '已收到货,需要退换已收到的货物', 'icon' => 'am-icon-retweet', 'class' => 'am-fr'], + ], + // 订单售后状态 + 'common_order_aftersale_status_list' => [ + 0 => ['value' => 0, 'name' => '待确认'], + 1 => ['value' => 1, 'name' => '待退货'], + 2 => ['value' => 2, 'name' => '待审核'], + 3 => ['value' => 3, 'name' => '已完成'], + 4 => ['value' => 4, 'name' => '已拒绝'], + 5 => ['value' => 5, 'name' => '已取消'], + ], + // 订单售后退款方式 + 'common_order_aftersale_refundment_list' => [ + 0 => ['value' => 0, 'name' => '原路退回'], + 1 => ['value' => 1, 'name' => '退至钱包'], + 2 => ['value' => 2, 'name' => '手动处理'], + ], + // 商品评分 + 'common_goods_comments_rating_list' => [ + 0 => ['value'=>0, 'name'=>'未评分', 'badge'=>''], + 1 => ['value'=>1, 'name'=>'1分', 'badge'=>'danger'], + 2 => ['value'=>2, 'name'=>'2分', 'badge'=>'warning'], + 3 => ['value'=>3, 'name'=>'3分', 'badge'=>'secondary'], + 4 => ['value'=>4, 'name'=>'4分', 'badge'=>'primary'], + 5 => ['value'=>5, 'name'=>'5分', 'badge'=>'success'], + ], + // 商品评论业务类型 + 'common_goods_comments_business_type_list' => [ + 'order' => ['value' => 'order', 'name' => '订单'], + ], + // 站点类型 + 'common_site_type_list' => [ + 0 => ['value' => 0, 'name' => '快递'], + 1 => ['value' => 1, 'name' => '展示'], + 2 => ['value' => 2, 'name' => '自提'], + 3 => ['value' => 3, 'name' => '虚拟售卖'], + 4 => ['value' => 4, 'name' => '快递+自提', 'is_ext' => 1], + ], + // 订单类型 + 'common_order_type_list' => [ + 0 => ['value' => 0, 'name' => '快递'], + 1 => ['value' => 1, 'name' => '展示'], + 2 => ['value' => 2, 'name' => '自提'], + 3 => ['value' => 3, 'name' => '虚拟销售'], + ], + // 下单站点类型列表 + 'common_buy_site_model_list' => [ + ['value' => 0, 'name' => '快递邮寄'], + ['value' => 2, 'name' => '自提点取货'], + ], + // 管理员状态 + 'common_admin_status_list' => [ + 0 => ['value' => 0, 'name' => '正常', 'checked' => true], + 1 => ['value' => 1, 'name' => '暂停'], + 2 => ['value' => 2, 'name' => '已离职'], + ], + // 支付日志状态 + 'common_pay_log_status_list' => [ + 0 => ['value' => 0, 'name' => '待支付', 'checked' => true], + 1 => ['value' => 1, 'name' => '已支付'], + 2 => ['value' => 2, 'name' => '已关闭'], + ], + // 商品参数组件类型 + 'common_goods_parameters_type_list' => [ + 0 => ['value' => 0, 'name' => '全部'], + 1 => ['value' => 1, 'name' => '详情', 'checked' => true], + 2 => ['value' => 2, 'name' => '基础'], + ], + // 商品关联排序类型 + 'goods_order_by_type_list' => [ + 0 => ['value' => 'g.access_count,g.sales_count,g.id', 'name' => '综合', 'checked' => true], + 1 => ['value' => 'g.sales_count', 'name' => '销量'], + 2 => ['value' => 'g.access_count', 'name' => '热度'], + 3 => ['value' => 'g.min_price', 'name' => '价格'], + 4 => ['value' => 'g.id', 'name' => '最新'], + ], + // 商品关联排序规则 + 'goods_order_by_rule_list' => [ + 0 => ['value' => 'desc', 'name' => '降序(desc)', 'checked' => true], + 1 => ['value' => 'asc', 'name' => '升序(asc)'], + ], + // 首页数据类型 + 'common_site_floor_data_type_list' => [ + 0 => ['value' => 0, 'name' => '自动模式', 'checked' => true], + 1 => ['value' => 1, 'name' => '手动模式'], + 2 => ['value' => 2, 'name' => '拖拽模式'], + ], + // 文件上传错误码 + 'common_file_upload_error_list' => [ + 1 => '文件大小超过服务器允许上传的最大值', + 2 => '文件大小超出浏览器限制,查看是否超过[站点设置->附件最大限制]', + 3 => '文件仅部分被上传', + 4 => '没有找到要上传的文件', + 5 => '没有找到服务器临时文件夹', + 6 => '文件写入到临时文件夹出错 ', + 7 => '文件写入失败', + 8 => '文件上传扩展没有打开', + ], + // -------------------- 后端相关 -------------------- + // 图片验证码 + 'site_images_verify_rules_list' => [ + 0 => ['value' => 'bgcolor', 'name' => '彩色背景'], + 1 => ['value' => 'textcolor', 'name' => '彩色文本'], + 2 => ['value' => 'point', 'name' => '干扰点'], + 3 => ['value' => 'line', 'name' => '干扰线'], + ], + // 时区 + 'site_timezone_list' => [ + 'Pacific/Pago_Pago' => '(标准时-11:00) 中途岛、萨摩亚群岛', + 'Pacific/Rarotonga' => '(标准时-10:00) 夏威夷', + 'Pacific/Gambier' => '(标准时-9:00) 阿拉斯加', + 'America/Dawson' => '(标准时-8:00) 太平洋时间(美国和加拿大)', + 'America/Creston' => '(标准时-7:00) 山地时间(美国和加拿大)', + 'America/Belize' => '(标准时-6:00) 中部时间(美国和加拿大)、墨西哥城', + 'America/Eirunepe' => '(标准时-5:00) 东部时间(美国和加拿大)、波哥大', + 'America/Antigua' => '(标准时-4:00) 大西洋时间(加拿大)、加拉加斯', + 'America/Argentina/Buenos_Aires' => '(标准时-3:00) 巴西、布宜诺斯艾利斯、乔治敦', + 'America/Noronha' => '(标准时-2:00) 中大西洋', + 'Atlantic/Cape_Verde' => '(标准时-1:00) 亚速尔群岛、佛得角群岛', + 'Africa/Ouagadougou' => '(格林尼治标准时) 西欧时间、伦敦、卡萨布兰卡', + 'Europe/Andorra' => '(标准时+1:00) 中欧时间、安哥拉、利比亚', + 'Europe/Mariehamn' => '(标准时+2:00) 东欧时间、开罗,雅典', + 'Asia/Bahrain' => '(标准时+3:00) 巴格达、科威特、莫斯科', + 'Asia/Dubai' => '(标准时+4:00) 阿布扎比、马斯喀特、巴库', + 'Asia/Kolkata' => '(标准时+5:00) 叶卡捷琳堡、伊斯兰堡、卡拉奇', + 'Asia/Dhaka' => '(标准时+6:00) 阿拉木图、 达卡、新亚伯利亚', + 'Indian/Christmas' => '(标准时+7:00) 曼谷、河内、雅加达', + 'Asia/Shanghai' => '(标准时+8:00)北京、重庆、香港、新加坡', + 'Australia/Darwin' => '(标准时+9:00) 东京、汉城、大阪、雅库茨克', + 'Australia/Adelaide' => '(标准时+10:00) 悉尼、关岛', + 'Australia/Currie' => '(标准时+11:00) 马加丹、索罗门群岛', + 'Pacific/Fiji' => '(标准时+12:00) 奥克兰、惠灵顿、堪察加半岛' + ], + // seo + // url模式列表 + 'seo_url_model_list' => [ + 0 => ['value' => 0, 'name' => '兼容模式', 'checked' => true], + 1 => ['value' => 1, 'name' => 'PATHINFO模式'], + 2 => ['value' => 2, 'name' => 'PATHINFO模式+短地址'], ], ]; ?> \ No newline at end of file diff --git a/app/layout/index.html b/app/layout/index.html new file mode 100644 index 000000000..e69de29bb diff --git a/app/layout/service/BaseLayout.php b/app/layout/service/BaseLayout.php index 608d6734b..927d38f44 100644 --- a/app/layout/service/BaseLayout.php +++ b/app/layout/service/BaseLayout.php @@ -955,8 +955,8 @@ class BaseLayout } // 排序处理 - $order_by_type_list = MyConst('goods_order_by_type_list'); - $order_by_rule_list = MyConst('goods_order_by_rule_list'); + $order_by_type_list = MyLang('goods_order_by_type_list'); + $order_by_rule_list = MyLang('goods_order_by_rule_list'); // 排序类型 $order_by_type = empty($params['order_by_type']) ? $order_by_type_list[0]['value'] : (array_key_exists($params['order_by_type'], $order_by_type_list) ? $order_by_type_list[$params['order_by_type']]['value'] : $order_by_type_list[0]['value']); diff --git a/app/layout/view/public/modal/modal_module_pages_select.html b/app/layout/view/public/modal/modal_module_pages_select.html index 4758a467d..8caf3fc1e 100644 --- a/app/layout/view/public/modal/modal_module_pages_select.html +++ b/app/layout/view/public/modal/modal_module_pages_select.html @@ -73,7 +73,7 @@
    - {{foreach :MyConst('common_platform_type') as $v}} + {{foreach :MyLang('common_platform_type') as $v}}
    diff --git a/app/module/FormHandleModule.php b/app/module/FormHandleModule.php index c107b3cc9..df11ca12b 100644 --- a/app/module/FormHandleModule.php +++ b/app/module/FormHandleModule.php @@ -871,6 +871,7 @@ class FormHandleModule */ public function FormConfigHandle() { + $lang = MyLang('form_table_search_first'); foreach($this->form_data['form'] as $k=>&$v) { // 基础字段处理 @@ -1038,7 +1039,7 @@ class FormHandleModule // 提示信息处理 if(empty($v['search_config']['placeholder'])) { - $v['search_config']['placeholder'] = '请输入'.$label; + $v['search_config']['placeholder'] = $lang['input'].$label; } break; @@ -1047,7 +1048,7 @@ class FormHandleModule // 提示信息处理 if(empty($v['search_config']['placeholder'])) { - $v['search_config']['placeholder'] = '请选择'.$label; + $v['search_config']['placeholder'] = $lang['select'].$label; } // 选择数据 key=>name @@ -1066,11 +1067,11 @@ class FormHandleModule // 提示信息处理 if(empty($v['search_config']['placeholder_min'])) { - $v['search_config']['placeholder_min'] = '最小值'; + $v['search_config']['placeholder_min'] = $lang['section_min']; } if(empty($v['search_config']['placeholder_max'])) { - $v['search_config']['placeholder_max'] = '最大值'; + $v['search_config']['placeholder_max'] = $lang['section_max']; } break; @@ -1080,11 +1081,11 @@ class FormHandleModule // 提示信息处理 if(empty($v['search_config']['placeholder_start'])) { - $v['search_config']['placeholder_start'] = '开始'; + $v['search_config']['placeholder_start'] = $lang['date_start']; } if(empty($v['search_config']['placeholder_end'])) { - $v['search_config']['placeholder_end'] = '结束'; + $v['search_config']['placeholder_end'] = $lang['date_end']; } break; @@ -1093,7 +1094,7 @@ class FormHandleModule // 提示信息处理 if(empty($v['search_config']['placeholder'])) { - $v['search_config']['placeholder'] = '请选择年月'; + $v['search_config']['placeholder'] = $lang['ym']; } break; } diff --git a/app/module/index.html b/app/module/index.html new file mode 100644 index 000000000..e69de29bb diff --git a/app/service/AdminPowerService.php b/app/service/AdminPowerService.php index 4aaf35b22..4ca76e6f6 100755 --- a/app/service/AdminPowerService.php +++ b/app/service/AdminPowerService.php @@ -132,15 +132,15 @@ class AdminPowerService $data['add_time'] = time(); if(Db::name('Power')->insertGetId($data) > 0) { - return DataReturn(MyLang('common.insert_success'), 0); + return DataReturn(MyLang('insert_success'), 0); } - return DataReturn(MyLang('common.insert_fail'), -100); + return DataReturn(MyLang('insert_fail'), -100); } else { if(Db::name('Power')->where(['id'=>intval($params['id'])])->update($data) !== false) { - return DataReturn(MyLang('common.update_success'), 0); + return DataReturn(MyLang('update_success'), 0); } - return DataReturn(MyLang('common.update_fail'), -100); + return DataReturn(MyLang('update_fail'), -100); } } @@ -165,9 +165,9 @@ class AdminPowerService // 清除用户权限数据 self::PowerCacheDelete(); - return DataReturn(MyLang('common.delete_success'), 0); + return DataReturn(MyLang('delete_success'), 0); } - return DataReturn(MyLang('common.delete_fail'), -100); + return DataReturn(MyLang('delete_fail'), -100); } /** diff --git a/app/service/AdminRoleService.php b/app/service/AdminRoleService.php index 758589c2a..dca2dd51c 100644 --- a/app/service/AdminRoleService.php +++ b/app/service/AdminRoleService.php @@ -41,7 +41,7 @@ class AdminRoleService // 获取角色列表 $data = Db::name('Role')->field($field)->where($where)->order($order_by)->limit($m, $n)->select()->toArray(); - return DataReturn(MyLang('common.handle_success'), 0, self::RoleListHandle($data, $params)); + return DataReturn(MyLang('handle_success'), 0, self::RoleListHandle($data, $params)); } /** @@ -143,9 +143,9 @@ class AdminRoleService // 数据更新 if(Db::name('Role')->where(['id'=>intval($params['id'])])->update(['is_enable'=>intval($params['state'])])) { - return DataReturn(MyLang('common.edit_success'), 0); + return DataReturn(MyLang('edit_success'), 0); } - return DataReturn(MyLang('common.edit_fail'), -100); + return DataReturn(MyLang('edit_fail'), -100); } /** @@ -351,7 +351,7 @@ class AdminRoleService // 清除用户权限数据 AdminPowerService::PowerCacheDelete(); - return DataReturn(MyLang('common.operate_success'), 0); + return DataReturn(MyLang('operate_success'), 0); } catch(\Exception $e) { Db::rollback(); return DataReturn($e->getMessage(), -1); @@ -397,11 +397,11 @@ class AdminRoleService // 清除用户权限数据 AdminPowerService::PowerCacheDelete(); - return DataReturn(MyLang('common.delete_success'), 0); + return DataReturn(MyLang('delete_success'), 0); } Db::rollback(); - return DataReturn(MyLang('common.delete_fail'), -100); + return DataReturn(MyLang('delete_fail'), -100); } /** diff --git a/app/service/AdminService.php b/app/service/AdminService.php index 54b668283..3a143048d 100755 --- a/app/service/AdminService.php +++ b/app/service/AdminService.php @@ -44,8 +44,8 @@ class AdminService $roles = Db::name('Role')->where('id', 'in', array_column($data, 'role_id'))->column('name', 'id'); // 数据处理 - $common_gender_list = MyConst('common_gender_list'); - $common_admin_status_list = MyConst('common_admin_status_list'); + $common_gender_list = MyLang('common_gender_list'); + $common_admin_status_list = MyLang('common_admin_status_list'); foreach($data as &$v) { // 所在角色组 @@ -79,7 +79,7 @@ class AdminService $where = empty($params['where']) ? [] : $params['where']; $field = empty($params['field']) ? '*' : $params['field']; $data = Db::name('Role')->field($field)->where($where)->select()->toArray(); - return DataReturn(MyLang('common.handle_success'), 0, $data); + return DataReturn(MyLang('handle_success'), 0, $data); } /** @@ -122,7 +122,7 @@ class AdminService [ 'checked_type' => 'in', 'key_name' => 'status', - 'checked_data' => array_column(MyConst('common_admin_status_list'), 'value'), + 'checked_data' => array_column(MyLang('common_admin_status_list'), 'value'), 'error_msg' => '状态值范围不正确', ], [ @@ -295,9 +295,9 @@ class AdminService self::LoginLogout(); } - return DataReturn(MyLang('common.edit_success'), 0); + return DataReturn(MyLang('edit_success'), 0); } - return DataReturn(MyLang('common.edit_fail'), -100); + return DataReturn(MyLang('edit_fail'), -100); } /** @@ -330,9 +330,9 @@ class AdminService // 删除操作 if(Db::name('Admin')->where(['id'=>$params['ids']])->delete()) { - return DataReturn(MyLang('common.delete_success'), 0); + return DataReturn(MyLang('delete_success'), 0); } - return DataReturn(MyLang('common.delete_fail'), -100); + return DataReturn(MyLang('delete_fail'), -100); } /** @@ -350,7 +350,7 @@ class AdminService [ 'checked_type' => 'in', 'key_name' => 'type', - 'checked_data' => array_column(MyConst('common_login_type_list'), 'value'), + 'checked_data' => array_column(MyLang('common_login_type_list'), 'value'), 'error_msg' => '登录类型有误', ], [ @@ -564,7 +564,7 @@ class AdminService [ 'checked_type' => 'in', 'key_name' => 'type', - 'checked_data' => array_column(MyConst('common_login_type_list'), 'value'), + 'checked_data' => array_column(MyLang('common_login_type_list'), 'value'), 'error_msg' => '登录类型有误', ], ]; @@ -640,9 +640,9 @@ class AdminService $verify['data']->Remove(); } - return DataReturn(MyLang('common.send_success'), 0); + return DataReturn(MyLang('send_success'), 0); } - return DataReturn(MyLang('common.send_fail').'['.$obj->error.']', -100); + return DataReturn(MyLang('send_fail').'['.$obj->error.']', -100); } /** @@ -707,7 +707,7 @@ class AdminService $field = 'username'; break; } - return DataReturn(MyLang('common.operate_success'), 0, $field); + return DataReturn(MyLang('operate_success'), 0, $field); } /** diff --git a/app/service/AnswerService.php b/app/service/AnswerService.php index 9b016f405..9efdcbf93 100755 --- a/app/service/AnswerService.php +++ b/app/service/AnswerService.php @@ -57,7 +57,7 @@ class AnswerService // 获取数据列表 $data = Db::name('Answer')->field($field)->where($where)->limit($m, $n)->order($order_by)->select()->toArray(); - return DataReturn(MyLang('common.handle_success'), 0, self::AnswerListHandle($data, $params)); + return DataReturn(MyLang('handle_success'), 0, self::AnswerListHandle($data, $params)); } /** @@ -279,9 +279,9 @@ class AnswerService $data['upd_time'] = time(); if(Db::name('Answer')->where(['id'=>intval($params['id'])])->update($data)) { - return DataReturn(MyLang('common.edit_success'), 0); + return DataReturn(MyLang('edit_success'), 0); } - return DataReturn(MyLang('common.edit_fail'), -100); + return DataReturn(MyLang('edit_fail'), -100); } } @@ -339,9 +339,9 @@ class AnswerService // 开始删除 if(Db::name('Answer')->where($where)->delete()) { - return DataReturn(MyLang('common.delete_success'), 0); + return DataReturn(MyLang('delete_success'), 0); } - return DataReturn(MyLang('common.delete_fail'), -1); + return DataReturn(MyLang('delete_fail'), -1); } /** @@ -400,9 +400,9 @@ class AnswerService ]; if(Db::name('Answer')->where($where)->update($data)) { - return DataReturn(MyLang('common.operate_success'), 0); + return DataReturn(MyLang('operate_success'), 0); } - return DataReturn(MyLang('common.operate_fail'), -100); + return DataReturn(MyLang('operate_fail'), -100); } /** @@ -443,9 +443,9 @@ class AnswerService // 数据更新 if(Db::name('Answer')->where(['id'=>intval($params['id'])])->update([$params['field']=>intval($params['state']), 'upd_time'=>time()])) { - return DataReturn(MyLang('common.edit_success'), 0); + return DataReturn(MyLang('edit_success'), 0); } - return DataReturn(MyLang('common.edit_fail'), -100); + return DataReturn(MyLang('edit_fail'), -100); } /** diff --git a/app/service/AppCenterNavService.php b/app/service/AppCenterNavService.php index db5a5fbf2..9d35097e0 100755 --- a/app/service/AppCenterNavService.php +++ b/app/service/AppCenterNavService.php @@ -37,8 +37,8 @@ class AppCenterNavService { if(!empty($data)) { - $common_platform_type = MyConst('common_platform_type'); - $common_app_event_type = MyConst('common_app_event_type'); + $common_platform_type = MyLang('common_platform_type'); + $common_app_event_type = MyLang('common_app_event_type'); foreach($data as &$v) { // 平台类型 @@ -95,13 +95,13 @@ class AppCenterNavService [ 'checked_type' => 'in', 'key_name' => 'platform', - 'checked_data' => array_column(MyConst('common_platform_type'), 'value'), + 'checked_data' => array_column(MyLang('common_platform_type'), 'value'), 'error_msg' => '平台类型有误', ], [ 'checked_type' => 'in', 'key_name' => 'event_type', - 'checked_data' => array_column(MyConst('common_app_event_type'), 'value'), + 'checked_data' => array_column(MyLang('common_app_event_type'), 'value'), 'is_checked' => 2, 'error_msg' => '事件值类型有误', ], @@ -157,16 +157,16 @@ class AppCenterNavService $data['add_time'] = time(); if(Db::name('AppCenterNav')->insertGetId($data) > 0) { - return DataReturn(MyLang('common.insert_success'), 0); + return DataReturn(MyLang('insert_success'), 0); } - return DataReturn(MyLang('common.insert_fail'), -100); + return DataReturn(MyLang('insert_fail'), -100); } else { $data['upd_time'] = time(); if(Db::name('AppCenterNav')->where(['id'=>intval($params['id'])])->update($data)) { - return DataReturn(MyLang('common.edit_success'), 0); + return DataReturn(MyLang('edit_success'), 0); } - return DataReturn(MyLang('common.edit_fail'), -100); + return DataReturn(MyLang('edit_fail'), -100); } } @@ -195,10 +195,10 @@ class AppCenterNavService // 删除操作 if(Db::name('AppCenterNav')->where(['id'=>$params['ids']])->delete()) { - return DataReturn(MyLang('common.delete_success'), 0); + return DataReturn(MyLang('delete_success'), 0); } - return DataReturn(MyLang('common.delete_fail'), -100); + return DataReturn(MyLang('delete_fail'), -100); } /** @@ -239,9 +239,9 @@ class AppCenterNavService // 数据更新 if(Db::name('AppCenterNav')->where(['id'=>intval($params['id'])])->update([$params['field']=>intval($params['state']), 'upd_time'=>time()])) { - return DataReturn(MyLang('common.operate_success'), 0); + return DataReturn(MyLang('operate_success'), 0); } - return DataReturn(MyLang('common.operate_fail'), -100); + return DataReturn(MyLang('operate_fail'), -100); } /** diff --git a/app/service/AppHomeNavService.php b/app/service/AppHomeNavService.php index e08acacbb..f4a60c578 100755 --- a/app/service/AppHomeNavService.php +++ b/app/service/AppHomeNavService.php @@ -37,8 +37,8 @@ class AppHomeNavService { if(!empty($data)) { - $common_platform_type = MyConst('common_platform_type'); - $common_app_event_type = MyConst('common_app_event_type'); + $common_platform_type = MyLang('common_platform_type'); + $common_app_event_type = MyLang('common_app_event_type'); foreach($data as &$v) { // 平台类型 @@ -95,13 +95,13 @@ class AppHomeNavService [ 'checked_type' => 'in', 'key_name' => 'platform', - 'checked_data' => array_column(MyConst('common_platform_type'), 'value'), + 'checked_data' => array_column(MyLang('common_platform_type'), 'value'), 'error_msg' => '平台类型有误', ], [ 'checked_type' => 'in', 'key_name' => 'event_type', - 'checked_data' => array_column(MyConst('common_app_event_type'), 'value'), + 'checked_data' => array_column(MyLang('common_app_event_type'), 'value'), 'is_checked' => 2, 'error_msg' => '事件值类型有误', ], @@ -152,16 +152,16 @@ class AppHomeNavService $data['add_time'] = time(); if(Db::name('AppHomeNav')->insertGetId($data) > 0) { - return DataReturn(MyLang('common.insert_success'), 0); + return DataReturn(MyLang('insert_success'), 0); } - return DataReturn(MyLang('common.insert_fail'), -100); + return DataReturn(MyLang('insert_fail'), -100); } else { $data['upd_time'] = time(); if(Db::name('AppHomeNav')->where(['id'=>intval($params['id'])])->update($data)) { - return DataReturn(MyLang('common.edit_success'), 0); + return DataReturn(MyLang('edit_success'), 0); } - return DataReturn(MyLang('common.edit_fail'), -100); + return DataReturn(MyLang('edit_fail'), -100); } } @@ -190,10 +190,10 @@ class AppHomeNavService // 删除操作 if(Db::name('AppHomeNav')->where(['id'=>$params['ids']])->delete()) { - return DataReturn(MyLang('common.delete_success'), 0); + return DataReturn(MyLang('delete_success'), 0); } - return DataReturn(MyLang('common.delete_fail'), -100); + return DataReturn(MyLang('delete_fail'), -100); } /** @@ -234,9 +234,9 @@ class AppHomeNavService // 数据更新 if(Db::name('AppHomeNav')->where(['id'=>intval($params['id'])])->update([$params['field']=>intval($params['state']), 'upd_time'=>time()])) { - return DataReturn(MyLang('common.operate_success'), 0); + return DataReturn(MyLang('operate_success'), 0); } - return DataReturn(MyLang('common.operate_fail'), -100); + return DataReturn(MyLang('operate_fail'), -100); } /** diff --git a/app/service/AppMiniService.php b/app/service/AppMiniService.php index b179a5787..26c09a8b9 100755 --- a/app/service/AppMiniService.php +++ b/app/service/AppMiniService.php @@ -50,7 +50,7 @@ class AppMiniService self::$application_name = isset($params['application_name']) ? $params['application_name'] : 'weixin'; // 小程序类型校验 - if(!array_key_exists(self::$application_name, MyConst('common_appmini_type'))) + if(!array_key_exists(self::$application_name, MyLang('common_appmini_type'))) { return DataReturn('小程序类型有误['.self::$application_name.']', -1); } @@ -340,7 +340,7 @@ class AppMiniService // 开始删除主题 if(\base\FileUtil::UnlinkDir(self::$old_path.DS.$id)) { - return DataReturn(MyLang('common.delete_success'), 0); + return DataReturn(MyLang('delete_success'), 0); } return DataReturn('删除失败或资源不存在', -100); } @@ -430,7 +430,7 @@ class AppMiniService \base\FileUtil::UnlinkDir($new_dir); // 开始下载 - $appmini_type = MyConst('common_appmini_type'); + $appmini_type = MyLang('common_appmini_type'); $application_name = array_key_exists(self::$application_name, $appmini_type) ? $appmini_type[self::$application_name]['name'].'-' : ''; if(\base\FileUtil::DownloadFile($new_dir.'.zip', $application_name.$config['name'].'_v'.$config['ver'].'.zip')) { @@ -628,7 +628,7 @@ class AppMiniService // 默认 default : - $ret = DataReturn(MyLang('common.handle_noneed'), 0); + $ret = DataReturn(MyLang('handle_noneed'), 0); } if(isset($ret['code']) && $ret['code'] != 0) { @@ -652,7 +652,7 @@ class AppMiniService // 生成成功删除目录 \base\FileUtil::UnlinkDir($new_dir); - return DataReturn(MyLang('common.created_success'), 0); + return DataReturn(MyLang('created_success'), 0); } /** @@ -788,13 +788,13 @@ class AppMiniService // 成功 if($sucs == count($params['ids'])) { - return DataReturn(MyLang('common.delete_success'), 0); + return DataReturn(MyLang('delete_success'), 0); } // 失败 if($fail == count($params['ids'])) { - return DataReturn(MyLang('common.delete_fail'), -100); + return DataReturn(MyLang('delete_fail'), -100); } return DataReturn('成功['.$sucs.'],失败['.$fail.']'); diff --git a/app/service/AppMiniUserService.php b/app/service/AppMiniUserService.php index 75c8ab4a5..4e6010b7b 100644 --- a/app/service/AppMiniUserService.php +++ b/app/service/AppMiniUserService.php @@ -134,7 +134,7 @@ class AppMiniUserService $ret = UserService::UserStatusCheck('id', $user['id']); if($ret['code'] == 0) { - $ret = DataReturn(MyLang('common.auth_success'), 0, $user); + $ret = DataReturn(MyLang('auth_success'), 0, $user); } } } else { @@ -266,7 +266,7 @@ class AppMiniUserService $ret = UserService::UserStatusCheck('id', $user['id']); if($ret['code'] == 0) { - $ret = DataReturn(MyLang('common.auth_success'), 0, $user); + $ret = DataReturn(MyLang('auth_success'), 0, $user); } } } else { @@ -387,7 +387,7 @@ class AppMiniUserService $ret = UserService::UserStatusCheck('id', $user['id']); if($ret['code'] == 0) { - $ret = DataReturn(MyLang('common.auth_success'), 0, $user); + $ret = DataReturn(MyLang('auth_success'), 0, $user); } } } else { @@ -510,7 +510,7 @@ class AppMiniUserService $ret = UserService::UserStatusCheck('id', $user['id']); if($ret['code'] == 0) { - $ret = DataReturn(MyLang('common.auth_success'), 0, $user); + $ret = DataReturn(MyLang('auth_success'), 0, $user); } } } else { @@ -599,7 +599,7 @@ class AppMiniUserService $ret = UserService::UserStatusCheck('id', $user['id']); if($ret['code'] == 0) { - $ret = DataReturn(MyLang('common.auth_success'), 0, $user); + $ret = DataReturn(MyLang('auth_success'), 0, $user); } } } else { @@ -750,7 +750,7 @@ class AppMiniUserService $ret = UserService::UserStatusCheck('id', $user['id']); if($ret['code'] == 0) { - $ret = DataReturn(MyLang('common.auth_success'), 0, $user); + $ret = DataReturn(MyLang('auth_success'), 0, $user); } } } else { diff --git a/app/service/ArticleService.php b/app/service/ArticleService.php index a8efc4dca..f8e144dfc 100755 --- a/app/service/ArticleService.php +++ b/app/service/ArticleService.php @@ -73,7 +73,7 @@ class ArticleService $n = isset($params['n']) ? intval($params['n']) : 10; $data = Db::name('Article')->field($field)->where($where)->order($order_by)->limit($m, $n)->select()->toArray(); - return DataReturn(MyLang('common.handle_success'), 0, self::ArticleListHandle($data, $params)); + return DataReturn(MyLang('handle_success'), 0, self::ArticleListHandle($data, $params)); } /** @@ -289,14 +289,14 @@ class ArticleService $article_id = Db::name('Article')->insertGetId($data); if($article_id <= 0) { - return DataReturn(MyLang('common.insert_fail'), -100); + return DataReturn(MyLang('insert_fail'), -100); } } else { $data['upd_time'] = time(); $article_id = intval($params['id']); if(!Db::name('Article')->where(['id'=>$article_id])->update($data)) { - return DataReturn(MyLang('common.edit_fail'), -100); + return DataReturn(MyLang('edit_fail'), -100); } } @@ -310,7 +310,7 @@ class ArticleService 'article_id' => $article_id, ]); - return DataReturn(MyLang('common.operate_success'), 0); + return DataReturn(MyLang('operate_success'), 0); } /** @@ -345,7 +345,7 @@ class ArticleService $field = empty($params['field']) ? '*' : $params['field']; $order_by = empty($params['order_by']) ? 'sort asc' : trim($params['order_by']); $data = Db::name('ArticleCategory')->where(['is_enable'=>1])->field($field)->order($order_by)->select()->toArray(); - return DataReturn(MyLang('common.handle_success'), 0, self::CategoryDataHandle($data)); + return DataReturn(MyLang('handle_success'), 0, self::CategoryDataHandle($data)); } /** @@ -423,10 +423,10 @@ class ArticleService // 删除操作 if(Db::name('Article')->where(['id'=>$params['ids']])->delete()) { - return DataReturn(MyLang('common.delete_success'), 0); + return DataReturn(MyLang('delete_success'), 0); } - return DataReturn(MyLang('common.delete_fail'), -100); + return DataReturn(MyLang('delete_fail'), -100); } /** @@ -467,9 +467,9 @@ class ArticleService // 数据更新 if(Db::name('Article')->where(['id'=>intval($params['id'])])->update([$params['field']=>intval($params['state']), 'upd_time'=>time()])) { - return DataReturn(MyLang('common.edit_success'), 0); + return DataReturn(MyLang('edit_success'), 0); } - return DataReturn(MyLang('common.edit_fail'), -100); + return DataReturn(MyLang('edit_fail'), -100); } /** @@ -495,9 +495,9 @@ class ArticleService $v['is_son'] = (Db::name('ArticleCategory')->where(['pid'=>$v['id']])->count() > 0) ? 'ok' : 'no'; $v['json'] = json_encode($v); } - return DataReturn(MyLang('common.operate_success'), 0, $data); + return DataReturn(MyLang('operate_success'), 0, $data); } - return DataReturn(MyLang('common.no_data'), -100); + return DataReturn(MyLang('no_data'), -100); } /** @@ -540,19 +540,19 @@ class ArticleService $data['id'] = Db::name('ArticleCategory')->insertGetId($data); if($data['id'] <= 0) { - return DataReturn(MyLang('common.insert_fail'), -100); + return DataReturn(MyLang('insert_fail'), -100); } } else { $data['upd_time'] = time(); if(Db::name('ArticleCategory')->where(['id'=>intval($params['id'])])->update($data) === false) { - return DataReturn(MyLang('common.edit_fail'), -100); + return DataReturn(MyLang('edit_fail'), -100); } else { $data['id'] = $params['id']; } } - return DataReturn(MyLang('common.operate_success'), 0, $data); + return DataReturn(MyLang('operate_success'), 0, $data); } /** @@ -587,9 +587,9 @@ class ArticleService // 开始删除 if(Db::name('ArticleCategory')->where(['id'=>intval($params['id'])])->delete()) { - return DataReturn(MyLang('common.delete_success'), 0); + return DataReturn(MyLang('delete_success'), 0); } - return DataReturn(MyLang('common.delete_fail'), -100); + return DataReturn(MyLang('delete_fail'), -100); } /** @@ -654,7 +654,7 @@ class ArticleService $v['items'] = $items; } } - return DataReturn(MyLang('common.handle_success'), 0, $data); + return DataReturn(MyLang('handle_success'), 0, $data); } } ?> \ No newline at end of file diff --git a/app/service/BrandCategoryService.php b/app/service/BrandCategoryService.php index 76cdf78f9..2dc8a64e7 100644 --- a/app/service/BrandCategoryService.php +++ b/app/service/BrandCategoryService.php @@ -37,7 +37,7 @@ class BrandCategoryService $data = Db::name('BrandCategory')->where(['is_enable'=>1])->field($field)->order($order_by)->select()->toArray(); - return DataReturn(MyLang('common.handle_success'), 0, $data); + return DataReturn(MyLang('handle_success'), 0, $data); } /** @@ -62,9 +62,9 @@ class BrandCategoryService $v['delete_url'] = MyUrl('admin/brandcategory/delete'); $v['json'] = json_encode($v); } - return DataReturn(MyLang('common.operate_success'), 0, $data); + return DataReturn(MyLang('operate_success'), 0, $data); } - return DataReturn(MyLang('common.no_data'), -100); + return DataReturn(MyLang('no_data'), -100); } /** @@ -105,16 +105,16 @@ class BrandCategoryService $data['add_time'] = time(); if(Db::name('BrandCategory')->insertGetId($data) > 0) { - return DataReturn(MyLang('common.insert_success'), 0); + return DataReturn(MyLang('insert_success'), 0); } - return DataReturn(MyLang('common.insert_fail'), -100); + return DataReturn(MyLang('insert_fail'), -100); } else { $data['upd_time'] = time(); if(Db::name('BrandCategory')->where(['id'=>intval($params['id'])])->update($data)) { - return DataReturn(MyLang('common.edit_success'), 0); + return DataReturn(MyLang('edit_success'), 0); } - return DataReturn(MyLang('common.edit_fail'), -100); + return DataReturn(MyLang('edit_fail'), -100); } } @@ -150,9 +150,9 @@ class BrandCategoryService // 开始删除 if(Db::name('BrandCategory')->where(['id'=>intval($params['id'])])->delete()) { - return DataReturn(MyLang('common.delete_success'), 0); + return DataReturn(MyLang('delete_success'), 0); } - return DataReturn(MyLang('common.delete_fail'), -100); + return DataReturn(MyLang('delete_fail'), -100); } } ?> \ No newline at end of file diff --git a/app/service/BrandService.php b/app/service/BrandService.php index 00ad86ab6..7af33dd07 100755 --- a/app/service/BrandService.php +++ b/app/service/BrandService.php @@ -54,7 +54,7 @@ class BrandService // 获取列表 $data = Db::name('Brand')->where($where)->field($field)->order($order_by)->limit($m, $n)->select()->toArray(); - return DataReturn(MyLang('common.handle_success'), 0, self::BrandListHandle($data, $params)); + return DataReturn(MyLang('handle_success'), 0, self::BrandListHandle($data, $params)); } /** @@ -325,7 +325,7 @@ class BrandService if($brand_id <= 0) { Db::rollback(); - return DataReturn(MyLang('common.insert_fail'), -100); + return DataReturn(MyLang('insert_fail'), -100); } } else { $data['upd_time'] = time(); @@ -333,7 +333,7 @@ class BrandService if(Db::name('Brand')->where(['id'=>$brand_id])->update($data) === false) { Db::rollback(); - return DataReturn(MyLang('common.edit_fail'), -100); + return DataReturn(MyLang('edit_fail'), -100); } } @@ -348,7 +348,7 @@ class BrandService // 提交事务 Db::commit(); - return DataReturn(MyLang('common.operate_success'), 0); + return DataReturn(MyLang('operate_success'), 0); } /** @@ -379,7 +379,7 @@ class BrandService } } } - return DataReturn(MyLang('common.insert_success'), 0); + return DataReturn(MyLang('insert_success'), 0); } /** @@ -407,10 +407,10 @@ class BrandService // 删除操作 if(Db::name('Brand')->where(['id'=>$params['ids']])->delete()) { - return DataReturn(MyLang('common.delete_success'), 0); + return DataReturn(MyLang('delete_success'), 0); } - return DataReturn(MyLang('common.delete_fail'), -100); + return DataReturn(MyLang('delete_fail'), -100); } /** @@ -451,9 +451,9 @@ class BrandService // 数据更新 if(Db::name('Brand')->where(['id'=>intval($params['id'])])->update([$params['field']=>intval($params['state']), 'upd_time'=>time()])) { - return DataReturn(MyLang('common.operate_success'), 0); + return DataReturn(MyLang('operate_success'), 0); } - return DataReturn(MyLang('common.operate_fail'), -100); + return DataReturn(MyLang('operate_fail'), -100); } } ?> \ No newline at end of file diff --git a/app/service/BuyService.php b/app/service/BuyService.php index 1a9912401..63e44e962 100755 --- a/app/service/BuyService.php +++ b/app/service/BuyService.php @@ -470,7 +470,7 @@ class BuyService $result['base']['preferential_price'] = ($result['base']['preferential_price'] <= 0) ? 0.00 : PriceNumberFormat($result['base']['preferential_price']); $result['base']['increase_price'] = ($result['base']['increase_price'] <= 0) ? 0.00 : PriceNumberFormat($result['base']['increase_price']); - return DataReturn(MyLang('common.operate_success'), 0, $result); + return DataReturn(MyLang('operate_success'), 0, $result); } /** @@ -964,7 +964,7 @@ class BuyService ]); // 返回信息 - return DataReturn(MyLang('common.operate_success'), 0, $order_ids); + return DataReturn(MyLang('operate_success'), 0, $order_ids); } /** @@ -1030,7 +1030,7 @@ class BuyService $order_detail_id = Db::name('OrderDetail')->insertGetId($data); if($order_detail_id > 0) { - return DataReturn(MyLang('common.insert_success'), 0, $order_detail_id); + return DataReturn(MyLang('insert_success'), 0, $order_detail_id); } return DataReturn('订单详情添加失败', -1); } @@ -1071,7 +1071,7 @@ class BuyService // 添加订单虚拟数据 if(Db::name('OrderExtractionCode')->insertGetId($data) > 0) { - return DataReturn(MyLang('common.insert_success'), 0); + return DataReturn(MyLang('insert_success'), 0); } return DataReturn('订单取货码添加失败', -1); } @@ -1117,7 +1117,7 @@ class BuyService // 添加订单虚拟数据 if(Db::name('OrderFictitiousValue')->insertGetId($data) > 0) { - return DataReturn(MyLang('common.insert_success'), 0); + return DataReturn(MyLang('insert_success'), 0); } return DataReturn('订单虚拟信息添加失败', -1); } @@ -1176,7 +1176,7 @@ class BuyService // 添加订单地址 if(Db::name('OrderAddress')->insertGetId($data) > 0) { - return DataReturn(MyLang('common.insert_success'), 0); + return DataReturn(MyLang('insert_success'), 0); } return DataReturn('订单地址添加失败', -1); } @@ -1524,7 +1524,7 @@ class BuyService } } } - return DataReturn(MyLang('common.operate_success'), 0); + return DataReturn(MyLang('operate_success'), 0); } return DataReturn('没有需要扣除库存的数据', 0); } @@ -1639,7 +1639,7 @@ class BuyService } } } - return DataReturn(MyLang('common.operate_success'), 0); + return DataReturn(MyLang('operate_success'), 0); } return DataReturn('没有需要回滚的数据', 0); } @@ -1697,7 +1697,7 @@ class BuyService 'data' => &$result, ]); - return DataReturn(MyLang('common.operate_success'), 0, $result); + return DataReturn(MyLang('operate_success'), 0, $result); } /** diff --git a/app/service/ConfigService.php b/app/service/ConfigService.php index fa4e88e30..716653738 100755 --- a/app/service/ConfigService.php +++ b/app/service/ConfigService.php @@ -234,9 +234,9 @@ class ConfigService return $ret; } - return DataReturn(MyLang('common.operate_success').'['.$success.']'); + return DataReturn(MyLang('operate_success').'['.$success.']'); } - return DataReturn(MyLang('common.operate_fail'), -100); + return DataReturn(MyLang('operate_fail'), -100); } /** @@ -365,9 +365,9 @@ class ConfigService } } } - return DataReturn(MyLang('common.handle_success'), 0); + return DataReturn(MyLang('handle_success'), 0); } - return DataReturn(MyLang('common.handle_noneed'), 0); + return DataReturn(MyLang('handle_noneed'), 0); } /** @@ -400,7 +400,7 @@ class ConfigService MyCache($cache_key, $data); } - return DataReturn(MyLang('common.operate_success'), 0, $data); + return DataReturn(MyLang('operate_success'), 0, $data); } /** @@ -471,7 +471,7 @@ class ConfigService } } - return DataReturn(MyLang('common.operate_success'), 0, $data); + return DataReturn(MyLang('operate_success'), 0, $data); } /** @@ -495,7 +495,7 @@ class ConfigService 'title' => $title, 'tips' => str_replace("\n", '
    ', $tips), ]; - return DataReturn(MyLang('common.operate_success'), 0, $result); + return DataReturn(MyLang('operate_success'), 0, $result); } /** diff --git a/app/service/ConstService.php b/app/service/ConstService.php index 6759c9f7a..75f68fbc9 100644 --- a/app/service/ConstService.php +++ b/app/service/ConstService.php @@ -120,421 +120,51 @@ class ConstService '2.3.2' => ['value' => '2.3.2', 'name' => 'v2.3.2'], ], - // 用户注册类型列表 - 'common_user_reg_type_list' => [ - 0 => ['value' => 'username', 'name' => '账号'], - 1 => ['value' => 'sms', 'name' => '短信'], - 2 => ['value' => 'email', 'name' => '邮箱'], - ], - - // 登录方式 - 'common_login_type_list' => [ - 0 => ['value' => 'username', 'name' => '帐号密码', 'checked' => true], - 1 => ['value' => 'email', 'name' => '邮箱验证码'], - 2 => ['value' => 'sms', 'name' => '手机验证码'], - ], - - // 性别 - 'common_gender_list' => [ - 0 => ['id' => 0, 'name' => '保密', 'checked' => true], - 1 => ['id' => 1, 'name' => '女'], - 2 => ['id' => 2, 'name' => '男'], - ], - - // 关闭开启状态 - 'common_close_open_list' => [ - 0 => ['value' => 0, 'name' => '关闭'], - 1 => ['value' => 1, 'name' => '开启'], - ], - - // 是否启用 - 'common_is_enable_tips' => [ - 0 => ['id' => 0, 'name' => '未启用'], - 1 => ['id' => 1, 'name' => '已启用'], - ], - 'common_is_enable_list' => [ - 0 => ['id' => 0, 'name' => '不启用'], - 1 => ['id' => 1, 'name' => '启用', 'checked' => true], - ], - - // 是否显示 - 'common_is_show_list' => [ - 0 => ['id' => 0, 'name' => '不显示'], - 1 => ['id' => 1, 'name' => '显示', 'checked' => true], - ], - - // 状态 - 'common_state_list' => [ - 0 => ['id' => 0, 'name' => '不可用'], - 1 => ['id' => 1, 'name' => '可用', 'checked' => true], - ], - - // excel编码列表 - 'common_excel_charset_list' => [ - 0 => ['id' => 0, 'value' => 'utf-8', 'name' => 'utf-8', 'checked' => true], - 1 => ['id' => 1, 'value' => 'gbk', 'name' => 'gbk'], - ], - - // excel导出类型列表 - 'common_excel_export_type_list' => [ - 0 => ['id' => 0, 'name' => 'CSV', 'checked' => true], - 1 => ['id' => 1, 'name' => 'Excel'], - ], - - // 地图类型列表 - 'common_map_type_list' => [ - 'baidu' => ['id' => 'baidu', 'name' => '百度地图', 'checked' => true], - 'amap' => ['id' => 'amap', 'name' => '高德地图'], - 'tencent' => ['id' => 'tencent', 'name' => '腾讯地图'], - 'tianditu' => ['id' => 'tianditu', 'name' => '天地图'], - ], - - // 支付支付状态 - 'common_order_pay_status' => [ - 0 => ['id' => 0, 'name' => '待支付', 'checked' => true], - 1 => ['id' => 1, 'name' => '已支付'], - 2 => ['id' => 2, 'name' => '已退款'], - 3 => ['id' => 3, 'name' => '部分退款'], - ], - - // 订单状态 - 'common_order_status' => [ - 0 => ['id' => 0, 'name' => '待确认', 'checked' => true], - 1 => ['id' => 1, 'name' => '待付款'], - 2 => ['id' => 2, 'name' => '待发货'], - 3 => ['id' => 3, 'name' => '待收货'], - 4 => ['id' => 4, 'name' => '已完成'], - 5 => ['id' => 5, 'name' => '已取消'], - 6 => ['id' => 6, 'name' => '已关闭'], - ], - - // 所属平台 - 'common_platform_type' => [ - 'pc' => ['value' => 'pc', 'name' => 'PC网站'], - 'h5' => ['value' => 'h5', 'name' => 'H5手机网站'], - 'ios' => ['value' => 'ios', 'name' => '苹果APP'], - 'android' => ['value' => 'android', 'name' => '安卓APP'], - 'weixin' => ['value' => 'weixin', 'name' => '微信小程序'], - 'alipay' => ['value' => 'alipay', 'name' => '支付宝小程序'], - 'baidu' => ['value' => 'baidu', 'name' => '百度小程序'], - 'toutiao' => ['value' => 'toutiao', 'name' => '头条小程序'], - 'qq' => ['value' => 'qq', 'name' => 'QQ小程序'], - 'kuaishou' => ['value' => 'kuaishou', 'name' => '快手小程序'], - ], - - // app平台 - 'common_app_type' => [ - 'ios' => ['value' => 'ios', 'name' => '苹果APP'], - 'android' => ['value' => 'android', 'name' => '安卓APP'], - ], - - // 小程序平台 - 'common_appmini_type' => [ - 'weixin' => ['value' => 'weixin', 'name' => '微信小程序'], - 'alipay' => ['value' => 'alipay', 'name' => '支付宝小程序'], - 'baidu' => ['value' => 'baidu', 'name' => '百度小程序'], - 'toutiao' => ['value' => 'toutiao', 'name' => '头条小程序'], - 'qq' => ['value' => 'qq', 'name' => 'QQ小程序'], - 'kuaishou' => ['value' => 'kuaishou', 'name' => '快手小程序'], - ], - - // 扣除库存规则 - 'common_deduction_inventory_rules_list' => [ - 0 => ['id' => 0, 'name' => '订单确认成功'], - 1 => ['id' => 1, 'name' => '订单支付成功'], - 2 => ['id' => 2, 'name' => '订单发货'], - ], - - // 商品增加销量规则 - 'common_sales_count_inc_rules_list' => [ - 0 => ['id' => 0, 'name' => '订单支付'], - 1 => ['id' => 1, 'name' => '订单收货'], - ], - - // 是否已读 - 'common_is_read_list' => [ - 0 => ['id' => 0, 'name' => '未读', 'checked' => true], - 1 => ['id' => 1, 'name' => '已读'], - ], - - // 消息类型 - 'common_message_type_list' => [ - 0 => ['id' => 0, 'name' => '默认', 'checked' => true], - ], - - // 用户积分 - 操作类型 - 'common_integral_log_type_list' => [ - 0 => ['id' => 0, 'name' => '减少', 'checked' => true], - 1 => ['id' => 1, 'name' => '增加'], - ], - - // 是否上架/下架 - 'common_is_shelves_list' => [ - 0 => ['id' => 0, 'name' => '下架'], - 1 => ['id' => 1, 'name' => '上架', 'checked' => true], - ], - - // 是否 - 'common_is_text_list' => [ - 0 => ['id' => 0, 'name' => '否', 'checked' => true], - 1 => ['id' => 1, 'name' => '是'], - ], - - // 用户状态 - 'common_user_status_list' => [ - 0 => ['id' => 0, 'name' => '正常', 'checked' => true], - 1 => ['id' => 1, 'name' => '禁止发言', 'tips' => '用户被禁止发言'], - 2 => ['id' => 2, 'name' => '禁止登录', 'tips' => '用户被禁止登录'], - 3 => ['id' => 3, 'name' => '待审核', 'tips' => '用户等待审核中'], - ], - - // 导航数据类型 - 'common_nav_type_list' => [ - 'custom' => ['value'=>'custom', 'name'=>'自定义'], - 'article' => ['value'=>'article', 'name'=>'文章'], - 'customview' => ['value'=>'customview', 'name'=>'自定义页面'], - 'goods_category' => ['value'=>'goods_category', 'name'=>'商品分类'], - ], - - // 搜索框下热门关键字类型 - 'common_search_keywords_type_list' => [ - 0 => ['value' => 0, 'name' => '关闭'], - 1 => ['value' => 1, 'name' => '自动'], - 2 => ['value' => 2, 'name' => '自定义'], - ], - - // app事件类型 - 'common_app_event_type' => [ - 0 => ['value' => 0, 'name' => 'WEB页面'], - 1 => ['value' => 1, 'name' => '内部页面(小程序/APP内部地址)'], - 2 => ['value' => 2, 'name' => '外部小程序(同一个主体下的小程序appid)'], - 3 => ['value' => 3, 'name' => '跳转原生地图查看指定位置'], - 4 => ['value' => 4, 'name' => '拨打电话'], - ], - - // 订单售后类型 - 'common_order_aftersale_type_list' => [ - 0 => ['value' => 0, 'name' => '仅退款', 'desc' => '未收到货(未签收),协商同意前提下', 'icon' => 'am-icon-random', 'class' => 'am-fl'], - 1 => ['value' => 1, 'name' => '退款退货', 'desc' => '已收到货,需要退换已收到的货物', 'icon' => 'am-icon-retweet', 'class' => 'am-fr'], - ], - - // 订单售后状态 - 'common_order_aftersale_status_list' => [ - 0 => ['value' => 0, 'name' => '待确认'], - 1 => ['value' => 1, 'name' => '待退货'], - 2 => ['value' => 2, 'name' => '待审核'], - 3 => ['value' => 3, 'name' => '已完成'], - 4 => ['value' => 4, 'name' => '已拒绝'], - 5 => ['value' => 5, 'name' => '已取消'], - ], - - // 订单售后退款方式 - 'common_order_aftersale_refundment_list' => [ - 0 => ['value' => 0, 'name' => '原路退回'], - 1 => ['value' => 1, 'name' => '退至钱包'], - 2 => ['value' => 2, 'name' => '手动处理'], - ], - - // 商品评分 - 'common_goods_comments_rating_list' => [ - 0 => ['value'=>0, 'name'=>'未评分', 'badge'=>''], - 1 => ['value'=>1, 'name'=>'1分', 'badge'=>'danger'], - 2 => ['value'=>2, 'name'=>'2分', 'badge'=>'warning'], - 3 => ['value'=>3, 'name'=>'3分', 'badge'=>'secondary'], - 4 => ['value'=>4, 'name'=>'4分', 'badge'=>'primary'], - 5 => ['value'=>5, 'name'=>'5分', 'badge'=>'success'], - ], - - // 商品评论业务类型 - 'common_goods_comments_business_type_list' => [ - 'order' => ['value' => 'order', 'name' => '订单'], - ], - - // 站点类型 - 'common_site_type_list' => [ - 0 => ['value' => 0, 'name' => '快递'], - 1 => ['value' => 1, 'name' => '展示'], - 2 => ['value' => 2, 'name' => '自提'], - 3 => ['value' => 3, 'name' => '虚拟售卖'], - 4 => ['value' => 4, 'name' => '快递+自提', 'is_ext' => 1], - ], - - // 订单类型 - 'common_order_type_list' => [ - 0 => ['value' => 0, 'name' => '快递'], - 1 => ['value' => 1, 'name' => '展示'], - 2 => ['value' => 2, 'name' => '自提'], - 3 => ['value' => 3, 'name' => '虚拟销售'], - ], - - // 管理员状态 - 'common_admin_status_list' => [ - 0 => ['value' => 0, 'name' => '正常', 'checked' => true], - 1 => ['value' => 1, 'name' => '暂停'], - 2 => ['value' => 2, 'name' => '已离职'], - ], - - // 支付日志状态 - 'common_pay_log_status_list' => [ - 0 => ['value' => 0, 'name' => '待支付', 'checked' => true], - 1 => ['value' => 1, 'name' => '已支付'], - 2 => ['value' => 2, 'name' => '已关闭'], - ], - - // 商品参数组件类型 - 'common_goods_parameters_type_list' => [ - 0 => ['value' => 0, 'name' => '全部'], - 1 => ['value' => 1, 'name' => '详情', 'checked' => true], - 2 => ['value' => 2, 'name' => '基础'], - ], - - // 商品关联排序类型 - 'goods_order_by_type_list' => [ - 0 => ['value' => 'g.access_count,g.sales_count,g.id', 'name' => '综合', 'checked' => true], - 1 => ['value' => 'g.sales_count', 'name' => '销量'], - 2 => ['value' => 'g.access_count', 'name' => '热度'], - 3 => ['value' => 'g.min_price', 'name' => '价格'], - 4 => ['value' => 'g.id', 'name' => '最新'], - ], - - // 商品关联排序规则 - 'goods_order_by_rule_list' => [ - 0 => ['value' => 'desc', 'name' => '降序(desc)', 'checked' => true], - 1 => ['value' => 'asc', 'name' => '升序(asc)'], - ], - - // 首页数据类型 - 'common_site_floor_data_type_list' => [ - 0 => ['value' => 0, 'name' => '自动模式', 'checked' => true], - 1 => ['value' => 1, 'name' => '手动模式'], - 2 => ['value' => 2, 'name' => '拖拽模式'], - ], - - // 文件上传错误码 - 'common_file_upload_error_list' => [ - 1 => '文件大小超过服务器允许上传的最大值', - 2 => '文件大小超出浏览器限制,查看是否超过[站点设置->附件最大限制]', - 3 => '文件仅部分被上传', - 4 => '没有找到要上传的文件', - 5 => '没有找到服务器临时文件夹', - 6 => '没有找到服务器临时文件夹', - 7 => '文件写入失败', - 8 => '文件上传扩展没有打开', - ], - - // -------------------- 正则 -------------------- // 用户名 'common_regex_username' => '^[A-Za-z0-9_]{2,18}$', - // 用户名 'common_regex_pwd' => '^.{6,18}$', - // 包含字母和数字、6~16个字符 'common_regex_alpha_number' => '^(?![0-9]+$)(?![a-zA-Z]+$)[0-9A-Za-z]{6,16}$', - // 手机号码 'common_regex_mobile' => '^1((3|4|5|6|7|8|9){1}\d{1})\d{8}$', - // 座机号码 'common_regex_tel' => '^\d{3,4}-?\d{8}$', - // 电子邮箱 'common_regex_email' => '^\w+([-+.]\w+)*@\w+([-.]\w+)*\.\w+([-.]\w+)*$', - // 身份证号码 'common_regex_id_card' => '^(\d{15}$|^\d{18}$|^\d{17}(\d|X|x))$', - // 价格格式 'common_regex_price' => '^([0-9]{1}\d{0,7})(\.\d{1,2})?$', - // ip 'common_regex_ip' => '^(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])$', - // url 'common_regex_url' => '^http[s]?:\/\/[A-Za-z0-9-]+\.[A-Za-z0-9]+[\/=\?%\-&_~`@[\]\':+!]*([^<>\"\"])*$', - // 控制器名称 'common_regex_control' => '^[A-Za-z]{1}[A-Za-z0-9_]{0,29}$', - // 方法名称 'common_regex_action' => '^[A-Za-z]{1}[A-Za-z0-9_]{0,29}$', - // 顺序 'common_regex_sort' => '^[0-9]{1,3}$', - // 日期 'common_regex_date' => '^\d{4}-\d{2}-\d{2}$', - // 分数 'common_regex_score' => '^[0-9]{1,3}$', - // 分页 'common_regex_page_number' => '^[1-9]{1}[0-9]{0,2}$', - // 时段格式 10:00-10:45 'common_regex_interval' => '^\d{2}\:\d{2}\-\d{2}\:\d{2}$', - // 颜色 'common_regex_color' => '^(#([a-fA-F0-9]{6}|[a-fA-F0-9]{3}))?$', - // id逗号隔开 'common_regex_id_comma_split' => '^\d(\d|,?)*\d$', - // url伪静态后缀 'common_regex_url_html_suffix' => '^[a-z]{0,8}$', - // 图片比例值 'common_regex_image_proportion' => '^([1-9]{1}[0-9]?|[1-9]{1}[0-9]?\.{1}[0-9]{1,2}|100|0)?$', - // 版本号 'common_regex_version' => '^[0-9]{1,6}\.[0-9]{1,6}\.[0-9]{1,6}$', - - - // -------------------- 后端相关 -------------------- - // 图片验证码 - 'site_images_verify_rules_list' => [ - 0 => ['value' => 'bgcolor', 'name' => '彩色背景'], - 1 => ['value' => 'textcolor', 'name' => '彩色文本'], - 2 => ['value' => 'point', 'name' => '干扰点'], - 3 => ['value' => 'line', 'name' => '干扰线'], - ], - - // 时区 - 'site_timezone_list' => [ - 'Pacific/Pago_Pago' => '(标准时-11:00) 中途岛、萨摩亚群岛', - 'Pacific/Rarotonga' => '(标准时-10:00) 夏威夷', - 'Pacific/Gambier' => '(标准时-9:00) 阿拉斯加', - 'America/Dawson' => '(标准时-8:00) 太平洋时间(美国和加拿大)', - 'America/Creston' => '(标准时-7:00) 山地时间(美国和加拿大)', - 'America/Belize' => '(标准时-6:00) 中部时间(美国和加拿大)、墨西哥城', - 'America/Eirunepe' => '(标准时-5:00) 东部时间(美国和加拿大)、波哥大', - 'America/Antigua' => '(标准时-4:00) 大西洋时间(加拿大)、加拉加斯', - 'America/Argentina/Buenos_Aires' => '(标准时-3:00) 巴西、布宜诺斯艾利斯、乔治敦', - 'America/Noronha' => '(标准时-2:00) 中大西洋', - 'Atlantic/Cape_Verde' => '(标准时-1:00) 亚速尔群岛、佛得角群岛', - 'Africa/Ouagadougou' => '(格林尼治标准时) 西欧时间、伦敦、卡萨布兰卡', - 'Europe/Andorra' => '(标准时+1:00) 中欧时间、安哥拉、利比亚', - 'Europe/Mariehamn' => '(标准时+2:00) 东欧时间、开罗,雅典', - 'Asia/Bahrain' => '(标准时+3:00) 巴格达、科威特、莫斯科', - 'Asia/Dubai' => '(标准时+4:00) 阿布扎比、马斯喀特、巴库', - 'Asia/Kolkata' => '(标准时+5:00) 叶卡捷琳堡、伊斯兰堡、卡拉奇', - 'Asia/Dhaka' => '(标准时+6:00) 阿拉木图、 达卡、新亚伯利亚', - 'Indian/Christmas' => '(标准时+7:00) 曼谷、河内、雅加达', - 'Asia/Shanghai' => '(标准时+8:00)北京、重庆、香港、新加坡', - 'Australia/Darwin' => '(标准时+9:00) 东京、汉城、大阪、雅库茨克', - 'Australia/Adelaide' => '(标准时+10:00) 悉尼、关岛', - 'Australia/Currie' => '(标准时+11:00) 马加丹、索罗门群岛', - 'Pacific/Fiji' => '(标准时+12:00) 奥克兰、惠灵顿、堪察加半岛' - ], - - // seo - // url模式列表 - 'seo_url_model_list' => [ - 0 => ['value' => 0, 'name' => '兼容模式', 'checked' => true], - 1 => ['value' => 1, 'name' => 'PATHINFO模式'], - 2 => ['value' => 2, 'name' => 'PATHINFO模式+短地址'], - ], ]; } } diff --git a/app/service/CrontabService.php b/app/service/CrontabService.php index 8dffca2d3..bb8622416 100644 --- a/app/service/CrontabService.php +++ b/app/service/CrontabService.php @@ -82,7 +82,7 @@ class CrontabService $fail++; } } - return DataReturn(MyLang('common.operate_success'), 0, ['sucs'=>$sucs, 'fail'=>$fail]); + return DataReturn(MyLang('operate_success'), 0, ['sucs'=>$sucs, 'fail'=>$fail]); } /** @@ -147,7 +147,7 @@ class CrontabService $fail++; } } - return DataReturn(MyLang('common.operate_success'), 0, ['sucs'=>$sucs, 'fail'=>$fail]); + return DataReturn(MyLang('operate_success'), 0, ['sucs'=>$sucs, 'fail'=>$fail]); } /** @@ -174,7 +174,7 @@ class CrontabService 'close_time' => time(), ]; $res = Db::name('PayLog')->where($where)->update($data); - return DataReturn(MyLang('common.operate_success'), 0, $res); + return DataReturn(MyLang('operate_success'), 0, $res); } /** @@ -243,7 +243,7 @@ class CrontabService $fail++; } } - return DataReturn(MyLang('common.operate_success'), 0, ['sucs'=>$sucs, 'fail'=>$fail]); + return DataReturn(MyLang('operate_success'), 0, ['sucs'=>$sucs, 'fail'=>$fail]); } } ?> \ No newline at end of file diff --git a/app/service/CustomViewService.php b/app/service/CustomViewService.php index a14dcca2c..e4e1f7b81 100755 --- a/app/service/CustomViewService.php +++ b/app/service/CustomViewService.php @@ -40,7 +40,7 @@ class CustomViewService $n = isset($params['n']) ? intval($params['n']) : 10; $data = Db::name('CustomView')->field($field)->where($where)->order($order_by)->limit($m, $n)->select()->toArray(); - return DataReturn(MyLang('common.handle_success'), 0, self::CustomViewListHandle($data, $params)); + return DataReturn(MyLang('handle_success'), 0, self::CustomViewListHandle($data, $params)); } /** @@ -57,7 +57,7 @@ class CustomViewService { if(!empty($data)) { - $common_is_enable_list = MyConst('common_is_enable_list'); + $common_is_enable_list = MyLang('common_is_enable_list'); foreach($data as &$v) { // 是否启用 @@ -168,16 +168,16 @@ class CustomViewService $data['add_time'] = time(); if(Db::name('CustomView')->insertGetId($data) > 0) { - return DataReturn(MyLang('common.insert_success'), 0); + return DataReturn(MyLang('insert_success'), 0); } - return DataReturn(MyLang('common.insert_fail'), -100); + return DataReturn(MyLang('insert_fail'), -100); } else { $data['upd_time'] = time(); if(Db::name('CustomView')->where(['id'=>intval($params['id'])])->update($data)) { - return DataReturn(MyLang('common.edit_success'), 0); + return DataReturn(MyLang('edit_success'), 0); } - return DataReturn(MyLang('common.edit_fail'), -100); + return DataReturn(MyLang('edit_fail'), -100); } } @@ -206,10 +206,10 @@ class CustomViewService // 删除操作 if(Db::name('CustomView')->where(['id'=>$params['ids']])->delete()) { - return DataReturn(MyLang('common.delete_success'), 0); + return DataReturn(MyLang('delete_success'), 0); } - return DataReturn(MyLang('common.delete_fail'), -100); + return DataReturn(MyLang('delete_fail'), -100); } /** @@ -250,9 +250,9 @@ class CustomViewService // 数据更新 if(Db::name('CustomView')->where(['id'=>intval($params['id'])])->update([$params['field']=>intval($params['state']), 'upd_time'=>time()])) { - return DataReturn(MyLang('common.edit_success'), 0); + return DataReturn(MyLang('edit_success'), 0); } - return DataReturn(MyLang('common.edit_fail'), -100); + return DataReturn(MyLang('edit_fail'), -100); } } ?> \ No newline at end of file diff --git a/app/service/DesignService.php b/app/service/DesignService.php index 088b986f7..f0afd080f 100644 --- a/app/service/DesignService.php +++ b/app/service/DesignService.php @@ -43,7 +43,7 @@ class DesignService // 获取数据 $data = Db::name('Design')->where($where)->limit($m, $n)->order($order_by)->select()->toArray(); - return DataReturn(MyLang('common.handle_success'), 0, self::DesignListHandle($data, $params)); + return DataReturn(MyLang('handle_success'), 0, self::DesignListHandle($data, $params)); } /** @@ -118,17 +118,17 @@ class DesignService $data_id = Db::name('Design')->insertGetId($data); if($data_id <= 0) { - return DataReturn(MyLang('common.insert_fail'), -1); + return DataReturn(MyLang('insert_fail'), -1); } } else { $data_id = intval($params['id']); $data['upd_time'] = time(); if(Db::name('Design')->where(['id'=>$data_id])->update($data) === false) { - return DataReturn(MyLang('common.update_fail'), -1); + return DataReturn(MyLang('update_fail'), -1); } } - return DataReturn(MyLang('common.operate_success'), 0, $data_id); + return DataReturn(MyLang('operate_success'), 0, $data_id); } /** @@ -170,9 +170,9 @@ class DesignService // 数据更新 if(Db::name('Design')->where(['id'=>intval($params['id'])])->update([$params['field']=>intval($params['state']), 'upd_time'=>time()])) { - return DataReturn(MyLang('common.operate_success'), 0); + return DataReturn(MyLang('operate_success'), 0); } - return DataReturn(MyLang('common.operate_fail'), -100); + return DataReturn(MyLang('operate_fail'), -100); } /** @@ -214,10 +214,10 @@ class DesignService { ResourcesService::AttachmentPathTypeDelete(self::AttachmentPathTypeValue($v)); } - return DataReturn(MyLang('common.delete_success'), 0); + return DataReturn(MyLang('delete_success'), 0); } - return DataReturn(MyLang('common.delete_fail'), -100); + return DataReturn(MyLang('delete_fail'), -100); } /** diff --git a/app/service/DomainService.php b/app/service/DomainService.php index 8f7c374c7..0e6d3c443 100644 --- a/app/service/DomainService.php +++ b/app/service/DomainService.php @@ -124,7 +124,7 @@ class DomainService { return DataReturn('域名配置部署失败', -10); } - return DataReturn(MyLang('common.operate_success'), 0); + return DataReturn(MyLang('operate_success'), 0); } } ?> \ No newline at end of file diff --git a/app/service/ExpressService.php b/app/service/ExpressService.php index 2b896e732..d26009198 100755 --- a/app/service/ExpressService.php +++ b/app/service/ExpressService.php @@ -158,9 +158,9 @@ class ExpressService $v['is_son'] = (Db::name('Express')->where(['pid'=>$v['id']])->count() > 0) ? 'ok' : 'no'; $v['json'] = json_encode($v); } - return DataReturn(MyLang('common.operate_success'), 0, $data); + return DataReturn(MyLang('operate_success'), 0, $data); } - return DataReturn(MyLang('common.no_data'), -100); + return DataReturn(MyLang('no_data'), -100); } /** @@ -213,20 +213,20 @@ class ExpressService $data['id'] = Db::name('Express')->insertGetId($data); if($data['id'] <= 0) { - return DataReturn(MyLang('common.insert_fail'), -100); + return DataReturn(MyLang('insert_fail'), -100); } } else { $data['upd_time'] = time(); if(Db::name('Express')->where(['id'=>intval($params['id'])])->update($data) === false) { - return DataReturn(MyLang('common.edit_fail'), -100); + return DataReturn(MyLang('edit_fail'), -100); } else { $data['id'] = $params['id']; } } $res = self::DataHandle([$data]); - return DataReturn(MyLang('common.operate_success'), 0, $res[0]); + return DataReturn(MyLang('operate_success'), 0, $res[0]); } /** @@ -261,9 +261,9 @@ class ExpressService // 开始删除 if(Db::name('Express')->where(['id'=>intval($params['id'])])->delete()) { - return DataReturn(MyLang('common.delete_success'), 0); + return DataReturn(MyLang('delete_success'), 0); } - return DataReturn(MyLang('common.delete_fail'), -100); + return DataReturn(MyLang('delete_fail'), -100); } } ?> \ No newline at end of file diff --git a/app/service/FormTableService.php b/app/service/FormTableService.php index 850f8fdca..fc09c4811 100644 --- a/app/service/FormTableService.php +++ b/app/service/FormTableService.php @@ -75,9 +75,9 @@ class FormTableService ]; if(Db::name('FormTableUserFields')->insertGetId($data) <= 0) { - return DataReturn(MyLang('common.operate_fail'), -100); + return DataReturn(MyLang('operate_fail'), -100); } - return DataReturn(MyLang('common.operate_success'), 0); + return DataReturn(MyLang('operate_success'), 0); } /** @@ -124,9 +124,9 @@ class FormTableService ]; if(Db::name('FormTableUserFields')->where($where)->delete() === false) { - return DataReturn(MyLang('common.operate_fail'), -100); + return DataReturn(MyLang('operate_fail'), -100); } - return DataReturn(MyLang('common.operate_success'), 0); + return DataReturn(MyLang('operate_success'), 0); } /** @@ -172,7 +172,7 @@ class FormTableService // 获取数据 $data = Db::name('FormTableUserFields')->where($where)->order('id desc')->find(); $data = empty($data['fields']) ? [] : json_decode($data['fields'], true); - return DataReturn(MyLang('common.handle_success'), 0, $data); + return DataReturn(MyLang('handle_success'), 0, $data); } } ?> \ No newline at end of file diff --git a/app/service/GoodsBrowseService.php b/app/service/GoodsBrowseService.php index f8be449a1..35852e835 100644 --- a/app/service/GoodsBrowseService.php +++ b/app/service/GoodsBrowseService.php @@ -72,9 +72,9 @@ class GoodsBrowseService } if($status) { - return DataReturn(MyLang('common.insert_success'), 0); + return DataReturn(MyLang('insert_success'), 0); } - return DataReturn(MyLang('common.insert_fail'), -100); + return DataReturn(MyLang('insert_fail'), -100); } /** @@ -139,7 +139,7 @@ class GoodsBrowseService // 获取数据 $data = Db::name('GoodsBrowse')->alias('b')->join('goods g', 'g.id=b.goods_id')->field($field)->where($where)->limit($m, $n)->order($order_by)->select()->toArray(); - return DataReturn(MyLang('common.handle_success'), 0, self::GoodsBrowseListHandle($data, $params)); + return DataReturn(MyLang('handle_success'), 0, self::GoodsBrowseListHandle($data, $params)); } /** @@ -222,9 +222,9 @@ class GoodsBrowseService // 删除 if(Db::name('GoodsBrowse')->where($where)->delete()) { - return DataReturn(MyLang('common.delete_success'), 0); + return DataReturn(MyLang('delete_success'), 0); } - return DataReturn(MyLang('common.delete_fail'), -100); + return DataReturn(MyLang('delete_fail'), -100); } } ?> \ No newline at end of file diff --git a/app/service/GoodsCartService.php b/app/service/GoodsCartService.php index 259ea5e81..529e66fc8 100644 --- a/app/service/GoodsCartService.php +++ b/app/service/GoodsCartService.php @@ -144,7 +144,7 @@ class GoodsCartService } } } - return DataReturn(MyLang('common.operate_success'), 0, $data); + return DataReturn(MyLang('operate_success'), 0, $data); } /** @@ -327,7 +327,7 @@ class GoodsCartService $data['add_time'] = time(); if(Db::name('Cart')->insertGetId($data) > 0) { - return DataReturn(MyLang('common.join_success'), 0, self::UserGoodsCartTotal($params)); + return DataReturn(MyLang('join_success'), 0, self::UserGoodsCartTotal($params)); } } else { $data['upd_time'] = time(); @@ -342,10 +342,10 @@ class GoodsCartService } if(Db::name('Cart')->where($where)->update($data)) { - return DataReturn(MyLang('common.join_success'), 0, self::UserGoodsCartTotal($params)); + return DataReturn(MyLang('join_success'), 0, self::UserGoodsCartTotal($params)); } } - return DataReturn(MyLang('common.join_fail'), -100); + return DataReturn(MyLang('join_fail'), -100); } /** @@ -464,9 +464,9 @@ class GoodsCartService return $ret; } - return DataReturn(MyLang('common.update_success'), 0, $data); + return DataReturn(MyLang('update_success'), 0, $data); } - return DataReturn(MyLang('common.update_fail'), -100); + return DataReturn(MyLang('update_fail'), -100); } /** @@ -578,9 +578,9 @@ class GoodsCartService // 删除 if(Db::name('Cart')->where($where)->delete()) { - return DataReturn(MyLang('common.delete_success'), 0, self::UserGoodsCartTotal($params)); + return DataReturn(MyLang('delete_success'), 0, self::UserGoodsCartTotal($params)); } - return DataReturn(MyLang('common.delete_fail'), -100); + return DataReturn(MyLang('delete_fail'), -100); } } ?> \ No newline at end of file diff --git a/app/service/GoodsCommentsService.php b/app/service/GoodsCommentsService.php index 17069da32..a35dec11f 100644 --- a/app/service/GoodsCommentsService.php +++ b/app/service/GoodsCommentsService.php @@ -141,7 +141,7 @@ class GoodsCommentsService } if($order['status'] != 4) { - $status_text = MyConst('common_order_status')[$order['status']]['name']; + $status_text = MyLang('common_order_status')[$order['status']]['name']; return DataReturn('状态不可操作['.$status_text.']', -1); } if($order['user_is_comments'] != 0) @@ -202,7 +202,7 @@ class GoodsCommentsService // 获取数据列表 $data = Db::name('GoodsComments')->where($where)->field($field)->limit($m, $n)->order($order_by)->select()->toArray(); - return DataReturn(MyLang('common.handle_success'), 0, self::GoodsCommentsListHandle($data, $params)); + return DataReturn(MyLang('handle_success'), 0, self::GoodsCommentsListHandle($data, $params)); } /** @@ -242,9 +242,9 @@ class GoodsCommentsService } // 静态数据 - $common_is_text_list = MyConst('common_is_text_list'); - $comments_rating_list = MyConst('common_goods_comments_rating_list'); - $comments_business_type_list = MyConst('common_goods_comments_business_type_list'); + $common_is_text_list = MyLang('common_is_text_list'); + $comments_rating_list = MyLang('common_goods_comments_rating_list'); + $comments_business_type_list = MyLang('common_goods_comments_business_type_list'); // 用户默认头像 $default_avatar = SystemBaseService::AttachmentHost().'/static/index/'.strtolower(MyFileConfig('common_default_theme', '', 'default', true)).'/images/default-user-avatar.jpg'; @@ -422,7 +422,7 @@ class GoodsCommentsService [ 'checked_type' => 'in', 'key_name' => 'business_type', - 'checked_data' => array_keys(MyConst('common_order_aftersale_refundment_list')), + 'checked_data' => array_keys(MyLang('common_order_aftersale_refundment_list')), 'error_msg' => '请选择业务类型', ], [ @@ -440,7 +440,7 @@ class GoodsCommentsService [ 'checked_type' => 'in', 'key_name' => 'rating', - 'checked_data' => array_keys(MyConst('common_goods_comments_rating_list')), + 'checked_data' => array_keys(MyLang('common_goods_comments_rating_list')), 'error_msg' => '请选择评分', ], ]; @@ -466,7 +466,7 @@ class GoodsCommentsService // 更新 if(Db::name('GoodsComments')->where(['id'=>intval($params['id'])])->update($data)) { - return DataReturn(MyLang('common.edit_success'), 0); + return DataReturn(MyLang('edit_success'), 0); } return DataReturn('编辑失败或数据不存在', -100); } @@ -496,9 +496,9 @@ class GoodsCommentsService // 开始删除 if(Db::name('GoodsComments')->where(['id'=>$params['ids']])->delete()) { - return DataReturn(MyLang('common.delete_success'), 0); + return DataReturn(MyLang('delete_success'), 0); } - return DataReturn(MyLang('common.delete_fail'), -100); + return DataReturn(MyLang('delete_fail'), -100); } /** @@ -552,9 +552,9 @@ class GoodsCommentsService ]; if(Db::name('GoodsComments')->where(['id'=>$comments_id])->update($data)) { - return DataReturn(MyLang('common.operate_success'), 0); + return DataReturn(MyLang('operate_success'), 0); } - return DataReturn(MyLang('common.operate_fail'), -100); + return DataReturn(MyLang('operate_fail'), -100); } /** @@ -600,9 +600,9 @@ class GoodsCommentsService ]; if(Db::name('GoodsComments')->where(['id'=>intval($params['id'])])->update($data)) { - return DataReturn(MyLang('common.edit_success'), 0); + return DataReturn(MyLang('edit_success'), 0); } - return DataReturn(MyLang('common.edit_fail'), -100); + return DataReturn(MyLang('edit_fail'), -100); } /** diff --git a/app/service/GoodsFavorService.php b/app/service/GoodsFavorService.php index 1f3b98c2c..92392e7f9 100644 --- a/app/service/GoodsFavorService.php +++ b/app/service/GoodsFavorService.php @@ -93,7 +93,7 @@ class GoodsFavorService // 删除收藏 if(Db::name('GoodsFavor')->where($data)->delete() > 0) { - return DataReturn(MyLang('common.cancel_success'), 0, [ + return DataReturn(MyLang('cancel_success'), 0, [ 'text' => '收藏', 'status' => 0, 'count' => self::GoodsFavorTotal(['goods_id'=>$data['goods_id']]), @@ -137,7 +137,7 @@ class GoodsFavorService $data = ['goods_id'=>intval($params['goods_id']), 'user_id'=>$params['user']['id']]; $temp = Db::name('GoodsFavor')->where($data)->find(); - return DataReturn(MyLang('common.operate_success'), 0, empty($temp) ? 0 : 1); + return DataReturn(MyLang('operate_success'), 0, empty($temp) ? 0 : 1); } /** @@ -202,7 +202,7 @@ class GoodsFavorService // 获取数据 $data = Db::name('GoodsFavor')->alias('f')->join('goods g', 'g.id=f.goods_id')->field($field)->where($where)->limit($m, $n)->order($order_by)->select()->toArray(); - return DataReturn(MyLang('common.handle_success'), 0, self::GoodsFavorListHandle($data, $params)); + return DataReturn(MyLang('handle_success'), 0, self::GoodsFavorListHandle($data, $params)); } /** @@ -285,9 +285,9 @@ class GoodsFavorService // 删除 if(Db::name('GoodsFavor')->where($where)->delete()) { - return DataReturn(MyLang('common.delete_success'), 0); + return DataReturn(MyLang('delete_success'), 0); } - return DataReturn(MyLang('common.delete_fail'), -100); + return DataReturn(MyLang('delete_fail'), -100); } } ?> \ No newline at end of file diff --git a/app/service/GoodsParamsService.php b/app/service/GoodsParamsService.php index 47e924212..e77370cb7 100755 --- a/app/service/GoodsParamsService.php +++ b/app/service/GoodsParamsService.php @@ -59,7 +59,7 @@ class GoodsParamsService ]; $data = self::GoodsParamsTemplateListHandle(Db::name('GoodsParamsTemplate')->where($where)->field('id,name,config_count')->order('id desc')->select()->toArray(), $params); } - return DataReturn(MyLang('common.operate_success'), 0, $data); + return DataReturn(MyLang('operate_success'), 0, $data); } /** @@ -209,7 +209,7 @@ class GoodsParamsService // 完成 Db::commit(); - return DataReturn(MyLang('common.operate_success'), 0); + return DataReturn(MyLang('operate_success'), 0); } catch(\Exception $e) { Db::rollback(); return DataReturn($e->getMessage(), -1); @@ -257,7 +257,7 @@ class GoodsParamsService // 完成 Db::commit(); - return DataReturn(MyLang('common.delete_success'), 0); + return DataReturn(MyLang('delete_success'), 0); } catch(\Exception $e) { Db::rollback(); return DataReturn($e->getMessage(), -1); @@ -303,9 +303,9 @@ class GoodsParamsService // 数据更新 if(Db::name('GoodsParamsTemplate')->where(['id'=>intval($params['id'])])->update([$params['field']=>intval($params['state']), 'upd_time'=>time()])) { - return DataReturn(MyLang('common.operate_success'), 0); + return DataReturn(MyLang('operate_success'), 0); } - return DataReturn(MyLang('common.operate_fail'), -100); + return DataReturn(MyLang('operate_fail'), -100); } /** @@ -336,7 +336,7 @@ class GoodsParamsService } if(!empty($data)) { - return DataReturn(MyLang('common.handle_success'), 0, $data); + return DataReturn(MyLang('handle_success'), 0, $data); } } return DataReturn('请填写参数配置', -1); diff --git a/app/service/GoodsService.php b/app/service/GoodsService.php index e99c24f74..9834bedc0 100755 --- a/app/service/GoodsService.php +++ b/app/service/GoodsService.php @@ -284,8 +284,8 @@ class GoodsService // 商品数量 $goods_count = MyC('home_index_floor_goods_max_count', 8, true); // 排序配置 - $floor_order_by_type_list = MyConst('goods_order_by_type_list'); - $floor_order_by_rule_list = MyConst('goods_order_by_rule_list'); + $floor_order_by_type_list = MyLang('goods_order_by_type_list'); + $floor_order_by_rule_list = MyLang('goods_order_by_rule_list'); $floor_order_by_type = MyC('home_index_floor_goods_order_by_type', 0, true); $floor_order_by_rule = MyC('home_index_floor_goods_order_by_rule', 0, true); // 排序字段名称 @@ -1261,7 +1261,7 @@ class GoodsService [ 'checked_type' => 'in', 'key_name' => 'site_type', - 'checked_data' => array_merge(array_column(MyConst('common_site_type_list'), 'value')), + 'checked_data' => array_merge(array_column(MyLang('common_site_type_list'), 'value')), 'is_checked' => 2, 'error_msg' => '商品类型数据值范围有误', ], @@ -1474,7 +1474,7 @@ class GoodsService ]); // 返回信息 - return DataReturn(MyLang('common.operate_success'), 0); + return DataReturn(MyLang('operate_success'), 0); } /** @@ -1506,7 +1506,7 @@ class GoodsService return DataReturn('规格参数添加失败', -1); } } - return DataReturn(MyLang('common.operate_success'), 0); + return DataReturn(MyLang('operate_success'), 0); } /** @@ -1552,7 +1552,7 @@ class GoodsService return $ret; } - return DataReturn(MyLang('common.operate_success'), 0); + return DataReturn(MyLang('operate_success'), 0); } /** @@ -1840,7 +1840,7 @@ class GoodsService } } } - return DataReturn(MyLang('common.insert_success'), 0); + return DataReturn(MyLang('insert_success'), 0); } /** @@ -1874,7 +1874,7 @@ class GoodsService } } } - return DataReturn(MyLang('common.insert_success'), 0); + return DataReturn(MyLang('insert_success'), 0); } /** @@ -1908,7 +1908,7 @@ class GoodsService } } } - return DataReturn(MyLang('common.insert_success'), 0); + return DataReturn(MyLang('insert_success'), 0); } /** @@ -2030,7 +2030,7 @@ class GoodsService } } - return DataReturn(MyLang('common.insert_success'), 0); + return DataReturn(MyLang('insert_success'), 0); } /** @@ -2073,7 +2073,7 @@ class GoodsService // 提交事务 Db::commit(); - return DataReturn(MyLang('common.delete_success'), 0); + return DataReturn(MyLang('delete_success'), 0); } catch(\Exception $e) { Db::rollback(); return DataReturn($e->getMessage(), -1); @@ -2203,7 +2203,7 @@ class GoodsService // 提交事务 Db::commit(); - return DataReturn(MyLang('common.operate_success'), 0); + return DataReturn(MyLang('operate_success'), 0); } catch(\Exception $e) { Db::rollback(); return DataReturn($e->getMessage(), -1); @@ -2456,7 +2456,7 @@ class GoodsService } // 返回成功 - return DataReturn(MyLang('common.operate_success'), 0, $data); + return DataReturn(MyLang('operate_success'), 0, $data); } return DataReturn('没有相关规格', -100); @@ -2560,7 +2560,7 @@ class GoodsService return $ret; } - return DataReturn(MyLang('common.operate_success'), 0, $data); + return DataReturn(MyLang('operate_success'), 0, $data); } } return DataReturn('没有相关规格类型', -100); @@ -2630,9 +2630,9 @@ class GoodsService $v['is_son'] = (Db::name('GoodsCategory')->where(['pid'=>$v['id']])->count() > 0) ? 'ok' : 'no'; $v['json'] = json_encode($v); } - return DataReturn(MyLang('common.operate_success'), 0, $data); + return DataReturn(MyLang('operate_success'), 0, $data); } - return DataReturn(MyLang('common.no_data'), -100); + return DataReturn(MyLang('no_data'), -100); } /** @@ -2733,13 +2733,13 @@ class GoodsService $data['id'] = Db::name('GoodsCategory')->insertGetId($data); if($data['id'] <= 0) { - return DataReturn(MyLang('common.insert_fail'), -100); + return DataReturn(MyLang('insert_fail'), -100); } } else { $data['upd_time'] = time(); if(Db::name('GoodsCategory')->where(['id'=>intval($params['id'])])->update($data) === false) { - return DataReturn(MyLang('common.edit_fail'), -100); + return DataReturn(MyLang('edit_fail'), -100); } else { $data['id'] = $params['id']; } @@ -2749,7 +2749,7 @@ class GoodsService MyCache(SystemService::CacheKey('shopxo.cache_goods_category_key'), null); $res = self::GoodsCategoryDataHandle([$data]); - return DataReturn(MyLang('common.operate_success'), 0, $res[0]); + return DataReturn(MyLang('operate_success'), 0, $res[0]); } /** @@ -2790,9 +2790,9 @@ class GoodsService // 删除大分类缓存 MyCache(SystemService::CacheKey('shopxo.cache_goods_category_key'), null); - return DataReturn(MyLang('common.delete_success'), 0); + return DataReturn(MyLang('delete_success'), 0); } - return DataReturn(MyLang('common.delete_fail'), -100); + return DataReturn(MyLang('delete_fail'), -100); } /** @@ -2866,7 +2866,7 @@ class GoodsService } // 仅可单独购买 - $site_type_arr = MyConst('common_site_type_list'); + $site_type_arr = MyLang('common_site_type_list'); $msg = array_key_exists($site_type, $site_type_arr) ? '仅'.$site_type_arr[$site_type]['name'] : '仅单买'; return DataReturn($msg, -1, $site_type); } @@ -2910,7 +2910,7 @@ class GoodsService // 是否已下架 if($goods['is_shelves'] != 1) { - $error = '已下架'; + $error = MyLang('goods_already_shelves_title'); } // 按钮列表 @@ -2933,16 +2933,16 @@ class GoodsService $data[] = [ 'color' => 'main', 'type' => 'show', - 'name' => MyC('common_is_exhibition_mode_btn_text', '立即咨询', true), + 'name' => MyC('common_is_exhibition_mode_btn_text', MyLang('goods_show_title'), true), 'value' => MyC('common_customer_store_tel'), 'icon' => 'am-icon-phone', ]; - $error = '仅展示'; + $error = MyLang('goods_only_show_title'); } else { // 还有库存 if($goods['inventory'] <= 0) { - $error = '没货了'; + $error = MyLang('goods_no_inventory_title'); } if(empty($error)) { @@ -2950,11 +2950,12 @@ class GoodsService $class_name = (APPLICATION == 'web') ? 'buy-event login-event' : ''; // 购买 + $name = (MyC('common_order_is_booking', 0, true) == 1) ? MyLang('goods_booking_title') : MyLang('goods_buy_title'); $buy = [ 'color' => 'main', 'type' => 'buy', - 'title' => '点此按钮到下一步确认购买信息', - 'name' => (MyC('common_order_is_booking', 0, true) == 1) ? '立即预约' : '立即购买', + 'title' => $name, + 'name' => $name, 'class' => $class_name, 'icon' => '', ]; @@ -2965,11 +2966,12 @@ class GoodsService if($ret['code'] == 0) { // 加入购物车 + $name = MyLang('goods_cart_title'); $cart = [ 'color' => 'second', 'type' => 'cart', - 'title' => '加入购物车', - 'name' => '加入购物车', + 'title' => $name, + 'name' => $name, 'class' => $class_name, 'icon' => 'am-icon-opencart', ]; @@ -3009,7 +3011,7 @@ class GoodsService // 是否存在按钮数据 if(empty($data) && empty($error)) { - $error = '暂停销售'; + $error = MyLang('goods_stop_sale_title'); } // 返回数据 @@ -3054,17 +3056,17 @@ class GoodsService { // 这里的 ent 值必须和系统中区域块定义的一致 $data = [ - ['name'=>'商品', 'ent'=>'.page'], + ['name'=>MyLang('goods_main_title'), 'ent'=>'.page'], ]; // 是否展示商品评价 if($is_comments == 1) { - $data[] = ['name'=>'评价', 'ent'=>'.goods-comment']; + $data[] = ['name'=>MyLang('comment_title'), 'ent'=>'.goods-comment']; } // 商品详情介绍 - $data[] = ['name'=>'详情', 'ent'=>'.goods-detail']; + $data[] = ['name'=>MyLang('detail_title'), 'ent'=>'.goods-detail']; } else { // 评论总数 $comments_count = isset($goods['comments_count']) ? $goods['comments_count'] : GoodsCommentsService::GoodsCommentsTotal(['goods_id'=>$goods['id'], 'is_show'=>1]); @@ -3077,7 +3079,7 @@ class GoodsService $data = [ [ 'type' => 'detail', - 'name' => '详情', + 'name' => MyLang('detail_title'), 'active' => 1, ], ]; @@ -3087,14 +3089,14 @@ class GoodsService { $data[] = [ 'type' => 'comments', - 'name' => '评价('.$comments_count.')', + 'name' => MyLang('comment_title').'('.$comments_count.')', ]; } // 猜你喜欢,目前以销量最高推荐 $data[] = [ 'type' => 'guess_you_like', - 'name' => '猜你喜欢', + 'name' => MyLang('goods_guess_you_like_title'), ]; } @@ -3237,7 +3239,7 @@ class GoodsService $result['data'] = $goods['data']; $result['page_total'] = ceil($result['total']/$result['page_size']); } - return DataReturn(MyLang('common.handle_success'), 0, $result); + return DataReturn(MyLang('handle_success'), 0, $result); } /** @@ -3260,7 +3262,7 @@ class GoodsService $data = [ [ 'type' => 0, - 'name' => '首页', + 'name' => MyLang('home_title'), 'url' => SystemService::HomeUrl(), 'icon' => 'am-icon-home', ], @@ -3291,7 +3293,7 @@ class GoodsService } else { $data[] = [ 'type' => 1, - 'name' => '商品分类', + 'name' => MyLang('goods_category_title'), 'data' => $category, ]; } @@ -3341,7 +3343,7 @@ class GoodsService // 参数模板 $parameter = GoodsParamsService::GoodsCategoryParamsTemplateList($params); - return DataReturn(MyLang('common.operate_success'), 0, [ + return DataReturn(MyLang('operate_success'), 0, [ 'spec' => $spec['data'], 'params' => $parameter['data'], ]); diff --git a/app/service/GoodsSpecService.php b/app/service/GoodsSpecService.php index b6d21c59f..fa7df2f83 100644 --- a/app/service/GoodsSpecService.php +++ b/app/service/GoodsSpecService.php @@ -59,7 +59,7 @@ class GoodsSpecService ]; $data = self::GoodsSpecTemplateListHandle(Db::name('GoodsSpecTemplate')->where($where)->field('id,name,content')->order('id desc')->select()->toArray(), $params); } - return DataReturn(MyLang('common.operate_success'), 0, $data); + return DataReturn(MyLang('operate_success'), 0, $data); } /** @@ -172,7 +172,7 @@ class GoodsSpecService } // 完成 - return DataReturn(MyLang('common.operate_success'), 0); + return DataReturn(MyLang('operate_success'), 0); } catch(\Exception $e) { return DataReturn($e->getMessage(), -1); } @@ -209,7 +209,7 @@ class GoodsSpecService } // 完成 - return DataReturn(MyLang('common.delete_success'), 0); + return DataReturn(MyLang('delete_success'), 0); } catch(\Exception $e) { return DataReturn($e->getMessage(), -1); } @@ -254,9 +254,9 @@ class GoodsSpecService // 数据更新 if(Db::name('GoodsSpecTemplate')->where(['id'=>intval($params['id'])])->update([$params['field']=>intval($params['state']), 'upd_time'=>time()])) { - return DataReturn(MyLang('common.operate_success'), 0); + return DataReturn(MyLang('operate_success'), 0); } - return DataReturn(MyLang('common.operate_fail'), -100); + return DataReturn(MyLang('operate_fail'), -100); } } ?> \ No newline at end of file diff --git a/app/service/IntegralService.php b/app/service/IntegralService.php index 8a4aedacf..8f4e0fc38 100755 --- a/app/service/IntegralService.php +++ b/app/service/IntegralService.php @@ -52,7 +52,7 @@ class IntegralService $log_id = Db::name('UserIntegralLog')->insertGetId($data); if($log_id > 0) { - $type_msg = MyConst('common_integral_log_type_list')[$type]['name']; + $type_msg = MyLang('common_integral_log_type_list')[$type]['name']; $detail = $msg.'积分'.$type_msg.$operation_integral; MessageService::MessageAdd($user_id, '积分变动', $detail, '积分', $log_id); return true; @@ -79,7 +79,7 @@ class IntegralService // 获取数据列表 $data = Db::name('UserIntegralLog')->where($where)->field($field)->limit($m, $n)->order($order_by)->select()->toArray(); - return DataReturn(MyLang('common.handle_success'), 0, self::IntegralLogListHandle($data, $params)); + return DataReturn(MyLang('handle_success'), 0, self::IntegralLogListHandle($data, $params)); } /** @@ -96,7 +96,7 @@ class IntegralService { if(!empty($data)) { - $integral_log_type_list = MyConst('common_integral_log_type_list'); + $integral_log_type_list = MyLang('common_integral_log_type_list'); foreach($data as &$v) { // 用户信息 @@ -282,7 +282,7 @@ class IntegralService } } } - return DataReturn(MyLang('common.operate_success'), 0); + return DataReturn(MyLang('operate_success'), 0); } } return DataReturn('没有需要操作的数据', 0); @@ -390,7 +390,7 @@ class IntegralService } } - return DataReturn(MyLang('common.operate_success'), 0); + return DataReturn(MyLang('operate_success'), 0); } /** diff --git a/app/service/LayoutService.php b/app/service/LayoutService.php index 0d9d1424e..b3486386f 100644 --- a/app/service/LayoutService.php +++ b/app/service/LayoutService.php @@ -68,16 +68,16 @@ class LayoutService $data['add_time'] = time(); if(Db::name('Layout')->insertGetId($data) <= 0) { - return DataReturn(MyLang('common.insert_fail'), -1); + return DataReturn(MyLang('insert_fail'), -1); } } else { $data['upd_time'] = time(); if(!Db::name('Layout')->where(['id'=>$info['id']])->update($data)) { - return DataReturn(MyLang('common.update_fail'), -1); + return DataReturn(MyLang('update_fail'), -1); } } - return DataReturn(MyLang('common.operate_success'), 0); + return DataReturn(MyLang('operate_success'), 0); } /** diff --git a/app/service/LinkService.php b/app/service/LinkService.php index 9125046e9..74c3b177d 100755 --- a/app/service/LinkService.php +++ b/app/service/LinkService.php @@ -69,7 +69,7 @@ class LinkService $where = empty($params['where']) ? [] : $params['where']; $order_by = empty($params['order_by']) ? 'sort asc,id desc' : trim($params['order_by']); $data = Db::name('Link')->field($field)->where($where)->order($order_by)->select()->toArray(); - return DataReturn(MyLang('common.handle_success'), 0, self::LinkListHandle($data, $params)); + return DataReturn(MyLang('handle_success'), 0, self::LinkListHandle($data, $params)); } /** @@ -173,16 +173,16 @@ class LinkService $data['add_time'] = time(); if(Db::name('Link')->insertGetId($data) > 0) { - return DataReturn(MyLang('common.insert_success'), 0); + return DataReturn(MyLang('insert_success'), 0); } - return DataReturn(MyLang('common.insert_fail'), -100); + return DataReturn(MyLang('insert_fail'), -100); } else { $data['upd_time'] = time(); if(Db::name('Link')->where(['id'=>intval($params['id'])])->update($data)) { - return DataReturn(MyLang('common.edit_success'), 0); + return DataReturn(MyLang('edit_success'), 0); } - return DataReturn(MyLang('common.edit_fail'), -100); + return DataReturn(MyLang('edit_fail'), -100); } } @@ -211,10 +211,10 @@ class LinkService // 删除操作 if(Db::name('Link')->where(['id'=>$params['ids']])->delete()) { - return DataReturn(MyLang('common.delete_success'), 0); + return DataReturn(MyLang('delete_success'), 0); } - return DataReturn(MyLang('common.delete_fail'), -100); + return DataReturn(MyLang('delete_fail'), -100); } /** @@ -255,9 +255,9 @@ class LinkService // 数据更新 if(Db::name('Link')->where(['id'=>intval($params['id'])])->update([$params['field']=>intval($params['state']), 'upd_time'=>time()])) { - return DataReturn(MyLang('common.edit_success'), 0); + return DataReturn(MyLang('edit_success'), 0); } - return DataReturn(MyLang('common.edit_fail'), -100); + return DataReturn(MyLang('edit_fail'), -100); } } ?> \ No newline at end of file diff --git a/app/service/MessageService.php b/app/service/MessageService.php index 907495edc..f74c91da4 100755 --- a/app/service/MessageService.php +++ b/app/service/MessageService.php @@ -191,7 +191,7 @@ class MessageService // 获取数据列表 $data = Db::name('Message')->where($where)->field($field)->limit($m, $n)->order($order_by)->select()->toArray(); - return DataReturn(MyLang('common.handle_success'), 0, self::MessageListHandle($data, $params)); + return DataReturn(MyLang('handle_success'), 0, self::MessageListHandle($data, $params)); } /** @@ -217,8 +217,8 @@ class MessageService $user_list = UserService::GetUserViewInfo(array_column($data, 'user_id')); } - $common_is_read_list = MyConst('common_is_read_list'); - $common_message_type_list = MyConst('common_message_type_list'); + $common_is_read_list = MyLang('common_is_read_list'); + $common_message_type_list = MyLang('common_message_type_list'); foreach($data as &$v) { // 用户信息 @@ -275,7 +275,7 @@ class MessageService // 更新用户未读消息为已读 $where = ['user_id'=>$params['user']['id'], 'is_read'=>0]; $ret = Db::name('Message')->where($where)->update(['is_read'=>1]); - return DataReturn(MyLang('common.handle_success'), 0, $ret); + return DataReturn(MyLang('handle_success'), 0, $ret); } /** @@ -303,10 +303,10 @@ class MessageService // 删除操作 if(Db::name('Message')->where(['id'=>$params['ids']])->delete()) { - return DataReturn(MyLang('common.delete_success'), 0); + return DataReturn(MyLang('delete_success'), 0); } - return DataReturn(MyLang('common.delete_fail'), -100); + return DataReturn(MyLang('delete_fail'), -100); } } ?> \ No newline at end of file diff --git a/app/service/NavigationService.php b/app/service/NavigationService.php index 958b9007d..f11ee0001 100755 --- a/app/service/NavigationService.php +++ b/app/service/NavigationService.php @@ -261,7 +261,7 @@ class NavigationService } } - return DataReturn(MyLang('common.handle_success'), 0, $result); + return DataReturn(MyLang('handle_success'), 0, $result); } /** @@ -277,7 +277,7 @@ class NavigationService { if(!empty($data) && is_array($data)) { - $nav_type_list = MyConst('common_nav_type_list'); + $nav_type_list = MyLang('common_nav_type_list'); foreach($data as &$v) { // 数据类型 @@ -535,9 +535,9 @@ class NavigationService // 清除缓存 MyCache($cache_key, null); - return DataReturn(MyLang('common.edit_success'), 0); + return DataReturn(MyLang('edit_success'), 0); } else { - return DataReturn(MyLang('common.edit_fail'), -100); + return DataReturn(MyLang('edit_fail'), -100); } } } @@ -577,12 +577,12 @@ class NavigationService MyCache(SystemService::CacheKey('shopxo.cache_common_home_nav_header_key'), null); MyCache(SystemService::CacheKey('shopxo.cache_common_home_nav_footer_key'), null); - return DataReturn(MyLang('common.delete_success'), 0); + return DataReturn(MyLang('delete_success'), 0); } // 回滚事务 Db::rollback(); - return DataReturn(MyLang('common.delete_fail'), -100); + return DataReturn(MyLang('delete_fail'), -100); } /** @@ -627,9 +627,9 @@ class NavigationService MyCache(SystemService::CacheKey('shopxo.cache_common_home_nav_header_key'), null); MyCache(SystemService::CacheKey('shopxo.cache_common_home_nav_footer_key'), null); - return DataReturn(MyLang('common.edit_success'), 0); + return DataReturn(MyLang('edit_success'), 0); } - return DataReturn(MyLang('common.edit_fail'), -100); + return DataReturn(MyLang('edit_fail'), -100); } /** @@ -649,9 +649,10 @@ class NavigationService if($data === null || MyEnv('app_debug')) { // 列表 + $lang = MyLang('header_top_nav_right'); $data = [ [ - 'name' => '个人中心', + 'name' => $lang['user_center'], 'type' => 'center', 'is_login' => 1, 'badge' => null, @@ -660,7 +661,7 @@ class NavigationService 'items' => [], ], [ - 'name' => '我的商城', + 'name' => $lang['user_shop'], 'type' => 'myself', 'is_login' => 1, 'badge' => null, @@ -668,13 +669,13 @@ class NavigationService 'url' => '', 'items' => [ [ - 'name' => '我的订单', + 'name' => $lang['user_order'], 'url' => MyUrl('index/order/index'), ], ], ], [ - 'name' => '我的收藏', + 'name' => $lang['favor'], 'type' => 'favor', 'is_login' => 1, 'badge' => null, @@ -682,13 +683,13 @@ class NavigationService 'url' => '', 'items' => [ [ - 'name' => '商品收藏', + 'name' => $lang['goods_favor'], 'url' => MyUrl('index/usergoodsfavor/index'), ], ], ], [ - 'name' => '购物车', + 'name' => $lang['cart'], 'type' => 'cart', 'is_login' => 1, 'badge' => -1, @@ -697,7 +698,7 @@ class NavigationService 'items' => [], ], [ - 'name' => '消息', + 'name' => $lang['message'], 'type' => 'message', 'is_login' => 1, 'badge' => 0, diff --git a/app/service/OrderAftersaleService.php b/app/service/OrderAftersaleService.php index d66bd02a9..e1ed6bb83 100644 --- a/app/service/OrderAftersaleService.php +++ b/app/service/OrderAftersaleService.php @@ -72,7 +72,7 @@ class OrderAftersaleService return $ret; } - return DataReturn(MyLang('common.no_data'), -100); + return DataReturn(MyLang('no_data'), -100); } /** @@ -101,7 +101,7 @@ class OrderAftersaleService [ 'checked_type' => 'in', 'key_name' => 'type', - 'checked_data' => array_column(MyConst('common_order_aftersale_type_list'), 'value'), + 'checked_data' => array_column(MyLang('common_order_aftersale_type_list'), 'value'), 'error_msg' => '操作类型有误', ], [ @@ -261,9 +261,9 @@ class OrderAftersaleService } // 返回成功 - return DataReturn(MyLang('common.apply_success'), 0, $data_id); + return DataReturn(MyLang('apply_success'), 0, $data_id); } - return DataReturn(MyLang('common.apply_fail'), -100); + return DataReturn(MyLang('apply_fail'), -100); } /** @@ -326,7 +326,7 @@ class OrderAftersaleService } if($aftersale['status'] != 1) { - $common_order_aftersale_status_list = MyConst('common_order_aftersale_status_list'); + $common_order_aftersale_status_list = MyLang('common_order_aftersale_status_list'); return DataReturn('该售后订单状态不可操作['.$common_order_aftersale_status_list[$aftersale['status']]['name'].']', -10); } @@ -372,9 +372,9 @@ class OrderAftersaleService } // 返回成功 - return DataReturn(MyLang('common.operate_success'), 0); + return DataReturn(MyLang('operate_success'), 0); } - return DataReturn(MyLang('common.operate_fail'), -100); + return DataReturn(MyLang('operate_fail'), -100); } /** @@ -413,9 +413,9 @@ class OrderAftersaleService { if(!empty($data)) { - $type_list = MyConst('common_order_aftersale_type_list'); - $status_list = MyConst('common_order_aftersale_status_list'); - $refundment_list = MyConst('common_order_aftersale_refundment_list'); + $type_list = MyLang('common_order_aftersale_type_list'); + $status_list = MyLang('common_order_aftersale_status_list'); + $refundment_list = MyLang('common_order_aftersale_refundment_list'); foreach($data as &$v) { // 订单商品 @@ -635,7 +635,7 @@ class OrderAftersaleService // 状态校验 if(in_array($aftersale['status'], [3,5])) { - $status_list = MyConst('common_order_aftersale_status_list'); + $status_list = MyLang('common_order_aftersale_status_list'); return DataReturn('状态不可操作['.$status_list[$aftersale['status']]['name'].']', -1); } @@ -679,9 +679,9 @@ class OrderAftersaleService } // 返回成功 - return DataReturn(MyLang('common.cancel_success'), 0); + return DataReturn(MyLang('cancel_success'), 0); } - return DataReturn(MyLang('common.cancel_fail'), -100); + return DataReturn(MyLang('cancel_fail'), -100); } /** @@ -724,14 +724,14 @@ class OrderAftersaleService // 状态校验 if($aftersale['status'] != 0) { - $status_list = MyConst('common_order_aftersale_status_list'); + $status_list = MyLang('common_order_aftersale_status_list'); return DataReturn('状态不可操作['.$status_list[$aftersale['status']]['name'].']', -1); } // 类型 if($aftersale['type'] != 1) { - $aftersale_type_list = MyConst('common_order_aftersale_type_list'); + $aftersale_type_list = MyLang('common_order_aftersale_type_list'); return DataReturn('类型不可操作['.$aftersale_type_list[$aftersale['type']]['name'].']', -1); } @@ -801,7 +801,7 @@ class OrderAftersaleService [ 'checked_type' => 'in', 'key_name' => 'refundment', - 'checked_data' => array_column(MyConst('common_order_aftersale_refundment_list'), 'value'), + 'checked_data' => array_column(MyLang('common_order_aftersale_refundment_list'), 'value'), 'error_msg' => '退款方式有误', ], ]; @@ -821,7 +821,7 @@ class OrderAftersaleService // 状态校验 if($aftersale['status'] != 2) { - $status_list = MyConst('common_order_aftersale_status_list'); + $status_list = MyLang('common_order_aftersale_status_list'); return DataReturn('状态不可操作['.$status_list[$aftersale['status']]['name'].']', -1); } @@ -1293,7 +1293,7 @@ class OrderAftersaleService // 状态校验 if(!in_array($aftersale['status'], [0,2])) { - $status_list = MyConst('common_order_aftersale_status_list'); + $status_list = MyLang('common_order_aftersale_status_list'); return DataReturn('状态不可操作['.$status_list[$aftersale['status']]['name'].']', -1); } @@ -1378,7 +1378,7 @@ class OrderAftersaleService // 状态校验 if(!in_array($aftersale['status'], [4,5])) { - $status_list = MyConst('common_order_aftersale_status_list'); + $status_list = MyLang('common_order_aftersale_status_list'); return DataReturn('状态不可操作['.$status_list[$aftersale['status']]['name'].']', -1); } @@ -1399,9 +1399,9 @@ class OrderAftersaleService } // 返回成功 - return DataReturn(MyLang('common.delete_success'), 0); + return DataReturn(MyLang('delete_success'), 0); } - return DataReturn(MyLang('common.delete_fail'), -100); + return DataReturn(MyLang('delete_fail'), -100); } /** @@ -1506,7 +1506,7 @@ class OrderAftersaleService } } - return DataReturn(MyLang('common.operate_success'), 0, ['returned_quantity'=>$returned_quantity, 'refund_price'=>PriceNumberFormat($refund_price)]); + return DataReturn(MyLang('operate_success'), 0, ['returned_quantity'=>$returned_quantity, 'refund_price'=>PriceNumberFormat($refund_price)]); } /** diff --git a/app/service/OrderService.php b/app/service/OrderService.php index a715a046e..b1c78aaa9 100755 --- a/app/service/OrderService.php +++ b/app/service/OrderService.php @@ -89,7 +89,7 @@ class OrderService $operate = self::OrderOperateData($order, 'user'); if($operate['is_pay'] != 1) { - $status_text = MyConst('common_order_status')[$order['status']]['name']; + $status_text = MyLang('common_order_status')[$order['status']]['name']; return DataReturn('状态不可操作['.$status_text.'-'.$order['order_no'].']', -1); } @@ -152,7 +152,7 @@ class OrderService // 是否直接跳转 if($success_count > 0 && $success_count == count($order_data)) { - return DataReturn(MyLang('common.operate_success'), 0, ['is_success'=>1]); + return DataReturn(MyLang('operate_success'), 0, ['is_success'=>1]); } // 订单金额大于0则必须存在支付方式 @@ -438,7 +438,7 @@ class OrderService $operate = self::OrderOperateData($order, 'admin'); if($operate['is_pay'] != 1) { - $status_text = MyConst('common_order_status')[$order['status']]['name']; + $status_text = MyLang('common_order_status')[$order['status']]['name']; return DataReturn('状态不可操作['.$status_text.'-'.$order['order_no'].']', -1); } @@ -630,7 +630,7 @@ class OrderService // 订单支付日志已支付则直接返回 if($pay_data['data']['pay_log_data']['status'] == 1) { - return DataReturn(MyLang('common.operate_success'), 0); + return DataReturn(MyLang('operate_success'), 0); } // 启动事务 @@ -1233,10 +1233,10 @@ class OrderService $user_type = isset($params['user_type']) ? $params['user_type'] : 'user'; // 静态数据 - $order_status_list = MyConst('common_order_status'); - $order_pay_status = MyConst('common_order_pay_status'); - $common_platform_type = MyConst('common_platform_type'); - $common_order_type_list = MyConst('common_order_type_list'); + $order_status_list = MyLang('common_order_status'); + $order_pay_status = MyLang('common_order_pay_status'); + $common_platform_type = MyLang('common_platform_type'); + $common_order_type_list = MyLang('common_order_type_list'); // 仓库信息 if(in_array('warehouse_id', $keys)) @@ -1528,8 +1528,8 @@ class OrderService $data = Db::name('OrderAftersale')->where(['order_id'=>$order_id])->field('status,type,number,price,reason,msg')->order('id desc')->find(); if(!empty($data)) { - $type_list = MyConst('common_order_aftersale_type_list'); - $status_list = MyConst('common_order_aftersale_status_list'); + $type_list = MyLang('common_order_aftersale_type_list'); + $status_list = MyLang('common_order_aftersale_status_list'); // 类型 $data['type_text'] = array_key_exists($data['type'], $type_list) ? $type_list[$data['type']]['name'] : ''; @@ -1777,7 +1777,7 @@ class OrderService public static function OrderHistoryAdd($order_id, $new_status, $original_status, $msg = '', $creator = 0, $creator_name = '') { // 状态描述 - $order_status_list = MyConst('common_order_status'); + $order_status_list = MyLang('common_order_status'); $original_status_name = $order_status_list[$original_status]['name']; $new_status_name = $order_status_list[$new_status]['name']; $msg .= '['.$original_status_name.'-'.$new_status_name.']'; @@ -1854,7 +1854,7 @@ class OrderService $operate = self::OrderOperateData($order, $user_type); if($operate['is_cancel'] != 1) { - $status_text = MyConst('common_order_status')[$order['status']]['name']; + $status_text = MyLang('common_order_status')[$order['status']]['name']; return DataReturn('状态不可操作['.$status_text.']', -1); } @@ -1886,12 +1886,12 @@ class OrderService // 提交事务 Db::commit(); - return DataReturn(MyLang('common.cancel_success'), 0); + return DataReturn(MyLang('cancel_success'), 0); } // 事务回滚 Db::rollback(); - return DataReturn(MyLang('common.cancel_fail'), -1); + return DataReturn(MyLang('cancel_fail'), -1); } /** @@ -1962,7 +1962,7 @@ class OrderService $operate = self::OrderOperateData($order, $user_type); if($operate['is_delivery'] != 1) { - $status_text = MyConst('common_order_status')[$order['status']]['name']; + $status_text = MyLang('common_order_status')[$order['status']]['name']; throw new \Exception('状态不可操作['.$status_text.']'); } @@ -2095,7 +2095,7 @@ class OrderService $operate = self::OrderOperateData($order, $user_type); if($operate['is_collect'] != 1) { - $status_text = MyConst('common_order_status')[$order['status']]['name']; + $status_text = MyLang('common_order_status')[$order['status']]['name']; return DataReturn('状态不可操作['.$status_text.']', -1); } @@ -2203,7 +2203,7 @@ class OrderService $operate = self::OrderOperateData($order, $user_type); if($operate['is_confirm'] != 1) { - $status_text = MyConst('common_order_status')[$order['status']]['name']; + $status_text = MyLang('common_order_status')[$order['status']]['name']; return DataReturn('状态不可操作['.$status_text.']', -1); } @@ -2308,7 +2308,7 @@ class OrderService $operate = self::OrderOperateData($order, $user_type); if($operate['is_delete'] != 1) { - $status_text = MyConst('common_order_status')[$order['status']]['name']; + $status_text = MyLang('common_order_status')[$order['status']]['name']; return DataReturn('状态不可操作['.$status_text.']', -1); } @@ -2324,7 +2324,7 @@ class OrderService ]; if(!Db::name('Order')->where($where)->update($data)) { - throw new \Exception(MyLang('common.delete_fail')); + throw new \Exception(MyLang('delete_fail')); } // 用户消息 @@ -2345,7 +2345,7 @@ class OrderService // 完成 Db::commit(); - return DataReturn(MyLang('common.delete_success'), 0); + return DataReturn(MyLang('delete_success'), 0); } catch(\Exception $e) { Db::rollback(); return DataReturn($e->getMessage(), -1); @@ -2365,7 +2365,7 @@ class OrderService { // 状态数据封装 $result = []; - $order_status_list = MyConst('common_order_status'); + $order_status_list = MyLang('common_order_status'); foreach($order_status_list as $v) { $result[] = [ @@ -2523,12 +2523,12 @@ class OrderService return DataReturn('订单商品销量增加失败['.$v['title'].']', -10); } } - return DataReturn(MyLang('common.operate_success'), 0); + return DataReturn(MyLang('operate_success'), 0); } else { return DataReturn('订单有误,没有找到相关商品', -100); } } - return DataReturn(MyLang('common.handle_noneed'), 0); + return DataReturn(MyLang('handle_noneed'), 0); } /** diff --git a/app/service/OrderSplitService.php b/app/service/OrderSplitService.php index 4226b4575..db063abe0 100644 --- a/app/service/OrderSplitService.php +++ b/app/service/OrderSplitService.php @@ -107,7 +107,7 @@ class OrderSplitService } // 返回数据 - return DataReturn(MyLang('common.operate_success'), 0, $data); + return DataReturn(MyLang('operate_success'), 0, $data); } /** diff --git a/app/service/PayLogService.php b/app/service/PayLogService.php index bb97a8a08..6f1e763ad 100755 --- a/app/service/PayLogService.php +++ b/app/service/PayLogService.php @@ -122,7 +122,7 @@ class PayLogService } // 返回成功 - return DataReturn(MyLang('common.insert_success'), 0, $data); + return DataReturn(MyLang('insert_success'), 0, $data); } } return DataReturn('支付订单添加失败', -100); @@ -179,7 +179,7 @@ class PayLogService public static function PayLogTypeList($params = []) { $data = Db::name('PayLog')->field('payment as id, payment_name as name')->group('payment,payment_name')->select()->toArray(); - return DataReturn(MyLang('common.handle_success'), 0, $data); + return DataReturn(MyLang('handle_success'), 0, $data); } /** @@ -265,10 +265,10 @@ class PayLogService // 关闭操作 if(Db::name('PayLog')->where(['id'=>$params['ids'], 'status'=>0])->update(['status'=>2, 'close_time'=>time()])) { - return DataReturn(MyLang('common.close_success'), 0); + return DataReturn(MyLang('close_success'), 0); } - return DataReturn(MyLang('common.close_fail'), -100); + return DataReturn(MyLang('close_fail'), -100); } } ?> \ No newline at end of file diff --git a/app/service/PaymentService.php b/app/service/PaymentService.php index 51654c316..817ac9463 100755 --- a/app/service/PaymentService.php +++ b/app/service/PaymentService.php @@ -79,7 +79,7 @@ class PaymentService { if($dh = opendir(self::$payment_dir)) { - $common_platform_type = MyConst('common_platform_type'); + $common_platform_type = MyLang('common_platform_type'); while(($temp_file = readdir($dh)) !== false) { if(substr($temp_file, 0, 1) != '.') @@ -186,7 +186,7 @@ class PaymentService 'is_enable' => 0, 'is_open_user' => 0, 'is_install' => 0, - 'apply_terminal' => empty($data['base']['apply_terminal']) ? array_column(MyConst('common_platform_type'), 'value') : $data['base']['apply_terminal'], + 'apply_terminal' => empty($data['base']['apply_terminal']) ? array_column(MyLang('common_platform_type'), 'value') : $data['base']['apply_terminal'], 'config' => '', ]; } @@ -427,9 +427,9 @@ class PaymentService $data['upd_time'] = time(); if(Db::name('Payment')->where(['id'=>intval($params['id'])])->update($data)) { - return DataReturn(MyLang('common.edit_success'), 0); + return DataReturn(MyLang('edit_success'), 0); } - return DataReturn(MyLang('common.edit_fail'), -100); + return DataReturn(MyLang('edit_fail'), -100); } /** @@ -491,9 +491,9 @@ class PaymentService // 数据更新 if(Db::name('Payment')->where(['payment'=>$params['id']])->update([$params['field']=>intval($params['state']), 'upd_time'=>time()])) { - return DataReturn(MyLang('common.operate_success'), 0); + return DataReturn(MyLang('operate_success'), 0); } - return DataReturn(MyLang('common.operate_fail'), -100); + return DataReturn(MyLang('operate_fail'), -100); } /** @@ -750,13 +750,13 @@ class PaymentService // 删除 if(!@unlink($file)) { - return DataReturn(MyLang('common.delete_fail'), -100); + return DataReturn(MyLang('delete_fail'), -100); } // 删除入口文件 self::PaymentEntranceDelete(['payment' => $payment]); - return DataReturn(MyLang('common.delete_success'), 0); + return DataReturn(MyLang('delete_success'), 0); } /** @@ -1028,7 +1028,7 @@ php; } } - return DataReturn(MyLang('common.operate_success'), 0); + return DataReturn(MyLang('operate_success'), 0); } /** @@ -1072,7 +1072,7 @@ php; } } - return DataReturn(MyLang('common.operate_success'), 0); + return DataReturn(MyLang('operate_success'), 0); } /** diff --git a/app/service/PluginsAdminService.php b/app/service/PluginsAdminService.php index 6eb22419e..01d805892 100755 --- a/app/service/PluginsAdminService.php +++ b/app/service/PluginsAdminService.php @@ -141,7 +141,7 @@ class PluginsAdminService 'db_data' => $db_data, 'dir_data' => array_values($dir_data), ]; - return DataReturn(MyLang('common.handle_success'), 0, $data); + return DataReturn(MyLang('handle_success'), 0, $data); } /** @@ -308,10 +308,10 @@ class PluginsAdminService { // 提交事务 Db::commit(); - return DataReturn(MyLang('common.operate_success'), 0); + return DataReturn(MyLang('operate_success'), 0); } } else { - $ret = DataReturn(MyLang('common.operate_fail'), -100); + $ret = DataReturn(MyLang('operate_fail'), -100); } // 事务回退 @@ -414,7 +414,7 @@ class PluginsAdminService return DataReturn('应用钩子部署失败', -10); } - return DataReturn(MyLang('common.handle_success'), 0); + return DataReturn(MyLang('handle_success'), 0); } /** @@ -490,7 +490,7 @@ class PluginsAdminService // 插件事件回调 PluginsService::PluginsEventCall($plugins, 'Delete', $params); - return DataReturn(MyLang('common.delete_success'), 0); + return DataReturn(MyLang('delete_success'), 0); } return $ret; } @@ -625,7 +625,7 @@ class PluginsAdminService return $ret; } - return DataReturn(MyLang('common.operate_success'), 0); + return DataReturn(MyLang('operate_success'), 0); } /** @@ -864,7 +864,7 @@ php; } } - return DataReturn(MyLang('common.operate_success'), 0); + return DataReturn(MyLang('operate_success'), 0); } /** @@ -923,7 +923,7 @@ php; return DataReturn('应用配置文件创建失败', -10); } - return DataReturn(MyLang('common.operate_success'), 0); + return DataReturn(MyLang('operate_success'), 0); } /** @@ -1572,7 +1572,7 @@ php; // 完成 Db::commit(); - return DataReturn(MyLang('common.operate_success'), 0); + return DataReturn(MyLang('operate_success'), 0); } catch(\Exception $e) { Db::rollback(); return DataReturn($e->getMessage(), -1); diff --git a/app/service/PluginsService.php b/app/service/PluginsService.php index 3cfe428f8..78f96a1ce 100755 --- a/app/service/PluginsService.php +++ b/app/service/PluginsService.php @@ -70,7 +70,7 @@ class PluginsService // 加入静态记录 $static_all_plugins_data[$plugins] = $data; } - return DataReturn(MyLang('common.handle_success'), 0, $data); + return DataReturn(MyLang('handle_success'), 0, $data); } /** @@ -212,9 +212,9 @@ class PluginsService // 删除缓存 self::PluginsCacheDelete($params['plugins']); - return DataReturn(MyLang('common.operate_success'), 0); + return DataReturn(MyLang('operate_success'), 0); } - return DataReturn(MyLang('common.operate_fail'), -100); + return DataReturn(MyLang('operate_fail'), -100); } /** @@ -274,7 +274,7 @@ class PluginsService public static function PluginsField($plugins, $field) { $data = Db::name('Plugins')->where(['plugins'=>$plugins])->value($field); - return DataReturn(MyLang('common.operate_success'), 0, $data); + return DataReturn(MyLang('operate_success'), 0, $data); } /** diff --git a/app/service/QuickNavService.php b/app/service/QuickNavService.php index 8760481dc..806720fd2 100755 --- a/app/service/QuickNavService.php +++ b/app/service/QuickNavService.php @@ -38,8 +38,8 @@ class QuickNavService { if(!empty($data)) { - $common_platform_type = MyConst('common_platform_type'); - $common_app_event_type = MyConst('common_app_event_type'); + $common_platform_type = MyLang('common_platform_type'); + $common_app_event_type = MyLang('common_app_event_type'); foreach($data as &$v) { // 平台类型 @@ -96,13 +96,13 @@ class QuickNavService [ 'checked_type' => 'in', 'key_name' => 'platform', - 'checked_data' => array_column(MyConst('common_platform_type'), 'value'), + 'checked_data' => array_column(MyLang('common_platform_type'), 'value'), 'error_msg' => '平台类型有误', ], [ 'checked_type' => 'in', 'key_name' => 'event_type', - 'checked_data' => array_column(MyConst('common_app_event_type'), 'value'), + 'checked_data' => array_column(MyLang('common_app_event_type'), 'value'), 'is_checked' => 2, 'error_msg' => '事件值类型有误', ], @@ -152,16 +152,16 @@ class QuickNavService $data['add_time'] = time(); if(Db::name('QuickNav')->insertGetId($data) > 0) { - return DataReturn(MyLang('common.insert_success'), 0); + return DataReturn(MyLang('insert_success'), 0); } - return DataReturn(MyLang('common.insert_fail'), -100); + return DataReturn(MyLang('insert_fail'), -100); } else { $data['upd_time'] = time(); if(Db::name('QuickNav')->where(['id'=>intval($params['id'])])->update($data)) { - return DataReturn(MyLang('common.edit_success'), 0); + return DataReturn(MyLang('edit_success'), 0); } - return DataReturn(MyLang('common.edit_fail'), -100); + return DataReturn(MyLang('edit_fail'), -100); } } @@ -190,10 +190,10 @@ class QuickNavService // 删除操作 if(Db::name('QuickNav')->where(['id'=>$params['ids']])->delete()) { - return DataReturn(MyLang('common.delete_success'), 0); + return DataReturn(MyLang('delete_success'), 0); } - return DataReturn(MyLang('common.delete_fail'), -100); + return DataReturn(MyLang('delete_fail'), -100); } /** @@ -234,9 +234,9 @@ class QuickNavService // 数据更新 if(Db::name('QuickNav')->where(['id'=>intval($params['id'])])->update([$params['field']=>intval($params['state']), 'upd_time'=>time()])) { - return DataReturn(MyLang('common.operate_success'), 0); + return DataReturn(MyLang('operate_success'), 0); } - return DataReturn(MyLang('common.operate_fail'), -100); + return DataReturn(MyLang('operate_fail'), -100); } /** diff --git a/app/service/RefundLogService.php b/app/service/RefundLogService.php index 5ea491766..e17e67b14 100644 --- a/app/service/RefundLogService.php +++ b/app/service/RefundLogService.php @@ -76,7 +76,7 @@ class RefundLogService public static function RefundLogTypeList($params = []) { $data = Db::name('RefundLog')->field('payment as id, payment_name as name')->group('payment,payment_name')->select()->toArray(); - return DataReturn(MyLang('common.handle_success'), 0, $data); + return DataReturn(MyLang('handle_success'), 0, $data); } /** @@ -93,7 +93,7 @@ class RefundLogService { if(!empty($data)) { - $refundment_list = MyConst('common_order_aftersale_refundment_list'); + $refundment_list = MyLang('common_order_aftersale_refundment_list'); foreach($data as &$v) { // 用户信息 diff --git a/app/service/RegionService.php b/app/service/RegionService.php index 9ee7dd3e0..31d1ce64d 100755 --- a/app/service/RegionService.php +++ b/app/service/RegionService.php @@ -116,9 +116,9 @@ class RegionService $v['is_son'] = (Db::name('Region')->where(['pid'=>$v['id']])->count() > 0) ? 'ok' : 'no'; $v['json'] = json_encode($v); } - return DataReturn(MyLang('common.operate_success'), 0, $data); + return DataReturn(MyLang('operate_success'), 0, $data); } - return DataReturn(MyLang('common.no_data'), -100); + return DataReturn(MyLang('no_data'), -100); } /** @@ -171,18 +171,18 @@ class RegionService $data['id'] = Db::name('Region')->insertGetId($data); if($data['id'] <= 0) { - return DataReturn(MyLang('common.insert_fail'), -100); + return DataReturn(MyLang('insert_fail'), -100); } } else { $data['upd_time'] = time(); if(Db::name('Region')->where(['id'=>intval($params['id'])])->update($data) === false) { - return DataReturn(MyLang('common.edit_fail'), -100); + return DataReturn(MyLang('edit_fail'), -100); } else { $data['id'] = $params['id']; } } - return DataReturn(MyLang('common.operate_success'), 0, $data); + return DataReturn(MyLang('operate_success'), 0, $data); } /** @@ -221,9 +221,9 @@ class RegionService // 开始删除 if(Db::name('Region')->where(['id'=>$ids])->delete()) { - return DataReturn(MyLang('common.delete_success'), 0); + return DataReturn(MyLang('delete_success'), 0); } - return DataReturn(MyLang('common.delete_fail'), -100); + return DataReturn(MyLang('delete_fail'), -100); } /** @@ -397,7 +397,7 @@ class RegionService { return DataReturn('无相关地区', -1); } - return DataReturn(MyLang('common.get_success'), 0, $result); + return DataReturn(MyLang('get_success'), 0, $result); } } ?> \ No newline at end of file diff --git a/app/service/ResourcesService.php b/app/service/ResourcesService.php index 2908ffaed..1a8347099 100755 --- a/app/service/ResourcesService.php +++ b/app/service/ResourcesService.php @@ -313,7 +313,7 @@ class ResourcesService $params['id'] = $attachment_id; $params['url'] = self::AttachmentPathViewHandle($data['url']); $params['add_time'] = date('Y-m-d H:i:s', $data['add_time']); - return DataReturn(MyLang('common.insert_success'), 0, $params); + return DataReturn(MyLang('insert_success'), 0, $params); } // 删除本地图片 @@ -321,7 +321,7 @@ class ResourcesService { \base\FileUtil::UnlinkFile($params['path']); } - return DataReturn(MyLang('common.insert_fail'), -100); + return DataReturn(MyLang('insert_fail'), -100); } /** @@ -428,9 +428,9 @@ class ResourcesService // 删除附件 \base\FileUtil::UnlinkFile($path); - $ret = DataReturn(MyLang('common.delete_success'), 0); + $ret = DataReturn(MyLang('delete_success'), 0); } else { - $ret = DataReturn(MyLang('common.delete_fail'), -100); + $ret = DataReturn(MyLang('delete_fail'), -100); } } else { $ret = DataReturn('没有删除权限', -1); @@ -438,9 +438,9 @@ class ResourcesService } else { if(DB::name('Attachment')->where(['id'=>$data['id']])->delete()) { - $ret = DataReturn(MyLang('common.delete_success'), 0); + $ret = DataReturn(MyLang('delete_success'), 0); } else { - $ret = DataReturn(MyLang('common.delete_fail'), -100); + $ret = DataReturn(MyLang('delete_fail'), -100); } } @@ -476,7 +476,7 @@ class ResourcesService // 删除数据库数据 if(!DB::name('Attachment')->where($where)->delete()) { - return DataReturn(MyLang('common.delete_fail'), -1); + return DataReturn(MyLang('delete_fail'), -1); } // 删除磁盘文件 @@ -499,7 +499,7 @@ class ResourcesService 'data' => $data, ]); - return DataReturn(MyLang('common.delete_success'), 0); + return DataReturn(MyLang('delete_success'), 0); } /** diff --git a/app/service/SafetyService.php b/app/service/SafetyService.php index be4b4fea5..87d5c8f88 100755 --- a/app/service/SafetyService.php +++ b/app/service/SafetyService.php @@ -84,7 +84,7 @@ class SafetyService $ret = self::UserLoginPwdUpdate($accounts, $user['id'], $params['new_pwd']); if($ret['code'] != 0) { - return DataReturn(MyLang('common.operate_success'), 0); + return DataReturn(MyLang('operate_success'), 0); } return $ret; } @@ -124,9 +124,9 @@ class SafetyService return $ret; } - return DataReturn(MyLang('common.change_success'), 0); + return DataReturn(MyLang('change_success'), 0); } - return DataReturn(MyLang('common.change_fail'), -100); + return DataReturn(MyLang('change_fail'), -100); } /** @@ -177,9 +177,9 @@ class SafetyService { return DataReturn('验证码错误', -12); } - return DataReturn(MyLang('common.operate_success'), 0, $verify); + return DataReturn(MyLang('operate_success'), 0, $verify); } - return DataReturn(MyLang('common.operate_success'), 0); + return DataReturn(MyLang('operate_success'), 0); } /** @@ -271,9 +271,9 @@ class SafetyService $verify['data']->Remove(); } - return DataReturn(MyLang('common.send_success'), 0); + return DataReturn(MyLang('send_success'), 0); } - return DataReturn(MyLang('common.send_fail').'['.$obj->error.']', -100); + return DataReturn(MyLang('send_fail').'['.$obj->error.']', -100); } /** @@ -451,9 +451,9 @@ class SafetyService return $ret; } - return DataReturn(MyLang('common.operate_success'), 0); + return DataReturn(MyLang('operate_success'), 0); } - return DataReturn(MyLang('common.operate_fail'), -100); + return DataReturn(MyLang('operate_fail'), -100); } /** @@ -501,9 +501,9 @@ class SafetyService if(Db::name('User')->where(['id'=>$params['user']['id']])->update($data)) { UserService::Logout(); - return DataReturn(MyLang('common.logout_success'), 0); + return DataReturn(MyLang('logout_success'), 0); } - return DataReturn(MyLang('common.logout_fail'), -1); + return DataReturn(MyLang('logout_fail'), -1); } } ?> \ No newline at end of file diff --git a/app/service/ScreeningPriceService.php b/app/service/ScreeningPriceService.php index 157cb39ff..672ebbe75 100755 --- a/app/service/ScreeningPriceService.php +++ b/app/service/ScreeningPriceService.php @@ -45,9 +45,9 @@ class ScreeningPriceService $v['is_son'] = (Db::name('ScreeningPrice')->where(['pid'=>$v['id']])->count() > 0) ? 'ok' : 'no'; $v['json'] = json_encode($v); } - return DataReturn(MyLang('common.operate_success'), 0, $data); + return DataReturn(MyLang('operate_success'), 0, $data); } - return DataReturn(MyLang('common.no_data'), -100); + return DataReturn(MyLang('no_data'), -100); } /** @@ -92,18 +92,18 @@ class ScreeningPriceService $data['id'] = Db::name('ScreeningPrice')->insertGetId($data); if($data['id'] <= 0) { - return DataReturn(MyLang('common.insert_fail'), -100); + return DataReturn(MyLang('insert_fail'), -100); } } else { $data['upd_time'] = time(); if(Db::name('ScreeningPrice')->where(['id'=>intval($params['id'])])->update($data) === false) { - return DataReturn(MyLang('common.edit_fail'), -100); + return DataReturn(MyLang('edit_fail'), -100); } else { $data['id'] = $params['id']; } } - return DataReturn(MyLang('common.operate_success'), 0, $data); + return DataReturn(MyLang('operate_success'), 0, $data); } /** @@ -138,9 +138,9 @@ class ScreeningPriceService // 开始删除 if(Db::name('ScreeningPrice')->where(['id'=>intval($params['id'])])->delete()) { - return DataReturn(MyLang('common.delete_success'), 0); + return DataReturn(MyLang('delete_success'), 0); } - return DataReturn(MyLang('common.delete_fail'), -100); + return DataReturn(MyLang('delete_fail'), -100); } } ?> \ No newline at end of file diff --git a/app/service/SearchService.php b/app/service/SearchService.php index 4b65f2e1d..a303a6338 100755 --- a/app/service/SearchService.php +++ b/app/service/SearchService.php @@ -218,7 +218,7 @@ class SearchService $result['data'] = $goods['data']; $result['page_total'] = ceil($result['total']/$result['page_size']); } - return DataReturn(MyLang('common.handle_success'), 0, $result); + return DataReturn(MyLang('handle_success'), 0, $result); } /** diff --git a/app/service/SiteService.php b/app/service/SiteService.php index 671a48108..2afa6017f 100644 --- a/app/service/SiteService.php +++ b/app/service/SiteService.php @@ -132,7 +132,7 @@ class SiteService } } } - return DataReturn(MyLang('common.handle_success'), 0, $result); + return DataReturn(MyLang('handle_success'), 0, $result); } /** @@ -182,7 +182,7 @@ class SiteService $result[$k] = $temp; } } - return DataReturn(MyLang('common.handle_success'), 0, $result); + return DataReturn(MyLang('handle_success'), 0, $result); } } ?> \ No newline at end of file diff --git a/app/service/SlideService.php b/app/service/SlideService.php index c1a8967fd..8ddfff246 100755 --- a/app/service/SlideService.php +++ b/app/service/SlideService.php @@ -40,7 +40,7 @@ class SlideService $n = isset($params['n']) ? intval($params['n']) : 10; $data = Db::name('Slide')->field($field)->where($where)->order($order_by)->limit($m, $n)->select()->toArray(); - return DataReturn(MyLang('common.handle_success'), 0, self::SlideListHandle($data, $params)); + return DataReturn(MyLang('handle_success'), 0, self::SlideListHandle($data, $params)); } /** @@ -57,9 +57,9 @@ class SlideService { if(!empty($data)) { - $common_platform_type = MyConst('common_platform_type'); - $common_is_enable_tips = MyConst('common_is_enable_tips'); - $common_app_event_type = MyConst('common_app_event_type'); + $common_platform_type = MyLang('common_platform_type'); + $common_is_enable_tips = MyLang('common_is_enable_tips'); + $common_app_event_type = MyLang('common_app_event_type'); foreach($data as &$v) { // 图片地址 @@ -104,13 +104,13 @@ class SlideService [ 'checked_type' => 'in', 'key_name' => 'platform', - 'checked_data' => array_column(MyConst('common_platform_type'), 'value'), + 'checked_data' => array_column(MyLang('common_platform_type'), 'value'), 'error_msg' => '平台类型有误', ], [ 'checked_type' => 'in', 'key_name' => 'event_type', - 'checked_data' => array_column(MyConst('common_app_event_type'), 'value'), + 'checked_data' => array_column(MyLang('common_app_event_type'), 'value'), 'is_checked' => 2, 'error_msg' => '事件值类型有误', ], @@ -160,16 +160,16 @@ class SlideService $data['add_time'] = time(); if(Db::name('Slide')->insertGetId($data) > 0) { - return DataReturn(MyLang('common.insert_success'), 0); + return DataReturn(MyLang('insert_success'), 0); } - return DataReturn(MyLang('common.insert_fail'), -100); + return DataReturn(MyLang('insert_fail'), -100); } else { $data['upd_time'] = time(); if(Db::name('Slide')->where(['id'=>intval($params['id'])])->update($data)) { - return DataReturn(MyLang('common.edit_success'), 0); + return DataReturn(MyLang('edit_success'), 0); } - return DataReturn(MyLang('common.edit_fail'), -100); + return DataReturn(MyLang('edit_fail'), -100); } } @@ -198,10 +198,10 @@ class SlideService // 删除操作 if(Db::name('Slide')->where(['id'=>$params['ids']])->delete()) { - return DataReturn(MyLang('common.delete_success'), 0); + return DataReturn(MyLang('delete_success'), 0); } - return DataReturn(MyLang('common.delete_fail'), -100); + return DataReturn(MyLang('delete_fail'), -100); } /** @@ -242,9 +242,9 @@ class SlideService // 数据更新 if(Db::name('Slide')->where(['id'=>intval($params['id'])])->update([$params['field']=>intval($params['state']), 'upd_time'=>time()])) { - return DataReturn(MyLang('common.edit_success'), 0); + return DataReturn(MyLang('edit_success'), 0); } - return DataReturn(MyLang('common.edit_fail'), -100); + return DataReturn(MyLang('edit_fail'), -100); } } ?> \ No newline at end of file diff --git a/app/service/StatisticalService.php b/app/service/StatisticalService.php index a24f393b2..7edc88f0c 100755 --- a/app/service/StatisticalService.php +++ b/app/service/StatisticalService.php @@ -282,7 +282,7 @@ class StatisticalService 'yesterday_count' => $yesterday_count, 'today_count' => $today_count, ]; - return DataReturn(MyLang('common.handle_success'), 0, $result); + return DataReturn(MyLang('handle_success'), 0, $result); } /** @@ -340,7 +340,7 @@ class StatisticalService 'yesterday_count' => $yesterday_count, 'today_count' => $today_count, ]; - return DataReturn(MyLang('common.handle_success'), 0, $result); + return DataReturn(MyLang('handle_success'), 0, $result); } /** @@ -398,7 +398,7 @@ class StatisticalService 'yesterday_count' => $yesterday_count, 'today_count' => $today_count, ]; - return DataReturn(MyLang('common.handle_success'), 0, $result); + return DataReturn(MyLang('handle_success'), 0, $result); } /** @@ -465,7 +465,7 @@ class StatisticalService 'yesterday_count' => PriceNumberFormat($yesterday_count), 'today_count' => PriceNumberFormat($today_count), ]; - return DataReturn(MyLang('common.handle_success'), 0, $result); + return DataReturn(MyLang('handle_success'), 0, $result); } /** @@ -514,7 +514,7 @@ class StatisticalService 'order_sale_count' => $order_sale_count, 'order_complete_total' => PriceNumberFormat($order_complete_total), ]; - return DataReturn(MyLang('common.handle_success'), 0, $result); + return DataReturn(MyLang('handle_success'), 0, $result); } /** @@ -568,7 +568,7 @@ class StatisticalService public static function OrderTradingTotal($params = []) { // 订单状态列表 - $order_status_list = MyConst('common_order_status'); + $order_status_list = MyLang('common_order_status'); $status_arr = array_column($order_status_list, 'id'); // 循环获取统计数据 @@ -611,7 +611,7 @@ class StatisticalService 'name_arr' => $name_arr, 'data' => $data, ]; - return DataReturn(MyLang('common.handle_success'), 0, $result); + return DataReturn(MyLang('handle_success'), 0, $result); } /** @@ -625,7 +625,7 @@ class StatisticalService public static function OrderProfitTotal($params = []) { // 订单状态列表 - $order_status_list = MyConst('common_order_status'); + $order_status_list = MyLang('common_order_status'); $status_arr = array_column($order_status_list, 'id'); // 循环获取统计数据 @@ -673,7 +673,7 @@ class StatisticalService 'name_arr' => $name_arr, 'data' => $data, ]; - return DataReturn(MyLang('common.handle_success'), 0, $result); + return DataReturn(MyLang('handle_success'), 0, $result); } /** @@ -727,7 +727,7 @@ class StatisticalService 'name_arr' => array_column($data, 'name'), 'data' => $data, ]; - return DataReturn(MyLang('common.handle_success'), 0, $result); + return DataReturn(MyLang('handle_success'), 0, $result); } /** @@ -792,7 +792,7 @@ class StatisticalService 'name_arr' => $name_arr, 'data' => $data, ]; - return DataReturn(MyLang('common.handle_success'), 0, $result); + return DataReturn(MyLang('handle_success'), 0, $result); } /** @@ -837,7 +837,7 @@ class StatisticalService 'name_arr' => array_column($data, 'name'), 'data' => array_column($data, 'value'), ]; - return DataReturn(MyLang('common.handle_success'), 0, $result); + return DataReturn(MyLang('handle_success'), 0, $result); } /** diff --git a/app/service/SystemService.php b/app/service/SystemService.php index 183423942..993abc41f 100644 --- a/app/service/SystemService.php +++ b/app/service/SystemService.php @@ -207,7 +207,7 @@ class SystemService $lang_common = []; } // 当前控制器 - $lang_page = MyLang('page_'.RequestController()); + $lang_page = MyLang(RequestController().'.page_common'); if(empty($lang_page) || !is_array($lang_page)) { $lang_page = []; diff --git a/app/service/SystemUpgradeService.php b/app/service/SystemUpgradeService.php index e65dd4ae2..bbcd4d508 100644 --- a/app/service/SystemUpgradeService.php +++ b/app/service/SystemUpgradeService.php @@ -127,7 +127,7 @@ class SystemUpgradeService \base\FileUtil::UnlinkFile($upgrade_url); // 返回提示 - return DataReturn(MyLang('common.update_success'), 0); + return DataReturn(MyLang('update_success'), 0); } /** diff --git a/app/service/ThemeService.php b/app/service/ThemeService.php index 658983d33..1bb871593 100755 --- a/app/service/ThemeService.php +++ b/app/service/ThemeService.php @@ -287,7 +287,7 @@ class ThemeService // 开始删除主题 if(\base\FileUtil::UnlinkDir(ROOT.self::$html_path.$id) && \base\FileUtil::UnlinkDir(ROOT.self::$static_path.$id)) { - return DataReturn(MyLang('common.delete_success'), 0); + return DataReturn(MyLang('delete_success'), 0); } return DataReturn('删除失败或资源不存在', -100); } diff --git a/app/service/UeditorService.php b/app/service/UeditorService.php index 9b410f8e2..573946703 100644 --- a/app/service/UeditorService.php +++ b/app/service/UeditorService.php @@ -255,7 +255,7 @@ class UeditorService } } - return DataReturn(MyLang('common.no_data'), -1); + return DataReturn(MyLang('no_data'), -1); } /** @@ -317,7 +317,7 @@ class UeditorService { return DataReturn('success', 0, $list); } - return DataReturn(MyLang('common.no_data'), -1); + return DataReturn(MyLang('no_data'), -1); } } ?> \ No newline at end of file diff --git a/app/service/UserAddressService.php b/app/service/UserAddressService.php index 9c95d2e18..cc1bc8a40 100644 --- a/app/service/UserAddressService.php +++ b/app/service/UserAddressService.php @@ -42,7 +42,7 @@ class UserAddressService // 获取列表 $data = Db::name('UserAddress')->where($where)->order($order_by)->limit($m, $n)->select()->toArray(); - return DataReturn(MyLang('common.handle_success'), 0, self::UserAddressListHandle($data), $params); + return DataReturn(MyLang('handle_success'), 0, self::UserAddressListHandle($data), $params); } /** @@ -70,10 +70,10 @@ class UserAddressService // 删除操作 if(Db::name('UserAddress')->where(['id'=>$params['ids']])->delete()) { - return DataReturn(MyLang('common.delete_success'), 0); + return DataReturn(MyLang('delete_success'), 0); } - return DataReturn(MyLang('common.delete_fail'), -100); + return DataReturn(MyLang('delete_fail'), -100); } /** @@ -207,7 +207,7 @@ class UserAddressService 'user_id' => $params['user']['id'], ]); - return DataReturn(MyLang('common.operate_success'), 0, $data); + return DataReturn(MyLang('operate_success'), 0, $data); } /** @@ -527,7 +527,7 @@ class UserAddressService 'user_id' => $params['user']['id'], ]); - return DataReturn(MyLang('common.delete_success'), 0); + return DataReturn(MyLang('delete_success'), 0); } else { return DataReturn('删除失败或资源不存在', -100); } diff --git a/app/service/UserService.php b/app/service/UserService.php index a50bd6821..3af811c03 100755 --- a/app/service/UserService.php +++ b/app/service/UserService.php @@ -135,7 +135,7 @@ class UserService } if(!in_array($user['status'], [0,1])) { - $common_user_status_list = MyConst('common_user_status_list'); + $common_user_status_list = MyLang('common_user_status_list'); if(isset($common_user_status_list[$user['status']])) { return DataReturn($common_user_status_list[$user['status']]['tips'], -110); @@ -164,7 +164,7 @@ class UserService // 获取用户列表 $data = Db::name('User')->where($where)->order($order_by)->field($field)->limit($m, $n)->select()->toArray(); - return DataReturn(MyLang('common.handle_success'), 0, self::UserListHandle($data, $params)); + return DataReturn(MyLang('handle_success'), 0, self::UserListHandle($data, $params)); } /** @@ -200,8 +200,8 @@ class UserService } // 开始处理数据 - $common_gender_list = MyConst('common_gender_list'); - $common_user_status_list = MyConst('common_user_status_list'); + $common_gender_list = MyLang('common_gender_list'); + $common_user_status_list = MyLang('common_user_status_list'); foreach($data as &$v) { // 生日 @@ -331,13 +331,13 @@ class UserService [ 'checked_type' => 'in', 'key_name' => 'gender', - 'checked_data' => array_column(MyConst('common_gender_list'), 'id'), + 'checked_data' => array_column(MyLang('common_gender_list'), 'id'), 'error_msg' => '性别值范围不正确', ], [ 'checked_type' => 'in', 'key_name' => 'status', - 'checked_data' => array_column(MyConst('common_user_status_list'), 'id'), + 'checked_data' => array_column(MyLang('common_user_status_list'), 'id'), 'error_msg' => '状态值范围不正确', ], [ @@ -465,9 +465,9 @@ class UserService } IntegralService::UserIntegralLogAdd($user_id, $old_integral, $opt_integral, '管理员操作', $integral_type, $params['admin']['id']); } - return DataReturn(MyLang('common.operate_success'), 0); + return DataReturn(MyLang('operate_success'), 0); } - return DataReturn(MyLang('common.operate_fail'), -100); + return DataReturn(MyLang('operate_fail'), -100); } /** @@ -497,9 +497,9 @@ class UserService { return $ret; } - return DataReturn(MyLang('common.update_success'), 0); + return DataReturn(MyLang('update_success'), 0); } - return DataReturn(MyLang('common.update_fail'), -100); + return DataReturn(MyLang('update_fail'), -100); } /** @@ -526,9 +526,9 @@ class UserService // 删除操作 if(Db::name('User')->where(['id'=>$params['ids']])->delete()) { - return DataReturn(MyLang('common.delete_success'), 0); + return DataReturn(MyLang('delete_success'), 0); } - return DataReturn(MyLang('common.delete_fail'), -100); + return DataReturn(MyLang('delete_fail'), -100); } /** @@ -595,7 +595,7 @@ class UserService } if(isset($user['gender'])) { - $user['gender_text'] = MyConst('common_gender_list')[$user['gender']]['name']; + $user['gender_text'] = MyLang('common_gender_list')[$user['gender']]['name']; } if(isset($user['birthday'])) { @@ -766,7 +766,7 @@ class UserService // app则直接返回图片地址 if(APPLICATION == 'app') { - return DataReturn(MyLang('common.upload_success'), 0, ResourcesService::AttachmentPathViewHandle($avatar)); + return DataReturn(MyLang('upload_success'), 0, ResourcesService::AttachmentPathViewHandle($avatar)); } // 更新用户头像 @@ -792,9 +792,9 @@ class UserService // web端用户登录纪录处理 self::UserLoginRecord($params['user']['id']); - return DataReturn(MyLang('common.upload_success'), 0); + return DataReturn(MyLang('upload_success'), 0); } - return DataReturn(MyLang('common.upload_fail'), -100); + return DataReturn(MyLang('upload_fail'), -100); } /** @@ -825,7 +825,7 @@ class UserService [ 'checked_type' => 'in', 'key_name' => 'type', - 'checked_data' => array_column(MyConst('common_login_type_list'), 'value'), + 'checked_data' => array_column(MyLang('common_login_type_list'), 'value'), 'error_msg' => '登录类型有误', ], [ @@ -947,7 +947,7 @@ class UserService // 用户状态 if(in_array($user['status'], [2,3])) { - return DataReturn(MyConst('common_user_status_list')[$user['status']]['tips'], -10); + return DataReturn(MyLang('common_user_status_list')[$user['status']]['tips'], -10); } // 用户登录前钩子 @@ -1007,7 +1007,7 @@ class UserService return self::UserLoginHandle($user['id'], $params); } - return DataReturn('登录失效,请重新登录', -100); + return DataReturn(MyLang('login_failure_tips'), -100); } /** @@ -1063,7 +1063,7 @@ class UserService } return DataReturn('登录成功', 0, $result); } - return DataReturn('登录失效,请重新登录', -100); + return DataReturn(MyLang('login_failure_tips'), -100); } /** @@ -1092,7 +1092,7 @@ class UserService [ 'checked_type' => 'in', 'key_name' => 'type', - 'checked_data' => array_column(MyConst('common_user_reg_type_list'), 'value'), + 'checked_data' => array_column(MyLang('common_user_reg_type_list'), 'value'), 'error_msg' => '注册类型有误', ], [ @@ -1282,7 +1282,7 @@ class UserService } break; } - return DataReturn(MyLang('common.operate_success'), 0); + return DataReturn(MyLang('operate_success'), 0); } /** @@ -1329,9 +1329,9 @@ class UserService { return DataReturn('验证码错误', -12); } - return DataReturn(MyLang('common.operate_success'), 0, $verify); + return DataReturn(MyLang('operate_success'), 0, $verify); } - return DataReturn(MyLang('common.operate_success'), 0); + return DataReturn(MyLang('operate_success'), 0); } /** @@ -1390,7 +1390,7 @@ class UserService } break; } - return DataReturn(MyLang('common.operate_success'), 0, $field); + return DataReturn(MyLang('operate_success'), 0, $field); } /** @@ -1413,7 +1413,7 @@ class UserService [ 'checked_type' => 'in', 'key_name' => 'type', - 'checked_data' => array_column(MyConst('common_login_type_list'), 'value'), + 'checked_data' => array_column(MyLang('common_login_type_list'), 'value'), 'error_msg' => '登录类型有误', ], ]; @@ -1489,9 +1489,9 @@ class UserService $verify['data']->Remove(); } - return DataReturn(MyLang('common.send_success'), 0); + return DataReturn(MyLang('send_success'), 0); } else { - return DataReturn(MyLang('common.send_fail').'['.$obj->error.']', -100); + return DataReturn(MyLang('send_fail').'['.$obj->error.']', -100); } } @@ -1515,7 +1515,7 @@ class UserService [ 'checked_type' => 'in', 'key_name' => 'type', - 'checked_data' => array_column(MyConst('common_user_reg_type_list'), 'value'), + 'checked_data' => array_column(MyLang('common_user_reg_type_list'), 'value'), 'error_msg' => '注册类型有误', ], ]; @@ -1591,9 +1591,9 @@ class UserService $verify['data']->Remove(); } - return DataReturn(MyLang('common.send_success'), 0); + return DataReturn(MyLang('send_success'), 0); } else { - return DataReturn(MyLang('common.send_fail').'['.$obj->error.']', -100); + return DataReturn(MyLang('send_fail').'['.$obj->error.']', -100); } } @@ -1675,9 +1675,9 @@ class UserService $verify['data']->Remove(); } - return DataReturn(MyLang('common.send_success'), 0); + return DataReturn(MyLang('send_success'), 0); } else { - return DataReturn(MyLang('common.send_fail').'['.$obj->error.']', -100); + return DataReturn(MyLang('send_fail').'['.$obj->error.']', -100); } } @@ -1698,14 +1698,14 @@ class UserService { return DataReturn('手机号码不存在', -3); } - return DataReturn(MyLang('common.operate_success'), 0, 'mobile'); + return DataReturn(MyLang('operate_success'), 0, 'mobile'); } else if(CheckEmail($accounts)) { if(!self::IsExistAccounts($accounts, 'email')) { return DataReturn('电子邮箱不存在', -3); } - return DataReturn(MyLang('common.operate_success'), 0, 'email'); + return DataReturn(MyLang('operate_success'), 0, 'email'); } return DataReturn('手机/邮箱格式有误', -4); } @@ -1801,7 +1801,7 @@ class UserService { $obj->Remove(); } - return DataReturn(MyLang('common.operate_success'), 0); + return DataReturn(MyLang('operate_success'), 0); } return $ret; } @@ -1878,9 +1878,9 @@ class UserService MyCache(SystemService::CacheKey('shopxo.cache_user_info').$user['token'], $user); } - return DataReturn(MyLang('common.change_success'), 0, $user); + return DataReturn(MyLang('change_success'), 0, $user); } - return DataReturn(MyLang('common.change_fail'), -100); + return DataReturn(MyLang('change_fail'), -100); } /** @@ -1944,7 +1944,7 @@ class UserService } } - return DataReturn(MyLang('common.auth_success'), 0, $user); + return DataReturn(MyLang('auth_success'), 0, $user); } else { // 是否需要添加用户 $is_insert_user = false; @@ -2041,12 +2041,12 @@ class UserService { return DataReturn('用户等待审核中', -110); } - return DataReturn(MyLang('common.auth_success'), 0, self::AppUserInfoHandle($ret['data']['user_id'])); + return DataReturn(MyLang('auth_success'), 0, self::AppUserInfoHandle($ret['data']['user_id'])); } return $ret; } } - return DataReturn(MyLang('common.auth_success'), 0, self::AppUserInfoHandle(null, null, null, $data)); + return DataReturn(MyLang('auth_success'), 0, self::AppUserInfoHandle(null, null, null, $data)); } /** @@ -2082,7 +2082,7 @@ class UserService { $field = null; $value = null; - $fields_arr = array_column(MyConst('common_appmini_type'), 'value'); + $fields_arr = array_column(MyLang('common_appmini_type'), 'value'); foreach($fields_arr as $type) { $openid = $type.'_openid'; @@ -2352,9 +2352,9 @@ class UserService 'user_id' => $user_id, ]; - return DataReturn(MyLang('common.insert_success'), 0, $result); + return DataReturn(MyLang('insert_success'), 0, $result); } - return DataReturn(MyLang('common.insert_fail'), -100); + return DataReturn(MyLang('insert_fail'), -100); } /** @@ -2528,7 +2528,7 @@ class UserService ]; // 是否小程序请求 - $is_appmini = array_key_exists(APPLICATION_CLIENT_TYPE, MyConst('common_appmini_type')); + $is_appmini = array_key_exists(APPLICATION_CLIENT_TYPE, MyLang('common_appmini_type')); // 手机号码获取用户信息 $mobile_user = self::UserInfo('mobile', $data['mobile']); @@ -2700,9 +2700,9 @@ class UserService // 状态 if($status) { - return DataReturn(MyLang('common.send_success'), 0); + return DataReturn(MyLang('send_success'), 0); } - return DataReturn(MyLang('common.send_fail').'['.$obj->error.']', -100); + return DataReturn(MyLang('send_fail').'['.$obj->error.']', -100); } /** @@ -2869,7 +2869,7 @@ class UserService } } } - return DataReturn(MyLang('common.operate_success'), 0, $data); + return DataReturn(MyLang('operate_success'), 0, $data); } /** diff --git a/app/service/WarehouseGoodsService.php b/app/service/WarehouseGoodsService.php index 3af65d496..88a12f755 100644 --- a/app/service/WarehouseGoodsService.php +++ b/app/service/WarehouseGoodsService.php @@ -194,7 +194,7 @@ class WarehouseGoodsService // 提交事务 Db::commit(); - return DataReturn(MyLang('common.delete_success'), 0); + return DataReturn(MyLang('delete_success'), 0); } /** @@ -261,11 +261,11 @@ class WarehouseGoodsService // 提交事务 Db::commit(); - return DataReturn(MyLang('common.edit_success'), 0); + return DataReturn(MyLang('edit_success'), 0); } Db::rollback(); - return DataReturn(MyLang('common.edit_fail'), -100); + return DataReturn(MyLang('edit_fail'), -100); } /** @@ -352,7 +352,7 @@ class WarehouseGoodsService } } } - return DataReturn(MyLang('common.handle_success'), 0, $result); + return DataReturn(MyLang('handle_success'), 0, $result); } /** @@ -401,10 +401,10 @@ class WarehouseGoodsService ]; if(Db::name('WarehouseGoods')->insertGetId($data) <= 0) { - return DataReturn(MyLang('common.insert_fail'), -100); + return DataReturn(MyLang('insert_fail'), -100); } } - return DataReturn(MyLang('common.insert_success'), 0); + return DataReturn(MyLang('insert_success'), 0); } /** @@ -457,11 +457,11 @@ class WarehouseGoodsService // 提交事务 Db::commit(); - return DataReturn(MyLang('common.delete_success'), 0); + return DataReturn(MyLang('delete_success'), 0); } Db::rollback(); - return DataReturn(MyLang('common.delete_fail'), -100); + return DataReturn(MyLang('delete_fail'), -100); } /** @@ -713,7 +713,7 @@ class WarehouseGoodsService // 完成 Db::commit(); - return DataReturn(MyLang('common.operate_success'), 0); + return DataReturn(MyLang('operate_success'), 0); } catch(\Exception $e) { Db::rollback(); return DataReturn($e->getMessage(), -1); @@ -853,7 +853,7 @@ class WarehouseGoodsService return $ret; } - return DataReturn(MyLang('common.update_success'), 0); + return DataReturn(MyLang('update_success'), 0); } /** diff --git a/app/service/WarehouseService.php b/app/service/WarehouseService.php index 6cf501085..1d3453050 100644 --- a/app/service/WarehouseService.php +++ b/app/service/WarehouseService.php @@ -40,7 +40,7 @@ class WarehouseService $field = empty($params['field']) ? '*' : $params['field']; $order_by = empty($params['order_by']) ? 'level desc, id desc' : trim($params['order_by']); $data = Db::name('Warehouse')->field($field)->where($where)->order($order_by)->select()->toArray(); - return DataReturn(MyLang('common.handle_success'), 0, self::WarehouseListHandle($data, $params)); + return DataReturn(MyLang('handle_success'), 0, self::WarehouseListHandle($data, $params)); } /** @@ -259,7 +259,7 @@ class WarehouseService // 完成 Db::commit(); - return DataReturn(MyLang('common.operate_success'), 0); + return DataReturn(MyLang('operate_success'), 0); } catch(\Exception $e) { Db::rollback(); return DataReturn($e->getMessage(), -1); @@ -306,11 +306,11 @@ class WarehouseService // 提交事务 Db::commit(); - return DataReturn(MyLang('common.delete_success'), 0); + return DataReturn(MyLang('delete_success'), 0); } Db::rollback(); - return DataReturn(MyLang('common.delete_fail'), -100); + return DataReturn(MyLang('delete_fail'), -100); } /** @@ -368,11 +368,11 @@ class WarehouseService // 提交事务 Db::commit(); - return DataReturn(MyLang('common.edit_success'), 0); + return DataReturn(MyLang('edit_success'), 0); } Db::rollback(); - return DataReturn(MyLang('common.edit_fail'), -100); + return DataReturn(MyLang('edit_fail'), -100); } /** @@ -400,7 +400,7 @@ class WarehouseService } } } - return DataReturn(MyLang('common.handle_success'), 0); + return DataReturn(MyLang('handle_success'), 0); } /** @@ -436,7 +436,7 @@ class WarehouseService $result[] = $v; } } - return DataReturn(MyLang('common.handle_success'), 0, $result); + return DataReturn(MyLang('handle_success'), 0, $result); } } ?> \ No newline at end of file diff --git a/config/lang.php b/config/lang.php index c44c1a583..d60fabcca 100644 --- a/config/lang.php +++ b/config/lang.php @@ -14,7 +14,7 @@ // +---------------------------------------------------------------------- return [ // 默认语言 - 'default_lang' => 'zh-cn', + 'default_lang' => 'en-us', // 允许的语言列表 'allow_lang_list' => [], // 多语言自动侦测变量名 diff --git a/extend/base/Page.php b/extend/base/Page.php index bd24c0d82..b60c1ae5b 100755 --- a/extend/base/Page.php +++ b/extend/base/Page.php @@ -63,7 +63,12 @@ class Page } /** - * [SetParem 参数设置] + * 参数设置 + * @author Devil + * @blog http://gong.gg/ + * @version 1.0.0 + * @date 2023-01-19 + * @desc description */ private function SetParem() { @@ -106,7 +111,12 @@ class Page } /** - * [GetPageHtml 获取生成好的分页代码] + * 获取生成好的分页代码 + * @author Devil + * @blog http://gong.gg/ + * @version 1.0.0 + * @date 2023-01-19 + * @desc description */ public function GetPageHtml() { @@ -132,17 +142,17 @@ class Page $this->html .= ''; $this->html .= ''; - $this->html .= '每页'; + $this->html .= ''.MyLang('page_each_page_name').''; $this->html .= ''; - $this->html .= ''; + $this->html .= ''.MyLang('page_page_unit').''; - $this->html .= '跳转到'; + $this->html .= ''.MyLang('page_jump_to_text').''; $this->html .= ''; - $this->html .= ''; + $this->html .= ''.MyLang('page_page_unit').''; $this->html .= '
    '; - $this->html .= '共 '.$this->total.' 条数据'; - $this->html .= '共 '.$this->page_total.' 页'; + $this->html .= ''.MyLang('page_data_total', ['total'=>$this->total]).''; + $this->html .= ''.MyLang('page_page_total', ['total'=>$this->page_total]).''; if(!empty($this->tips_msg)) { $this->html .= ''.$this->tips_msg.''; @@ -154,8 +164,13 @@ class Page } /** - * [GetButtonNumberHtml 获取button显示个数的html] - * @return [string] [按钮个数html代码] + * 获取button显示个数的html + * @author Devil + * @blog http://gong.gg/ + * @version 1.0.0 + * @date 2023-01-19 + * @desc description + * @return 按钮个数html代码 */ private function GetButtonNumberHtml() { @@ -188,7 +203,12 @@ class Page } /** - * [GetPageStarNumber 获取分页起始值] + * 获取分页起始值 + * @author Devil + * @blog http://gong.gg/ + * @version 1.0.0 + * @date 2023-01-19 + * @desc description */ public function GetPageStarNumber() { diff --git a/public/static/common/css/common.css b/public/static/common/css/common.css index c9f85301f..279fa5460 100755 --- a/public/static/common/css/common.css +++ b/public/static/common/css/common.css @@ -1289,7 +1289,7 @@ button.colorpicker-submit img { height: 50px; } .form-table-fields-button-container .form-table-field-confirm-submit { - width: calc(100% - 130px); + width: calc(100% - 200px); } /** diff --git a/public/static/index/default/css/article.css b/public/static/index/default/css/article.css index 93105d825..891feb8ab 100755 --- a/public/static/index/default/css/article.css +++ b/public/static/index/default/css/article.css @@ -93,7 +93,7 @@ * 上一篇、下一篇 */ .last-next-data a { - width: calc(100% - 175px); + max-width: calc(100% - 175px); } .last-next-data .text-tips { color: #999; diff --git a/public/static/index/default/css/common.css b/public/static/index/default/css/common.css index 1206601cb..1624fef69 100755 --- a/public/static/index/default/css/common.css +++ b/public/static/index/default/css/common.css @@ -989,16 +989,15 @@ button { outline: none !important; } .common-cropper-popup .img-preview, .common-cropper-popup .submit-operation { overflow:hidden; } .common-cropper-popup .img-container { width:200px; height:200px; margin-bottom:5px; } -.common-cropper-popup .cropper-input-images-submit { width:104px; margin:0px 5px 0px 2px; height: 32px; } +.common-cropper-popup .cropper-input-images-submit { width:115px; margin:0px 5px 0px 2px; height: 32px; } .common-cropper-popup .preview-lg { width:180px; height:180px; } .common-cropper-popup .preview-md { width:100px; height:100px; } .common-cropper-popup .preview-sm { width:50px; height:50px; } .common-cropper-popup .img-preview { margin-left:20px; border: 1px solid #eee; background-color: #f9f9f9; } .common-cropper-popup .cropper-container, .cropper-input-images-submit { border-radius:2px; } -.common-cropper-popup .am-form-file input[type="file"] { width: 105px; height: 32px; } +.common-cropper-popup .am-form-file input[type="file"] { width: 117px !important; height: 32px; } .common-cropper-popup .am-form-group { width: auto; } .common-cropper-popup form.am-form .am-form-group-refreshing { padding: 0 !important; } -.common-cropper-popup .am-form-file input[type="file"] { width: 106px !important; top: 0; } @media only screen and (max-width:640px){ .common-cropper-popup .img-preview { margin-left:10px; } .common-cropper-popup .preview-md, diff --git a/public/static/index/default/css/goods.css b/public/static/index/default/css/goods.css index b8d8f638a..837ea1756 100755 --- a/public/static/index/default/css/goods.css +++ b/public/static/index/default/css/goods.css @@ -487,8 +487,8 @@ flex: 1 1 0%;line-height: 16px;cursor: pointer;} /*左侧商品-看了又看*/ .introduce-main{width:80%;float:left;background:#fff ;} .browse{display:block; float:left;width:20% ;} + .browse .head-title{background-color: #f7f7f7; height: 35px;line-height: 35px;text-align: center;} .browse ul{border:1px solid #eee ;width: 90%;} - .browse ul .mt{background-color: #f7f7f7; height: 35px;line-height: 35px;text-align: center;} .browse ul li {margin:0px 10px;padding:12px 0px;border-top: 1px dotted #DEDEDE;} .browse ul li.first {border-top:none;} .browse li img{width:100% ;} diff --git a/public/static/index/default/js/goods.js b/public/static/index/default/js/goods.js index e413b0a23..83bb3647e 100755 --- a/public/static/index/default/js/goods.js +++ b/public/static/index/default/js/goods.js @@ -31,7 +31,7 @@ function GoodsCommentsHtml(page) if($('.goods-comment-content article').length <= 0) { $('.goods-page-no-data').removeClass('none'); - $('.goods-page-no-data span').text(window['lang_loading_tips'] || '加载中...'); + $('.goods-page-no-data p').text(window['lang_loading_tips'] || '加载中...'); } else { $('.goods-page-no-data').addClass('none'); } @@ -54,7 +54,7 @@ function GoodsCommentsHtml(page) if($('.goods-comment-content article').length <= 0) { $('.goods-page-no-data').removeClass('none'); - $('.goods-page-no-data span').text(window['lang_comment_no_data_tips'] || '没有评论数据'); + $('.goods-page-no-data p').text(window['lang_comment_no_data_tips'] || '没有评论数据'); } }, error: function(xhr, type)