diff --git a/app/admin/controller/Admin.php b/app/admin/controller/Admin.php index ca1aaccc7..02dba223c 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 76781c636..09be19a46 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 bef6218b9..cdd17f8e0 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 ee15ff935..7e9108a46 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 f4cbc7e89..2d9865a08 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 1e2c00153..22f202e51 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 27f39b9d9..9971d9b7b 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 2a91b4a1d..a59af4c5d 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 854ac28a3..e09b99d44 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 23658af51..6642db5eb 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 9260e4d52..729457012 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 f46bc1127..8ce5f70af 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 bdf950ce5..d176fea79 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 197ba20ac..6b8135053 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 561e404cf..7d74643a5 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 2955bc340..1e14e44e4 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 2611c4dac..6c0f426b3 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 cb31850f8..6e13dd0ae 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 6dd6902fe..49efd3f2a 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 7507ea7b3..8509e03a1 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 1813a3db8..7d667aa6f 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 14c14f5c2..37f73979e 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 4b2f4c9a5..d93bcf59c 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 ad8f17570..de41a3fc9 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 7b51073ef..ecc61bab2 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 3a05842d6..34ddbba5a 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 3a5cd2304..4497a55ab 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 e39942110..04272812f 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 876f4b9a6..7d1d957e5 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 471897a07..ccfa37d1f 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 d044ac77f..9db6039df 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 2003d2d06..443bf444d 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 6269b698e..64c39bb3a 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 1ee989493..8beb8a0f8 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 41c51f980..dc5ce0d9b 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 3d30f93fc..79be7c28f 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 330f7dcb0..cf756fa7d 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 50a102cf5..41c073f49 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 e677fe06d..0297489cf 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 21467d912..a72c67439 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 7e7930216..c18625b7c 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 e08e61b24..45a0ae500 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 8329e56a3..ee2dc286c 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 c09cd425c..8f20b01b9 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 4a6ccf89e..c5dbdbb53 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 9992255e9..da1388ff4 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 f483ffb95..026b5ac00 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 772c11597..cb6fda39f 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 d73d9f97e..8ca75f6f8 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 d1bf502e0..381ab4be7 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 8c3dd8a68..1f9fcad31 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 2dc008463..63457eee9 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 8bb29a3e2..ff7abc8f8 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 0649a8dec..290a41b7b 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 94e0b3c48..bb11d7659 100755 --- a/app/admin/view/default/admin/login_info.html +++ b/app/admin/view/default/admin/login_info.html @@ -29,13 +29,13 @@
- +
- + @@ -96,7 +96,7 @@
- +
diff --git a/app/admin/view/default/admin/save_info.html b/app/admin/view/default/admin/save_info.html index 933f1c71f..982e42d33 100755 --- a/app/admin/view/default/admin/save_info.html +++ b/app/admin/view/default/admin/save_info.html @@ -11,15 +11,15 @@
- +
- +
- +
@@ -42,7 +42,7 @@
diff --git a/app/admin/view/default/config/index.html b/app/admin/view/default/config/index.html index dfcd28a19..f6ba37504 100755 --- a/app/admin/view/default/config/index.html +++ b/app/admin/view/default/config/index.html @@ -21,7 +21,7 @@
- +
diff --git a/app/admin/view/default/lib/enable.html b/app/admin/view/default/lib/enable.html index b9b2a74b1..076cdd2a9 100755 --- a/app/admin/view/default/lib/enable.html +++ b/app/admin/view/default/lib/enable.html @@ -2,7 +2,7 @@
- {{foreach :lang('common_is_enable_list') as $v}} + {{foreach :MyConst('common_is_enable_list') as $v}} diff --git a/app/admin/view/default/lib/gender.html b/app/admin/view/default/lib/gender.html index 4ec3c0fa9..4df22e19b 100755 --- a/app/admin/view/default/lib/gender.html +++ b/app/admin/view/default/lib/gender.html @@ -2,7 +2,7 @@
- {{foreach :lang('common_gender_list') as $v}} + {{foreach :MyConst('common_gender_list') as $v}} diff --git a/app/admin/view/default/lib/is_footer.html b/app/admin/view/default/lib/is_footer.html index 0eed5b089..db7246401 100755 --- a/app/admin/view/default/lib/is_footer.html +++ b/app/admin/view/default/lib/is_footer.html @@ -2,7 +2,7 @@
- {{foreach :lang('common_is_text_list') as $v}} + {{foreach :MyConst('common_is_text_list') as $v}} diff --git a/app/admin/view/default/lib/is_full_screen.html b/app/admin/view/default/lib/is_full_screen.html index eb760022e..8f8bd1d09 100755 --- a/app/admin/view/default/lib/is_full_screen.html +++ b/app/admin/view/default/lib/is_full_screen.html @@ -2,7 +2,7 @@
- {{foreach :lang('common_is_text_list') as $v}} + {{foreach :MyConst('common_is_text_list') as $v}} diff --git a/app/admin/view/default/lib/is_header.html b/app/admin/view/default/lib/is_header.html index be7f2885d..411178877 100755 --- a/app/admin/view/default/lib/is_header.html +++ b/app/admin/view/default/lib/is_header.html @@ -2,7 +2,7 @@
- {{foreach :lang('common_is_text_list') as $v}} + {{foreach :MyConst('common_is_text_list') as $v}} diff --git a/app/admin/view/default/lib/is_new_window_open.html b/app/admin/view/default/lib/is_new_window_open.html index 6f4047f4d..47fc0fe47 100755 --- a/app/admin/view/default/lib/is_new_window_open.html +++ b/app/admin/view/default/lib/is_new_window_open.html @@ -2,7 +2,7 @@
- {{foreach :lang('common_is_text_list') as $v}} + {{foreach :MyConst('common_is_text_list') as $v}} diff --git a/app/admin/view/default/lib/is_show.html b/app/admin/view/default/lib/is_show.html index fa172a3cd..8b6ca0484 100755 --- a/app/admin/view/default/lib/is_show.html +++ b/app/admin/view/default/lib/is_show.html @@ -2,7 +2,7 @@
- {{foreach :lang('common_is_show_list') as $v}} + {{foreach :MyConst('common_is_show_list') as $v}} diff --git a/app/admin/view/default/lib/user_status.html b/app/admin/view/default/lib/user_status.html index e691383c3..0a70029ac 100755 --- a/app/admin/view/default/lib/user_status.html +++ b/app/admin/view/default/lib/user_status.html @@ -2,7 +2,7 @@
diff --git a/app/admin/view/default/pluginsadmin/save_info.html b/app/admin/view/default/pluginsadmin/save_info.html index a7cf10a5a..ca7546ee8 100755 --- a/app/admin/view/default/pluginsadmin/save_info.html +++ b/app/admin/view/default/pluginsadmin/save_info.html @@ -43,7 +43,7 @@
- +
@@ -54,7 +54,7 @@
@@ -63,7 +63,7 @@
diff --git a/app/admin/view/default/power/index.html b/app/admin/view/default/power/index.html index da49f0d79..b6a6656a6 100755 --- a/app/admin/view/default/power/index.html +++ b/app/admin/view/default/power/index.html @@ -49,11 +49,11 @@
- +
- +
diff --git a/app/admin/view/default/seo/index.html b/app/admin/view/default/seo/index.html index ef1becc7c..2962a895b 100755 --- a/app/admin/view/default/seo/index.html +++ b/app/admin/view/default/seo/index.html @@ -24,7 +24,7 @@
- +
diff --git a/app/admin/view/default/user/save_info.html b/app/admin/view/default/user/save_info.html index b12001548..289a5e3d7 100755 --- a/app/admin/view/default/user/save_info.html +++ b/app/admin/view/default/user/save_info.html @@ -20,7 +20,7 @@
- +
@@ -62,7 +62,7 @@
- +
@@ -83,7 +83,7 @@
- +
diff --git a/app/api/controller/Orderaftersale.php b/app/api/controller/Orderaftersale.php index 64b735e2e..c48ae0de8 100644 --- a/app/api/controller/Orderaftersale.php +++ b/app/api/controller/Orderaftersale.php @@ -141,7 +141,7 @@ class Orderaftersale extends Common 'returned_data' => $returned['data'], 'return_only_money_reason' => empty($return_only_money_reason) ? [] : explode("\n", $return_only_money_reason), 'return_money_goods_reason' => empty($return_money_goods_reason) ? [] : explode("\n", $return_money_goods_reason), - 'aftersale_type_list' => lang('common_order_aftersale_type_list'), + 'aftersale_type_list' => MyConst('common_order_aftersale_type_list'), 'return_goods_address' => $return_goods_address, 'editor_path_type' => ResourcesService::EditorPathTypeValue(OrderAftersaleService::EditorAttachmentPathType($this->user['id'], $order_id, $order_detail_id)), ]; diff --git a/app/common.php b/app/common.php index a8016ad3b..9eed13db1 100755 --- a/app/common.php +++ b/app/common.php @@ -11,6 +11,21 @@ // 应用公共文件 +/** + * 获取常量数据 + * @author Devil + * @blog http://gong.gg/ + * @version 1.0.0 + * @date 2021-08-14 + * @desc description + * @param [string] $key [数据key] + * @param [mixed] $default [默认值] + */ +function MyConst($key = '', $default = null) +{ + return \app\service\ConstService::Run($key, $default); +} + /** * session管理 * @author Devil @@ -1710,7 +1725,7 @@ function FileUploadError($name, $index = false) } // 错误码对应的错误信息 - $file_error_list = lang('common_file_upload_error_list'); + $file_error_list = MyConst('common_file_upload_error_list'); if(isset($file_error_list[$error])) { return $file_error_list[$error]; @@ -2149,7 +2164,7 @@ function XmlArray($xmlstring) { */ function CheckMobile($mobile) { - return (preg_match('/'.lang('common_regex_mobile').'/', $mobile) == 1) ? true : false; + return (preg_match('/'.MyConst('common_regex_mobile').'/', $mobile) == 1) ? true : false; } /** @@ -2163,7 +2178,7 @@ function CheckMobile($mobile) */ function CheckTel($tel) { - return (preg_match('/'.lang('common_regex_tel').'/', $tel) == 1) ? true : false; + return (preg_match('/'.MyConst('common_regex_tel').'/', $tel) == 1) ? true : false; } /** @@ -2177,7 +2192,7 @@ function CheckTel($tel) */ function CheckEmail($email) { - return (preg_match('/'.lang('common_regex_email').'/', $email) == 1) ? true : false; + return (preg_match('/'.MyConst('common_regex_email').'/', $email) == 1) ? true : false; } /** @@ -2191,7 +2206,7 @@ function CheckEmail($email) */ function CheckIdCard($number) { - return (preg_match('/'.lang('common_regex_id_card').'/', $number) == 1) ? true : false; + return (preg_match('/'.MyConst('common_regex_id_card').'/', $number) == 1) ? true : false; } /** @@ -2205,7 +2220,7 @@ function CheckIdCard($number) */ function CheckPrice($price) { - return (preg_match('/'.lang('common_regex_price').'/', $price) == 1) ? true : false; + return (preg_match('/'.MyConst('common_regex_price').'/', $price) == 1) ? true : false; } @@ -2219,7 +2234,7 @@ function CheckPrice($price) */ function CheckIp($ip) { - return (preg_match('/'.lang('common_regex_ip').'/', $ip) == 1) ? true : false; + return (preg_match('/'.MyConst('common_regex_ip').'/', $ip) == 1) ? true : false; } /** @@ -2232,7 +2247,7 @@ function CheckIp($ip) */ function CheckUrl($url) { - return (preg_match('/'.lang('common_regex_url').'/', $url) == 1) ? true : false; + return (preg_match('/'.MyConst('common_regex_url').'/', $url) == 1) ? true : false; } /** @@ -2245,7 +2260,7 @@ function CheckUrl($url) */ function CheckVersion($ver) { - return (preg_match('/'.lang('common_regex_version').'/', $ver) == 1) ? true : false; + return (preg_match('/'.MyConst('common_regex_version').'/', $ver) == 1) ? true : false; } /** @@ -2259,7 +2274,7 @@ function CheckVersion($ver) */ function CheckUserName($string) { - return (preg_match('/'.lang('common_regex_username').'/', $string) == 1) ? true : false; + return (preg_match('/'.MyConst('common_regex_username').'/', $string) == 1) ? true : false; } /** @@ -2287,7 +2302,7 @@ function CheckSort($value) */ function CheckColor($value) { - return (preg_match('/'.lang('common_regex_color').'/', $value) == 1) ? true : false; + return (preg_match('/'.MyConst('common_regex_color').'/', $value) == 1) ? true : false; } /** @@ -2301,7 +2316,7 @@ function CheckColor($value) */ function CheckLoginPwd($string) { - return (preg_match('/'.lang('common_regex_pwd').'/', $string) == 1) ? true : false; + return (preg_match('/'.MyConst('common_regex_pwd').'/', $string) == 1) ? true : false; } /** diff --git a/app/index/controller/Common.php b/app/index/controller/Common.php index 247140ce1..ac0ada38d 100755 --- a/app/index/controller/Common.php +++ b/app/index/controller/Common.php @@ -249,7 +249,7 @@ class Common extends BaseController MyViewAssign('common_goods_category_hidden', $common_goods_category_hidden); // 价格正则 - 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/index/controller/Index.php b/app/index/controller/Index.php index 4b87cc7a1..a302e18e1 100755 --- a/app/index/controller/Index.php +++ b/app/index/controller/Index.php @@ -94,8 +94,8 @@ class Index 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('home_seo_site_title', SeoService::BrowserSeoTitle('首页设计', 1)); diff --git a/app/index/controller/Orderaftersale.php b/app/index/controller/Orderaftersale.php index b0d091d30..993887885 100644 --- a/app/index/controller/Orderaftersale.php +++ b/app/index/controller/Orderaftersale.php @@ -140,7 +140,7 @@ class Orderaftersale extends Common MyViewAssign('return_goods_address', $return_goods_address); // 静态数据 - MyViewAssign('common_order_aftersale_type_list', lang('common_order_aftersale_type_list')); + MyViewAssign('common_order_aftersale_type_list', MyConst('common_order_aftersale_type_list')); // 编辑器文件存放地址 MyViewAssign('editor_path_type', ResourcesService::EditorPathTypeValue(OrderAftersaleService::EditorAttachmentPathType($this->user['id'], $order_id, $order_detail_id))); diff --git a/app/index/controller/Personal.php b/app/index/controller/Personal.php index 357d923d1..d4b569e42 100755 --- a/app/index/controller/Personal.php +++ b/app/index/controller/Personal.php @@ -67,7 +67,7 @@ class Personal extends Common public function SaveInfo() { // 性别 - MyViewAssign('common_gender_list', lang('common_gender_list')); + MyViewAssign('common_gender_list', MyConst('common_gender_list')); // 数据 MyViewAssign('data', $this->user); diff --git a/app/index/form/Message.php b/app/index/form/Message.php index e7158147a..5222b4209 100644 --- a/app/index/form/Message.php +++ b/app/index/form/Message.php @@ -69,12 +69,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, @@ -120,12 +120,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, diff --git a/app/index/form/Order.php b/app/index/form/Order.php index a4bcf44a6..b921783b3 100644 --- a/app/index/form/Order.php +++ b/app/index/form/Order.php @@ -88,12 +88,12 @@ class Order 'view_type' => 'field', 'view_key' => 'status', 'view_data_key' => 'name', - 'view_data' => lang('common_order_user_status'), + 'view_data' => MyConst('common_order_user_status'), 'is_sort' => 1, 'search_config' => [ 'form_type' => 'select', 'where_type' => 'in', - 'data' => lang('common_order_user_status'), + 'data' => MyConst('common_order_user_status'), 'data_key' => 'id', 'data_name' => 'name', 'is_multiple' => 1, @@ -108,7 +108,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, @@ -149,12 +149,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, @@ -165,12 +165,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, @@ -320,7 +320,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/index/form/Orderaftersale.php b/app/index/form/Orderaftersale.php index bac013ac0..225a7eef4 100644 --- a/app/index/form/Orderaftersale.php +++ b/app/index/form/Orderaftersale.php @@ -83,13 +83,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, @@ -100,13 +100,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, @@ -157,13 +157,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/index/form/Userintegral.php b/app/index/form/Userintegral.php index 8af6eb937..a1b35d3f8 100644 --- a/app/index/form/Userintegral.php +++ b/app/index/form/Userintegral.php @@ -67,12 +67,12 @@ class UserIntegral '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/index/view/default/config.json b/app/index/view/default/config.json index 2ef4ef1b6..803ca5cd3 100755 --- a/app/index/view/default/config.json +++ b/app/index/view/default/config.json @@ -1,6 +1,6 @@ { "name":"默认主题", - "ver":"2.2.0", + "ver":"2.2.1", "author":"Devil", "home":"https://shopxo.net/" } \ No newline at end of file diff --git a/app/index/view/default/lib/enable.html b/app/index/view/default/lib/enable.html index b9b2a74b1..076cdd2a9 100755 --- a/app/index/view/default/lib/enable.html +++ b/app/index/view/default/lib/enable.html @@ -2,7 +2,7 @@
- {{foreach :lang('common_is_enable_list') as $v}} + {{foreach :MyConst('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 d3c1ac4b7..c3b0865b6 100755 --- a/app/index/view/default/lib/gender.html +++ b/app/index/view/default/lib/gender.html @@ -2,7 +2,7 @@
- {{foreach :lang('common_gender_list') as $v}} + {{foreach :MyConst('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 0794abfeb..345558a6f 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 :lang('common_is_text_list') as $v}} + {{foreach :MyConst('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 797a74487..9859a2be9 100755 --- a/app/index/view/default/lib/is_show.html +++ b/app/index/view/default/lib/is_show.html @@ -2,7 +2,7 @@
- {{foreach :lang('common_is_show_list') as $v}} + {{foreach :MyConst('common_is_show_list') as $v}} diff --git a/app/index/view/default/safety/login_pwd_info.html b/app/index/view/default/safety/login_pwd_info.html index 0c81eafef..3ae664286 100755 --- a/app/index/view/default/safety/login_pwd_info.html +++ b/app/index/view/default/safety/login_pwd_info.html @@ -30,15 +30,15 @@
- +
- +
- +
diff --git a/app/index/view/default/safety/new_mobile_info.html b/app/index/view/default/safety/new_mobile_info.html index 89a23d7e4..1142dc7c3 100755 --- a/app/index/view/default/safety/new_mobile_info.html +++ b/app/index/view/default/safety/new_mobile_info.html @@ -30,7 +30,7 @@
- +
diff --git a/app/index/view/default/user/forget_pwd_info.html b/app/index/view/default/user/forget_pwd_info.html index da499eb93..dcbd6e112 100755 --- a/app/index/view/default/user/forget_pwd_info.html +++ b/app/index/view/default/user/forget_pwd_info.html @@ -49,7 +49,7 @@
- + diff --git a/app/index/view/default/user/login_content.html b/app/index/view/default/user/login_content.html index 8fba24fa8..81ac95a5f 100644 --- a/app/index/view/default/user/login_content.html +++ b/app/index/view/default/user/login_content.html @@ -25,7 +25,7 @@
- + @@ -86,7 +86,7 @@
- +
diff --git a/app/index/view/default/user/reg_info.html b/app/index/view/default/user/reg_info.html index dba55a1c5..51cde9fe1 100755 --- a/app/index/view/default/user/reg_info.html +++ b/app/index/view/default/user/reg_info.html @@ -72,13 +72,13 @@
- +
- + @@ -125,7 +125,7 @@
- +
@@ -141,7 +141,7 @@
- + @@ -189,7 +189,7 @@
- + diff --git a/app/layout/service/BaseLayout.php b/app/layout/service/BaseLayout.php index c44b805a4..ed8d54c63 100644 --- a/app/layout/service/BaseLayout.php +++ b/app/layout/service/BaseLayout.php @@ -795,8 +795,8 @@ class BaseLayout } // 排序处理 - $order_by_type_list = lang('goods_order_by_type_list'); - $order_by_rule_list = lang('goods_order_by_rule_list'); + $order_by_type_list = MyConst('goods_order_by_type_list'); + $order_by_rule_list = MyConst('goods_order_by_rule_list'); // 排序类型 $order_by_type = empty($params['order_by_type']) ? $order_by_type_list[0]['value'] : (array_key_exists($params['order_by_type'], $order_by_type_list) ? $order_by_type_list[$params['order_by_type']]['value'] : $order_by_type_list[0]['value']); diff --git a/app/layout/view/public/modal/modal_module_pages_select.html b/app/layout/view/public/modal/modal_module_pages_select.html index 6db2e02a6..76f4a5c7d 100644 --- a/app/layout/view/public/modal/modal_module_pages_select.html +++ b/app/layout/view/public/modal/modal_module_pages_select.html @@ -71,7 +71,7 @@
- {{foreach :lang('common_platform_type') as $v}} + {{foreach :MyConst('common_platform_type') as $v}}
diff --git a/app/service/AdminService.php b/app/service/AdminService.php index 10ab3ab39..401f054d2 100755 --- a/app/service/AdminService.php +++ b/app/service/AdminService.php @@ -49,8 +49,8 @@ class AdminService $roles = Db::name('Role')->where('id', 'in', array_column($data, 'role_id'))->column('name', 'id'); // 数据处理 - $common_gender_list = lang('common_gender_list'); - $common_admin_status_list = lang('common_admin_status_list'); + $common_gender_list = MyConst('common_gender_list'); + $common_admin_status_list = MyConst('common_admin_status_list'); foreach($data as &$v) { // 所在角色组 @@ -140,7 +140,7 @@ class AdminService [ 'checked_type' => 'in', 'key_name' => 'status', - 'checked_data' => array_column(lang('common_admin_status_list'), 'value'), + 'checked_data' => array_column(MyConst('common_admin_status_list'), 'value'), 'error_msg' => '状态值范围不正确', ], [ @@ -368,7 +368,7 @@ class AdminService [ 'checked_type' => 'in', 'key_name' => 'type', - 'checked_data' => array_column(lang('common_login_type_list'), 'value'), + 'checked_data' => array_column(MyConst('common_login_type_list'), 'value'), 'error_msg' => '登录类型有误', ], [ @@ -583,7 +583,7 @@ class AdminService [ 'checked_type' => 'in', 'key_name' => 'type', - 'checked_data' => array_column(lang('common_login_type_list'), 'value'), + 'checked_data' => array_column(MyConst('common_login_type_list'), 'value'), 'error_msg' => '登录类型有误', ], ]; diff --git a/app/service/AppCenterNavService.php b/app/service/AppCenterNavService.php index c6e58c32d..887b4e3cc 100755 --- a/app/service/AppCenterNavService.php +++ b/app/service/AppCenterNavService.php @@ -42,8 +42,8 @@ class AppCenterNavService $data = Db::name('AppCenterNav')->where($where)->order($order_by)->limit($m, $n)->select()->toArray(); if(!empty($data)) { - $common_platform_type = lang('common_platform_type'); - $common_app_event_type = lang('common_app_event_type'); + $common_platform_type = MyConst('common_platform_type'); + $common_app_event_type = MyConst('common_app_event_type'); foreach($data as &$v) { // 平台类型 @@ -114,13 +114,13 @@ class AppCenterNavService [ 'checked_type' => 'in', 'key_name' => 'platform', - 'checked_data' => array_column(lang('common_platform_type'), 'value'), + 'checked_data' => array_column(MyConst('common_platform_type'), 'value'), 'error_msg' => '平台类型有误', ], [ 'checked_type' => 'in', 'key_name' => 'event_type', - 'checked_data' => array_column(lang('common_app_event_type'), 'value'), + 'checked_data' => array_column(MyConst('common_app_event_type'), 'value'), 'is_checked' => 2, 'error_msg' => '事件值类型有误', ], diff --git a/app/service/AppHomeNavService.php b/app/service/AppHomeNavService.php index e852b4b4f..62ac05e11 100755 --- a/app/service/AppHomeNavService.php +++ b/app/service/AppHomeNavService.php @@ -42,8 +42,8 @@ class AppHomeNavService $data = Db::name('AppHomeNav')->where($where)->order($order_by)->limit($m, $n)->select()->toArray(); if(!empty($data)) { - $common_platform_type = lang('common_platform_type'); - $common_app_event_type = lang('common_app_event_type'); + $common_platform_type = MyConst('common_platform_type'); + $common_app_event_type = MyConst('common_app_event_type'); foreach($data as &$v) { // 平台类型 @@ -114,13 +114,13 @@ class AppHomeNavService [ 'checked_type' => 'in', 'key_name' => 'platform', - 'checked_data' => array_column(lang('common_platform_type'), 'value'), + 'checked_data' => array_column(MyConst('common_platform_type'), 'value'), 'error_msg' => '平台类型有误', ], [ 'checked_type' => 'in', 'key_name' => 'event_type', - 'checked_data' => array_column(lang('common_app_event_type'), 'value'), + 'checked_data' => array_column(MyConst('common_app_event_type'), 'value'), 'is_checked' => 2, 'error_msg' => '事件值类型有误', ], diff --git a/app/service/AppMiniService.php b/app/service/AppMiniService.php index 1b25c05b8..414ff7a4c 100755 --- a/app/service/AppMiniService.php +++ b/app/service/AppMiniService.php @@ -50,7 +50,7 @@ class AppMiniService self::$application_name = isset($params['application_name']) ? $params['application_name'] : 'weixin'; // 小程序类型校验 - if(!array_key_exists(self::$application_name, lang('common_appmini_type'))) + if(!array_key_exists(self::$application_name, MyConst('common_appmini_type'))) { return DataReturn('小程序类型有误['.self::$application_name.']', -1); } @@ -430,7 +430,7 @@ class AppMiniService \base\FileUtil::UnlinkDir($new_dir); // 开始下载 - $appmini_type = lang('common_appmini_type'); + $appmini_type = MyConst('common_appmini_type'); $application_name = array_key_exists(self::$application_name, $appmini_type) ? $appmini_type[self::$application_name]['name'].'-' : ''; if(\base\FileUtil::DownloadFile($new_dir.'.zip', $application_name.$config['name'].'_v'.$config['ver'].'.zip')) { diff --git a/app/service/ConstService.php b/app/service/ConstService.php new file mode 100644 index 000000000..d6b264e9d --- /dev/null +++ b/app/service/ConstService.php @@ -0,0 +1,529 @@ + [ + '1.1.0' => ['value' => '1.1.0', 'name' => 'v1.1.0'], + '1.2.0' => ['value' => '1.2.0', 'name' => 'v1.2.0'], + '1.3.0' => ['value' => '1.3.0', 'name' => 'v1.3.0'], + '1.4.0' => ['value' => '1.4.0', 'name' => 'v1.4.0'], + '1.5.0' => ['value' => '1.5.0', 'name' => 'v1.5.0'], + '1.6.0' => ['value' => '1.6.0', 'name' => 'v1.6.0'], + '1.7.0' => ['value' => '1.7.0', 'name' => 'v1.7.0'], + '1.8.0' => ['value' => '1.8.0', 'name' => 'v1.8.0'], + '1.8.1' => ['value' => '1.8.1', 'name' => 'v1.8.1'], + '1.9.0' => ['value' => '1.9.0', 'name' => 'v1.9.0'], + '1.9.1' => ['value' => '1.9.1', 'name' => 'v1.9.1'], + '1.9.2' => ['value' => '1.9.2', 'name' => 'v1.9.2'], + '1.9.3' => ['value' => '1.9.3', 'name' => 'v1.9.3'], + '2.0.0' => ['value' => '2.0.0', 'name' => 'v2.0.0'], + '2.0.1' => ['value' => '2.0.1', 'name' => 'v2.0.1'], + '2.0.2' => ['value' => '2.0.2', 'name' => 'v2.0.2'], + '2.0.3' => ['value' => '2.0.3', 'name' => 'v2.0.3'], + '2.1.0' => ['value' => '2.1.0', 'name' => 'v2.1.0'], + '2.2.0' => ['value' => '2.2.0', 'name' => 'v2.2.0'], + '2.2.1' => ['value' => '2.2.0', 'name' => 'v2.2.1'], + ], + + // 用户注册类型列表 + 'common_user_reg_type_list' => [ + 0 => ['value' => 'sms', 'name' => '短信'], + 1 => ['value' => 'email', 'name' => '邮箱'], + 2 => ['value' => 'username', 'name' => '用户名'], + ], + + // 登录方式 + 'common_login_type_list' => [ + 0 => ['value' => 'username', 'name' => '帐号密码', 'checked' => true], + 1 => ['value' => 'email', 'name' => '邮箱验证码'], + 2 => ['value' => 'sms', 'name' => '手机验证码'], + ], + + // 性别 + 'common_gender_list' => [ + 0 => ['id' => 0, 'name' => '保密', 'checked' => true], + 1 => ['id' => 1, 'name' => '女'], + 2 => ['id' => 2, 'name' => '男'], + ], + + // 关闭开启状态 + 'common_close_open_list' => [ + 0 => ['value' => 0, 'name' => '关闭'], + 1 => ['value' => 1, 'name' => '开启'], + ], + + // 是否启用 + 'common_is_enable_tips' => [ + 0 => ['id' => 0, 'name' => '未启用'], + 1 => ['id' => 1, 'name' => '已启用'], + ], + 'common_is_enable_list' => [ + 0 => ['id' => 0, 'name' => '不启用'], + 1 => ['id' => 1, 'name' => '启用', 'checked' => true], + ], + + // 是否显示 + 'common_is_show_list' => [ + 0 => ['id' => 0, 'name' => '不显示'], + 1 => ['id' => 1, 'name' => '显示', 'checked' => true], + ], + + // 状态 + 'common_state_list' => [ + 0 => ['id' => 0, 'name' => '不可用'], + 1 => ['id' => 1, 'name' => '可用', 'checked' => true], + ], + + // excel编码列表 + 'common_excel_charset_list' => [ + 0 => ['id' => 0, 'value' => 'utf-8', 'name' => 'utf-8', 'checked' => true], + 1 => ['id' => 1, 'value' => 'gbk', 'name' => 'gbk'], + ], + + // 支付状态 + 'common_order_pay_status' => [ + 0 => ['id' => 0, 'name' => '待支付', 'checked' => true], + 1 => ['id' => 1, 'name' => '已支付'], + 2 => ['id' => 2, 'name' => '已退款'], + 3 => ['id' => 3, 'name' => '部分退款'], + ], + + // 用户端 - 订单管理 + 'common_order_user_status' => [ + 0 => ['id' => 0, 'name' => '待确认', 'checked' => true], + 1 => ['id' => 1, 'name' => '待付款'], + 2 => ['id' => 2, 'name' => '待发货'], + 3 => ['id' => 3, 'name' => '待收货'], + 4 => ['id' => 4, 'name' => '已完成'], + 5 => ['id' => 5, 'name' => '已取消'], + 6 => ['id' => 6, 'name' => '已关闭'], + ], + + // 后台管理 - 订单管理 + 'common_order_admin_status' => [ + 0 => ['id' => 0, 'name' => '待确认', 'checked' => true], + 1 => ['id' => 1, 'name' => '已确认/待支付'], + 2 => ['id' => 2, 'name' => '待发货/待取货'], + 3 => ['id' => 3, 'name' => '已发货/待收货'], + 4 => ['id' => 4, 'name' => '已完成'], + 5 => ['id' => 5, 'name' => '已取消'], + 6 => ['id' => 6, 'name' => '已关闭'], + ], + + // 所属平台 + 'common_platform_type' => [ + 'pc' => ['value' => 'pc', 'name' => 'PC网站'], + 'h5' => ['value' => 'h5', 'name' => 'H5手机网站'], + 'ios' => ['value' => 'ios', 'name' => '苹果APP'], + 'android' => ['value' => 'android', 'name' => '安卓APP'], + 'weixin' => ['value' => 'weixin', 'name' => '微信小程序'], + 'alipay' => ['value' => 'alipay', 'name' => '支付宝小程序'], + 'baidu' => ['value' => 'baidu', 'name' => '百度小程序'], + 'toutiao' => ['value' => 'toutiao', 'name' => '头条小程序'], + 'qq' => ['value' => 'qq', 'name' => 'QQ小程序'], + ], + + // app平台 + 'common_app_type' => [ + 'ios' => ['value' => 'ios', 'name' => '苹果APP'], + 'android' => ['value' => 'android', 'name' => '安卓APP'], + ], + + // 小程序平台 + 'common_appmini_type' => [ + 'weixin' => ['value' => 'weixin', 'name' => '微信小程序'], + 'alipay' => ['value' => 'alipay', 'name' => '支付宝小程序'], + 'baidu' => ['value' => 'baidu', 'name' => '百度小程序'], + 'toutiao' => ['value' => 'toutiao', 'name' => '头条小程序'], + 'qq' => ['value' => 'qq', 'name' => 'QQ小程序'], + ], + + // 扣除库存规则 + 'common_deduction_inventory_rules_list' => [ + 0 => ['id' => 0, 'name' => '订单确认成功'], + 1 => ['id' => 1, 'name' => '订单支付成功'], + 2 => ['id' => 2, 'name' => '订单发货'], + ], + + // 商品增加销量规则 + 'common_sales_count_inc_rules_list' => [ + 0 => ['id' => 0, 'name' => '订单支付'], + 1 => ['id' => 1, 'name' => '订单收货'], + ], + + // 是否已读 + 'common_is_read_list' => [ + 0 => ['id' => 0, 'name' => '未读', 'checked' => true], + 1 => ['id' => 1, 'name' => '已读'], + ], + + // 消息类型 + 'common_message_type_list' => [ + 0 => ['id' => 0, 'name' => '默认', 'checked' => true], + ], + + // 用户积分 - 操作类型 + 'common_integral_log_type_list' => [ + 0 => ['id' => 0, 'name' => '减少', 'checked' => true], + 1 => ['id' => 1, 'name' => '增加'], + ], + + // 是否上架/下架 + 'common_is_shelves_list' => [ + 0 => ['id' => 0, 'name' => '下架'], + 1 => ['id' => 1, 'name' => '上架', 'checked' => true], + ], + + // 是否 + 'common_is_text_list' => [ + 0 => ['id' => 0, 'name' => '否', 'checked' => true], + 1 => ['id' => 1, 'name' => '是'], + ], + + // 用户状态 + 'common_user_status_list' => [ + 0 => ['id' => 0, 'name' => '正常', 'checked' => true], + 1 => ['id' => 1, 'name' => '禁止发言', 'tips' => '用户被禁止发言'], + 2 => ['id' => 2, 'name' => '禁止登录', 'tips' => '用户被禁止登录'], + 3 => ['id' => 3, 'name' => '待审核', 'tips' => '用户等待审核中'], + ], + + // 导航数据类型 + 'common_nav_type_list' => [ + 'custom' => ['value'=>'custom', 'name'=>'自定义'], + 'article' => ['value'=>'article', 'name'=>'文章'], + 'customview' => ['value'=>'customview', 'name'=>'自定义页面'], + 'goods_category' => ['value'=>'goods_category', 'name'=>'商品分类'], + ], + + // 搜索框下热门关键字类型 + 'common_search_keywords_type_list' => [ + 0 => ['value' => 0, 'name' => '关闭'], + 1 => ['value' => 1, 'name' => '自动'], + 2 => ['value' => 2, 'name' => '自定义'], + ], + + // app事件类型 + 'common_app_event_type' => [ + 0 => ['value' => 0, 'name' => 'WEB页面'], + 1 => ['value' => 1, 'name' => '内部页面(小程序/APP内部地址)'], + 2 => ['value' => 2, 'name' => '外部小程序(同一个主体下的小程序appid)'], + 3 => ['value' => 3, 'name' => '跳转原生地图查看指定位置'], + 4 => ['value' => 4, 'name' => '拨打电话'], + ], + + // 订单售后类型 + 'common_order_aftersale_type_list' => [ + 0 => ['value' => 0, 'name' => '仅退款', 'desc' => '未收到货(未签收),协商同意前提下', 'icon' => 'am-icon-random', 'class' => 'am-fl'], + 1 => ['value' => 1, 'name' => '退款退货', 'desc' => '已收到货,需要退换已收到的货物', 'icon' => 'am-icon-retweet', 'class' => 'am-fr'], + ], + + // 订单售后状态 + 'common_order_aftersale_status_list' => [ + 0 => ['value' => 0, 'name' => '待确认'], + 1 => ['value' => 1, 'name' => '待退货'], + 2 => ['value' => 2, 'name' => '待审核'], + 3 => ['value' => 3, 'name' => '已完成'], + 4 => ['value' => 4, 'name' => '已拒绝'], + 5 => ['value' => 5, 'name' => '已取消'], + ], + + // 订单售后退款方式 + 'common_order_aftersale_refundment_list' => [ + 0 => ['value' => 0, 'name' => '原路退回'], + 1 => ['value' => 1, 'name' => '退至钱包'], + 2 => ['value' => 2, 'name' => '手动处理'], + ], + + // 商品评分 + 'common_goods_comments_rating_list' => [ + 0 => ['value'=>0, 'name'=>'未评分', 'badge'=>''], + 1 => ['value'=>1, 'name'=>'1分', 'badge'=>'danger'], + 2 => ['value'=>2, 'name'=>'2分', 'badge'=>'warning'], + 3 => ['value'=>3, 'name'=>'3分', 'badge'=>'secondary'], + 4 => ['value'=>4, 'name'=>'4分', 'badge'=>'primary'], + 5 => ['value'=>5, 'name'=>'5分', 'badge'=>'success'], + ], + + // 商品评论业务类型 + 'common_goods_comments_business_type_list' => [ + 'order' => ['value' => 'order', 'name' => '订单'], + ], + + // 站点类型 + 'common_site_type_list' => [ + 0 => ['value' => 0, 'name' => '销售'], + 1 => ['value' => 1, 'name' => '展示'], + 2 => ['value' => 2, 'name' => '自提'], + 3 => ['value' => 3, 'name' => '虚拟销售'], + 4 => ['value' => 4, 'name' => '销售+自提', 'is_ext' => 1], + ], + + // 管理员状态 + 'common_admin_status_list' => [ + 0 => ['value' => 0, 'name' => '正常', 'checked' => true], + 1 => ['value' => 1, 'name' => '暂停'], + 2 => ['value' => 2, 'name' => '已离职'], + ], + + // 支付日志状态 + 'common_pay_log_status_list' => [ + 0 => ['value' => 0, 'name' => '待支付', 'checked' => true], + 1 => ['value' => 1, 'name' => '已支付'], + 2 => ['value' => 2, 'name' => '已关闭'], + ], + + // 商品参数组件类型 + 'common_goods_parameters_type_list' => [ + 0 => ['value' => 0, 'name' => '全部'], + 1 => ['value' => 1, 'name' => '详情', 'checked' => true], + 2 => ['value' => 2, 'name' => '基础'], + ], + + // 商品关联排序类型 + 'goods_order_by_type_list' => [ + 0 => ['value' => 'g.access_count,g.sales_count,g.id', 'name' => '综合', 'checked' => true], + 1 => ['value' => 'g.sales_count', 'name' => '销量'], + 2 => ['value' => 'g.access_count', 'name' => '热度'], + 3 => ['value' => 'g.min_price', 'name' => '价格'], + 4 => ['value' => 'g.id', 'name' => '最新'], + ], + + // 商品关联排序规则 + 'goods_order_by_rule_list' => [ + 0 => ['value' => 'desc', 'name' => '降序(desc)', 'checked' => true], + 1 => ['value' => 'asc', 'name' => '升序(asc)'], + ], + + // 首页数据类型 + 'common_site_floor_data_type_list' => [ + 0 => ['value' => 0, 'name' => '自动模式', 'checked' => true], + 1 => ['value' => 1, 'name' => '手动模式'], + 2 => ['value' => 2, 'name' => '拖拽模式'], + ], + + // 文件上传错误码 + 'common_file_upload_error_list' => [ + 1 => '文件大小超过服务器允许上传的最大值', + 2 => '文件大小超出浏览器限制，查看是否超过[站点设置->附件最大限制]', + 3 => '文件仅部分被上传', + 4 => '没有找到要上传的文件', + 5 => '没有找到服务器临时文件夹', + 6 => '没有找到服务器临时文件夹', + 7 => '文件写入失败', + 8 => '文件上传扩展没有打开', + ], + + + // -------------------- 正则 -------------------- + // 用户名 + 'common_regex_username' => '^[A-Za-z0-9_]{2,18}$', + + // 用户名 + 'common_regex_pwd' => '^.{6,18}$', + + // 手机号码 + 'common_regex_mobile' => '^1((3|4|5|6|7|8|9){1}\d{1})\d{8}$', + + // 座机号码 + 'common_regex_tel' => '^\d{3,4}-?\d{8}$', + + // 电子邮箱 + 'common_regex_email' => '^\w+([-+.]\w+)*@\w+([-.]\w+)*\.\w+([-.]\w+)*$', + + // 身份证号码 + 'common_regex_id_card' => '^(\d{15}$|^\d{18}$|^\d{17}(\d|X|x))$', + + // 价格格式 + 'common_regex_price' => '^([0-9]{1}\d{0,7})(\.\d{1,2})?$', + + // ip + 'common_regex_ip' => '^(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])$', + + // url + 'common_regex_url' => '^http[s]?:\/\/[A-Za-z0-9-]+\.[A-Za-z0-9]+[\/=\?%\-&_~`@[\]\':+!]*([^<>\"\"])*$', + + // 控制器名称 + 'common_regex_control' => '^[A-Za-z]{1}[A-Za-z0-9_]{0,29}$', + + // 方法名称 + 'common_regex_action' => '^[A-Za-z]{1}[A-Za-z0-9_]{0,29}$', + + // 顺序 + 'common_regex_sort' => '^[0-9]{1,3}$', + + // 日期 + 'common_regex_date' => '^\d{4}-\d{2}-\d{2}$', + + // 分数 + 'common_regex_score' => '^[0-9]{1,3}$', + + // 分页 + 'common_regex_page_number' => '^[1-9]{1}[0-9]{0,2}$', + + // 时段格式 10:00-10:45 + 'common_regex_interval' => '^\d{2}\:\d{2}\-\d{2}\:\d{2}$', + + // 颜色 + 'common_regex_color' => '^(#([a-fA-F0-9]{6}|[a-fA-F0-9]{3}))?$', + + // id逗号隔开 + 'common_regex_id_comma_split' => '^\d(\d|,?)*\d$', + + // url伪静态后缀 + 'common_regex_url_html_suffix' => '^[a-z]{0,8}$', + + // 图片比例值 + 'common_regex_image_proportion' => '^([1-9]{1}[0-9]?|[1-9]{1}[0-9]?\.{1}[0-9]{1,2}|100|0)?$', + + // 版本号 + 'common_regex_version' => '^[0-9]{1,6}\.[0-9]{1,6}\.[0-9]{1,6}$', + + + // -------------------- 后端相关 -------------------- + // 图片验证码 + 'site_images_verify_rules_list' => [ + 0 => ['value' => 'bgcolor', 'name' => '彩色背景'], + 1 => ['value' => 'textcolor', 'name' => '彩色文本'], + 2 => ['value' => 'point', 'name' => '干扰点'], + 3 => ['value' => 'line', 'name' => '干扰线'], + ], + + // 时区 + 'site_timezone_list' => [ + 'Pacific/Pago_Pago' => '(标准时-11:00) 中途岛、萨摩亚群岛', + 'Pacific/Rarotonga' => '(标准时-10:00) 夏威夷', + 'Pacific/Gambier' => '(标准时-9:00) 阿拉斯加', + 'America/Dawson' => '(标准时-8:00) 太平洋时间(美国和加拿大)', + 'America/Creston' => '(标准时-7:00) 山地时间(美国和加拿大)', + 'America/Belize' => '(标准时-6:00) 中部时间(美国和加拿大)、墨西哥城', + 'America/Eirunepe' => '(标准时-5:00) 东部时间(美国和加拿大)、波哥大', + 'America/Antigua' => '(标准时-4:00) 大西洋时间(加拿大)、加拉加斯', + 'America/Argentina/Buenos_Aires' => '(标准时-3:00) 巴西、布宜诺斯艾利斯、乔治敦', + 'America/Noronha' => '(标准时-2:00) 中大西洋', + 'Atlantic/Cape_Verde' => '(标准时-1:00) 亚速尔群岛、佛得角群岛', + 'Africa/Ouagadougou' => '(格林尼治标准时) 西欧时间、伦敦、卡萨布兰卡', + 'Europe/Andorra' => '(标准时+1:00) 中欧时间、安哥拉、利比亚', + 'Europe/Mariehamn' => '(标准时+2:00) 东欧时间、开罗，雅典', + 'Asia/Bahrain' => '(标准时+3:00) 巴格达、科威特、莫斯科', + 'Asia/Dubai' => '(标准时+4:00) 阿布扎比、马斯喀特、巴库', + 'Asia/Kolkata' => '(标准时+5:00) 叶卡捷琳堡、伊斯兰堡、卡拉奇', + 'Asia/Dhaka' => '(标准时+6:00) 阿拉木图、 达卡、新亚伯利亚', + 'Indian/Christmas' => '(标准时+7:00) 曼谷、河内、雅加达', + 'Asia/Shanghai' => '(标准时+8:00)北京、重庆、香港、新加坡', + 'Australia/Darwin' => '(标准时+9:00) 东京、汉城、大阪、雅库茨克', + 'Australia/Adelaide' => '(标准时+10:00) 悉尼、关岛', + 'Australia/Currie' => '(标准时+11:00) 马加丹、索罗门群岛', + 'Pacific/Fiji' => '(标准时+12:00) 奥克兰、惠灵顿、堪察加半岛' + ], + + // seo + // url模式列表 + 'seo_url_model_list' => [ + 0 => ['value' => 0, 'name' => '兼容模式', 'checked' => true], + 1 => ['value' => 1, 'name' => 'PATHINFO模式'], + 2 => ['value' => 2, 'name' => 'PATHINFO模式+短地址'], + ], + + // 用户excel导出标题列表 + 'excel_user_title_list' => [ + 'username' => [ + 'name' => '用户名', + 'type' => 'string', + ], + 'nickname' => [ + 'name' => '昵称', + 'type' => 'int', + ], + 'gender_text' => [ + 'name' => '性别', + 'type' => 'string', + ], + 'birthday_text'=> [ + 'name' => '生日', + 'type' => 'string', + ], + 'status_text'=> [ + 'name' => '状态', + 'type' => 'string', + ], + 'mobile' => [ + 'name' => '手机号码', + 'type' => 'int', + ], + 'email' => [ + 'name' => '电子邮箱', + 'type' => 'string', + ], + 'province' => [ + 'name' => '所在省', + 'type' => 'string', + ], + 'city' => [ + 'name' => '所在市', + 'type' => 'string', + ], + 'address' => [ + 'name' => '详细地址', + 'type' => 'string', + ], + 'add_time' => [ + 'name' => '注册时间', + 'type' => 'string', + ], + ], + ]; + + // 匹配数据 + // 空 key 则返回全部 + // 未匹配到数据则返回null + $data = empty($key) ? $container : (array_key_exists($key, $container) ? $container[$key] : $default); + + // 常量数据读取钩子 + $hook_name = 'plugins_service_const_data'; + MyEventTrigger($hook_name, [ + 'hook_name' => $hook_name, + 'is_backend' => true, + 'key' => $key, + 'default' => $default, + 'data' => &$data, + ]); + + return $data; + } +} +?> \ No newline at end of file diff --git a/app/service/CustomViewService.php b/app/service/CustomViewService.php index f6f24398e..4fc502e24 100755 --- a/app/service/CustomViewService.php +++ b/app/service/CustomViewService.php @@ -42,7 +42,7 @@ class CustomViewService $data = Db::name('CustomView')->field($field)->where($where)->order($order_by)->limit($m, $n)->select()->toArray(); if(!empty($data)) { - $common_is_enable_list = lang('common_is_enable_list'); + $common_is_enable_list = MyConst('common_is_enable_list'); foreach($data as &$v) { // 是否启用 diff --git a/app/service/GoodsCommentsService.php b/app/service/GoodsCommentsService.php index 3de9daac7..c17bdeaeb 100644 --- a/app/service/GoodsCommentsService.php +++ b/app/service/GoodsCommentsService.php @@ -140,7 +140,7 @@ class GoodsCommentsService } if($order['status'] != 4) { - $status_text = lang('common_order_user_status')[$order['status']]['name']; + $status_text = MyConst('common_order_user_status')[$order['status']]['name']; return DataReturn('状态不可操作['.$status_text.']', -1); } if($order['user_is_comments'] != 0) @@ -222,9 +222,9 @@ class GoodsCommentsService } // 静态数据 - $common_is_text_list = lang('common_is_text_list'); - $comments_rating_list = lang('common_goods_comments_rating_list'); - $comments_business_type_list = lang('common_goods_comments_business_type_list'); + $common_is_text_list = MyConst('common_is_text_list'); + $comments_rating_list = MyConst('common_goods_comments_rating_list'); + $comments_business_type_list = MyConst('common_goods_comments_business_type_list'); // 数据处理 foreach($data as &$v) @@ -364,7 +364,7 @@ class GoodsCommentsService [ 'checked_type' => 'in', 'key_name' => 'business_type', - 'checked_data' => array_keys(lang('common_order_aftersale_refundment_list')), + 'checked_data' => array_keys(MyConst('common_order_aftersale_refundment_list')), 'error_msg' => '请选择业务类型', ], [ @@ -382,7 +382,7 @@ class GoodsCommentsService [ 'checked_type' => 'in', 'key_name' => 'rating', - 'checked_data' => array_keys(lang('common_goods_comments_rating_list')), + 'checked_data' => array_keys(MyConst('common_goods_comments_rating_list')), 'error_msg' => '请选择评分', ], ]; diff --git a/app/service/GoodsService.php b/app/service/GoodsService.php index 1ba96de17..4cddc48f0 100755 --- a/app/service/GoodsService.php +++ b/app/service/GoodsService.php @@ -253,8 +253,8 @@ class GoodsService // 商品数量 $goods_count = MyC('home_index_floor_goods_max_count', 8, true); // 排序配置 - $floor_order_by_type_list = lang('goods_order_by_type_list'); - $floor_order_by_rule_list = lang('goods_order_by_rule_list'); + $floor_order_by_type_list = MyConst('goods_order_by_type_list'); + $floor_order_by_rule_list = MyConst('goods_order_by_rule_list'); $floor_order_by_type = MyC('home_index_floor_goods_order_by_type', 0, true); $floor_order_by_rule = MyC('home_index_floor_goods_order_by_rule', 0, true); // 排序字段名称 @@ -1065,7 +1065,7 @@ class GoodsService [ 'checked_type' => 'in', 'key_name' => 'site_type', - 'checked_data' => array_merge([-1], array_column(lang('common_site_type_list'), 'value')), + 'checked_data' => array_merge([-1], array_column(MyConst('common_site_type_list'), 'value')), 'is_checked' => 2, 'error_msg' => '商品类型数据值范围有误', ], diff --git a/app/service/IntegralService.php b/app/service/IntegralService.php index 1a04cc1c9..85d19aa7b 100755 --- a/app/service/IntegralService.php +++ b/app/service/IntegralService.php @@ -52,7 +52,7 @@ class IntegralService $log_id = Db::name('UserIntegralLog')->insertGetId($data); if($log_id > 0) { - $type_msg = lang('common_integral_log_type_list')[$type]['name']; + $type_msg = MyConst('common_integral_log_type_list')[$type]['name']; $detail = $msg.'积分'.$type_msg.$operation_integral; MessageService::MessageAdd($user_id, '积分变动', $detail, '积分', $log_id); return true; @@ -81,7 +81,7 @@ class IntegralService $data = Db::name('UserIntegralLog')->where($where)->field($field)->limit($m, $n)->order($order_by)->select()->toArray(); if(!empty($data)) { - $integral_log_type_list = lang('common_integral_log_type_list'); + $integral_log_type_list = MyConst('common_integral_log_type_list'); foreach($data as &$v) { // 用户信息 diff --git a/app/service/MessageService.php b/app/service/MessageService.php index f33103afb..3b2651936 100755 --- a/app/service/MessageService.php +++ b/app/service/MessageService.php @@ -202,8 +202,8 @@ class MessageService $user_list = UserService::GetUserViewInfo(array_column($data, 'user_id')); } - $common_is_read_list = lang('common_is_read_list'); - $common_message_type_list = lang('common_message_type_list'); + $common_is_read_list = MyConst('common_is_read_list'); + $common_message_type_list = MyConst('common_message_type_list'); foreach($data as &$v) { // 用户信息 diff --git a/app/service/NavigationService.php b/app/service/NavigationService.php index 1adfd1d04..e30d7f61d 100755 --- a/app/service/NavigationService.php +++ b/app/service/NavigationService.php @@ -271,7 +271,7 @@ class NavigationService { if(!empty($data) && is_array($data)) { - $nav_type_list = lang('common_nav_type_list'); + $nav_type_list = MyConst('common_nav_type_list'); foreach($data as &$v) { // 数据类型 diff --git a/app/service/OrderAftersaleService.php b/app/service/OrderAftersaleService.php index cfb31fb6d..89a123d70 100644 --- a/app/service/OrderAftersaleService.php +++ b/app/service/OrderAftersaleService.php @@ -325,7 +325,7 @@ class OrderAftersaleService } if($aftersale['status'] != 1) { - $common_order_aftersale_status_list = lang('common_order_aftersale_status_list'); + $common_order_aftersale_status_list = MyConst('common_order_aftersale_status_list'); return DataReturn('该售后订单状态不可操作['.$common_order_aftersale_status_list[$aftersale['status']]['name'].']', -10); } @@ -397,9 +397,9 @@ class OrderAftersaleService $data = Db::name('OrderAftersale')->field($field)->where($where)->limit($m, $n)->order($order_by)->select()->toArray(); if(!empty($data)) { - $type_list = lang('common_order_aftersale_type_list'); - $status_list = lang('common_order_aftersale_status_list'); - $refundment_list = lang('common_order_aftersale_refundment_list'); + $type_list = MyConst('common_order_aftersale_type_list'); + $status_list = MyConst('common_order_aftersale_status_list'); + $refundment_list = MyConst('common_order_aftersale_refundment_list'); foreach($data as &$v) { // 订单商品 @@ -619,7 +619,7 @@ class OrderAftersaleService // 状态校验 if(in_array($aftersale['status'], [3,5])) { - $status_list = lang('common_order_aftersale_status_list'); + $status_list = MyConst('common_order_aftersale_status_list'); return DataReturn('状态不可操作['.$status_list[$aftersale['status']]['name'].']', -1); } @@ -708,14 +708,14 @@ class OrderAftersaleService // 状态校验 if($aftersale['status'] != 0) { - $status_list = lang('common_order_aftersale_status_list'); + $status_list = MyConst('common_order_aftersale_status_list'); return DataReturn('状态不可操作['.$status_list[$aftersale['status']]['name'].']', -1); } // 类型 if($aftersale['type'] != 1) { - $aftersale_type_list = lang('common_order_aftersale_type_list'); + $aftersale_type_list = MyConst('common_order_aftersale_type_list'); return DataReturn('类型不可操作['.$aftersale_type_list[$aftersale['type']]['name'].']', -1); } @@ -785,7 +785,7 @@ class OrderAftersaleService [ 'checked_type' => 'in', 'key_name' => 'refundment', - 'checked_data' => array_column(lang('common_order_aftersale_refundment_list'), 'value'), + 'checked_data' => array_column(MyConst('common_order_aftersale_refundment_list'), 'value'), 'error_msg' => '退款方式有误', ], ]; @@ -805,7 +805,7 @@ class OrderAftersaleService // 状态校验 if($aftersale['status'] != 2) { - $status_list = lang('common_order_aftersale_status_list'); + $status_list = MyConst('common_order_aftersale_status_list'); return DataReturn('状态不可操作['.$status_list[$aftersale['status']]['name'].']', -1); } @@ -1247,7 +1247,7 @@ class OrderAftersaleService // 状态校验 if(!in_array($aftersale['status'], [0,2])) { - $status_list = lang('common_order_aftersale_status_list'); + $status_list = MyConst('common_order_aftersale_status_list'); return DataReturn('状态不可操作['.$status_list[$aftersale['status']]['name'].']', -1); } @@ -1332,7 +1332,7 @@ class OrderAftersaleService // 状态校验 if(!in_array($aftersale['status'], [4,5])) { - $status_list = lang('common_order_aftersale_status_list'); + $status_list = MyConst('common_order_aftersale_status_list'); return DataReturn('状态不可操作['.$status_list[$aftersale['status']]['name'].']', -1); } diff --git a/app/service/OrderService.php b/app/service/OrderService.php index f847488be..acfeba254 100755 --- a/app/service/OrderService.php +++ b/app/service/OrderService.php @@ -109,7 +109,7 @@ class OrderService $operate = self::OrderOperateData($order, 'user'); if($operate['is_pay'] != 1) { - $status_text = lang('common_order_user_status')[$order['status']]['name']; + $status_text = MyConst('common_order_user_status')[$order['status']]['name']; return DataReturn('状态不可操作['.$status_text.'-'.$order['order_no'].']', -1); } @@ -424,7 +424,7 @@ class OrderService $operate = self::OrderOperateData($order, 'admin'); if($operate['is_pay'] != 1) { - $status_text = lang('common_order_admin_status')[$order['status']]['name']; + $status_text = MyConst('common_order_admin_status')[$order['status']]['name']; return DataReturn('状态不可操作['.$status_text.'-'.$order['order_no'].']', -1); } @@ -1180,10 +1180,10 @@ class OrderService $user_type = isset($params['user_type']) ? $params['user_type'] : 'user'; // 静态数据 - $order_status_list = lang('common_order_user_status'); - $order_pay_status = lang('common_order_pay_status'); - $common_platform_type = lang('common_platform_type'); - $common_site_type_list = lang('common_site_type_list'); + $order_status_list = MyConst('common_order_user_status'); + $order_pay_status = MyConst('common_order_pay_status'); + $common_platform_type = MyConst('common_platform_type'); + $common_site_type_list = MyConst('common_site_type_list'); // 仓库信息 if(in_array('warehouse_id', $keys)) @@ -1453,8 +1453,8 @@ class OrderService $data = Db::name('OrderAftersale')->where(['order_id'=>$order_id])->field('status,type,number,price,reason,msg')->order('id desc')->find(); if(!empty($data)) { - $type_list = lang('common_order_aftersale_type_list'); - $status_list = lang('common_order_aftersale_status_list'); + $type_list = MyConst('common_order_aftersale_type_list'); + $status_list = MyConst('common_order_aftersale_status_list'); // 类型 $data['type_text'] = array_key_exists($data['type'], $type_list) ? $type_list[$data['type']]['name'] : ''; @@ -1652,7 +1652,7 @@ class OrderService public static function OrderHistoryAdd($order_id, $new_status, $original_status, $msg = '', $creator = 0, $creator_name = '') { // 状态描述 - $order_status_list = lang('common_order_user_status'); + $order_status_list = MyConst('common_order_user_status'); $original_status_name = $order_status_list[$original_status]['name']; $new_status_name = $order_status_list[$new_status]['name']; $msg .= '['.$original_status_name.'-'.$new_status_name.']'; @@ -1729,7 +1729,7 @@ class OrderService $operate = self::OrderOperateData($order, $user_type); if($operate['is_cancel'] != 1) { - $status_text = lang('common_order_user_status')[$order['status']]['name']; + $status_text = MyConst('common_order_user_status')[$order['status']]['name']; return DataReturn('状态不可操作['.$status_text.']', -1); } @@ -1812,7 +1812,7 @@ class OrderService $operate = self::OrderOperateData($order, $user_type); if($operate['is_delivery'] != 1) { - $status_text = lang('common_order_user_status')[$order['status']]['name']; + $status_text = MyConst('common_order_user_status')[$order['status']]['name']; return DataReturn('状态不可操作['.$status_text.']', -1); } @@ -1949,7 +1949,7 @@ class OrderService $operate = self::OrderOperateData($order, $user_type); if($operate['is_collect'] != 1) { - $status_text = lang('common_order_user_status')[$order['status']]['name']; + $status_text = MyConst('common_order_user_status')[$order['status']]['name']; return DataReturn('状态不可操作['.$status_text.']', -1); } @@ -2043,7 +2043,7 @@ class OrderService $operate = self::OrderOperateData($order, $user_type); if($operate['is_confirm'] != 1) { - $status_text = lang('common_order_user_status')[$order['status']]['name']; + $status_text = MyConst('common_order_user_status')[$order['status']]['name']; return DataReturn('状态不可操作['.$status_text.']', -1); } @@ -2147,7 +2147,7 @@ class OrderService $operate = self::OrderOperateData($order, $user_type); if($operate['is_delete'] != 1) { - $status_text = lang('common_order_user_status')[$order['status']]['name']; + $status_text = MyConst('common_order_user_status')[$order['status']]['name']; return DataReturn('状态不可操作['.$status_text.']', -1); } @@ -2179,7 +2179,7 @@ class OrderService { // 状态数据封装 $result = []; - $order_status_list = lang('common_order_user_status'); + $order_status_list = MyConst('common_order_user_status'); foreach($order_status_list as $v) { $result[] = [ diff --git a/app/service/PaymentService.php b/app/service/PaymentService.php index 245ddf80e..46540d6bb 100755 --- a/app/service/PaymentService.php +++ b/app/service/PaymentService.php @@ -78,7 +78,7 @@ class PaymentService { if($dh = opendir(self::$payment_dir)) { - $common_platform_type = lang('common_platform_type'); + $common_platform_type = MyConst('common_platform_type'); while(($temp_file = readdir($dh)) !== false) { if(substr($temp_file, 0, 1) != '.') @@ -176,7 +176,7 @@ class PaymentService 'is_enable' => 0, 'is_open_user' => 0, 'is_install' => 0, - 'apply_terminal' => empty($data['base']['apply_terminal']) ? array_column(lang('common_platform_type'), 'value') : $data['base']['apply_terminal'], + 'apply_terminal' => empty($data['base']['apply_terminal']) ? array_column(MyConst('common_platform_type'), 'value') : $data['base']['apply_terminal'], 'config' => '', ]; } diff --git a/app/service/QuickNavService.php b/app/service/QuickNavService.php index d01fd7bf8..a32aaecf3 100755 --- a/app/service/QuickNavService.php +++ b/app/service/QuickNavService.php @@ -42,8 +42,8 @@ class QuickNavService $data = Db::name('QuickNav')->where($where)->order($order_by)->limit($m, $n)->select()->toArray(); if(!empty($data)) { - $common_platform_type = lang('common_platform_type'); - $common_app_event_type = lang('common_app_event_type'); + $common_platform_type = MyConst('common_platform_type'); + $common_app_event_type = MyConst('common_app_event_type'); foreach($data as &$v) { // 平台类型 @@ -114,13 +114,13 @@ class QuickNavService [ 'checked_type' => 'in', 'key_name' => 'platform', - 'checked_data' => array_column(lang('common_platform_type'), 'value'), + 'checked_data' => array_column(MyConst('common_platform_type'), 'value'), 'error_msg' => '平台类型有误', ], [ 'checked_type' => 'in', 'key_name' => 'event_type', - 'checked_data' => array_column(lang('common_app_event_type'), 'value'), + 'checked_data' => array_column(MyConst('common_app_event_type'), 'value'), 'is_checked' => 2, 'error_msg' => '事件值类型有误', ], diff --git a/app/service/RefundLogService.php b/app/service/RefundLogService.php index 42600a45b..56da85b7e 100644 --- a/app/service/RefundLogService.php +++ b/app/service/RefundLogService.php @@ -98,7 +98,7 @@ class RefundLogService $data = Db::name('RefundLog')->where($where)->field($field)->limit($m, $n)->order($order_by)->select()->toArray(); if(!empty($data)) { - $refundment_list = lang('common_order_aftersale_refundment_list'); + $refundment_list = MyConst('common_order_aftersale_refundment_list'); foreach($data as &$v) { // 用户信息 diff --git a/app/service/SlideService.php b/app/service/SlideService.php index 39f4307be..8b5d4d50b 100755 --- a/app/service/SlideService.php +++ b/app/service/SlideService.php @@ -42,9 +42,9 @@ class SlideService $data = Db::name('Slide')->field($field)->where($where)->order($order_by)->limit($m, $n)->select()->toArray(); if(!empty($data)) { - $common_platform_type = lang('common_platform_type'); - $common_is_enable_tips = lang('common_is_enable_tips'); - $common_app_event_type = lang('common_app_event_type'); + $common_platform_type = MyConst('common_platform_type'); + $common_is_enable_tips = MyConst('common_is_enable_tips'); + $common_app_event_type = MyConst('common_app_event_type'); foreach($data as &$v) { // 图片地址 @@ -104,13 +104,13 @@ class SlideService [ 'checked_type' => 'in', 'key_name' => 'platform', - 'checked_data' => array_column(lang('common_platform_type'), 'value'), + 'checked_data' => array_column(MyConst('common_platform_type'), 'value'), 'error_msg' => '平台类型有误', ], [ 'checked_type' => 'in', 'key_name' => 'event_type', - 'checked_data' => array_column(lang('common_app_event_type'), 'value'), + 'checked_data' => array_column(MyConst('common_app_event_type'), 'value'), 'is_checked' => 2, 'error_msg' => '事件值类型有误', ], diff --git a/app/service/StatisticalService.php b/app/service/StatisticalService.php index 508865ff6..ebd9dbe72 100755 --- a/app/service/StatisticalService.php +++ b/app/service/StatisticalService.php @@ -390,7 +390,7 @@ class StatisticalService self::Init($params); // 订单状态列表 - $order_status_list = lang('common_order_user_status'); + $order_status_list = MyConst('common_order_user_status'); $status_arr = array_column($order_status_list, 'id'); // 循环获取统计数据 @@ -452,7 +452,7 @@ class StatisticalService self::Init($params); // 订单状态列表 - $order_status_list = lang('common_order_user_status'); + $order_status_list = MyConst('common_order_user_status'); $status_arr = array_column($order_status_list, 'id'); // 循环获取统计数据 diff --git a/app/service/UserService.php b/app/service/UserService.php index 0b074956f..30583fbc7 100755 --- a/app/service/UserService.php +++ b/app/service/UserService.php @@ -111,7 +111,7 @@ class UserService } if(!in_array($user['status'], [0,1])) { - $common_user_status_list = lang('common_user_status_list'); + $common_user_status_list = MyConst('common_user_status_list'); if(isset($common_user_status_list[$user['status']])) { return DataReturn($common_user_status_list[$user['status']]['tips'], -110); @@ -152,8 +152,8 @@ class UserService ]); // 开始处理数据 - $common_gender_list = lang('common_gender_list'); - $common_user_status_list = lang('common_user_status_list'); + $common_gender_list = MyConst('common_gender_list'); + $common_user_status_list = MyConst('common_user_status_list'); foreach($data as &$v) { // 生日 @@ -277,13 +277,13 @@ class UserService [ 'checked_type' => 'in', 'key_name' => 'gender', - 'checked_data' => array_column(lang('common_gender_list'), 'id'), + 'checked_data' => array_column(MyConst('common_gender_list'), 'id'), 'error_msg' => '性别值范围不正确', ], [ 'checked_type' => 'in', 'key_name' => 'status', - 'checked_data' => array_column(lang('common_user_status_list'), 'id'), + 'checked_data' => array_column(MyConst('common_user_status_list'), 'id'), 'error_msg' => '状态值范围不正确', ], [ @@ -498,7 +498,7 @@ class UserService } if(isset($user['gender'])) { - $user['gender_text'] = lang('common_gender_list')[$user['gender']]['name']; + $user['gender_text'] = MyConst('common_gender_list')[$user['gender']]['name']; } if(isset($user['birthday'])) { @@ -663,7 +663,7 @@ class UserService [ 'checked_type' => 'in', 'key_name' => 'type', - 'checked_data' => array_column(lang('common_login_type_list'), 'value'), + 'checked_data' => array_column(MyConst('common_login_type_list'), 'value'), 'error_msg' => '登录类型有误', ], [ @@ -786,7 +786,7 @@ class UserService // 用户状态 if(in_array($user['status'], [2,3])) { - return DataReturn(lang('common_user_status_list')[$user['status']]['tips'], -10); + return DataReturn(MyConst('common_user_status_list')[$user['status']]['tips'], -10); } // 用户登录前钩子 @@ -899,7 +899,7 @@ class UserService [ 'checked_type' => 'in', 'key_name' => 'type', - 'checked_data' => array_column(lang('common_user_reg_type_list'), 'value'), + 'checked_data' => array_column(MyConst('common_user_reg_type_list'), 'value'), 'error_msg' => '注册类型有误', ], [ @@ -1220,7 +1220,7 @@ class UserService [ 'checked_type' => 'in', 'key_name' => 'type', - 'checked_data' => array_column(lang('common_login_type_list'), 'value'), + 'checked_data' => array_column(MyConst('common_login_type_list'), 'value'), 'error_msg' => '登录类型有误', ], ]; @@ -1322,7 +1322,7 @@ class UserService [ 'checked_type' => 'in', 'key_name' => 'type', - 'checked_data' => array_column(lang('common_user_reg_type_list'), 'value'), + 'checked_data' => array_column(MyConst('common_user_reg_type_list'), 'value'), 'error_msg' => '注册类型有误', ], ]; @@ -2163,7 +2163,7 @@ class UserService ]; // 是否小程序请求 - $is_appmini = array_key_exists(APPLICATION_CLIENT_TYPE, lang('common_appmini_type')); + $is_appmini = array_key_exists(APPLICATION_CLIENT_TYPE, MyConst('common_appmini_type')); // 手机号码获取用户信息 $mobile_user = Db::name('User')->where([ diff --git a/extend/base/Excel.php b/extend/base/Excel.php index d5de5c8c8..e096a5bd3 100755 --- a/extend/base/Excel.php +++ b/extend/base/Excel.php @@ -126,7 +126,7 @@ class Excel // 获取配置编码类型 $excel_charset = MyC('admin_excel_charset', 0); - $charset = lang('common_excel_charset_list')[$excel_charset]['value']; + $charset = MyConst('common_excel_charset_list')[$excel_charset]['value']; // 水平,垂直居中 if($this->horizontal_center == 1) diff --git a/extend/base/Images.php b/extend/base/Images.php index 92f554d3e..95e9a84ad 100755 --- a/extend/base/Images.php +++ b/extend/base/Images.php @@ -70,7 +70,10 @@ class Images */ private function IsGD() { - if(!isset(gd_info()['GD Version']) || empty(gd_info()['GD Version'])) Api_Return(lang('code_412'), 412); + if(!isset(gd_info()['GD Version']) || empty(gd_info()['GD Version'])) + { + die('not support gd'); + } } /** diff --git a/public/core.php b/public/core.php index cb1351d5e..b32ea7a15 100755 --- a/public/core.php +++ b/public/core.php @@ -10,7 +10,7 @@ // +---------------------------------------------------------------------- // 系统版本 -define('APPLICATION_VERSION', 'v2.2.0'); +define('APPLICATION_VERSION', 'v2.2.1'); // 检测PHP环境 if(version_compare(PHP_VERSION,'7.2.5','<')) diff --git a/sourcecode/alipay/default/pages/common/copyright.axml b/sourcecode/alipay/default/pages/common/copyright.axml index b8f9b153d..22341eca6 100644 --- a/sourcecode/alipay/default/pages/common/copyright.axml +++ b/sourcecode/alipay/default/pages/common/copyright.axml @@ -1,5 +1,5 @@ \ No newline at end of file diff --git a/sourcecode/baidu/default/pages/common/copyright.swan b/sourcecode/baidu/default/pages/common/copyright.swan index b8f9b153d..22341eca6 100755 --- a/sourcecode/baidu/default/pages/common/copyright.swan +++ b/sourcecode/baidu/default/pages/common/copyright.swan @@ -1,5 +1,5 @@ \ No newline at end of file diff --git a/sourcecode/qq/default/pages/common/copyright.qml b/sourcecode/qq/default/pages/common/copyright.qml index b8f9b153d..22341eca6 100755 --- a/sourcecode/qq/default/pages/common/copyright.qml +++ b/sourcecode/qq/default/pages/common/copyright.qml @@ -1,5 +1,5 @@ \ No newline at end of file diff --git a/sourcecode/toutiao/default/pages/common/copyright.ttml b/sourcecode/toutiao/default/pages/common/copyright.ttml index b8f9b153d..22341eca6 100755 --- a/sourcecode/toutiao/default/pages/common/copyright.ttml +++ b/sourcecode/toutiao/default/pages/common/copyright.ttml @@ -1,5 +1,5 @@ \ No newline at end of file diff --git a/sourcecode/weixin/default/pages/common/copyright.wxml b/sourcecode/weixin/default/pages/common/copyright.wxml index b8f9b153d..22341eca6 100755 --- a/sourcecode/weixin/default/pages/common/copyright.wxml +++ b/sourcecode/weixin/default/pages/common/copyright.wxml @@ -1,5 +1,5 @@ \ No newline at end of file