diff --git a/app/admin/controller/Admin.php b/app/admin/controller/Admin.php index ca1aaccc782cd9a624a49d17a48e75458ff89a3e..02dba223c337fc9bb3857eff96a5a8ab607309ea 100755 --- a/app/admin/controller/Admin.php +++ b/app/admin/controller/Admin.php @@ -160,8 +160,8 @@ class Admin extends Common MyViewAssign('role_list', $role['data']); MyViewAssign('id', isset($params['id']) ? $params['id'] : 0); - MyViewAssign('common_gender_list', lang('common_gender_list')); - MyViewAssign('common_admin_status_list', lang('common_admin_status_list')); + MyViewAssign('common_gender_list', MyConst('common_gender_list')); + MyViewAssign('common_admin_status_list', MyConst('common_admin_status_list')); // 管理员编辑页面钩子 $hook_name = 'plugins_view_admin_admin_save'; diff --git a/app/admin/controller/Answer.php b/app/admin/controller/Answer.php index 76781c636e1e26159f6b452132e7cceb63eaa7ab..09be19a46a3f972632c57fe0c64efbd18f181b0b 100755 --- a/app/admin/controller/Answer.php +++ b/app/admin/controller/Answer.php @@ -153,8 +153,8 @@ class Answer extends Common MyViewAssign('data', $data); // 静态数据 - MyViewAssign('common_is_show_list', lang('common_is_show_list')); - MyViewAssign('common_is_text_list', lang('common_is_text_list')); + MyViewAssign('common_is_show_list', MyConst('common_is_show_list')); + MyViewAssign('common_is_text_list', MyConst('common_is_text_list')); // 参数 unset($params['id']); diff --git a/app/admin/controller/Appcenternav.php b/app/admin/controller/Appcenternav.php index bef6218b98e1491156bf7f0cc7a1804f63bbb26b..cdd17f8e0caddfb88ba5437d6b46eecc27b1fc30 100755 --- a/app/admin/controller/Appcenternav.php +++ b/app/admin/controller/Appcenternav.php @@ -136,8 +136,8 @@ class AppCenterNav extends Common } // 静态数据 - MyViewAssign('common_platform_type', lang('common_platform_type')); - MyViewAssign('common_app_event_type', lang('common_app_event_type')); + MyViewAssign('common_platform_type', MyConst('common_platform_type')); + MyViewAssign('common_app_event_type', MyConst('common_app_event_type')); // 编辑器文件存放地址 MyViewAssign('editor_path_type', ResourcesService::EditorPathTypeValue('app_center_nav')); diff --git a/app/admin/controller/Appconfig.php b/app/admin/controller/Appconfig.php index ee15ff93558d05819498a89a551f70472f10d649..7e9108a462991da31f3593d420b1e181ba6d3d5d 100755 --- a/app/admin/controller/Appconfig.php +++ b/app/admin/controller/Appconfig.php @@ -53,7 +53,7 @@ class AppConfig extends Common MyViewAssign('data', ConfigService::ConfigList()); // 是否 - MyViewAssign('common_is_text_list', lang('common_is_text_list')); + MyViewAssign('common_is_text_list', MyConst('common_is_text_list')); // 导航/视图 $nav_type = input('nav_type', 'base'); diff --git a/app/admin/controller/Apphomenav.php b/app/admin/controller/Apphomenav.php index f4cbc7e892711c898ec4bef518ddc9d19f726bf0..2d9865a08fb7eb2e63adaf23902690f769e1a3a2 100755 --- a/app/admin/controller/Apphomenav.php +++ b/app/admin/controller/Apphomenav.php @@ -136,8 +136,8 @@ class AppHomeNav extends Common } // 静态数据 - MyViewAssign('common_platform_type', lang('common_platform_type')); - MyViewAssign('common_app_event_type', lang('common_app_event_type')); + MyViewAssign('common_platform_type', MyConst('common_platform_type')); + MyViewAssign('common_app_event_type', MyConst('common_app_event_type')); // 编辑器文件存放地址 MyViewAssign('editor_path_type', ResourcesService::EditorPathTypeValue('app_nav')); diff --git a/app/admin/controller/Appmini.php b/app/admin/controller/Appmini.php index 1e2c00153c087148227b290d20faaf8daecdf98e..22f202e51d6a6b4ffdf3168d39fd7f3c4f3f7ca6 100755 --- a/app/admin/controller/Appmini.php +++ b/app/admin/controller/Appmini.php @@ -159,10 +159,10 @@ class Appmini extends Common MyViewAssign('store_theme_url', StoreService::StoreThemeUrl()); // 小程序平台 - MyViewAssign('common_appmini_type', lang('common_appmini_type')); + MyViewAssign('common_appmini_type', MyConst('common_appmini_type')); // 是否 - MyViewAssign('common_is_text_list', lang('common_is_text_list')); + MyViewAssign('common_is_text_list', MyConst('common_is_text_list')); // 基础导航 $base_nav = [ diff --git a/app/admin/controller/Articlecategory.php b/app/admin/controller/Articlecategory.php index 27f39b9d92e80d33b79943eff156adee387ac1a1..9971d9b7b7771f1f58b48cd055a5325bd6bce9cc 100755 --- a/app/admin/controller/Articlecategory.php +++ b/app/admin/controller/Articlecategory.php @@ -50,7 +50,7 @@ class ArticleCategory extends Common public function Index() { // 是否启用 - MyViewAssign('common_is_enable_list', lang('common_is_enable_list')); + MyViewAssign('common_is_enable_list', MyConst('common_is_enable_list')); return MyView(); } diff --git a/app/admin/controller/Brand.php b/app/admin/controller/Brand.php index 2a91b4a1d5513b45b361feb9bc08facc88d2b9d8..a59af4c5dc43bbff4a7a31b32e65d71e58c27088 100755 --- a/app/admin/controller/Brand.php +++ b/app/admin/controller/Brand.php @@ -137,7 +137,7 @@ class Brand extends Common } // 是否启用 - MyViewAssign('common_is_enable_list', lang('common_is_enable_list')); + MyViewAssign('common_is_enable_list', MyConst('common_is_enable_list')); // 品牌分类 $brand_category = BrandCategoryService::BrandCategoryList(['field'=>'id,name']); diff --git a/app/admin/controller/Brandcategory.php b/app/admin/controller/Brandcategory.php index 854ac28a3bbc181ef879c2d0c3fe50b6c6973241..e09b99d440d182ddcd48cc2a8dff3e9f87766aee 100755 --- a/app/admin/controller/Brandcategory.php +++ b/app/admin/controller/Brandcategory.php @@ -50,7 +50,7 @@ class BrandCategory extends Common public function Index() { // 是否启用 - MyViewAssign('common_is_enable_list', lang('common_is_enable_list')); + MyViewAssign('common_is_enable_list', MyConst('common_is_enable_list')); return MyView(); } diff --git a/app/admin/controller/Common.php b/app/admin/controller/Common.php index 23658af515d89a4889cfd83502ee4340ceb03e69..6642db5eb5dfc578400355961e304fe9b69a12bf 100755 --- a/app/admin/controller/Common.php +++ b/app/admin/controller/Common.php @@ -178,7 +178,7 @@ class Common extends BaseController MyViewAssign('module_js', file_exists(ROOT_PATH.'static'.DS.$module_js) ? $module_js : ''); // 价格正则 - MyViewAssign('default_price_regex', lang('common_regex_price')); + MyViewAssign('default_price_regex', MyConst('common_regex_price')); // 附件host地址 MyViewAssign('attachment_host', SystemBaseService::AttachmentHost()); diff --git a/app/admin/controller/Config.php b/app/admin/controller/Config.php index 9260e4d523f248a6ae96842f7ecbc670ee656b3f..729457012933ab6f752e51bef2118faff5f79b5b 100755 --- a/app/admin/controller/Config.php +++ b/app/admin/controller/Config.php @@ -50,10 +50,10 @@ class Config extends Common public function Index() { // 静态数据 - MyViewAssign('common_excel_charset_list', lang('common_excel_charset_list')); - MyViewAssign('common_is_enable_list', lang('common_is_enable_list')); - MyViewAssign('common_login_type_list', lang('common_login_type_list')); - MyViewAssign('common_close_open_list', lang('common_close_open_list')); + MyViewAssign('common_excel_charset_list', MyConst('common_excel_charset_list')); + MyViewAssign('common_is_enable_list', MyConst('common_is_enable_list')); + MyViewAssign('common_login_type_list', MyConst('common_login_type_list')); + MyViewAssign('common_close_open_list', MyConst('common_close_open_list')); // 配置信息 MyViewAssign('data', ConfigService::ConfigList()); diff --git a/app/admin/controller/Design.php b/app/admin/controller/Design.php index f46bc1127a21b8d7b09b39426e08fa3aff25eaa0..8ce5f70af34a7972f81741d3858c177ddf8064b3 100644 --- a/app/admin/controller/Design.php +++ b/app/admin/controller/Design.php @@ -151,8 +151,8 @@ class Design extends Common MyViewAssign('many_images_view_list_show_style', BaseLayout::$many_images_view_list_show_style); // 首页商品排序规则 - MyViewAssign('goods_order_by_type_list', lang('goods_order_by_type_list')); - MyViewAssign('goods_order_by_rule_list', lang('goods_order_by_rule_list')); + MyViewAssign('goods_order_by_type_list', MyConst('goods_order_by_type_list')); + MyViewAssign('goods_order_by_rule_list', MyConst('goods_order_by_rule_list')); // 加载布局样式+管理 MyViewAssign('is_load_layout', 1); diff --git a/app/admin/controller/Email.php b/app/admin/controller/Email.php index bdf950ce567c59cce497964117959c04b1b6bce2..d176fea7944fb8284c8ab20dbaa3bb7ae7ea29a5 100755 --- a/app/admin/controller/Email.php +++ b/app/admin/controller/Email.php @@ -54,7 +54,7 @@ class Email extends Common $type = input('type', 'email'); // 静态数据 - MyViewAssign('common_is_text_list', lang('common_is_text_list')); + MyViewAssign('common_is_text_list', MyConst('common_is_text_list')); // 导航 MyViewAssign('nav_type', $type); diff --git a/app/admin/controller/Express.php b/app/admin/controller/Express.php index 197ba20ac7c1ba8de99ecce657962974e5e4fd62..6b8135053551c5af73bea838b470f38516e2a9a3 100755 --- a/app/admin/controller/Express.php +++ b/app/admin/controller/Express.php @@ -51,7 +51,7 @@ class Express extends Common public function Index() { // 是否启用 - MyViewAssign('common_is_enable_list', lang('common_is_enable_list')); + MyViewAssign('common_is_enable_list', MyConst('common_is_enable_list')); // 编辑器文件存放地址 MyViewAssign('editor_path_type', ResourcesService::EditorPathTypeValue('express')); diff --git a/app/admin/controller/Goods.php b/app/admin/controller/Goods.php index 561e404cf42a70f307dceb81bb154f6b9ec0fda6..7d74643a54283e04341ac70dfaffb14f7bf691d1 100755 --- a/app/admin/controller/Goods.php +++ b/app/admin/controller/Goods.php @@ -124,7 +124,7 @@ class Goods extends Common $parameters = GoodsService::GoodsEditParameters($data['id']); // 商品参数类型 - MyViewAssign('common_goods_parameters_type_list', lang('common_goods_parameters_type_list')); + MyViewAssign('common_goods_parameters_type_list', MyConst('common_goods_parameters_type_list')); MyViewAssign('parameters', $parameters); } @@ -195,12 +195,12 @@ class Goods extends Common MyViewAssign('goods_specifications_extends', $goods_spec_extends['data']); // 站点类型 - MyViewAssign('common_site_type_list', lang('common_site_type_list')); + MyViewAssign('common_site_type_list', MyConst('common_site_type_list')); // 当前系统设置的站点类型 MyViewAssign('common_site_type', SystemBaseService::SiteTypeValue()); // 商品参数类型 - MyViewAssign('common_goods_parameters_type_list', lang('common_goods_parameters_type_list')); + MyViewAssign('common_goods_parameters_type_list', MyConst('common_goods_parameters_type_list')); // 商品参数模板 $data_params = array( diff --git a/app/admin/controller/Goodscategory.php b/app/admin/controller/Goodscategory.php index 2955bc340d45255654eb93e67329ce1daa0d1177..1e14e44e40285ac0fe4fdc2b17c753f9b6a90626 100755 --- a/app/admin/controller/Goodscategory.php +++ b/app/admin/controller/Goodscategory.php @@ -51,7 +51,7 @@ class GoodsCategory extends Common public function Index() { // 静态数据 - MyViewAssign('common_is_text_list', lang('common_is_text_list')); + MyViewAssign('common_is_text_list', MyConst('common_is_text_list')); // 商品分类 MyViewAssign('goods_category_list', GoodsService::GoodsCategoryAll()); diff --git a/app/admin/controller/Goodscomments.php b/app/admin/controller/Goodscomments.php index 2611c4dac06e43ce9cbde955154f785dc5f22f4a..6c0f426b3a16f5040789dee4af067a99e0d686de 100644 --- a/app/admin/controller/Goodscomments.php +++ b/app/admin/controller/Goodscomments.php @@ -105,7 +105,7 @@ class Goodscomments extends Common $data = (empty($ret['data']) || empty($ret['data'][0])) ? [] : $ret['data'][0]; MyViewAssign('data', $data); - MyViewAssign('common_goods_comments_rating_list', lang('common_goods_comments_rating_list')); + MyViewAssign('common_goods_comments_rating_list', MyConst('common_goods_comments_rating_list')); } return MyView(); } @@ -139,10 +139,10 @@ class Goodscomments extends Common MyViewAssign('data', $data); // 静态数据 - MyViewAssign('common_is_show_list', lang('common_is_show_list')); - MyViewAssign('common_is_text_list', lang('common_is_text_list')); - MyViewAssign('common_goods_comments_rating_list', lang('common_goods_comments_rating_list')); - MyViewAssign('common_goods_comments_business_type_list', lang('common_goods_comments_business_type_list')); + MyViewAssign('common_is_show_list', MyConst('common_is_show_list')); + MyViewAssign('common_is_text_list', MyConst('common_is_text_list')); + MyViewAssign('common_goods_comments_rating_list', MyConst('common_goods_comments_rating_list')); + MyViewAssign('common_goods_comments_business_type_list', MyConst('common_goods_comments_business_type_list')); // 参数 unset($params['id']); diff --git a/app/admin/controller/Goodsparamstemplate.php b/app/admin/controller/Goodsparamstemplate.php index cb31850f86c02261e727282e3360f686eff5896b..6e13dd0ae18e3fe482b8d520c3acd18ba5ff76eb 100755 --- a/app/admin/controller/Goodsparamstemplate.php +++ b/app/admin/controller/Goodsparamstemplate.php @@ -109,7 +109,7 @@ class GoodsParamsTemplate extends Common MyViewAssign('data', $data); // 商品参数类型 - MyViewAssign('common_goods_parameters_type_list', lang('common_goods_parameters_type_list')); + MyViewAssign('common_goods_parameters_type_list', MyConst('common_goods_parameters_type_list')); // 参数配置 MyViewAssign('parameters', empty($data['config_data']) ? [] : $data['config_data']); @@ -146,7 +146,7 @@ class GoodsParamsTemplate extends Common } // 商品参数类型 - MyViewAssign('common_goods_parameters_type_list', lang('common_goods_parameters_type_list')); + MyViewAssign('common_goods_parameters_type_list', MyConst('common_goods_parameters_type_list')); // 参数配置 MyViewAssign('parameters', empty($data['config_data']) ? [] : $data['config_data']); diff --git a/app/admin/controller/Orderaftersale.php b/app/admin/controller/Orderaftersale.php index 6dd6902fe7f3ca17382b5a00328c3aa402e53108..49efd3f2a352bc453dd7951a62ad5364b459e711 100644 --- a/app/admin/controller/Orderaftersale.php +++ b/app/admin/controller/Orderaftersale.php @@ -76,7 +76,7 @@ class Orderaftersale extends Common $ret = OrderAftersaleService::OrderAftersaleList($data_params); // 静态数据 - MyViewAssign('common_order_aftersale_refundment_list', lang('common_order_aftersale_refundment_list')); + MyViewAssign('common_order_aftersale_refundment_list', MyConst('common_order_aftersale_refundment_list')); // 基础参数赋值 MyViewAssign('params', $this->data_request); diff --git a/app/admin/controller/Payment.php b/app/admin/controller/Payment.php index 7507ea7b37d5ada697231611f21607c8be8d675d..8509e03a196bb2d913a7e10142c5e4e9a3b6ad56 100755 --- a/app/admin/controller/Payment.php +++ b/app/admin/controller/Payment.php @@ -59,7 +59,7 @@ class Payment extends Common MyViewAssign('cannot_deleted_list', PaymentService::$cannot_deleted_list); // 适用平台 - MyViewAssign('common_platform_type', lang('common_platform_type')); + MyViewAssign('common_platform_type', MyConst('common_platform_type')); // 应用商店 MyViewAssign('store_payment_url', StoreService::StorePaymentUrl()); @@ -102,7 +102,7 @@ class Payment extends Common } // 适用平台 - MyViewAssign('common_platform_type', lang('common_platform_type')); + MyViewAssign('common_platform_type', MyConst('common_platform_type')); // 参数 MyViewAssign('params', $params); diff --git a/app/admin/controller/Power.php b/app/admin/controller/Power.php index 1813a3db8e4205b21c49ac88b3346e86ac58a780..7d667aa6f3ece943749a292cc281654495a6ee74 100755 --- a/app/admin/controller/Power.php +++ b/app/admin/controller/Power.php @@ -57,7 +57,7 @@ class Power extends Common $data = AdminPowerService::PowerList($data_params); MyViewAssign('data', $data); - MyViewAssign('common_is_show_list', lang('common_is_show_list')); + MyViewAssign('common_is_show_list', MyConst('common_is_show_list')); return MyView(); } diff --git a/app/admin/controller/Quicknav.php b/app/admin/controller/Quicknav.php index 14c14f5c2d2b3f4605f152ff9ddf1a6d0083d308..37f73979ef06ab80eae16320022cae2b86366811 100755 --- a/app/admin/controller/Quicknav.php +++ b/app/admin/controller/Quicknav.php @@ -137,8 +137,8 @@ class QuickNav extends Common MyViewAssign('data', $data); // 静态数据 - MyViewAssign('common_platform_type', lang('common_platform_type')); - MyViewAssign('common_app_event_type', lang('common_app_event_type')); + MyViewAssign('common_platform_type', MyConst('common_platform_type')); + MyViewAssign('common_app_event_type', MyConst('common_app_event_type')); // 参数 MyViewAssign('params', $params); diff --git a/app/admin/controller/Region.php b/app/admin/controller/Region.php index 4b2f4c9a57347b22d9fc77d80997939ae177c0cd..d93bcf59c7f921ef3c7015bb6ab87befdf9a6128 100755 --- a/app/admin/controller/Region.php +++ b/app/admin/controller/Region.php @@ -50,7 +50,7 @@ class Region extends Common $this->IsPower(); // 是否启用 - MyViewAssign('common_is_enable_list', lang('common_is_enable_list')); + MyViewAssign('common_is_enable_list', MyConst('common_is_enable_list')); return MyView(); } diff --git a/app/admin/controller/Screeningprice.php b/app/admin/controller/Screeningprice.php index ad8f1757063116af189c4752f7c0fafce94c7ed7..de41a3fc984086143f729dd9ab2b3737f269b158 100755 --- a/app/admin/controller/Screeningprice.php +++ b/app/admin/controller/Screeningprice.php @@ -50,7 +50,7 @@ class ScreeningPrice extends Common public function Index() { // 是否启用 - MyViewAssign('common_is_enable_list', lang('common_is_enable_list')); + MyViewAssign('common_is_enable_list', MyConst('common_is_enable_list')); return MyView(); } diff --git a/app/admin/controller/Seo.php b/app/admin/controller/Seo.php index 7b51073ef4ccf46ace07b52a58373eb7842d2bae..ecc61bab264f00bbec907451df4ff7384902739b 100755 --- a/app/admin/controller/Seo.php +++ b/app/admin/controller/Seo.php @@ -50,13 +50,13 @@ class Seo extends Common public function Index() { // url模式 - MyViewAssign('seo_url_model_list', lang('seo_url_model_list')); + MyViewAssign('seo_url_model_list', MyConst('seo_url_model_list')); // 文章标题seo方案 - MyViewAssign('seo_article_browser_list', lang('seo_article_browser_list')); + MyViewAssign('seo_article_browser_list', MyConst('seo_article_browser_list')); // 频道标题seo方案 - MyViewAssign('seo_channel_browser_list', lang('seo_channel_browser_list')); + MyViewAssign('seo_channel_browser_list', MyConst('seo_channel_browser_list')); // 配置信息 MyViewAssign('data', ConfigService::ConfigList()); diff --git a/app/admin/controller/Site.php b/app/admin/controller/Site.php index 3a05842d681eaabefc7c91c303edde6d55b35ac5..34ddbba5ab317a02987bb28f0c35ffcd0e01f0c3 100755 --- a/app/admin/controller/Site.php +++ b/app/admin/controller/Site.php @@ -154,44 +154,44 @@ class Site extends Common MyViewAssign('view_type', $this->view_type); // 时区 - MyViewAssign('site_timezone_list', lang('site_timezone_list')); + MyViewAssign('site_timezone_list', MyConst('site_timezone_list')); // 关闭开启 - MyViewAssign('common_close_open_list', lang('common_close_open_list')); + MyViewAssign('common_close_open_list', MyConst('common_close_open_list')); // 登录方式 - MyViewAssign('common_login_type_list', lang('common_login_type_list')); + MyViewAssign('common_login_type_list', MyConst('common_login_type_list')); // 用户注册类型列表 - MyViewAssign('common_user_reg_type_list', lang('common_user_reg_type_list')); + MyViewAssign('common_user_reg_type_list', MyConst('common_user_reg_type_list')); // 图片验证码规则 - MyViewAssign('site_images_verify_rules_list', lang('site_images_verify_rules_list')); + MyViewAssign('site_images_verify_rules_list', MyConst('site_images_verify_rules_list')); // 热门搜索关键字 - MyViewAssign('common_search_keywords_type_list', lang('common_search_keywords_type_list')); + MyViewAssign('common_search_keywords_type_list', MyConst('common_search_keywords_type_list')); // 是否 - MyViewAssign('common_is_text_list', lang('common_is_text_list')); + MyViewAssign('common_is_text_list', MyConst('common_is_text_list')); // 站点类型 - MyViewAssign('common_site_type_list', lang('common_site_type_list')); + MyViewAssign('common_site_type_list', MyConst('common_site_type_list')); // 扣除库存规则 - MyViewAssign('common_deduction_inventory_rules_list', lang('common_deduction_inventory_rules_list')); + MyViewAssign('common_deduction_inventory_rules_list', MyConst('common_deduction_inventory_rules_list')); // 增加销量规则 - MyViewAssign('common_sales_count_inc_rules_list', lang('common_sales_count_inc_rules_list')); + MyViewAssign('common_sales_count_inc_rules_list', MyConst('common_sales_count_inc_rules_list')); // 首页商品排序规则 - MyViewAssign('goods_order_by_type_list', lang('goods_order_by_type_list')); - MyViewAssign('goods_order_by_rule_list', lang('goods_order_by_rule_list')); + MyViewAssign('goods_order_by_type_list', MyConst('goods_order_by_type_list')); + MyViewAssign('goods_order_by_rule_list', MyConst('goods_order_by_rule_list')); // 首页楼层数据类型 - MyViewAssign('common_site_floor_data_type_list', lang('common_site_floor_data_type_list')); + MyViewAssign('common_site_floor_data_type_list', MyConst('common_site_floor_data_type_list')); // 搜索参数类型 - MyViewAssign('common_goods_parameters_type_list', lang('common_goods_parameters_type_list')); + MyViewAssign('common_goods_parameters_type_list', MyConst('common_goods_parameters_type_list')); // 主导航 MyViewAssign('second_nav_list', [ diff --git a/app/admin/controller/Slide.php b/app/admin/controller/Slide.php index 3a5cd23044538c9901d00b34cff7f5bc66fc4e42..4497a55ab6959c03bf78fcc8d436c9b0b1790e47 100755 --- a/app/admin/controller/Slide.php +++ b/app/admin/controller/Slide.php @@ -136,9 +136,9 @@ class Slide extends Common } // 静态资源 - MyViewAssign('common_is_enable_list', lang('common_is_enable_list')); - MyViewAssign('common_platform_type', lang('common_platform_type')); - MyViewAssign('common_app_event_type', lang('common_app_event_type')); + MyViewAssign('common_is_enable_list', MyConst('common_is_enable_list')); + MyViewAssign('common_platform_type', MyConst('common_platform_type')); + MyViewAssign('common_app_event_type', MyConst('common_app_event_type')); // 编辑器文件存放地址 MyViewAssign('editor_path_type', ResourcesService::EditorPathTypeValue('slide')); diff --git a/app/admin/controller/User.php b/app/admin/controller/User.php index e39942110a120e6878de4e2e3373b244e459949f..04272812fb6a40e3b613e75333d330abda285bbe 100755 --- a/app/admin/controller/User.php +++ b/app/admin/controller/User.php @@ -129,7 +129,7 @@ class User extends Common $data = UserService::UserList($data_params); // Excel驱动导出数据 - $excel = new \base\Excel(array('filename'=>'user', 'title'=>lang('excel_user_title_list'), 'data'=>$data['data'], 'msg'=>'没有相关数据')); + $excel = new \base\Excel(array('filename'=>'user', 'title'=>MyConst('excel_user_title_list'), 'data'=>$data['data'], 'msg'=>'没有相关数据')); return $excel->Export(); } @@ -178,7 +178,7 @@ class User extends Common ])); // 性别 - MyViewAssign('common_gender_list', lang('common_gender_list')); + MyViewAssign('common_gender_list', MyConst('common_gender_list')); // 数据 unset($params['id']); diff --git a/app/admin/form/Admin.php b/app/admin/form/Admin.php index 876f4b9a60b12bf9a67ea2c564ebeede8699e84f..7d1d957e5ee3267a8ed1059671645d4d9fae1f6d 100644 --- a/app/admin/form/Admin.php +++ b/app/admin/form/Admin.php @@ -73,12 +73,12 @@ class Admin 'view_type' => 'field', 'view_key' => 'status', 'view_data_key' => 'name', - 'view_data' => lang('common_admin_status_list'), + 'view_data' => MyConst('common_admin_status_list'), 'is_sort' => 1, 'search_config' => [ 'form_type' => 'select', 'where_type' => 'in', - 'data' => lang('common_admin_status_list'), + 'data' => MyConst('common_admin_status_list'), 'data_key' => 'value', 'data_name' => 'name', 'is_multiple' => 1, @@ -89,12 +89,12 @@ class Admin 'view_type' => 'field', 'view_key' => 'gender', 'view_data_key' => 'name', - 'view_data' => lang('common_gender_list'), + 'view_data' => MyConst('common_gender_list'), 'is_sort' => 1, 'search_config' => [ 'form_type' => 'select', 'where_type' => 'in', - 'data' => lang('common_gender_list'), + 'data' => MyConst('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 471897a07460211349729135c682f49df0d03237..ccfa37d1fa8e755df808f7ab51c3643d3b8bf6c4 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' => lang('common_is_show_list'), + 'data' => MyConst('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' => lang('common_is_text_list'), + 'data' => MyConst('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 d044ac77ffcc91149d3c9579a10237eaf56bb929..9db6039df3bb766a48a47fe2954269851235cdb6 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' => lang('common_platform_type'), + 'view_data' => MyConst('common_platform_type'), 'is_sort' => 1, 'search_config' => [ 'form_type' => 'select', 'where_type' => 'in', - 'data' => lang('common_platform_type'), + 'data' => MyConst('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' => lang('common_app_event_type'), + 'view_data' => MyConst('common_app_event_type'), 'grid_size' => 'sm', 'is_sort' => 1, 'search_config' => [ 'form_type' => 'select', 'where_type' => 'in', - 'data' => lang('common_app_event_type'), + 'data' => MyConst('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' => lang('common_is_enable_list'), + 'data' => MyConst('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' => lang('common_is_text_list'), + 'data' => MyConst('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 2003d2d060b8d0016cdc9f1c35242ed175110b6d..443bf444dc5793ab2363f649d9005c55ab14fbff 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' => lang('common_platform_type'), + 'view_data' => MyConst('common_platform_type'), 'is_sort' => 1, 'search_config' => [ 'form_type' => 'select', 'where_type' => 'in', - 'data' => lang('common_platform_type'), + 'data' => MyConst('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' => lang('common_app_event_type'), + 'view_data' => MyConst('common_app_event_type'), 'grid_size' => 'sm', 'is_sort' => 1, 'search_config' => [ 'form_type' => 'select', 'where_type' => 'in', - 'data' => lang('common_app_event_type'), + 'data' => MyConst('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' => lang('common_is_enable_list'), + 'data' => MyConst('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' => lang('common_is_text_list'), + 'data' => MyConst('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 6269b698e8f6dca0a3ae04ef2a0c44136745906a..64c39bb3abbf9d0074182ed1a73f631d70b09574 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' => lang('common_is_enable_list'), + 'data' => MyConst('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' => lang('common_is_text_list'), + 'data' => MyConst('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 1ee989493c1aa64cc17260e07c9b7a5f9d853fda..8beb8a0f8fb632842065cbe298d5389fe6b3cce6 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' => lang('common_is_enable_list'), + 'data' => MyConst('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 41c51f9805dcc8f66f6faa0ada8bffaed4267d89..dc5ce0d9bbb32bd869c300682573fc601223ab5c 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' => lang('common_is_enable_list'), + 'data' => MyConst('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' => lang('common_is_text_list'), + 'data' => MyConst('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' => lang('common_is_text_list'), + 'data' => MyConst('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' => lang('common_is_text_list'), + 'data' => MyConst('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 3d30f93fc998a09a44826af0aa74dbd5110f1dd4..79be7c28f9eb03636406a8c04c7ee3df772bd1e2 100644 --- a/app/admin/form/Design.php +++ b/app/admin/form/Design.php @@ -88,7 +88,7 @@ class Design 'search_config' => [ 'form_type' => 'select', 'where_type' => 'in', - 'data' => lang('common_is_text_list'), + 'data' => MyConst('common_is_text_list'), 'data_key' => 'id', 'data_name' => 'name', 'is_multiple' => 1, @@ -104,7 +104,7 @@ class Design 'search_config' => [ 'form_type' => 'select', 'where_type' => 'in', - 'data' => lang('common_is_text_list'), + 'data' => MyConst('common_is_text_list'), 'data_key' => 'id', 'data_name' => 'name', 'is_multiple' => 1, @@ -120,7 +120,7 @@ class Design 'search_config' => [ 'form_type' => 'select', 'where_type' => 'in', - 'data' => lang('common_is_text_list'), + 'data' => MyConst('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 330f7dcb04847ad3e9095afae295fa8ed5cb45da..cf756fa7db4390c5f65810a23192586a1a4b2a2d 100644 --- a/app/admin/form/Goods.php +++ b/app/admin/form/Goods.php @@ -161,7 +161,7 @@ class Goods 'search_config' => [ 'form_type' => 'select', 'where_type' => 'in', - 'data' => lang('common_is_shelves_list'), + 'data' => MyConst('common_is_shelves_list'), 'data_key' => 'id', 'data_name' => 'name', 'is_multiple' => 1, @@ -177,7 +177,7 @@ class Goods 'search_config' => [ 'form_type' => 'select', 'where_type' => 'in', - 'data' => lang('common_is_text_list'), + 'data' => MyConst('common_is_text_list'), 'data_key' => 'id', 'data_name' => 'name', 'is_multiple' => 1, @@ -188,12 +188,12 @@ class Goods 'view_type' => 'field', 'view_key' => 'site_type', 'view_data_key' => 'name', - 'view_data' => lang('common_site_type_list'), + 'view_data' => MyConst('common_site_type_list'), 'is_sort' => 1, 'search_config' => [ 'form_type' => 'select', 'where_type' => 'in', - 'data' => lang('common_site_type_list'), + 'data' => MyConst('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 50a102cf56f9f2f706797030b6f9f92e2671040a..41c073f49c2bf3a8b9dbc869bdce7f078a52d97e 100644 --- a/app/admin/form/Goodscomments.php +++ b/app/admin/form/Goodscomments.php @@ -91,13 +91,13 @@ class GoodsComments 'view_type' => 'field', 'view_key' => 'business_type', 'view_data_key' => 'name', - 'view_data' => lang('common_goods_comments_business_type_list'), + 'view_data' => MyConst('common_goods_comments_business_type_list'), 'width' => 120, 'is_sort' => 1, 'search_config' => [ 'form_type' => 'select', 'where_type' => 'in', - 'data' => lang('common_goods_comments_business_type_list'), + 'data' => MyConst('common_goods_comments_business_type_list'), 'data_key' => 'value', 'data_name' => 'name', 'is_multiple' => 1, @@ -130,7 +130,7 @@ class GoodsComments 'form_type' => 'select', 'form_name' => 'rating', 'where_type' => 'in', - 'data' => lang('common_goods_comments_rating_list'), + 'data' => MyConst('common_goods_comments_rating_list'), 'data_key' => 'value', 'data_name' => 'name', 'is_multiple' => 1, @@ -158,7 +158,7 @@ class GoodsComments 'search_config' => [ 'form_type' => 'select', 'where_type' => 'in', - 'data' => lang('common_is_shelves_list'), + 'data' => MyConst('common_is_shelves_list'), 'data_key' => 'id', 'data_name' => 'name', 'is_multiple' => 1, @@ -174,7 +174,7 @@ class GoodsComments 'search_config' => [ 'form_type' => 'select', 'where_type' => 'in', - 'data' => lang('common_is_text_list'), + 'data' => MyConst('common_is_text_list'), 'data_key' => 'id', 'data_name' => 'name', 'is_multiple' => 1, @@ -190,7 +190,7 @@ class GoodsComments 'search_config' => [ 'form_type' => 'select', 'where_type' => 'in', - 'data' => lang('common_is_text_list'), + 'data' => MyConst('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 e677fe06dec80e18b4655fddd4551cee46871a3d..0297489cf3c9aa33d6abfeb4839aa88f08000b2f 100644 --- a/app/admin/form/Goodsparamstemplate.php +++ b/app/admin/form/Goodsparamstemplate.php @@ -77,7 +77,7 @@ class GoodsParamsTemplate 'search_config' => [ 'form_type' => 'select', 'where_type' => 'in', - 'data' => lang('common_is_enable_list'), + 'data' => MyConst('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 21467d912bfb599cfb55ac6d27ee5e64073af9f7..a72c674399e7d94e0b5c0c4f74630d276faef109 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' => lang('common_integral_log_type_list'), + 'view_data' => MyConst('common_integral_log_type_list'), 'is_sort' => 1, 'search_config' => [ 'form_type' => 'select', 'where_type' => 'in', - 'data' => lang('common_integral_log_type_list'), + 'data' => MyConst('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 7e79302169197f6e0175580db535687e8b5a413e..c18625b7c415932ab9768f52604e89d1db40a8a4 100644 --- a/app/admin/form/Link.php +++ b/app/admin/form/Link.php @@ -101,7 +101,7 @@ class Link 'search_config' => [ 'form_type' => 'select', 'where_type' => 'in', - 'data' => lang('common_is_enable_list'), + 'data' => MyConst('common_is_enable_list'), 'data_key' => 'id', 'data_name' => 'name', 'is_multiple' => 1, @@ -117,7 +117,7 @@ class Link 'search_config' => [ 'form_type' => 'select', 'where_type' => 'in', - 'data' => lang('common_is_text_list'), + 'data' => MyConst('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 e08e61b24060cba5e8d01b597df93fd3d6389d29..45a0ae500102310372b95a906ec654409e17204c 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' => lang('common_message_type_list'), + 'view_data' => MyConst('common_message_type_list'), 'is_sort' => 1, 'search_config' => [ 'form_type' => 'select', 'where_type' => 'in', - 'data' => lang('common_message_type_list'), + 'data' => MyConst('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' => lang('common_is_read_list'), + 'view_data' => MyConst('common_is_read_list'), 'is_sort' => 1, 'search_config' => [ 'form_type' => 'select', 'where_type' => 'in', - 'data' => lang('common_is_read_list'), + 'data' => MyConst('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' => lang('common_is_text_list'), + 'data' => MyConst('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 8329e56a3c73a4ef0b58cbe18427dbaf593a5324..ee2dc286c4c15a216986127b7c85ccb5043c5a13 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' => lang('common_nav_type_list'), + 'view_data' => MyConst('common_nav_type_list'), 'is_sort' => 1, 'search_config' => [ 'form_type' => 'select', 'where_type' => 'in', - 'data' => lang('common_nav_type_list'), + 'data' => MyConst('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' => lang('common_is_show_list'), + 'data' => MyConst('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' => lang('common_is_text_list'), + 'data' => MyConst('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 c09cd425c30bc18940cbd1f299141416e4eb4e0d..8f20b01b9c6a36119a2fd6a476b4bc35df00aefe 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' => lang('common_order_admin_status'), + 'data' => MyConst('common_order_admin_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' => lang('common_order_pay_status'), + 'data' => MyConst('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' => lang('common_site_type_list'), + 'view_data' => MyConst('common_site_type_list'), 'is_sort' => 1, 'search_config' => [ 'form_type' => 'select', 'where_type' => 'in', - 'data' => lang('common_site_type_list'), + 'data' => MyConst('common_site_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' => lang('common_platform_type'), + 'view_data' => MyConst('common_platform_type'), 'is_sort' => 1, 'search_config' => [ 'form_type' => 'select', 'where_type' => 'in', - 'data' => lang('common_platform_type'), + 'data' => MyConst('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' => lang('common_is_text_list'), + 'data' => MyConst('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 4a6ccf89e9c3d9536ae439340e255a4fac9e8bcd..c5dbdbb535c29034918682d8e45c685528643509 100644 --- a/app/admin/form/Orderaftersale.php +++ b/app/admin/form/Orderaftersale.php @@ -80,13 +80,13 @@ class OrderAftersale 'view_type' => 'field', 'view_key' => 'status', 'view_data_key' => 'name', - 'view_data' => lang('common_order_aftersale_status_list'), + 'view_data' => MyConst('common_order_aftersale_status_list'), 'width' => 120, 'is_sort' => 1, 'search_config' => [ 'form_type' => 'select', 'where_type' => 'in', - 'data' => lang('common_order_aftersale_status_list'), + 'data' => MyConst('common_order_aftersale_status_list'), 'data_key' => 'value', 'data_name' => 'name', 'is_multiple' => 1, @@ -97,13 +97,13 @@ class OrderAftersale 'view_type' => 'field', 'view_key' => 'type', 'view_data_key' => 'name', - 'view_data' => lang('common_order_aftersale_type_list'), + 'view_data' => MyConst('common_order_aftersale_type_list'), 'width' => 120, 'is_sort' => 1, 'search_config' => [ 'form_type' => 'select', 'where_type' => 'in', - 'data' => lang('common_order_aftersale_type_list'), + 'data' => MyConst('common_order_aftersale_type_list'), 'data_key' => 'value', 'data_name' => 'name', 'is_multiple' => 1, @@ -154,13 +154,13 @@ class OrderAftersale 'view_type' => 'field', 'view_key' => 'refundment', 'view_data_key' => 'name', - 'view_data' => lang('common_order_aftersale_refundment_list'), + 'view_data' => MyConst('common_order_aftersale_refundment_list'), 'width' => 120, 'is_sort' => 1, 'search_config' => [ 'form_type' => 'select', 'where_type' => 'in', - 'data' => lang('common_order_aftersale_refundment_list'), + 'data' => MyConst('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 9992255e9c65ffd931b753a33ecf15d448caacfc..da1388ff45e59d798eb74fc0eb87cb598da6c0b7 100644 --- a/app/admin/form/Paylog.php +++ b/app/admin/form/Paylog.php @@ -93,12 +93,12 @@ class PayLog 'view_type' => 'field', 'view_key' => 'status', 'view_data_key' => 'name', - 'view_data' => lang('common_pay_log_status_list'), + 'view_data' => MyConst('common_pay_log_status_list'), 'is_sort' => 1, 'search_config' => [ 'form_type' => 'select', 'where_type' => 'in', - 'data' => lang('common_pay_log_status_list'), + 'data' => MyConst('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 f483ffb95c16fbe898b89721c59a8bee66165520..026b5ac0095456536211186eed203a1c508857c4 100644 --- a/app/admin/form/Quicknav.php +++ b/app/admin/form/Quicknav.php @@ -70,12 +70,12 @@ class QuickNav 'view_type' => 'field', 'view_key' => 'platform', 'view_data_key' => 'name', - 'view_data' => lang('common_platform_type'), + 'view_data' => MyConst('common_platform_type'), 'is_sort' => 1, 'search_config' => [ 'form_type' => 'select', 'where_type' => 'in', - 'data' => lang('common_platform_type'), + 'data' => MyConst('common_platform_type'), 'data_key' => 'value', 'data_name' => 'name', 'is_multiple' => 1, @@ -92,13 +92,13 @@ class QuickNav 'view_type' => 'field', 'view_key' => 'event_type', 'view_data_key' => 'name', - 'view_data' => lang('common_app_event_type'), + 'view_data' => MyConst('common_app_event_type'), 'grid_size' => 'sm', 'is_sort' => 1, 'search_config' => [ 'form_type' => 'select', 'where_type' => 'in', - 'data' => lang('common_app_event_type'), + 'data' => MyConst('common_app_event_type'), 'data_key' => 'value', 'data_name' => 'name', 'is_multiple' => 1, @@ -126,7 +126,7 @@ class QuickNav 'search_config' => [ 'form_type' => 'select', 'where_type' => 'in', - 'data' => lang('common_is_enable_list'), + 'data' => MyConst('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 772c11597fd865348ee71ca6ad9ba0ff369b164f..cb6fda39f2ab6bedb4929e9f36565373b3bedf85 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' => lang('common_order_aftersale_refundment_list'), + 'data' => MyConst('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 d73d9f97e8bdb90124b89616b9eb416ccfeef77b..8ca75f6f834cf1cbb1262e8777fc5c7d3535b451 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' => lang('common_is_text_list'), + 'data' => MyConst('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 d1bf502e0ce268de1621830a046326b05972c4e6..381ab4be7d2bb3f4c6e298c3d0edb975033a9369 100644 --- a/app/admin/form/Slide.php +++ b/app/admin/form/Slide.php @@ -70,12 +70,12 @@ class Slide 'view_type' => 'field', 'view_key' => 'platform', 'view_data_key' => 'name', - 'view_data' => lang('common_platform_type'), + 'view_data' => MyConst('common_platform_type'), 'is_sort' => 1, 'search_config' => [ 'form_type' => 'select', 'where_type' => 'in', - 'data' => lang('common_platform_type'), + 'data' => MyConst('common_platform_type'), 'data_key' => 'value', 'data_name' => 'name', 'is_multiple' => 1, @@ -92,12 +92,12 @@ class Slide 'view_type' => 'field', 'view_key' => 'event_type', 'view_data_key' => 'name', - 'view_data' => lang('common_app_event_type'), + 'view_data' => MyConst('common_app_event_type'), 'is_sort' => 1, 'search_config' => [ 'form_type' => 'select', 'where_type' => 'in', - 'data' => lang('common_app_event_type'), + 'data' => MyConst('common_app_event_type'), 'data_key' => 'value', 'data_name' => 'name', 'is_multiple' => 1, @@ -125,7 +125,7 @@ class Slide 'search_config' => [ 'form_type' => 'select', 'where_type' => 'in', - 'data' => lang('common_is_enable_list'), + 'data' => MyConst('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 8c3dd8a68e7ed417596d5fde31e02a94d4a5843f..1f9fcad315c4e4810bb772532e0ff6e310c72c76 100644 --- a/app/admin/form/User.php +++ b/app/admin/form/User.php @@ -116,12 +116,12 @@ class User 'view_type' => 'field', 'view_key' => 'gender', 'view_data_key' => 'name', - 'view_data' => lang('common_gender_list'), + 'view_data' => MyConst('common_gender_list'), 'is_sort' => 1, 'search_config' => [ 'form_type' => 'select', 'where_type' => 'in', - 'data' => lang('common_gender_list'), + 'data' => MyConst('common_gender_list'), 'data_key' => 'id', 'data_name' => 'name', 'is_multiple' => 1, @@ -132,12 +132,12 @@ class User 'view_type' => 'field', 'view_key' => 'status', 'view_data_key' => 'name', - 'view_data' => lang('common_user_status_list'), + 'view_data' => MyConst('common_user_status_list'), 'is_sort' => 1, 'search_config' => [ 'form_type' => 'select', 'where_type' => 'in', - 'data' => lang('common_user_status_list'), + 'data' => MyConst('common_user_status_list'), 'data_key' => 'id', 'data_name' => 'name', 'is_multiple' => 1, diff --git a/app/admin/form/Useraddress.php b/app/admin/form/Useraddress.php index 2dc008463c31c2a9df0123329b5f421f91ce78b2..63457eee9042eae314adf8c01dd6a46249439955 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' => lang('common_is_text_list'), + 'data' => MyConst('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 8bb29a3e297ba2c15dc8f5db8d2126fe8e1a1116..ff7abc8f80528f172df21ddb1c61501e49b4cea6 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' => lang('common_is_enable_list'), + 'data' => MyConst('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 0649a8decd2d312978256001871b2e3516fbbcc2..290a41b7bf6cc79558a89910107072fa79144d5e 100644 --- a/app/admin/form/Warehousegoods.php +++ b/app/admin/form/Warehousegoods.php @@ -101,7 +101,7 @@ class WarehouseGoods 'search_config' => [ 'form_type' => 'select', 'where_type' => 'in', - 'data' => lang('common_is_enable_list'), + 'data' => MyConst('common_is_enable_list'), 'data_key' => 'id', 'data_name' => 'name', 'is_multiple' => 1, diff --git a/app/admin/view/default/admin/login_info.html b/app/admin/view/default/admin/login_info.html index 94e0b3c48ced30293c89d841798169dff54593ef..bb11d7659eeba1c067f29ee60d5131234c4014f9 100755 --- a/app/admin/view/default/admin/login_info.html +++ b/app/admin/view/default/admin/login_info.html @@ -29,13 +29,13 @@