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 @@
可点击拖拽调整显示顺序、如需恢复点击重置即可
+{{:MyLang('form_table_column_sort_tips')}}
没有地址
- + +{{:MyLang('buy.no_delivery_address_tips')}}
+请联系管理员配置自提点地址
+{{:MyLang('buy.no_take_address_tips')}}
{{else /}} {{if !empty($base['address'])}} @@ -157,9 +160,9 @@没有地址
- + +{{:MyLang('buy.no_address_tips')}}
+商品信息 | - - - +{{:MyLang('buy.goods_list_thead_base')}} | + + +
---|
{{:MyLang('buy.not_goods_tips')}}
+{{:MyLang('buy.not_goods_tips')}}
+{{:MyLang('buy.not_payment_tips')}}
+支付跳转中、请勿关闭页面
-支付失败或长时间未响应
+{{: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')}}
商品信息 | - -数量 | - -操作 | +{{:MyLang('cart.goods_list_thead_base')}} | + +{{:MyLang('cart.goods_list_thead_number')}} | + +{{:MyLang('operate_title')}} |
- 删除
+ {{:MyLang('delete_title')}}
{{if isset($shopxo_is_develop) and $shopxo_is_develop eq true}}
@@ -297,9 +297,9 @@
- 删除
+ {{:MyLang('delete_title')}}
{{if isset($shopxo_is_develop) and $shopxo_is_develop eq true}}
@@ -347,29 +347,28 @@
- {{/if}}
- {{if empty($cart_list)}}
+ {{else /}}
-
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('cart.no_cart_data_tips')}}
- 没有子分类数据
+ {{:MyLang('category.no_sub_category_data_tips')}}
{{/if}}
@@ -114,7 +114,10 @@
{{/foreach}}
{{/if}}
{{else /}}
- - 查看分类下商品 >> + {{:MyLang('category.view_category_sub_goods_name')}} >> 没有分类数据
+
+
+
{{/if}}
{{:MyLang('category.no_category_data_tips')}} +库存不足起购数({{$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 @@ - 更多 + {{: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/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)}}
-
+
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 @@
{{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')}}
-
+
{{/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($left_goods)}}
+
+ {{/foreach}}
+
+
+ {{/if}}
看了又看
+ {{if !empty($left_goods)}} +{{:MyLang('goods.recommend_goods_title')}}
{{foreach $left_goods as $key=>$v}}-
@@ -629,10 +629,10 @@
{{$currency_symbol}}{{$v.price}}
- {{/foreach}}
- {{/if}}
-
-动态评分
+{{:MyLang('goods.dynamic_scoring_name')}}
{{$goods_score.avg}}
{{:MyLang('goods.no_comments_data_tips')}}
{{$v.title}}
- -- {{$currency_symbol}}{{$v.price}} -
-{{$v.title}}
+ ++ {{$currency_symbol}}{{$v.price}} +