From 86760a49dcc11c4da612b2885411b2cfa540d7f7 Mon Sep 17 00:00:00 2001 From: devil_gong Date: Thu, 1 Aug 2019 09:55:14 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=8E=E5=8F=B0=E6=96=B0=E5=A2=9E=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E6=96=B0=E5=A2=9E=E9=92=A9=E5=AD=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/admin/controller/Admin.php | 17 ++++++- application/admin/controller/Article.php | 17 +++++-- application/admin/controller/Goods.php | 7 +-- application/admin/controller/Power.php | 18 +++++++- application/admin/controller/User.php | 7 +-- .../admin/view/default/admin/save_info.html | 21 +++++++++ .../admin/view/default/article/save_info.html | 22 ++++++++- .../view/default/power/role_save_info.html | 20 +++++++++ application/tags.php | 45 +++++++++++++------ 9 files changed, 148 insertions(+), 26 deletions(-) diff --git a/application/admin/controller/Admin.php b/application/admin/controller/Admin.php index de6a37952..172614c1d 100755 --- a/application/admin/controller/Admin.php +++ b/application/admin/controller/Admin.php @@ -10,6 +10,7 @@ // +---------------------------------------------------------------------- namespace app\admin\controller; +use think\facade\Hook; use app\service\AdminService; /** @@ -132,7 +133,6 @@ class Admin extends Common } $data = $ret[0]; } - $this->assign('data', $data); // 角色 $role_params = [ @@ -143,6 +143,21 @@ class Admin extends Common $this->assign('id', isset($params['id']) ? $params['id'] : 0); $this->assign('common_gender_list', lang('common_gender_list')); + + // 管理员编辑页面钩子 + $hook_name = 'plugins_view_admin_admin_save'; + $this->assign($hook_name.'_data', Hook::listen($hook_name, + [ + 'hook_name' => $hook_name, + 'is_backend' => false, + 'goods_id' => isset($params['id']) ? $params['id'] : 0, + 'data' => &$data, + 'params' => &$params, + ])); + + // 数据 + $this->assign('data', $data); + $this->assign('params', $params); return $this->fetch(); } diff --git a/application/admin/controller/Article.php b/application/admin/controller/Article.php index 5b8332464..78e98765b 100755 --- a/application/admin/controller/Article.php +++ b/application/admin/controller/Article.php @@ -10,6 +10,7 @@ // +---------------------------------------------------------------------- namespace app\admin\controller; +use think\facade\Hook; use app\service\ArticleService; /** @@ -123,7 +124,6 @@ class Article extends Common $ret = ArticleService::ArticleList($data_params); $data = empty($ret['data'][0]) ? [] : $ret['data'][0]; } - $this->assign('data', $data); // 是否启用 $this->assign('common_is_enable_list', lang('common_is_enable_list')); @@ -132,12 +132,23 @@ class Article extends Common $article_category = ArticleService::ArticleCategoryList(['field'=>'id,name']); $this->assign('article_category_list', $article_category['data']); - // 参数 - $this->assign('params', $params); + // 文章编辑页面钩子 + $hook_name = 'plugins_view_admin_article_save'; + $this->assign($hook_name.'_data', Hook::listen($hook_name, + [ + 'hook_name' => $hook_name, + 'is_backend' => false, + 'goods_id' => isset($params['id']) ? $params['id'] : 0, + 'data' => &$data, + 'params' => &$params, + ])); // 编辑器文件存放地址 $this->assign('editor_path_type', 'article'); + // 数据 + $this->assign('data', $data); + $this->assign('params', $params); return $this->fetch(); } diff --git a/application/admin/controller/Goods.php b/application/admin/controller/Goods.php index cdb077b55..af2cd9dd6 100755 --- a/application/admin/controller/Goods.php +++ b/application/admin/controller/Goods.php @@ -145,11 +145,12 @@ class Goods extends Common $this->assign('goods_specifications_extends', $goods_spec_extends['data']); // 商品编辑页面钩子 - $this->assign('plugins_view_admin_goods_save_data', Hook::listen('plugins_view_admin_goods_save', + $hook_name = 'plugins_view_admin_goods_save'; + $this->assign($hook_name.'_data', Hook::listen($hook_name, [ - 'hook_name' => 'plugins_view_admin_goods_save', + 'hook_name' => $hook_name, 'is_backend' => false, - 'goods_id' => $params['id'], + 'goods_id' => isset($params['id']) ? $params['id'] : 0, 'data' => &$data, 'params' => &$params, ])); diff --git a/application/admin/controller/Power.php b/application/admin/controller/Power.php index 9f17bba13..bbf36a41c 100755 --- a/application/admin/controller/Power.php +++ b/application/admin/controller/Power.php @@ -10,6 +10,7 @@ // +---------------------------------------------------------------------- namespace app\admin\controller; +use think\facade\Hook; use app\service\AdminPowerService; /** @@ -149,13 +150,26 @@ class Power extends Common $params['role_id'] = $ret[0]['id']; } } - $this->assign('data', $data); // 菜单列表 $power = AdminPowerService::RolePowerEditData($params); - $this->assign('common_is_enable_list', lang('common_is_enable_list')); $this->assign('power', $power); + + // 角色编辑页面钩子 + $hook_name = 'plugins_view_admin_power_role_save'; + $this->assign($hook_name.'_data', Hook::listen($hook_name, + [ + 'hook_name' => $hook_name, + 'is_backend' => false, + 'goods_id' => isset($params['id']) ? $params['id'] : 0, + 'data' => &$data, + 'params' => &$params, + ])); + + // 数据 + $this->assign('data', $data); + $this->assign('params', $params); return $this->fetch(); } diff --git a/application/admin/controller/User.php b/application/admin/controller/User.php index 0847e5845..9f6ffb0f9 100755 --- a/application/admin/controller/User.php +++ b/application/admin/controller/User.php @@ -152,11 +152,12 @@ class User extends Common } // 用户编辑页面钩子 - $this->assign('plugins_view_admin_user_save_data', Hook::listen('plugins_view_admin_user_save', + $hook_name = 'plugins_view_admin_user_save'; + $this->assign($hook_name.'_data', Hook::listen($hook_name, [ - 'hook_name' => 'plugins_view_admin_user_save', + 'hook_name' => $hook_name, 'is_backend' => false, - 'user_id' => $params['id'], + 'user_id' => isset($params['id']) ? $params['id'] : 0, 'data' => &$data, 'params' => &$params, ])); diff --git a/application/admin/view/default/admin/save_info.html b/application/admin/view/default/admin/save_info.html index 4eef0a170..3526256cb 100755 --- a/application/admin/view/default/admin/save_info.html +++ b/application/admin/view/default/admin/save_info.html @@ -39,6 +39,27 @@ {{/if}} {{include file="lib/gender" /}} + + + {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true}} +
+ plugins_view_admin_admin_save +
+ {{/if}} + {{if !empty($plugins_view_admin_admin_save_data) and is_array($plugins_view_admin_admin_save_data)}} +
+ +
+ {{foreach $plugins_view_admin_admin_save_data as $hook}} + {{if is_string($hook) or is_int($hook)}} + {{$hook|raw}} + {{/if}} + {{/foreach}} +
+
+ {{/if}} + +
diff --git a/application/admin/view/default/article/save_info.html b/application/admin/view/default/article/save_info.html index 8848ba29f..2add22bdd 100755 --- a/application/admin/view/default/article/save_info.html +++ b/application/admin/view/default/article/save_info.html @@ -50,9 +50,29 @@
- +
+ + {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true}} +
+ plugins_view_admin_article_save +
+ {{/if}} + {{if !empty($plugins_view_admin_article_save_data) and is_array($plugins_view_admin_article_save_data)}} +
+ +
+ {{foreach $plugins_view_admin_article_save_data as $hook}} + {{if is_string($hook) or is_int($hook)}} + {{$hook|raw}} + {{/if}} + {{/foreach}} +
+
+ {{/if}} + +
{{include file="lib/seo" /}}
diff --git a/application/admin/view/default/power/role_save_info.html b/application/admin/view/default/power/role_save_info.html index e674616d0..a4a56b64d 100755 --- a/application/admin/view/default/power/role_save_info.html +++ b/application/admin/view/default/power/role_save_info.html @@ -56,6 +56,26 @@ + + {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true}} +
+ plugins_view_admin_power_role_save +
+ {{/if}} + {{if !empty($plugins_view_admin_power_role_save_data) and is_array($plugins_view_admin_power_role_save_data)}} +
+ +
+ {{foreach $plugins_view_admin_power_role_save_data as $hook}} + {{if is_string($hook) or is_int($hook)}} + {{$hook|raw}} + {{/if}} + {{/foreach}} +
+
+ {{/if}} + +
diff --git a/application/tags.php b/application/tags.php index f7d840c72..85336ebc5 100755 --- a/application/tags.php +++ b/application/tags.php @@ -34,55 +34,74 @@ return array ( ), 'plugins_css' => array ( - 0 => 'app\\plugins\\membershiplevel\\Hook', + 0 => 'app\\plugins\\limitedtimediscount\\Hook', + 1 => 'app\\plugins\\membershiplevelvip\\Hook', + ), + 'plugins_js' => + array ( + 0 => 'app\\plugins\\limitedtimediscount\\Hook', + ), + 'plugins_service_navigation_header_handle' => + array ( + 0 => 'app\\plugins\\limitedtimediscount\\Hook', ), 'plugins_service_goods_handle_end' => array ( - 0 => 'app\\plugins\\membershiplevel\\Hook', + 0 => 'app\\plugins\\limitedtimediscount\\Hook', + 1 => 'app\\plugins\\membershiplevelvip\\Hook', ), 'plugins_service_goods_spec_base' => array ( - 0 => 'app\\plugins\\membershiplevel\\Hook', + 0 => 'app\\plugins\\limitedtimediscount\\Hook', + 1 => 'app\\plugins\\membershiplevelvip\\Hook', + ), + 'plugins_view_goods_detail_base_top' => + array ( + 0 => 'app\\plugins\\limitedtimediscount\\Hook', + ), + 'plugins_view_home_floor_top' => + array ( + 0 => 'app\\plugins\\limitedtimediscount\\Hook', ), 'plugins_service_buy_handle' => array ( - 0 => 'app\\plugins\\membershiplevel\\Hook', + 0 => 'app\\plugins\\membershiplevelvip\\Hook', ), 'plugins_service_user_login_success_record' => array ( - 0 => 'app\\plugins\\membershiplevel\\Hook', + 0 => 'app\\plugins\\membershiplevelvip\\Hook', ), 'plugins_service_goods_spec_extends_handle' => array ( - 0 => 'app\\plugins\\membershiplevel\\Hook', + 0 => 'app\\plugins\\membershiplevelvip\\Hook', ), 'plugins_view_admin_user_save' => array ( - 0 => 'app\\plugins\\membershiplevel\\Hook', + 0 => 'app\\plugins\\membershiplevelvip\\Hook', ), 'plugins_service_user_save_handle' => array ( - 0 => 'app\\plugins\\membershiplevel\\Hook', + 0 => 'app\\plugins\\membershiplevelvip\\Hook', ), 'plugins_service_goods_save_handle' => array ( - 0 => 'app\\plugins\\membershiplevel\\Hook', + 0 => 'app\\plugins\\membershiplevelvip\\Hook', ), 'plugins_view_goods_detail_panel_price_top' => array ( - 0 => 'app\\plugins\\membershiplevel\\Hook', + 0 => 'app\\plugins\\membershiplevelvip\\Hook', ), 'plugins_view_home_goods_inside_bottom' => array ( - 0 => 'app\\plugins\\membershiplevel\\Hook', + 0 => 'app\\plugins\\membershiplevelvip\\Hook', ), 'plugins_view_search_goods_inside_bottom' => array ( - 0 => 'app\\plugins\\membershiplevel\\Hook', + 0 => 'app\\plugins\\membershiplevelvip\\Hook', ), 'plugins_service_goods_spec_type' => array ( - 0 => 'app\\plugins\\membershiplevel\\Hook', + 0 => 'app\\plugins\\membershiplevelvip\\Hook', ), ); ?> \ No newline at end of file