diff --git a/application/index/controller/Common.php b/application/index/controller/Common.php index ed355777efdf13551517e9020f9f75fcbc24328c..b2b436854c7e9eb10881935207b649ac92c1b3ff 100755 --- a/application/index/controller/Common.php +++ b/application/index/controller/Common.php @@ -226,7 +226,7 @@ class Common extends Controller $default_theme = strtolower(MyC('common_default_theme', 'default', true)); $this->assign('default_theme', $default_theme); - // 当前操作名称, 兼容插件模块名称 + // 当前操作名称, 兼容插件模块名称 $module_name = strtolower(request()->module()); $controller_name = strtolower(request()->controller()); $action_name = strtolower(request()->action()); diff --git a/application/index/view/default/order/detail.html b/application/index/view/default/order/detail.html index cb4b44abf16d5b6fd858989c981aef8b342f91e1..c2bc44590c35efdc6192fdcb42dc7b90337717e0 100755 --- a/application/index/view/default/order/detail.html +++ b/application/index/view/default/order/detail.html @@ -218,19 +218,26 @@ {{/if}} - - {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true}} + + {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true and (!isset($is_footer) or $is_footer eq 1)}}
- plugins_service_order_handle_operation_html + plugins_view_index_order_detail_operation
{{/if}} - {{if !empty($data['plugins_service_order_handle_operation_html']) and is_array($data['plugins_service_order_handle_operation_html'])}} - {{foreach $data.plugins_service_order_handle_operation_html as $hook}} - {{if is_string($hook) or is_int($hook)}} - {{$hook|raw}} - {{/if}} - {{/foreach}} - {{/if}} + {{php}} + $hook_name = 'plugins_view_index_order_detail_operation'; + $hook_data = Hook::listen($hook_name, ['hook_name'=>$hook_name, 'is_backend'=>false, 'id'=>$data['id'], 'data'=>$data]); + 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}} {{if in_array($data['status'], [3,4])}}
diff --git a/application/index/view/default/order/index.html b/application/index/view/default/order/index.html index ff862701a0ec8edfb204b123b837d4e8e5c30ae4..fd51d646246b33e05313df0b7deeebe1f3699823 100755 --- a/application/index/view/default/order/index.html +++ b/application/index/view/default/order/index.html @@ -234,19 +234,26 @@ {{/if}} - - {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true}} + + {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true and (!isset($is_footer) or $is_footer eq 1)}}
- plugins_service_order_handle_operation_html + plugins_view_index_order_list_operation
{{/if}} - {{if !empty($order['plugins_service_order_handle_operation_html']) and is_array($order['plugins_service_order_handle_operation_html'])}} - {{foreach $order.plugins_service_order_handle_operation_html as $hook}} - {{if is_string($hook) or is_int($hook)}} - {{$hook|raw}} - {{/if}} - {{/foreach}} - {{/if}} + {{php}} + $hook_name = 'plugins_view_index_order_list_operation'; + $hook_data = Hook::listen($hook_name, ['hook_name'=>$hook_name, 'is_backend'=>false, 'id'=>$order['id'], 'data'=>$order]); + 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}} {{/if}} diff --git a/config/shopxo.php b/config/shopxo.php index 586bb6b244c99e8f5f7955f3818827357a5cc72f..c7111a6b072d29914e4f9dce97e1371749cba815 100755 --- a/config/shopxo.php +++ b/config/shopxo.php @@ -15,7 +15,7 @@ return [ // 开发模式 - 'is_develop' => false, + 'is_develop' => true, // 默认编码 'default_charset' => 'utf-8', diff --git a/public/static/upload/images/app_center_nav/2019/10/16/1571231187362091.png b/public/static/upload/images/app_center_nav/2019/10/16/1571231187362091.png old mode 100644 new mode 100755 diff --git a/public/static/upload/images/app_center_nav/2019/11/05/1572932149956815.png b/public/static/upload/images/app_center_nav/2019/11/05/1572932149956815.png old mode 100644 new mode 100755 diff --git a/public/static/upload/images/app_nav/2019/10/16/1571231655606153.png b/public/static/upload/images/app_nav/2019/10/16/1571231655606153.png old mode 100644 new mode 100755