diff --git a/application/admin/controller/Admin.php b/application/admin/controller/Admin.php index dbd81e5b4..29ed6126e 100755 --- a/application/admin/controller/Admin.php +++ b/application/admin/controller/Admin.php @@ -149,7 +149,7 @@ class Admin extends Common $this->assign($hook_name.'_data', Hook::listen($hook_name, [ 'hook_name' => $hook_name, - 'is_backend' => false, + 'is_backend' => true, 'admin_id' => isset($params['id']) ? $params['id'] : 0, 'data' => &$data, 'params' => &$params, @@ -241,7 +241,7 @@ class Admin extends Common $this->assign($hook_name.'_data', Hook::listen($hook_name, [ 'hook_name' => $hook_name, - 'is_backend' => false, + 'is_backend' => true, ])); return $this->fetch(); diff --git a/application/admin/controller/Article.php b/application/admin/controller/Article.php index 294bbaff1..21c5f440b 100755 --- a/application/admin/controller/Article.php +++ b/application/admin/controller/Article.php @@ -137,7 +137,7 @@ class Article extends Common $this->assign($hook_name.'_data', Hook::listen($hook_name, [ 'hook_name' => $hook_name, - 'is_backend' => false, + 'is_backend' => true, 'article_id' => isset($params['id']) ? $params['id'] : 0, 'data' => &$data, 'params' => &$params, diff --git a/application/admin/controller/Brand.php b/application/admin/controller/Brand.php index 6593f0de9..25d8d3153 100755 --- a/application/admin/controller/Brand.php +++ b/application/admin/controller/Brand.php @@ -10,6 +10,7 @@ // +---------------------------------------------------------------------- namespace app\admin\controller; +use think\facade\Hook; use app\service\BrandService; /** @@ -120,7 +121,6 @@ class Brand extends Common $ret = BrandService::BrandList($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')); @@ -129,12 +129,23 @@ class Brand extends Common $brand_category = BrandService::BrandCategoryList(['field'=>'id,name']); $this->assign('brand_category', $brand_category['data']); - // 参数 - $this->assign('params', $params); + // 品牌编辑页面钩子 + $hook_name = 'plugins_view_admin_brand_save'; + $this->assign($hook_name.'_data', Hook::listen($hook_name, + [ + 'hook_name' => $hook_name, + 'is_backend' => true, + 'brand_id' => isset($params['id']) ? $params['id'] : 0, + 'data' => &$data, + 'params' => &$params, + ])); // 编辑器文件存放地址 $this->assign('editor_path_type', 'brand'); + // 数据 + $this->assign('data', $data); + $this->assign('params', $params); return $this->fetch(); } diff --git a/application/admin/controller/Common.php b/application/admin/controller/Common.php index 009acaeaf..228e041be 100755 --- a/application/admin/controller/Common.php +++ b/application/admin/controller/Common.php @@ -76,22 +76,22 @@ class Common extends Controller private function CommonPluginsInit() { // css钩子 - $this->assign('plugins_admin_css_data', Hook::listen('plugins_admin_css', ['hook_name'=>'plugins_admin_css', 'is_backend'=>false])); + $this->assign('plugins_admin_css_data', Hook::listen('plugins_admin_css', ['hook_name'=>'plugins_admin_css', 'is_backend'=>true])); // js钩子 - $this->assign('plugins_admin_js_data', Hook::listen('plugins_admin_js', ['hook_name'=>'plugins_admin_js', 'is_backend'=>false])); + $this->assign('plugins_admin_js_data', Hook::listen('plugins_admin_js', ['hook_name'=>'plugins_admin_js', 'is_backend'=>true])); // 公共header内钩子 - $this->assign('plugins_admin_common_header_data', Hook::listen('plugins_admin_common_header', ['hook_name'=>'plugins_admin_common_header', 'is_backend'=>false, 'admin'=>$this->admin])); + $this->assign('plugins_admin_common_header_data', Hook::listen('plugins_admin_common_header', ['hook_name'=>'plugins_admin_common_header', 'is_backend'=>true, 'admin'=>$this->admin])); // 公共页面底部钩子 - $this->assign('plugins_admin_common_page_bottom_data', Hook::listen('plugins_admin_common_page_bottom', ['hook_name'=>'plugins_admin_common_page_bottom', 'is_backend'=>false, 'admin'=>$this->admin])); + $this->assign('plugins_admin_common_page_bottom_data', Hook::listen('plugins_admin_common_page_bottom', ['hook_name'=>'plugins_admin_common_page_bottom', 'is_backend'=>true, 'admin'=>$this->admin])); // 公共顶部钩子 - $this->assign('plugins_admin_view_common_top_data', Hook::listen('plugins_admin_view_common_top', ['hook_name'=>'plugins_admin_view_common_top', 'is_backend'=>false, 'admin'=>$this->admin])); + $this->assign('plugins_admin_view_common_top_data', Hook::listen('plugins_admin_view_common_top', ['hook_name'=>'plugins_admin_view_common_top', 'is_backend'=>true, 'admin'=>$this->admin])); // 公共底部钩子 - $this->assign('plugins_admin_view_common_bottom_data', Hook::listen('plugins_admin_view_common_bottom', ['hook_name'=>'plugins_admin_view_common_bottom', 'is_backend'=>false, 'admin'=>$this->admin])); + $this->assign('plugins_admin_view_common_bottom_data', Hook::listen('plugins_admin_view_common_bottom', ['hook_name'=>'plugins_admin_view_common_bottom', 'is_backend'=>true, 'admin'=>$this->admin])); } /** diff --git a/application/admin/controller/Goods.php b/application/admin/controller/Goods.php index af2cd9dd6..fef7a1f73 100755 --- a/application/admin/controller/Goods.php +++ b/application/admin/controller/Goods.php @@ -83,6 +83,12 @@ class Goods extends Common ]; $ret = GoodsService::GoodsList($data_params); + // 商品分类 + $this->assign('goods_category_list', GoodsService::GoodsCategoryAll()); + + // 品牌分类 + $this->assign('brand_list', BrandService::CategoryBrand()); + // 是否上下架 $this->assign('common_is_shelves_list', lang('common_is_shelves_list')); @@ -135,7 +141,7 @@ class Goods extends Common $this->assign('region_province_list', RegionService::RegionItems(['pid'=>0])); // 商品分类 - $this->assign('category_list', GoodsService::GoodsCategoryAll()); + $this->assign('goods_category_list', GoodsService::GoodsCategoryAll()); // 品牌分类 $this->assign('brand_list', BrandService::CategoryBrand()); @@ -149,7 +155,7 @@ class Goods extends Common $this->assign($hook_name.'_data', Hook::listen($hook_name, [ 'hook_name' => $hook_name, - 'is_backend' => false, + 'is_backend' => true, 'goods_id' => isset($params['id']) ? $params['id'] : 0, 'data' => &$data, 'params' => &$params, diff --git a/application/admin/controller/Index.php b/application/admin/controller/Index.php index 61118e1ce..93b2d76af 100755 --- a/application/admin/controller/Index.php +++ b/application/admin/controller/Index.php @@ -86,15 +86,15 @@ class Index extends Common $order_complete_money = StatisticalService::OrderCompleteMoneyYesterdayTodayTotal(); $this->assign('order_complete_money', $order_complete_money['data']); - // 近7日订单交易走势 + // 近15日订单交易走势 $order_trading_trend = StatisticalService::OrderTradingTrendSevenTodayTotal(); $this->assign('order_trading_trend', $order_trading_trend['data']); - // 近7日订单支付方式 + // 近15日订单支付方式 $order_type_number = StatisticalService::OrderPayTypeSevenTodayTotal(); $this->assign('order_type_number', $order_type_number['data']); - // 近7日热销商品 + // 近15日热销商品 $goods_hot_sale = StatisticalService::GoodsHotSaleSevenTodayTotal(); $this->assign('goods_hot_sale', $goods_hot_sale['data']); diff --git a/application/admin/controller/Power.php b/application/admin/controller/Power.php index 86250cd83..39556dc62 100755 --- a/application/admin/controller/Power.php +++ b/application/admin/controller/Power.php @@ -161,7 +161,7 @@ class Power extends Common $this->assign($hook_name.'_data', Hook::listen($hook_name, [ 'hook_name' => $hook_name, - 'is_backend' => false, + 'is_backend' => true, 'role_id' => isset($params['id']) ? $params['id'] : 0, 'data' => &$data, 'params' => &$params, diff --git a/application/admin/controller/User.php b/application/admin/controller/User.php index 9f6ffb0f9..c81dcd2bc 100755 --- a/application/admin/controller/User.php +++ b/application/admin/controller/User.php @@ -156,7 +156,7 @@ class User extends Common $this->assign($hook_name.'_data', Hook::listen($hook_name, [ 'hook_name' => $hook_name, - 'is_backend' => false, + 'is_backend' => true, '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 3526256cb..b8751c95b 100755 --- a/application/admin/view/default/admin/save_info.html +++ b/application/admin/view/default/admin/save_info.html @@ -30,7 +30,7 @@ {{if !isset($data['id']) or $admin['id'] neq $data['id']}}
- {{foreach $role as $v}} diff --git a/application/admin/view/default/answer/index.html b/application/admin/view/default/answer/index.html index a11db88c7..c40ab94d3 100755 --- a/application/admin/view/default/answer/index.html +++ b/application/admin/view/default/answer/index.html @@ -220,6 +220,27 @@ {{/if}} + + + {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true and (!isset($is_footer) or $is_footer eq 1)}} +
+ plugins_view_admin_answer_list_operation +
+ {{/if}} + {{php}} + $hook_name = 'plugins_view_admin_answer_list_operation'; + $hook_data = Hook::listen($hook_name, ['hook_name'=>$hook_name, 'is_backend'=>true, 'id'=>$v['id'], 'data'=>$v]); + if(!empty($hook_data) && is_array($hook_data)) + { + foreach($hook_data as $hook) + { + if(is_string($hook) || is_int($hook)) + { + echo htmlspecialchars_decode($hook); + } + } + } + {{/php}} {{/foreach}} diff --git a/application/admin/view/default/appconfig/app.html b/application/admin/view/default/appconfig/app.html index 599d8f6ea..d50c72584 100644 --- a/application/admin/view/default/appconfig/app.html +++ b/application/admin/view/default/appconfig/app.html @@ -11,7 +11,7 @@
- {{foreach $common_is_text_list as $v}} {{/foreach}} @@ -19,7 +19,7 @@
- {{foreach $common_is_text_list as $v}} {{/foreach}} @@ -28,7 +28,7 @@
- {{foreach $common_is_text_list as $v}} {{/foreach}} @@ -36,7 +36,7 @@
- {{foreach $common_is_text_list as $v}} {{/foreach}} @@ -45,7 +45,7 @@
- {{foreach $common_is_text_list as $v}} {{/foreach}} @@ -53,7 +53,7 @@
- {{foreach $common_is_text_list as $v}} {{/foreach}} @@ -62,7 +62,7 @@
- {{foreach $common_is_text_list as $v}} {{/foreach}} @@ -71,7 +71,7 @@
- {{foreach $common_is_text_list as $v}} {{/foreach}} diff --git a/application/admin/view/default/appconfig/weixinmini.html b/application/admin/view/default/appconfig/weixinmini.html index 162a2ea5d..3aaafb42a 100644 --- a/application/admin/view/default/appconfig/weixinmini.html +++ b/application/admin/view/default/appconfig/weixinmini.html @@ -11,7 +11,7 @@
- {{foreach $common_is_text_list as $v}} {{/foreach}} @@ -20,7 +20,7 @@
- {{foreach $common_is_text_list as $v}} {{/foreach}} @@ -29,7 +29,7 @@
- {{foreach $common_is_text_list as $v}} {{/foreach}} diff --git a/application/admin/view/default/article/index.html b/application/admin/view/default/article/index.html index 9c3dfe9a0..69dadf69f 100755 --- a/application/admin/view/default/article/index.html +++ b/application/admin/view/default/article/index.html @@ -138,6 +138,15 @@
是否启用
{{$v.is_enable_text}}
+
SEO标题
+
{{$v.seo_title}}
+ +
SEO关键字
+
{{$v.seo_keywords}}
+ +
SEO描述
+
{{$v.seo_desc}}
+
创建时间
{{$v.add_time_time}}
@@ -153,6 +162,27 @@ + + + {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true and (!isset($is_footer) or $is_footer eq 1)}} +
+ plugins_view_admin_article_list_operation +
+ {{/if}} + {{php}} + $hook_name = 'plugins_view_admin_article_list_operation'; + $hook_data = Hook::listen($hook_name, ['hook_name'=>$hook_name, 'is_backend'=>true, 'id'=>$v['id'], 'data'=>$v]); + if(!empty($hook_data) && is_array($hook_data)) + { + foreach($hook_data as $hook) + { + if(is_string($hook) || is_int($hook)) + { + echo htmlspecialchars_decode($hook); + } + } + } + {{/php}} {{/foreach}} diff --git a/application/admin/view/default/article/save_info.html b/application/admin/view/default/article/save_info.html index 66e889a2d..b05100cca 100755 --- a/application/admin/view/default/article/save_info.html +++ b/application/admin/view/default/article/save_info.html @@ -29,7 +29,7 @@
- {{foreach $article_category_list as $v}} diff --git a/application/admin/view/default/brand/index.html b/application/admin/view/default/brand/index.html index 35e7d466c..cdbaa9ce7 100755 --- a/application/admin/view/default/brand/index.html +++ b/application/admin/view/default/brand/index.html @@ -77,11 +77,11 @@ 名称 - LOGO + LOGO 品牌分类 官网地址 是否启用 - 创建时间 + 更多 操作 @@ -90,7 +90,7 @@ {{foreach $data_list as $v}} {{$v.name}} - + {{if !empty($v['logo'])}} @@ -111,12 +111,92 @@ - {{$v.add_time_time}} + + 查看更多 +
+
+
+

详情内容

+ × +
+
+
+
名称
+
{{$v.name}}
+ +
LOGO
+
+ {{if !empty($v['logo'])}} + + + + {{else /}} + 暂无图片 + {{/if}} +
+ +
品牌分类
+
{{$v.brand_category_name}}
+ +
官网地址
+
+ {{$v.website_url}} + {{if !empty($v['website_url'])}} + + + + {{/if}} +
+ +
是否启用
+
{{$v.is_enable_text}}
+ +
SEO标题
+
{{$v.seo_title}}
+ +
SEO关键字
+
{{$v.seo_keywords}}
+ +
SEO描述
+
{{$v.seo_desc}}
+ +
创建时间
+
{{$v.add_time_time}}
+ +
更新时间
+
{{$v.upd_time_time}}
+
+
+
+
+ + + + {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true and (!isset($is_footer) or $is_footer eq 1)}} +
+ plugins_view_admin_brand_list_operation +
+ {{/if}} + {{php}} + $hook_name = 'plugins_view_admin_brand_list_operation'; + $hook_data = Hook::listen($hook_name, ['hook_name'=>$hook_name, 'is_backend'=>true, 'id'=>$v['id'], 'data'=>$v]); + if(!empty($hook_data) && is_array($hook_data)) + { + foreach($hook_data as $hook) + { + if(is_string($hook) || is_int($hook)) + { + echo htmlspecialchars_decode($hook); + } + } + } + {{/php}} {{/foreach}} diff --git a/application/admin/view/default/brand/save_info.html b/application/admin/view/default/brand/save_info.html index 5242fc193..2a88a21ac 100755 --- a/application/admin/view/default/brand/save_info.html +++ b/application/admin/view/default/brand/save_info.html @@ -21,7 +21,7 @@
- {{foreach $brand_category as $v}} @@ -55,6 +55,31 @@
+ + + {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true}} +
+ plugins_view_admin_brand_save +
+ {{/if}} + {{if !empty($plugins_view_admin_brand_save_data) and is_array($plugins_view_admin_brand_save_data)}} +
+ +
+ {{foreach $plugins_view_admin_brand_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/config/index.html b/application/admin/view/default/config/index.html index ed6cf1adf..f6e6fd054 100755 --- a/application/admin/view/default/config/index.html +++ b/application/admin/view/default/config/index.html @@ -7,7 +7,7 @@
- {{foreach $common_excel_charset_list as $v}} {{/foreach}} @@ -20,7 +20,7 @@
- {{foreach $common_is_text_list as $v}} {{/foreach}} @@ -28,7 +28,7 @@
- {{foreach $common_deduction_inventory_rules_list as $v}} {{/foreach}} @@ -36,7 +36,7 @@
- {{foreach $common_is_text_list as $v}} {{/foreach}} diff --git a/application/admin/view/default/email/index.html b/application/admin/view/default/email/index.html index 2a6f578ad..563d5c02b 100755 --- a/application/admin/view/default/email/index.html +++ b/application/admin/view/default/email/index.html @@ -31,7 +31,7 @@
- {{foreach $common_is_text_list as $v}} {{/foreach}} diff --git a/application/admin/view/default/goods/index.html b/application/admin/view/default/goods/index.html index 98848cc71..3c83200de 100755 --- a/application/admin/view/default/goods/index.html +++ b/application/admin/view/default/goods/index.html @@ -26,6 +26,46 @@ + + + + - + {{/foreach}} diff --git a/application/admin/view/default/goods/save_info.html b/application/admin/view/default/goods/save_info.html index f5f573290..ca5337ac0 100755 --- a/application/admin/view/default/goods/save_info.html +++ b/application/admin/view/default/goods/save_info.html @@ -71,9 +71,9 @@

- + {{if !empty($goods_category_list)}} + {{foreach $goods_category_list as $v}} {{if !empty($v['items'])}} {{foreach $v.items as $vs}} @@ -92,7 +92,7 @@

- {{if !empty($brand_list)}} {{foreach $brand_list as $v}} @@ -110,7 +110,7 @@

- {{if !empty($region_province_list)}} {{foreach $region_province_list as $v}} diff --git a/application/admin/view/default/goodscategory/index.html b/application/admin/view/default/goodscategory/index.html index d5bc8f3f3..90be07dcd 100755 --- a/application/admin/view/default/goodscategory/index.html +++ b/application/admin/view/default/goodscategory/index.html @@ -21,7 +21,7 @@
- {{if !empty($goods_category_list)}} {{foreach $goods_category_list as $v}} diff --git a/application/admin/view/default/index/init.html b/application/admin/view/default/index/init.html index 35a8084ce..24ee2394f 100755 --- a/application/admin/view/default/index/init.html +++ b/application/admin/view/default/index/init.html @@ -74,11 +74,11 @@
- +
- 近7日订单交易走势 + 近15日订单交易走势
@@ -86,19 +86,19 @@
  • - +
    - 近7日热销商品 + 近15日热销商品
  • - +
    - 近7日订单支付方式 + 近15日订单支付方式
    • @@ -159,7 +159,7 @@
+ 分类： + + + 品牌： + +
状态：
时间： @@ -199,6 +239,27 @@ + + + {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true and (!isset($is_footer) or $is_footer eq 1)}} +
+ plugins_view_admin_goods_list_operation +
+ {{/if}} + {{php}} + $hook_name = 'plugins_view_admin_goods_list_operation'; + $hook_data = Hook::listen($hook_name, ['hook_name'=>$hook_name, 'is_backend'=>true, 'id'=>$v['id'], 'data'=>$v]); + if(!empty($hook_data) && is_array($hook_data)) + { + foreach($hook_data as $hook) + { + if(is_string($hook) || is_int($hook)) + { + echo htmlspecialchars_decode($hook); + } + } + } + {{/php}}