- {{:MyLang('power.form_item_pid')}}
-
- {{:MyLang('power.form_item_pid_placeholder')}}
+ {{:MyLang('common_form.power.form_item_pid')}}
+
+ {{:MyLang('common_form.power.form_item_pid_placeholder')}}
{{foreach $data as $v}}
{{$v.name}}
{{/foreach}}
@@ -48,8 +48,8 @@
@@ -57,14 +57,14 @@
@@ -72,14 +72,14 @@
diff --git a/app/api/controller/Goods.php b/app/api/controller/Goods.php
index e4450bbb5..08a502066 100755
--- a/app/api/controller/Goods.php
+++ b/app/api/controller/Goods.php
@@ -57,7 +57,7 @@ class Goods extends Common
$goods_id = empty($this->data_post['id']) ? (empty($this->data_post['goods_id']) ? 0 : intval($this->data_post['goods_id'])) : intval($this->data_post['id']);
if(empty($goods_id))
{
- $ret = DataReturn('参数有误', -1);
+ $ret = DataReturn(MyLang('params_error_tips'), -1);
} else {
// 商品详情方式
$is_use_mobile_detail = intval(MyC('common_app_is_use_mobile_detail'));
@@ -76,7 +76,7 @@ class Goods extends Common
$ret = GoodsService::GoodsList($params);
if(empty($ret['data'][0]) || $ret['data'][0]['is_delete_time'] != 0)
{
- $ret = DataReturn('商品不存在或已删除', -1);
+ $ret = DataReturn(MyLang('goods_no_exist_or_delete_error_tips'), -1);
} else {
// 商品信息
$goods = $ret['data'][0];
@@ -229,7 +229,7 @@ class Goods extends Common
{
if(empty($this->data_post['goods_id']))
{
- $ret = DataReturn('参数有误', -1);
+ $ret = DataReturn(MyLang('params_error_tips'), -1);
} else {
// 获取商品评分
$data = GoodsCommentsService::GoodsCommentsScore($this->data_post['goods_id']);
diff --git a/app/api/controller/Order.php b/app/api/controller/Order.php
index 485dec0b3..28b32ab32 100755
--- a/app/api/controller/Order.php
+++ b/app/api/controller/Order.php
@@ -135,10 +135,10 @@ class Order extends Common
}
$ret = SystemBaseService::DataReturn($result);
} else {
- $ret = DataReturn('数据不存在或已删除', -100);
+ $ret = DataReturn(MyLang('data_no_exist_or_delete_error_tips'), -100);
}
} else {
- $ret = DataReturn('参数有误', -1);
+ $ret = DataReturn(MyLang('params_error_tips'), -1);
}
return ApiService::ApiDataReturn($ret);
}
@@ -159,7 +159,7 @@ class Order extends Common
$params['user_type'] = 'user';
if(empty($params['id']))
{
- $ret = DataReturn('参数有误', -1);
+ $ret = DataReturn(MyLang('params_error_tips'), -1);
} else {
// 获取列表
$where = OrderService::OrderListWhere($params);
@@ -184,7 +184,7 @@ class Order extends Common
$ret = DataReturn('你已进行过评论', 0, $result);
}
} else {
- $ret = DataReturn('没有相关数据', -100);
+ $ret = DataReturn(MyLang('no_data'), -100);
}
}
return ApiService::ApiDataReturn($ret);
diff --git a/app/index/view/default/lib/is_enable.html b/app/index/view/default/lib/is_enable.html
index 64d64f4fc..1cfbf244b 100755
--- a/app/index/view/default/lib/is_enable.html
+++ b/app/index/view/default/lib/is_enable.html
@@ -1,6 +1,6 @@
- {{:MyLang('form_whether_enable_title')}}
+ {{:MyLang('form_is_enable_title')}}
\ No newline at end of file
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 c15fcfbb3..9663db74b 100755
--- a/app/index/view/default/lib/is_new_window_open.html
+++ b/app/index/view/default/lib/is_new_window_open.html
@@ -1,6 +1,6 @@
- {{:MyLang('form_whether_new_window_open_title')}}
+ {{:MyLang('form_is_new_window_open_title')}}
\ No newline at end of file
diff --git a/app/index/view/default/lib/is_show.html b/app/index/view/default/lib/is_show.html
index af3dc36b6..831e1076e 100755
--- a/app/index/view/default/lib/is_show.html
+++ b/app/index/view/default/lib/is_show.html
@@ -1,6 +1,6 @@
- {{:MyLang('form_whether_show_title')}}
+ {{:MyLang('form_is_show_title')}}
\ No newline at end of file
diff --git a/app/index/view/default/order/comments.html b/app/index/view/default/order/comments.html
index 4a542a542..534330b05 100755
--- a/app/index/view/default/order/comments.html
+++ b/app/index/view/default/order/comments.html
@@ -95,7 +95,7 @@
{{/if}}
- {{:MyLang('form_whether_anonymous_title')}}{{:MyLang('order.form_item_anonymous_tips')}}
+ {{:MyLang('form_is_anonymous_title')}}{{:MyLang('order.form_item_anonymous_tips')}}
diff --git a/app/install/controller/Index.php b/app/install/controller/Index.php
index 553751c14..1b9d5d316 100755
--- a/app/install/controller/Index.php
+++ b/app/install/controller/Index.php
@@ -339,7 +339,7 @@ php;
$this->behavior_obj->ReportInstallLog(['msg'=>'配置文件创建失败['.$dir.']']);
return DataReturn('配置文件创建失败', -1);
}
- return DataReturn('操作成功', 0);
+ return DataReturn(MyLang('operate_success'), 0);
}
/**
diff --git a/app/lang/en-us.php b/app/lang/en-us.php
index cbbe1608c..247651d99 100644
--- a/app/lang/en-us.php
+++ b/app/lang/en-us.php
@@ -139,6 +139,28 @@ return [
'import_success' => 'Import Succeeded',
'install_fail' => 'Install Failed',
'install_success' => 'Install Succeeded',
+ 'uninstall_fail' => 'Uninstall Failed',
+ 'uninstall_success' => 'Uninstall Succeeded',
+ 'setup_fail' => 'Setup Failed',
+ 'setup_success' => 'Setup Succeeded',
+ 'switch_fail' => 'Switch Failed',
+ 'switch_success' => 'Switch Succeeded',
+ 'bind_fail' => 'Bind Failed',
+ 'bind_success' => 'Bind Succeeded',
+ 'submit_fail' => 'Submit Failed',
+ 'submit_success' => 'Submit Succeeded',
+ 'config_fail' => 'Config Failed',
+ 'config_success' => 'Config Succeeded',
+ 'check_fail' => 'Check Failed',
+ 'check_success' => 'Check Succeeded',
+ 'take_fail' => 'Take Failed',
+ 'take_success' => 'Take Succeeded',
+ 'audit_fail' => 'Audit Failed',
+ 'audit_success' => 'Audit Succeeded',
+ 'confirm_fail' => 'Confirm Failed',
+ 'confirm_success' => 'Confirm Succeeded',
+ 'login_success' => 'Login Succeeded',
+ 'quit_success' => 'Quit Succeeded',
'no_data' => 'No Relevant Data',
'no_goods' => 'No related Goods',
'params_error_tips' => 'Params Error',
@@ -163,6 +185,10 @@ return [
'no_config_data_tips' => 'No data configured',
'config_empty_tips' => 'Configuration is empty',
'config_error_tips' => 'Incorrect configuration',
+ 'data_id_error_tips' => 'Incorrect data id',
+ 'data_no_exist_error_tips' => 'Data does not exist',
+ 'data_no_exist_or_delete_error_tips' => 'Data does not exist or has been deleted',
+ 'goods_no_exist_or_delete_error_tips' => 'Item does not exist or has been deleted',
'no_filled_tips' => 'Not filled in',
'no_power_tips' => 'No permission',
'not_open_developer_mode_tips' => 'Please start developer mode first',
@@ -173,6 +199,7 @@ return [
'back_prev_page_name' => 'Return to the previous page',
'back_prev_time_auto_text' => 'Second automatic return',
'view_config_course_name' => 'View the configuration tutorial',
+ 'payment_method_error_tips' => 'Incorrect payment method',
// 商店
'store_bind_account_name' => 'Bind ShopXO store account',
'store_bind_account_tips' => 'If it is bound, please clear the cache under the menu tool on the left side of the mall background and try to access it again!',
@@ -374,11 +401,7 @@ return [
'form_upload_excel_title' => 'Upload Excel',
'form_choice_excel_title' => 'Choice Excel',
'form_upload_excel_message' => 'Please upload Excel',
- 'form_whether_enable_title' => 'Whether Enable',
- 'form_whether_anonymous_title' => 'Whether Anonymous',
'form_gender_title' => 'Gender',
- 'form_whether_new_window_open_title' => 'Whether to open a new window',
- 'form_whether_show_title' => 'Whether Show ',
'form_region_title' => 'Provinces and cities',
'form_region_province_title' => 'Province',
'form_region_province_message' => 'Please select a province',
@@ -407,11 +430,23 @@ return [
'form_images_verify_placeholder' => 'Please enter the graphic verification code',
'form_images_verify_message' => 'Please enter a valid graphic verification code',
'form_images_verify_button_text' => 'Replace one',
- 'form_is_default_title' => 'Default or not',
+ 'form_is_show_title' => 'Show or not ',
+ 'form_is_show_message' => 'Whether the display range value is incorrect',
'form_is_enable_title' => 'Enable or not',
+ 'form_is_enable_message' => 'Error in enabling range value',
+ 'form_is_anonymous_title' => 'Anonymous or not',
+ 'form_is_anonymous_message' => 'Whether the anonymous range value is incorrect',
+ 'form_is_new_window_open_title' => 'New window open or not',
+ 'form_is_new_window_open_message' => 'Whether the new window opening range value is incorrect',
+ 'form_is_default_title' => 'Default or not',
+ 'form_is_default_message' => 'Whether the default range value is incorrect',
'form_is_header_title' => 'Header or not',
+ 'form_is_header_message' => 'Whether the range value of header is incorrect',
'form_is_footer_title' => 'Footer or not',
+ 'form_is_footer_message' => 'Whether the value of tail range is incorrect',
'form_is_full_screen_title' => 'FullScreen or not',
+ 'form_is_full_screen_message' => 'Whether the full screen range value is incorrect',
+ 'form_status_range_message' => 'Wrong status range value',
'form_sort_title' => 'Sort',
'form_sort_tips' => 'from small to large',
'form_sort_message' => 'Values between 0 and 255',
@@ -931,6 +966,31 @@ return [
2 => ['value' => 2, 'name' => 'PATHINFO Mode+ShortAddress'],
],
+ // -------------------- 表单 --------------------
+ 'common_form' => [
+ // 权限管理
+ 'power' => [
+ 'form_item_pid' => 'Column Level',
+ 'form_item_pid_placeholder' => 'Primary column...',
+ 'form_item_pid_message' => 'Column level selection error',
+ 'form_item_name' => 'Power Name',
+ 'form_item_name_message' => 'Power name format 2~16 characters',
+ 'form_item_control' => 'Controller Name',
+ 'form_item_control_message' => 'The format of the controller name is between 1 and 30 characters (it must start with a letter and can be alphanumeric underscore)',
+ 'form_item_action' => 'Action Name',
+ 'form_item_action_message' => 'The format of the method name is between 1 and 30 characters (it must start with a letter and can be alphanumeric underscore)',
+ 'form_item_url' => 'Custom Url Address',
+ 'form_item_url_message' => 'Custom url address, starting with http://or https://',
+ 'form_item_icon' => 'Icon Class',
+ 'form_item_icon_message' => 'Icon format can be up to 30 characters',
+ 'form_item_icon_tips_list' => [
+ '1. reference resources http://www.iconfont.cn/ Place the icon in the [/static/admin/default/cs/iconfontmenu. css] file',
+ '2. You can also directly use the icon and reference provided by the frame[ http://amazeui.shopxo.net/css/icon/ ]',
+ '3. You can also use the plug-in hook to import the css file of the custom icon, and then use the defined icon',
+ ],
+ ],
+ ],
+
// -------------------- 公共 --------------------
// 配置信息
'common_config' => [
diff --git a/app/lang/zh-cn.php b/app/lang/zh-cn.php
index 89fb8fe0a..99f493b60 100755
--- a/app/lang/zh-cn.php
+++ b/app/lang/zh-cn.php
@@ -139,6 +139,28 @@ return [
'import_success' => '导入成功',
'install_fail' => '安装失败',
'install_success' => '安装成功',
+ 'uninstall_fail' => '卸载失败',
+ 'uninstall_success' => '卸载成功',
+ 'setup_fail' => '设置失败',
+ 'setup_success' => '设置成功',
+ 'switch_fail' => '切换失败',
+ 'switch_success' => '切换成功',
+ 'bind_fail' => '绑定失败',
+ 'bind_success' => '绑定成功',
+ 'submit_fail' => '提交失败',
+ 'submit_success' => '提交成功',
+ 'config_fail' => '配置失败',
+ 'config_success' => '配置成功',
+ 'check_fail' => '校验失败',
+ 'check_success' => '校验成功',
+ 'take_fail' => '领取失败',
+ 'take_success' => '领取成功',
+ 'audit_fail' => '审核失败',
+ 'audit_success' => '审核成功',
+ 'confirm_fail' => '确认失败',
+ 'confirm_success' => '确认成功',
+ 'login_success' => '登录成功',
+ 'quit_success' => '退出成功',
'no_data' => '没有相关数据',
'no_goods' => '没有相关商品',
'params_error_tips' => '参数错误',
@@ -163,6 +185,10 @@ return [
'no_config_data_tips' => '未配置数据',
'config_empty_tips' => '配置为空',
'config_error_tips' => '配置有误',
+ 'data_id_error_tips' => '数据id有误',
+ 'data_no_exist_error_tips' => '数据不存在',
+ 'data_no_exist_or_delete_error_tips' => '数据不存在或已删除',
+ 'goods_no_exist_or_delete_error_tips' => '商品不存在或已删除',
'no_filled_tips' => '未填写',
'no_power_tips' => '无权限',
'not_open_developer_mode_tips' => '请先开启开发者模式',
@@ -173,6 +199,7 @@ return [
'back_prev_page_name' => '返回上一页',
'back_prev_time_auto_text' => '秒自动返回',
'view_config_course_name' => '查看配置教程',
+ 'payment_method_error_tips' => '支付方式有误',
// 商店
'store_bind_account_name' => '绑定ShopXO商店账户',
'store_bind_account_tips' => '如已绑定、请到商城后台左侧菜单工具下面清除缓存再尝试访问！',
@@ -375,11 +402,7 @@ return [
'form_upload_excel_title' => '上传Excel',
'form_choice_excel_title' => '选择Excel',
'form_upload_excel_message' => '请上传Excel',
- 'form_whether_enable_title' => '是否启用',
- 'form_whether_anonymous_title' => '是否匿名',
'form_gender_title' => '性别',
- 'form_whether_new_window_open_title' => '是否新窗口打开',
- 'form_whether_show_title' => '是否显示',
'form_region_title' => '省市区',
'form_region_province_title' => '省份',
'form_region_province_message' => '请选择省份',
@@ -408,11 +431,23 @@ return [
'form_images_verify_placeholder' => '请输入图形验证码',
'form_images_verify_message' => '请输入有效的图形验证码',
'form_images_verify_button_text' => '更换一张',
- 'form_is_default_title' => '是否默认',
+ 'form_is_show_title' => '是否显示',
+ 'form_is_show_message' => '是否显示范围值有误',
'form_is_enable_title' => '是否启用',
+ 'form_is_enable_message' => '是否启用范围值有误',
+ 'form_is_anonymous_title' => '是否匿名',
+ 'form_is_anonymous_message' => '是否匿名范围值有误',
+ 'form_is_new_window_open_title' => '是否新窗口打开',
+ 'form_is_new_window_open_message' => '是否新窗口打开范围值有误',
+ 'form_is_default_title' => '是否默认',
+ 'form_is_default_message' => '是否默认范围值有误',
'form_is_header_title' => '是否含头部',
+ 'form_is_header_message' => '是否含头部范围值有误',
'form_is_footer_title' => '是否含尾部',
+ 'form_is_footer_message' => '是否含尾部范围值有误',
'form_is_full_screen_title' => '是否满屏',
+ 'form_is_full_screen_message' => '是否满屏范围值有误',
+ 'form_status_range_message' => '状态范围值有误',
'form_sort_title' => '顺序',
'form_sort_tips' => '从小到大',
'form_sort_message' => '顺序0~255之间的数值',
@@ -931,6 +966,31 @@ return [
2 => ['value' => 2, 'name' => 'PATHINFO模式+短地址'],
],
+ // -------------------- 表单 --------------------
+ 'common_form' => [
+ // 权限管理
+ 'power' => [
+ 'form_item_pid' => '栏目级别',
+ 'form_item_pid_placeholder' => '一级栏目...',
+ 'form_item_pid_message' => '栏目级别选择错误',
+ 'form_item_name' => '权限名称',
+ 'form_item_name_message' => '权限名称格式2~16个字符',
+ 'form_item_control' => '控制器名称',
+ 'form_item_control_message' => '控制器名格式1~30个字符之间（必须以字母开始，可以是字母数字下划线）',
+ 'form_item_action' => '方法名称',
+ 'form_item_action_message' => '法名格式1~30个字符之间（必须以字母开始，可以是字母数字下划线）',
+ 'form_item_url' => '自定义url地址',
+ 'form_item_url_message' => '自定义url地址、以http://或https://开头',
+ 'form_item_icon' => '图标class',
+ 'form_item_icon_message' => '图标格式最多30个字符',
+ 'form_item_icon_tips_list' => [
+ '1. 参考 http://www.iconfont.cn/ 将icon放到 [ /static/admin/default/css/iconfontmenu.css ] 文件中',
+ '2. 也可以直接使用框架自带的icon、参考 [ http://amazeui.shopxo.net/css/icon/ ]',
+ '3. 也可以自己使用插件钩子引入自定义的icon图标的css文件，然后使用定义好的icon',
+ ],
+ ],
+ ],
+
// -------------------- 公共 --------------------
// 配置信息
'common_config' => [
diff --git a/app/layout/service/BaseLayout.php b/app/layout/service/BaseLayout.php
index 927d38f44..ea24c2023 100644
--- a/app/layout/service/BaseLayout.php
+++ b/app/layout/service/BaseLayout.php
@@ -902,7 +902,7 @@ class BaseLayout
}
}
}
- return DataReturn('处理成功', 0, $result);
+ return DataReturn(MyLang('handle_success'), 0, $result);
}
/**
diff --git a/app/service/AdminPowerService.php b/app/service/AdminPowerService.php
index f65f43bf5..2d80f09a7 100755
--- a/app/service/AdminPowerService.php
+++ b/app/service/AdminPowerService.php
@@ -62,29 +62,24 @@ class AdminPowerService
{
// 请求参数
$p = [
- [
- 'checked_type' => 'empty',
- 'key_name' => 'name',
- 'error_msg' => '权限名称不能为空',
- ],
[
'checked_type' => 'length',
'key_name' => 'name',
'checked_data' => '2,16',
- 'error_msg' => '权限名称格式 2~16 个字符之间',
+ 'error_msg' => MyLang('common_form.power.form_item_name_message'),
],
[
'checked_type' => 'length',
'key_name' => 'icon',
'checked_data' => '60',
'is_checked' => 1,
- 'error_msg' => '图标格式 0~30 个字符之间',
+ 'error_msg' => MyLang('common_form.power.form_item_icon_message'),
],
[
'checked_type' => 'in',
'key_name' => 'is_show',
'checked_data' => [0,1],
- 'error_msg' => '是否显示范围值有误',
+ 'error_msg' => MyLang('form_is_show_message'),
],
];
// 是否自定义url地址
@@ -94,20 +89,20 @@ class AdminPowerService
'checked_type' => 'length',
'key_name' => 'control',
'checked_data' => '1,30',
- 'error_msg' => '控制器名称格式 1~30 个字符之间',
+ 'error_msg' => MyLang('common_form.power.form_item_control_message'),
];
$p[] = [
'checked_type' => 'length',
'key_name' => 'action',
'checked_data' => '1,30',
- 'error_msg' => '方法名称格式 1~30 个字符之间',
+ 'error_msg' => MyLang('common_form.power.form_item_action_message'),
];
} else {
$p[] = [
'checked_type' => 'length',
'key_name' => 'url',
'checked_data' => '1,255',
- 'error_msg' => '自定义url地址格式 1~255 个字符之间',
+ 'error_msg' => MyLang('common_form.power.form_item_url_message'),
];
}
$ret = ParamsChecked($params, $p);
@@ -157,7 +152,7 @@ class AdminPowerService
// 参数是否有误
if(empty($params['id']))
{
- return DataReturn('权限菜单id有误', -1);
+ return DataReturn(MyLang('data_id_error_tips'), -1);
}
if(Db::name('Power')->delete(intval($params['id'])))
diff --git a/app/service/AdminRoleService.php b/app/service/AdminRoleService.php
index dca2dd51c..9ba6f9584 100644
--- a/app/service/AdminRoleService.php
+++ b/app/service/AdminRoleService.php
@@ -125,13 +125,13 @@ class AdminRoleService
[
'checked_type' => 'empty',
'key_name' => 'id',
- 'error_msg' => '操作id有误',
+ 'error_msg' => MyLang('data_id_error_tips'),
],
[
'checked_type' => 'in',
'key_name' => 'state',
'checked_data' => [0,1],
- 'error_msg' => '状态有误',
+ 'error_msg' => MyLang('form_status_range_message'),
],
];
$ret = ParamsChecked($params, $p);
@@ -371,7 +371,7 @@ class AdminRoleService
// 参数是否有误
if(empty($params['ids']))
{
- return DataReturn('角色id有误', -1);
+ return DataReturn(MyLang('data_id_error_tips'), -1);
}
// 是否数组
if(!is_array($params['ids']))
diff --git a/app/service/AdminService.php b/app/service/AdminService.php
index 3a143048d..ef09f8eca 100755
--- a/app/service/AdminService.php
+++ b/app/service/AdminService.php
@@ -220,9 +220,9 @@ class AdminService
// 添加
if(Db::name('Admin')->insert($data) > 0)
{
- return DataReturn('新增成功', 0);
+ return DataReturn(MyLang('insert_success'), 0);
}
- return DataReturn('新增失败', -100);
+ return DataReturn(MyLang('insert_fail'), -100);
}
/**
@@ -492,7 +492,7 @@ class AdminService
// 权限菜单初始化
AdminPowerService::PowerMenuInit($admin);
- return DataReturn('登录成功');
+ return DataReturn(MyLang('login_success'));
}
}
@@ -767,9 +767,9 @@ class AdminService
{
return DataReturn('验证码错误', -12);
}
- return DataReturn('验证成功', 0, $verify);
+ return DataReturn(MyLang('check_success'), 0, $verify);
}
- return DataReturn('验证成功', 0);
+ return DataReturn(MyLang('check_success'), 0);
}
}
?>
\ No newline at end of file
diff --git a/app/service/AnswerService.php b/app/service/AnswerService.php
index 282edc619..002d9d2d4 100755
--- a/app/service/AnswerService.php
+++ b/app/service/AnswerService.php
@@ -206,7 +206,7 @@ class AnswerService
$user = UserService::LoginUserInfo();
if(empty($user))
{
- return DataReturn('请先登录', -400);
+ return DataReturn(MyLang('user_no_login_tips'), -400);
}
}
@@ -272,9 +272,9 @@ class AnswerService
$data['add_time'] = time();
if(Db::name('Answer')->insertGetId($data) > 0)
{
- return DataReturn('提交成功', 0);
+ return DataReturn(MyLang('submit_success'), 0);
}
- return DataReturn('提交失败', -100);
+ return DataReturn(MyLang('submit_fail'), -100);
} else {
$data['upd_time'] = time();
if(Db::name('Answer')->where(['id'=>intval($params['id'])])->update($data))
@@ -301,7 +301,7 @@ class AnswerService
[
'checked_type' => 'empty',
'key_name' => 'ids',
- 'error_msg' => '操作id有误',
+ 'error_msg' => MyLang('data_id_error_tips'),
],
[
'checked_type' => 'empty',
@@ -360,7 +360,7 @@ class AnswerService
[
'checked_type' => 'empty',
'key_name' => 'id',
- 'error_msg' => '操作id有误',
+ 'error_msg' => MyLang('data_id_error_tips'),
],
[
'checked_type' => 'empty',
@@ -389,7 +389,7 @@ class AnswerService
$temp = Db::name('Answer')->where($where)->field('id')->find();
if(empty($temp))
{
- return DataReturn('资源不存在或已被删除', -2);
+ return DataReturn(MyLang('data_no_exist_or_delete_error_tips'), -2);
}
// 更新问答
$data = [
@@ -420,7 +420,7 @@ class AnswerService
[
'checked_type' => 'empty',
'key_name' => 'id',
- 'error_msg' => '操作id有误',
+ 'error_msg' => MyLang('data_id_error_tips'),
],
[
'checked_type' => 'empty',
@@ -431,7 +431,7 @@ class AnswerService
'checked_type' => 'in',
'key_name' => 'state',
'checked_data' => [0,1],
- 'error_msg' => '状态有误',
+ 'error_msg' => MyLang('form_status_range_message'),
],
];
$ret = ParamsChecked($params, $p);
diff --git a/app/service/AppCenterNavService.php b/app/service/AppCenterNavService.php
index f93d81418..c69408b26 100755
--- a/app/service/AppCenterNavService.php
+++ b/app/service/AppCenterNavService.php
@@ -46,26 +46,26 @@ class AppCenterNavService
'checked_type' => 'in',
'key_name' => 'platform',
'checked_data' => array_column(MyLang('common_platform_type'), 'value'),
- 'error_msg' => '平台类型有误',
+ 'error_msg' => MyLang('form_platform_message'),
],
[
'checked_type' => 'in',
'key_name' => 'event_type',
'checked_data' => array_column(MyLang('common_app_event_type'), 'value'),
- 'is_checked' => 2,
- 'error_msg' => '事件值类型有误',
+ 'is_checked' => 1,
+ 'error_msg' => MyLang('form_event_type_message'),
],
[
'checked_type' => 'length',
'key_name' => 'event_value',
'checked_data' => '255',
- 'error_msg' => '事件值最多 255 个字符',
+ 'error_msg' => MyLang('form_event_value_message'),
],
[
'checked_type' => 'empty',
'key_name' => 'images_url',
'checked_data' => '255',
- 'error_msg' => '请上传图片',
+ 'error_msg' => MyLang('form_upload_images_message'),
],
[
'checked_type' => 'length',
@@ -77,7 +77,7 @@ class AppCenterNavService
'checked_type' => 'length',
'key_name' => 'sort',
'checked_data' => '3',
- 'error_msg' => '顺序 0~255 之间的数值',
+ 'error_msg' => MyLang('form_sort_message'),
],
];
$ret = ParamsChecked($params, $p);
@@ -134,7 +134,7 @@ class AppCenterNavService
// 参数是否有误
if(empty($params['ids']))
{
- return DataReturn('操作id有误', -1);
+ return DataReturn(MyLang('data_id_error_tips'), -1);
}
// 是否数组
if(!is_array($params['ids']))
@@ -166,7 +166,7 @@ class AppCenterNavService
[
'checked_type' => 'empty',
'key_name' => 'id',
- 'error_msg' => '操作id有误',
+ 'error_msg' => MyLang('data_id_error_tips'),
],
[
'checked_type' => 'empty',
@@ -177,7 +177,7 @@ class AppCenterNavService
'checked_type' => 'in',
'key_name' => 'state',
'checked_data' => [0,1],
- 'error_msg' => '状态有误',
+ 'error_msg' => MyLang('form_status_range_message'),
],
];
$ret = ParamsChecked($params, $p);
diff --git a/app/service/AppHomeNavService.php b/app/service/AppHomeNavService.php
index 95f220ec7..47800d847 100755
--- a/app/service/AppHomeNavService.php
+++ b/app/service/AppHomeNavService.php
@@ -46,32 +46,32 @@ class AppHomeNavService
'checked_type' => 'in',
'key_name' => 'platform',
'checked_data' => array_column(MyLang('common_platform_type'), 'value'),
- 'error_msg' => '平台类型有误',
+ 'error_msg' => MyLang('form_platform_message'),
],
[
'checked_type' => 'in',
'key_name' => 'event_type',
'checked_data' => array_column(MyLang('common_app_event_type'), 'value'),
- 'is_checked' => 2,
- 'error_msg' => '事件值类型有误',
+ 'is_checked' => 1,
+ 'error_msg' => MyLang('form_event_type_message'),
],
[
'checked_type' => 'length',
'key_name' => 'event_value',
'checked_data' => '255',
- 'error_msg' => '事件值最多 255 个字符',
+ 'error_msg' => MyLang('form_event_value_message'),
],
[
'checked_type' => 'empty',
'key_name' => 'images_url',
'checked_data' => '255',
- 'error_msg' => '请上传图片',
+ 'error_msg' => MyLang('form_upload_images_message'),
],
[
'checked_type' => 'length',
'key_name' => 'sort',
'checked_data' => '3',
- 'error_msg' => '顺序 0~255 之间的数值',
+ 'error_msg' => MyLang('form_sort_message'),
],
];
$ret = ParamsChecked($params, $p);
@@ -129,7 +129,7 @@ class AppHomeNavService
// 参数是否有误
if(empty($params['ids']))
{
- return DataReturn('操作id有误', -1);
+ return DataReturn(MyLang('data_id_error_tips'), -1);
}
// 是否数组
if(!is_array($params['ids']))
@@ -161,7 +161,7 @@ class AppHomeNavService
[
'checked_type' => 'empty',
'key_name' => 'id',
- 'error_msg' => '操作id有误',
+ 'error_msg' => MyLang('data_id_error_tips'),
],
[
'checked_type' => 'empty',
@@ -172,7 +172,7 @@ class AppHomeNavService
'checked_type' => 'in',
'key_name' => 'state',
'checked_data' => [0,1],
- 'error_msg' => '状态有误',
+ 'error_msg' => MyLang('form_status_range_message'),
],
];
$ret = ParamsChecked($params, $p);
diff --git a/app/service/AppMiniService.php b/app/service/AppMiniService.php
index 26c09a8b9..1e602d14e 100755
--- a/app/service/AppMiniService.php
+++ b/app/service/AppMiniService.php
@@ -284,7 +284,7 @@ class AppMiniService
// 关闭zip
$zip->close();
- return DataReturn('安装成功');
+ return DataReturn(MyLang('install_success'), 0);
}
/**
@@ -342,7 +342,7 @@ class AppMiniService
{
return DataReturn(MyLang('delete_success'), 0);
}
- return DataReturn('删除失败或资源不存在', -100);
+ return DataReturn(MyLang('delete_fail'), -100);
}
/**
@@ -723,7 +723,7 @@ class AppMiniService
}
}
- return DataReturn('配置成功', 0);
+ return DataReturn(MyLang('config_success'), 0);
}
/**
@@ -740,7 +740,7 @@ class AppMiniService
// 参数是否有误
if(empty($params['ids']))
{
- return DataReturn('操作id有误', -1);
+ return DataReturn(MyLang('data_id_error_tips'), -1);
}
// 是否数组
if(!is_array($params['ids']))
diff --git a/app/service/ArticleService.php b/app/service/ArticleService.php
index f8e144dfc..d8231b340 100755
--- a/app/service/ArticleService.php
+++ b/app/service/ArticleService.php
@@ -225,21 +225,21 @@ class ArticleService
'key_name' => 'seo_title',
'checked_data' => '100',
'is_checked' => 1,
- 'error_msg' => 'SEO标题格式 最多100个字符',
+ 'error_msg' => MyLang('form_seo_title_message'),
],
[
'checked_type' => 'length',
'key_name' => 'seo_keywords',
'checked_data' => '130',
'is_checked' => 1,
- 'error_msg' => 'SEO关键字格式 最多130个字符',
+ 'error_msg' => MyLang('form_seo_keywords_message'),
],
[
'checked_type' => 'length',
'key_name' => 'seo_desc',
'checked_data' => '230',
'is_checked' => 1,
- 'error_msg' => 'SEO描述格式 最多230个字符',
+ 'error_msg' => MyLang('form_seo_desc_message'),
],
];
$ret = ParamsChecked($params, $p);
@@ -412,7 +412,7 @@ class ArticleService
// 参数是否有误
if(empty($params['ids']))
{
- return DataReturn('商品id有误', -1);
+ return DataReturn(MyLang('data_id_error_tips'), -1);
}
// 是否数组
if(!is_array($params['ids']))
@@ -444,7 +444,7 @@ class ArticleService
[
'checked_type' => 'empty',
'key_name' => 'id',
- 'error_msg' => '操作id有误',
+ 'error_msg' => MyLang('data_id_error_tips'),
],
[
'checked_type' => 'empty',
@@ -455,7 +455,7 @@ class ArticleService
'checked_type' => 'in',
'key_name' => 'state',
'checked_data' => [0,1],
- 'error_msg' => '状态有误',
+ 'error_msg' => MyLang('form_status_range_message'),
],
];
$ret = ParamsChecked($params, $p);
diff --git a/app/service/BrandService.php b/app/service/BrandService.php
index 7af33dd07..9d4a1345e 100755
--- a/app/service/BrandService.php
+++ b/app/service/BrandService.php
@@ -255,28 +255,28 @@ class BrandService
'key_name' => 'sort',
'checked_data' => 255,
'is_checked' => 1,
- 'error_msg' => '顺序 0~255 之间的数值',
+ 'error_msg' => MyLang('form_sort_message'),
],
[
'checked_type' => 'length',
'key_name' => 'seo_title',
'checked_data' => '100',
'is_checked' => 1,
- 'error_msg' => 'SEO标题格式 最多100个字符',
+ 'error_msg' => MyLang('form_seo_title_message'),
],
[
'checked_type' => 'length',
'key_name' => 'seo_keywords',
'checked_data' => '130',
'is_checked' => 1,
- 'error_msg' => 'SEO关键字格式 最多130个字符',
+ 'error_msg' => MyLang('form_seo_keywords_message'),
],
[
'checked_type' => 'length',
'key_name' => 'seo_desc',
'checked_data' => '230',
'is_checked' => 1,
- 'error_msg' => 'SEO描述格式 最多230个字符',
+ 'error_msg' => MyLang('form_seo_desc_message'),
],
];
$ret = ParamsChecked($params, $p);
@@ -396,7 +396,7 @@ class BrandService
// 参数是否有误
if(empty($params['ids']))
{
- return DataReturn('操作id有误', -1);
+ return DataReturn(MyLang('data_id_error_tips'), -1);
}
// 是否数组
if(!is_array($params['ids']))
@@ -428,7 +428,7 @@ class BrandService
[
'checked_type' => 'empty',
'key_name' => 'id',
- 'error_msg' => '操作id有误',
+ 'error_msg' => MyLang('data_id_error_tips'),
],
[
'checked_type' => 'empty',
@@ -439,7 +439,7 @@ class BrandService
'checked_type' => 'in',
'key_name' => 'state',
'checked_data' => [0,1],
- 'error_msg' => '状态有误',
+ 'error_msg' => MyLang('form_status_range_message'),
],
];
$ret = ParamsChecked($params, $p);
diff --git a/app/service/BuyService.php b/app/service/BuyService.php
index 63e44e962..008b2e7be 100755
--- a/app/service/BuyService.php
+++ b/app/service/BuyService.php
@@ -74,7 +74,7 @@ class BuyService
$ret = GoodsService::GoodsList($goods_params);
if(empty($ret['data'][0]))
{
- return DataReturn('资源不存在或已被删除', -10);
+ return DataReturn(MyLang('data_no_exist_or_delete_error_tips'), -10);
}
// 商品处理
@@ -287,10 +287,10 @@ class BuyService
// 默认
default :
- $ret = DataReturn('参数有误', -1);
+ $ret = DataReturn(MyLang('params_error_tips'), -1);
}
} else {
- $ret = DataReturn('参数有误', -1);
+ $ret = DataReturn(MyLang('params_error_tips'), -1);
}
// 数据组装
@@ -572,7 +572,7 @@ class BuyService
}
}
- return DataReturn('校验成功', 0);
+ return DataReturn(MyLang('check_success'), 0);
}
/**
@@ -644,7 +644,7 @@ class BuyService
{
if(empty($params['payment_id']))
{
- return DataReturn('支付方式有误', -1);
+ return DataReturn(MyLang('payment_method_error_tips'), -1);
}
}
@@ -662,7 +662,7 @@ class BuyService
$payment = PaymentService::PaymentData(['where'=>['id'=>intval($params['payment_id'])]]);
if(empty($payment))
{
- return DataReturn('支付方式有误', -1);
+ return DataReturn(MyLang('payment_method_error_tips'), -1);
}
$payment_id = $payment['id'];
$is_under_line = in_array($payment['payment'], MyConfig('shopxo.under_line_list')) ? 1 : 0;
@@ -1236,7 +1236,7 @@ class BuyService
}
}
}
- return DataReturn('校验成功', 0);
+ return DataReturn(MyLang('check_success'), 0);
}
/**
@@ -1326,7 +1326,7 @@ class BuyService
}
}
- return DataReturn('校验成功', 0);
+ return DataReturn(MyLang('check_success'), 0);
}
/**
@@ -1381,7 +1381,7 @@ class BuyService
return $base;
}
}
- return DataReturn('校验成功', 0);
+ return DataReturn(MyLang('check_success'), 0);
}
/**
diff --git a/app/service/CustomViewService.php b/app/service/CustomViewService.php
index 73249582b..0fe6c7df5 100755
--- a/app/service/CustomViewService.php
+++ b/app/service/CustomViewService.php
@@ -195,7 +195,7 @@ class CustomViewService
// 参数是否有误
if(empty($params['ids']))
{
- return DataReturn('操作id有误', -1);
+ return DataReturn(MyLang('data_id_error_tips'), -1);
}
// 是否数组
if(!is_array($params['ids']))
@@ -227,7 +227,7 @@ class CustomViewService
[
'checked_type' => 'empty',
'key_name' => 'id',
- 'error_msg' => '操作id有误',
+ 'error_msg' => MyLang('data_id_error_tips'),
],
[
'checked_type' => 'empty',
@@ -238,7 +238,7 @@ class CustomViewService
'checked_type' => 'in',
'key_name' => 'state',
'checked_data' => [0,1],
- 'error_msg' => '状态有误',
+ 'error_msg' => MyLang('form_status_range_message'),
],
];
$ret = ParamsChecked($params, $p);
diff --git a/app/service/DesignService.php b/app/service/DesignService.php
index 2bc4b8109..935b9257e 100644
--- a/app/service/DesignService.php
+++ b/app/service/DesignService.php
@@ -147,7 +147,7 @@ class DesignService
[
'checked_type' => 'empty',
'key_name' => 'id',
- 'error_msg' => '操作id有误',
+ 'error_msg' => MyLang('data_id_error_tips'),
],
[
'checked_type' => 'empty',
@@ -158,7 +158,7 @@ class DesignService
'checked_type' => 'in',
'key_name' => 'state',
'checked_data' => [0,1],
- 'error_msg' => '状态有误',
+ 'error_msg' => MyLang('form_status_range_message'),
],
];
$ret = ParamsChecked($params, $p);
@@ -191,7 +191,7 @@ class DesignService
[
'checked_type' => 'empty',
'key_name' => 'ids',
- 'error_msg' => '操作id有误',
+ 'error_msg' => MyLang('data_id_error_tips'),
],
];
$ret = ParamsChecked($params, $p);
@@ -268,7 +268,7 @@ class DesignService
[
'checked_type' => 'empty',
'key_name' => 'id',
- 'error_msg' => '操作id有误',
+ 'error_msg' => MyLang('data_id_error_tips'),
],
];
$ret = ParamsChecked($params, $p);
@@ -281,7 +281,7 @@ class DesignService
$data = Db::name('Design')->where(['id'=>intval($params['id'])])->field('config')->find();
if(empty($data))
{
- return DataReturn('数据不存在', -1);
+ return DataReturn(MyLang('data_no_exist_error_tips'), -1);
}
return LayoutService::LayoutConfigSave('home', $data);
@@ -303,7 +303,7 @@ class DesignService
[
'checked_type' => 'empty',
'key_name' => 'id',
- 'error_msg' => '操作id有误',
+ 'error_msg' => MyLang('data_id_error_tips'),
],
];
$ret = ParamsChecked($params, $p);
@@ -316,7 +316,7 @@ class DesignService
$data = Db::name('Design')->where(['id'=>intval($params['id'])])->find();
if(empty($data))
{
- return DataReturn('数据不存在', -1);
+ return DataReturn(MyLang('data_no_exist_error_tips'), -1);
}
// 目录不存在则创建
@@ -637,7 +637,7 @@ class DesignService
if($data_id <= 0)
{
$zip->close();
- return DataReturn('数据添加失败', -1);
+ return DataReturn(MyLang('insert_fail'), -1);
}
// 更新配置信息和logo
if(!empty($config['config']) || !empty($config['logo']))
@@ -650,7 +650,7 @@ class DesignService
if(!Db::name('Design')->where(['id'=>$data_id])->update($upd_data))
{
$zip->close();
- return DataReturn('数据更新失败', -1);
+ return DataReturn(MyLang('update_fail'), -1);
}
}
break;
@@ -713,7 +713,7 @@ class DesignService
if($success > 0)
{
- return DataReturn('导入成功', 0);
+ return DataReturn(MyLang('import_success'), 0);
}
return DataReturn('无效数据包', -1);
}
diff --git a/app/service/GoodsBrowseService.php b/app/service/GoodsBrowseService.php
index 35852e835..f8e9e74ce 100644
--- a/app/service/GoodsBrowseService.php
+++ b/app/service/GoodsBrowseService.php
@@ -195,7 +195,7 @@ class GoodsBrowseService
[
'checked_type' => 'empty',
'key_name' => 'ids',
- 'error_msg' => '操作id有误',
+ 'error_msg' => MyLang('data_id_error_tips'),
],
];
$ret = ParamsChecked($params, $p);
diff --git a/app/service/GoodsCartService.php b/app/service/GoodsCartService.php
index 529e66fc8..10fff8047 100644
--- a/app/service/GoodsCartService.php
+++ b/app/service/GoodsCartService.php
@@ -253,7 +253,7 @@ class GoodsCartService
$goods = Db::name('Goods')->where(['id'=>$goods_id, 'is_shelves'=>1, 'is_delete_time'=>0])->find();
if(empty($goods))
{
- return DataReturn('商品不存在或已删除', -2);
+ return DataReturn(MyLang('goods_no_exist_or_delete_error_tips'), -2);
}
// 无封面图片
@@ -556,7 +556,7 @@ class GoodsCartService
$ids = empty($params['ids']) ? (empty($params['id']) ? [] : $params['id']) : $params['ids'];
if(empty($ids))
{
- return DataReturn('操作id有误', -1);
+ return DataReturn(MyLang('data_id_error_tips'), -1);
}
// 是否数组
if(!is_array($ids))
diff --git a/app/service/GoodsCommentsService.php b/app/service/GoodsCommentsService.php
index a35dec11f..e6f08de70 100644
--- a/app/service/GoodsCommentsService.php
+++ b/app/service/GoodsCommentsService.php
@@ -137,7 +137,7 @@ class GoodsCommentsService
$order = Db::name('Order')->where($where)->field('id,status,user_is_comments')->find();
if(empty($order))
{
- return DataReturn('资源不存在或已被删除', -1);
+ return DataReturn(MyLang('data_no_exist_or_delete_error_tips'), -1);
}
if($order['status'] != 4)
{
@@ -417,7 +417,7 @@ class GoodsCommentsService
[
'checked_type' => 'empty',
'key_name' => 'id',
- 'error_msg' => '操作id有误',
+ 'error_msg' => MyLang('data_id_error_tips'),
],
[
'checked_type' => 'in',
@@ -485,7 +485,7 @@ class GoodsCommentsService
// 参数是否有误
if(empty($params['ids']))
{
- return DataReturn('操作id有误', -1);
+ return DataReturn(MyLang('data_id_error_tips'), -1);
}
// 是否数组
if(!is_array($params['ids']))
@@ -517,7 +517,7 @@ class GoodsCommentsService
[
'checked_type' => 'empty',
'key_name' => 'id',
- 'error_msg' => '操作id有误',
+ 'error_msg' => MyLang('data_id_error_tips'),
],
[
'checked_type' => 'empty',
@@ -541,7 +541,7 @@ class GoodsCommentsService
$comments_id = Db::name('GoodsComments')->field('id')->find(intval($params['id']));
if(empty($comments_id))
{
- return DataReturn('资源不存在或已被删除', -2);
+ return DataReturn(MyLang('data_no_exist_or_delete_error_tips'), -2);
}
// 更新问答
$data = [
@@ -572,13 +572,13 @@ class GoodsCommentsService
[
'checked_type' => 'empty',
'key_name' => 'id',
- 'error_msg' => '操作id有误',
+ 'error_msg' => MyLang('data_id_error_tips'),
],
[
'checked_type' => 'in',
'key_name' => 'state',
'checked_data' => [0,1],
- 'error_msg' => '状态有误',
+ 'error_msg' => MyLang('form_status_range_message'),
],
[
'checked_type' => 'in',
diff --git a/app/service/GoodsFavorService.php b/app/service/GoodsFavorService.php
index 92392e7f9..9e843065a 100644
--- a/app/service/GoodsFavorService.php
+++ b/app/service/GoodsFavorService.php
@@ -258,7 +258,7 @@ class GoodsFavorService
[
'checked_type' => 'empty',
'key_name' => 'ids',
- 'error_msg' => '操作id有误',
+ 'error_msg' => MyLang('data_id_error_tips'),
],
];
$ret = ParamsChecked($params, $p);
diff --git a/app/service/GoodsParamsService.php b/app/service/GoodsParamsService.php
index e77370cb7..1c40a53fd 100755
--- a/app/service/GoodsParamsService.php
+++ b/app/service/GoodsParamsService.php
@@ -230,7 +230,7 @@ class GoodsParamsService
// 参数是否有误
if(empty($params['ids']))
{
- return DataReturn('操作id有误', -1);
+ return DataReturn(MyLang('data_id_error_tips'), -1);
}
// 是否数组
if(!is_array($params['ids']))
@@ -280,7 +280,7 @@ class GoodsParamsService
[
'checked_type' => 'empty',
'key_name' => 'id',
- 'error_msg' => '操作id有误',
+ 'error_msg' => MyLang('data_id_error_tips'),
],
[
'checked_type' => 'empty',
@@ -291,7 +291,7 @@ class GoodsParamsService
'checked_type' => 'in',
'key_name' => 'state',
'checked_data' => [0,1],
- 'error_msg' => '状态有误',
+ 'error_msg' => MyLang('form_status_range_message'),
],
];
$ret = ParamsChecked($params, $p);
diff --git a/app/service/GoodsService.php b/app/service/GoodsService.php
index d555b9a31..d2c8820d2 100755
--- a/app/service/GoodsService.php
+++ b/app/service/GoodsService.php
@@ -1269,21 +1269,21 @@ class GoodsService
'key_name' => 'seo_title',
'checked_data' => '100',
'is_checked' => 1,
- 'error_msg' => 'SEO标题格式 最多100个字符',
+ 'error_msg' => MyLang('form_seo_title_message'),
],
[
'checked_type' => 'length',
'key_name' => 'seo_keywords',
'checked_data' => '130',
'is_checked' => 1,
- 'error_msg' => 'SEO关键字格式 最多130个字符',
+ 'error_msg' => MyLang('form_seo_keywords_message'),
],
[
'checked_type' => 'length',
'key_name' => 'seo_desc',
'checked_data' => '230',
'is_checked' => 1,
- 'error_msg' => 'SEO描述格式 最多230个字符',
+ 'error_msg' => MyLang('form_seo_desc_message'),
],
];
$ret = ParamsChecked($params, $p);
@@ -2045,7 +2045,7 @@ class GoodsService
// 参数是否有误
if(empty($params['ids']))
{
- return DataReturn('操作id有误', -1);
+ return DataReturn(MyLang('data_id_error_tips'), -1);
}
// 是否数组
if(!is_array($params['ids']))
@@ -2153,7 +2153,7 @@ class GoodsService
[
'checked_type' => 'empty',
'key_name' => 'id',
- 'error_msg' => '操作id有误',
+ 'error_msg' => MyLang('data_id_error_tips'),
],
[
'checked_type' => 'empty',
@@ -2164,7 +2164,7 @@ class GoodsService
'checked_type' => 'in',
'key_name' => 'state',
'checked_data' => [0,1],
- 'error_msg' => '状态有误',
+ 'error_msg' => MyLang('form_status_range_message'),
],
];
$ret = ParamsChecked($params, $p);
@@ -2671,21 +2671,21 @@ class GoodsService
'key_name' => 'seo_title',
'checked_data' => '100',
'is_checked' => 1,
- 'error_msg' => 'SEO标题格式 最多100个字符',
+ 'error_msg' => MyLang('form_seo_title_message'),
],
[
'checked_type' => 'length',
'key_name' => 'seo_keywords',
'checked_data' => '130',
'is_checked' => 1,
- 'error_msg' => 'SEO关键字格式 最多130个字符',
+ 'error_msg' => MyLang('form_seo_keywords_message'),
],
[
'checked_type' => 'length',
'key_name' => 'seo_desc',
'checked_data' => '230',
'is_checked' => 1,
- 'error_msg' => 'SEO描述格式 最多230个字符',
+ 'error_msg' => MyLang('form_seo_desc_message'),
],
];
$ret = ParamsChecked($params, $p);
@@ -2806,7 +2806,7 @@ class GoodsService
public static function GoodsCategoryNames($goods_id)
{
$data = Db::name('GoodsCategory')->alias('gc')->join('goods_category_join gci', 'gc.id=gci.category_id')->where(['gci.goods_id'=>$goods_id])->column('gc.name');
- return DataReturn('获取成功', 0, $data);
+ return DataReturn(MyLang('get_success'), 0, $data);
}
/**
@@ -2831,7 +2831,7 @@ class GoodsService
'data' => &$data,
]);
- return DataReturn('获取成功', 0, $data);
+ return DataReturn(MyLang('get_success'), 0, $data);
}
/**
diff --git a/app/service/GoodsSpecService.php b/app/service/GoodsSpecService.php
index fa7df2f83..680cd17b4 100644
--- a/app/service/GoodsSpecService.php
+++ b/app/service/GoodsSpecService.php
@@ -192,7 +192,7 @@ class GoodsSpecService
// 参数是否有误
if(empty($params['ids']))
{
- return DataReturn('操作id有误', -1);
+ return DataReturn(MyLang('data_id_error_tips'), -1);
}
// 是否数组
if(!is_array($params['ids']))
@@ -231,7 +231,7 @@ class GoodsSpecService
[
'checked_type' => 'empty',
'key_name' => 'id',
- 'error_msg' => '操作id有误',
+ 'error_msg' => MyLang('data_id_error_tips'),
],
[
'checked_type' => 'empty',
@@ -242,7 +242,7 @@ class GoodsSpecService
'checked_type' => 'in',
'key_name' => 'state',
'checked_data' => [0,1],
- 'error_msg' => '状态有误',
+ 'error_msg' => MyLang('form_status_range_message'),
],
];
$ret = ParamsChecked($params, $p);
diff --git a/app/service/LinkService.php b/app/service/LinkService.php
index 74c3b177d..394f20c3c 100755
--- a/app/service/LinkService.php
+++ b/app/service/LinkService.php
@@ -131,7 +131,7 @@ class LinkService
'checked_type' => 'length',
'key_name' => 'sort',
'checked_data' => '3',
- 'error_msg' => '顺序 0~255 之间的数值',
+ 'error_msg' => MyLang('form_sort_message'),
],
[
'checked_type' => 'in',
@@ -200,7 +200,7 @@ class LinkService
// 参数是否有误
if(empty($params['ids']))
{
- return DataReturn('操作id有误', -1);
+ return DataReturn(MyLang('data_id_error_tips'), -1);
}
// 是否数组
if(!is_array($params['ids']))
@@ -232,7 +232,7 @@ class LinkService
[
'checked_type' => 'empty',
'key_name' => 'id',
- 'error_msg' => '操作id有误',
+ 'error_msg' => MyLang('data_id_error_tips'),
],
[
'checked_type' => 'empty',
@@ -243,7 +243,7 @@ class LinkService
'checked_type' => 'in',
'key_name' => 'state',
'checked_data' => [0,1],
- 'error_msg' => '状态有误',
+ 'error_msg' => MyLang('form_status_range_message'),
],
];
$ret = ParamsChecked($params, $p);
diff --git a/app/service/MessageService.php b/app/service/MessageService.php
index 1b57018a4..6a9651589 100755
--- a/app/service/MessageService.php
+++ b/app/service/MessageService.php
@@ -293,7 +293,7 @@ class MessageService
// 参数是否有误
if(empty($params['ids']))
{
- return DataReturn('操作id有误', -1);
+ return DataReturn(MyLang('data_id_error_tips'), -1);
}
// 是否数组
if(!is_array($params['ids']))
diff --git a/app/service/NavigationService.php b/app/service/NavigationService.php
index 4df9b2517..8d94e63d3 100755
--- a/app/service/NavigationService.php
+++ b/app/service/NavigationService.php
@@ -331,7 +331,7 @@ class NavigationService
'checked_type' => 'length',
'key_name' => 'sort',
'checked_data' => '4',
- 'error_msg' => '顺序 0~255 之间的数值',
+ 'error_msg' => MyLang('form_sort_message'),
],
[
'checked_type' => 'in',
@@ -524,9 +524,9 @@ class NavigationService
// 清除缓存
MyCache($cache_key, null);
- return DataReturn('新增成功', 0);
+ return DataReturn(MyLang('insert_success'), 0);
} else {
- return DataReturn('新增失败', -100);
+ return DataReturn(MyLang('insert_fail'), -100);
}
} else {
$data['upd_time'] = time();
@@ -556,7 +556,7 @@ class NavigationService
// 参数是否有误
if(empty($params['ids']))
{
- return DataReturn('操作id有误', -1);
+ return DataReturn(MyLang('data_id_error_tips'), -1);
}
// 是否数组
if(!is_array($params['ids']))
@@ -600,7 +600,7 @@ class NavigationService
[
'checked_type' => 'empty',
'key_name' => 'id',
- 'error_msg' => '操作id有误',
+ 'error_msg' => MyLang('data_id_error_tips'),
],
[
'checked_type' => 'empty',
@@ -611,7 +611,7 @@ class NavigationService
'checked_type' => 'in',
'key_name' => 'state',
'checked_data' => [0,1],
- 'error_msg' => '状态有误',
+ 'error_msg' => MyLang('form_status_range_message'),
],
];
$ret = ParamsChecked($params, $p);
diff --git a/app/service/OrderAftersaleService.php b/app/service/OrderAftersaleService.php
index 9bda73ff3..9a7935581 100644
--- a/app/service/OrderAftersaleService.php
+++ b/app/service/OrderAftersaleService.php
@@ -282,7 +282,7 @@ class OrderAftersaleService
[
'checked_type' => 'empty',
'key_name' => 'id',
- 'error_msg' => '操作id有误',
+ 'error_msg' => MyLang('data_id_error_tips'),
],
[
'checked_type' => 'length',
@@ -316,7 +316,7 @@ class OrderAftersaleService
$aftersale = Db::name('OrderAftersale')->where($where)->find();
if(empty($aftersale))
{
- return DataReturn('数据不存在或已删除', -1);
+ return DataReturn(MyLang('data_no_exist_or_delete_error_tips'), -1);
}
// 状态
@@ -396,7 +396,7 @@ class OrderAftersaleService
// 获取数据列表
$data = Db::name('OrderAftersale')->field($field)->where($where)->limit($m, $n)->order($order_by)->select()->toArray();
- return DataReturn('获取成功', 0, self::OrderAftersaleListHandle($data, $params));
+ return DataReturn(MyLang('get_success'), 0, self::OrderAftersaleListHandle($data, $params));
}
/**
@@ -593,7 +593,7 @@ class OrderAftersaleService
[
'checked_type' => 'empty',
'key_name' => 'id',
- 'error_msg' => '操作id有误',
+ 'error_msg' => MyLang('data_id_error_tips'),
],
[
'checked_type' => 'empty',
@@ -621,7 +621,7 @@ class OrderAftersaleService
$aftersale = Db::name('OrderAftersale')->where($where)->find();
if(empty($aftersale))
{
- return DataReturn('数据不存在或已删除', -1);
+ return DataReturn(MyLang('data_no_exist_or_delete_error_tips'), -1);
}
// 状态校验
@@ -692,7 +692,7 @@ class OrderAftersaleService
[
'checked_type' => 'empty',
'key_name' => 'id',
- 'error_msg' => '操作id有误',
+ 'error_msg' => MyLang('data_id_error_tips'),
],
];
$ret = ParamsChecked($params, $p);
@@ -710,7 +710,7 @@ class OrderAftersaleService
$aftersale = Db::name('OrderAftersale')->where($where)->find();
if(empty($aftersale))
{
- return DataReturn('数据不存在或已删除', -1);
+ return DataReturn(MyLang('data_no_exist_or_delete_error_tips'), -1);
}
// 状态校验
@@ -767,9 +767,9 @@ class OrderAftersaleService
}
// 返回成功
- return DataReturn('确认成功');
+ return DataReturn(MyLang('confirm_success'), 0);
}
- return DataReturn('确认失败', -100);
+ return DataReturn(MyLang('confirm_fail'), -100);
}
/**
@@ -788,7 +788,7 @@ class OrderAftersaleService
[
'checked_type' => 'empty',
'key_name' => 'id',
- 'error_msg' => '操作id有误',
+ 'error_msg' => MyLang('data_id_error_tips'),
],
[
'checked_type' => 'in',
@@ -807,7 +807,7 @@ class OrderAftersaleService
$aftersale = Db::name('OrderAftersale')->where(['id' => intval($params['id'])])->find();
if(empty($aftersale))
{
- return DataReturn('数据不存在或已删除', -1);
+ return DataReturn(MyLang('data_no_exist_or_delete_error_tips'), -1);
}
// 状态校验
@@ -1101,7 +1101,7 @@ class OrderAftersaleService
]);
if(empty($payment))
{
- return DataReturn('支付方式有误', -1);
+ return DataReturn(MyLang('payment_method_error_tips'), -1);
}
// 交易平台单号
@@ -1260,7 +1260,7 @@ class OrderAftersaleService
[
'checked_type' => 'empty',
'key_name' => 'id',
- 'error_msg' => '操作id有误',
+ 'error_msg' => MyLang('data_id_error_tips'),
],
[
'checked_type' => 'length',
@@ -1279,7 +1279,7 @@ class OrderAftersaleService
$aftersale = Db::name('OrderAftersale')->where(['id' => intval($params['id'])])->find();
if(empty($aftersale))
{
- return DataReturn('数据不存在或已删除', -1);
+ return DataReturn(MyLang('data_no_exist_or_delete_error_tips'), -1);
}
// 状态校验
@@ -1351,7 +1351,7 @@ class OrderAftersaleService
[
'checked_type' => 'empty',
'key_name' => 'id',
- 'error_msg' => '操作id有误',
+ 'error_msg' => MyLang('data_id_error_tips'),
],
];
$ret = ParamsChecked($params, $p);
@@ -1364,7 +1364,7 @@ class OrderAftersaleService
$aftersale = Db::name('OrderAftersale')->where(['id' => intval($params['id'])])->find();
if(empty($aftersale))
{
- return DataReturn('数据不存在或已删除', -1);
+ return DataReturn(MyLang('data_no_exist_or_delete_error_tips'), -1);
}
// 状态校验
diff --git a/app/service/OrderService.php b/app/service/OrderService.php
index 335fdf0ce..83b87ebf2 100755
--- a/app/service/OrderService.php
+++ b/app/service/OrderService.php
@@ -165,7 +165,7 @@ class OrderService
}
if(empty($payment))
{
- return DataReturn('支付方式有误', -1);
+ return DataReturn(MyLang('payment_method_error_tips'), -1);
}
// 更新订单支付方式信息
@@ -433,7 +433,7 @@ class OrderService
$order = Db::name('Order')->where($where)->find();
if(empty($order))
{
- return DataReturn('资源不存在或已被删除', -1);
+ return DataReturn(MyLang('data_no_exist_or_delete_error_tips'), -1);
}
$operate = self::OrderOperateData($order, 'admin');
if($operate['is_pay'] != 1)
@@ -454,7 +454,7 @@ class OrderService
$payment = PaymentService::PaymentData(['where'=>['id'=>$payment_id]]);
if(empty($payment))
{
- return DataReturn('支付方式有误', -1);
+ return DataReturn(MyLang('payment_method_error_tips'), -1);
}
// 订单用户信息
@@ -575,7 +575,7 @@ class OrderService
$payment = PaymentService::PaymentData(['where'=>['payment'=>$payment_name]]);
if(empty($payment))
{
- return DataReturn('支付方式有误', -1);
+ return DataReturn(MyLang('payment_method_error_tips'), -1);
}
// 支付数据校验
@@ -666,7 +666,7 @@ class OrderService
// 完成
Db::commit();
- return DataReturn('支付成功', 0);
+ return DataReturn(MyLang('pay_success'), 0);
} catch(\Exception $e) {
Db::rollback();
return DataReturn($e->getMessage(), -1);
@@ -690,7 +690,7 @@ class OrderService
$payment = PaymentService::PaymentData(['where'=>['payment'=>PAYMENT_TYPE]]);
if(empty($payment))
{
- return DataReturn('支付方式有误', -1);
+ return DataReturn(MyLang('payment_method_error_tips'), -1);
}
// 支付数据校验
@@ -815,7 +815,7 @@ class OrderService
return DataReturn('订单信息有误', -1);
}
- return DataReturn('获取成功', 0, [
+ return DataReturn(MyLang('get_success'), 0, [
'pay_log_data' => $pay_log_data,
'order_list' => $order_list,
]);
@@ -845,7 +845,7 @@ class OrderService
// 支付方式
if(empty($params['payment']))
{
- return DataReturn('支付方式有误', -1);
+ return DataReturn(MyLang('payment_method_error_tips'), -1);
}
// 日志订单
@@ -861,7 +861,7 @@ class OrderService
$pay_log_status = Db::name('PayLog')->where(['id'=>$params['pay_log_data']['id']])->field('id,status')->value('status');
if($pay_log_status == 1)
{
- return DataReturn('支付成功', 0);
+ return DataReturn(MyLang('pay_success'), 0);
}
}
@@ -1009,7 +1009,7 @@ class OrderService
// 提交事务
Db::commit();
- return DataReturn('支付成功', 0);
+ return DataReturn(MyLang('pay_success'), 0);
}
/**
@@ -1849,7 +1849,7 @@ class OrderService
$order = Db::name('Order')->where($where)->field('id,status,pay_status,user_id,order_model')->find();
if(empty($order))
{
- return DataReturn('资源不存在或已被删除', -1);
+ return DataReturn(MyLang('data_no_exist_or_delete_error_tips'), -1);
}
// 有效订单情况下、如果未支付可以正常进行取消操作
$operate = self::OrderOperateData($order, $user_type);
@@ -2091,7 +2091,7 @@ class OrderService
$order = Db::name('Order')->where($where)->field('id,status,pay_status,user_id,order_model')->find();
if(empty($order))
{
- return DataReturn('资源不存在或已被删除', -1);
+ return DataReturn(MyLang('data_no_exist_or_delete_error_tips'), -1);
}
$operate = self::OrderOperateData($order, $user_type);
if($operate['is_collect'] != 1)
@@ -2199,7 +2199,7 @@ class OrderService
$order = Db::name('Order')->where($where)->field('id,status,pay_status,user_id,order_model')->find();
if(empty($order))
{
- return DataReturn('资源不存在或已被删除', -1);
+ return DataReturn(MyLang('data_no_exist_or_delete_error_tips'), -1);
}
$operate = self::OrderOperateData($order, $user_type);
if($operate['is_confirm'] != 1)
@@ -2238,12 +2238,12 @@ class OrderService
// 事务提交
Db::commit();
- return DataReturn('确认成功', 0);
+ return DataReturn(MyLang('confirm_success'), 0);
}
// 事务回滚
Db::rollback();
- return DataReturn('确认失败', -1);
+ return DataReturn(MyLang('confirm_fail'), -1);
}
/**
@@ -2304,7 +2304,7 @@ class OrderService
$order = Db::name('Order')->where($where)->field('id,status,pay_status,user_id,order_model,is_delete_time,user_is_delete_time')->find();
if(empty($order))
{
- return DataReturn('资源不存在或已被删除', -1);
+ return DataReturn(MyLang('data_no_exist_or_delete_error_tips'), -1);
}
$operate = self::OrderOperateData($order, $user_type);
if($operate['is_delete'] != 1)
@@ -2576,7 +2576,7 @@ class OrderService
} else {
$url = MyUrl('index/order/detail', ['id'=>$pay_log_value[0]]);
}
- return DataReturn('支付成功', 0, ['url'=>$url]);
+ return DataReturn(MyLang('pay_success'), 0, ['url'=>$url]);
}
return DataReturn('支付中', -300);
}
diff --git a/app/service/PayLogService.php b/app/service/PayLogService.php
index 6f1e763ad..9bdc47ca8 100755
--- a/app/service/PayLogService.php
+++ b/app/service/PayLogService.php
@@ -254,7 +254,7 @@ class PayLogService
// 参数是否有误
if(empty($params['ids']))
{
- return DataReturn('操作id有误', -1);
+ return DataReturn(MyLang('data_id_error_tips'), -1);
}
// 是否数组
if(!is_array($params['ids']))
diff --git a/app/service/PaymentService.php b/app/service/PaymentService.php
index 817ac9463..4e3c42169 100755
--- a/app/service/PaymentService.php
+++ b/app/service/PaymentService.php
@@ -383,7 +383,7 @@ class PaymentService
[
'checked_type' => 'empty',
'key_name' => 'id',
- 'error_msg' => '操作id有误',
+ 'error_msg' => MyLang('data_id_error_tips'),
],
[
'checked_type' => 'length',
@@ -400,7 +400,7 @@ class PaymentService
'checked_type' => 'length',
'key_name' => 'sort',
'checked_data' => '3',
- 'error_msg' => '顺序 0~255 之间的数值',
+ 'error_msg' => MyLang('form_sort_message'),
],
];
$ret = ParamsChecked($params, $p);
@@ -468,7 +468,7 @@ class PaymentService
[
'checked_type' => 'empty',
'key_name' => 'id',
- 'error_msg' => '操作id有误',
+ 'error_msg' => MyLang('data_id_error_tips'),
],
[
'checked_type' => 'empty',
@@ -479,7 +479,7 @@ class PaymentService
'checked_type' => 'in',
'key_name' => 'state',
'checked_data' => [0,1],
- 'error_msg' => '状态有误',
+ 'error_msg' => MyLang('form_status_range_message'),
],
];
$ret = ParamsChecked($params, $p);
@@ -517,7 +517,7 @@ class PaymentService
return DataReturn('目录没有操作权限'.'['.self::$payment_dir.']', -4);
}
- return DataReturn('验证成功', 0);
+ return DataReturn(MyLang('check_success'), 0);
}
/**
@@ -662,7 +662,7 @@ class PaymentService
// 参数
if(empty($params['id']))
{
- return DataReturn('参数错误', -1);
+ return DataReturn(MyLang('params_error_tips'), -1);
}
// 数据处理
@@ -689,11 +689,11 @@ class PaymentService
// 提交事务
Db::commit();
- return DataReturn('安装成功');
+ return DataReturn(MyLang('install_success'), 0);
} else {
// 事务回滚
Db::rollback();
- return DataReturn('安装失败', -100);
+ return DataReturn(MyLang('install_fail'), -100);
}
} else {
return DataReturn('插件配置有误', -10);
@@ -724,7 +724,7 @@ class PaymentService
// 参数
if(empty($params['id']))
{
- return DataReturn('参数错误', -1);
+ return DataReturn(MyLang('params_error_tips'), -1);
}
// 是否禁止删除
@@ -738,7 +738,7 @@ class PaymentService
$file = self::$payment_dir.$payment.'.php';
if(!file_exists($file))
{
- return DataReturn('资源不存在或已被删除', -2);
+ return DataReturn(MyLang('data_no_exist_or_delete_error_tips'), -2);
}
// 权限
@@ -773,7 +773,7 @@ class PaymentService
// 参数
if(empty($params['id']))
{
- return DataReturn('参数错误', -1);
+ return DataReturn(MyLang('params_error_tips'), -1);
}
// 初始化
@@ -786,9 +786,9 @@ class PaymentService
// 删除入口文件
self::PaymentEntranceDelete(['payment' => $payment]);
- return DataReturn('卸载成功', 0);
+ return DataReturn(MyLang('uninstall_success'), 0);
}
- return DataReturn('卸载失败', -100);
+ return DataReturn(MyLang('uninstall_fail'), -100);
}
/**
@@ -1133,7 +1133,7 @@ php;
return DataReturn('支付通知入口文件不存在，请联系管理员处理', -11, $result);
}
}
- return DataReturn('校验成功', 0, $result);
+ return DataReturn(MyLang('check_success'), 0, $result);
}
/**
diff --git a/app/service/PluginsAdminService.php b/app/service/PluginsAdminService.php
index 01d805892..49f29d74c 100755
--- a/app/service/PluginsAdminService.php
+++ b/app/service/PluginsAdminService.php
@@ -158,7 +158,7 @@ class PluginsAdminService
// 参数
if(empty($params['id']))
{
- return DataReturn('参数错误', -1);
+ return DataReturn(MyLang('params_error_tips'), -1);
}
// 数据处理
@@ -192,9 +192,9 @@ class PluginsAdminService
// 插件事件回调
PluginsService::PluginsEventCall($plugins, 'Install', $params);
- return DataReturn('安装成功');
+ return DataReturn(MyLang('install_success'), 0);
} else {
- return DataReturn('安装失败', -100);
+ return DataReturn(MyLang('install_fail'), -100);
}
} else {
return DataReturn('插件配置有误', -10);
@@ -215,7 +215,7 @@ class PluginsAdminService
// 参数
if(empty($params['id']))
{
- return DataReturn('参数错误', -1);
+ return DataReturn(MyLang('params_error_tips'), -1);
}
// 开启事务
@@ -235,10 +235,10 @@ class PluginsAdminService
// 插件事件回调
PluginsService::PluginsEventCall($plugins, 'Uninstall', $params);
- return DataReturn('卸载成功');
+ return DataReturn(MyLang('uninstall_success'), 0);
}
} else {
- $ret = DataReturn('卸载失败', -100);
+ $ret = DataReturn(MyLang('uninstall_fail'), -100);
}
// 事务回退
@@ -281,13 +281,13 @@ class PluginsAdminService
[
'checked_type' => 'empty',
'key_name' => 'id',
- 'error_msg' => '操作id有误',
+ 'error_msg' => MyLang('data_id_error_tips'),
],
[
'checked_type' => 'in',
'key_name' => 'state',
'checked_data' => [0,1],
- 'error_msg' => '状态有误',
+ 'error_msg' => MyLang('form_status_range_message'),
],
];
$ret = ParamsChecked($params, $p);
@@ -433,7 +433,7 @@ class PluginsAdminService
[
'checked_type' => 'empty',
'key_name' => 'id',
- 'error_msg' => '操作id有误',
+ 'error_msg' => MyLang('data_id_error_tips'),
],
];
$ret = ParamsChecked($params, $p);
@@ -942,7 +942,7 @@ php;
return DataReturn('不能使用限制的名称['.$plugins.']', -1);
}
- return DataReturn('校验成功', 0);
+ return DataReturn(MyLang('check_success'), 0);
}
/**
@@ -1083,7 +1083,7 @@ php;
// 插件事件回调
PluginsService::PluginsEventCall($plugins, 'Upload', $params);
- return DataReturn('安装成功');
+ return DataReturn(MyLang('install_success'), 0);
}
/**
@@ -1289,7 +1289,7 @@ php;
[
'checked_type' => 'empty',
'key_name' => 'id',
- 'error_msg' => '操作id有误',
+ 'error_msg' => MyLang('data_id_error_tips'),
],
];
$ret = ParamsChecked($params, $p);
@@ -1514,7 +1514,7 @@ php;
// 插件事件回调
PluginsService::PluginsEventCall($plugins, 'Upgrade', $params);
- return DataReturn('更新成功');
+ return DataReturn(MyLang('update_success'));
}
/**
diff --git a/app/service/PluginsService.php b/app/service/PluginsService.php
index 78f96a1ce..d53bbd8ee 100755
--- a/app/service/PluginsService.php
+++ b/app/service/PluginsService.php
@@ -321,7 +321,7 @@ class PluginsService
{
return DataReturn('应用未启用['.$plugins.']', -11);
}
- return DataReturn('验证成功', 0);
+ return DataReturn(MyLang('check_success'), 0);
}
/**
diff --git a/app/service/QuickNavService.php b/app/service/QuickNavService.php
index 2dee5b285..5702f3594 100755
--- a/app/service/QuickNavService.php
+++ b/app/service/QuickNavService.php
@@ -46,32 +46,32 @@ class QuickNavService
'checked_type' => 'in',
'key_name' => 'platform',
'checked_data' => array_column(MyLang('common_platform_type'), 'value'),
- 'error_msg' => '平台类型有误',
+ 'error_msg' => MyLang('form_platform_message'),
],
[
'checked_type' => 'in',
'key_name' => 'event_type',
'checked_data' => array_column(MyLang('common_app_event_type'), 'value'),
- 'is_checked' => 2,
- 'error_msg' => '事件值类型有误',
+ 'is_checked' => 1,
+ 'error_msg' => MyLang('form_event_type_message'),
],
[
'checked_type' => 'length',
'key_name' => 'event_value',
'checked_data' => '255',
- 'error_msg' => '事件值最多 255 个字符',
+ 'error_msg' => MyLang('form_event_value_message'),
],
[
'checked_type' => 'empty',
'key_name' => 'images_url',
'checked_data' => '255',
- 'error_msg' => '请上传图片',
+ 'error_msg' => MyLang('form_upload_images_message'),
],
[
'checked_type' => 'length',
'key_name' => 'sort',
'checked_data' => '3',
- 'error_msg' => '顺序 0~255 之间的数值',
+ 'error_msg' => MyLang('form_sort_message'),
],
];
$ret = ParamsChecked($params, $p);
@@ -128,7 +128,7 @@ class QuickNavService
// 参数是否有误
if(empty($params['ids']))
{
- return DataReturn('操作id有误', -1);
+ return DataReturn(MyLang('data_id_error_tips'), -1);
}
// 是否数组
if(!is_array($params['ids']))
@@ -160,7 +160,7 @@ class QuickNavService
[
'checked_type' => 'empty',
'key_name' => 'id',
- 'error_msg' => '操作id有误',
+ 'error_msg' => MyLang('data_id_error_tips'),
],
[
'checked_type' => 'empty',
@@ -171,7 +171,7 @@ class QuickNavService
'checked_type' => 'in',
'key_name' => 'state',
'checked_data' => [0,1],
- 'error_msg' => '状态有误',
+ 'error_msg' => MyLang('form_status_range_message'),
],
];
$ret = ParamsChecked($params, $p);
diff --git a/app/service/ResourcesService.php b/app/service/ResourcesService.php
index 1a8347099..9e6900bf3 100755
--- a/app/service/ResourcesService.php
+++ b/app/service/ResourcesService.php
@@ -401,7 +401,7 @@ class ResourcesService
[
'checked_type' => 'empty',
'key_name' => 'id',
- 'error_msg' => '操作id有误',
+ 'error_msg' => MyLang('data_id_error_tips'),
]
];
$ret = ParamsChecked($params, $p);
@@ -414,7 +414,7 @@ class ResourcesService
$data = Db::name('Attachment')->find(intval($params['id']));
if(empty($data))
{
- return DataReturn('数据不存在或已删除', -1);
+ return DataReturn(MyLang('data_no_exist_or_delete_error_tips'), -1);
}
// 删除文件
diff --git a/app/service/SafetyService.php b/app/service/SafetyService.php
index 87d5c8f88..1ccedb420 100755
--- a/app/service/SafetyService.php
+++ b/app/service/SafetyService.php
@@ -166,7 +166,7 @@ class SafetyService
{
if(empty($params['verify']))
{
- return DataReturn('参数错误', -10);
+ return DataReturn(MyLang('params_error_tips'), -10);
}
$verify = new \base\Verify($verify_params);
if(!$verify->CheckExpire())
diff --git a/app/service/SlideService.php b/app/service/SlideService.php
index 5e573ee55..4a9ddf861 100755
--- a/app/service/SlideService.php
+++ b/app/service/SlideService.php
@@ -45,32 +45,32 @@ class SlideService
'checked_type' => 'in',
'key_name' => 'platform',
'checked_data' => array_column(MyLang('common_platform_type'), 'value'),
- 'error_msg' => '平台类型有误',
+ 'error_msg' => MyLang('form_platform_message'),
],
[
'checked_type' => 'in',
'key_name' => 'event_type',
'checked_data' => array_column(MyLang('common_app_event_type'), 'value'),
- 'is_checked' => 2,
- 'error_msg' => '事件值类型有误',
+ 'is_checked' => 1,
+ 'error_msg' => MyLang('form_event_type_message'),
],
[
'checked_type' => 'length',
'key_name' => 'event_value',
'checked_data' => '255',
- 'error_msg' => '事件值最多 255 个字符',
+ 'error_msg' => MyLang('form_event_value_message'),
],
[
'checked_type' => 'empty',
'key_name' => 'images_url',
'checked_data' => '255',
- 'error_msg' => '请上传图片',
+ 'error_msg' => MyLang('form_upload_images_message'),
],
[
'checked_type' => 'length',
'key_name' => 'sort',
'checked_data' => '3',
- 'error_msg' => '顺序 0~255 之间的数值',
+ 'error_msg' => MyLang('form_sort_message'),
],
];
$ret = ParamsChecked($params, $p);
@@ -127,7 +127,7 @@ class SlideService
// 参数是否有误
if(empty($params['ids']))
{
- return DataReturn('商品id有误', -1);
+ return DataReturn(MyLang('data_id_error_tips'), -1);
}
// 是否数组
if(!is_array($params['ids']))
@@ -159,7 +159,7 @@ class SlideService
[
'checked_type' => 'empty',
'key_name' => 'id',
- 'error_msg' => '操作id有误',
+ 'error_msg' => MyLang('data_id_error_tips'),
],
[
'checked_type' => 'empty',
@@ -170,7 +170,7 @@ class SlideService
'checked_type' => 'in',
'key_name' => 'state',
'checked_data' => [0,1],
- 'error_msg' => '状态有误',
+ 'error_msg' => MyLang('form_status_range_message'),
],
];
$ret = ParamsChecked($params, $p);
diff --git a/app/service/StoreService.php b/app/service/StoreService.php
index 8e1ba8aae..1ca4dd583 100644
--- a/app/service/StoreService.php
+++ b/app/service/StoreService.php
@@ -186,7 +186,7 @@ class StoreService
$cache_time = (empty($res['data']['base']) || empty($res['data']['base']['cache_time'])) ? 3600 : intval($res['data']['base']['cache_time']);
MyCache(self::$site_store_info_key, $res['data'], $cache_time);
- return DataReturn('绑定成功', 0);
+ return DataReturn(MyLang('bind_success'), 0);
}
return $res;
}
diff --git a/app/service/SystemUpgradeService.php b/app/service/SystemUpgradeService.php
index bbcd4d508..a72dd8602 100644
--- a/app/service/SystemUpgradeService.php
+++ b/app/service/SystemUpgradeService.php
@@ -321,7 +321,7 @@ class SystemUpgradeService
if(!empty($ret) && isset($ret['code']) && $ret['code'] == 0)
{
MySession(self::$package_url_key, $ret['data']);
- return DataReturn('获取成功', 0);
+ return DataReturn(MyLang('get_success'), 0);
}
return $ret;
}
diff --git a/app/service/ThemeService.php b/app/service/ThemeService.php
index 1bb871593..9124d6656 100755
--- a/app/service/ThemeService.php
+++ b/app/service/ThemeService.php
@@ -238,7 +238,7 @@ class ThemeService
{
return DataReturn('无效的主题包', -1);
}
- return DataReturn('安装成功', 0);
+ return DataReturn(MyLang('install_success'), 0);
}
/**
@@ -289,7 +289,7 @@ class ThemeService
{
return DataReturn(MyLang('delete_success'), 0);
}
- return DataReturn('删除失败或资源不存在', -100);
+ return DataReturn(MyLang('delete_fail'), -100);
}
/**
diff --git a/app/service/UserAddressService.php b/app/service/UserAddressService.php
index cc1bc8a40..00b54a0ac 100644
--- a/app/service/UserAddressService.php
+++ b/app/service/UserAddressService.php
@@ -59,7 +59,7 @@ class UserAddressService
// 参数是否有误
if(empty($params['ids']))
{
- return DataReturn('操作id有误', -1);
+ return DataReturn(MyLang('data_id_error_tips'), -1);
}
// 是否数组
if(!is_array($params['ids']))
@@ -305,7 +305,7 @@ class UserAddressService
'user_id' => $params['user']['id'],
]);
- return DataReturn('获取成功', 0, $data);
+ return DataReturn(MyLang('get_success'), 0, $data);
}
/**
@@ -529,7 +529,7 @@ class UserAddressService
return DataReturn(MyLang('delete_success'), 0);
} else {
- return DataReturn('删除失败或资源不存在', -100);
+ return DataReturn(MyLang('delete_fail'), -100);
}
}
@@ -583,11 +583,11 @@ class UserAddressService
// 提交事务
Db::commit();
- return DataReturn('设置成功', 0);
+ return DataReturn(MyLang('setup_success'), 0);
} else {
// 回滚事务
Db::rollback();
- return DataReturn('设置失败', -100);
+ return DataReturn(MyLang('setup_fail'), -100);
}
}
diff --git a/app/service/UserService.php b/app/service/UserService.php
index d53b7c4c5..e629467d8 100755
--- a/app/service/UserService.php
+++ b/app/service/UserService.php
@@ -515,7 +515,7 @@ class UserService
// 参数是否有误
if(empty($params['ids']))
{
- return DataReturn('商品id有误', -1);
+ return DataReturn(MyLang('data_id_error_tips'), -1);
}
// 是否数组
if(!is_array($params['ids']))
@@ -1061,7 +1061,7 @@ class UserService
'body_html' => is_array($body_html) ? implode(' ', $body_html) : $body_html,
];
}
- return DataReturn('登录成功', 0, $result);
+ return DataReturn(MyLang('login_success'), 0, $result);
}
return DataReturn(MyLang('login_failure_tips'), -100);
}
@@ -1610,7 +1610,7 @@ class UserService
// 参数
if(empty($params['accounts']))
{
- return DataReturn('参数错误', -10);
+ return DataReturn(MyLang('params_error_tips'), -10);
}
// 验证码基础参数
@@ -1934,7 +1934,7 @@ class UserService
];
if(Db::name('User')->where(['id'=>$user['id']])->update($upd_data))
{
- return DataReturn('绑定成功', 0, self::AppUserInfoHandle($user['id']));
+ return DataReturn(MyLang('bind_success'), 0, self::AppUserInfoHandle($user['id']));
}
} else {
if($user['id'] != $temp['id'])
@@ -1986,7 +1986,7 @@ class UserService
}
if(Db::name('User')->where(['id'=>$user_unionid['id']])->update($upd_data))
{
- return DataReturn('绑定成功', 0, self::AppUserInfoHandle($user_unionid['id']));
+ return DataReturn(MyLang('bind_success'), 0, self::AppUserInfoHandle($user_unionid['id']));
}
}
@@ -2017,7 +2017,7 @@ class UserService
}
if(Db::name('User')->where(['id'=>$user['id']])->update($upd_data))
{
- return DataReturn('绑定成功', 0, self::AppUserInfoHandle($user['id']));
+ return DataReturn(MyLang('bind_success'), 0, self::AppUserInfoHandle($user['id']));
}
} else {
$is_insert_user = true;
@@ -2649,9 +2649,9 @@ class UserService
{
// 清除验证码
$obj->Remove();
- return DataReturn('绑定成功', 0, self::AppUserInfoHandle($user_id));
+ return DataReturn(MyLang('bind_success'), 0, self::AppUserInfoHandle($user_id));
}
- return DataReturn('绑定失败', -100);
+ return DataReturn(MyLang('bind_fail'), -100);
}
/**
@@ -2774,7 +2774,7 @@ class UserService
'body_html' => is_array($body_html) ? implode(' ', $body_html) : $body_html,
];
- return DataReturn('退出成功', 0, $result);
+ return DataReturn(MyLang('quit_success'), 0, $result);
}
/**
diff --git a/app/service/WarehouseGoodsService.php b/app/service/WarehouseGoodsService.php
index 88a12f755..9b1171fe2 100644
--- a/app/service/WarehouseGoodsService.php
+++ b/app/service/WarehouseGoodsService.php
@@ -148,7 +148,7 @@ class WarehouseGoodsService
// 参数是否有误
if(empty($params['ids']))
{
- return DataReturn('商品id有误', -1);
+ return DataReturn(MyLang('data_id_error_tips'), -1);
}
// 是否数组
if(!is_array($params['ids']))
@@ -213,7 +213,7 @@ class WarehouseGoodsService
[
'checked_type' => 'empty',
'key_name' => 'id',
- 'error_msg' => '操作id有误',
+ 'error_msg' => MyLang('data_id_error_tips'),
],
[
'checked_type' => 'empty',
@@ -224,7 +224,7 @@ class WarehouseGoodsService
'checked_type' => 'in',
'key_name' => 'state',
'checked_data' => [0,1],
- 'error_msg' => '状态有误',
+ 'error_msg' => MyLang('form_status_range_message'),
],
];
$ret = ParamsChecked($params, $p);
@@ -238,7 +238,7 @@ class WarehouseGoodsService
$warehouse_goods = Db::name('WarehouseGoods')->where($where)->find();
if(empty($warehouse_goods))
{
- return DataReturn('数据不存在', -1);
+ return DataReturn(MyLang('data_no_exist_error_tips'), -1);
}
// 启动事务
diff --git a/app/service/WarehouseService.php b/app/service/WarehouseService.php
index 1d3453050..1befdef5c 100644
--- a/app/service/WarehouseService.php
+++ b/app/service/WarehouseService.php
@@ -280,7 +280,7 @@ class WarehouseService
// 参数是否有误
if(empty($params['ids']))
{
- return DataReturn('数据id有误', -1);
+ return DataReturn(MyLang('data_id_error_tips'), -1);
}
// 是否数组
if(!is_array($params['ids']))
@@ -329,7 +329,7 @@ class WarehouseService
[
'checked_type' => 'empty',
'key_name' => 'id',
- 'error_msg' => '操作id有误',
+ 'error_msg' => MyLang('data_id_error_tips'),
],
[
'checked_type' => 'empty',
@@ -340,7 +340,7 @@ class WarehouseService
'checked_type' => 'in',
'key_name' => 'state',
'checked_data' => [0,1],
- 'error_msg' => '状态有误',
+ 'error_msg' => MyLang('form_status_range_message'),
],
];
$ret = ParamsChecked($params, $p);