diff --git a/app/admin/controller/Admin.php b/app/admin/controller/Admin.php
index 6ff2b63c5..5f511ea11 100755
--- a/app/admin/controller/Admin.php
+++ b/app/admin/controller/Admin.php
@@ -10,6 +10,7 @@
// +----------------------------------------------------------------------
namespace app\admin\controller;
+use app\service\ApiService;
use app\service\AdminService;
use app\service\SystemBaseService;
@@ -105,6 +106,13 @@ class Admin extends Common
}
}
+ // 模板数据
+ $assign = [
+ 'id' => isset($params['id']) ? $params['id'] : 0,
+ 'common_gender_list' => MyConst('common_gender_list'),
+ 'common_admin_status_list' => MyConst('common_admin_status_list'),
+ ];
+
// 角色
$role_params = [
'where' => [
@@ -113,27 +121,26 @@ class Admin extends Common
'field' => 'id,name',
];
$role = AdminService::RoleList($role_params);
- MyViewAssign('role_list', $role['data']);
-
- MyViewAssign('id', isset($params['id']) ? $params['id'] : 0);
- MyViewAssign('common_gender_list', MyConst('common_gender_list'));
- MyViewAssign('common_admin_status_list', MyConst('common_admin_status_list'));
+ $assign['role_list'] = $role['data'];
// 管理员编辑页面钩子
$hook_name = 'plugins_view_admin_admin_save';
- MyViewAssign($hook_name.'_data', MyEventTrigger($hook_name,
+ $assign[$hook_name.'_data'] = MyEventTrigger($hook_name,
[
'hook_name' => $hook_name,
'is_backend' => true,
'admin_id' => isset($params['id']) ? $params['id'] : 0,
'data' => &$data,
'params' => &$params,
- ]));
+ ]);
// 数据
unset($params['id']);
- MyViewAssign('data', $data);
- MyViewAssign('params', $params);
+ $assign['data'] = $data;
+ $assign['params'] = $params;
+
+ // 数据赋值
+ MyViewAssign($assign);
return MyView();
}
@@ -168,7 +175,7 @@ class Admin extends Common
// 开始操作
$params['admin'] = $this->admin;
- return AdminService::AdminSave($params);
+ return ApiService::ApiDataReturn(AdminService::AdminSave($params));
}
/**
@@ -190,7 +197,7 @@ class Admin extends Common
// 开始操作
$params = $this->data_post;
$params['admin'] = $this->admin;
- return AdminService::AdminDelete($params);
+ return ApiService::ApiDataReturn(AdminService::AdminDelete($params));
}
/**
@@ -209,8 +216,11 @@ class Admin extends Common
return MyRedirect(MyUrl('admin/index/index'));
}
- // 登录方式
- MyViewAssign('admin_login_type', MyC('admin_login_type', [], true));
+ // 模板数据
+ $assign = [
+ // 登录方式
+ 'admin_login_type' => MyC('admin_login_type', [], true),
+ ];
// 背景图片
$host = SystemBaseService::AttachmentHost();
@@ -231,16 +241,18 @@ class Admin extends Common
$host.'/static/admin/default/images/login/14.jpg',
$host.'/static/admin/default/images/login/15.jpg',
];
- MyViewAssign('bg_images_list', $bg_images_list);
+ $assign['bg_images_list'] = $bg_images_list;
// 管理员登录页面钩子
$hook_name = 'plugins_view_admin_login_info';
- MyViewAssign($hook_name.'_data', MyEventTrigger($hook_name,
+ $assign[$hook_name.'_data'] = MyEventTrigger($hook_name,
[
'hook_name' => $hook_name,
'is_backend' => true,
- ]));
+ ]);
+ // 数据赋值
+ MyViewAssign($assign);
return MyView();
}
@@ -262,7 +274,7 @@ class Admin extends Common
// 开始操作
$params = $this->data_post;
- return AdminService::Login($params);
+ return ApiService::ApiDataReturn(AdminService::Login($params));
}
/**
@@ -301,7 +313,7 @@ class Admin extends Common
}
// 调用服务层
- return AdminService::LoginVerifySend($this->data_post);
+ return ApiService::ApiDataReturn(AdminService::LoginVerifySend($this->data_post));
}
/**
diff --git a/app/admin/controller/Agreement.php b/app/admin/controller/Agreement.php
index ee30a6669..05960ea92 100644
--- a/app/admin/controller/Agreement.php
+++ b/app/admin/controller/Agreement.php
@@ -10,6 +10,8 @@
// +----------------------------------------------------------------------
namespace app\admin\controller;
+use app\admin\controller\Base;
+use app\service\ApiService;
use app\service\ConfigService;
use app\service\ResourcesService;
@@ -20,27 +22,8 @@ use app\service\ResourcesService;
* @version 0.0.1
* @datetime 2016-12-01T21:51:08+0800
*/
-class Agreement extends Common
+class Agreement extends Base
{
- /**
- * 构造方法
- * @author Devil
- * @blog http://gong.gg/
- * @version 0.0.1
- * @datetime 2016-12-03T12:39:08+0800
- */
- public function __construct()
- {
- // 调用父类前置方法
- parent::__construct();
-
- // 登录校验
- $this->IsLogin();
-
- // 权限校验
- $this->IsPower();
- }
-
/**
* 配置列表
* @author Devil
@@ -51,11 +34,14 @@ class Agreement extends Common
*/
public function Index()
{
- // 配置信息
- MyViewAssign('data', ConfigService::ConfigList());
+ // 模板数据
+ $assign = [
+ // 配置信息
+ 'data' => ConfigService::ConfigList(),
- // 编辑器文件存放地址
- MyViewAssign('editor_path_type', ResourcesService::EditorPathTypeValue('agreement'));
+ // 编辑器文件存放地址
+ 'editor_path_type' => ResourcesService::EditorPathTypeValue('agreement'),
+ ];
// 导航数据
$nav_data = [
@@ -68,11 +54,14 @@ class Agreement extends Common
'type' => 'privacy',
]
];
- MyViewAssign('nav_data', $nav_data);
+ $assign['nav_data'] = $nav_data;
// 导航/视图
- $nav_type = input('nav_type', 'register');
- MyViewAssign('nav_type', $nav_type);
+ $nav_type = empty($this->data_request['nav_type']) ? 'register' : $this->data_request['nav_type'];
+ $assign['nav_type'] = $nav_type;
+
+ // 数据赋值
+ MyViewAssign($assign);
return MyView($nav_type);
}
@@ -86,7 +75,7 @@ class Agreement extends Common
*/
public function Save()
{
- return ConfigService::ConfigSave($_POST);
+ return ApiService::ApiDataReturn(ConfigService::ConfigSave($_POST));
}
}
?>
\ No newline at end of file
diff --git a/app/admin/controller/Answer.php b/app/admin/controller/Answer.php
index e8c77da54..c566349f1 100755
--- a/app/admin/controller/Answer.php
+++ b/app/admin/controller/Answer.php
@@ -10,6 +10,8 @@
// +----------------------------------------------------------------------
namespace app\admin\controller;
+use app\admin\controller\Base;
+use app\service\ApiService;
use app\service\AnswerService;
/**
@@ -19,28 +21,9 @@ use app\service\AnswerService;
* @version 0.0.1
* @datetime 2016-12-01T21:51:08+0800
*/
-class Answer extends Common
+class Answer extends Base
{
/**
- * 构造方法
- * @author Devil
- * @blog http://gong.gg/
- * @version 0.0.1
- * @datetime 2016-12-03T12:39:08+0800
- */
- public function __construct()
- {
- // 调用父类前置方法
- parent::__construct();
-
- // 登录校验
- $this->IsLogin();
-
- // 权限校验
- $this->IsPower();
- }
-
- /**
* 列表
* @author Devil
* @blog http://gong.gg/
@@ -74,6 +57,12 @@ class Answer extends Common
*/
public function SaveInfo()
{
+ // 模板数据
+ $assign = [
+ // 静态数据
+ 'common_is_show_list' => MyConst('common_is_show_list'),
+ 'common_is_text_list' => MyConst('common_is_text_list'),
+ ];
// 数据
$data = $this->data_detail;
if(!empty($data))
@@ -90,16 +79,15 @@ class Answer extends Common
$data['reply'] = str_replace('
', "\n", $data['reply']);
}
}
- MyViewAssign('data', $data);
-
- // 静态数据
- MyViewAssign('common_is_show_list', MyConst('common_is_show_list'));
- MyViewAssign('common_is_text_list', MyConst('common_is_text_list'));
+ $assign['data'] = $data;
// 参数
$params = $this->data_request;
unset($params['id']);
- MyViewAssign('params', $params);
+ $assign['params'] = $params;
+
+ // 数据赋值
+ MyViewAssign($assign);
return MyView();
}
@@ -120,7 +108,7 @@ class Answer extends Common
// 开始处理
$params = $this->data_request;
- return AnswerService::AnswerSave($params);
+ return ApiService::ApiDataReturn(AnswerService::AnswerSave($params));
}
/**
@@ -141,7 +129,7 @@ class Answer extends Common
// 开始处理
$params = $this->data_request;
$params['user_type'] = 'admin';
- return AnswerService::AnswerDelete($params);
+ return ApiService::ApiDataReturn(AnswerService::AnswerDelete($params));
}
/**
@@ -161,7 +149,7 @@ class Answer extends Common
// 开始处理
$params = $this->data_request;
- return AnswerService::AnswerReply($params);
+ return ApiService::ApiDataReturn(AnswerService::AnswerReply($params));
}
/**
@@ -181,7 +169,7 @@ class Answer extends Common
// 开始处理
$params = $this->data_request;
- return AnswerService::AnswerStatusUpdate($params);
+ return ApiService::ApiDataReturn(AnswerService::AnswerStatusUpdate($params));
}
}
?>
\ No newline at end of file
diff --git a/app/admin/controller/Appcenternav.php b/app/admin/controller/Appcenternav.php
index 34b4352dc..b2a7dce34 100755
--- a/app/admin/controller/Appcenternav.php
+++ b/app/admin/controller/Appcenternav.php
@@ -10,8 +10,10 @@
// +----------------------------------------------------------------------
namespace app\admin\controller;
-use app\service\AppCenterNavService;
+use app\admin\controller\Base;
+use app\service\ApiService;
use app\service\ResourcesService;
+use app\service\AppCenterNavService;
/**
* 手机管理-用户中心导航管理
@@ -20,27 +22,8 @@ use app\service\ResourcesService;
* @version 0.0.1
* @datetime 2016-12-01T21:51:08+0800
*/
-class AppCenterNav extends Common
+class AppCenterNav extends Base
{
- /**
- * 构造方法
- * @author Devil
- * @blog http://gong.gg/
- * @version 0.0.1
- * @datetime 2016-12-03T12:39:08+0800
- */
- public function __construct()
- {
- // 调用父类前置方法
- parent::__construct();
-
- // 登录校验
- $this->IsLogin();
-
- // 权限校验
- $this->IsPower();
- }
-
/**
* 列
* @author Devil
@@ -74,19 +57,23 @@ class AppCenterNav extends Common
*/
public function SaveInfo()
{
- // 参数
- $params = $this->data_request;
+ // 模板数据
+ $assign = [
+ // 静态数据
+ 'common_platform_type' => MyConst('common_platform_type'),
+ 'common_app_event_type' => MyConst('common_app_event_type'),
- // 静态数据
- MyViewAssign('common_platform_type', MyConst('common_platform_type'));
- MyViewAssign('common_app_event_type', MyConst('common_app_event_type'));
-
- // 编辑器文件存放地址
- MyViewAssign('editor_path_type', ResourcesService::EditorPathTypeValue('app_center_nav'));
+ // 编辑器文件存放地址
+ 'editor_path_type' => ResourcesService::EditorPathTypeValue('app_center_nav'),
+ ];
// 数据
+ $params = $this->data_request;
unset($params['id']);
- MyViewAssign('params', $params);
+ $assign['params'] = $params;
+
+ // 模板赋值
+ MyViewAssign($assign);
return MyView();
}
@@ -107,7 +94,7 @@ class AppCenterNav extends Common
// 开始处理
$params = $this->data_request;
- return AppCenterNavService::AppCenterNavSave($params);
+ return ApiService::ApiDataReturn(AppCenterNavService::AppCenterNavSave($params));
}
/**
@@ -128,7 +115,7 @@ class AppCenterNav extends Common
// 开始处理
$params = $this->data_request;
$params['user_type'] = 'admin';
- return AppCenterNavService::AppCenterNavDelete($params);
+ return ApiService::ApiDataReturn(AppCenterNavService::AppCenterNavDelete($params));
}
/**
@@ -148,7 +135,7 @@ class AppCenterNav extends Common
// 开始处理
$params = $this->data_request;
- return AppCenterNavService::AppCenterNavStatusUpdate($params);
+ return ApiService::ApiDataReturn(AppCenterNavService::AppCenterNavStatusUpdate($params));
}
}
?>
\ No newline at end of file
diff --git a/app/admin/controller/Appconfig.php b/app/admin/controller/Appconfig.php
index 4474372f1..bfe0e7427 100755
--- a/app/admin/controller/Appconfig.php
+++ b/app/admin/controller/Appconfig.php
@@ -10,6 +10,8 @@
// +----------------------------------------------------------------------
namespace app\admin\controller;
+use app\admin\controller\Base;
+use app\service\ApiService;
use app\service\ConfigService;
/**
@@ -19,29 +21,10 @@ use app\service\ConfigService;
* @version 0.0.1
* @datetime 2016-12-01T21:51:08+0800
*/
-class AppConfig extends Common
+class AppConfig extends Base
{
/**
- * 构造方法
- * @author Devil
- * @blog http://gong.gg/
- * @version 0.0.1
- * @datetime 2016-12-03T12:39:08+0800
- */
- public function __construct()
- {
- // 调用父类前置方法
- parent::__construct();
-
- // 登录校验
- $this->IsLogin();
-
- // 权限校验
- $this->IsPower();
- }
-
- /**
- * [Index 配置列表]
+ * 配置列表
* @author Devil
* @blog http://gong.gg/
* @version 0.0.1
@@ -49,21 +32,26 @@ class AppConfig extends Common
*/
public function Index()
{
- // 配置信息
- MyViewAssign('data', ConfigService::ConfigList());
+ // 模板数据
+ $assign = [
+ // 配置数据
+ 'data' => ConfigService::ConfigList(),
+ // 静态数据
+ 'common_platform_type' => MyConst('common_platform_type'),
+ 'common_is_text_list' => MyConst('common_is_text_list'),
+ ];
- // 静态数据
- MyViewAssign('common_is_text_list', MyConst('common_is_text_list'));
- MyViewAssign('common_platform_type', MyConst('common_platform_type'));
-
// 导航/视图
- $nav_type = input('nav_type', 'base');
- MyViewAssign('nav_type', $nav_type);
+ $nav_type = empty($this->data_request['nav_type']) ? 'base' : $this->data_request['nav_type'];
+ $assign['nav_type'] = $nav_type;
+
+ // 模板赋值
+ MyViewAssign($assign);
return MyView($nav_type);
}
/**
- * [Save 配置数据保存]
+ * 配置数据保存
* @author Devil
* @blog http://gong.gg/
* @version 0.0.1
@@ -76,7 +64,7 @@ class AppConfig extends Common
'common_user_onekey_bind_mobile_list',
'common_user_address_platform_import_list',
];
- return ConfigService::ConfigSave(ConfigService::FieldsEmptyDataHandle($_POST, $field_list));
+ return ApiService::ApiDataReturn(ConfigService::ConfigSave(ConfigService::FieldsEmptyDataHandle($_POST, $field_list)));
}
}
?>
\ No newline at end of file
diff --git a/app/admin/controller/Apphomenav.php b/app/admin/controller/Apphomenav.php
index e2fd539d0..68e41a331 100755
--- a/app/admin/controller/Apphomenav.php
+++ b/app/admin/controller/Apphomenav.php
@@ -10,6 +10,8 @@
// +----------------------------------------------------------------------
namespace app\admin\controller;
+use app\admin\controller\Base;
+use app\service\ApiService;
use app\service\AppHomeNavService;
use app\service\ResourcesService;
@@ -20,27 +22,8 @@ use app\service\ResourcesService;
* @version 0.0.1
* @datetime 2016-12-01T21:51:08+0800
*/
-class AppHomeNav extends Common
+class AppHomeNav extends Base
{
- /**
- * 构造方法
- * @author Devil
- * @blog http://gong.gg/
- * @version 0.0.1
- * @datetime 2016-12-03T12:39:08+0800
- */
- public function __construct()
- {
- // 调用父类前置方法
- parent::__construct();
-
- // 登录校验
- $this->IsLogin();
-
- // 权限校验
- $this->IsPower();
- }
-
/**
* 列表
* @author Devil
@@ -74,19 +57,23 @@ class AppHomeNav extends Common
*/
public function SaveInfo()
{
- // 参数
- $params = $this->data_request;
+ // 模板数据
+ $assign = [
+ // 静态数据
+ 'common_platform_type' => MyConst('common_platform_type'),
+ 'common_app_event_type' => MyConst('common_app_event_type'),
- // 静态数据
- MyViewAssign('common_platform_type', MyConst('common_platform_type'));
- MyViewAssign('common_app_event_type', MyConst('common_app_event_type'));
-
- // 编辑器文件存放地址
- MyViewAssign('editor_path_type', ResourcesService::EditorPathTypeValue('app_nav'));
+ // 编辑器文件存放地址
+ 'editor_path_type' => ResourcesService::EditorPathTypeValue('app_nav'),
+ ];
// 数据
+ $params = $this->data_request;
unset($params['id']);
- MyViewAssign('params', $params);
+ $assign['params'] = $params;
+
+ // 模板赋值
+ MyViewAssign($assign);
return MyView();
}
@@ -107,7 +94,7 @@ class AppHomeNav extends Common
// 开始处理
$params = $this->data_request;
- return AppHomeNavService::AppHomeNavSave($params);
+ return ApiService::ApiDataReturn(AppHomeNavService::AppHomeNavSave($params));
}
/**
@@ -128,7 +115,7 @@ class AppHomeNav extends Common
// 开始处理
$params = $this->data_request;
$params['user_type'] = 'admin';
- return AppHomeNavService::AppHomeNavDelete($params);
+ return ApiService::ApiDataReturn(AppHomeNavService::AppHomeNavDelete($params));
}
/**
@@ -148,7 +135,7 @@ class AppHomeNav extends Common
// 开始处理
$params = $this->data_request;
- return AppHomeNavService::AppHomeNavStatusUpdate($params);
+ return ApiService::ApiDataReturn(AppHomeNavService::AppHomeNavStatusUpdate($params));
}
}
?>
\ No newline at end of file
diff --git a/app/admin/controller/Appmini.php b/app/admin/controller/Appmini.php
index 22f202e51..eb209a8c8 100755
--- a/app/admin/controller/Appmini.php
+++ b/app/admin/controller/Appmini.php
@@ -10,6 +10,8 @@
// +----------------------------------------------------------------------
namespace app\admin\controller;
+use app\admin\controller\Base;
+use app\service\ApiService;
use app\service\AppMiniService;
use app\service\ConfigService;
use app\service\StoreService;
@@ -22,7 +24,7 @@ use app\service\StoreService;
* @date 2020-07-13
* @desc description
*/
-class Appmini extends Common
+class Appmini extends Base
{
private $params;
private $application_name;
@@ -43,12 +45,6 @@ class Appmini extends Common
// 调用父类前置方法
parent::__construct();
- // 登录校验
- $this->IsLogin();
-
- // 权限校验
- $this->IsPower();
-
// 参数
$this->params = $this->data_request;
$this->params['application_name'] = empty($this->data_request['nav_type']) ? 'weixin' : trim($this->data_request['nav_type']);
@@ -68,29 +64,33 @@ class Appmini extends Common
public function Index()
{
// 公共视图
- $this->CurrentViewInit();
+ $assign = $this->CurrentViewInit();
+ // 根据页面处理
switch($this->view_type)
{
// 首页
case 'index' :
// 默认主题
- MyViewAssign('theme', AppMiniService::DefaultTheme());
+ $assign['theme'] = AppMiniService::DefaultTheme();
// 获取主题列表
$data = AppMiniService::ThemeList($this->params);
- MyViewAssign('data_list', $data);
+ $assign['data_list'] = $data;
// 插件更新信息
$upgrade = AppMiniService::AppMiniUpgradeInfo(['terminal'=>$this->params['application_name'], 'data'=>$data]);
- MyViewAssign('upgrade_info', $upgrade['data']);
+ $assign['upgrade_info'] = $upgrade['data'];
break;
// 源码包列表
case 'package' :
- $this->Package();
+ $assign = array_merge($assign, $this->Package());
break;
}
+
+ // 模板赋值
+ MyViewAssign($assign);
return MyView($this->view_type);
}
@@ -132,11 +132,13 @@ class Appmini extends Common
'url' => $host.'qq.html',
],
];
- MyViewAssign('nav_dev_tips', $nav_dev_tips);
// 源码包列表
$ret = AppMiniService::DownloadDataList($this->params);
- MyViewAssign('data_list', $ret['data']);
+ return [
+ 'nav_dev_tips' => $nav_dev_tips,
+ 'data_list' => $ret['data'],
+ ];
}
/**
@@ -149,37 +151,38 @@ class Appmini extends Common
*/
public function CurrentViewInit()
{
- // 操作导航类型
- MyViewAssign('nav_type', $this->params['application_name']);
+ return [
+ // 操作导航类型
+ 'nav_type' => $this->params['application_name'],
- // 操作页面类型
- MyViewAssign('view_type', $this->view_type);
+ // 操作页面类型
+ 'view_type' => $this->view_type,
- // 应用商店
- MyViewAssign('store_theme_url', StoreService::StoreThemeUrl());
+ // 应用商店
+ 'store_theme_url' => StoreService::StoreThemeUrl(),
- // 小程序平台
- MyViewAssign('common_appmini_type', MyConst('common_appmini_type'));
+ // 小程序平台
+ 'common_appmini_type' => MyConst('common_appmini_type'),
- // 是否
- MyViewAssign('common_is_text_list', MyConst('common_is_text_list'));
+ // 是否
+ 'common_is_text_list' => MyConst('common_is_text_list'),
- // 基础导航
- $base_nav = [
- [
- 'view_type' => 'index',
- 'name' => '当前主题',
- ],
- [
- 'view_type' => 'upload',
- 'name' => '主题安装',
- ],
- [
- 'view_type' => 'package',
- 'name' => '源码包下载',
+ // 基础导航
+ 'base_nav' => [
+ [
+ 'view_type' => 'index',
+ 'name' => '当前主题',
+ ],
+ [
+ 'view_type' => 'upload',
+ 'name' => '主题安装',
+ ],
+ [
+ 'view_type' => 'package',
+ 'name' => '源码包下载',
+ ],
],
];
- MyViewAssign('base_nav', $base_nav);
}
/**
@@ -199,7 +202,7 @@ class Appmini extends Common
}
// 开始处理
- return AppMiniService::ThemeUpload($this->params);
+ return ApiService::ApiDataReturn(AppMiniService::ThemeUpload($this->params));
}
/**
@@ -218,7 +221,7 @@ class Appmini extends Common
{
$ret['msg'] = '切换成功';
}
- return $ret;
+ return ApiService::ApiDataReturn($ret);
}
/**
@@ -236,8 +239,6 @@ class Appmini extends Common
{
MyViewAssign('msg', $ret['msg']);
return MyView('public/tips_error');
- } else {
- return $ret;
}
}
@@ -259,7 +260,7 @@ class Appmini extends Common
// 开始处理
$params = array_merge($this->params, $this->data_request);
- return AppMiniService::ThemeDelete($params);
+ return ApiService::ApiDataReturn(AppMiniService::ThemeDelete($params));
}
/**
@@ -273,10 +274,13 @@ class Appmini extends Common
public function Config()
{
// 公共视图
- $this->CurrentViewInit();
+ $assign = $this->CurrentViewInit();
// 配置信息
- MyViewAssign('data', ConfigService::ConfigList());
+ $assign['data'] = ConfigService::ConfigList();
+
+ // 模板赋值
+ MyViewAssign($assign);
return MyView();
}
@@ -297,7 +301,7 @@ class Appmini extends Common
}
// 开始操作
- return AppMiniService::Created($this->params);
+ return ApiService::ApiDataReturn(AppMiniService::Created($this->params));
}
/**
@@ -310,7 +314,7 @@ class Appmini extends Common
*/
public function Save()
{
- return ConfigService::ConfigSave($_POST);
+ return ApiService::ApiDataReturn(ConfigService::ConfigSave($_POST));
}
/**
@@ -326,11 +330,11 @@ class Appmini extends Common
// 是否ajax请求
if(!IS_AJAX)
{
- $this->error('非法访问');
+ return $this->error('非法访问');
}
// 开始操作
- return AppMiniService::Delete($this->params);
+ return ApiService::ApiDataReturn(AppMiniService::Delete($this->params));
}
}
?>
\ No newline at end of file
diff --git a/app/admin/controller/Article.php b/app/admin/controller/Article.php
index cc5613ac0..6c117cf21 100755
--- a/app/admin/controller/Article.php
+++ b/app/admin/controller/Article.php
@@ -10,6 +10,8 @@
// +----------------------------------------------------------------------
namespace app\admin\controller;
+use app\admin\controller\Base;
+use app\service\ApiService;
use app\service\ArticleService;
use app\service\ResourcesService;
@@ -20,28 +22,9 @@ use app\service\ResourcesService;
* @version 0.0.1
* @datetime 2016-12-01T21:51:08+0800
*/
-class Article extends Common
+class Article extends Base
{
/**
- * 构造方法
- * @author Devil
- * @blog http://gong.gg/
- * @version 0.0.1
- * @datetime 2016-12-03T12:39:08+0800
- */
- public function __construct()
- {
- // 调用父类前置方法
- parent::__construct();
-
- // 登录校验
- $this->IsLogin();
-
- // 权限校验
- $this->IsPower();
- }
-
- /**
* 列表
* @author Devil
* @blog http://gong.gg/
@@ -74,34 +57,40 @@ class Article extends Common
*/
public function SaveInfo()
{
- // 参数
+ // 模板数据
+ $assign = [
+ // 编辑器文件存放地址
+ 'editor_path_type' => ResourcesService::EditorPathTypeValue('article'),
+ ];
+
+ // 文章分类
+ $article_category = ArticleService::ArticleCategoryList(['field'=>'id,name']);
+ $assign['article_category_list'] = $article_category['data'];
+
+ // 参数
$params = $this->data_request;
// 数据
$data = $this->data_detail;
- // 文章分类
- $article_category = ArticleService::ArticleCategoryList(['field'=>'id,name']);
- MyViewAssign('article_category_list', $article_category['data']);
-
// 文章编辑页面钩子
$hook_name = 'plugins_view_admin_article_save';
- MyViewAssign($hook_name.'_data', MyEventTrigger($hook_name,
+ $assign[$hook_name.'_data'] = MyEventTrigger($hook_name,
[
'hook_name' => $hook_name,
'is_backend' => true,
'article_id' => isset($params['id']) ? $params['id'] : 0,
'data' => &$data,
'params' => &$params,
- ]));
+ ]);
- // 编辑器文件存放地址
- MyViewAssign('editor_path_type', ResourcesService::EditorPathTypeValue('article'));
-
- // 数据
+ // 数据/参数
unset($params['id']);
- MyViewAssign('data', $data);
- MyViewAssign('params', $params);
+ $assign['data'] = $data;
+ $assign['params'] = $params;
+
+ // 模板赋值
+ MyViewAssign($assign);
return MyView();
}
@@ -122,7 +111,7 @@ class Article extends Common
// 开始处理
$params = $this->data_request;
- return ArticleService::ArticleSave($params);
+ return ApiService::ApiDataReturn(ArticleService::ArticleSave($params));
}
/**
@@ -143,7 +132,7 @@ class Article extends Common
// 开始处理
$params = $this->data_request;
$params['admin'] = $this->admin;
- return ArticleService::ArticleDelete($params);
+ return ApiService::ApiDataReturn(ArticleService::ArticleDelete($params));
}
/**
@@ -164,7 +153,7 @@ class Article extends Common
// 开始处理
$params = $this->data_request;
$params['admin'] = $this->admin;
- return ArticleService::ArticleStatusUpdate($params);
+ return ApiService::ApiDataReturn(ArticleService::ArticleStatusUpdate($params));
}
}
?>
\ No newline at end of file
diff --git a/app/admin/controller/Articlecategory.php b/app/admin/controller/Articlecategory.php
index 9971d9b7b..57c751448 100755
--- a/app/admin/controller/Articlecategory.php
+++ b/app/admin/controller/Articlecategory.php
@@ -10,6 +10,8 @@
// +----------------------------------------------------------------------
namespace app\admin\controller;
+use app\admin\controller\Base;
+use app\service\ApiService;
use app\service\ArticleService;
/**
@@ -19,29 +21,10 @@ use app\service\ArticleService;
* @version 0.0.1
* @datetime 2016-12-01T21:51:08+0800
*/
-class ArticleCategory extends Common
+class ArticleCategory extends Base
{
/**
- * 构造方法
- * @author Devil
- * @blog http://gong.gg/
- * @version 0.0.1
- * @datetime 2016-12-03T12:39:08+0800
- */
- public function __construct()
- {
- // 调用父类前置方法
- parent::__construct();
-
- // 登录校验
- $this->IsLogin();
-
- // 权限校验
- $this->IsPower();
- }
-
- /**
- * [Index 文章分类列表]
+ * 列表
* @author Devil
* @blog http://gong.gg/
* @version 0.0.1
@@ -51,12 +34,11 @@ class ArticleCategory extends Common
{
// 是否启用
MyViewAssign('common_is_enable_list', MyConst('common_is_enable_list'));
-
return MyView();
}
/**
- * [GetNodeSon 获取节点子列表]
+ * 获取节点子列表
* @author Devil
* @blog http://gong.gg/
* @version 0.0.1
@@ -67,15 +49,15 @@ class ArticleCategory extends Common
// 是否ajax请求
if(!IS_AJAX)
{
- $this->error('非法访问');
+ return $this->error('非法访问');
}
// 开始操作
- return ArticleService::ArticleCategoryNodeSon($this->data_request);
+ return ApiService::ApiDataReturn(ArticleService::ArticleCategoryNodeSon($this->data_request));
}
/**
- * [Save 文章分类保存]
+ * 保存
* @author Devil
* @blog http://gong.gg/
* @version 0.0.1
@@ -86,15 +68,15 @@ class ArticleCategory extends Common
// 是否ajax请求
if(!IS_AJAX)
{
- $this->error('非法访问');
+ return $this->error('非法访问');
}
// 开始操作
- return ArticleService::ArticleCategorySave($this->data_request);
+ return ApiService::ApiDataReturn(ArticleService::ArticleCategorySave($this->data_request));
}
/**
- * [Delete 文章分类删除]
+ * 删除
* @author Devil
* @blog http://gong.gg/
* @version 0.0.1
@@ -111,7 +93,7 @@ class ArticleCategory extends Common
// 开始操作
$params = $this->data_post;
$params['admin'] = $this->admin;
- return ArticleService::ArticleCategoryDelete($params);
+ return ApiService::ApiDataReturn(ArticleService::ArticleCategoryDelete($params));
}
}
?>
\ No newline at end of file
diff --git a/app/admin/controller/Base.php b/app/admin/controller/Base.php
new file mode 100644
index 000000000..b09fb9caa
--- /dev/null
+++ b/app/admin/controller/Base.php
@@ -0,0 +1,43 @@
+IsLogin();
+
+ // 权限校验
+ $this->IsPower();
+ }
+}
+?>
\ No newline at end of file
diff --git a/app/admin/controller/Brand.php b/app/admin/controller/Brand.php
index 99a44eb2b..d9850c90e 100755
--- a/app/admin/controller/Brand.php
+++ b/app/admin/controller/Brand.php
@@ -10,6 +10,8 @@
// +----------------------------------------------------------------------
namespace app\admin\controller;
+use app\admin\controller\Base;
+use app\service\ApiService;
use app\service\BrandService;
use app\service\BrandCategoryService;
use app\service\ResourcesService;
@@ -21,28 +23,9 @@ use app\service\ResourcesService;
* @version 0.0.1
* @datetime 2016-12-01T21:51:08+0800
*/
-class Brand extends Common
+class Brand extends Base
{
/**
- * 构造方法
- * @author Devil
- * @blog http://gong.gg/
- * @version 0.0.1
- * @datetime 2016-12-03T12:39:08+0800
- */
- public function __construct()
- {
- // 调用父类前置方法
- parent::__construct();
-
- // 登录校验
- $this->IsLogin();
-
- // 权限校验
- $this->IsPower();
- }
-
- /**
* 列表
* @author Devil
* @blog http://gong.gg/
@@ -75,37 +58,42 @@ class Brand extends Common
*/
public function SaveInfo()
{
+ // 模板数据
+ $assign = [
+ // 静态数据
+ 'common_is_enable_list' => MyConst('common_is_enable_list'),
+ // 编辑器文件存放地址
+ 'editor_path_type' => ResourcesService::EditorPathTypeValue('brand'),
+ ];
+
+ // 品牌分类
+ $brand_category = BrandCategoryService::BrandCategoryList(['field'=>'id,name']);
+ $assign['brand_category'] = $brand_category['data'];
+
// 参数
$params = $this->data_request;
// 数据
$data = $this->data_detail;
- // 是否启用
- MyViewAssign('common_is_enable_list', MyConst('common_is_enable_list'));
-
- // 品牌分类
- $brand_category = BrandCategoryService::BrandCategoryList(['field'=>'id,name']);
- MyViewAssign('brand_category', $brand_category['data']);
-
// 编辑页面钩子
$hook_name = 'plugins_view_admin_brand_save';
- MyViewAssign($hook_name.'_data', MyEventTrigger($hook_name,
+ $assign[$hook_name.'_data'] = MyEventTrigger($hook_name,
[
'hook_name' => $hook_name,
'is_backend' => true,
'data_id' => isset($params['id']) ? $params['id'] : 0,
'data' => &$data,
'params' => &$params,
- ]));
+ ]);
- // 编辑器文件存放地址
- MyViewAssign('editor_path_type', ResourcesService::EditorPathTypeValue('brand'));
-
- // 数据
+ // 数据/参数
unset($params['id']);
- MyViewAssign('data', $data);
- MyViewAssign('params', $params);
+ $assign['data'] = $data;
+ $assign['params'] = $params;
+
+ // 模板赋值
+ MyViewAssign($assign);
return MyView();
}
@@ -126,7 +114,7 @@ class Brand extends Common
// 开始处理
$params = $this->data_request;
- return BrandService::BrandSave($params);
+ return ApiService::ApiDataReturn(BrandService::BrandSave($params));
}
/**
@@ -147,7 +135,7 @@ class Brand extends Common
// 开始处理
$params = $this->data_request;
$params['user_type'] = 'admin';
- return BrandService::BrandDelete($params);
+ return ApiService::ApiDataReturn(BrandService::BrandDelete($params));
}
/**
@@ -167,7 +155,7 @@ class Brand extends Common
// 开始处理
$params = $this->data_request;
- return BrandService::BrandStatusUpdate($params);
+ return ApiService::ApiDataReturn(BrandService::BrandStatusUpdate($params));
}
}
?>
\ No newline at end of file
diff --git a/app/admin/controller/Brandcategory.php b/app/admin/controller/Brandcategory.php
index e09b99d44..2397c515a 100755
--- a/app/admin/controller/Brandcategory.php
+++ b/app/admin/controller/Brandcategory.php
@@ -10,6 +10,8 @@
// +----------------------------------------------------------------------
namespace app\admin\controller;
+use app\admin\controller\Base;
+use app\service\ApiService;
use app\service\BrandCategoryService;
/**
@@ -19,29 +21,10 @@ use app\service\BrandCategoryService;
* @version 0.0.1
* @datetime 2016-12-01T21:51:08+0800
*/
-class BrandCategory extends Common
+class BrandCategory extends Base
{
/**
- * 构造方法
- * @author Devil
- * @blog http://gong.gg/
- * @version 0.0.1
- * @datetime 2016-12-03T12:39:08+0800
- */
- public function __construct()
- {
- // 调用父类前置方法
- parent::__construct();
-
- // 登录校验
- $this->IsLogin();
-
- // 权限校验
- $this->IsPower();
- }
-
- /**
- * [Index 品牌分类列表]
+ * 列表
* @author Devil
* @blog http://gong.gg/
* @version 0.0.1
@@ -51,12 +34,11 @@ class BrandCategory extends Common
{
// 是否启用
MyViewAssign('common_is_enable_list', MyConst('common_is_enable_list'));
-
return MyView();
}
/**
- * [GetNodeSon 获取节点子列表]
+ * 获取节点子列表
* @author Devil
* @blog http://gong.gg/
* @version 0.0.1
@@ -67,15 +49,15 @@ class BrandCategory extends Common
// 是否ajax请求
if(!IS_AJAX)
{
- $this->error('非法访问');
+ return $this->error('非法访问');
}
// 开始操作
- return BrandCategoryService::BrandCategoryNodeSon($this->data_request);
+ return ApiService::ApiDataReturn(BrandCategoryService::BrandCategoryNodeSon($this->data_request));
}
/**
- * [Save 品牌分类保存]
+ * 保存
* @author Devil
* @blog http://gong.gg/
* @version 0.0.1
@@ -86,15 +68,15 @@ class BrandCategory extends Common
// 是否ajax请求
if(!IS_AJAX)
{
- $this->error('非法访问');
+ return $this->error('非法访问');
}
// 开始操作
- return BrandCategoryService::BrandCategorySave($this->data_request);
+ return ApiService::ApiDataReturn(BrandCategoryService::BrandCategorySave($this->data_request));
}
/**
- * [Delete 品牌分类删除]
+ * 删除
* @author Devil
* @blog http://gong.gg/
* @version 0.0.1
@@ -111,7 +93,7 @@ class BrandCategory extends Common
// 开始操作
$params = $this->data_post;
$params['admin'] = $this->admin;
- return BrandCategoryService::BrandCategoryDelete($params);
+ return ApiService::ApiDataReturn(BrandCategoryService::BrandCategoryDelete($params));
}
}
?>
\ No newline at end of file
diff --git a/app/admin/controller/Cache.php b/app/admin/controller/Cache.php
index 6c14df405..61a41fdcc 100755
--- a/app/admin/controller/Cache.php
+++ b/app/admin/controller/Cache.php
@@ -10,6 +10,8 @@
// +----------------------------------------------------------------------
namespace app\admin\controller;
+use app\admin\controller\Base;
+use app\service\ApiService;
use app\service\CacheService;
use app\service\AdminPowerService;
@@ -20,29 +22,10 @@ use app\service\AdminPowerService;
* @version 0.0.1
* @datetime 2016-12-01T21:51:08+0800
*/
-class Cache extends Common
+class Cache extends Base
{
/**
- * 构造方法
- * @author Devil
- * @blog http://gong.gg/
- * @version 0.0.1
- * @datetime 2016-12-03T12:39:08+0800
- */
- public function __construct()
- {
- // 调用父类前置方法
- parent::__construct();
-
- // 登录校验
- $this->IsLogin();
-
- // 权限校验
- $this->IsPower();
- }
-
- /**
- * [Index 首页]
+ * 首页
* @author Devil
* @blog http://gong.gg/
* @version 0.0.1
@@ -56,7 +39,7 @@ class Cache extends Common
}
/**
- * [StatusUpdate 站点缓存更新]
+ * 站点缓存更新
* @author Devil
* @blog http://gong.gg/
* @version 0.0.1
@@ -75,11 +58,11 @@ class Cache extends Common
// 初始化菜单
AdminPowerService::PowerMenuInit($this->admin);
- return DataReturn('更新成功', 0);
+ return ApiService::ApiDataReturn(DataReturn('更新成功', 0));
}
/**
- * [TemplateUpdate 模板缓存更新]
+ * 模板缓存更新
* @author Devil
* @blog http://gong.gg/
* @version 0.0.1
@@ -91,11 +74,11 @@ class Cache extends Common
\base\FileUtil::UnlinkDir(ROOT.'runtime'.DS.'index'.DS.'temp');
\base\FileUtil::UnlinkDir(ROOT.'runtime'.DS.'api'.DS.'temp');
- return DataReturn('更新成功', 0);
+ return ApiService::ApiDataReturn(DataReturn('更新成功', 0));
}
/**
- * [ModuleUpdate 模块缓存更新]
+ * 模块缓存更新
* @author Devil
* @blog http://gong.gg/
* @version 0.0.1
@@ -103,11 +86,11 @@ class Cache extends Common
*/
public function ModuleUpdate()
{
- return DataReturn('更新成功', 0);
+ return ApiService::ApiDataReturn(DataReturn('更新成功', 0));
}
/**
- * [LogDelete 日志删除]
+ * 日志删除
* @author Devil
* @blog http://gong.gg/
* @version 0.0.1
@@ -119,7 +102,7 @@ class Cache extends Common
\base\FileUtil::UnlinkDir(ROOT.'runtime'.DS.'index'.DS.'log');
\base\FileUtil::UnlinkDir(ROOT.'runtime'.DS.'api'.DS.'log');
- return DataReturn('更新成功', 0);
+ return ApiService::ApiDataReturn(DataReturn('更新成功', 0));
}
}
?>
\ No newline at end of file
diff --git a/app/admin/controller/Common.php b/app/admin/controller/Common.php
index adf1f44fc..26236ab2c 100755
--- a/app/admin/controller/Common.php
+++ b/app/admin/controller/Common.php
@@ -131,7 +131,7 @@ class Common extends BaseController
}
/**
- * [IsLogin 登录校验]
+ * 登录校验
* @author Devil
* @blog http://gong.gg/
* @version 0.0.1
@@ -159,16 +159,19 @@ class Common extends BaseController
*/
public function ViewInit()
{
+ // 模板数据
+ $assign = [];
+
// 系统类型
$this->system_type = SystemService::SystemTypeValue();
- MyViewAssign('system_type', $this->system_type);
+ $assign['system_type'] = $this->system_type;
// 公共参数
- MyViewAssign('params', $this->data_request);
+ $assign['params'] = $this->data_request;
// 主题
$default_theme = 'default';
- MyViewAssign('default_theme', $default_theme);
+ $assign['default_theme'] = $default_theme;
// 当前系统操作名称
$this->module_name = RequestModule();
@@ -176,9 +179,9 @@ class Common extends BaseController
$this->action_name = RequestAction();
// 当前系统操作名称
- MyViewAssign('module_name', $this->module_name);
- MyViewAssign('controller_name', $this->controller_name);
- MyViewAssign('action_name', $this->action_name);
+ $assign['module_name'] = $this->module_name;
+ $assign['controller_name'] = $this->controller_name;
+ $assign['action_name'] = $this->action_name;
// 当前插件操作名称, 兼容插件模块名称
if(empty($this->data_request['pluginsname']))
@@ -193,77 +196,77 @@ class Common extends BaseController
}
// 当前插件操作名称
- MyViewAssign('plugins_module_name', $this->plugins_module_name);
- MyViewAssign('plugins_controller_name', $this->plugins_controller_name);
- MyViewAssign('plugins_action_name', $this->plugins_action_name);
+ $assign['plugins_module_name'] = $this->plugins_module_name;
+ $assign['plugins_controller_name'] = $this->plugins_controller_name;
+ $assign['plugins_action_name'] = $this->plugins_action_name;
// 管理员
- MyViewAssign('admin', $this->admin);
+ $assign['admin'] = $this->admin;
// 权限菜单
- MyViewAssign('left_menu', $this->left_menu);
+ $assign['left_menu'] = $this->left_menu;
// 分页信息
$this->page = max(1, isset($this->data_request['page']) ? intval($this->data_request['page']) : 1);
$this->page_size = min(empty($this->data_request['page_size']) ? MyC('common_page_size', 10, true) : intval($this->data_request['page_size']), 1000);
- MyViewAssign('page', $this->page);
- MyViewAssign('page_size', $this->page_size);
+ $assign['page'] = $this->page;
+ $assign['page_size'] = $this->page_size;
// 货币符号
- MyViewAssign('currency_symbol', ResourcesService::CurrencyDataSymbol());
+ $assign['currency_symbol'] = ResourcesService::CurrencyDataSymbol();
// 控制器静态文件状态css,js
$module_css = $this->module_name.DS.$default_theme.DS.'css'.DS.$this->controller_name;
$module_css .= file_exists(ROOT_PATH.'static'.DS.$module_css.'.'.$this->action_name.'.css') ? '.'.$this->action_name.'.css' : '.css';
- MyViewAssign('module_css', file_exists(ROOT_PATH.'static'.DS.$module_css) ? $module_css : '');
+ $assign['module_css'] = file_exists(ROOT_PATH.'static'.DS.$module_css) ? $module_css : '';
$module_js = $this->module_name.DS.$default_theme.DS.'js'.DS.$this->controller_name;
$module_js .= file_exists(ROOT_PATH.'static'.DS.$module_js.'.'.$this->action_name.'.js') ? '.'.$this->action_name.'.js' : '.js';
- MyViewAssign('module_js', file_exists(ROOT_PATH.'static'.DS.$module_js) ? $module_js : '');
+ $assign['module_js'] = file_exists(ROOT_PATH.'static'.DS.$module_js) ? $module_js : '';
// 价格正则
- MyViewAssign('default_price_regex', MyConst('common_regex_price'));
+ $assign['default_price_regex'] = MyConst('common_regex_price');
// 附件host地址
- MyViewAssign('attachment_host', SystemBaseService::AttachmentHost());
+ $assign['attachment_host'] = SystemBaseService::AttachmentHost();
// css/js引入host地址
- MyViewAssign('public_host', MyConfig('shopxo.public_host'));
+ $assign['public_host'] = MyConfig('shopxo.public_host');
// 当前url地址
- MyViewAssign('my_domain', __MY_DOMAIN__);
+ $assign['my_domain'] = __MY_DOMAIN__;
// 当前完整url地址
- MyViewAssign('my_url', __MY_URL__);
+ $assign['my_url'] = __MY_URL__;
// 项目public目录URL地址
- MyViewAssign('my_public_url', __MY_PUBLIC_URL__);
+ $assign['my_public_url'] = __MY_PUBLIC_URL__;
// 当前http类型
- MyViewAssign('my_http', __MY_HTTP__);
+ $assign['my_http'] = __MY_HTTP__;
// 首页地址
- MyViewAssign('home_url', SystemService::HomeUrl());
+ $assign['home_url'] = SystemService::HomeUrl();
// 开发模式
- MyViewAssign('shopxo_is_develop', MyConfig('shopxo.is_develop'));
+ $assign['shopxo_is_develop'] = MyConfig('shopxo.is_develop');
// 是否加载视频播放器组件
- MyViewAssign('is_load_ckplayer', 0);
+ $assign['is_load_ckplayer'] = 0;
// 默认不加载地图api、类型默认百度地图
- MyViewAssign('is_load_map_api', 0);
- MyViewAssign('load_map_type', MyC('common_map_type', 'baidu', true));
+ $assign['is_load_map_api'] = 0;
+ $assign['load_map_type'] = MyC('common_map_type', 'baidu', true);
// 布局样式+管理
- MyViewAssign('is_load_layout', 0);
- MyViewAssign('is_load_layout_admin', 0);
+ $assign['is_load_layout'] = 0;
+ $assign['is_load_layout_admin'] = 0;
// 是否加载附件组件
- MyViewAssign('is_load_upload_editor', !empty($this->admin) ? 1 : 0);
+ $assign['is_load_upload_editor'] = !empty($this->admin) ? 1 : 0;
// 站点名称
- MyViewAssign('admin_theme_site_name', MyC('admin_theme_site_name', 'ShopXO', true));
+ $assign['admin_theme_site_name'] = MyC('admin_theme_site_name', 'ShopXO', true);
// 站点商店信息
$site_store_error = '';
@@ -278,35 +281,38 @@ class Common extends BaseController
$site_store_error = $ret['msg'];
}
}
- MyViewAssign('site_store_error', $site_store_error);
- MyViewAssign('site_store_info', $site_store_info);
+ $assign['site_store_error'] = $site_store_error;
+ $assign['site_store_info'] = $site_store_info;
// 更多链接地址
$site_store_links = empty($site_store_info['links']) ? [] : $site_store_info['links'];
- MyViewAssign('site_store_links', $site_store_links);
+ $assign['site_store_links'] = $site_store_links;
// 系统基础信息
$is_system_show_base = (empty($site_store_info) || empty($site_store_info['vip']) || !isset($site_store_info['vip']['status']) || $site_store_info['vip']['status'] == 0 || ($site_store_info['vip']['status'] == 1 && (AdminIsPower('index', 'storeaccountsbind') || AdminIsPower('index', 'inspectupgrade')))) ? 1 : 0;
- MyViewAssign('is_system_show_base', $is_system_show_base);
+ $assign['is_system_show_base'] = $is_system_show_base;
// 后台公告
$admin_notice = MyC('admin_notice');
- MyViewAssign('admin_notice', empty($admin_notice) ? '' : str_replace("\n", '
', $admin_notice));
+ $assign['admin_notice'] = empty($admin_notice) ? '' : str_replace("\n", '
', $admin_notice);
// 系统环境参数最大数
- MyViewAssign('env_max_input_vars_count', SystemService::EnvMaxInputVarsCount());
+ $assign['env_max_input_vars_count'] = SystemService::EnvMaxInputVarsCount();
// 主题配色
$this->admin_color_value = intval(MyCookie($this->admin_color_value_key));
if($this->admin_color_value == 1)
{
- MyViewAssign('admin_color_name', '普通白色');
- MyViewAssign('admin_color_url', MyUrl('admin/index/color', ['value'=>0]));
+ $assign['admin_color_name'] = '普通白色';
+ $assign['admin_color_url'] = MyUrl('admin/index/color', ['value'=>0]);
} else {
- MyViewAssign('admin_color_name', '夜间深色');
- MyViewAssign('admin_color_url', MyUrl('admin/index/color', ['value'=>1]));
+ $assign['admin_color_name'] = '夜间深色';
+ $assign['admin_color_url'] = MyUrl('admin/index/color', ['value'=>1]);
}
- MyViewAssign('admin_color_value', $this->admin_color_value);
+ $assign['admin_color_value'] = $this->admin_color_value;
+
+ // 模板赋值
+ MyViewAssign($assign);
}
/**
@@ -324,6 +330,7 @@ class Common extends BaseController
if(!empty($module))
{
// 调用表格处理
+ $assign = [];
$params = $this->data_request;
$params['system_admin'] = $this->admin;
$ret = (new FormHandleModule())->Run($module['module'], $module['action'], $params);
@@ -336,19 +343,19 @@ class Common extends BaseController
$this->form_md5_key = $ret['data']['md5_key'];
$this->form_user_fields = $ret['data']['user_fields'];
$this->form_order_by = $ret['data']['order_by'];
- MyViewAssign('form_table', $this->form_table);
- MyViewAssign('form_params', $this->form_params);
- MyViewAssign('form_md5_key', $this->form_md5_key);
- MyViewAssign('form_user_fields', $this->form_user_fields);
- MyViewAssign('form_order_by', $this->form_order_by);
+ $assign['form_table'] = $this->form_table;
+ $assign['form_params'] = $this->form_params;
+ $assign['form_md5_key'] = $this->form_md5_key;
+ $assign['form_user_fields'] = $this->form_user_fields;
+ $assign['form_order_by'] = $this->form_order_by;
// 列表数据
$this->data_total = $ret['data']['data_total'];
$this->data_list = $ret['data']['data_list'];
$this->data_detail = $ret['data']['data_detail'];
- MyViewAssign('data_total', $this->data_total);
- MyViewAssign('data_list', $this->data_list);
- MyViewAssign('data', $this->data_detail);
+ $assign['data_total'] = $this->data_total;
+ $assign['data_list'] = $this->data_list;
+ $assign['data'] = $this->data_detail;
// 分页数据
$this->page = $ret['data']['page'];
@@ -356,15 +363,17 @@ class Common extends BaseController
$this->page_size = $ret['data']['page_size'];
$this->page_html = $ret['data']['page_html'];
$this->page_url = $ret['data']['page_url'];
- MyViewAssign('page', $this->page);
- MyViewAssign('page_start', $this->page_start);
- MyViewAssign('page_size', $this->page_size);
- MyViewAssign('page_html', $this->page_html);
- MyViewAssign('page_url', $this->page_url);
+ $assign['page'] = $this->page;
+ $assign['page_start'] = $this->page_start;
+ $assign['page_size'] = $this->page_size;
+ $assign['page_html'] = $this->page_html;
+ $assign['page_url'] = $this->page_url;
} else {
$this->form_error = $ret['msg'];
- MyViewAssign('form_error', $this->form_error);
+ $assign['form_error'] = $this->form_error;
}
+ // 模板赋值
+ MyViewAssign($assign);
}
}
@@ -378,14 +387,14 @@ class Common extends BaseController
protected function IsPower()
{
// 不需要校验权限的方法
- $unwanted_power = ['getnodeson'];
+ $unwanted_power = ['getnodeson', 'node'];
if(!AdminIsPower(null, null, $unwanted_power))
{
if(IS_AJAX)
{
exit(json_encode(DataReturn('无权限', -1000)));
} else {
- return $this->error('无权限');
+ MyRedirect(MyUrl('admin/error/tips', ['msg'=>urlencode(base64_encode('无权限'))]), true);
}
}
}
@@ -461,23 +470,32 @@ class Common extends BaseController
*/
private function CommonPluginsInit()
{
- // css钩子
- MyViewAssign('plugins_admin_css_data', MyEventTrigger('plugins_admin_css', ['hook_name'=>'plugins_admin_css', 'is_backend'=>true]));
+ // 模板数据
+ $assign = [];
- // js钩子
- MyViewAssign('plugins_admin_js_data', MyEventTrigger('plugins_admin_js', ['hook_name'=>'plugins_admin_js', 'is_backend'=>true]));
-
- // 公共header内钩子
- MyViewAssign('plugins_admin_common_header_data', MyEventTrigger('plugins_admin_common_header', ['hook_name'=>'plugins_admin_common_header', 'is_backend'=>true, 'admin'=>$this->admin]));
-
- // 公共页面底部钩子
- MyViewAssign('plugins_admin_common_page_bottom_data', MyEventTrigger('plugins_admin_common_page_bottom', ['hook_name'=>'plugins_admin_common_page_bottom', 'is_backend'=>true, 'admin'=>$this->admin]));
-
- // 公共顶部钩子
- MyViewAssign('plugins_admin_view_common_top_data', MyEventTrigger('plugins_admin_view_common_top', ['hook_name'=>'plugins_admin_view_common_top', 'is_backend'=>true, 'admin'=>$this->admin]));
-
- // 公共底部钩子
- MyViewAssign('plugins_admin_view_common_bottom_data', MyEventTrigger('plugins_admin_view_common_bottom', ['hook_name'=>'plugins_admin_view_common_bottom', 'is_backend'=>true, 'admin'=>$this->admin]));
+ // 钩子列表
+ $hook_arr = [
+ // css钩子
+ 'plugins_admin_css',
+ // js钩子
+ 'plugins_admin_js',
+ // 公共header内钩子
+ 'plugins_admin_common_header',
+ // 公共页面底部钩子
+ 'plugins_admin_common_page_bottom',
+ // 公共顶部钩子
+ 'plugins_admin_view_common_top',
+ // 公共底部钩子
+ 'plugins_admin_view_common_bottom',
+ ];
+ foreach($hook_arr as $hook_name)
+ {
+ $assign[$hook_name.'_data'] = MyEventTrigger($hook_name,
+ ['hook_name' => $hook_name,
+ 'is_backend' => false,
+ 'admin' => $this->admin,
+ ]);
+ }
// 公共表格钩子名称动态处理
$current = 'plugins_view_admin_'.$this->controller_name;
@@ -492,31 +510,34 @@ class Common extends BaseController
}
// 表格列表公共标识
- MyViewAssign('hook_name_form_grid', $current.'_grid');
+ $assign['hook_name_form_grid'] = $current.'_grid';
// 内容外部顶部
- MyViewAssign('hook_name_content_top', $current.'_content_top');
+ $assign['hook_name_content_top'] = $current.'_content_top';
// 内容外部底部
- MyViewAssign('hook_name_content_bottom', $current.'_content_bottom');
+ $assign['hook_name_content_bottom'] = $current.'_content_bottom';
// 内容内部顶部
- MyViewAssign('hook_name_content_inside_top', $current.'_content_inside_top');
+ $assign['hook_name_content_inside_top'] = $current.'_content_inside_top';
// 内容内部底部
- MyViewAssign('hook_name_content_inside_bottom', $current.'_content_inside_bottom');
+ $assign['hook_name_content_inside_bottom'] = $current.'_content_inside_bottom';
// 表格列表顶部操作
- MyViewAssign('hook_name_form_top_operate', $current.'_top_operate');
+ $assign['hook_name_form_top_operate'] = $current.'_top_operate';
// 表格列表底部操作
- MyViewAssign('hook_name_form_bottom_operate', $current.'_bottom_operate');
+ $assign['hook_name_form_bottom_operate'] = $current.'_bottom_operate';
// 表格列表后面操作栏
- MyViewAssign('hook_name_form_list_operate', $current.'_list_operate');
+ $assign['hook_name_form_list_operate'] = $current.'_list_operate';
// 公共详情页面钩子名称动态处理
// 内容外部顶部
- MyViewAssign('hook_name_detail_top', $current.'_detail_top');
+ $assign['hook_name_detail_top'] = $current.'_detail_top';
// 内容外部底部
- MyViewAssign('hook_name_detail_bottom', $current.'_detail_bottom');
+ $assign['hook_name_detail_bottom'] = $current.'_detail_bottom';
// 内容内部顶部
- MyViewAssign('hook_name_detail_inside_top', $current.'_detail_inside_top');
+ $assign['hook_name_detail_inside_top'] = $current.'_detail_inside_top';
// 内容内部底部
- MyViewAssign('hook_name_detail_inside_bottom', $current.'_detail_inside_bottom');
+ $assign['hook_name_detail_inside_bottom'] = $current.'_detail_inside_bottom';
+
+ // 模板赋值
+ MyViewAssign($assign);
}
}
?>
\ No newline at end of file
diff --git a/app/admin/controller/Config.php b/app/admin/controller/Config.php
index 8af32bce4..2e4aeef5e 100755
--- a/app/admin/controller/Config.php
+++ b/app/admin/controller/Config.php
@@ -10,6 +10,8 @@
// +----------------------------------------------------------------------
namespace app\admin\controller;
+use app\admin\controller\Base;
+use app\service\ApiService;
use app\service\ConfigService;
/**
@@ -19,28 +21,9 @@ use app\service\ConfigService;
* @version 0.0.1
* @datetime 2016-12-01T21:51:08+0800
*/
-class Config extends Common
+class Config extends Base
{
/**
- * 构造方法
- * @author Devil
- * @blog http://gong.gg/
- * @version 0.0.1
- * @datetime 2016-12-03T12:39:08+0800
- */
- public function __construct()
- {
- // 调用父类前置方法
- parent::__construct();
-
- // 登录校验
- $this->IsLogin();
-
- // 权限校验
- $this->IsPower();
- }
-
- /**
* 后台配置
* @author Devil
* @blog http://gong.gg/
@@ -49,19 +32,24 @@ class Config extends Common
*/
public function Index()
{
- // 静态数据
- MyViewAssign('common_excel_charset_list', MyConst('common_excel_charset_list'));
- MyViewAssign('common_excel_export_type_list', MyConst('common_excel_export_type_list'));
- MyViewAssign('common_map_type_list', MyConst('common_map_type_list'));
- MyViewAssign('common_is_enable_list', MyConst('common_is_enable_list'));
- MyViewAssign('common_login_type_list', MyConst('common_login_type_list'));
- MyViewAssign('common_close_open_list', MyConst('common_close_open_list'));
- MyViewAssign('common_is_text_list', MyConst('common_is_text_list'));
+ // 模板数据
+ $assign = [
+ // 静态数据
+ 'common_excel_charset_list' => MyConst('common_excel_charset_list'),
+ 'common_excel_export_type_list' => MyConst('common_excel_export_type_list'),
+ 'common_map_type_list' => MyConst('common_map_type_list'),
+ 'common_is_enable_list' => MyConst('common_is_enable_list'),
+ 'common_login_type_list' => MyConst('common_login_type_list'),
+ 'common_close_open_list' => MyConst('common_close_open_list'),
+ 'common_is_text_list' => MyConst('common_is_text_list'),
- // 配置信息
- MyViewAssign('data', ConfigService::ConfigList());
-
- MyViewAssign('view_type', 'index');
+ // 数据
+ 'data' => ConfigService::ConfigList(),
+
+ // 页面类型
+ 'view_type' => 'index',
+ ];
+ MyViewAssign($assign);
return MyView();
}
@@ -74,10 +62,15 @@ class Config extends Common
*/
public function Store()
{
- // 配置信息
- MyViewAssign('data', ConfigService::ConfigList());
-
- MyViewAssign('view_type', 'store');
+ // 模板数据
+ $assign = [
+ // 数据
+ 'data' => ConfigService::ConfigList(),
+
+ // 页面类型
+ 'view_type' => 'store',
+ ];
+ MyViewAssign($assign);
return MyView();
}
@@ -124,7 +117,7 @@ class Config extends Common
}
// 保存
- return ConfigService::ConfigSave($params);
+ return ApiService::ApiDataReturn(ConfigService::ConfigSave($params));
}
}
?>
\ No newline at end of file
diff --git a/app/admin/controller/Customview.php b/app/admin/controller/Customview.php
index ea01b38bc..2cfac9dfd 100755
--- a/app/admin/controller/Customview.php
+++ b/app/admin/controller/Customview.php
@@ -10,6 +10,8 @@
// +----------------------------------------------------------------------
namespace app\admin\controller;
+use app\admin\controller\Base;
+use app\service\ApiService;
use app\service\CustomViewService;
/**
@@ -19,28 +21,9 @@ use app\service\CustomViewService;
* @version 0.0.1
* @datetime 2016-12-01T21:51:08+0800
*/
-class CustomView extends Common
+class CustomView extends Base
{
/**
- * 构造方法
- * @author Devil
- * @blog http://gong.gg/
- * @version 0.0.1
- * @datetime 2016-12-03T12:39:08+0800
- */
- public function __construct()
- {
- // 调用父类前置方法
- parent::__construct();
-
- // 登录校验
- $this->IsLogin();
-
- // 权限校验
- $this->IsPower();
- }
-
- /**
* 列表
* @author Devil
* @blog http://gong.gg/
@@ -97,7 +80,7 @@ class CustomView extends Common
// 开始处理
$params = $this->data_request;
- return CustomViewService::CustomViewSave($params);
+ return ApiService::ApiDataReturn(CustomViewService::CustomViewSave($params));
}
/**
@@ -118,7 +101,7 @@ class CustomView extends Common
// 开始处理
$params = $this->data_request;
$params['user_type'] = 'admin';
- return CustomViewService::CustomViewDelete($params);
+ return ApiService::ApiDataReturn(CustomViewService::CustomViewDelete($params));
}
/**
@@ -138,7 +121,7 @@ class CustomView extends Common
// 开始处理
$params = $this->data_request;
- return CustomViewService::CustomViewStatusUpdate($params);
+ return ApiService::ApiDataReturn(CustomViewService::CustomViewStatusUpdate($params));
}
}
?>
\ No newline at end of file
diff --git a/app/admin/controller/Design.php b/app/admin/controller/Design.php
index 71b64cd55..9352b5309 100644
--- a/app/admin/controller/Design.php
+++ b/app/admin/controller/Design.php
@@ -10,6 +10,8 @@
// +----------------------------------------------------------------------
namespace app\admin\controller;
+use app\admin\controller\Base;
+use app\service\ApiService;
use app\service\DesignService;
use app\service\GoodsService;
use app\service\BrandService;
@@ -24,27 +26,8 @@ use app\layout\service\BaseLayout;
* @date 2020-09-10
* @desc description
*/
-class Design extends Common
+class Design extends Base
{
- /**
- * 构造方法
- * @author Devil
- * @blog http://gong.gg/
- * @version 0.0.1
- * @datetime 2016-12-03T12:39:08+0800
- */
- public function __construct()
- {
- // 调用父类前置方法
- parent::__construct();
-
- // 登录校验
- $this->IsLogin();
-
- // 权限校验
- $this->IsPower();
- }
-
/**
* 首页
* @author Devil
@@ -57,7 +40,6 @@ class Design extends Common
{
// 应用商店
MyViewAssign('store_design_url', StoreService::StoreDesignUrl());
-
return MyView();
}
@@ -88,39 +70,45 @@ class Design extends Common
// 配置处理
$layout_data = BaseLayout::ConfigAdminHandle($data['config']);
unset($data['config']);
- MyViewAssign('layout_data', $layout_data);
- MyViewAssign('data', $data);
-
- // 页面列表
- $pages_list = BaseLayout::PagesList();
- MyViewAssign('pages_list', $pages_list);
// 商品分类
$goods_category = GoodsService::GoodsCategoryAll();
- MyViewAssign('goods_category_list', $goods_category);
- // 商品搜索分类(分类)
- MyViewAssign('layout_goods_category', $goods_category);
- MyViewAssign('layout_goods_category_field', 'gci.category_id');
+ // 模板数据
+ $assign = [
+ 'layout_data' => $layout_data,
+ 'data' => $data,
- // 品牌
- MyViewAssign('brand_list', BrandService::CategoryBrand());
+ // 页面列表
+ 'pages_list' => BaseLayout::PagesList(),
- // 静态数据
- MyViewAssign('border_style_type_list', BaseLayout::$border_style_type_list);
- MyViewAssign('goods_view_list_show_style', BaseLayout::$goods_view_list_show_style);
- MyViewAssign('many_images_view_list_show_style', BaseLayout::$many_images_view_list_show_style);
+ // 商品分类
+ 'goods_category_list' => $goods_category,
- // 首页商品排序规则
- MyViewAssign('goods_order_by_type_list', MyConst('goods_order_by_type_list'));
- MyViewAssign('goods_order_by_rule_list', MyConst('goods_order_by_rule_list'));
+ // 商品搜索分类(分类)
+ 'layout_goods_category' => $goods_category,
+ 'layout_goods_category_field' => 'gci.category_id',
- // 加载布局样式+管理
- MyViewAssign('is_load_layout', 1);
- MyViewAssign('is_load_layout_admin', 1);
+ // 品牌
+ 'brand_list' => BrandService::CategoryBrand(),
- // 编辑器文件存放地址定义
- MyViewAssign('editor_path_type', DesignService::AttachmentPathTypeValue($data['id']));
+ // 静态数据
+ 'border_style_type_list' => BaseLayout::$border_style_type_list,
+ 'goods_view_list_show_style' => BaseLayout::$goods_view_list_show_style,
+ 'many_images_view_list_show_style' => BaseLayout::$many_images_view_list_show_style,
+
+ // 首页商品排序规则
+ 'goods_order_by_type_list' => MyConst('goods_order_by_type_list'),
+ 'goods_order_by_rule_list' => MyConst('goods_order_by_rule_list'),
+
+ // 加载布局样式+管理
+ 'is_load_layout' => 1,
+ 'is_load_layout_admin' => 1,
+
+ // 编辑器文件存放地址定义
+ 'editor_path_type' => DesignService::AttachmentPathTypeValue($data['id']),
+ ];
+ MyViewAssign($assign);
return MyView();
}
@@ -134,13 +122,6 @@ class Design extends Common
*/
public function Download()
{
- // 是否有权限
- if(!AdminIsPower())
- {
- return $this->error('无权限');
- }
-
- // 下载数据
$ret = DesignService::DesignDownload($this->data_request);
if(isset($ret['code']) && $ret['code'] != 0)
{
@@ -166,7 +147,7 @@ class Design extends Common
}
// 开始处理
- return DesignService::DesignSave($this->data_post);
+ return ApiService::ApiDataReturn(DesignService::DesignSave($this->data_post));
}
/**
@@ -186,7 +167,7 @@ class Design extends Common
}
// 开始操作
- return DesignService::DesignStatusUpdate($this->data_post);
+ return ApiService::ApiDataReturn(DesignService::DesignStatusUpdate($this->data_post));
}
/**
@@ -206,7 +187,7 @@ class Design extends Common
}
// 开始操作
- return DesignService::DesignDelete($this->data_post);
+ return ApiService::ApiDataReturn(DesignService::DesignDelete($this->data_post));
}
/**
@@ -222,11 +203,11 @@ class Design extends Common
// 是否ajax请求
if(!IS_AJAX)
{
- $this->error('非法访问');
+ return $this->error('非法访问');
}
// 开始操作
- return DesignService::DesignSync($this->data_post);
+ return ApiService::ApiDataReturn(DesignService::DesignSync($this->data_post));
}
/**
@@ -242,11 +223,11 @@ class Design extends Common
// 是否ajax请求
if(!IS_AJAX)
{
- $this->error('非法访问');
+ return $this->error('非法访问');
}
// 开始操作
- return DesignService::DesignUpload($this->data_request);
+ return ApiService::ApiDataReturn(DesignService::DesignUpload($this->data_request));
}
}
?>
\ No newline at end of file
diff --git a/app/admin/controller/Email.php b/app/admin/controller/Email.php
index d176fea79..7f7be7426 100755
--- a/app/admin/controller/Email.php
+++ b/app/admin/controller/Email.php
@@ -10,6 +10,8 @@
// +----------------------------------------------------------------------
namespace app\admin\controller;
+use app\admin\controller\Base;
+use app\service\ApiService;
use app\service\ConfigService;
/**
@@ -19,29 +21,10 @@ use app\service\ConfigService;
* @version 0.0.1
* @datetime 2016-12-01T21:51:08+0800
*/
-class Email extends Common
+class Email extends Base
{
/**
- * 构造方法
- * @author Devil
- * @blog http://gong.gg/
- * @version 0.0.1
- * @datetime 2016-12-03T12:39:08+0800
- */
- public function __construct()
- {
- // 调用父类前置方法
- parent::__construct();
-
- // 登录校验
- $this->IsLogin();
-
- // 权限校验
- $this->IsPower();
- }
-
- /**
- * [Index 配置列表]
+ * 列表
* @author Devil
* @blog http://gong.gg/
* @version 0.0.1
@@ -49,25 +32,24 @@ class Email extends Common
*/
public function Index()
{
- // 配置信息
- MyViewAssign('data', ConfigService::ConfigList());
- $type = input('type', 'email');
-
- // 静态数据
- MyViewAssign('common_is_text_list', MyConst('common_is_text_list'));
-
// 导航
- MyViewAssign('nav_type', $type);
- if($type == 'email')
- {
- return MyView('index');
- } else {
- return MyView('message');
- }
+ $type = empty($this->data_request['type']) ? 'index' : $this->data_request['type'];
+ $assign = [
+
+ // 静态数据
+ 'common_is_text_list' => MyConst('common_is_text_list'),
+ // 配置信息
+ 'data' => ConfigService::ConfigList(),
+
+ // 页面导航
+ 'nav_type' => $type,
+ ];
+ MyViewAssign($assign);
+ return MyView($type);
}
/**
- * [Save 配置数据保存]
+ * 保存
* @author Devil
* @blog http://gong.gg/
* @version 0.0.1
@@ -75,11 +57,11 @@ class Email extends Common
*/
public function Save()
{
- return ConfigService::ConfigSave($_POST);
+ return ApiService::ApiDataReturn(ConfigService::ConfigSave($_POST));
}
/**
- * [EmailTest 邮件测试]
+ * 邮件测试
* @author Devil
* @blog http://gong.gg/
* @version 0.0.1
@@ -88,23 +70,25 @@ class Email extends Common
public function EmailTest()
{
// 验证码公共基础参数
- $verify_param = array(
- 'expire_time' => MyC('common_verify_expire_time'),
+ $verify_param = [
+ 'expire_time' => MyC('common_verify_expire_time'),
'interval_time' => MyC('common_verify_interval_time'),
- );
+ ];
$obj = new \base\Email($verify_param);
- $email_param = array(
+ $email_param = [
'email' => isset($this->data_request['email']) ? $this->data_request['email'] : '',
'content' => '邮件配置-发送测试内容',
'title' => MyC('home_site_name').' - '.'测试',
- );
+ ];
// 发送
if($obj->SendHtml($email_param))
{
- return DataReturn('发送成功');
+ $ret = DataReturn('发送成功');
+ } else {
+ $ret = DataReturn('发送失败'.'['.$obj->error.']', -100);
}
- return DataReturn('发送失败'.'['.$obj->error.']', -100);
+ return ApiService::ApiDataReturn($ret);
}
}
?>
\ No newline at end of file
diff --git a/app/admin/controller/Error.php b/app/admin/controller/Error.php
index c1bedd3d3..f20bfb1d3 100755
--- a/app/admin/controller/Error.php
+++ b/app/admin/controller/Error.php
@@ -10,6 +10,8 @@
// +----------------------------------------------------------------------
namespace app\admin\controller;
+use app\service\ApiService;
+
/**
* 空控制器响应
* @author Devil
@@ -34,11 +36,26 @@ class Error extends Common
{
if(IS_AJAX)
{
- return DataReturn(RequestController().' 控制器不存在', -1000);
+ return ApiService::ApiDataReturn(DataReturn(RequestController().' 控制器不存在', -1000));
} else {
MyViewAssign('msg', RequestController().' 控制器不存在');
return MyView('public/tips_error');
}
}
+
+ /**
+ * 错误信息提示
+ * @author Devil
+ * @blog http://gong.gg/
+ * @version 1.0.0
+ * @date 2022-08-17
+ * @desc description
+ */
+ public function Tips()
+ {
+ $msg = empty($this->data_request['msg']) ? '异常错误' : urldecode(base64_decode($this->data_request['msg']));
+ MyViewAssign('msg', $msg);
+ return MyView('public/tips_error');
+ }
}
?>
\ No newline at end of file
diff --git a/app/admin/controller/Express.php b/app/admin/controller/Express.php
index 6b8135053..3957f6dd6 100755
--- a/app/admin/controller/Express.php
+++ b/app/admin/controller/Express.php
@@ -10,6 +10,8 @@
// +----------------------------------------------------------------------
namespace app\admin\controller;
+use app\admin\controller\Base;
+use app\service\ApiService;
use app\service\ExpressService;
use app\service\ResourcesService;
@@ -20,29 +22,10 @@ use app\service\ResourcesService;
* @version 0.0.1
* @datetime 2016-12-01T21:51:08+0800
*/
-class Express extends Common
+class Express extends Base
{
/**
- * 构造方法
- * @author Devil
- * @blog http://gong.gg/
- * @version 0.0.1
- * @datetime 2016-12-03T12:39:08+0800
- */
- public function __construct()
- {
- // 调用父类前置方法
- parent::__construct();
-
- // 登录校验
- $this->IsLogin();
-
- // 权限校验
- $this->IsPower();
- }
-
- /**
- * [Index 快递列表]
+ * 列表
* @author Devil
* @blog http://gong.gg/
* @version 0.0.1
@@ -50,17 +33,20 @@ class Express extends Common
*/
public function Index()
{
- // 是否启用
- MyViewAssign('common_is_enable_list', MyConst('common_is_enable_list'));
-
- // 编辑器文件存放地址
- MyViewAssign('editor_path_type', ResourcesService::EditorPathTypeValue('express'));
+ // 模板数据
+ $assign = [
+ // 静态数据
+ 'common_is_enable_list' => MyConst('common_is_enable_list'),
+ // 编辑器文件存放地址
+ 'editor_path_type' => ResourcesService::EditorPathTypeValue('express'),
+ ];
+ MyViewAssign($assign);
return MyView();
}
/**
- * [GetNodeSon 获取节点子列表]
+ * 获取节点子列表
* @author Devil
* @blog http://gong.gg/
* @version 0.0.1
@@ -71,15 +57,15 @@ class Express extends Common
// 是否ajax请求
if(!IS_AJAX)
{
- $this->error('非法访问');
+ return $this->error('非法访问');
}
// 开始操作
- return ExpressService::ExpressNodeSon($this->data_request);
+ return ApiService::ApiDataReturn(ExpressService::ExpressNodeSon($this->data_request));
}
/**
- * [Save 快递保存]
+ * 保存
* @author Devil
* @blog http://gong.gg/
* @version 0.0.1
@@ -90,15 +76,15 @@ class Express extends Common
// 是否ajax请求
if(!IS_AJAX)
{
- $this->error('非法访问');
+ return $this->error('非法访问');
}
// 开始操作
- return ExpressService::ExpressSave($this->data_request);
+ return ApiService::ApiDataReturn(ExpressService::ExpressSave($this->data_request));
}
/**
- * [Delete 快递删除]
+ * 删除
* @author Devil
* @blog http://gong.gg/
* @version 0.0.1
@@ -115,7 +101,7 @@ class Express extends Common
// 开始操作
$params = $this->data_post;
$params['admin'] = $this->admin;
- return ExpressService::ExpressDelete($params);
+ return ApiService::ApiDataReturn(ExpressService::ExpressDelete($params));
}
}
?>
\ No newline at end of file
diff --git a/app/admin/controller/Formtable.php b/app/admin/controller/Formtable.php
index b1bc617fd..859ca450e 100644
--- a/app/admin/controller/Formtable.php
+++ b/app/admin/controller/Formtable.php
@@ -10,6 +10,7 @@
// +----------------------------------------------------------------------
namespace app\admin\controller;
+use app\service\ApiService;
use app\service\FormTableService;
/**
@@ -50,7 +51,7 @@ class FormTable extends Common
$params = $this->data_post;
$params['user_id'] = $this->admin['id'];
$params['user_type'] = 0;
- return FormTableService::FieldsSelectSave($params);
+ return ApiService::ApiDataReturn(FormTableService::FieldsSelectSave($params));
}
/**
@@ -66,7 +67,7 @@ class FormTable extends Common
$params = $this->data_post;
$params['user_id'] = $this->admin['id'];
$params['user_type'] = 0;
- return FormTableService::FieldsSelectReset($params);
+ return ApiService::ApiDataReturn(FormTableService::FieldsSelectReset($params));
}
}
?>
\ No newline at end of file
diff --git a/app/admin/controller/Goods.php b/app/admin/controller/Goods.php
index b0df8c813..931b56853 100755
--- a/app/admin/controller/Goods.php
+++ b/app/admin/controller/Goods.php
@@ -10,6 +10,8 @@
// +----------------------------------------------------------------------
namespace app\admin\controller;
+use app\admin\controller\Base;
+use app\service\ApiService;
use app\service\SystemBaseService;
use app\service\GoodsService;
use app\service\RegionService;
@@ -24,28 +26,9 @@ use app\service\ResourcesService;
* @version 0.0.1
* @datetime 2016-12-01T21:51:08+0800
*/
-class Goods extends Common
+class Goods extends Base
{
/**
- * 构造方法
- * @author Devil
- * @blog http://gong.gg/
- * @version 0.0.1
- * @datetime 2016-12-03T12:39:08+0800
- */
- public function __construct()
- {
- // 调用父类前置方法
- parent::__construct();
-
- // 登录校验
- $this->IsLogin();
-
- // 权限校验
- $this->IsPower();
- }
-
- /**
* 列表
* @author Devil
* @blog http://gong.gg/
@@ -66,20 +49,20 @@ class Goods extends Common
*/
public function Detail()
{
- $data = $this->data_detail;
- if(!empty($data))
+ // 模板数据
+ $assign = [
+ // 商品参数类型
+ 'common_goods_parameters_type_list' => MyConst('common_goods_parameters_type_list'),
+ ];
+ if(!empty($this->data_detail))
{
// 获取商品编辑规格
- $specifications = GoodsService::GoodsEditSpecifications($data['id']);
- MyViewAssign('specifications', $specifications);
+ $assign['specifications'] = GoodsService::GoodsEditSpecifications($this->data_detail['id']);
// 获取商品编辑参数
- $parameters = GoodsService::GoodsEditParameters($data['id']);
- MyViewAssign('parameters', $parameters);
-
- // 商品参数类型
- MyViewAssign('common_goods_parameters_type_list', MyConst('common_goods_parameters_type_list'));
+ $assign['parameters'] = GoodsService::GoodsEditParameters($this->data_detail['id']);
}
+ MyViewAssign($assign);
return MyView();
}
@@ -95,47 +78,47 @@ class Goods extends Common
// 参数
$params = $this->data_request;
- // 商品信息
+ // 是否存在数据
$data = $this->data_detail;
- if(!empty($params['id']))
+ if(!empty($params['id']) && empty($data))
{
- if(empty($data))
- {
- return $this->error('商品信息不存在', MyUrl('admin/goods/index'));
- }
-
- // 获取商品编辑规格
- $specifications = GoodsService::GoodsEditSpecifications($data['id']);
- MyViewAssign('specifications', $specifications);
-
- // 获取商品编辑参数
- $parameters = GoodsService::GoodsEditParameters($data['id']);
- MyViewAssign('parameters', $parameters);
+ return $this->error('商品信息不存在', MyUrl('admin/goods/index'));
}
- // 地区信息
- MyViewAssign('region_province_list', RegionService::RegionItems(['pid'=>0]));
+ // 模板信息
+ $assign = [
+ // 商品参数类型
+ 'common_goods_parameters_type_list' => MyConst('common_goods_parameters_type_list'),
+ // 站点类型
+ 'common_site_type_list' => MyConst('common_site_type_list'),
+ // 当前系统设置的站点类型
+ 'common_site_type' => SystemBaseService::SiteTypeValue(),
+ // 地区信息
+ 'region_province_list' => RegionService::RegionItems(['pid'=>0]),
+ // 商品分类
+ 'goods_category_list' => GoodsService::GoodsCategoryAll(),
+ // 品牌
+ 'brand_list' => BrandService::CategoryBrand(),
+ // 编辑器文件存放地址
+ 'editor_path_type' => ResourcesService::EditorPathTypeValue('goods'),
+ ];
- // 商品分类
- MyViewAssign('goods_category_list', GoodsService::GoodsCategoryAll());
+ // 商品信息
+ if(!empty($data))
+ {
+ // 获取商品编辑规格
+ $assign['specifications'] = GoodsService::GoodsEditSpecifications($data['id']);
- // 品牌
- MyViewAssign('brand_list', BrandService::CategoryBrand());
+ // 获取商品编辑参数
+ $assign['parameters'] = GoodsService::GoodsEditParameters($data['id']);
+ }
// 规格扩展数据
$goods_spec_extends = GoodsService::GoodsSpecificationsExtends($params);
- MyViewAssign('goods_specifications_extends', $goods_spec_extends['data']);
-
- // 站点类型
- MyViewAssign('common_site_type_list', MyConst('common_site_type_list'));
- // 当前系统设置的站点类型
- MyViewAssign('common_site_type', SystemBaseService::SiteTypeValue());
-
- // 商品参数类型
- MyViewAssign('common_goods_parameters_type_list', MyConst('common_goods_parameters_type_list'));
+ $assign['goods_specifications_extends'] = $goods_spec_extends['data'];
// 商品参数模板
- $data_params = array(
+ $data_params = [
'm' => 0,
'n' => 0,
'where' => [
@@ -143,31 +126,31 @@ class Goods extends Common
['config_count', '>', 0],
],
'field' => 'id,name',
- );
+ ];
$template = GoodsParamsService::GoodsParamsTemplateList($data_params);
- MyViewAssign('goods_template_list', $template['data']);
+ $assign['goods_template_list'] = $template['data'];
// 是否拷贝
- MyViewAssign('is_copy', (isset($params['is_copy']) && $params['is_copy'] == 1) ? 1 : 0);
+ $assign['is_copy'] = (isset($params['is_copy']) && $params['is_copy'] == 1) ? 1 : 0;
// 商品编辑页面钩子
$hook_name = 'plugins_view_admin_goods_save';
- MyViewAssign($hook_name.'_data', MyEventTrigger($hook_name,
+ $assign[$hook_name.'_data'] = MyEventTrigger($hook_name,
[
'hook_name' => $hook_name,
'is_backend' => true,
'goods_id' => isset($params['id']) ? $params['id'] : 0,
'data' => &$data,
'params' => &$params,
- ]));
+ ]);
- // 编辑器文件存放地址
- MyViewAssign('editor_path_type', ResourcesService::EditorPathTypeValue('goods'));
-
- // 数据
+ // 数据/参数
unset($params['id'], $params['is_copy']);
- MyViewAssign('data', $data);
- MyViewAssign('params', $params);
+ $assign['data'] = $data;
+ $assign['params'] = $params;
+
+ // 数据赋值
+ MyViewAssign($assign);
return MyView();
}
@@ -189,7 +172,7 @@ class Goods extends Common
// 开始操作
$params = $this->data_post;
$params['admin'] = $this->admin;
- return GoodsService::GoodsSave($params);
+ return ApiService::ApiDataReturn(GoodsService::GoodsSave($params));
}
/**
@@ -210,7 +193,7 @@ class Goods extends Common
// 开始操作
$params = $this->data_post;
$params['admin'] = $this->admin;
- return GoodsService::GoodsDelete($params);
+ return ApiService::ApiDataReturn(GoodsService::GoodsDelete($params));
}
/**
@@ -231,7 +214,7 @@ class Goods extends Common
// 开始操作
$params = $this->data_post;
$params['admin'] = $this->admin;
- return GoodsService::GoodsStatusUpdate($params);
+ return ApiService::ApiDataReturn(GoodsService::GoodsStatusUpdate($params));
}
}
?>
\ No newline at end of file
diff --git a/app/admin/controller/Goodsbrowse.php b/app/admin/controller/Goodsbrowse.php
index 13d4f906b..7b73fcf51 100644
--- a/app/admin/controller/Goodsbrowse.php
+++ b/app/admin/controller/Goodsbrowse.php
@@ -10,6 +10,8 @@
// +----------------------------------------------------------------------
namespace app\admin\controller;
+use app\admin\controller\Base;
+use app\service\ApiService;
use app\service\GoodsBrowseService;
/**
@@ -20,27 +22,8 @@ use app\service\GoodsBrowseService;
* @date 2020-06-30
* @desc description
*/
-class GoodsBrowse extends Common
+class GoodsBrowse extends Base
{
- /**
- * 构造方法
- * @author Devil
- * @blog http://gong.gg/
- * @version 0.0.1
- * @datetime 2016-12-03T12:39:08+0800
- */
- public function __construct()
- {
- // 调用父类前置方法
- parent::__construct();
-
- // 登录校验
- $this->IsLogin();
-
- // 权限校验
- $this->IsPower();
- }
-
/**
* 列表
* @author Devil
@@ -86,7 +69,7 @@ class GoodsBrowse extends Common
// 开始处理
$params = $this->data_request;
$params['user_type'] = 'admin';
- return GoodsBrowseService::GoodsBrowseDelete($params);
+ return ApiService::ApiDataReturn(GoodsBrowseService::GoodsBrowseDelete($params));
}
}
?>
\ No newline at end of file
diff --git a/app/admin/controller/Goodscategory.php b/app/admin/controller/Goodscategory.php
index 1e14e44e4..cab61c20b 100755
--- a/app/admin/controller/Goodscategory.php
+++ b/app/admin/controller/Goodscategory.php
@@ -10,6 +10,8 @@
// +----------------------------------------------------------------------
namespace app\admin\controller;
+use app\admin\controller\Base;
+use app\service\ApiService;
use app\service\GoodsService;
use app\service\ResourcesService;
@@ -20,29 +22,10 @@ use app\service\ResourcesService;
* @version 0.0.1
* @datetime 2016-12-01T21:51:08+0800
*/
-class GoodsCategory extends Common
+class GoodsCategory extends Base
{
/**
- * 构造方法
- * @author Devil
- * @blog http://gong.gg/
- * @version 0.0.1
- * @datetime 2016-12-03T12:39:08+0800
- */
- public function __construct()
- {
- // 调用父类前置方法
- parent::__construct();
-
- // 登录校验
- $this->IsLogin();
-
- // 权限校验
- $this->IsPower();
- }
-
- /**
- * [Index 分类列表]
+ * 列表
* @author Devil
* @blog http://gong.gg/
* @version 0.0.1
@@ -50,20 +33,23 @@ class GoodsCategory extends Common
*/
public function Index()
{
- // 静态数据
- MyViewAssign('common_is_text_list', MyConst('common_is_text_list'));
+ // 模板数据
+ $assign = [
+ // 静态数据
+ 'common_is_text_list' => MyConst('common_is_text_list'),
- // 商品分类
- MyViewAssign('goods_category_list', GoodsService::GoodsCategoryAll());
-
- // 编辑器文件存放地址
- MyViewAssign('editor_path_type', ResourcesService::EditorPathTypeValue('goods_category'));
+ // 商品分类
+ 'goods_category_list' => GoodsService::GoodsCategoryAll(),
+ // 编辑器文件存放地址
+ 'editor_path_type' => ResourcesService::EditorPathTypeValue('goods_category'),
+ ];
+ MyViewAssign($assign);
return MyView();
}
/**
- * [GetNodeSon 获取节点子列表]
+ * 获取节点子列表
* @author Devil
* @blog http://gong.gg/
* @version 0.0.1
@@ -74,16 +60,16 @@ class GoodsCategory extends Common
// 是否ajax请求
if(!IS_AJAX)
{
- $this->error('非法访问');
+ return $this->error('非法访问');
}
// 开始操作
- return GoodsService::GoodsCategoryNodeSon($this->data_request);
+ return ApiService::ApiDataReturn(GoodsService::GoodsCategoryNodeSon($this->data_request));
}
/**
- * [Save 分类保存]
+ * 保存
* @author Devil
* @blog http://gong.gg/
* @version 0.0.1
@@ -94,15 +80,15 @@ class GoodsCategory extends Common
// 是否ajax请求
if(!IS_AJAX)
{
- $this->error('非法访问');
+ return $this->error('非法访问');
}
// 开始操作
- return GoodsService::GoodsCategorySave($this->data_request);
+ return ApiService::ApiDataReturn(GoodsService::GoodsCategorySave($this->data_request));
}
/**
- * [Delete 分类删除]
+ * 删除
* @author Devil
* @blog http://gong.gg/
* @version 0.0.1
@@ -119,7 +105,7 @@ class GoodsCategory extends Common
// 开始操作
$params = $this->data_post;
$params['admin'] = $this->admin;
- return GoodsService::GoodsCategoryDelete($params);
+ return ApiService::ApiDataReturn(GoodsService::GoodsCategoryDelete($params));
}
}
?>
\ No newline at end of file
diff --git a/app/admin/controller/Goodscomments.php b/app/admin/controller/Goodscomments.php
index 10b9e600f..5cb4a08db 100644
--- a/app/admin/controller/Goodscomments.php
+++ b/app/admin/controller/Goodscomments.php
@@ -10,6 +10,8 @@
// +----------------------------------------------------------------------
namespace app\admin\controller;
+use app\admin\controller\Base;
+use app\service\ApiService;
use app\service\GoodsCommentsService;
/**
@@ -19,27 +21,8 @@ use app\service\GoodsCommentsService;
* @version 0.0.1
* @datetime 2016-12-01T21:51:08+0800
*/
-class Goodscomments extends Common
+class Goodscomments extends Base
{
- /**
- * 构造方法
- * @author Devil
- * @blog http://gong.gg/
- * @version 0.0.1
- * @datetime 2016-12-03T12:39:08+0800
- */
- public function __construct()
- {
- // 调用父类前置方法
- parent::__construct();
-
- // 登录校验
- $this->IsLogin();
-
- // 权限校验
- $this->IsPower();
- }
-
/**
* 列表
* @author Devil
@@ -74,22 +57,24 @@ class Goodscomments extends Common
*/
public function SaveInfo()
{
+ // 模板数据
+ $assign = [
+ // 数据
+ 'data' => $this->data_detail,
+ // 静态数据
+ 'common_is_show_list' => MyConst('common_is_show_list'),
+ 'common_is_text_list' => MyConst('common_is_text_list'),
+ 'common_goods_comments_rating_list' => MyConst('common_goods_comments_rating_list'),
+ 'common_goods_comments_business_type_list' => MyConst('common_goods_comments_business_type_list'),
+ ];
+
// 参数
$params = $this->data_request;
-
- // 数据
- $data = $this->data_detail;
- MyViewAssign('data', $data);
-
- // 静态数据
- MyViewAssign('common_is_show_list', MyConst('common_is_show_list'));
- MyViewAssign('common_is_text_list', MyConst('common_is_text_list'));
- MyViewAssign('common_goods_comments_rating_list', MyConst('common_goods_comments_rating_list'));
- MyViewAssign('common_goods_comments_business_type_list', MyConst('common_goods_comments_business_type_list'));
-
- // 参数
unset($params['id']);
- MyViewAssign('params', $params);
+ $assign['params'] = $params;
+
+ // 数据赋值
+ MyViewAssign($assign);
return MyView();
}
@@ -110,7 +95,7 @@ class Goodscomments extends Common
// 开始处理
$params = $this->data_request;
- return GoodsCommentsService::GoodsCommentsSave($params);
+ return ApiService::ApiDataReturn(GoodsCommentsService::GoodsCommentsSave($params));
}
/**
@@ -130,7 +115,7 @@ class Goodscomments extends Common
// 开始处理
$params = $this->data_request;
- return GoodsCommentsService::GoodsCommentsDelete($params);
+ return ApiService::ApiDataReturn(GoodsCommentsService::GoodsCommentsDelete($params));
}
/**
@@ -150,7 +135,7 @@ class Goodscomments extends Common
// 开始处理
$params = $this->data_request;
- return GoodsCommentsService::GoodsCommentsReply($params);
+ return ApiService::ApiDataReturn(GoodsCommentsService::GoodsCommentsReply($params));
}
/**
@@ -170,7 +155,7 @@ class Goodscomments extends Common
// 开始处理
$params = $this->data_request;
- return GoodsCommentsService::GoodsCommentsStatusUpdate($params);
+ return ApiService::ApiDataReturn(GoodsCommentsService::GoodsCommentsStatusUpdate($params));
}
}
?>
\ No newline at end of file
diff --git a/app/admin/controller/Goodsfavor.php b/app/admin/controller/Goodsfavor.php
index ed8e325d9..ff6d3743e 100644
--- a/app/admin/controller/Goodsfavor.php
+++ b/app/admin/controller/Goodsfavor.php
@@ -10,6 +10,8 @@
// +----------------------------------------------------------------------
namespace app\admin\controller;
+use app\admin\controller\Base;
+use app\service\ApiService;
use app\service\GoodsFavorService;
/**
@@ -20,27 +22,8 @@ use app\service\GoodsFavorService;
* @date 2020-06-30
* @desc description
*/
-class Goodsfavor extends Common
+class Goodsfavor extends Base
{
- /**
- * 构造方法
- * @author Devil
- * @blog http://gong.gg/
- * @version 0.0.1
- * @datetime 2016-12-03T12:39:08+0800
- */
- public function __construct()
- {
- // 调用父类前置方法
- parent::__construct();
-
- // 登录校验
- $this->IsLogin();
-
- // 权限校验
- $this->IsPower();
- }
-
/**
* 列表
* @author Devil
@@ -86,7 +69,7 @@ class Goodsfavor extends Common
// 开始处理
$params = $this->data_request;
$params['user_type'] = 'admin';
- return GoodsFavorService::GoodsFavorDelete($params);
+ return ApiService::ApiDataReturn(GoodsFavorService::GoodsFavorDelete($params));
}
}
?>
\ No newline at end of file
diff --git a/app/admin/controller/Goodsparamstemplate.php b/app/admin/controller/Goodsparamstemplate.php
index c8cb01c78..7626aa7e0 100755
--- a/app/admin/controller/Goodsparamstemplate.php
+++ b/app/admin/controller/Goodsparamstemplate.php
@@ -10,6 +10,8 @@
// +----------------------------------------------------------------------
namespace app\admin\controller;
+use app\admin\controller\Base;
+use app\service\ApiService;
use app\service\GoodsParamsService;
/**
@@ -20,28 +22,8 @@ use app\service\GoodsParamsService;
* @date 2020-11-27
* @desc description
*/
-class GoodsParamsTemplate extends Common
+class GoodsParamsTemplate extends Base
{
- /**
- * 构造方法
- * @author Devil
- * @blog http://gong.gg/
- * @version 1.0.0
- * @date 2020-11-27
- * @desc description
- */
- public function __construct()
- {
- // 调用父类前置方法
- parent::__construct();
-
- // 登录校验
- $this->IsLogin();
-
- // 权限校验
- $this->IsPower();
- }
-
/**
* 列表
* @author Devil
@@ -65,15 +47,18 @@ class GoodsParamsTemplate extends Common
*/
public function Detail()
{
- // 数据
- $data = $this->data_detail;
+ // 模板数据
+ $assign = [
+ // 商品参数类型
+ 'common_goods_parameters_type_list' => MyConst('common_goods_parameters_type_list'),
- // 商品参数类型
- MyViewAssign('common_goods_parameters_type_list', MyConst('common_goods_parameters_type_list'));
-
- // 参数配置
- MyViewAssign('parameters', empty($data['config_data']) ? [] : $data['config_data']);
+ // 数据
+ 'data' => $this->data_detail,
+ // 参数配置
+ 'parameters' => empty($this->data_detail['config_data']) ? [] : $this->data_detail['config_data'],
+ ];
+ MyViewAssign($assign);
return MyView();
}
@@ -93,11 +78,14 @@ class GoodsParamsTemplate extends Common
// 数据
$data = $this->data_detail;
- // 商品参数类型
- MyViewAssign('common_goods_parameters_type_list', MyConst('common_goods_parameters_type_list'));
+ // 模板数据
+ $assign = [
+ // 商品参数类型
+ 'common_goods_parameters_type_list' => MyConst('common_goods_parameters_type_list'),
- // 参数配置
- MyViewAssign('parameters', empty($data['config_data']) ? [] : $data['config_data']);
+ // 参数配置
+ 'parameters' => empty($data['config_data']) ? [] : $data['config_data'],
+ ];
// 编辑页面钩子
$hook_name = 'plugins_view_admin_goods_params_template_save';
@@ -110,10 +98,13 @@ class GoodsParamsTemplate extends Common
'params' => &$params,
]));
- // 数据
+ // 数据/参数
unset($params['id']);
- MyViewAssign('data', $data);
- MyViewAssign('params', $params);
+ $assign['data'] = $data;
+ $assign['params'] = $params;
+
+ // 数据赋值
+ MyViewAssign($assign);
return MyView();
}
@@ -135,7 +126,7 @@ class GoodsParamsTemplate extends Common
// 开始处理
$params = $this->data_request;
- return GoodsParamsService::GoodsParamsTemplateSave($params);
+ return ApiService::ApiDataReturn(GoodsParamsService::GoodsParamsTemplateSave($params));
}
/**
@@ -157,7 +148,7 @@ class GoodsParamsTemplate extends Common
// 开始处理
$params = $this->data_request;
$params['user_type'] = 'admin';
- return GoodsParamsService::GoodsParamsTemplateDelete($params);
+ return ApiService::ApiDataReturn(GoodsParamsService::GoodsParamsTemplateDelete($params));
}
/**
@@ -178,7 +169,7 @@ class GoodsParamsTemplate extends Common
// 开始处理
$params = $this->data_request;
- return GoodsParamsService::GoodsParamsTemplateStatusUpdate($params);
+ return ApiService::ApiDataReturn(GoodsParamsService::GoodsParamsTemplateStatusUpdate($params));
}
}
?>
\ No newline at end of file
diff --git a/app/admin/controller/Index.php b/app/admin/controller/Index.php
index 6e8a9cd22..2c34fb051 100755
--- a/app/admin/controller/Index.php
+++ b/app/admin/controller/Index.php
@@ -10,6 +10,8 @@
// +----------------------------------------------------------------------
namespace app\admin\controller;
+use app\admin\controller\Common;
+use app\service\ApiService;
use app\service\StatisticalService;
use app\service\StoreService;
use app\service\SystemUpgradeService;
@@ -37,6 +39,12 @@ class Index extends Common
// 登录校验
$this->IsLogin();
+
+ // 权限校验
+ if(in_array($this->action_name, ['storeaccountsbind', 'inspectupgrade', 'inspectupgradeconfirm', 'stats']))
+ {
+ $this->IsPower();
+ }
}
/**
@@ -56,7 +64,6 @@ class Index extends Common
{
$to_url = base64_decode(urldecode($this->data_request['to_url']));
}
-
MyViewAssign('to_url', $to_url);
return MyView();
}
@@ -70,6 +77,9 @@ class Index extends Common
*/
public function Init()
{
+ // 模板数据
+ $assign = [];
+
// 系统信息
$mysql_ver = \think\facade\Db::query('SELECT VERSION() AS `ver`');
$data = [
@@ -80,7 +90,7 @@ class Index extends Common
'host' => isset($_SERVER["HTTP_HOST"]) ? $_SERVER["HTTP_HOST"] : '',
'ver' => 'ShopXO'.' '.APPLICATION_VERSION,
];
- MyViewAssign('data', $data);
+ $assign['data'] = $data;
// 用户是否有数据统计权限
$is_stats = AdminIsPower('index', 'stats');
@@ -89,15 +99,15 @@ class Index extends Common
{
// 默认时间
$default_day = '30-day';
- MyViewAssign('default_day', $default_day);
+ $assign['default_day'] = $default_day;
// 收入统计权限
$is_income = AdminIsPower('index', 'income');
- MyViewAssign('is_income', $is_income);
+ $assign['is_income'] = $is_income;
// 时间
$time_data = StatisticalService::DateTimeList();
- MyViewAssign('time_data', $time_data);
+ $assign['time_data'] = $time_data;
// 基础数据总计
$time = [];
@@ -107,27 +117,28 @@ class Index extends Common
$time['end'] = strtotime($time_data[$default_day]['end']);
}
$base_count = StatisticalService::BaseTotalCount($time);
- MyViewAssign('base_count', $base_count['data']);
+ $assign['base_count'] = $base_count['data'];
// 用户
$user = StatisticalService::UserYesterdayTodayTotal();
- MyViewAssign('user', $user['data']);
+ $assign['user'] = $user['data'];
// 订单总数
$order_number = StatisticalService::OrderNumberYesterdayTodayTotal();
- MyViewAssign('order_number', $order_number['data']);
+ $assign['order_number'] = $order_number['data'];
// 订单成交总量
$order_complete_number = StatisticalService::OrderCompleteYesterdayTodayTotal();
- MyViewAssign('order_complete_number', $order_complete_number['data']);
+ $assign['order_complete_number'] = $order_complete_number['data'];
// 订单收入总计
if($is_income)
{
$order_complete_money = StatisticalService::OrderCompleteMoneyYesterdayTodayTotal();
- MyViewAssign('order_complete_money', $order_complete_money['data']);
+ $assign['order_complete_money'] = $order_complete_money['data'];
}
}
+ MyViewAssign($assign);
// 钩子初始化
$this->PluginsInit();
@@ -164,36 +175,41 @@ class Index extends Common
* @desc description
*/
private function PluginsInit()
- {
- // 顶部钩子
- MyViewAssign('plugins_admin_view_index_init_top_data', MyEventTrigger('plugins_admin_view_index_init_top', ['hook_name'=>'plugins_admin_view_index_init_top', 'is_backend'=>false, 'admin'=>$this->admin]));
-
- // 公告顶部钩子
- MyViewAssign('plugins_admin_view_index_init_notice_top_data', MyEventTrigger('plugins_admin_view_index_init_notice_top', ['hook_name'=>'plugins_admin_view_index_init_notice_top', 'is_backend'=>false, 'admin'=>$this->admin]));
-
- // 基础统计顶部钩子
- MyViewAssign('plugins_admin_view_index_init_stats_base_top_data', MyEventTrigger('plugins_admin_view_index_init_stats_base_top', ['hook_name'=>'plugins_admin_view_index_init_stats_base_top', 'is_backend'=>false, 'admin'=>$this->admin]));
-
- // 基础统计内部顶部钩子
- MyViewAssign('plugins_admin_view_index_init_stats_inside_base_top_data', MyEventTrigger('plugins_admin_view_index_init_stats_inside_base_top', ['hook_name'=>'plugins_admin_view_index_init_stats_inside_base_top', 'is_backend'=>false, 'admin'=>$this->admin]));
-
- // 订单金额走势统计内部顶部钩子
- MyViewAssign('plugins_admin_view_index_init_stats_inside_amount_trend_top_data', MyEventTrigger('plugins_admin_view_index_init_stats_inside_amount_trend_top', ['hook_name'=>'plugins_admin_view_index_init_stats_inside_amount_trend_top', 'is_backend'=>false, 'admin'=>$this->admin]));
-
- // 订单交易走势统计内部顶部钩子
- MyViewAssign('plugins_admin_view_index_init_stats_inside_order_trading_top_data', MyEventTrigger('plugins_admin_view_index_init_stats_inside_order_trading_top', ['hook_name'=>'plugins_admin_view_index_init_stats_inside_order_trading_top', 'is_backend'=>false, 'admin'=>$this->admin]));
-
- // 组合商品和支付统计内部顶部钩子
- MyViewAssign('plugins_admin_view_index_init_stats_inside_compose_top_data', MyEventTrigger('plugins_admin_view_index_init_stats_inside_compose_top', ['hook_name'=>'plugins_admin_view_index_init_stats_inside_compose_top', 'is_backend'=>false, 'admin'=>$this->admin]));
-
- // 地域分布统计内部顶部钩子
- MyViewAssign('plugins_admin_view_index_init_stats_inside_region_top_data', MyEventTrigger('plugins_admin_view_index_init_stats_inside_region_top', ['hook_name'=>'plugins_admin_view_index_init_stats_inside_region_top', 'is_backend'=>false, 'admin'=>$this->admin]));
-
- // 系统信息顶部钩子
- MyViewAssign('plugins_admin_view_index_init_system_info_top_data', MyEventTrigger('plugins_admin_view_index_init_system_info_top', ['hook_name'=>'plugins_admin_view_index_init_system_info_top', 'is_backend'=>false, 'admin'=>$this->admin]));
-
- // 底部钩子
- MyViewAssign('plugins_admin_view_index_init_bottom_data', MyEventTrigger('plugins_admin_view_index_init_bottom', ['hook_name'=>'plugins_admin_view_index_init_bottom', 'is_backend'=>false, 'admin'=>$this->admin]));
+ {
+ // 钩子列表
+ $hook_arr = [
+ // 顶部钩子
+ 'plugins_admin_view_index_init_top',
+ // 公告顶部钩子
+ 'plugins_admin_view_index_init_notice_top',
+ // 基础统计顶部钩子
+ 'plugins_admin_view_index_init_stats_base_top',
+ // 基础统计内部顶部钩子
+ 'plugins_admin_view_index_init_stats_inside_base_top',
+ // 订单金额走势统计内部顶部钩子
+ 'plugins_admin_view_index_init_stats_inside_amount_trend_top',
+ // 订单交易走势统计内部顶部钩子
+ 'plugins_admin_view_index_init_stats_inside_order_trading_top',
+ // 组合商品和支付统计内部顶部钩子
+ 'plugins_admin_view_index_init_stats_inside_compose_top',
+ // 地域分布统计内部顶部钩子
+ 'plugins_admin_view_index_init_stats_inside_region_top',
+ // 系统信息顶部钩子
+ 'plugins_admin_view_index_init_system_info_top',
+ // 底部钩子
+ 'plugins_admin_view_index_init_bottom',
+ ];
+ $assign = [];
+ foreach($hook_arr as $hook_name)
+ {
+ // 基础统计顶部钩子
+ $assign[$hook_name.'_data'] = MyEventTrigger($hook_name,
+ ['hook_name' => $hook_name,
+ 'is_backend' => false,
+ 'admin' => $this->admin,
+ ]);
+ }
+ MyViewAssign($assign);
}
/**
@@ -212,12 +228,9 @@ class Index extends Common
return $this->error('非法访问');
}
- // 权限校验
- $this->IsPower();
-
// 开始处理
$params = $this->data_request;
- return StoreService::SiteStoreAccountsBind($params);
+ return ApiService::ApiDataReturn(StoreService::SiteStoreAccountsBind($params));
}
/**
@@ -236,12 +249,9 @@ class Index extends Common
return $this->error('非法访问');
}
- // 权限校验
- $this->IsPower();
-
// 开始处理
$params = $this->data_request;
- return StoreService::SiteInspectUpgrade($params);
+ return ApiService::ApiDataReturn(StoreService::SiteInspectUpgrade($params));
}
/**
@@ -260,12 +270,9 @@ class Index extends Common
return $this->error('非法访问');
}
- // 权限校验
- $this->IsPower();
-
// 开始处理
$params = $this->data_request;
- return SystemUpgradeService::Run($params);
+ return ApiService::ApiDataReturn(SystemUpgradeService::Run($params));
}
/**
@@ -284,12 +291,9 @@ class Index extends Common
return $this->error('非法访问');
}
- // 权限校验
- $this->IsPower();
-
// 开始处理
$params = $this->data_request;
- return StatisticalService::StatsData($params);
+ return ApiService::ApiDataReturn(StatisticalService::StatsData($params));
}
}
?>
\ No newline at end of file
diff --git a/app/admin/controller/Integrallog.php b/app/admin/controller/Integrallog.php
index 6daeb20fb..be099fabb 100755
--- a/app/admin/controller/Integrallog.php
+++ b/app/admin/controller/Integrallog.php
@@ -10,7 +10,7 @@
// +----------------------------------------------------------------------
namespace app\admin\controller;
-use app\service\IntegralService;
+use app\admin\controller\Base;
/**
* 用户积分日志管理
@@ -19,29 +19,10 @@ use app\service\IntegralService;
* @version 0.0.1
* @datetime 2016-12-01T21:51:08+0800
*/
-class IntegralLog extends Common
+class IntegralLog extends Base
{
/**
- * 构造方法
- * @author Devil
- * @blog http://gong.gg/
- * @version 0.0.1
- * @datetime 2016-12-03T12:39:08+0800
- */
- public function __construct()
- {
- // 调用父类前置方法
- parent::__construct();
-
- // 登录校验
- $this->IsLogin();
-
- // 权限校验
- $this->IsPower();
- }
-
- /**
- * [Index 用户积分日志列表]
+ * 列表
* @author Devil
* @blog http://gong.gg/
* @version 0.0.1
diff --git a/app/admin/controller/Layout.php b/app/admin/controller/Layout.php
index eb45ed69f..6d30e2efc 100644
--- a/app/admin/controller/Layout.php
+++ b/app/admin/controller/Layout.php
@@ -10,6 +10,8 @@
// +----------------------------------------------------------------------
namespace app\admin\controller;
+use app\admin\controller\Base;
+use app\service\ApiService;
use app\service\LayoutService;
/**
@@ -19,27 +21,8 @@ use app\service\LayoutService;
* @version 0.0.1
* @datetime 2016-12-01T21:51:08+0800
*/
-class Layout extends Common
+class Layout extends Base
{
- /**
- * 构造方法
- * @author Devil
- * @blog http://gong.gg/
- * @version 0.0.1
- * @datetime 2016-12-03T12:39:08+0800
- */
- public function __construct()
- {
- // 调用父类前置方法
- parent::__construct();
-
- // 登录校验
- $this->IsLogin();
-
- // 权限校验
- $this->IsPower();
- }
-
/**
* 前端首页布局保存
* @author Devil
@@ -50,7 +33,7 @@ class Layout extends Common
*/
public function LayoutIndexHomeSave()
{
- return LayoutService::LayoutConfigSave('home', $this->data_post);
+ return ApiService::ApiDataReturn(LayoutService::LayoutConfigSave('home', $this->data_post));
}
}
?>
\ No newline at end of file
diff --git a/app/admin/controller/Link.php b/app/admin/controller/Link.php
index c7bd3af0a..e723d1c85 100755
--- a/app/admin/controller/Link.php
+++ b/app/admin/controller/Link.php
@@ -10,6 +10,8 @@
// +----------------------------------------------------------------------
namespace app\admin\controller;
+use app\admin\controller\Base;
+use app\service\ApiService;
use app\service\LinkService;
/**
@@ -19,28 +21,9 @@ use app\service\LinkService;
* @version 0.0.1
* @datetime 2016-12-01T21:51:08+0800
*/
-class Link extends Common
+class Link extends Base
{
/**
- * 构造方法
- * @author Devil
- * @blog http://gong.gg/
- * @version 0.0.1
- * @datetime 2016-12-03T12:39:08+0800
- */
- public function __construct()
- {
- // 调用父类前置方法
- parent::__construct();
-
- // 登录校验
- $this->IsLogin();
-
- // 权限校验
- $this->IsPower();
- }
-
- /**
* 列表
* @author Devil
* @blog http://gong.gg/
@@ -81,7 +64,7 @@ class Link extends Common
// 开始处理
$params = $this->data_request;
- return LinkService::LinkSave($params);
+ return ApiService::ApiDataReturn(LinkService::LinkSave($params));
}
/**
@@ -102,7 +85,7 @@ class Link extends Common
// 开始处理
$params = $this->data_request;
$params['user_type'] = 'admin';
- return LinkService::LinkDelete($params);
+ return ApiService::ApiDataReturn(LinkService::LinkDelete($params));
}
/**
@@ -122,7 +105,7 @@ class Link extends Common
// 开始处理
$params = $this->data_request;
- return LinkService::LinkStatusUpdate($params);
+ return ApiService::ApiDataReturn(LinkService::LinkStatusUpdate($params));
}
}
?>
\ No newline at end of file
diff --git a/app/admin/controller/Message.php b/app/admin/controller/Message.php
index 93eb98814..bb4ffac31 100755
--- a/app/admin/controller/Message.php
+++ b/app/admin/controller/Message.php
@@ -10,6 +10,8 @@
// +----------------------------------------------------------------------
namespace app\admin\controller;
+use app\admin\controller\Base;
+use app\service\ApiService;
use app\service\MessageService;
/**
@@ -19,29 +21,10 @@ use app\service\MessageService;
* @version 0.0.1
* @datetime 2016-12-01T21:51:08+0800
*/
-class Message extends Common
+class Message extends Base
{
/**
- * 构造方法
- * @author Devil
- * @blog http://gong.gg/
- * @version 0.0.1
- * @datetime 2016-12-03T12:39:08+0800
- */
- public function __construct()
- {
- // 调用父类前置方法
- parent::__construct();
-
- // 登录校验
- $this->IsLogin();
-
- // 权限校验
- $this->IsPower();
- }
-
- /**
- * [Index 消息列表]
+ * 列表
* @author Devil
* @blog http://gong.gg/
* @version 0.0.1
@@ -65,7 +48,7 @@ class Message extends Common
}
/**
- * [Delete 消息删除]
+ * 删除
* @author Devil
* @blog http://gong.gg/
* @version 0.0.1
@@ -82,7 +65,7 @@ class Message extends Common
// 开始处理
$params = $this->data_request;
$params['admin'] = $this->admin;
- return MessageService::MessageDelete($params);
+ return ApiService::ApiDataReturn(MessageService::MessageDelete($params));
}
}
?>
\ No newline at end of file
diff --git a/app/admin/controller/Navigation.php b/app/admin/controller/Navigation.php
index 212b2ab7d..56bf0002f 100755
--- a/app/admin/controller/Navigation.php
+++ b/app/admin/controller/Navigation.php
@@ -10,6 +10,8 @@
// +----------------------------------------------------------------------
namespace app\admin\controller;
+use app\admin\controller\Base;
+use app\service\ApiService;
use app\service\ArticleService;
use app\service\NavigationService;
use app\service\GoodsService;
@@ -23,7 +25,7 @@ use app\service\DesignService;
* @version 0.0.1
* @datetime 2016-12-01T21:51:08+0800
*/
-class Navigation extends Common
+class Navigation extends Base
{
private $nav_type;
@@ -39,12 +41,6 @@ class Navigation extends Common
// 调用父类前置方法
parent::__construct();
- // 登录校验
- $this->IsLogin();
-
- // 权限校验
- $this->IsPower();
-
// 导航类型
$this->nav_type = empty($this->data_request['nav_type']) ? 'header' : $this->data_request['nav_type'];
}
@@ -58,6 +54,16 @@ class Navigation extends Common
*/
public function Index()
{
+ // 模板数据
+ $assign = [
+ // 导航类型
+ 'nav_type' => $this->nav_type,
+ // 一级分类
+ 'nav_header_pid_list' => NavigationService::LevelOneNav(['nav_type'=>$this->nav_type]),
+ // 商品分类
+ 'goods_category_list' => GoodsService::GoodsCategoryAll(),
+ ];
+
// 获取列表
$data_params = [
'where' => $this->form_where,
@@ -65,27 +71,22 @@ class Navigation extends Common
];
$data_params['where'][] = ['nav_type', '=', $this->nav_type];
$ret = NavigationService::NavList($data_params);
- MyViewAssign('data_list', $ret['data']);
-
- // 一级分类
- MyViewAssign('nav_header_pid_list', NavigationService::LevelOneNav(['nav_type'=>$this->nav_type]));
-
+ $assign['data_list'] = $ret['data'];
+
// 获取分类和文章
$article_category_content = ArticleService::ArticleCategoryListContent();
- MyViewAssign('article_list', $article_category_content['data']);
-
- // 商品分类
- MyViewAssign('goods_category_list', GoodsService::GoodsCategoryAll());
+ $assign['article_list'] = $article_category_content['data'];
// 自定义页面
$custom_view = CustomViewService::CustomViewList(['where'=>['is_enable'=>1], 'field'=>'id,title', 'n'=>0]);
- MyViewAssign('customview_list', $custom_view['data']);
+ $assign['customview_list'] = $custom_view['data'];
// 页面设计
$design_view = DesignService::DesignList(['where'=>['is_enable'=>1], 'field'=>'id,name', 'n'=>0]);
- MyViewAssign('design_list', $design_view['data']);
+ $assign['design_list'] = $design_view['data'];
- MyViewAssign('nav_type', $this->nav_type);
+ // 数据赋值
+ MyViewAssign($assign);
return MyView();
}
@@ -107,7 +108,7 @@ class Navigation extends Common
// 开始处理
$params = $this->data_request;
$params['nav_type'] = $this->nav_type;
- return NavigationService::NavSave($params);
+ return ApiService::ApiDataReturn(NavigationService::NavSave($params));
}
/**
@@ -127,7 +128,7 @@ class Navigation extends Common
// 开始处理
$params = $this->data_request;
- return NavigationService::NavDelete($params);
+ return ApiService::ApiDataReturn(NavigationService::NavDelete($params));
}
/**
@@ -147,7 +148,7 @@ class Navigation extends Common
// 开始处理
$params = $this->data_request;
- return NavigationService::NavStatusUpdate($params);
+ return ApiService::ApiDataReturn(NavigationService::NavStatusUpdate($params));
}
}
?>
\ No newline at end of file
diff --git a/app/admin/controller/Order.php b/app/admin/controller/Order.php
index 8959ee503..1ed6861fc 100755
--- a/app/admin/controller/Order.php
+++ b/app/admin/controller/Order.php
@@ -10,6 +10,8 @@
// +----------------------------------------------------------------------
namespace app\admin\controller;
+use app\admin\controller\Base;
+use app\service\ApiService;
use app\service\OrderService;
use app\service\PaymentService;
use app\service\ExpressService;
@@ -21,28 +23,8 @@ use app\service\ExpressService;
* @version 0.0.1
* @datetime 2016-12-01T21:51:08+0800
*/
-class Order extends Common
+class Order extends Base
{
- /**
- * 构造方法
- * @author Devil
- * @blog http://gong.gg/
- * @version 1.0.0
- * @date 2018-09-28
- * @desc description
- */
- public function __construct()
- {
- // 调用父类前置方法
- parent::__construct();
-
- // 登录校验
- $this->IsLogin();
-
- // 权限校验
- $this->IsPower();
- }
-
/**
* 订单列表
* @author Devil
@@ -53,6 +35,12 @@ class Order extends Common
*/
public function Index()
{
+ // 模板数据
+ $assign = [
+ // 快递公司
+ 'express_list' => ExpressService::ExpressList(),
+ ];
+
// 发起支付 - 支付方式
$pay_wparams = [
'where' => [
@@ -60,11 +48,10 @@ class Order extends Common
['payment', 'in', MyConfig('shopxo.under_line_list')],
],
];
- MyViewAssign('buy_payment_list', PaymentService::BuyPaymentList($pay_wparams));
-
- // 快递公司
- MyViewAssign('express_list', ExpressService::ExpressList());
+ $assign['buy_payment_list'] = PaymentService::BuyPaymentList($pay_wparams);
+ // 数据赋值
+ MyViewAssign($assign);
return MyView();
}
@@ -103,7 +90,7 @@ class Order extends Common
$params['creator'] = $this->admin['id'];
$params['creator_name'] = $this->admin['username'];
$params['user_type'] = 'admin';
- return OrderService::OrderDelete($params);
+ return ApiService::ApiDataReturn(OrderService::OrderDelete($params));
}
/**
@@ -128,7 +115,7 @@ class Order extends Common
$params['creator'] = $this->admin['id'];
$params['creator_name'] = $this->admin['username'];
$params['user_type'] = 'admin';
- return OrderService::OrderCancel($params);
+ return ApiService::ApiDataReturn(OrderService::OrderCancel($params));
}
/**
@@ -152,7 +139,7 @@ class Order extends Common
$params['creator'] = $this->admin['id'];
$params['creator_name'] = $this->admin['username'];
$params['user_type'] = 'admin';
- return OrderService::OrderDelivery($params);
+ return ApiService::ApiDataReturn(OrderService::OrderDelivery($params));
}
/**
@@ -177,7 +164,7 @@ class Order extends Common
$params['creator'] = $this->admin['id'];
$params['creator_name'] = $this->admin['username'];
$params['user_type'] = 'admin';
- return OrderService::OrderCollect($params);
+ return ApiService::ApiDataReturn(OrderService::OrderCollect($params));
}
/**
@@ -202,7 +189,7 @@ class Order extends Common
$params['creator'] = $this->admin['id'];
$params['creator_name'] = $this->admin['username'];
$params['user_type'] = 'admin';
- return OrderService::OrderConfirm($params);
+ return ApiService::ApiDataReturn(OrderService::OrderConfirm($params));
}
/**
@@ -217,7 +204,7 @@ class Order extends Common
{
$params = $this->data_request;
$params['admin'] = $this->admin;
- return OrderService::OrderPaymentUnderLinePay($params);
+ return ApiService::ApiDataReturn(OrderService::OrderPaymentUnderLinePay($params));
}
}
?>
\ No newline at end of file
diff --git a/app/admin/controller/Orderaftersale.php b/app/admin/controller/Orderaftersale.php
index 61613f44b..28da38caa 100644
--- a/app/admin/controller/Orderaftersale.php
+++ b/app/admin/controller/Orderaftersale.php
@@ -10,7 +10,8 @@
// +----------------------------------------------------------------------
namespace app\admin\controller;
-use app\service\OrderService;
+use app\admin\controller\Base;
+use app\service\ApiService;
use app\service\OrderAftersaleService;
/**
@@ -20,28 +21,8 @@ use app\service\OrderAftersaleService;
* @version 0.0.1
* @datetime 2016-12-01T21:51:08+0800
*/
-class Orderaftersale extends Common
+class Orderaftersale extends Base
{
- /**
- * 构造方法
- * @author Devil
- * @blog http://gong.gg/
- * @version 1.0.0
- * @date 2018-11-30
- * @desc description
- */
- public function __construct()
- {
- // 调用父类前置方法
- parent::__construct();
-
- // 登录校验
- $this->IsLogin();
-
- // 权限校验
- $this->IsPower();
- }
-
/**
* 列表
* @author Devil
@@ -54,7 +35,6 @@ class Orderaftersale extends Common
{
// 静态数据
MyViewAssign('common_order_aftersale_refundment_list', MyConst('common_order_aftersale_refundment_list'));
-
return MyView();
}
@@ -87,7 +67,7 @@ class Orderaftersale extends Common
}
$params = $this->data_request;
- return OrderAftersaleService::AftersaleConfirm($params);
+ return ApiService::ApiDataReturn(OrderAftersaleService::AftersaleConfirm($params));
}
/**
@@ -109,7 +89,7 @@ class Orderaftersale extends Common
$params = $this->data_request;
$params['creator'] = $this->admin['id'];
$params['creator_name'] = $this->admin['username'];
- return OrderAftersaleService::AftersaleAudit($params);
+ return ApiService::ApiDataReturn(OrderAftersaleService::AftersaleAudit($params));
}
/**
@@ -131,7 +111,7 @@ class Orderaftersale extends Common
$params = $this->data_request;
$params['creator'] = $this->admin['id'];
$params['creator_name'] = $this->admin['username'];
- return OrderAftersaleService::AftersaleRefuse($params);
+ return ApiService::ApiDataReturn(OrderAftersaleService::AftersaleRefuse($params));
}
/**
@@ -153,7 +133,7 @@ class Orderaftersale extends Common
$params = $this->data_request;
$params['creator'] = $this->admin['id'];
$params['creator_name'] = $this->admin['username'];
- return OrderAftersaleService::AftersaleCancel($params);
+ return ApiService::ApiDataReturn(OrderAftersaleService::AftersaleCancel($params));
}
/**
@@ -175,7 +155,7 @@ class Orderaftersale extends Common
$params = $this->data_request;
$params['creator'] = $this->admin['id'];
$params['creator_name'] = $this->admin['username'];
- return OrderAftersaleService::AftersaleDelete($params);
+ return ApiService::ApiDataReturn(OrderAftersaleService::AftersaleDelete($params));
}
}
?>
\ No newline at end of file
diff --git a/app/admin/controller/Packageinstall.php b/app/admin/controller/Packageinstall.php
index b15652f85..a2f79bd5d 100644
--- a/app/admin/controller/Packageinstall.php
+++ b/app/admin/controller/Packageinstall.php
@@ -10,6 +10,8 @@
// +----------------------------------------------------------------------
namespace app\admin\controller;
+use app\admin\controller\Base;
+use app\service\ApiService;
use app\service\PackageInstallService;
/**
@@ -19,28 +21,8 @@ use app\service\PackageInstallService;
* @version 0.0.1
* @datetime 2016-12-01T21:51:08+0800
*/
-class PackageInstall extends Common
+class PackageInstall extends Base
{
- /**
- * 构造方法
- * @author Devil
- * @blog http://gong.gg/
- * @version 1.0.0
- * @date 2018-09-28
- * @desc description
- */
- public function __construct()
- {
- // 调用父类前置方法
- parent::__construct();
-
- // 登录校验
- $this->IsLogin();
-
- // 权限校验
- $this->IsPower();
- }
-
/**
* 获取安装参数
* @author Devil
@@ -66,7 +48,7 @@ class PackageInstall extends Common
*/
public function Install()
{
- return PackageInstallService::Install($this->data_post);
+ return ApiService::ApiDataReturn(PackageInstallService::Install($this->data_post));
}
}
?>
\ No newline at end of file
diff --git a/app/admin/controller/Packageupgrade.php b/app/admin/controller/Packageupgrade.php
index a2f7b4b04..f727f95a8 100644
--- a/app/admin/controller/Packageupgrade.php
+++ b/app/admin/controller/Packageupgrade.php
@@ -10,6 +10,8 @@
// +----------------------------------------------------------------------
namespace app\admin\controller;
+use app\admin\controller\Base;
+use app\service\ApiService;
use app\service\PluginsUpgradeService;
/**
@@ -19,28 +21,8 @@ use app\service\PluginsUpgradeService;
* @version 0.0.1
* @datetime 2016-12-01T21:51:08+0800
*/
-class Packageupgrade extends Common
+class Packageupgrade extends Base
{
- /**
- * 构造方法
- * @author Devil
- * @blog http://gong.gg/
- * @version 1.0.0
- * @date 2018-09-28
- * @desc description
- */
- public function __construct()
- {
- // 调用父类前置方法
- parent::__construct();
-
- // 登录校验
- $this->IsLogin();
-
- // 权限校验
- $this->IsPower();
- }
-
/**
* 软件更新
* @author Devil
@@ -51,7 +33,7 @@ class Packageupgrade extends Common
*/
public function Upgrade()
{
- return PluginsUpgradeService::Run($this->data_post);
+ return ApiService::ApiDataReturn(PluginsUpgradeService::Run($this->data_post));
}
}
?>
\ No newline at end of file
diff --git a/app/admin/controller/Paylog.php b/app/admin/controller/Paylog.php
index c90fbb56b..802aaa522 100755
--- a/app/admin/controller/Paylog.php
+++ b/app/admin/controller/Paylog.php
@@ -10,6 +10,8 @@
// +----------------------------------------------------------------------
namespace app\admin\controller;
+use app\admin\controller\Base;
+use app\service\ApiService;
use app\service\PayLogService;
/**
@@ -19,27 +21,8 @@ use app\service\PayLogService;
* @version 0.0.1
* @datetime 2016-12-01T21:51:08+0800
*/
-class PayLog extends Common
+class PayLog extends Base
{
- /**
- * 构造方法
- * @author Devil
- * @blog http://gong.gg/
- * @version 0.0.1
- * @datetime 2016-12-03T12:39:08+0800
- */
- public function __construct()
- {
- // 调用父类前置方法
- parent::__construct();
-
- // 登录校验
- $this->IsLogin();
-
- // 权限校验
- $this->IsPower();
- }
-
/**
* 列表
* @author Devil
@@ -85,7 +68,7 @@ class PayLog extends Common
// 开始操作
$params = $this->data_post;
$params['admin'] = $this->admin;
- return PayLogService::PayLogClose($params);
+ return ApiService::ApiDataReturn(PayLogService::PayLogClose($params));
}
}
?>
\ No newline at end of file
diff --git a/app/admin/controller/Payment.php b/app/admin/controller/Payment.php
index 24ab34553..06a009319 100755
--- a/app/admin/controller/Payment.php
+++ b/app/admin/controller/Payment.php
@@ -10,6 +10,8 @@
// +----------------------------------------------------------------------
namespace app\admin\controller;
+use app\admin\controller\Base;
+use app\service\ApiService;
use app\service\PaymentService;
use app\service\StoreService;
use app\service\ResourcesService;
@@ -21,29 +23,10 @@ use app\service\ResourcesService;
* @version 0.0.1
* @datetime 2016-12-01T21:51:08+0800
*/
-class Payment extends Common
+class Payment extends Base
{
/**
- * 构造方法
- * @author Devil
- * @blog http://gong.gg/
- * @version 0.0.1
- * @datetime 2016-12-03T12:39:08+0800
- */
- public function __construct()
- {
- // 调用父类前置方法
- parent::__construct();
-
- // 登录校验
- $this->IsLogin();
-
- // 权限校验
- $this->IsPower();
- }
-
- /**
- * [Index 支付方式列表]
+ * 列表
* @author Devil
* @blog http://gong.gg/
* @version 0.0.1
@@ -51,28 +34,32 @@ class Payment extends Common
*/
public function Index()
{
+ // 模板数据
+ $assign = [
+ // 不能删除的支付方式
+ 'cannot_deleted_list' => PaymentService::$cannot_deleted_list,
+
+ // 适用平台
+ 'common_platform_type' => MyConst('common_platform_type'),
+
+ // 应用商店
+ 'store_payment_url' => StoreService::StorePaymentUrl(),
+ ];
// 插件列表
$ret = PaymentService::PluginsPaymentList();
- MyViewAssign('data_list', $ret['data']);
-
- // 不能删除的支付方式
- MyViewAssign('cannot_deleted_list', PaymentService::$cannot_deleted_list);
-
- // 适用平台
- MyViewAssign('common_platform_type', MyConst('common_platform_type'));
-
- // 应用商店
- MyViewAssign('store_payment_url', StoreService::StorePaymentUrl());
+ $assign['data_list'] = $ret['data'];
// 插件更新信息
$upgrade = PaymentService::PaymentUpgradeInfo($ret['data']);
- MyViewAssign('upgrade_info', $upgrade['data']);
+ $assign['upgrade_info'] = $upgrade['data'];
+ // 数据赋值
+ MyViewAssign($assign);
return MyView();
}
/**
- * [SaveInfo 添加/编辑页面]
+ * 添加/编辑页面
* @author Devil
* @blog http://gong.gg/
* @version 0.0.1
@@ -94,18 +81,22 @@ class Payment extends Common
$data = $data[0];
}
}
- MyViewAssign('data', $data);
+ // 模板数据
+ $assign = [
+ 'data' => $data,
- // 适用平台
- MyViewAssign('common_platform_type', MyConst('common_platform_type'));
+ // 适用平台
+ 'common_platform_type' => MyConst('common_platform_type'),
- // 编辑器文件存放地址
- MyViewAssign('editor_path_type', ResourcesService::EditorPathTypeValue('payment'));
+ // 编辑器文件存放地址
+ 'editor_path_type' => ResourcesService::EditorPathTypeValue('payment'),
+ ];
+ MyViewAssign($assign);
return MyView();
}
/**
- * [Save 支付方式保存]
+ * 保存
* @author Devil
* @blog http://gong.gg/
* @version 0.0.1
@@ -120,11 +111,11 @@ class Payment extends Common
}
// 开始操作
- return PaymentService::PaymentUpdate($this->data_request);
+ return ApiService::ApiDataReturn(PaymentService::PaymentUpdate($this->data_request));
}
/**
- * [StatusUpdate 状态更新]
+ * 状态更新
* @author Devil
* @blog http://gong.gg/
* @version 0.0.1
@@ -139,7 +130,7 @@ class Payment extends Common
}
// 开始操作
- return PaymentService::PaymentStatusUpdate($this->data_request);
+ return ApiService::ApiDataReturn(PaymentService::PaymentStatusUpdate($this->data_request));
}
/**
@@ -159,7 +150,7 @@ class Payment extends Common
}
// 开始操作
- return PaymentService::Install($this->data_request);
+ return ApiService::ApiDataReturn(PaymentService::Install($this->data_request));
}
/**
@@ -179,7 +170,7 @@ class Payment extends Common
}
// 开始操作
- return PaymentService::Uninstall($this->data_request);
+ return ApiService::ApiDataReturn(PaymentService::Uninstall($this->data_request));
}
/**
@@ -199,7 +190,7 @@ class Payment extends Common
}
// 开始操作
- return PaymentService::Delete($this->data_request);
+ return ApiService::ApiDataReturn(PaymentService::Delete($this->data_request));
}
/**
@@ -219,7 +210,7 @@ class Payment extends Common
}
// 开始操作
- return PaymentService::Upload($this->data_request);
+ return ApiService::ApiDataReturn(PaymentService::Upload($this->data_request));
}
}
?>
\ No newline at end of file
diff --git a/app/admin/controller/Payrequestlog.php b/app/admin/controller/Payrequestlog.php
index b1a5bfb45..d900693df 100644
--- a/app/admin/controller/Payrequestlog.php
+++ b/app/admin/controller/Payrequestlog.php
@@ -10,6 +10,8 @@
// +----------------------------------------------------------------------
namespace app\admin\controller;
+use app\admin\controller\Base;
+
/**
* 支付请求日志管理
* @author Devil
@@ -17,27 +19,8 @@ namespace app\admin\controller;
* @version 0.0.1
* @datetime 2016-12-01T21:51:08+0800
*/
-class PayRequestLog extends Common
+class PayRequestLog extends Base
{
- /**
- * 构造方法
- * @author Devil
- * @blog http://gong.gg/
- * @version 0.0.1
- * @datetime 2016-12-03T12:39:08+0800
- */
- public function __construct()
- {
- // 调用父类前置方法
- parent::__construct();
-
- // 登录校验
- $this->IsLogin();
-
- // 权限校验
- $this->IsPower();
- }
-
/**
* 列表
* @author Devil
diff --git a/app/admin/controller/Plugins.php b/app/admin/controller/Plugins.php
index 50c116a15..7196c73cd 100755
--- a/app/admin/controller/Plugins.php
+++ b/app/admin/controller/Plugins.php
@@ -10,8 +10,9 @@
// +----------------------------------------------------------------------
namespace app\admin\controller;
-use app\service\SystemService;
+use app\admin\controller\Base;
use app\service\ApiService;
+use app\service\SystemService;
use app\service\PluginsService;
use app\service\ResourcesService;
@@ -22,29 +23,10 @@ use app\service\ResourcesService;
* @version 0.0.1
* @datetime 2016-12-01T21:51:08+0800
*/
-class Plugins extends Common
-{
+class Plugins extends Base
+{
/**
- * 构造方法
- * @author Devil
- * @blog http://gong.gg/
- * @version 1.0.0
- * @date 2018-11-30
- * @desc description
- */
- public function __construct()
- {
- parent::__construct();
-
- // 登录校验
- $this->IsLogin();
-
- // 权限校验
- $this->IsPower();
- }
-
- /**
- * [Index 首页]
+ * 首页
* @author Devil
* @blog http://gong.gg/
* @version 0.0.1
@@ -78,7 +60,7 @@ class Plugins extends Common
{
if(IS_AJAX)
{
- return DataReturn($ret, -5000);
+ return ApiService::ApiDataReturn(DataReturn($ret, -5000));
} else {
MyViewAssign('msg', $ret);
return MyView('public/tips_error');
@@ -92,7 +74,7 @@ class Plugins extends Common
$msg = '无权限使用该插件';
if(IS_AJAX)
{
- return DataReturn($msg, -5000);
+ return ApiService::ApiDataReturn(DataReturn($msg, -5000));
} else {
MyViewAssign('msg', $msg);
return MyView('public/tips_error');
@@ -107,9 +89,6 @@ class Plugins extends Common
// 视图初始化
$this->PluginsViewInit($pluginsname, $pluginscontrol, $pluginsaction);
- // 编辑器文件存放地址定义
- MyViewAssign('editor_path_type', ResourcesService::EditorPathTypeValue('plugins_'.$pluginsname));
-
// 调用
$ret = PluginsService::PluginsControlCall($pluginsname, $pluginscontrol, $pluginsaction, 'admin', $params);
@@ -170,10 +149,17 @@ class Plugins extends Common
*/
public function PluginsViewInit($plugins_name, $plugins_control, $plugins_action)
{
- // 应用名称/控制器/方法
- MyViewAssign('plugins_name', $plugins_name);
- MyViewAssign('plugins_control', $plugins_control);
- MyViewAssign('plugins_action', $plugins_action);
+ // 模板数据
+ $assign = [
+ // 应用名称/控制器/方法
+ 'plugins_name' => $plugins_name,
+ 'plugins_control' => $plugins_control,
+ 'plugins_action' => $plugins_action,
+ // 列表数据
+ 'data_total' => $this->data_total,
+ 'data_list' => $this->data_list,
+ 'data' => $this->data_detail,
+ ];
// 当前操作名称
$module_name = 'plugins';
@@ -184,22 +170,23 @@ class Plugins extends Common
// 控制器静态文件状态css,js
$module_css = $module_name.DS.'css'.DS.$plugins_name.DS.$group.DS.$plugins_control;
$module_css .= file_exists(ROOT_PATH.'static'.DS.$module_css.'.'.$plugins_action.'.css') ? '.'.$plugins_action.'.css' : '.css';
- MyViewAssign('module_css', file_exists(ROOT_PATH.'static'.DS.$module_css) ? $module_css : '');
+ $assign['module_css'] = file_exists(ROOT_PATH.'static'.DS.$module_css) ? $module_css : '';
$module_js = $module_name.DS.'js'.DS.$plugins_name.DS.$group.DS.$plugins_control;
$module_js .= file_exists(ROOT_PATH.'static'.DS.$module_js.'.'.$plugins_action.'.js') ? '.'.$plugins_action.'.js' : '.js';
- MyViewAssign('module_js', file_exists(ROOT_PATH.'static'.DS.$module_js) ? $module_js : '');
+ $assign['module_js'] = file_exists(ROOT_PATH.'static'.DS.$module_js) ? $module_js : '';
// 应用公共css,js
$plugins_css = $module_name.DS.'css'.DS.$plugins_name.DS.$group.DS.'common.css';
- MyViewAssign('plugins_css', file_exists(ROOT_PATH.'static'.DS.$plugins_css) ? $plugins_css : '');
+ $assign['plugins_css'] = file_exists(ROOT_PATH.'static'.DS.$plugins_css) ? $plugins_css : '';
$plugins_js = $module_name.DS.'js'.DS.$plugins_name.DS.$group.DS.'common.js';
- MyViewAssign('plugins_js', file_exists(ROOT_PATH.'static'.DS.$plugins_js) ? $plugins_js : '');
+ $assign['plugins_js'] = file_exists(ROOT_PATH.'static'.DS.$plugins_js) ? $plugins_js : '';
- // 列表数据
- MyViewAssign('data_total', $this->data_total);
- MyViewAssign('data_list', $this->data_list);
- MyViewAssign('data', $this->data_detail);
+ // 编辑器文件存放地址定义
+ $assign['editor_path_type'] = ResourcesService::EditorPathTypeValue('plugins_'.$plugins_name);
+
+ // 模板赋值
+ MyViewAssign($assign);
}
}
?>
\ No newline at end of file
diff --git a/app/admin/controller/Pluginsadmin.php b/app/admin/controller/Pluginsadmin.php
index 163a632c4..42a99cbb6 100755
--- a/app/admin/controller/Pluginsadmin.php
+++ b/app/admin/controller/Pluginsadmin.php
@@ -10,6 +10,8 @@
// +----------------------------------------------------------------------
namespace app\admin\controller;
+use app\admin\controller\Base;
+use app\service\ApiService;
use app\service\StoreService;
use app\service\PluginsAdminService;
use app\service\ResourcesService;
@@ -23,7 +25,7 @@ use app\service\PluginsUpgradeService;
* @version 0.0.1
* @datetime 2016-12-01T21:51:08+0800
*/
-class Pluginsadmin extends Common
+class Pluginsadmin extends Base
{
/**
* 构造方法
@@ -37,14 +39,8 @@ class Pluginsadmin extends Common
// 调用父类前置方法
parent::__construct();
- // 登录校验
- $this->IsLogin();
-
- // 权限校验
- $this->IsPower();
-
// 小导航
- $this->view_type = input('view_type', 'home');
+ $this->view_type = empty($this->data_request['view_type']) ? 'index' : $this->data_request['view_type'];
}
/**
@@ -56,30 +52,30 @@ class Pluginsadmin extends Common
*/
public function Index()
{
- // 导航参数
- MyViewAssign('view_type', $this->view_type);
+ // 模板数据
+ $assign = [
+ // 导航参数
+ 'view_type' => $this->view_type,
- // 参数
- $params = $this->data_request;
-
- // 应用商店地址
- MyViewAssign('store_url', StoreService::StoreUrl());
+ // 应用商店地址
+ 'store_url' => StoreService::StoreUrl(),
+ ];
// 页面类型
- if($this->view_type == 'home')
+ if($this->view_type == 'index')
{
// 插件列表
$ret = PluginsAdminService::PluginsList(['is_power'=>true]);
- MyViewAssign('data_list', $ret['data']);
+ $assign['data_list'] = $ret['data'];
// 插件更新信息
$upgrade = PluginsService::PluginsUpgradeInfo($ret['data']);
- MyViewAssign('upgrade_info', $upgrade['data']);
-
- return MyView();
- } else {
- return MyView('upload');
+ $assign['upgrade_info'] = $upgrade['data'];
}
+
+ // 数据赋值
+ MyViewAssign($assign);
+ return MyView($this->view_type);
}
/**
@@ -94,9 +90,6 @@ class Pluginsadmin extends Common
// 参数
$params = $this->data_request;
- // 参数
- MyViewAssign('params', $params);
-
// 获取数据
$data = [];
if(!empty($params['id']))
@@ -113,7 +106,12 @@ class Pluginsadmin extends Common
}
}
}
- MyViewAssign('data', $data);
+
+ // 模板数据
+ $assign = [
+ 'data' => $data,
+ 'params' => $params,
+ ];
// 名称校验
if(!empty($params['plugins']))
@@ -121,7 +119,8 @@ class Pluginsadmin extends Common
$ret = PluginsAdminService::PluginsVerification($params, $params['plugins']);
if($ret['code'] != 0)
{
- MyViewAssign('verification_msg', $ret['msg']);
+ $assign['verification_msg'] = $ret['msg'];
+ MyViewAssign($assign);
return MyView('first_step');
}
}
@@ -129,13 +128,17 @@ class Pluginsadmin extends Common
// 标记为空或等于view 并且 编辑数据为空则走第一步
if(empty($params['plugins']) && empty($data['data'][0]))
{
+ MyViewAssign($assign);
return MyView('first_step');
} else {
// 编辑器文件存放地址
- MyViewAssign('editor_path_type', ResourcesService::EditorPathTypeValue('plugins_'.$params['plugins']));
+ $assign['editor_path_type'] = ResourcesService::EditorPathTypeValue('plugins_'.$params['plugins']);
// 唯一标记
- MyViewAssign('plugins', $params['plugins']);
+ $assign['plugins'] = $params['plugins'];
+
+ //数据赋值
+ MyViewAssign($assign);
return MyView('save_info');
}
}
@@ -156,7 +159,7 @@ class Pluginsadmin extends Common
}
// 开始处理
- return PluginsAdminService::PluginsSave($this->data_post);
+ return ApiService::ApiDataReturn(PluginsAdminService::PluginsSave($this->data_post));
}
/**
@@ -175,11 +178,11 @@ class Pluginsadmin extends Common
}
// 开始处理
- return PluginsAdminService::PluginsDelete($this->data_post);
+ return ApiService::ApiDataReturn(PluginsAdminService::PluginsDelete($this->data_post));
}
/**
- * [StatusUpdate 状态更新]
+ * 状态更新
* @author Devil
* @blog http://gong.gg/
* @version 0.0.1
@@ -194,7 +197,7 @@ class Pluginsadmin extends Common
}
// 开始处理
- return PluginsAdminService::PluginsStatusUpdate($this->data_post);
+ return ApiService::ApiDataReturn(PluginsAdminService::PluginsStatusUpdate($this->data_post));
}
/**
@@ -213,7 +216,7 @@ class Pluginsadmin extends Common
}
// 开始处理
- return PluginsAdminService::PluginsUpload($this->data_request);
+ return ApiService::ApiDataReturn(PluginsAdminService::PluginsUpload($this->data_request));
}
/**
@@ -232,8 +235,6 @@ class Pluginsadmin extends Common
{
MyViewAssign('msg', $ret['msg']);
return MyView('public/tips_error');
- } else {
- return $ret;
}
}
@@ -254,7 +255,7 @@ class Pluginsadmin extends Common
}
// 开始操作
- return PluginsAdminService::PluginsInstall($this->data_request);
+ return ApiService::ApiDataReturn(PluginsAdminService::PluginsInstall($this->data_request));
}
/**
@@ -274,7 +275,7 @@ class Pluginsadmin extends Common
}
// 开始操作
- return PluginsAdminService::PluginsUninstall($this->data_request);
+ return ApiService::ApiDataReturn(PluginsAdminService::PluginsUninstall($this->data_request));
}
/**
@@ -294,7 +295,7 @@ class Pluginsadmin extends Common
}
// 开始操作
- return PluginsAdminService::SortSave($this->data_post);
+ return ApiService::ApiDataReturn(PluginsAdminService::SortSave($this->data_post));
}
/**
@@ -314,7 +315,7 @@ class Pluginsadmin extends Common
}
// 开始操作
- return PluginsUpgradeService::Run($this->data_post);
+ return ApiService::ApiDataReturn(PluginsUpgradeService::Run($this->data_post));
}
}
?>
\ No newline at end of file
diff --git a/app/admin/controller/Power.php b/app/admin/controller/Power.php
index 7d667aa6f..4dd7e8ea2 100755
--- a/app/admin/controller/Power.php
+++ b/app/admin/controller/Power.php
@@ -10,6 +10,8 @@
// +----------------------------------------------------------------------
namespace app\admin\controller;
+use app\admin\controller\Base;
+use app\service\ApiService;
use app\service\AdminPowerService;
/**
@@ -19,29 +21,10 @@ use app\service\AdminPowerService;
* @version 0.0.1
* @datetime 2016-12-01T21:51:08+0800
*/
-class Power extends Common
+class Power extends Base
{
/**
- * 构造方法
- * @author Devil
- * @blog http://gong.gg/
- * @version 0.0.1
- * @datetime 2016-12-03T12:39:08+0800
- */
- public function __construct()
- {
- // 调用父类前置方法
- parent::__construct();
-
- // 登录校验
- $this->IsLogin();
-
- // 权限校验
- $this->IsPower();
- }
-
- /**
- * [Index 权限组列表]
+ * 列表
* @author Devil
* @blog http://gong.gg/
* @version 0.0.1
@@ -52,17 +35,20 @@ class Power extends Common
$data_params = [
'field' => 'id,pid,name,control,action,url,sort,is_show,icon',
'order_by' => 'sort asc',
- 'where' => ['pid'=>0],
+ 'where' => [
+ ['pid', '=', 0]
+ ],
];
- $data = AdminPowerService::PowerList($data_params);
-
- MyViewAssign('data', $data);
- MyViewAssign('common_is_show_list', MyConst('common_is_show_list'));
+ $assign = [
+ 'data' => AdminPowerService::PowerList($data_params),
+ 'common_is_show_list' => MyConst('common_is_show_list'),
+ ];
+ MyViewAssign($assign);
return MyView();
}
/**
- * [Save 权限添加/编辑]
+ * 权限添加/编辑
* @author Devil
* @blog http://gong.gg/
* @version 0.0.1
@@ -79,11 +65,11 @@ class Power extends Common
// 开始操作
$params = $this->data_post;
$params['admin'] = $this->admin;
- return AdminPowerService::PowerSave($params);
+ return ApiService::ApiDataReturn(AdminPowerService::PowerSave($params));
}
/**
- * [Delete 权限删除]
+ * 删除
* @author Devil
* @blog http://gong.gg/
* @version 0.0.1
@@ -100,7 +86,7 @@ class Power extends Common
// 开始操作
$params = $this->data_post;
$params['admin'] = $this->admin;
- return AdminPowerService::PowerDelete($params);
+ return ApiService::ApiDataReturn(AdminPowerService::PowerDelete($params));
}
}
?>
\ No newline at end of file
diff --git a/app/admin/controller/Quicknav.php b/app/admin/controller/Quicknav.php
index 3390f2a67..2f12393c3 100755
--- a/app/admin/controller/Quicknav.php
+++ b/app/admin/controller/Quicknav.php
@@ -10,6 +10,8 @@
// +----------------------------------------------------------------------
namespace app\admin\controller;
+use app\admin\controller\Base;
+use app\service\ApiService;
use app\service\QuickNavService;
use app\service\ResourcesService;
@@ -20,27 +22,8 @@ use app\service\ResourcesService;
* @version 0.0.1
* @datetime 2016-12-01T21:51:08+0800
*/
-class QuickNav extends Common
+class QuickNav extends Base
{
- /**
- * 构造方法
- * @author Devil
- * @blog http://gong.gg/
- * @version 0.0.1
- * @datetime 2016-12-03T12:39:08+0800
- */
- public function __construct()
- {
- // 调用父类前置方法
- parent::__construct();
-
- // 登录校验
- $this->IsLogin();
-
- // 权限校验
- $this->IsPower();
- }
-
/**
* 列表
* @author Devil
@@ -74,19 +57,23 @@ class QuickNav extends Common
*/
public function SaveInfo()
{
- // 参数
+ // 模板数据
+ $assign = [
+ // 静态数据
+ 'common_platform_type' => MyConst('common_platform_type'),
+ 'common_app_event_type' => MyConst('common_app_event_type'),
+
+ // 编辑器文件存放地址
+ 'editor_path_type' => ResourcesService::EditorPathTypeValue('quick_nav'),
+ ];
+
+ // 参数处理
$params = $this->data_request;
-
- // 静态数据
- MyViewAssign('common_platform_type', MyConst('common_platform_type'));
- MyViewAssign('common_app_event_type', MyConst('common_app_event_type'));
-
- // 编辑器文件存放地址
- MyViewAssign('editor_path_type', ResourcesService::EditorPathTypeValue('quick_nav'));
-
- // 数据
unset($params['id']);
- MyViewAssign('params', $params);
+ $assign['params'] = $params;
+
+ //数据赋值
+ MyViewAssign($assign);
return MyView();
}
@@ -107,7 +94,7 @@ class QuickNav extends Common
// 开始处理
$params = $this->data_request;
- return QuickNavService::QuickNavSave($params);
+ return ApiService::ApiDataReturn(QuickNavService::QuickNavSave($params));
}
/**
@@ -128,7 +115,7 @@ class QuickNav extends Common
// 开始处理
$params = $this->data_request;
$params['user_type'] = 'admin';
- return QuickNavService::QuickNavDelete($params);
+ return ApiService::ApiDataReturn(QuickNavService::QuickNavDelete($params));
}
/**
@@ -148,7 +135,7 @@ class QuickNav extends Common
// 开始处理
$params = $this->data_request;
- return QuickNavService::QuickNavStatusUpdate($params);
+ return ApiService::ApiDataReturn(QuickNavService::QuickNavStatusUpdate($params));
}
}
?>
\ No newline at end of file
diff --git a/app/admin/controller/Refundlog.php b/app/admin/controller/Refundlog.php
index d58688f68..ac5055e0c 100644
--- a/app/admin/controller/Refundlog.php
+++ b/app/admin/controller/Refundlog.php
@@ -10,6 +10,8 @@
// +----------------------------------------------------------------------
namespace app\admin\controller;
+use app\admin\controller\Base;
+
/**
* 退款日志管理
* @author Devil
@@ -17,27 +19,8 @@ namespace app\admin\controller;
* @version 0.0.1
* @datetime 2016-12-01T21:51:08+0800
*/
-class RefundLog extends Common
+class RefundLog extends Base
{
- /**
- * 构造方法
- * @author Devil
- * @blog http://gong.gg/
- * @version 0.0.1
- * @datetime 2016-12-03T12:39:08+0800
- */
- public function __construct()
- {
- // 调用父类前置方法
- parent::__construct();
-
- // 登录校验
- $this->IsLogin();
-
- // 权限校验
- $this->IsPower();
- }
-
/**
* 列表
* @author Devil
diff --git a/app/admin/controller/Region.php b/app/admin/controller/Region.php
index d93bcf59c..2b04bebe5 100755
--- a/app/admin/controller/Region.php
+++ b/app/admin/controller/Region.php
@@ -10,6 +10,8 @@
// +----------------------------------------------------------------------
namespace app\admin\controller;
+use app\admin\controller\Base;
+use app\service\ApiService;
use app\service\RegionService;
/**
@@ -19,26 +21,10 @@ use app\service\RegionService;
* @version 0.0.1
* @datetime 2016-12-01T21:51:08+0800
*/
-class Region extends Common
+class Region extends Base
{
/**
- * 构造方法
- * @author Devil
- * @blog http://gong.gg/
- * @version 0.0.1
- * @datetime 2016-12-03T12:39:08+0800
- */
- public function __construct()
- {
- // 调用父类前置方法
- parent::__construct();
-
- // 登录校验
- $this->IsLogin();
- }
-
- /**
- * [Index 地区列表]
+ * 列表
* @author Devil
* @blog http://gong.gg/
* @version 0.0.1
@@ -46,17 +32,13 @@ class Region extends Common
*/
public function Index()
{
- // 权限校验
- $this->IsPower();
-
// 是否启用
MyViewAssign('common_is_enable_list', MyConst('common_is_enable_list'));
-
return MyView();
}
/**
- * [GetNodeSon 获取节点子列表]
+ * 获取节点子列表
* @author Devil
* @blog http://gong.gg/
* @version 0.0.1
@@ -64,21 +46,18 @@ class Region extends Common
*/
public function GetNodeSon()
{
- // 权限校验
- $this->IsPower();
-
// 是否ajax请求
if(!IS_AJAX)
{
- $this->error('非法访问');
+ return $this->error('非法访问');
}
// 开始操作
- return RegionService::RegionNodeSon($this->data_request);
+ return ApiService::ApiDataReturn(RegionService::RegionNodeSon($this->data_request));
}
/**
- * [Save 地区保存]
+ * 保存
* @author Devil
* @blog http://gong.gg/
* @version 0.0.1
@@ -86,31 +65,25 @@ class Region extends Common
*/
public function Save()
{
- // 权限校验
- $this->IsPower();
-
// 是否ajax请求
if(!IS_AJAX)
{
- $this->error('非法访问');
+ return $this->error('非法访问');
}
// 开始操作
- return RegionService::RegionSave($this->data_request);
+ return ApiService::ApiDataReturn(RegionService::RegionSave($this->data_request));
}
/**
- * [Delete 地区删除]
+ * 删除
* @author Devil
* @blog http://gong.gg/
* @version 0.0.1
* @datetime 2016-12-25T22:36:12+0800
*/
public function Delete()
- {
- // 权限校验
- $this->IsPower();
-
+ {
// 是否ajax
if(!IS_AJAX)
{
@@ -120,7 +93,7 @@ class Region extends Common
// 开始操作
$params = $this->data_post;
$params['admin'] = $this->admin;
- return RegionService::RegionDelete($params);
+ return ApiService::ApiDataReturn(RegionService::RegionDelete($params));
}
/**
@@ -136,17 +109,17 @@ class Region extends Common
// 是否ajax请求
if(!IS_AJAX)
{
- $this->error('非法访问');
+ return $this->error('非法访问');
}
// 获取地区
+ $pid = empty($this->data_request['pid']) ? 0 : intval($this->data_request['pid']);
$params = [
'where' => [
- 'pid' => isset($this->data_request['pid']) ? intval($this->data_request['pid']) : 0,
+ ['pid', '=', $pid],
],
];
- $data = RegionService::RegionNode($params);
- return DataReturn('操作成功', 0, $data);
+ return ApiService::ApiDataReturn(DataReturn('获取成功', 0, RegionService::RegionNode($params)));
}
}
?>
\ No newline at end of file
diff --git a/app/admin/controller/Role.php b/app/admin/controller/Role.php
index a0948a56a..5bc274db8 100644
--- a/app/admin/controller/Role.php
+++ b/app/admin/controller/Role.php
@@ -10,6 +10,8 @@
// +----------------------------------------------------------------------
namespace app\admin\controller;
+use app\admin\controller\Base;
+use app\service\ApiService;
use app\service\AdminRoleService;
/**
@@ -19,27 +21,8 @@ use app\service\AdminRoleService;
* @version 0.0.1
* @datetime 2016-12-01T21:51:08+0800
*/
-class Role extends Common
+class Role extends Base
{
- /**
- * 构造方法
- * @author Devil
- * @blog http://gong.gg/
- * @version 0.0.1
- * @datetime 2016-12-03T12:39:08+0800
- */
- public function __construct()
- {
- // 调用父类前置方法
- parent::__construct();
-
- // 登录校验
- $this->IsLogin();
-
- // 权限校验
- $this->IsPower();
- }
-
/**
* 列表
* @author Devil
@@ -84,13 +67,16 @@ class Role extends Common
$params['role_id'] = $data['id'];
}
+ // 模板数据
+ $assign = [];
+
// 权限列表
$power = AdminRoleService::RolePowerEditData($params);
- MyViewAssign('power', $power);
+ $assign['power'] = $power;
// 角色编辑页面钩子
$hook_name = 'plugins_view_admin_role_save';
- MyViewAssign($hook_name.'_data', MyEventTrigger($hook_name,
+ $assign[$hook_name.'_data'] = MyEventTrigger($hook_name,
[
'hook_name' => $hook_name,
'is_backend' => true,
@@ -98,12 +84,15 @@ class Role extends Common
'data' => &$data,
'power' => &$power,
'params' => &$params,
- ]));
+ ]);
- // 数据
+ // 数据/参数
unset($params['id']);
- MyViewAssign('data', $data);
- MyViewAssign('params', $params);
+ $assign['data'] = $data;
+ $assign['params'] = $params;
+
+ // 模板赋值
+ MyViewAssign($assign);
return MyView();
}
@@ -119,11 +108,11 @@ class Role extends Common
// 是否ajax请求
if(!IS_AJAX)
{
- $this->error('非法访问');
+ return $this->error('非法访问');
}
// 开始操作
- return AdminRoleService::RoleSave($this->data_post);
+ return ApiService::ApiDataReturn(AdminRoleService::RoleSave($this->data_post));
}
/**
@@ -138,11 +127,11 @@ class Role extends Common
// 是否ajax请求
if(!IS_AJAX)
{
- $this->error('非法访问');
+ return $this->error('非法访问');
}
// 开始操作
- return AdminRoleService::RoleDelete($this->data_post);
+ return ApiService::ApiDataReturn(AdminRoleService::RoleDelete($this->data_post));
}
/**
@@ -163,7 +152,7 @@ class Role extends Common
// 开始操作
$params = $this->data_post;
$params['admin'] = $this->admin;
- return AdminRoleService::RoleStatusUpdate($params);
+ return ApiService::ApiDataReturn(AdminRoleService::RoleStatusUpdate($params));
}
}
?>
\ No newline at end of file
diff --git a/app/admin/controller/Screeningprice.php b/app/admin/controller/Screeningprice.php
index de41a3fc9..a4d09f16d 100755
--- a/app/admin/controller/Screeningprice.php
+++ b/app/admin/controller/Screeningprice.php
@@ -10,6 +10,8 @@
// +----------------------------------------------------------------------
namespace app\admin\controller;
+use app\admin\controller\Base;
+use app\service\ApiService;
use app\service\ScreeningPriceService;
/**
@@ -19,29 +21,10 @@ use app\service\ScreeningPriceService;
* @version 0.0.1
* @datetime 2016-12-01T21:51:08+0800
*/
-class ScreeningPrice extends Common
+class ScreeningPrice extends Base
{
/**
- * 构造方法
- * @author Devil
- * @blog http://gong.gg/
- * @version 0.0.1
- * @datetime 2016-12-03T12:39:08+0800
- */
- public function __construct()
- {
- // 调用父类前置方法
- parent::__construct();
-
- // 登录校验
- $this->IsLogin();
-
- // 权限校验
- $this->IsPower();
- }
-
- /**
- * [Index 筛选价格列表]
+ * 列表
* @author Devil
* @blog http://gong.gg/
* @version 0.0.1
@@ -51,12 +34,11 @@ class ScreeningPrice extends Common
{
// 是否启用
MyViewAssign('common_is_enable_list', MyConst('common_is_enable_list'));
-
return MyView();
}
/**
- * [GetNodeSon 获取节点子列表]
+ * 获取节点子列表
* @author Devil
* @blog http://gong.gg/
* @version 0.0.1
@@ -67,15 +49,15 @@ class ScreeningPrice extends Common
// 是否ajax请求
if(!IS_AJAX)
{
- $this->error('非法访问');
+ return $this->error('非法访问');
}
// 开始操作
- return ScreeningPriceService::ScreeningPriceNodeSon($this->data_request);
+ return ApiService::ApiDataReturn(ScreeningPriceService::ScreeningPriceNodeSon($this->data_request));
}
/**
- * [Save 筛选价格保存]
+ * 保存
* @author Devil
* @blog http://gong.gg/
* @version 0.0.1
@@ -86,15 +68,15 @@ class ScreeningPrice extends Common
// 是否ajax请求
if(!IS_AJAX)
{
- $this->error('非法访问');
+ return $this->error('非法访问');
}
// 开始操作
- return ScreeningPriceService::ScreeningPriceSave($this->data_request);
+ return ApiService::ApiDataReturn(ScreeningPriceService::ScreeningPriceSave($this->data_request));
}
/**
- * [Delete 筛选价格删除]
+ * 删除
* @author Devil
* @blog http://gong.gg/
* @version 0.0.1
@@ -111,7 +93,7 @@ class ScreeningPrice extends Common
// 开始操作
$params = $this->data_post;
$params['admin'] = $this->admin;
- return ScreeningPriceService::ScreeningPriceDelete($params);
+ return ApiService::ApiDataReturn(ScreeningPriceService::ScreeningPriceDelete($params));
}
}
?>
\ No newline at end of file
diff --git a/app/admin/controller/Seo.php b/app/admin/controller/Seo.php
index ecc61bab2..1f499370c 100755
--- a/app/admin/controller/Seo.php
+++ b/app/admin/controller/Seo.php
@@ -10,6 +10,8 @@
// +----------------------------------------------------------------------
namespace app\admin\controller;
+use app\admin\controller\Base;
+use app\service\ApiService;
use app\service\ConfigService;
/**
@@ -19,29 +21,10 @@ use app\service\ConfigService;
* @version 0.0.1
* @datetime 2016-12-01T21:51:08+0800
*/
-class Seo extends Common
+class Seo extends Base
{
/**
- * 构造方法
- * @author Devil
- * @blog http://gong.gg/
- * @version 0.0.1
- * @datetime 2016-12-03T12:39:08+0800
- */
- public function __construct()
- {
- // 调用父类前置方法
- parent::__construct();
-
- // 登录校验
- $this->IsLogin();
-
- // 权限校验
- $this->IsPower();
- }
-
- /**
- * [Index 配置列表]
+ * 列表
* @author Devil
* @blog http://gong.gg/
* @version 0.0.1
@@ -49,23 +32,26 @@ class Seo extends Common
*/
public function Index()
{
- // url模式
- MyViewAssign('seo_url_model_list', MyConst('seo_url_model_list'));
+ // 模板数据
+ $assign = [
+ // url模式
+ 'seo_url_model_list' => MyConst('seo_url_model_list'),
- // 文章标题seo方案
- MyViewAssign('seo_article_browser_list', MyConst('seo_article_browser_list'));
+ // 文章标题seo方案
+ 'seo_article_browser_list' => MyConst('seo_article_browser_list'),
- // 频道标题seo方案
- MyViewAssign('seo_channel_browser_list', MyConst('seo_channel_browser_list'));
+ // 频道标题seo方案
+ 'seo_channel_browser_list' => MyConst('seo_channel_browser_list'),
- // 配置信息
- MyViewAssign('data', ConfigService::ConfigList());
-
+ // 配置信息
+ 'data' => ConfigService::ConfigList(),
+ ];
+ MyViewAssign($assign);
return MyView();
}
/**
- * [Save 配置数据保存]
+ * 保存
* @author Devil
* @blog http://gong.gg/
* @version 0.0.1
@@ -73,7 +59,7 @@ class Seo extends Common
*/
public function Save()
{
- return ConfigService::ConfigSave($this->data_request);
+ return ApiService::ApiDataReturn(ConfigService::ConfigSave($this->data_request));
}
}
?>
\ No newline at end of file
diff --git a/app/admin/controller/Site.php b/app/admin/controller/Site.php
index 9e67cbde4..af610a7f8 100755
--- a/app/admin/controller/Site.php
+++ b/app/admin/controller/Site.php
@@ -10,6 +10,8 @@
// +----------------------------------------------------------------------
namespace app\admin\controller;
+use app\admin\controller\Base;
+use app\service\ApiService;
use app\service\SystemService;
use app\service\ConfigService;
use app\service\GoodsService;
@@ -24,7 +26,7 @@ use app\service\ResourcesService;
* @version 0.0.1
* @datetime 2016-12-01T21:51:08+0800
*/
-class Site extends Common
+class Site extends Base
{
public $nav_type;
public $view_type;
@@ -41,15 +43,9 @@ class Site extends Common
// 调用父类前置方法
parent::__construct();
- // 登录校验
- $this->IsLogin();
-
- // 权限校验
- $this->IsPower();
-
// 导航类型
- $this->nav_type = input('nav_type', 'base');
- $this->view_type = input('view_type', 'index');
+ $this->nav_type = empty($this->data_request['nav_type']) ? 'base' : $this->data_request['nav_type'];
+ $this->view_type = empty($this->data_request['view_type']) ? 'index' : $this->data_request['view_type'];
// 仅网站设置页面存在多个子页面
if($this->nav_type != 'siteset')
@@ -69,11 +65,10 @@ class Site extends Common
public function Index()
{
// 公共数据
- $this->CurrentViewInit();
+ $assign = $this->CurrentViewInit();
// 配置信息
- $data = ConfigService::ConfigList();
- MyViewAssign('data', $data);
+ $assign['data'] = ConfigService::ConfigList();
// 数据处理
switch($this->nav_type)
@@ -84,11 +79,11 @@ class Site extends Common
if(!empty($data['common_self_extraction_address']) && !empty($data['common_self_extraction_address']['value']))
{
$address = ConfigService::SiteTypeExtractionAddressList($data['common_self_extraction_address']['value']);
- MyViewAssign('sitetype_address_list', $address['data']);
+ $assign['sitetype_address_list'] = $address['data'];
}
// 加载地图api
- MyViewAssign('is_load_map_api', 1);
+ $assign['is_load_map_api'] = 1;
break;
// 网站设置
@@ -122,26 +117,25 @@ class Site extends Common
$c['config_category_ids'] = array_key_exists($c['id'], $floor_category) ? explode(',', $floor_category[$c['id']]) : [];
}
}
- MyViewAssign('goods_category_list', $category);
+ $assign['goods_category_list'] = $category;
// 楼层自定义商品
if(!empty($data['home_index_floor_manual_mode_goods']) && !empty($data['home_index_floor_manual_mode_goods']['value']))
{
$ret = SiteService::FloorManualModeGoodsViewHandle(json_decode($data['home_index_floor_manual_mode_goods']['value'], true));
- MyViewAssign('floor_manual_mode_goods_list', $ret['data']);
+ $assign['floor_manual_mode_goods_list'] = $ret['data'];
}
// 支付方式
- $payment_list = PaymentService::PaymentList(['is_enable'=>1, 'is_open_user'=>1]);
- MyViewAssign('payment_list', $payment_list);
-
- // 默认支付方式
- //$params['common_default_payment'] = empty($params['common_default_payment']) ? '' : json_encode($params['common_default_payment'], JSON_UNESCAPED_UNICODE);
+ $assign['payment_list'] = PaymentService::PaymentList(['is_enable'=>1, 'is_open_user'=>1]);
break;
}
// 编辑器文件存放地址
- MyViewAssign('editor_path_type', ResourcesService::EditorPathTypeValue('common'));
+ $assign['editor_path_type'] = ResourcesService::EditorPathTypeValue('common');
+
+ // 数据赋值
+ MyViewAssign($assign);
// 视图
$view = 'site/'.$this->nav_type.'/'.$this->view_type;
@@ -158,55 +152,58 @@ class Site extends Common
*/
public function CurrentViewInit()
{
- // 主/子导航
- MyViewAssign('nav_type', $this->nav_type);
- MyViewAssign('view_type', $this->view_type);
+ // 模板数据
+ $assign = [
+ // 主/子导航
+ 'nav_type' => $this->nav_type,
+ 'view_type' => $this->view_type,
- // 时区
- MyViewAssign('site_timezone_list', MyConst('site_timezone_list'));
+ // 时区
+ 'site_timezone_list' => MyConst('site_timezone_list'),
- // 平台
- MyViewAssign('common_platform_type', MyConst('common_platform_type'));
+ // 平台
+ 'common_platform_type' => MyConst('common_platform_type'),
- // 关闭开启
- MyViewAssign('common_close_open_list', MyConst('common_close_open_list'));
+ // 关闭开启
+ 'common_close_open_list' => MyConst('common_close_open_list'),
- // 登录方式
- MyViewAssign('common_login_type_list', MyConst('common_login_type_list'));
+ // 登录方式
+ 'common_login_type_list' => MyConst('common_login_type_list'),
- // 用户注册类型列表
- MyViewAssign('common_user_reg_type_list', MyConst('common_user_reg_type_list'));
+ // 用户注册类型列表
+ 'common_user_reg_type_list' => MyConst('common_user_reg_type_list'),
- // 图片验证码规则
- MyViewAssign('site_images_verify_rules_list', MyConst('site_images_verify_rules_list'));
+ // 图片验证码规则
+ 'site_images_verify_rules_list' => MyConst('site_images_verify_rules_list'),
- // 热门搜索关键字
- MyViewAssign('common_search_keywords_type_list', MyConst('common_search_keywords_type_list'));
+ // 热门搜索关键字
+ 'common_search_keywords_type_list' => MyConst('common_search_keywords_type_list'),
- // 是否
- MyViewAssign('common_is_text_list', MyConst('common_is_text_list'));
+ // 是否
+ 'common_is_text_list' => MyConst('common_is_text_list'),
- // 站点类型
- MyViewAssign('common_site_type_list', MyConst('common_site_type_list'));
+ // 站点类型
+ 'common_site_type_list' => MyConst('common_site_type_list'),
- // 扣除库存规则
- MyViewAssign('common_deduction_inventory_rules_list', MyConst('common_deduction_inventory_rules_list'));
+ // 扣除库存规则
+ 'common_deduction_inventory_rules_list' => MyConst('common_deduction_inventory_rules_list'),
- // 增加销量规则
- MyViewAssign('common_sales_count_inc_rules_list', MyConst('common_sales_count_inc_rules_list'));
+ // 增加销量规则
+ 'common_sales_count_inc_rules_list' => MyConst('common_sales_count_inc_rules_list'),
- // 首页商品排序规则
- MyViewAssign('goods_order_by_type_list', MyConst('goods_order_by_type_list'));
- MyViewAssign('goods_order_by_rule_list', MyConst('goods_order_by_rule_list'));
+ // 首页商品排序规则
+ 'goods_order_by_type_list' => MyConst('goods_order_by_type_list'),
+ 'goods_order_by_rule_list' => MyConst('goods_order_by_rule_list'),
- // 首页楼层数据类型
- MyViewAssign('common_site_floor_data_type_list', MyConst('common_site_floor_data_type_list'));
+ // 首页楼层数据类型
+ 'common_site_floor_data_type_list' => MyConst('common_site_floor_data_type_list'),
- // 搜索参数类型
- MyViewAssign('common_goods_parameters_type_list', MyConst('common_goods_parameters_type_list'));
+ // 搜索参数类型
+ 'common_goods_parameters_type_list' => MyConst('common_goods_parameters_type_list'),
+ ];
// 主导航
- MyViewAssign('second_nav_list', [
+ $assign['second_nav_list'] = [
[
'name' => '基础配置',
'type' => 'base',
@@ -251,10 +248,10 @@ class Site extends Common
'name' => '扩展项',
'type' => 'extends',
],
- ]);
+ ];
// 网站设置导航
- MyViewAssign('siteset_nav_list', [
+ $assign['siteset_nav_list'] = [
[
'name' => '首页',
'type' => 'index',
@@ -279,7 +276,8 @@ class Site extends Common
'name' => '扩展',
'type' => 'extends',
],
- ]);
+ ];
+ return $assign;
}
/**
@@ -407,8 +405,7 @@ class Site extends Common
break;
}
}
-
- return $ret;
+ return ApiService::ApiDataReturn($ret);
}
/**
@@ -434,7 +431,7 @@ class Site extends Common
MyViewAssign('data', $ret['data']['data']);
$ret['data']['data'] = MyView('site/public/goods_search');
}
- return $ret;
+ return ApiService::ApiDataReturn($ret);
}
}
?>
\ No newline at end of file
diff --git a/app/admin/controller/Slide.php b/app/admin/controller/Slide.php
index b6957bf83..7c3cc0133 100755
--- a/app/admin/controller/Slide.php
+++ b/app/admin/controller/Slide.php
@@ -10,6 +10,8 @@
// +----------------------------------------------------------------------
namespace app\admin\controller;
+use app\admin\controller\Base;
+use app\service\ApiService;
use app\service\SlideService;
use app\service\ResourcesService;
@@ -20,27 +22,8 @@ use app\service\ResourcesService;
* @version 0.0.1
* @datetime 2016-12-01T21:51:08+0800
*/
-class Slide extends Common
+class Slide extends Base
{
- /**
- * 构造方法
- * @author Devil
- * @blog http://gong.gg/
- * @version 0.0.1
- * @datetime 2016-12-03T12:39:08+0800
- */
- public function __construct()
- {
- // 调用父类前置方法
- parent::__construct();
-
- // 登录校验
- $this->IsLogin();
-
- // 权限校验
- $this->IsPower();
- }
-
/**
* 列表
* @author Devil
@@ -74,20 +57,23 @@ class Slide extends Common
*/
public function SaveInfo()
{
+ // 模板数据
+ $assign = [
+ // 静态资源
+ 'common_is_enable_list' => MyConst('common_is_enable_list'),
+ 'common_platform_type' => MyConst('common_platform_type'),
+ 'common_app_event_type' => MyConst('common_app_event_type'),
+ // 编辑器文件存放地址
+ 'editor_path_type' => ResourcesService::EditorPathTypeValue('slide'),
+ ];
+
// 参数
$params = $this->data_request;
-
- // 静态资源
- MyViewAssign('common_is_enable_list', MyConst('common_is_enable_list'));
- MyViewAssign('common_platform_type', MyConst('common_platform_type'));
- MyViewAssign('common_app_event_type', MyConst('common_app_event_type'));
-
- // 编辑器文件存放地址
- MyViewAssign('editor_path_type', ResourcesService::EditorPathTypeValue('slide'));
-
- // 数据
unset($params['id']);
- MyViewAssign('params', $params);
+ $assign['params'] = $params;
+
+ // 数据赋值
+ MyViewAssign($assign);
return MyView();
}
@@ -108,7 +94,7 @@ class Slide extends Common
// 开始处理
$params = $this->data_request;
- return SlideService::SlideSave($params);
+ return ApiService::ApiDataReturn(SlideService::SlideSave($params));
}
/**
@@ -128,7 +114,7 @@ class Slide extends Common
// 开始处理
$params = $this->data_request;
- return SlideService::SlideDelete($params);
+ return ApiService::ApiDataReturn(SlideService::SlideDelete($params));
}
/**
@@ -148,7 +134,7 @@ class Slide extends Common
// 开始处理
$params = $this->data_request;
- return SlideService::SlideStatusUpdate($params);
+ return ApiService::ApiDataReturn(SlideService::SlideStatusUpdate($params));
}
}
?>
\ No newline at end of file
diff --git a/app/admin/controller/Sms.php b/app/admin/controller/Sms.php
index e42239569..2cf6c8eeb 100755
--- a/app/admin/controller/Sms.php
+++ b/app/admin/controller/Sms.php
@@ -10,6 +10,8 @@
// +----------------------------------------------------------------------
namespace app\admin\controller;
+use app\admin\controller\Base;
+use app\service\ApiService;
use app\service\ConfigService;
/**
@@ -19,29 +21,10 @@ use app\service\ConfigService;
* @version 0.0.1
* @datetime 2016-12-01T21:51:08+0800
*/
-class Sms extends Common
+class Sms extends Base
{
/**
- * 构造方法
- * @author Devil
- * @blog http://gong.gg/
- * @version 0.0.1
- * @datetime 2016-12-03T12:39:08+0800
- */
- public function __construct()
- {
- // 调用父类前置方法
- parent::__construct();
-
- // 登录校验
- $this->IsLogin();
-
- // 权限校验
- $this->IsPower();
- }
-
- /**
- * [Index 配置列表]
+ * 列表
* @author Devil
* @blog http://gong.gg/
* @version 0.0.1
@@ -49,22 +32,21 @@ class Sms extends Common
*/
public function Index()
{
- // 配置信息
- MyViewAssign('data', ConfigService::ConfigList());
-
// 导航
- $type = input('type', 'sms');
- MyViewAssign('nav_type', $type);
- if($type == 'sms')
- {
- return MyView('index');
- } else {
- return MyView('message');
- }
+ $type = empty($this->data_request['type']) ? 'index' : $this->data_request['type'];
+ $assign = [
+ // 配置信息
+ 'data' => ConfigService::ConfigList(),
+
+ // 页面导航
+ 'nav_type' => $type,
+ ];
+ MyViewAssign($assign);
+ return MyView($type);
}
/**
- * [Save 配置数据保存]
+ * 保存
* @author Devil
* @blog http://gong.gg/
* @version 0.0.1
@@ -72,7 +54,7 @@ class Sms extends Common
*/
public function Save()
{
- return ConfigService::ConfigSave($_POST);
+ return ApiService::ApiDataReturn(ConfigService::ConfigSave($_POST));
}
}
?>
\ No newline at end of file
diff --git a/app/admin/controller/Sqlconsole.php b/app/admin/controller/Sqlconsole.php
index cb5d7968a..e58bd7018 100755
--- a/app/admin/controller/Sqlconsole.php
+++ b/app/admin/controller/Sqlconsole.php
@@ -10,6 +10,8 @@
// +----------------------------------------------------------------------
namespace app\admin\controller;
+use app\admin\controller\Base;
+use app\service\ApiService;
use app\service\SqlConsoleService;
/**
@@ -19,29 +21,10 @@ use app\service\SqlConsoleService;
* @version 0.0.1
* @datetime 2016-12-01T21:51:08+0800
*/
-class Sqlconsole extends Common
+class Sqlconsole extends Base
{
/**
- * 构造方法
- * @author Devil
- * @blog http://gong.gg/
- * @version 0.0.1
- * @datetime 2016-12-03T12:39:08+0800
- */
- public function __construct()
- {
- // 调用父类前置方法
- parent::__construct();
-
- // 登录校验
- $this->IsLogin();
-
- // 权限校验
- $this->IsPower();
- }
-
- /**
- * [Index 首页]
+ * 首页
* @author Devil
* @blog http://gong.gg/
* @version 0.0.1
@@ -70,11 +53,12 @@ class Sqlconsole extends Common
// 是否开启开发者模式
if(MyConfig('shopxo.is_develop') !== true)
{
- return DataReturn('请先开启开发者模式', -1);
+ $ret = DataReturn('请先开启开发者模式', -1);
+ } else {
+ // 开始处理
+ $ret = SqlConsoleService::Implement($this->data_request);
}
-
- // 开始处理
- return SqlConsoleService::Implement($this->data_request);
+ return ApiService::ApiDataReturn($ret);
}
}
?>
\ No newline at end of file
diff --git a/app/admin/controller/Store.php b/app/admin/controller/Store.php
index 35d127f42..5e67c31ed 100644
--- a/app/admin/controller/Store.php
+++ b/app/admin/controller/Store.php
@@ -10,6 +10,7 @@
// +----------------------------------------------------------------------
namespace app\admin\controller;
+use app\admin\controller\Base;
use app\service\StoreService;
/**
@@ -19,25 +20,8 @@ use app\service\StoreService;
* @version 0.0.1
* @@date 2019-06-13
*/
-class Store extends Common
+class Store extends Base
{
- /**
- * 构造方法
- * @author Devil
- * @blog http://gong.gg/
- * @version 1.0.0
- * @date 2019-06-13
- * @desc description
- */
- public function __construct()
- {
- // 调用父类前置方法
- parent::__construct();
-
- // 登录校验
- $this->IsLogin();
- }
-
/**
* 应用商店首页
* @author Devil
diff --git a/app/admin/controller/Theme.php b/app/admin/controller/Theme.php
index 4a1f333fe..c32e24731 100755
--- a/app/admin/controller/Theme.php
+++ b/app/admin/controller/Theme.php
@@ -10,6 +10,8 @@
// +----------------------------------------------------------------------
namespace app\admin\controller;
+use app\admin\controller\Base;
+use app\service\ApiService;
use app\service\ThemeService;
use app\service\ConfigService;
use app\service\StoreService;
@@ -21,7 +23,7 @@ use app\service\StoreService;
* @version 0.0.1
* @datetime 2016-12-01T21:51:08+0800
*/
-class Theme extends Common
+class Theme extends Base
{
private $view_type;
@@ -37,14 +39,8 @@ class Theme extends Common
// 调用父类前置方法
parent::__construct();
- // 登录校验
- $this->IsLogin();
-
- // 权限校验
- $this->IsPower();
-
// 小导航
- $this->view_type = input('view_type', 'index');
+ $this->view_type = empty($this->data_request['view_type']) ? 'index' : $this->data_request['view_type'];
}
/**
@@ -56,26 +52,32 @@ class Theme extends Common
*/
public function Index()
{
- // 导航参数
- MyViewAssign('view_type', $this->view_type);
+ // 模板数据
+ $assign = [
+ // 导航参数
+ 'view_type' => $this->view_type,
- // 应用商店
- MyViewAssign('store_theme_url', StoreService::StoreThemeUrl());
+ // 应用商店
+ 'store_theme_url' => StoreService::StoreThemeUrl(),
+ ];
// 是否默认首页
if($this->view_type == 'index')
{
// 默认主题
- MyViewAssign('theme', ThemeService::DefaultTheme());
+ $assign['theme'] = ThemeService::DefaultTheme();
// 获取主题列表
- $data = ThemeService::ThemeList();
- MyViewAssign('data_list', $data);
+ $data_list = ThemeService::ThemeList();
+ $assign['data_list'] = $data_list;
// 插件更新信息
- $upgrade = ThemeService::ThemeUpgradeInfo($data);
- MyViewAssign('upgrade_info', $upgrade['data']);
+ $upgrade = ThemeService::ThemeUpgradeInfo($data_list);
+ $assign['upgrade_info'] = $upgrade['data'];
}
+
+ // 数据赋值
+ MyViewAssign($assign);
return MyView($this->view_type);
}
@@ -89,16 +91,11 @@ class Theme extends Common
public function Save()
{
$params['common_default_theme'] = empty($this->data_request['theme']) ? 'default' : $this->data_request['theme'];
- $ret = ConfigService::ConfigSave($params);
- if($ret['code'] == 0)
- {
- $ret['msg'] = '切换成功';
- }
- return $ret;
+ return ApiService::ApiDataReturn(ConfigService::ConfigSave($params));
}
/**
- * [Delete 删除]
+ * 删除
* @author Devil
* @blog http://gong.gg/
* @version 0.0.1
@@ -113,11 +110,11 @@ class Theme extends Common
}
// 开始处理
- return ThemeService::ThemeDelete($this->data_request);
+ return ApiService::ApiDataReturn(ThemeService::ThemeDelete($this->data_request));
}
/**
- * [Upload 模板上传安装]
+ * 模板上传安装
* @author Devil
* @blog http://gong.gg/
* @version 0.0.1
@@ -132,7 +129,7 @@ class Theme extends Common
}
// 开始处理
- return ThemeService::ThemeUpload($this->data_request);
+ return ApiService::ApiDataReturn(ThemeService::ThemeUpload($this->data_request));
}
/**
@@ -151,8 +148,6 @@ class Theme extends Common
{
MyViewAssign('msg', $ret['msg']);
return MyView('public/tips_error');
- } else {
- return $ret;
}
}
}
diff --git a/app/admin/controller/Ueditor.php b/app/admin/controller/Ueditor.php
index f6835f248..dcef318c3 100644
--- a/app/admin/controller/Ueditor.php
+++ b/app/admin/controller/Ueditor.php
@@ -11,7 +11,7 @@
namespace app\admin\controller;
use app\service\UeditorService;
-use app\service\ResourcesService;
+use app\service\ApiService;
/**
* 百度编辑器控制器入口
@@ -48,7 +48,7 @@ class Ueditor extends Common
*/
public function Index()
{
- return json(UeditorService::Run($this->data_request));
+ return ApiService::ApiDataReturn(UeditorService::Run($this->data_request));
}
}
?>
\ No newline at end of file
diff --git a/app/admin/controller/User.php b/app/admin/controller/User.php
index f6ecf8a26..e890152a5 100755
--- a/app/admin/controller/User.php
+++ b/app/admin/controller/User.php
@@ -10,7 +10,8 @@
// +----------------------------------------------------------------------
namespace app\admin\controller;
-use app\service\IntegralService;
+use app\admin\controller\Base;
+use app\service\ApiService;
use app\service\UserService;
/**
@@ -20,29 +21,10 @@ use app\service\UserService;
* @version 0.0.1
* @datetime 2016-12-01T21:51:08+0800
*/
-class User extends Common
+class User extends Base
{
/**
- * 构造方法
- * @author Devil
- * @blog http://gong.gg/
- * @version 0.0.1
- * @datetime 2016-12-03T12:39:08+0800
- */
- public function __construct()
- {
- // 调用父类前置方法
- parent::__construct();
-
- // 登录校验
- $this->IsLogin();
-
- // 权限校验
- $this->IsPower();
- }
-
- /**
- * [Index 用户列表]
+ * 列表
* @author Devil
* @blog http://gong.gg/
* @version 0.0.1
@@ -52,7 +34,6 @@ class User extends Common
{
// Excel地址
MyViewAssign('excel_url', MyUrl('admin/user/excelexport', $this->data_request));
-
return MyView();
}
@@ -69,7 +50,7 @@ class User extends Common
}
/**
- * [ExcelExport excel文件导出]
+ * excel文件导出
* @author Devil
* @blog http://gong.gg/
* @version 0.0.1
@@ -77,12 +58,6 @@ class User extends Common
*/
public function ExcelExport()
{
- // 是否有权限
- if(!AdminIsPower())
- {
- return $this->error('无权限');
- }
-
// 获取数据列表
$data_params = [
'where' => $this->form_where,
@@ -93,11 +68,11 @@ class User extends Common
// Excel驱动导出数据
$excel = new \base\Excel(array('filename'=>'user', 'title'=>MyConst('excel_user_title_list'), 'data'=>$data['data'], 'msg'=>'没有相关数据'));
- return $excel->Export();
+ $excel->Export();
}
/**
- * [SaveInfo 用户添加/编辑页面]
+ * 添加/编辑页面
* @author Devil
* @blog http://gong.gg/
* @version 0.0.1
@@ -121,30 +96,36 @@ class User extends Common
$data['birthday_text'] = empty($data['birthday']) ? '' : date('Y-m-d', $data['birthday']);
}
+ // 模板数据
+ $assign = [
+ // 静态数据
+ 'common_gender_list' => MyConst('common_gender_list'),
+ ];
+
// 用户编辑页面钩子
$hook_name = 'plugins_view_admin_user_save';
- MyViewAssign($hook_name.'_data', MyEventTrigger($hook_name,
+ $assign[$hook_name.'_data'] = MyEventTrigger($hook_name,
[
'hook_name' => $hook_name,
'is_backend' => true,
'user_id' => isset($params['id']) ? $params['id'] : 0,
'data' => &$data,
'params' => &$params,
- ]));
+ ]);
- // 性别
- MyViewAssign('common_gender_list', MyConst('common_gender_list'));
-
- // 数据
+ // 数据/参数
unset($params['id']);
- MyViewAssign('data', $data);
- MyViewAssign('params', $params);
+ $assign['data'] = $data;
+ $assign['params'] = $params;
+
+ // 数据赋值
+ MyViewAssign($assign);
return MyView();
}
/**
- * [Save 用户添加/编辑]
+ * 用户添加/编辑
* @author Devil
* @blog http://gong.gg/
* @version 0.0.1
@@ -161,11 +142,11 @@ class User extends Common
// 开始操作
$params = $this->data_post;
$params['admin'] = $this->admin;
- return UserService::UserSave($params);
+ return ApiService::ApiDataReturn(UserService::UserSave($params));
}
/**
- * [Delete 用户删除]
+ * 用户删除
* @author Devil
* @blog http://gong.gg/
* @version 0.0.1
@@ -182,7 +163,7 @@ class User extends Common
// 开始操作
$params = $this->data_post;
$params['admin'] = $this->admin;
- return UserService::UserDelete($params);
+ return ApiService::ApiDataReturn(UserService::UserDelete($params));
}
}
?>
\ No newline at end of file
diff --git a/app/admin/controller/Useraddress.php b/app/admin/controller/Useraddress.php
index eeea2e16a..2714c9967 100644
--- a/app/admin/controller/Useraddress.php
+++ b/app/admin/controller/Useraddress.php
@@ -10,6 +10,8 @@
// +----------------------------------------------------------------------
namespace app\admin\controller;
+use app\admin\controller\Base;
+use app\service\ApiService;
use app\service\UserAddressService;
use app\service\ResourcesService;
@@ -20,27 +22,8 @@ use app\service\ResourcesService;
* @version 0.0.1
* @datetime 2016-12-01T21:51:08+0800
*/
-class UserAddress extends Common
+class UserAddress extends Base
{
- /**
- * 构造方法
- * @author Devil
- * @blog http://gong.gg/
- * @version 0.0.1
- * @datetime 2016-12-03T12:39:08+0800
- */
- public function __construct()
- {
- // 调用父类前置方法
- parent::__construct();
-
- // 登录校验
- $this->IsLogin();
-
- // 权限校验
- $this->IsPower();
- }
-
/**
* 列表
* @author Devil
@@ -74,24 +57,31 @@ class UserAddress extends Common
*/
public function SaveInfo()
{
- // 参数
- $params = $this->data_request;
-
// 数据
- $data = $data = $this->data_detail;
- MyViewAssign('data', $data);
+ $data = $this->data_detail;
- // 加载地图api
- MyViewAssign('is_load_map_api', 1);
+ // 模板数据
+ $assign = [
+ // 数据
+ 'data' => $data,
+
+ // 加载地图api
+ 'is_load_map_api' => 1,
+ ];
// 编辑器文件存放地址
if(!empty($data['user_id']))
{
- MyViewAssign('editor_path_type', ResourcesService::EditorPathTypeValue(UserAddressService::EditorAttachmentPathType($data['user_id'])));
+ $assign['editor_path_type'] = ResourcesService::EditorPathTypeValue(UserAddressService::EditorAttachmentPathType($data['user_id']));
}
+ // 参数处理
+ $params = $this->data_request;
unset($params['id']);
- MyViewAssign('params', $params);
+ $assign['params'] = $params;
+
+ // 数据赋值
+ MyViewAssign($assign);
return MyView();
}
@@ -114,11 +104,12 @@ class UserAddress extends Common
$params = $this->data_request;
if(empty($params['user_id']))
{
- return DataReturn('用户信息有误', -1);
+ $ret = DataReturn('用户信息有误', -1);
+ } else {
+ $params['user'] = ['id'=>$params['user_id']];
+ $ret = UserAddressService::UserAddressSave($params);
}
-
- $params['user'] = ['id'=>$params['user_id']];
- return UserAddressService::UserAddressSave($params);
+ return ApiService::ApiDataReturn($ret);
}
/**
@@ -139,7 +130,7 @@ class UserAddress extends Common
// 开始处理
$params = $this->data_request;
$params['user_type'] = 'admin';
- return UserAddressService::UserAddressAdminDelete($params);
+ return ApiService::ApiDataReturn(UserAddressService::UserAddressAdminDelete($params));
}
}
?>
\ No newline at end of file
diff --git a/app/admin/controller/Warehouse.php b/app/admin/controller/Warehouse.php
index 42acce4f5..cb4012d27 100644
--- a/app/admin/controller/Warehouse.php
+++ b/app/admin/controller/Warehouse.php
@@ -10,6 +10,8 @@
// +----------------------------------------------------------------------
namespace app\admin\controller;
+use app\admin\controller\Base;
+use app\service\ApiService;
use app\service\WarehouseService;
use app\service\ResourcesService;
@@ -21,28 +23,8 @@ use app\service\ResourcesService;
* @date 2020-07-07
* @desc description
*/
-class Warehouse extends Common
+class Warehouse extends Base
{
- /**
- * 构造方法
- * @author Devil
- * @blog http://gong.gg/
- * @version 1.0.0
- * @date 2020-07-07
- * @desc description
- */
- public function __construct()
- {
- // 调用父类前置方法
- parent::__construct();
-
- // 登录校验
- $this->IsLogin();
-
- // 权限校验
- $this->IsPower();
- }
-
/**
* 列表
* @author Devil
@@ -84,27 +66,32 @@ class Warehouse extends Common
// 数据
$data = $this->data_detail;
+ // 模板数据
+ $assign = [
+ // 加载地图api
+ 'is_load_map_api' => 1,
+ // 编辑器文件存放地址
+ 'editor_path_type' => ResourcesService::EditorPathTypeValue('warehouse'),
+ ];
+
// 编辑页面钩子
$hook_name = 'plugins_view_admin_warehouse_save';
- MyViewAssign($hook_name.'_data', MyEventTrigger($hook_name,
+ $assign[$hook_name.'_data'] = MyEventTrigger($hook_name,
[
'hook_name' => $hook_name,
'is_backend' => true,
'warehouse_id' => isset($params['id']) ? $params['id'] : 0,
'data' => &$data,
'params' => &$params,
- ]));
+ ]);
- // 加载地图api
- MyViewAssign('is_load_map_api', 1);
-
- // 编辑器文件存放地址
- MyViewAssign('editor_path_type', ResourcesService::EditorPathTypeValue('warehouse'));
-
- // 数据
+ // 数据/参数
unset($params['id']);
- MyViewAssign('data', $data);
- MyViewAssign('params', $params);
+ $assign['data'] = $data;
+ $assign['params'] = $params;
+
+ // 数据赋值
+ MyViewAssign($assign);
return MyView();
}
@@ -126,7 +113,7 @@ class Warehouse extends Common
// 开始处理
$params = $this->data_request;
- return WarehouseService::WarehouseSave($params);
+ return ApiService::ApiDataReturn(WarehouseService::WarehouseSave($params));
}
/**
@@ -148,7 +135,7 @@ class Warehouse extends Common
// 开始处理
$params = $this->data_request;
$params['admin'] = $this->admin;
- return WarehouseService::WarehouseDelete($params);
+ return ApiService::ApiDataReturn(WarehouseService::WarehouseDelete($params));
}
/**
@@ -170,7 +157,7 @@ class Warehouse extends Common
// 开始处理
$params = $this->data_request;
$params['admin'] = $this->admin;
- return WarehouseService::WarehouseStatusUpdate($params);
+ return ApiService::ApiDataReturn(WarehouseService::WarehouseStatusUpdate($params));
}
}
?>
\ No newline at end of file
diff --git a/app/admin/controller/Warehousegoods.php b/app/admin/controller/Warehousegoods.php
index b51b67944..81751d77a 100644
--- a/app/admin/controller/Warehousegoods.php
+++ b/app/admin/controller/Warehousegoods.php
@@ -10,6 +10,8 @@
// +----------------------------------------------------------------------
namespace app\admin\controller;
+use app\admin\controller\Base;
+use app\service\ApiService;
use app\service\WarehouseGoodsService;
use app\service\WarehouseService;
use app\service\GoodsService;
@@ -22,28 +24,8 @@ use app\service\GoodsService;
* @date 2020-07-11
* @desc description
*/
-class WarehouseGoods extends Common
+class WarehouseGoods extends Base
{
- /**
- * 构造方法
- * @author Devil
- * @blog http://gong.gg/
- * @version 1.0.0
- * @date 2020-07-11
- * @desc description
- */
- public function __construct()
- {
- // 调用父类前置方法
- parent::__construct();
-
- // 登录校验
- $this->IsLogin();
-
- // 权限校验
- $this->IsPower();
- }
-
/**
* 列表
* @author Devil
@@ -54,6 +36,12 @@ class WarehouseGoods extends Common
*/
public function Index()
{
+ // 模板数据
+ $assign = [
+ // 商品分类
+ 'goods_category_list' => GoodsService::GoodsCategoryAll(),
+ ];
+
// 有效仓库列表
$data_params = [
'field' => 'id,name',
@@ -63,11 +51,10 @@ class WarehouseGoods extends Common
],
];
$warehouse = WarehouseService::WarehouseList($data_params);
- MyViewAssign('warehouse_list', $warehouse['data']);
-
- // 商品分类
- MyViewAssign('goods_category_list', GoodsService::GoodsCategoryAll());
-
+ $assign['warehouse_list'] = $warehouse['data'];
+
+ // 数据赋值
+ MyViewAssign($assign);
return MyView();
}
@@ -80,6 +67,7 @@ class WarehouseGoods extends Common
*/
public function Detail()
{
+ // 商品和规格数据
$data = [];
$spec = [];
if(!empty($this->data_request['id']))
@@ -102,8 +90,13 @@ class WarehouseGoods extends Common
}
}
}
- MyViewAssign('spec', $spec);
- MyViewAssign('data', $data);
+
+ // 数据赋值
+ $assign = [
+ 'spec' => $spec,
+ 'data' => $data,
+ ];
+ MyViewAssign($assign);
return MyView();
}
@@ -128,9 +121,12 @@ class WarehouseGoods extends Common
$data = empty($ret['data']) ? [] : $ret['data'];
}
- // 数据
- MyViewAssign('data', $data);
- MyViewAssign('params', $params);
+ // 数据赋值
+ $assign = [
+ 'params' => $params,
+ 'data' => $data,
+ ];
+ MyViewAssign($assign);
return MyView();
}
@@ -152,7 +148,7 @@ class WarehouseGoods extends Common
// 开始处理
$params = $this->data_request;
- return WarehouseGoodsService::WarehouseGoodsInventorySave($params);
+ return ApiService::ApiDataReturn(WarehouseGoodsService::WarehouseGoodsInventorySave($params));
}
/**
@@ -174,7 +170,7 @@ class WarehouseGoods extends Common
// 开始处理
$params = $this->data_request;
$params['admin'] = $this->admin;
- return WarehouseGoodsService::WarehouseGoodsDelete($params);
+ return ApiService::ApiDataReturn(WarehouseGoodsService::WarehouseGoodsDelete($params));
}
/**
@@ -196,7 +192,7 @@ class WarehouseGoods extends Common
// 开始处理
$params = $this->data_request;
$params['admin'] = $this->admin;
- return WarehouseGoodsService::WarehouseGoodsStatusUpdate($params);
+ return ApiService::ApiDataReturn(WarehouseGoodsService::WarehouseGoodsStatusUpdate($params));
}
/**
@@ -222,7 +218,7 @@ class WarehouseGoods extends Common
MyViewAssign('data', $ret['data']['data']);
$ret['data']['data'] = MyView();
}
- return $ret;
+ return ApiService::ApiDataReturn($ret);
}
/**
@@ -243,7 +239,7 @@ class WarehouseGoods extends Common
// 开始处理
$params = $this->data_request;
- return WarehouseGoodsService::WarehouseGoodsAdd($params);
+ return ApiService::ApiDataReturn(WarehouseGoodsService::WarehouseGoodsAdd($params));
}
/**
@@ -264,7 +260,7 @@ class WarehouseGoods extends Common
// 开始处理
$params = $this->data_request;
- return WarehouseGoodsService::WarehouseGoodsDel($params);
+ return ApiService::ApiDataReturn(WarehouseGoodsService::WarehouseGoodsDel($params));
}
}
?>
\ No newline at end of file
diff --git a/app/admin/form/Useraddress.php b/app/admin/form/Useraddress.php
index ec053ab8b..a7a4f056f 100644
--- a/app/admin/form/Useraddress.php
+++ b/app/admin/form/Useraddress.php
@@ -245,7 +245,7 @@ class UserAddress
*/
public function RegionProvinceItems()
{
- return RegionService::RegionNode(['field'=>'id,name', 'where'=>['pid'=>0]]);;
+ return RegionService::RegionNode(['field'=>'id,name', 'where'=>[['pid', '=', 0]]]);;
}
}
?>
\ No newline at end of file
diff --git a/app/admin/form/Warehouse.php b/app/admin/form/Warehouse.php
index 9e5fef3e5..46bfcc66c 100644
--- a/app/admin/form/Warehouse.php
+++ b/app/admin/form/Warehouse.php
@@ -233,7 +233,7 @@ class Warehouse
$ids = Db::name('Warehouse')->where($this->condition_base)->column($field);
if(!empty($ids))
{
- $result = RegionService::RegionNode(['field'=>'id,name', 'where'=>['id'=>$ids]]);
+ $result = RegionService::RegionNode(['field'=>'id,name', 'where'=>[['id', 'in', $ids]]]);
}
return $result;
}
diff --git a/app/admin/view/default/email/index.html b/app/admin/view/default/email/index.html
index 54498f309..18160a19c 100755
--- a/app/admin/view/default/email/index.html
+++ b/app/admin/view/default/email/index.html
@@ -8,7 +8,7 @@