diff --git a/application/admin/controller/Admin.php b/application/admin/controller/Admin.php index b2b5075f8..b9df509b3 100755 --- a/application/admin/controller/Admin.php +++ b/application/admin/controller/Admin.php @@ -150,7 +150,7 @@ class Admin extends Common // 是否ajax if(!IS_AJAX) { - return $this->error(lang('common_unauthorized_access')); + return $this->error('非法访问'); } // 开始操作 @@ -178,7 +178,7 @@ class Admin extends Common // 是否ajax if(!IS_AJAX) { - return $this->error(lang('common_unauthorized_access')); + return $this->error('非法访问'); } // 开始操作 @@ -218,7 +218,7 @@ class Admin extends Common // 是否ajax if(!IS_AJAX) { - return $this->error(lang('common_unauthorized_access')); + return $this->error('非法访问'); } // 开始操作 diff --git a/application/admin/controller/AlipayLife.php b/application/admin/controller/AlipayLife.php index e4db427a7..7a7e61232 100755 --- a/application/admin/controller/AlipayLife.php +++ b/application/admin/controller/AlipayLife.php @@ -198,7 +198,7 @@ class AlipayLife extends Common // 是否ajax请求 if(!IS_AJAX) { - $this->error(lang('common_unauthorized_access')); + $this->error('非法访问'); } // 图片 @@ -241,18 +241,18 @@ class AlipayLife extends Common if($alipay_life_id) { $status = true; - $msg = lang('common_operation_add_success'); + $msg = '新增成功'; } else { - $msg = lang('common_operation_add_error'); + $msg = '新增失败'; } } else { // 更新数据库 if($m->where(array('id'=>$alipay_life_id))->save()) { $status = true; - $msg = lang('common_operation_edit_success'); + $msg = '编辑成功'; } else { - $msg = lang('common_operation_edit_error'); + $msg = '编辑失败或数据未改变'; } } } else { @@ -276,7 +276,7 @@ class AlipayLife extends Common // 回滚事务 $m->rollback(); - $this->ajaxReturn(lang('alipay_life_save_category_error'), -10); + $this->ajaxReturn('分类添加失败', -10); } } else { // 回滚事务 @@ -300,7 +300,7 @@ class AlipayLife extends Common { if(!IS_AJAX) { - $this->error(lang('common_unauthorized_access')); + $this->error('非法访问'); } $m = D('AlipayLife'); @@ -311,9 +311,9 @@ class AlipayLife extends Common // 删除 if($m->delete($id)) { - $this->ajaxReturn(lang('common_operation_delete_success')); + $this->ajaxReturn('删除成功'); } else { - $this->ajaxReturn(lang('common_operation_delete_error'), -100); + $this->ajaxReturn('删除失败或资源不存在', -100); } } else { $this->ajaxReturn($m->getError(), -1); @@ -332,7 +332,7 @@ class AlipayLife extends Common // 是否ajax请求 if(!IS_AJAX) { - $this->error(lang('common_unauthorized_access')); + $this->error('非法访问'); } // 开始处理 diff --git a/application/admin/controller/AlipayLifeCategory.php b/application/admin/controller/AlipayLifeCategory.php index 1fc3ef25b..e2849e3c9 100755 --- a/application/admin/controller/AlipayLifeCategory.php +++ b/application/admin/controller/AlipayLifeCategory.php @@ -55,7 +55,7 @@ class AlipayLifeCategory extends Common // 是否ajax请求 if(!IS_AJAX) { - $this->error(lang('common_unauthorized_access')); + $this->error('非法访问'); } // 获取数据 @@ -71,7 +71,7 @@ class AlipayLifeCategory extends Common $data[$k]['json'] = json_encode($v); } } - $msg = empty($data) ? lang('common_not_data_tips') : lang('common_operation_success'); + $msg = empty($data) ? '没有相关数据' : '操作成功'; $this->ajaxReturn($msg, 0, $data); } @@ -105,7 +105,7 @@ class AlipayLifeCategory extends Common // 是否ajax请求 if(!IS_AJAX) { - $this->error(lang('common_unauthorized_access')); + $this->error('非法访问'); } // id为空则表示是新增 @@ -126,9 +126,9 @@ class AlipayLifeCategory extends Common // 写入数据库 if($m->add()) { - $this->ajaxReturn(lang('common_operation_add_success')); + $this->ajaxReturn('新增成功'); } else { - $this->ajaxReturn(lang('common_operation_add_error'), -100); + $this->ajaxReturn('新增失败', -100); } } } else { @@ -145,9 +145,9 @@ class AlipayLifeCategory extends Common // 更新数据库 if($m->where(array('id'=>I('id')))->save()) { - $this->ajaxReturn(lang('common_operation_edit_success')); + $this->ajaxReturn('编辑成功'); } else { - $this->ajaxReturn(lang('common_operation_edit_error'), -100); + $this->ajaxReturn('编辑失败或数据未改变', -100); } } } @@ -165,7 +165,7 @@ class AlipayLifeCategory extends Common { if(!IS_AJAX) { - $this->error(lang('common_unauthorized_access')); + $this->error('非法访问'); } $m = D('AlipayLifeCategory'); @@ -173,9 +173,9 @@ class AlipayLifeCategory extends Common { if($m->delete(I('id'))) { - $this->ajaxReturn(lang('common_operation_delete_success')); + $this->ajaxReturn('删除成功'); } else { - $this->ajaxReturn(lang('common_operation_delete_error'), -100); + $this->ajaxReturn('删除失败或资源不存在', -100); } } else { $this->ajaxReturn($m->getError(), -1); diff --git a/application/admin/controller/AlipayLifeMenu.php b/application/admin/controller/AlipayLifeMenu.php index ca01b5e55..829a875bc 100755 --- a/application/admin/controller/AlipayLifeMenu.php +++ b/application/admin/controller/AlipayLifeMenu.php @@ -337,7 +337,7 @@ class AlipayLifeMenu extends Common // 是否ajax请求 if(!IS_AJAX) { - $this->error(lang('common_unauthorized_access')); + $this->error('非法访问'); } $ret = AlipayLifeService::MenuSave($_POST); @@ -356,7 +356,7 @@ class AlipayLifeMenu extends Common // 是否ajax请求 if(!IS_AJAX) { - $this->error(lang('common_unauthorized_access')); + $this->error('非法访问'); } $ret = AlipayLifeService::MenuContentSave($_POST); @@ -375,7 +375,7 @@ class AlipayLifeMenu extends Common // 是否ajax请求 if(!IS_AJAX) { - $this->error(lang('common_unauthorized_access')); + $this->error('非法访问'); } // 删除 @@ -385,10 +385,10 @@ class AlipayLifeMenu extends Common if($m->delete($id) && db('AlipayLifeMenuContent')->where(['alipay_life_message_id'=>$id])->delete()) { $m->commit(); - $this->ajaxReturn(lang('common_operation_delete_success')); + $this->ajaxReturn('删除成功'); } $m->rollback(); - $this->ajaxReturn(lang('common_operation_delete_error'), -100); + $this->ajaxReturn('删除失败或资源不存在', -100); } /** @@ -403,15 +403,15 @@ class AlipayLifeMenu extends Common // 是否ajax请求 if(!IS_AJAX) { - $this->error(lang('common_unauthorized_access')); + $this->error('非法访问'); } // 删除 if(db('AlipayLifeMenuContent')->delete(intval(I('id')))) { - $this->ajaxReturn(lang('common_operation_delete_success')); + $this->ajaxReturn('删除成功'); } - $this->ajaxReturn(lang('common_operation_delete_error'), -100); + $this->ajaxReturn('删除失败或资源不存在', -100); } /** @@ -427,7 +427,7 @@ class AlipayLifeMenu extends Common // 是否ajax请求 if(!IS_AJAX) { - $this->error(lang('common_unauthorized_access')); + $this->error('非法访问'); } $ret = AlipayLifeService::MenuSubmit($_POST); @@ -447,7 +447,7 @@ class AlipayLifeMenu extends Common // 是否ajax请求 if(!IS_AJAX) { - $this->error(lang('common_unauthorized_access')); + $this->error('非法访问'); } $ret = AlipayLifeService::AlipayLifeSearch($_POST); diff --git a/application/admin/controller/AlipayLifeMessage.php b/application/admin/controller/AlipayLifeMessage.php index 491bf4f1c..176ea62f0 100755 --- a/application/admin/controller/AlipayLifeMessage.php +++ b/application/admin/controller/AlipayLifeMessage.php @@ -375,7 +375,7 @@ class AlipayLifeMessage extends Common // 是否ajax请求 if(!IS_AJAX) { - $this->error(lang('common_unauthorized_access')); + $this->error('非法访问'); } $ret = AlipayLifeService::MessageSave($_POST); @@ -394,7 +394,7 @@ class AlipayLifeMessage extends Common // 是否ajax请求 if(!IS_AJAX) { - $this->error(lang('common_unauthorized_access')); + $this->error('非法访问'); } $ret = AlipayLifeService::MessageContentSave($_POST); @@ -413,7 +413,7 @@ class AlipayLifeMessage extends Common // 是否ajax请求 if(!IS_AJAX) { - $this->error(lang('common_unauthorized_access')); + $this->error('非法访问'); } // 删除 @@ -423,10 +423,10 @@ class AlipayLifeMessage extends Common if($m->delete($id) && db('AlipayLifeMessageContent')->where(['alipay_life_message_id'=>$id])->delete()) { $m->commit(); - $this->ajaxReturn(lang('common_operation_delete_success')); + $this->ajaxReturn('删除成功'); } $m->rollback(); - $this->ajaxReturn(lang('common_operation_delete_error'), -100); + $this->ajaxReturn('删除失败或资源不存在', -100); } /** @@ -441,15 +441,15 @@ class AlipayLifeMessage extends Common // 是否ajax请求 if(!IS_AJAX) { - $this->error(lang('common_unauthorized_access')); + $this->error('非法访问'); } // 删除 if(db('AlipayLifeMessageContent')->delete(intval(I('id')))) { - $this->ajaxReturn(lang('common_operation_delete_success')); + $this->ajaxReturn('删除成功'); } - $this->ajaxReturn(lang('common_operation_delete_error'), -100); + $this->ajaxReturn('删除失败或资源不存在', -100); } /** @@ -465,7 +465,7 @@ class AlipayLifeMessage extends Common // 是否ajax请求 if(!IS_AJAX) { - $this->error(lang('common_unauthorized_access')); + $this->error('非法访问'); } $ret = AlipayLifeService::MessageSubmit($_POST); @@ -485,7 +485,7 @@ class AlipayLifeMessage extends Common // 是否ajax请求 if(!IS_AJAX) { - $this->error(lang('common_unauthorized_access')); + $this->error('非法访问'); } $ret = AlipayLifeService::AlipayLifeSearch($_POST); diff --git a/application/admin/controller/AlipayLifeStatus.php b/application/admin/controller/AlipayLifeStatus.php index 258b0b3b8..007a727c3 100755 --- a/application/admin/controller/AlipayLifeStatus.php +++ b/application/admin/controller/AlipayLifeStatus.php @@ -238,7 +238,7 @@ class AlipayLifeStatus extends Common // 是否ajax请求 if(!IS_AJAX) { - $this->error(lang('common_unauthorized_access')); + $this->error('非法访问'); } $ret = AlipayLifeService::LifeStatusSave($_POST); @@ -257,15 +257,15 @@ class AlipayLifeStatus extends Common // 是否ajax请求 if(!IS_AJAX) { - $this->error(lang('common_unauthorized_access')); + $this->error('非法访问'); } // 删除 if(db('AlipayLifeStatus')->delete(intval(I('id')))) { - $this->ajaxReturn(lang('common_operation_delete_success')); + $this->ajaxReturn('删除成功'); } - $this->ajaxReturn(lang('common_operation_delete_error'), -100); + $this->ajaxReturn('删除失败或资源不存在', -100); } /** @@ -281,7 +281,7 @@ class AlipayLifeStatus extends Common // 是否ajax请求 if(!IS_AJAX) { - $this->error(lang('common_unauthorized_access')); + $this->error('非法访问'); } $ret = AlipayLifeService::LifeStatusSubmit($_POST); @@ -301,7 +301,7 @@ class AlipayLifeStatus extends Common // 是否ajax请求 if(!IS_AJAX) { - $this->error(lang('common_unauthorized_access')); + $this->error('非法访问'); } $params = $_POST; diff --git a/application/admin/controller/Answer.php b/application/admin/controller/Answer.php index bd0cb7388..ca037b2f2 100755 --- a/application/admin/controller/Answer.php +++ b/application/admin/controller/Answer.php @@ -177,7 +177,7 @@ class Answer extends Common // 是否ajax请求 if(!IS_AJAX) { - $this->error(lang('common_unauthorized_access')); + $this->error('非法访问'); } // 参数处理 @@ -193,18 +193,18 @@ class Answer extends Common $merchant = $m->where(array('id'=>$id))->getField('id'); if(empty($merchant)) { - $this->ajaxReturn(lang('common_data_no_exist_error'), -2); + $this->ajaxReturn('资源不存在或已被删除', -2); } // 删除问答 if($m->where(array('id'=>$id))->save(['is_delete_time'=>time()]) !== false) { - $this->ajaxReturn(lang('common_operation_delete_success')); + $this->ajaxReturn('删除成功'); } else { - $this->ajaxReturn(lang('common_operation_delete_error'), -100); + $this->ajaxReturn('删除失败或资源不存在', -100); } } else { - $this->ajaxReturn(lang('common_param_error'), -1); + $this->ajaxReturn('参数错误', -1); } } @@ -220,7 +220,7 @@ class Answer extends Common // 是否ajax请求 if(!IS_AJAX) { - $this->error(lang('common_unauthorized_access')); + $this->error('非法访问'); } // 参数处理 @@ -228,11 +228,11 @@ class Answer extends Common $reply = I('reply'); if(empty($id)) { - $this->ajaxReturn(lang('common_param_error'), -1); + $this->ajaxReturn('参数错误', -1); } if(empty($reply)) { - $this->ajaxReturn(lang('answer_reply_format'), -2); + $this->ajaxReturn('回复内容格式 2~230 个字符', -2); } // 问答模型 @@ -242,15 +242,15 @@ class Answer extends Common $temp = $m->where(array('id'=>$id))->field('id')->find(); if(empty($temp)) { - $this->ajaxReturn(lang('common_data_no_exist_error'), -2); + $this->ajaxReturn('资源不存在或已被删除', -2); } // 更新问答 $data = array('reply'=>$reply, 'is_reply'=>1, 'upd_time'=>time()); if($m->where(array('id'=>$id))->save($data) !== false) { - $this->ajaxReturn(lang('common_operation_success')); + $this->ajaxReturn('操作成功'); } else { - $this->ajaxReturn(lang('common_operation_error'), -100); + $this->ajaxReturn('操作失败', -100); } } @@ -266,15 +266,15 @@ class Answer extends Common // 参数 if(empty($_POST['id']) || !isset($_POST['state'])) { - $this->ajaxReturn(lang('common_param_error'), -1); + $this->ajaxReturn('参数错误', -1); } // 数据更新 if(db('Answer')->where(array('id'=>I('id')))->save(array('is_show'=>I('state')))) { - $this->ajaxReturn(lang('common_operation_edit_success')); + $this->ajaxReturn('编辑成功'); } else { - $this->ajaxReturn(lang('common_operation_edit_error'), -100); + $this->ajaxReturn('编辑失败或数据未改变', -100); } } } diff --git a/application/admin/controller/AppHomeNav.php b/application/admin/controller/AppHomeNav.php index ad49bf0b3..5bc0917b3 100755 --- a/application/admin/controller/AppHomeNav.php +++ b/application/admin/controller/AppHomeNav.php @@ -205,7 +205,7 @@ class AppHomeNav extends Common // 是否ajax请求 if(!IS_AJAX) { - $this->error(lang('common_unauthorized_access')); + $this->error('非法访问'); } // 图片 @@ -251,9 +251,9 @@ class AppHomeNav extends Common // 数据添加 if($m->add()) { - $this->ajaxReturn(lang('common_operation_add_success')); + $this->ajaxReturn('新增成功'); } else { - $this->ajaxReturn(lang('common_operation_add_error'), -100); + $this->ajaxReturn('新增失败', -100); } } else { $this->ajaxReturn($m->getError(), -1); @@ -289,9 +289,9 @@ class AppHomeNav extends Common // 更新数据库 if($m->where(array('id'=>I('id')))->save()) { - $this->ajaxReturn(lang('common_operation_edit_success')); + $this->ajaxReturn('编辑成功'); } else { - $this->ajaxReturn(lang('common_operation_edit_error'), -100); + $this->ajaxReturn('编辑失败或数据未改变', -100); } } else { $this->ajaxReturn($m->getError(), -1); @@ -310,7 +310,7 @@ class AppHomeNav extends Common // 是否ajax请求 if(!IS_AJAX) { - $this->error(lang('common_unauthorized_access')); + $this->error('非法访问'); } // 参数处理 @@ -326,7 +326,7 @@ class AppHomeNav extends Common $data = $m->find($id); if(empty($data)) { - $this->ajaxReturn(lang('common_data_no_exist_error'), -2); + $this->ajaxReturn('资源不存在或已被删除', -2); } if($data['is_enable'] == 1) { @@ -336,12 +336,12 @@ class AppHomeNav extends Common // 删除 if($m->where(array('id'=>$id))->delete() !== false) { - $this->ajaxReturn(lang('common_operation_delete_success')); + $this->ajaxReturn('删除成功'); } else { - $this->ajaxReturn(lang('common_operation_delete_error'), -100); + $this->ajaxReturn('删除失败或资源不存在', -100); } } else { - $this->ajaxReturn(lang('common_param_error'), -1); + $this->ajaxReturn('参数错误', -1); } } @@ -357,15 +357,15 @@ class AppHomeNav extends Common // 参数 if(empty($_POST['id']) || !isset($_POST['state'])) { - $this->ajaxReturn(lang('common_param_error'), -1); + $this->ajaxReturn('参数错误', -1); } // 数据更新 if(db('AppHomeNav')->where(array('id'=>I('id')))->save(array('is_enable'=>I('state')))) { - $this->ajaxReturn(lang('common_operation_edit_success')); + $this->ajaxReturn('编辑成功'); } else { - $this->ajaxReturn(lang('common_operation_edit_error'), -100); + $this->ajaxReturn('编辑失败或数据未改变', -100); } } } diff --git a/application/admin/controller/AppMiniAlipayList.php b/application/admin/controller/AppMiniAlipayList.php index 9af4792fc..3bb3f9363 100755 --- a/application/admin/controller/AppMiniAlipayList.php +++ b/application/admin/controller/AppMiniAlipayList.php @@ -102,7 +102,7 @@ class AppMiniAlipayList extends Common $app_mini_alipay_describe = MyC('common_app_mini_alipay_describe'); if(empty($app_mini_alipay_title) || empty($app_mini_alipay_describe)) { - $this->ajaxReturn(lang('appmini_alipaylist_config_error'), -1); + $this->ajaxReturn('配置信息不能为空', -1); } // 目录不存在则创建 @@ -112,13 +112,13 @@ class AppMiniAlipayList extends Common $new_dir = $this->new_path.DS.date('YmdHis'); if(\base\FileUtil::CopyDir($this->old_path, $new_dir) != true) { - $this->ajaxReturn(lang('appmini_alipaylist_created_copy_error'), -2); + $this->ajaxReturn('项目包复制失败', -2); } // 校验基础文件是否存在 if(!file_exists($new_dir.DS.'app.js') || !file_exists($new_dir.DS.'app.json')) { - $this->ajaxReturn(lang('appmini_alipaylist_file_error'), -3); + $this->ajaxReturn('包基础文件不存在,请重新生成', -3); } // 替换内容 @@ -126,27 +126,27 @@ class AppMiniAlipayList extends Common file_put_contents($new_dir.DS.'app.js', str_replace(['{{request_url}}', '{{application_title}}', '{{application_describe}}'], [__MY_URL__, $app_mini_alipay_title, $app_mini_alipay_describe], file_get_contents($new_dir.DS.'app.js'))); if($status === false) { - $this->ajaxReturn(lang('appmini_alipaylist_file_replace_error'), -4); + $this->ajaxReturn('基础配置替换失败', -4); } // app.json $status = file_put_contents($new_dir.DS.'app.json', str_replace(['{{application_title}}'], [$app_mini_alipay_title], file_get_contents($new_dir.DS.'app.json'))); if($status === false) { - $this->ajaxReturn(lang('appmini_alipaylist_file_replace_error'), -4); + $this->ajaxReturn('基础配置替换失败', -4); } // 生成压缩包 $zip = new \base\ZipFolder(); if(!$zip->zip($new_dir.'.zip', $new_dir)) { - $this->ajaxReturn(lang('appmini_alipaylist_zip_error'), -100); + $this->ajaxReturn('压缩包生成失败', -100); } // 生成成功删除目录 \base\FileUtil::UnlinkDir($new_dir); - $this->ajaxReturn(lang('common_operation_created_success'), 0); + $this->ajaxReturn('生成成功', 0); } /** @@ -161,7 +161,7 @@ class AppMiniAlipayList extends Common // 是否ajax if(!IS_AJAX) { - $this->error(lang('common_unauthorized_access')); + $this->error('非法访问'); } // 删除压缩包 @@ -174,9 +174,9 @@ class AppMiniAlipayList extends Common } if($status) { - $this->ajaxReturn(lang('common_operation_delete_success')); + $this->ajaxReturn('删除成功'); } else { - $this->ajaxReturn(lang('common_operation_delete_error'), -100); + $this->ajaxReturn('删除失败或资源不存在', -100); } } } diff --git a/application/admin/controller/AppSlide.php b/application/admin/controller/AppSlide.php index 4e83a4ed5..3ba5b8ce5 100755 --- a/application/admin/controller/AppSlide.php +++ b/application/admin/controller/AppSlide.php @@ -204,7 +204,7 @@ class AppSlide extends Common // 是否ajax请求 if(!IS_AJAX) { - $this->error(lang('common_unauthorized_access')); + $this->error('非法访问'); } // 图片 @@ -249,9 +249,9 @@ class AppSlide extends Common // 数据添加 if($m->add()) { - $this->ajaxReturn(lang('common_operation_add_success')); + $this->ajaxReturn('新增成功'); } else { - $this->ajaxReturn(lang('common_operation_add_error'), -100); + $this->ajaxReturn('新增失败', -100); } } else { $this->ajaxReturn($m->getError(), -1); @@ -286,9 +286,9 @@ class AppSlide extends Common // 更新数据库 if($m->where(array('id'=>I('id')))->save()) { - $this->ajaxReturn(lang('common_operation_edit_success')); + $this->ajaxReturn('编辑成功'); } else { - $this->ajaxReturn(lang('common_operation_edit_error'), -100); + $this->ajaxReturn('编辑失败或数据未改变', -100); } } else { $this->ajaxReturn($m->getError(), -1); @@ -307,7 +307,7 @@ class AppSlide extends Common // 是否ajax请求 if(!IS_AJAX) { - $this->error(lang('common_unauthorized_access')); + $this->error('非法访问'); } // 参数处理 @@ -323,7 +323,7 @@ class AppSlide extends Common $data = $m->find($id); if(empty($data)) { - $this->ajaxReturn(lang('common_data_no_exist_error'), -2); + $this->ajaxReturn('资源不存在或已被删除', -2); } if($data['is_enable'] == 1) { @@ -333,12 +333,12 @@ class AppSlide extends Common // 删除 if($m->where(array('id'=>$id))->delete() !== false) { - $this->ajaxReturn(lang('common_operation_delete_success')); + $this->ajaxReturn('删除成功'); } else { - $this->ajaxReturn(lang('common_operation_delete_error'), -100); + $this->ajaxReturn('删除失败或资源不存在', -100); } } else { - $this->ajaxReturn(lang('common_param_error'), -1); + $this->ajaxReturn('参数错误', -1); } } @@ -354,15 +354,15 @@ class AppSlide extends Common // 参数 if(empty($_POST['id']) || !isset($_POST['state'])) { - $this->ajaxReturn(lang('common_param_error'), -1); + $this->ajaxReturn('参数错误', -1); } // 数据更新 if(db('AppSlide')->where(array('id'=>I('id')))->save(array('is_enable'=>I('state')))) { - $this->ajaxReturn(lang('common_operation_edit_success')); + $this->ajaxReturn('编辑成功'); } else { - $this->ajaxReturn(lang('common_operation_edit_error'), -100); + $this->ajaxReturn('编辑失败或数据未改变', -100); } } } diff --git a/application/admin/controller/Article.php b/application/admin/controller/Article.php index 58c727908..29d80abfc 100755 --- a/application/admin/controller/Article.php +++ b/application/admin/controller/Article.php @@ -210,7 +210,7 @@ class Article extends Common // 是否ajax请求 if(!IS_AJAX) { - $this->error(lang('common_unauthorized_access')); + $this->error('非法访问'); } // 数据处理 @@ -259,9 +259,9 @@ class Article extends Common // 数据添加 if($m->add()) { - $this->ajaxReturn(lang('common_operation_add_success')); + $this->ajaxReturn('新增成功'); } else { - $this->ajaxReturn(lang('common_operation_add_error'), -100); + $this->ajaxReturn('新增失败', -100); } } else { $this->ajaxReturn($m->getError(), -1); @@ -299,9 +299,9 @@ class Article extends Common // 数据更新 if($m->where(array('id'=>I('id')))->save()) { - $this->ajaxReturn(lang('common_operation_edit_success')); + $this->ajaxReturn('编辑成功'); } else { - $this->ajaxReturn(lang('common_operation_edit_error'), -100); + $this->ajaxReturn('编辑失败或数据未改变', -100); } } else { $this->ajaxReturn($m->getError(), -1); @@ -340,7 +340,7 @@ class Article extends Common // 是否ajax请求 if(!IS_AJAX) { - $this->error(lang('common_unauthorized_access')); + $this->error('非法访问'); } // 删除数据 @@ -349,12 +349,12 @@ class Article extends Common // 更新 if(db('Article')->delete(I('id'))) { - $this->ajaxReturn(lang('common_operation_delete_success')); + $this->ajaxReturn('删除成功'); } else { - $this->ajaxReturn(lang('common_operation_delete_error'), -100); + $this->ajaxReturn('删除失败或资源不存在', -100); } } else { - $this->ajaxReturn(lang('common_param_error'), -1); + $this->ajaxReturn('参数错误', -1); } } @@ -370,15 +370,15 @@ class Article extends Common // 参数 if(empty($_POST['id']) || !isset($_POST['state'])) { - $this->ajaxReturn(lang('common_param_error'), -1); + $this->ajaxReturn('参数错误', -1); } // 数据更新 if(db('Article')->where(array('id'=>I('id')))->save(array('is_enable'=>I('state')))) { - $this->ajaxReturn(lang('common_operation_edit_success')); + $this->ajaxReturn('编辑成功'); } else { - $this->ajaxReturn(lang('common_operation_edit_error'), -100); + $this->ajaxReturn('编辑失败或数据未改变', -100); } } @@ -394,15 +394,15 @@ class Article extends Common // 参数 if(empty($_POST['id']) || !isset($_POST['state'])) { - $this->ajaxReturn(lang('common_param_error'), -1); + $this->ajaxReturn('参数错误', -1); } // 数据更新 if(db('Article')->where(array('id'=>I('id')))->save(array('is_home_recommended'=>I('state')))) { - $this->ajaxReturn(lang('common_operation_edit_success')); + $this->ajaxReturn('编辑成功'); } else { - $this->ajaxReturn(lang('common_operation_edit_error'), -100); + $this->ajaxReturn('编辑失败或数据未改变', -100); } } } diff --git a/application/admin/controller/ArticleCategory.php b/application/admin/controller/ArticleCategory.php index 0a91e7307..3e4abc36a 100755 --- a/application/admin/controller/ArticleCategory.php +++ b/application/admin/controller/ArticleCategory.php @@ -55,7 +55,7 @@ class ArticleCategory extends Common // 是否ajax请求 if(!IS_AJAX) { - $this->error(lang('common_unauthorized_access')); + $this->error('非法访问'); } // 获取数据 @@ -71,7 +71,7 @@ class ArticleCategory extends Common $data[$k]['json'] = json_encode($v); } } - $msg = empty($data) ? lang('common_not_data_tips') : lang('common_operation_success'); + $msg = empty($data) ? '没有相关数据' : '操作成功'; $this->ajaxReturn($msg, 0, $data); } @@ -105,7 +105,7 @@ class ArticleCategory extends Common // 是否ajax请求 if(!IS_AJAX) { - $this->error(lang('common_unauthorized_access')); + $this->error('非法访问'); } // id为空则表示是新增 @@ -126,9 +126,9 @@ class ArticleCategory extends Common // 写入数据库 if($m->add()) { - $this->ajaxReturn(lang('common_operation_add_success')); + $this->ajaxReturn('新增成功'); } else { - $this->ajaxReturn(lang('common_operation_add_error'), -100); + $this->ajaxReturn('新增失败', -100); } } } else { @@ -145,9 +145,9 @@ class ArticleCategory extends Common // 更新数据库 if($m->where(array('id'=>I('id')))->save()) { - $this->ajaxReturn(lang('common_operation_edit_success')); + $this->ajaxReturn('编辑成功'); } else { - $this->ajaxReturn(lang('common_operation_edit_error'), -100); + $this->ajaxReturn('编辑失败或数据未改变', -100); } } } @@ -165,7 +165,7 @@ class ArticleCategory extends Common { if(!IS_AJAX) { - $this->error(lang('common_unauthorized_access')); + $this->error('非法访问'); } $m = D('ArticleCategory'); @@ -173,9 +173,9 @@ class ArticleCategory extends Common { if($m->delete(I('id'))) { - $this->ajaxReturn(lang('common_operation_delete_success')); + $this->ajaxReturn('删除成功'); } else { - $this->ajaxReturn(lang('common_operation_delete_error'), -100); + $this->ajaxReturn('删除失败或资源不存在', -100); } } else { $this->ajaxReturn($m->getError(), -1); diff --git a/application/admin/controller/Brand.php b/application/admin/controller/Brand.php index edb902520..297fc7626 100755 --- a/application/admin/controller/Brand.php +++ b/application/admin/controller/Brand.php @@ -194,7 +194,7 @@ class Brand extends Common // 是否ajax请求 if(!IS_AJAX) { - $this->error(lang('common_unauthorized_access')); + $this->error('非法访问'); } // 图片 @@ -221,9 +221,9 @@ class Brand extends Common // 写入数据库 if($m->add()) { - $this->ajaxReturn(lang('common_operation_add_success')); + $this->ajaxReturn('新增成功'); } else { - $this->ajaxReturn(lang('common_operation_add_error'), -100); + $this->ajaxReturn('新增失败', -100); } } } else { @@ -243,9 +243,9 @@ class Brand extends Common // 更新数据库 if($m->where(array('id'=>I('id')))->save()) { - $this->ajaxReturn(lang('common_operation_edit_success')); + $this->ajaxReturn('编辑成功'); } else { - $this->ajaxReturn(lang('common_operation_edit_error'), -100); + $this->ajaxReturn('编辑失败或数据未改变', -100); } } } @@ -263,7 +263,7 @@ class Brand extends Common { if(!IS_AJAX) { - $this->error(lang('common_unauthorized_access')); + $this->error('非法访问'); } $m = D('Brand'); @@ -274,9 +274,9 @@ class Brand extends Common // 删除 if($m->delete($id)) { - $this->ajaxReturn(lang('common_operation_delete_success')); + $this->ajaxReturn('删除成功'); } else { - $this->ajaxReturn(lang('common_operation_delete_error'), -100); + $this->ajaxReturn('删除失败或资源不存在', -100); } } else { $this->ajaxReturn($m->getError(), -1); @@ -295,15 +295,15 @@ class Brand extends Common // 参数 if(empty($_POST['id']) || !isset($_POST['state'])) { - $this->ajaxReturn(lang('common_param_error'), -1); + $this->ajaxReturn('参数错误', -1); } // 数据更新 if(db('Brand')->where(array('id'=>I('id')))->save(array('is_enable'=>I('state')))) { - $this->ajaxReturn(lang('common_operation_edit_success')); + $this->ajaxReturn('编辑成功'); } else { - $this->ajaxReturn(lang('common_operation_edit_error'), -100); + $this->ajaxReturn('编辑失败或数据未改变', -100); } } } diff --git a/application/admin/controller/BrandCategory.php b/application/admin/controller/BrandCategory.php index 1d0ebfa8f..3f380897a 100755 --- a/application/admin/controller/BrandCategory.php +++ b/application/admin/controller/BrandCategory.php @@ -55,7 +55,7 @@ class BrandCategory extends Common // 是否ajax请求 if(!IS_AJAX) { - $this->error(lang('common_unauthorized_access')); + $this->error('非法访问'); } // 获取数据 @@ -71,7 +71,7 @@ class BrandCategory extends Common $data[$k]['json'] = json_encode($v); } } - $msg = empty($data) ? lang('common_not_data_tips') : lang('common_operation_success'); + $msg = empty($data) ? '没有相关数据' : '操作成功'; $this->ajaxReturn($msg, 0, $data); } @@ -105,7 +105,7 @@ class BrandCategory extends Common // 是否ajax请求 if(!IS_AJAX) { - $this->error(lang('common_unauthorized_access')); + $this->error('非法访问'); } // id为空则表示是新增 @@ -126,9 +126,9 @@ class BrandCategory extends Common // 写入数据库 if($m->add()) { - $this->ajaxReturn(lang('common_operation_add_success')); + $this->ajaxReturn('新增成功'); } else { - $this->ajaxReturn(lang('common_operation_add_error'), -100); + $this->ajaxReturn('新增失败', -100); } } } else { @@ -145,9 +145,9 @@ class BrandCategory extends Common // 更新数据库 if($m->where(array('id'=>I('id')))->save()) { - $this->ajaxReturn(lang('common_operation_edit_success')); + $this->ajaxReturn('编辑成功'); } else { - $this->ajaxReturn(lang('common_operation_edit_error'), -100); + $this->ajaxReturn('编辑失败或数据未改变', -100); } } } @@ -165,7 +165,7 @@ class BrandCategory extends Common { if(!IS_AJAX) { - $this->error(lang('common_unauthorized_access')); + $this->error('非法访问'); } $m = D('BrandCategory'); @@ -173,9 +173,9 @@ class BrandCategory extends Common { if($m->delete(I('id'))) { - $this->ajaxReturn(lang('common_operation_delete_success')); + $this->ajaxReturn('删除成功'); } else { - $this->ajaxReturn(lang('common_operation_delete_error'), -100); + $this->ajaxReturn('删除失败或资源不存在', -100); } } else { $this->ajaxReturn($m->getError(), -1); diff --git a/application/admin/controller/Cache.php b/application/admin/controller/Cache.php index 1d9dedb68..06cd91c09 100755 --- a/application/admin/controller/Cache.php +++ b/application/admin/controller/Cache.php @@ -55,7 +55,7 @@ class Cache extends Common \base\FileUtil::UnlinkDir(TEMP_PATH); \base\FileUtil::UnlinkDir(DATA_PATH); \base\FileUtil::UnlinkFile(RUNTIME_PATH.'common~runtime.php'); - $this->success(lang('common_operation_update_success')); + $this->success('更新成功'); } /** @@ -70,7 +70,7 @@ class Cache extends Common // 模板 Cache \base\FileUtil::UnlinkDir(CACHE_PATH); - $this->success(lang('common_operation_update_success')); + $this->success('更新成功'); } /** @@ -82,7 +82,7 @@ class Cache extends Common */ public function ModuleUpdate() { - $this->success(lang('common_operation_update_success')); + $this->success('更新成功'); } } ?> \ No newline at end of file diff --git a/application/admin/controller/Common.php b/application/admin/controller/Common.php index c28664b89..8ca1d64ee 100755 --- a/application/admin/controller/Common.php +++ b/application/admin/controller/Common.php @@ -82,7 +82,7 @@ class Common extends Controller { if(IS_AJAX) { - exit(json_encode(DataReturn(lang('common_login_invalid'), -400))); + exit(json_encode(DataReturn('登录失效,请重新登录', -400))); } else { die(''); } @@ -147,7 +147,7 @@ class Common extends Controller // 角色组权限列表校验 if(!in_array(strtolower(request()->controller().'_'.request()->action()), $this->power)) { - return $this->error(lang('common_there_is_no_power')); + return $this->error('无权限'); } } } diff --git a/application/admin/controller/Coupon.php b/application/admin/controller/Coupon.php index 647facb01..ac465ae12 100755 --- a/application/admin/controller/Coupon.php +++ b/application/admin/controller/Coupon.php @@ -205,7 +205,7 @@ class Coupon extends Common // 是否ajax请求 if(!IS_AJAX) { - $this->error(lang('common_unauthorized_access')); + $this->error('非法访问'); } // 添加 @@ -256,9 +256,9 @@ class Coupon extends Common // 数据添加 if($m->add()) { - $this->ajaxReturn(lang('common_operation_add_success')); + $this->ajaxReturn('新增成功'); } else { - $this->ajaxReturn(lang('common_operation_add_error'), -100); + $this->ajaxReturn('新增失败', -100); } } else { $this->ajaxReturn($m->getError(), -1); @@ -302,9 +302,9 @@ class Coupon extends Common // 更新数据库 if($m->where(array('id'=>I('id')))->save()) { - $this->ajaxReturn(lang('common_operation_edit_success')); + $this->ajaxReturn('编辑成功'); } else { - $this->ajaxReturn(lang('common_operation_edit_error'), -100); + $this->ajaxReturn('编辑失败或数据未改变', -100); } } else { $this->ajaxReturn($m->getError(), -1); @@ -348,7 +348,7 @@ class Coupon extends Common // 是否ajax请求 if(!IS_AJAX) { - $this->error(lang('common_unauthorized_access')); + $this->error('非法访问'); } // 参数 @@ -371,13 +371,13 @@ class Coupon extends Common $user = db('User')->where($where)->field('id,username,nickname,mobile,avatar')->find(); if(empty($user)) { - $this->ajaxReturn(lang('common_not_data_tips'), -1); + $this->ajaxReturn('没有相关数据', -1); } if(empty($user['avatar'])) { $user['avatar'] = config('IMAGE_HOST').'Public/Common/Images/user-img-md.gif'; } - $this->ajaxReturn(lang('common_operation_success'), 0, $user); + $this->ajaxReturn('操作成功', 0, $user); } /** @@ -392,7 +392,7 @@ class Coupon extends Common // 是否ajax请求 if(!IS_AJAX) { - $this->error(lang('common_unauthorized_access')); + $this->error('非法访问'); } // 请求参数 @@ -622,7 +622,7 @@ class Coupon extends Common // 是否ajax请求 if(!IS_AJAX) { - $this->error(lang('common_unauthorized_access')); + $this->error('非法访问'); } // 参数处理 @@ -638,18 +638,18 @@ class Coupon extends Common $user_coupon = $m->where(array('id'=>$id))->getField('id'); if(empty($user_coupon)) { - $this->ajaxReturn(lang('user_coupon_no_exist_error'), -2); + $this->ajaxReturn('优惠券不存在', -2); } // 删除 if($m->where(array('id'=>$id))->save(['is_delete_time'=>time()]) !== false) { - $this->ajaxReturn(lang('common_operation_delete_success')); + $this->ajaxReturn('删除成功'); } else { - $this->ajaxReturn(lang('common_operation_delete_error'), -100); + $this->ajaxReturn('删除失败或资源不存在', -100); } } else { - $this->ajaxReturn(lang('common_param_error'), -1); + $this->ajaxReturn('参数错误', -1); } } @@ -665,15 +665,15 @@ class Coupon extends Common // 参数 if(empty($_POST['id']) || !isset($_POST['state'])) { - $this->ajaxReturn(lang('common_param_error'), -1); + $this->ajaxReturn('参数错误', -1); } // 数据更新 if(db('Coupon')->where(array('id'=>I('id')))->save(array('is_enable'=>I('state')))) { - $this->ajaxReturn(lang('common_operation_edit_success')); + $this->ajaxReturn('编辑成功'); } else { - $this->ajaxReturn(lang('common_operation_edit_error'), -100); + $this->ajaxReturn('编辑失败或数据未改变', -100); } } } diff --git a/application/admin/controller/CustomView.php b/application/admin/controller/CustomView.php index 41acaee0a..4ec32daa6 100755 --- a/application/admin/controller/CustomView.php +++ b/application/admin/controller/CustomView.php @@ -212,7 +212,7 @@ class CustomView extends Common // 是否ajax请求 if(!IS_AJAX) { - $this->error(lang('common_unauthorized_access')); + $this->error('非法访问'); } // 添加 @@ -257,9 +257,9 @@ class CustomView extends Common // 数据添加 if($m->add()) { - $this->ajaxReturn(lang('common_operation_add_success')); + $this->ajaxReturn('新增成功'); } else { - $this->ajaxReturn(lang('common_operation_add_error'), -100); + $this->ajaxReturn('新增失败', -100); } } else { $this->ajaxReturn($m->getError(), -1); @@ -294,9 +294,9 @@ class CustomView extends Common // 数据更新 if($m->where(array('id'=>I('id')))->save()) { - $this->ajaxReturn(lang('common_operation_edit_success')); + $this->ajaxReturn('编辑成功'); } else { - $this->ajaxReturn(lang('common_operation_edit_error'), -100); + $this->ajaxReturn('编辑失败或数据未改变', -100); } } else { $this->ajaxReturn($m->getError(), -1); @@ -335,7 +335,7 @@ class CustomView extends Common // 是否ajax请求 if(!IS_AJAX) { - $this->error(lang('common_unauthorized_access')); + $this->error('非法访问'); } // 删除数据 @@ -344,12 +344,12 @@ class CustomView extends Common // 更新 if(db('CustomView')->delete(I('id'))) { - $this->ajaxReturn(lang('common_operation_delete_success')); + $this->ajaxReturn('删除成功'); } else { - $this->ajaxReturn(lang('common_operation_delete_error'), -100); + $this->ajaxReturn('删除失败或资源不存在', -100); } } else { - $this->ajaxReturn(lang('common_param_error'), -1); + $this->ajaxReturn('参数错误', -1); } } @@ -365,16 +365,16 @@ class CustomView extends Common // 参数 if(empty($_POST['id']) || !isset($_POST['state'])) { - $this->ajaxReturn(lang('common_param_error'), -1); + $this->ajaxReturn('参数错误', -1); } $field = i('field', 'is_enable'); // 数据更新 if(db('CustomView')->where(['id'=>I('id')])->save([$field=>intval(I('state'))])) { - $this->ajaxReturn(lang('common_operation_edit_success')); + $this->ajaxReturn('编辑成功'); } else { - $this->ajaxReturn(lang('common_operation_edit_error'), -100); + $this->ajaxReturn('编辑失败或数据未改变', -100); } } } diff --git a/application/admin/controller/Email.php b/application/admin/controller/Email.php index 63145931e..74946ec37 100755 --- a/application/admin/controller/Email.php +++ b/application/admin/controller/Email.php @@ -84,15 +84,15 @@ class Email extends Common $obj = new \base\Email($verify_param); $email_param = array( 'email' => input('email'), - 'content' => lang('email_test_email_send_content'), - 'title' => MyC('home_site_name').' - '.lang('common_operation_test'), + 'content' => '邮件配置-发送测试内容', + 'title' => MyC('home_site_name').' - '.'测试', ); // 发送 if($obj->SendHtml($email_param)) { - return json(DataReturn(lang('common_send_success'))); + return json(DataReturn('发送成功')); } else { - return json(DataReturn(lang('common_send_error').'['.$obj->error.']', -100)); + return json(DataReturn('发送失败'.'['.$obj->error.']', -100)); } } } diff --git a/application/admin/controller/Express.php b/application/admin/controller/Express.php index ccb61f4ea..7a7e25bc1 100755 --- a/application/admin/controller/Express.php +++ b/application/admin/controller/Express.php @@ -56,7 +56,7 @@ class Express extends Common // 是否ajax请求 if(!IS_AJAX) { - $this->error(lang('common_unauthorized_access')); + $this->error('非法访问'); } // 获取数据 @@ -74,7 +74,7 @@ class Express extends Common $v['json'] = json_encode($v); } } - $msg = empty($data) ? lang('common_not_data_tips') : lang('common_operation_success'); + $msg = empty($data) ? '没有相关数据' : '操作成功'; $this->ajaxReturn($msg, 0, $data); } @@ -90,7 +90,7 @@ class Express extends Common // 是否ajax请求 if(!IS_AJAX) { - $this->error(lang('common_unauthorized_access')); + $this->error('非法访问'); } // 图片 @@ -114,9 +114,9 @@ class Express extends Common // 写入数据库 if($m->add()) { - $this->ajaxReturn(lang('common_operation_add_success')); + $this->ajaxReturn('新增成功'); } else { - $this->ajaxReturn(lang('common_operation_add_error'), -100); + $this->ajaxReturn('新增失败', -100); } } } else { @@ -133,9 +133,9 @@ class Express extends Common // 更新数据库 if($m->where(array('id'=>I('id')))->save()) { - $this->ajaxReturn(lang('common_operation_edit_success')); + $this->ajaxReturn('编辑成功'); } else { - $this->ajaxReturn(lang('common_operation_edit_error'), -100); + $this->ajaxReturn('编辑失败或数据未改变', -100); } } } @@ -153,7 +153,7 @@ class Express extends Common { if(!IS_AJAX) { - $this->error(lang('common_unauthorized_access')); + $this->error('非法访问'); } $m = D('Express'); @@ -164,9 +164,9 @@ class Express extends Common // 删除 if($m->delete($id)) { - $this->ajaxReturn(lang('common_operation_delete_success')); + $this->ajaxReturn('删除成功'); } else { - $this->ajaxReturn(lang('common_operation_delete_error'), -100); + $this->ajaxReturn('删除失败或资源不存在', -100); } } else { $this->ajaxReturn($m->getError(), -1); diff --git a/application/admin/controller/Goods.php b/application/admin/controller/Goods.php index 624ae5a1d..aa59dfa29 100755 --- a/application/admin/controller/Goods.php +++ b/application/admin/controller/Goods.php @@ -149,7 +149,7 @@ class Goods extends Common // 是否ajax if(!IS_AJAX) { - return $this->error(lang('common_unauthorized_access')); + return $this->error('非法访问'); } // 开始操作 @@ -171,7 +171,7 @@ class Goods extends Common // 是否ajax if(!IS_AJAX) { - return $this->error(lang('common_unauthorized_access')); + return $this->error('非法访问'); } // 开始操作 @@ -193,7 +193,7 @@ class Goods extends Common // 是否ajax if(!IS_AJAX) { - return $this->error(lang('common_unauthorized_access')); + return $this->error('非法访问'); } // 开始操作 @@ -216,7 +216,7 @@ class Goods extends Common // 是否ajax if(!IS_AJAX) { - return $this->error(lang('common_unauthorized_access')); + return $this->error('非法访问'); } // 开始操作 diff --git a/application/admin/controller/GoodsCategory.php b/application/admin/controller/GoodsCategory.php index 3b0f04c71..6c26ac119 100755 --- a/application/admin/controller/GoodsCategory.php +++ b/application/admin/controller/GoodsCategory.php @@ -64,7 +64,7 @@ class GoodsCategory extends Common // 是否ajax请求 if(!IS_AJAX) { - $this->error(lang('common_unauthorized_access')); + $this->error('非法访问'); } // 开始操作 @@ -85,7 +85,7 @@ class GoodsCategory extends Common // 是否ajax请求 if(!IS_AJAX) { - $this->error(lang('common_unauthorized_access')); + $this->error('非法访问'); } // 开始操作 @@ -105,7 +105,7 @@ class GoodsCategory extends Common // 是否ajax if(!IS_AJAX) { - return $this->error(lang('common_unauthorized_access')); + return $this->error('非法访问'); } // 开始操作 diff --git a/application/admin/controller/Index.php b/application/admin/controller/Index.php index 0028aa857..24d15d2bb 100755 --- a/application/admin/controller/Index.php +++ b/application/admin/controller/Index.php @@ -55,7 +55,7 @@ class Index extends Common 'mysql_ver' => isset($mysql_ver[0]['ver']) ? $mysql_ver[0]['ver'] : '', 'os_ver' => PHP_OS, 'host' => isset($_SERVER["HTTP_HOST"]) ? $_SERVER["HTTP_HOST"] : '', - 'ver' => lang('common_application_name').' '.lang('common_application_ver'), + 'ver' => 'ShopXO'.' '.'v1.1.0', ); $this->assign('data', $data); return $this->fetch(); diff --git a/application/admin/controller/Link.php b/application/admin/controller/Link.php index 0c22df283..b74946f6a 100755 --- a/application/admin/controller/Link.php +++ b/application/admin/controller/Link.php @@ -64,7 +64,7 @@ class Link extends Common // 是否ajax请求 if(!IS_AJAX) { - $this->error(lang('common_unauthorized_access')); + $this->error('非法访问'); } // id为空则表示是新增 @@ -87,9 +87,9 @@ class Link extends Common // 写入数据库 if($m->add()) { - $this->ajaxReturn(lang('common_operation_add_success')); + $this->ajaxReturn('新增成功'); } else { - $this->ajaxReturn(lang('common_operation_add_error'), -100); + $this->ajaxReturn('新增失败', -100); } } } else { @@ -106,9 +106,9 @@ class Link extends Common // 更新数据库 if($m->where(array('id'=>I('id')))->save()) { - $this->ajaxReturn(lang('common_operation_edit_success')); + $this->ajaxReturn('编辑成功'); } else { - $this->ajaxReturn(lang('common_operation_edit_error'), -100); + $this->ajaxReturn('编辑失败或数据未改变', -100); } } } @@ -126,7 +126,7 @@ class Link extends Common { if(!IS_AJAX) { - $this->error(lang('common_unauthorized_access')); + $this->error('非法访问'); } $m = D('Link'); @@ -134,9 +134,9 @@ class Link extends Common { if($m->delete($id)) { - $this->ajaxReturn(lang('common_operation_delete_success')); + $this->ajaxReturn('删除成功'); } else { - $this->ajaxReturn(lang('common_operation_delete_error'), -100); + $this->ajaxReturn('删除失败或资源不存在', -100); } } else { $this->ajaxReturn($m->getError(), -1); @@ -155,15 +155,15 @@ class Link extends Common // 参数 if(empty($_POST['id']) || !isset($_POST['state'])) { - $this->ajaxReturn(lang('common_param_error'), -1); + $this->ajaxReturn('参数错误', -1); } // 数据更新 if(db('Link')->where(array('id'=>I('id')))->save(array('is_enable'=>I('state')))) { - $this->ajaxReturn(lang('common_operation_edit_success')); + $this->ajaxReturn('编辑成功'); } else { - $this->ajaxReturn(lang('common_operation_edit_error'), -100); + $this->ajaxReturn('编辑失败或数据未改变', -100); } } } diff --git a/application/admin/controller/Message.php b/application/admin/controller/Message.php index 60a91b49e..8e106127e 100755 --- a/application/admin/controller/Message.php +++ b/application/admin/controller/Message.php @@ -183,7 +183,7 @@ class Message extends Common // 是否ajax请求 if(!IS_AJAX) { - $this->error(lang('common_unauthorized_access')); + $this->error('非法访问'); } // 参数处理 @@ -199,19 +199,19 @@ class Message extends Common $user = $m->where(array('id'=>$id))->getField('id'); if(empty($user)) { - $this->ajaxReturn(lang('common_data_no_exist_error'), -2); + $this->ajaxReturn('资源不存在或已被删除', -2); } // 删除消息 $status = $m->where(array('id'=>$id))->save(['is_delete_time'=>time()]); if($status !== false) { - $this->ajaxReturn(lang('common_operation_delete_success')); + $this->ajaxReturn('删除成功'); } else { - $this->ajaxReturn(lang('common_operation_delete_error'), -100); + $this->ajaxReturn('删除失败或资源不存在', -100); } } else { - $this->ajaxReturn(lang('common_param_error'), -1); + $this->ajaxReturn('参数错误', -1); } } } diff --git a/application/admin/controller/Navigation.php b/application/admin/controller/Navigation.php index f87b9c095..20f7a651d 100755 --- a/application/admin/controller/Navigation.php +++ b/application/admin/controller/Navigation.php @@ -125,7 +125,7 @@ class Navigation extends Common // 是否ajax请求 if(!IS_AJAX) { - $this->error(lang('common_unauthorized_access')); + $this->error('非法访问'); } // 请求类型 @@ -151,7 +151,7 @@ class Navigation extends Common $this->DataSave(8); break; } - $this->ajaxReturn(lang('common_param_error'), -1); + $this->ajaxReturn('参数错误', -1); } /** @@ -208,9 +208,9 @@ class Navigation extends Common // 写入数据库 if($m->add()) { - $this->ajaxReturn(lang('common_operation_add_success')); + $this->ajaxReturn('新增成功'); } else { - $this->ajaxReturn(lang('common_operation_add_error'), -100); + $this->ajaxReturn('新增失败', -100); } } else { // 额外数据处理 @@ -219,9 +219,9 @@ class Navigation extends Common // 数据编辑 if($m->where(array('id'=>I('id')))->save()) { - $this->ajaxReturn(lang('common_operation_edit_success')); + $this->ajaxReturn('编辑成功'); } else { - $this->ajaxReturn(lang('common_operation_edit_error'), -100); + $this->ajaxReturn('编辑失败或数据未改变', -100); } } } else { @@ -240,7 +240,7 @@ class Navigation extends Common { if(!IS_AJAX) { - $this->error(lang('common_unauthorized_access')); + $this->error('非法访问'); } $m = D('Navigation'); @@ -251,9 +251,9 @@ class Navigation extends Common // 清除缓存 S(config('cache_common_home_nav_'.$this->nav_type.'_key', null)); - $this->ajaxReturn(lang('common_operation_delete_success')); + $this->ajaxReturn('删除成功'); } else { - $this->ajaxReturn(lang('common_operation_delete_error'), -100); + $this->ajaxReturn('删除失败或资源不存在', -100); } } else { $this->ajaxReturn($m->getError(), -1); @@ -272,7 +272,7 @@ class Navigation extends Common // 参数 if(empty($_POST['id']) || !isset($_POST['state'])) { - $this->ajaxReturn(lang('common_param_error'), -1); + $this->ajaxReturn('参数错误', -1); } // 数据更新 @@ -281,9 +281,9 @@ class Navigation extends Common // 清除缓存 S(config('cache_common_home_nav_'.$this->nav_type.'_key', null)); - $this->ajaxReturn(lang('common_operation_edit_success')); + $this->ajaxReturn('编辑成功'); } else { - $this->ajaxReturn(lang('common_operation_edit_error'), -100); + $this->ajaxReturn('编辑失败或数据未改变', -100); } } } diff --git a/application/admin/controller/Order.php b/application/admin/controller/Order.php index 062f56f8e..9a320e3bb 100755 --- a/application/admin/controller/Order.php +++ b/application/admin/controller/Order.php @@ -248,7 +248,7 @@ class Order extends Common // 是否ajax请求 if(!IS_AJAX) { - $this->error(lang('common_unauthorized_access')); + $this->error('非法访问'); } // 删除操作 @@ -273,7 +273,7 @@ class Order extends Common // 是否ajax请求 if(!IS_AJAX) { - $this->error(lang('common_unauthorized_access')); + $this->error('非法访问'); } // 取消操作 @@ -297,7 +297,7 @@ class Order extends Common // 是否ajax请求 if(!IS_AJAX) { - $this->error(lang('common_unauthorized_access')); + $this->error('非法访问'); } // 发货操作 @@ -320,7 +320,7 @@ class Order extends Common // 是否ajax请求 if(!IS_AJAX) { - $this->error(lang('common_unauthorized_access')); + $this->error('非法访问'); } // 收货操作 @@ -344,7 +344,7 @@ class Order extends Common // 是否ajax请求 if(!IS_AJAX) { - $this->error(lang('common_unauthorized_access')); + $this->error('非法访问'); } // 订单确认 @@ -368,7 +368,7 @@ class Order extends Common { $params = $_POST; $params['user'] = $this->admin; - $params['user']['user_name_view'] = lang('common_admin_name').'-'.$this->admin['username']; + $params['user']['user_name_view'] = '管理员'.'-'.$this->admin['username']; $ret = OrderService::AdminPay($params); $this->ajaxReturn($ret['msg'], $ret['code'], $ret['data']); } diff --git a/application/admin/controller/Payment.php b/application/admin/controller/Payment.php index 83a9e9741..f6f16551d 100755 --- a/application/admin/controller/Payment.php +++ b/application/admin/controller/Payment.php @@ -201,7 +201,7 @@ class Payment extends Common // 是否ajax请求 if(!IS_AJAX) { - $this->error(lang('common_unauthorized_access')); + $this->error('非法访问'); } // 图片 @@ -232,9 +232,9 @@ class Payment extends Common // 更新数据库 if($m->where(array('id'=>I('id')))->save()) { - $this->ajaxReturn(lang('common_operation_edit_success')); + $this->ajaxReturn('编辑成功'); } else { - $this->ajaxReturn(lang('common_operation_edit_error'), -100); + $this->ajaxReturn('编辑失败或数据未改变', -100); } } else { $this->ajaxReturn($m->getError(), -1); @@ -272,22 +272,22 @@ class Payment extends Common { if(!IS_AJAX) { - $this->error(lang('common_unauthorized_access')); + $this->error('非法访问'); } // 参数 if(empty($_POST['id']) || !isset($_POST['state'])) { - $this->ajaxReturn(lang('common_param_error'), -1); + $this->ajaxReturn('参数错误', -1); } $field = I('field', 'is_enable'); // 数据更新 if(db('Payment')->where(array('payment'=>I('id')))->save(array($field=>I('state')))) { - $this->ajaxReturn(lang('common_operation_edit_success')); + $this->ajaxReturn('编辑成功'); } else { - $this->ajaxReturn(lang('common_operation_edit_error'), -100); + $this->ajaxReturn('编辑失败或数据未改变', -100); } } @@ -303,13 +303,13 @@ class Payment extends Common // 主目录权限 if(!is_writable(ROOT_PATH)) { - $this->ajaxReturn(lang('common_is_writable_error').'['.ROOT_PATH.']', -3); + $this->ajaxReturn('服务器用户没操作权限'.'['.ROOT_PATH.']', -3); } // 插件权限 if(!is_writable($this->payment_dir)) { - $this->ajaxReturn(lang('common_is_writable_error').'['.$this->payment_dir.']', -3); + $this->ajaxReturn('服务器用户没操作权限'.'['.$this->payment_dir.']', -3); } } @@ -325,7 +325,7 @@ class Payment extends Common { if(!IS_AJAX) { - $this->error(lang('common_unauthorized_access')); + $this->error('非法访问'); } // 权限 @@ -334,7 +334,7 @@ class Payment extends Common // 参数 if(empty($_POST['id'])) { - $this->ajaxReturn(lang('common_param_error'), -1); + $this->ajaxReturn('参数错误', -1); } // 数据处理 @@ -357,15 +357,15 @@ class Payment extends Common // 入口文件生成 $this->PaymentEntranceCreated($payment); - $this->ajaxReturn(lang('common_install_success')); + $this->ajaxReturn('安装成功'); } else { - $this->ajaxReturn(lang('common_install_error'), -100); + $this->ajaxReturn('安装失败', -100); } } else { $this->ajaxReturn($m->getError(), -1); } } else { - $this->ajaxReturn(lang('common_plugins_config_error'), -10); + $this->ajaxReturn('插件配置有误', -10); } } @@ -381,13 +381,13 @@ class Payment extends Common { if(!IS_AJAX) { - $this->error(lang('common_unauthorized_access')); + $this->error('非法访问'); } // 参数 if(empty($_POST['id'])) { - $this->ajaxReturn(lang('common_param_error'), -1); + $this->ajaxReturn('参数错误', -1); } // 开始卸载 @@ -397,9 +397,9 @@ class Payment extends Common // 删除入口文件 $this->PaymentEntranceDelete($payment); - $this->ajaxReturn(lang('common_uninstall_success')); + $this->ajaxReturn('卸载成功'); } else { - $this->ajaxReturn(lang('common_uninstall_error'), -100); + $this->ajaxReturn('卸载失败', -100); } } @@ -415,7 +415,7 @@ class Payment extends Common { if(!IS_AJAX) { - $this->error(lang('common_unauthorized_access')); + $this->error('非法访问'); } // 权限 @@ -424,38 +424,38 @@ class Payment extends Common // 参数 if(empty($_POST['id'])) { - $this->ajaxReturn(lang('common_param_error'), -1); + $this->ajaxReturn('参数错误', -1); } // 是否禁止删除 $payment = I('id'); if(in_array($payment, $this->cannot_deleted_list)) { - $this->ajaxReturn(lang('payment_cannot_deleted_error'), -10); + $this->ajaxReturn('该支付方式禁止删除', -10); } // 是否存在 $file = $this->payment_dir.$payment.'.class.php'; if(!file_exists($file)) { - $this->ajaxReturn(lang('common_data_no_exist_error'), -2); + $this->ajaxReturn('资源不存在或已被删除', -2); } // 权限 if(!is_writable($file)) { - $this->ajaxReturn(lang('common_is_writable_error'), -3); + $this->ajaxReturn('服务器用户没操作权限', -3); } // 删除 if(!@unlink($file)) { - $this->ajaxReturn(lang('common_operation_delete_error'), -100); + $this->ajaxReturn('删除失败或资源不存在', -100); } // 删除入口文件 $this->PaymentEntranceDelete($payment); - $this->ajaxReturn(lang('common_operation_delete_success')); + $this->ajaxReturn('删除成功'); } /** @@ -471,7 +471,7 @@ class Payment extends Common // 是否ajax if(!IS_AJAX) { - $this->error(lang('common_unauthorized_access')); + $this->error('非法访问'); } // 权限 @@ -488,19 +488,19 @@ class Payment extends Common $type = array('text/php'); if(!in_array($_FILES['file']['type'], $type)) { - $this->ajaxReturn(lang('payment_upload_format'), -2); + $this->ajaxReturn('文件格式有误,必须php文件', -2); } // 是否已有存在插件 if(file_exists($this->payment_dir.$_FILES['file']['name'])) { - $this->ajaxReturn(lang('common_plugins_already_existed_error'), -3); + $this->ajaxReturn('已存在相同插件', -3); } // 存储文件 if(!move_uploaded_file($_FILES['file']['tmp_name'], $this->payment_dir.$_FILES['file']['name'])) { - $this->ajaxReturn(lang('common_upload_error'), -100); + $this->ajaxReturn('上传失败', -100); } // 文件校验 @@ -509,9 +509,9 @@ class Payment extends Common if($config === false) { @unlink($this->payment_dir.$_FILES['file']['name']); - $this->ajaxReturn(lang('payment_upload_error'), -10); + $this->ajaxReturn('插件编写有误,请参考文档编写', -10); } - $this->ajaxReturn(lang('common_upload_success')); + $this->ajaxReturn('上传成功'); } /** diff --git a/application/admin/controller/Power.php b/application/admin/controller/Power.php index 67734d4d6..a8c008101 100755 --- a/application/admin/controller/Power.php +++ b/application/admin/controller/Power.php @@ -64,7 +64,7 @@ class Power extends Common // 是否ajax if(!IS_AJAX) { - return $this->error(lang('common_unauthorized_access')); + return $this->error('非法访问'); } // 开始操作 @@ -86,7 +86,7 @@ class Power extends Common // 是否ajax if(!IS_AJAX) { - return $this->error(lang('common_unauthorized_access')); + return $this->error('非法访问'); } // 开始操作 @@ -162,7 +162,7 @@ class Power extends Common // 是否ajax请求 if(!IS_AJAX) { - $this->error(lang('common_unauthorized_access')); + $this->error('非法访问'); } // 开始操作 @@ -182,7 +182,7 @@ class Power extends Common // 是否ajax请求 if(!IS_AJAX) { - $this->error(lang('common_unauthorized_access')); + $this->error('非法访问'); } // 开始操作 @@ -202,7 +202,7 @@ class Power extends Common // 是否ajax if(!IS_AJAX) { - return $this->error(lang('common_unauthorized_access')); + return $this->error('非法访问'); } // 开始操作 diff --git a/application/admin/controller/Region.php b/application/admin/controller/Region.php index 704dad932..09c3e0498 100755 --- a/application/admin/controller/Region.php +++ b/application/admin/controller/Region.php @@ -56,7 +56,7 @@ class Region extends Common // 是否ajax请求 if(!IS_AJAX) { - $this->error(lang('common_unauthorized_access')); + $this->error('非法访问'); } // 获取数据 @@ -72,7 +72,7 @@ class Region extends Common $data[$k]['json'] = json_encode($v); } } - $msg = empty($data) ? lang('common_not_data_tips') : lang('common_operation_success'); + $msg = empty($data) ? '没有相关数据' : '操作成功'; $this->ajaxReturn($msg, 0, $data); } @@ -106,7 +106,7 @@ class Region extends Common // 是否ajax请求 if(!IS_AJAX) { - $this->error(lang('common_unauthorized_access')); + $this->error('非法访问'); } // id为空则表示是新增 @@ -127,9 +127,9 @@ class Region extends Common // 写入数据库 if($m->add()) { - $this->ajaxReturn(lang('common_operation_add_success')); + $this->ajaxReturn('新增成功'); } else { - $this->ajaxReturn(lang('common_operation_add_error'), -100); + $this->ajaxReturn('新增失败', -100); } } } else { @@ -146,9 +146,9 @@ class Region extends Common // 更新数据库 if($m->where(array('id'=>I('id')))->save()) { - $this->ajaxReturn(lang('common_operation_edit_success')); + $this->ajaxReturn('编辑成功'); } else { - $this->ajaxReturn(lang('common_operation_edit_error'), -100); + $this->ajaxReturn('编辑失败或数据未改变', -100); } } } @@ -166,7 +166,7 @@ class Region extends Common { if(!IS_AJAX) { - $this->error(lang('common_unauthorized_access')); + $this->error('非法访问'); } $m = D('Region'); @@ -174,9 +174,9 @@ class Region extends Common { if($m->delete(I('id'))) { - $this->ajaxReturn(lang('common_operation_delete_success')); + $this->ajaxReturn('删除成功'); } else { - $this->ajaxReturn(lang('common_operation_delete_error'), -100); + $this->ajaxReturn('删除失败或资源不存在', -100); } } else { $this->ajaxReturn($m->getError(), -1); diff --git a/application/admin/controller/ScreeningPrice.php b/application/admin/controller/ScreeningPrice.php index 04453272b..f4cdb0812 100755 --- a/application/admin/controller/ScreeningPrice.php +++ b/application/admin/controller/ScreeningPrice.php @@ -55,7 +55,7 @@ class ScreeningPrice extends Common // 是否ajax请求 if(!IS_AJAX) { - $this->error(lang('common_unauthorized_access')); + $this->error('非法访问'); } // 获取数据 @@ -86,7 +86,7 @@ class ScreeningPrice extends Common $data[$k]['json'] = json_encode($v); } } - $msg = empty($data) ? lang('common_not_data_tips') : lang('common_operation_success'); + $msg = empty($data) ? '没有相关数据' : '操作成功'; $this->ajaxReturn($msg, 0, $data); } @@ -120,7 +120,7 @@ class ScreeningPrice extends Common // 是否ajax请求 if(!IS_AJAX) { - $this->error(lang('common_unauthorized_access')); + $this->error('非法访问'); } // id为空则表示是新增 @@ -143,9 +143,9 @@ class ScreeningPrice extends Common // 写入数据库 if($m->add()) { - $this->ajaxReturn(lang('common_operation_add_success')); + $this->ajaxReturn('新增成功'); } else { - $this->ajaxReturn(lang('common_operation_add_error'), -100); + $this->ajaxReturn('新增失败', -100); } } } else { @@ -164,9 +164,9 @@ class ScreeningPrice extends Common // 更新数据库 if($m->where(array('id'=>I('id')))->save()) { - $this->ajaxReturn(lang('common_operation_edit_success')); + $this->ajaxReturn('编辑成功'); } else { - $this->ajaxReturn(lang('common_operation_edit_error'), -100); + $this->ajaxReturn('编辑失败或数据未改变', -100); } } } @@ -184,7 +184,7 @@ class ScreeningPrice extends Common { if(!IS_AJAX) { - $this->error(lang('common_unauthorized_access')); + $this->error('非法访问'); } $m = D('ScreeningPrice'); @@ -192,9 +192,9 @@ class ScreeningPrice extends Common { if($m->delete(I('id'))) { - $this->ajaxReturn(lang('common_operation_delete_success')); + $this->ajaxReturn('删除成功'); } else { - $this->ajaxReturn(lang('common_operation_delete_error'), -100); + $this->ajaxReturn('删除失败或资源不存在', -100); } } else { $this->ajaxReturn($m->getError(), -1); diff --git a/application/admin/controller/Slide.php b/application/admin/controller/Slide.php index b3cb462b7..d6e06718c 100755 --- a/application/admin/controller/Slide.php +++ b/application/admin/controller/Slide.php @@ -176,7 +176,7 @@ class Slide extends Common // 是否ajax请求 if(!IS_AJAX) { - $this->error(lang('common_unauthorized_access')); + $this->error('非法访问'); } // 图片 @@ -220,9 +220,9 @@ class Slide extends Common // 数据添加 if($m->add()) { - $this->ajaxReturn(lang('common_operation_add_success')); + $this->ajaxReturn('新增成功'); } else { - $this->ajaxReturn(lang('common_operation_add_error'), -100); + $this->ajaxReturn('新增失败', -100); } } else { $this->ajaxReturn($m->getError(), -1); @@ -256,9 +256,9 @@ class Slide extends Common // 更新数据库 if($m->where(array('id'=>I('id')))->save()) { - $this->ajaxReturn(lang('common_operation_edit_success')); + $this->ajaxReturn('编辑成功'); } else { - $this->ajaxReturn(lang('common_operation_edit_error'), -100); + $this->ajaxReturn('编辑失败或数据未改变', -100); } } else { $this->ajaxReturn($m->getError(), -1); @@ -277,7 +277,7 @@ class Slide extends Common // 是否ajax请求 if(!IS_AJAX) { - $this->error(lang('common_unauthorized_access')); + $this->error('非法访问'); } // 参数处理 @@ -293,7 +293,7 @@ class Slide extends Common $data = $m->find($id); if(empty($data)) { - $this->ajaxReturn(lang('common_data_no_exist_error'), -2); + $this->ajaxReturn('资源不存在或已被删除', -2); } if($data['is_enable'] == 1) { @@ -303,12 +303,12 @@ class Slide extends Common // 删除 if($m->where(array('id'=>$id))->delete() !== false) { - $this->ajaxReturn(lang('common_operation_delete_success')); + $this->ajaxReturn('删除成功'); } else { - $this->ajaxReturn(lang('common_operation_delete_error'), -100); + $this->ajaxReturn('删除失败或资源不存在', -100); } } else { - $this->ajaxReturn(lang('common_param_error'), -1); + $this->ajaxReturn('参数错误', -1); } } @@ -324,15 +324,15 @@ class Slide extends Common // 参数 if(empty($_POST['id']) || !isset($_POST['state'])) { - $this->ajaxReturn(lang('common_param_error'), -1); + $this->ajaxReturn('参数错误', -1); } // 数据更新 if(db('Slide')->where(array('id'=>I('id')))->save(array('is_enable'=>I('state')))) { - $this->ajaxReturn(lang('common_operation_edit_success')); + $this->ajaxReturn('编辑成功'); } else { - $this->ajaxReturn(lang('common_operation_edit_error'), -100); + $this->ajaxReturn('编辑失败或数据未改变', -100); } } } diff --git a/application/admin/controller/Theme.php b/application/admin/controller/Theme.php index 170d6a735..5138f8448 100755 --- a/application/admin/controller/Theme.php +++ b/application/admin/controller/Theme.php @@ -147,14 +147,14 @@ class Theme extends Common // 是否ajax if(!IS_AJAX) { - $this->error(lang('common_unauthorized_access')); + $this->error('非法访问'); } // 主题 $id = str_replace(array('.', '/', '\\'), '', strip_tags(I('id'))); if(empty($id)) { - $this->error(lang('theme_empty_error')); + $this->error('主题名称有误'); } // 默认主题 @@ -164,15 +164,15 @@ class Theme extends Common // 不能删除正在使用的主题 if($theme == $id) { - $this->ajaxReturn(lang('theme_delete_error'), -2); + $this->ajaxReturn('不能删除正在使用的主题', -2); } // 开始删除主题 if(\base\FileUtil::UnlinkDir($this->html_path.$id) && \base\FileUtil::UnlinkDir($this->static_path.$id)) { - $this->ajaxReturn(lang('common_operation_delete_success')); + $this->ajaxReturn('删除成功'); } else { - $this->ajaxReturn(lang('common_operation_delete_error'), -100); + $this->ajaxReturn('删除失败或资源不存在', -100); } } @@ -188,7 +188,7 @@ class Theme extends Common // 是否ajax if(!IS_AJAX) { - $this->error(lang('common_unauthorized_access')); + $this->error('非法访问'); } // 文件上传校验 @@ -202,7 +202,7 @@ class Theme extends Common $type = array('application/zip', 'application/octet-stream'); if(!in_array($_FILES['theme']['type'], $type)) { - $this->ajaxReturn(lang('theme_upload_error'), -2); + $this->ajaxReturn('文件格式有误,请上传zip压缩包', -2); } // 开始解压文件 @@ -252,7 +252,7 @@ class Theme extends Common } } - $this->ajaxReturn(lang('common_operation_success')); + $this->ajaxReturn('操作成功'); } } ?> \ No newline at end of file diff --git a/application/admin/controller/User.php b/application/admin/controller/User.php index dc2be4d92..a32f1a32c 100755 --- a/application/admin/controller/User.php +++ b/application/admin/controller/User.php @@ -102,7 +102,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, 'msg'=>lang('common_not_data_tips'))); + $excel = new \base\Excel(array('filename'=>'user', 'title'=>lang('excel_user_title_list'), 'data'=>$data, 'msg'=>'没有相关数据')); return $excel->Export(); } @@ -157,7 +157,7 @@ class User extends Common // 是否ajax if(!IS_AJAX) { - return $this->error(lang('common_unauthorized_access')); + return $this->error('非法访问'); } // 开始操作 @@ -179,7 +179,7 @@ class User extends Common // 是否ajax if(!IS_AJAX) { - return $this->error(lang('common_unauthorized_access')); + return $this->error('非法访问'); } // 开始操作 diff --git a/application/admin/lang/zh-cn.php b/application/admin/lang/zh-cn.php index 6e17d7a8f..0c3cf3f3d 100644 --- a/application/admin/lang/zh-cn.php +++ b/application/admin/lang/zh-cn.php @@ -8,56 +8,6 @@ * @datetime 2016-12-01T21:51:08+0800 */ return array( - // 管理员 - 'login_username_text' => '用户名', - 'login_login_pwd_text' => '登录密码', - 'login_username_format' => '用户名格式 5~18 个字符(可以是字母数字下划线)', - 'login_login_pwd_format' => '密码格式 6~18 个字符', - 'login_role_id_format' => '请选择所属角色组', - 'login_button_text' => '登录', - 'login_forgot_pwd_text' => '忘记密码?', - 'login_forgot_pwd_tips' => '请联系管理员重置密码', - 'login_username_no_exist' => '管理员不存在', - 'login_login_pwd_error' => '密码错误', - 'login_role_id_error' => '角色不存在', - 'login_login_error' => '登录失败,请稍后再试!', - 'login_login_success' => '登录成功', - - // 管理员添加及编辑 - 'login_total_name' => '登录次数', - 'login_last_time_name' => '最后登录时间', - 'admin_add_name' => '管理员添加', - 'admin_edit_name' => '管理员编辑', - 'admin_view_role_name' => '权限组', - - - // 权限/菜单 - 'power_level_text' => '栏目级别', - 'power_name_text' => '权限名称', - 'power_control_text' => '控制器名称', - 'power_action_text' => '方法名称', - 'power_name_format' => '权限名称格式 2~8 个字符之间', - 'power_control_format' => '控制器名格式 1~30 个字符之间(必须以字母开始,可以是字母数字下划线)', - 'power_action_format' => '方法名格式 1~30 个字符之间(必须以字母开始,可以是字母数字下划线)', - 'power_level_format' => '栏目级别选择错误', - 'power_add_name' => '权限添加', - 'power_edit_name' => '权限编辑', - 'power_no_exist_tips' => '权限数据不存在', - 'power_exist_item_tips' => '该权限存在子级数据', - 'power_view_have_title' => '拥有权限', - 'role_view_role_text' => '角色名称', - 'role_name_format' => '角色名称格式 2~8 个字符之间', - 'role_no_exist_tips' => '角色数据不存在', - 'power_level_format' => '栏目级别选择错误', - 'role_add_name' => '角色添加', - 'role_edit_name' => '角色编辑', - 'power_icon_text' => '图标class', - 'power_icon_format' => '图标格式 0~30 个字符之间', - 'power_icon_tips' => '参考 http://www.iconfont.cn/ 将icon放到 [ /static/admin/default/css/iconfontmenu.css ] 文件中', - - // 站点设置 - 'site_site_logo_text' => '选择logo', - // 站点关闭状态列表 'site_site_state_list' => array( 0 => array('value' => 0, 'name' => '关闭', 'checked' => true), @@ -110,11 +60,6 @@ return array( 'Pacific/Fiji' => '(标准时+12:00) 奥克兰、惠灵顿、堪察加半岛' ), - // 短信 - 'sms_sms_nav_name' => '短信设置', - 'sms_message_nav_name' => '消息模板', - 'sms_view_tips' => '阿里云短信管理地址 https://dysms.console.aliyun.com/dysms.htm', - // seo // url模式列表 'seo_url_model_list' => array( @@ -122,38 +67,6 @@ return array( 1 => array('value' => 1, 'name' => 'PATHINFO模式'), ), - // 邮箱 - 'email_email_nav_name' => '邮箱设置', - 'email_message_nav_name' => '消息模板', - 'email_test_email_text' => '测试接收的邮件地址', - 'email_test_email_tips' => '请先保存配置后,再进行测试', - 'email_test_email_send_content' => '邮件配置-发送测试内容', - - // 用户 - 'user_add_name' => '成员添加', - 'user_edit_name' => '成员编辑', - 'user_so_keyword_tips' => '姓名/手机/邮箱/昵称', - 'user_time_start_text' => '起始时间', - 'user_time_end_text' => '结束时间', - 'user_nickname_name' => '昵称', - 'user_birthday_name' => '生日', - 'user_nickname_format' => '昵称最多 16 个字符', - - 'user_birthday_format' => '生日格式有误', - 'user_accounts_param_error' => '至少填写一项手机或邮箱', - - 'user_login_pwd_name' => '登录密码', - 'user_login_pwd_format' => '登录密码格式 6~18 个字符之间', - - 'user_username_name' => '用户名', - 'user_username_format' => '用户名 2~30 个字符', - - 'user_integral_name' => '积分', - - 'user_avatar_name' => '用户头像', - 'user_province_name' => '所在省', - 'user_city_name' => '所在市', - // 用户excel导出标题列表 'excel_user_title_list' => array( 'username' => array( @@ -207,150 +120,5 @@ return array( 'type' => 'string', ), ), - - // 商品管理 - 'goods_add_name' => '商品添加', - 'goods_edit_name' => '商品编辑', - - 'goods_title_text' => '标题名称', - 'goods_title_format' => '标题名称格式 2~60 个字符', - - 'goods_model_text' => '商品型号', - 'goods_model_format' => '商品型号格式 最多30个字符', - - 'goods_category_id_text' => '商品分类', - 'goods_category_id_format' => '请至少选择一个商品分类', - - 'goods_place_origin_name' => '生产地', - 'goods_place_origin_format' => '请选择生产地', - - 'goods_inventory_text' => '库存数量', - 'goods_inventory_format' => '库存数量 1~100000000', - - 'goods_inventory_unit_text' => '库存单位', - 'goods_inventory_unit_format' => '库存单位格式 1~6 个字符', - - 'goods_original_price_icon' => '原价', - 'goods_original_price_text' => '原价(元)', - 'goods_price_text' => '销售价格(元)', - 'goods_price_tips' => '最多两位小数', - 'goods_price_format' => '请填写有效的销售金额', - - 'goods_give_integral_text' => '购买赠送积分', - 'goods_give_integral_format' => '购买赠送积分 0~100000000', - - 'goods_buy_min_number_text' => '最低起购数量', - 'goods_buy_min_number_tips' => '默认数值 1', - 'goods_buy_min_number_format' => '最低起购数量 1~100000000', - - 'goods_buy_max_number_text' => '单次最大购买数量', - 'goods_buy_max_number_tips' => '单次最大数值 100000000, 小于等于0或空则不限', - 'goods_buy_max_number_format' => '单次最大购买数量 1~100000000', - - 'goods_is_deduction_inventory_text' => '扣减库存', - 'goods_is_deduction_inventory_tips' => '扣除规则根据后台配置->扣除库存规则而定', - 'goods_is_shelves_text' => '上下架', - 'goods_is_shelves_tips' => '下架后用户不可见', - - 'goods_is_home_recommended_text' => '首页推荐', - 'goods_is_home_recommended_tips' => '推荐后在首页展示', - - 'goods_images_text' => '相册', - 'goods_images_tips' => '可拖拽图片进行排序,建议图片尺寸一致', - 'goods_images_format' => '请上传相册', - 'goods_content_web_format' => '电脑端详情内容最多 105000 个字符', - - 'goods_nav_base_name' => '基础信息', - 'goods_nav_photo_name' => '商品相册', - 'goods_nav_video_name' => '商品视频', - 'goods_nav_attribute_name' => '商品规格', - 'goods_nav_web_name' => '电脑端详情', - 'goods_nav_app_name' => '手机端详情', - - 'goods_attribute_type_name' => '标题', - 'goods_attribute_type_placeholder' => '属性类型名称', - 'goods_attribute_type_format' => '属性类型名称 1~10 个字符', - 'goods_attribute_type_add_sub_text' => '添加商品属性', - - 'goods_attribute_type_type_name' => '类型', - 'goods_attribute_type_type_format' => '请选择属性类型', - - 'goods_attribute_type_type_show' => '展示', - 'goods_attribute_type_type_choose' => '选择', - 'goods_attribute_add_sub_text' => '添加属性', - - 'goods_attribute_name' => '属性', - 'goods_attribute_placeholder' => '属性名称', - 'goods_attribute_format' => '属性名称 1~10个字符之间', - - 'goods_content_app_images_text' => '图片', - 'goods_content_app_text_text' => '文本内容', - 'goods_content_app_text_format' => '文本内容最多 105000 个字符', - 'goods_content_app_add_sub_text' => '添加手机详情', - - 'goods_so_keyword_tips' => '标题/型号', - - 'goods_category_level_two' => '二级', - 'goods_category_level_three' => '三级', - - 'goods_home_recommended_images_text'=> '首页推荐图片', - 'goods_home_recommended_images_tips'=> '留空则取相册第一张图', - - 'goods_brand_id_text' => '品牌', - - 'goods_video_text' => '短视频', - 'goods_video_tips' => '视频比图文更有具带入感,仅支持 mp4 格式', - - - // 商品分类 - 'goods_category_add_name' => '分类添加', - 'goods_category_edit_name' => '分类编辑', - - 'goods_category_big_images_text' => '大图片', - - 'goods_category_vice_name_text' => '副名称', - 'goods_category_vice_name_format' => '副名称最大60个字符', - - 'goods_category_describe_text' => '描述', - 'goods_category_describe_format' => '描述最大200个字符', - - 'goods_category_home_recommended_text' => '首页推荐', - - // 订单 - 'order_so_keyword_tips' => '订单号/姓名/手机/地址/快递单号', - 'order_time_start_text' => '起始时间', - 'order_time_end_text' => '结束时间', - - 'order_base_text' => '基础信息', - 'order_receive_text' => '收件信息', - 'order_express_text' => '快递信息', - 'order_user_note_text' => '用户备注', - 'order_price_th_text' => '订单金额(元)', - 'order_payment_name_text' => '支付方式', - - 'order_confirm_time_text' => '确认时间', - 'order_pay_time_text' => '支付时间', - 'order_delivery_time_text' => '发货时间', - 'order_cancel_time_text' => '取消时间', - 'order_success_time_text' => '完成时间', - - 'order_delivery_popup_title' => '发货操作', - 'order_express_not_data_tips' => '没有快递方式', - 'order_business_express_title' => '选择快递', - 'order_express_number_text' => '快递单号', - 'order_express_number_format' => '请填写快递单号', - - 'order_order_no_text' => '订单号', - - 'order_price_text' => '金额', - 'order_preferential_price_text' => '优惠', - 'order_total_price_text' => '总价', - 'order_pay_price_text' => '支付', - - 'order_pay_popup_title' => '支付操作', - 'order_business_pay_title' => '选择支付', - 'order_payment_not_data_tips' => '没有支付方式', - - 'order_user_is_delete_text' => '用户已删除', ); ?> \ No newline at end of file diff --git a/application/admin/view/default/admin/index.html b/application/admin/view/default/admin/index.html index a8ea5bdac..61e5118e6 100755 --- a/application/admin/view/default/admin/index.html +++ b/application/admin/view/default/admin/index.html @@ -6,7 +6,7 @@
- +
diff --git a/application/admin/view/default/admin/save_info.html b/application/admin/view/default/admin/save_info.html index 9713459e2..785cce631 100755 --- a/application/admin/view/default/admin/save_info.html +++ b/application/admin/view/default/admin/save_info.html @@ -8,20 +8,20 @@ {{if empty($data['id'])}} - {{:lang('admin_add_name')}} + 管理员添加 {{else /}} - {{:lang('admin_edit_name')}} + 管理员编辑 {{/if}} 返回
- - + +
- - + +
@@ -29,8 +29,8 @@
{{if !isset($data['id']) or $admin['id'] neq $data['id']}}
- - {{foreach $role as $v}} diff --git a/application/admin/view/default/alipaylife/index.html b/application/admin/view/default/alipaylife/index.html index ed3dee0cd..65bb78894 100755 --- a/application/admin/view/default/alipaylife/index.html +++ b/application/admin/view/default/alipaylife/index.html @@ -6,14 +6,14 @@
-

{{:lang('alipay_life_tips')}}

+

接口异步通知地址:http://localhost/shopxo/alipay_life_notify.php

- value="{{$param.keyword}}"{{/if}} /> + value="{{$param.keyword}}"{{/if}} />