diff --git a/application/admin/controller/Common.php b/application/admin/controller/Common.php index 1145c5ed9..39cfd9ee1 100755 --- a/application/admin/controller/Common.php +++ b/application/admin/controller/Common.php @@ -15,6 +15,7 @@ use think\Controller; use app\module\FormHandleModule; use app\service\AdminPowerService; use app\service\ConfigService; +use app\service\ResourcesService; /** * 管理员公共控制器 @@ -233,7 +234,7 @@ class Common extends Controller $this->assign('page_size', $this->page_size); // 价格符号 - $this->assign('price_symbol', config('shopxo.price_symbol')); + $this->assign('price_symbol', ResourcesService::CurrencyPriceSymbol()); // 控制器静态文件状态css,js $module_css = $this->module_name.DS.$default_theme.DS.'css'.DS.$this->controller_name; diff --git a/application/index/controller/Common.php b/application/index/controller/Common.php index 8a14903b9..0f2ec7c10 100755 --- a/application/index/controller/Common.php +++ b/application/index/controller/Common.php @@ -22,6 +22,7 @@ use app\service\SearchService; use app\service\ConfigService; use app\service\LinkService; use app\service\UserService; +use app\service\ResourcesService; /** * 前端公共控制器 @@ -277,7 +278,7 @@ class Common extends Controller $this->assign('params', $this->data_request); // 价格符号 - $this->assign('price_symbol', config('shopxo.price_symbol')); + $this->assign('price_symbol', ResourcesService::CurrencyPriceSymbol()); // 站点类型 $this->assign('common_site_type', MyC('common_site_type', 0, true)); diff --git a/application/index/view/default/public/header_top_nav.html b/application/index/view/default/public/header_top_nav.html index deaca97ad..db0a1e5e0 100755 --- a/application/index/view/default/public/header_top_nav.html +++ b/application/index/view/default/public/header_top_nav.html @@ -59,21 +59,19 @@ {{else /}}
-
+
{{$nav.name}} - {{if !empty($user)}} -
    - {{foreach $nav.items as $navs}} -
  • - {{$navs.name}} -
    • - {{/foreach}} -
- {{/if}} +
    + {{foreach $nav.items as $navs}} +
  • + {{$navs.name}} +
    • + {{/foreach}} +
{{/if}} diff --git a/application/service/ResourcesService.php b/application/service/ResourcesService.php index 2529743fb..4031e63a6 100755 --- a/application/service/ResourcesService.php +++ b/application/service/ResourcesService.php @@ -584,5 +584,29 @@ class ResourcesService } return []; } + + /** + * 货币价格符号 + * @author Devil + * @blog http://gong.gg/ + * @version 1.0.0 + * @date 2020-09-10 + * @desc description + */ + public static function CurrencyPriceSymbol() + { + // 默认从配置文件读取货币符号 + $data = config('shopxo.price_symbol'); + + // 货币符号钩子 + $hook_name = 'plugins_service_currency_price_symbol'; + Hook::listen($hook_name, [ + 'hook_name' => $hook_name, + 'is_backend' => true, + 'data' => &$data, + ]); + + return $data; + } } ?> \ No newline at end of file diff --git a/application/service/WarehouseService.php b/application/service/WarehouseService.php index e25163a4f..f6b8b7829 100644 --- a/application/service/WarehouseService.php +++ b/application/service/WarehouseService.php @@ -216,7 +216,7 @@ class WarehouseService // 参数是否有误 if(empty($params['ids'])) { - return DataReturn('商品id有误', -1); + return DataReturn('数据id有误', -1); } // 是否数组 if(!is_array($params['ids'])) diff --git a/application/tags.php b/application/tags.php index c145b9e6d..53c802a31 100755 --- a/application/tags.php +++ b/application/tags.php @@ -54,15 +54,62 @@ return array ( ), 'plugins_service_users_center_left_menu_handle' => array ( - 0 => 'app\\plugins\\wallet\\Hook', + 0 => 'app\\plugins\\distribution\\Hook', + 1 => 'app\\plugins\\wallet\\Hook', ), 'plugins_service_header_navigation_top_right_handle' => array ( - 0 => 'app\\plugins\\wallet\\Hook', + 0 => 'app\\plugins\\distribution\\Hook', + 1 => 'app\\plugins\\wallet\\Hook', + 2 => 'app\\plugins\\exchangerate\\Hook', + ), + 'plugins_service_order_status_change_history_success_handle' => + array ( + 0 => 'app\\plugins\\distribution\\Hook', + ), + 'plugins_service_order_aftersale_audit_handle_end' => + array ( + 0 => 'app\\plugins\\distribution\\Hook', + ), + 'plugins_service_site_extraction_address_list' => + array ( + 0 => 'app\\plugins\\distribution\\Hook', + ), + 'plugins_service_buy_order_insert_end' => + array ( + 0 => 'app\\plugins\\distribution\\Hook', + ), + 'plugins_service_goods_spec_extends_handle' => + array ( + 0 => 'app\\plugins\\distribution\\Hook', + ), + 'plugins_view_admin_user_save' => + array ( + 0 => 'app\\plugins\\distribution\\Hook', + ), + 'plugins_service_user_save_handle' => + array ( + 0 => 'app\\plugins\\distribution\\Hook', ), 'plugins_service_user_register_end' => array ( 0 => 'app\\plugins\\wallet\\Hook', ), + 'plugins_service_currency_price_symbol' => + array ( + 0 => 'app\\plugins\\exchangerate\\Hook', + ), + 'plugins_service_goods_handle_end' => + array ( + 0 => 'app\\plugins\\exchangerate\\Hook', + ), + 'plugins_service_goods_spec_base' => + array ( + 0 => 'app\\plugins\\exchangerate\\Hook', + ), + 'plugins_service_order_pay_launch_handle' => + array ( + 0 => 'app\\plugins\\exchangerate\\Hook', + ), ); ?> \ No newline at end of file diff --git a/public/static/common/css/common.css b/public/static/common/css/common.css index 1c30a4daf..7eb7350e9 100755 --- a/public/static/common/css/common.css +++ b/public/static/common/css/common.css @@ -29,7 +29,7 @@ form.am-form .am-form-group-label-tips { color: #ccc; } form.am-form .am-form-group-label-tips-must { color: #f00; } .am-form-group:hover>label { color: #333 !important; } .am-form-group:hover>label>.am-form-group-label-tips { color: #FF9800 !important; } -form.am-form .am-form-group, .plug-file-upload-view, .business-form-group, .business-form-block { border-bottom: 1px dashed #ccc; padding: 10px 20% 10px 5px; } +form.am-form .am-form-group, .plug-file-upload-view, .business-form-group, .business-form-block { border-bottom: 1px dashed #e2e2e2; padding: 15px 20% 20px 5px; margin-bottom: 0; } form.am-form .am-form-group-refreshing, .plug-file-upload-view { border-bottom: 0px; } /**