sileya-ai
/
vr-shopxo-source
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'v1.3.0' of gitee.com:gongfuxiang/shopxo into v1.3.0

feat/task1-c-wallet
devil_gong 2019-02-16 10:42:31 +08:00
parent aedddfd083 de5f06cd53
commit 1160c80412
3 changed files with 39 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
application/index/controller/Common.php
View File

@ -80,6 +80,12 @@ class Common extends Controller
*/ */
private function CommonPluginsInit() private function CommonPluginsInit()
{ {
// css钩子
$this->assign('plugins_css_data', Hook::listen('plugins_css', ['hook_name'=>'plugins_css', 'is_control'=>false]));
// js钩子
$this->assign('plugins_js_data', Hook::listen('plugins_js', ['hook_name'=>'plugins_js', 'is_control'=>false]));
// 公共header内钩子 // 公共header内钩子
$this->assign('plugins_view_common_header_data', Hook::listen('plugins_view_common_header', ['hook_name'=>'plugins_view_common_header', 'is_control'=>false, 'user'=>$this->user])); $this->assign('plugins_view_common_header_data', Hook::listen('plugins_view_common_header', ['hook_name'=>'plugins_view_common_header', 'is_control'=>false, 'user'=>$this->user]));

16
application/index/view/default/public/footer.html
View File

@ -53,8 +53,24 @@
{{if !empty($module_js)}} {{if !empty($module_js)}}
<script type='text/javascript' src="{{$Think.__MY_ROOT_PUBLIC__}}static/{{$module_js}}?v={{:MyC('home_static_cache_version')}}"></script> <script type='text/javascript' src="{{$Think.__MY_ROOT_PUBLIC__}}static/{{$module_js}}?v={{:MyC('home_static_cache_version')}}"></script>
{{/if}} {{/if}}
<!-- 底部信息 -->
{{:MyC('home_footer_info')}} {{:MyC('home_footer_info')}}
<!-- js钩子 -->
{{if isset($shopxo_is_develop) and $shopxo_is_develop eq true and (!isset($is_footer) or $is_footer eq 1)}}
<div class="plugins-tag">
<span>plugins_js</span>
</div>
{{/if}}
{{if !empty($plugins_js_data) and is_array($plugins_js_data) and (!isset($is_header) or $is_header eq 1)}}
{{foreach $plugins_js_data as $hook}}
{{if is_string($hook)}}
<link rel="stylesheet" type="text/css" href="{{$hook}}?v={{:MyC('home_static_cache_version')}}" />
{{/if}}
{{/foreach}}
{{/if}}
<!-- 公共页面底部钩子 --> <!-- 公共页面底部钩子 -->
{{if isset($shopxo_is_develop) and $shopxo_is_develop eq true and (!isset($is_footer) or $is_footer eq 1)}} {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true and (!isset($is_footer) or $is_footer eq 1)}}
<div class="plugins-tag"> <div class="plugins-tag">

17
application/index/view/default/public/header.html
View File

@ -27,6 +27,16 @@
{{if !empty($module_css)}} {{if !empty($module_css)}}
<link rel="stylesheet" type="text/css" href="{{$Think.__MY_ROOT_PUBLIC__}}static/{{$module_css}}?v={{:MyC('home_static_cache_version')}}" /> <link rel="stylesheet" type="text/css" href="{{$Think.__MY_ROOT_PUBLIC__}}static/{{$module_css}}?v={{:MyC('home_static_cache_version')}}" />
{{/if}} {{/if}}
<!-- css钩子 -->
{{if !empty($plugins_css_data) and is_array($plugins_css_data) and (!isset($is_header) or $is_header eq 1)}}
{{foreach $plugins_css_data as $hook}}
{{if is_string($hook)}}
<link rel="stylesheet" type="text/css" href="{{$hook}}?v={{:MyC('home_static_cache_version')}}" />
{{/if}}
{{/foreach}}
{{/if}}
<script type="text/javascript"> <script type="text/javascript">
var __root__ = '{{$Think.__MY_ROOT_PUBLIC__}}'; var __root__ = '{{$Think.__MY_ROOT_PUBLIC__}}';
var __my_url__ = '{{:__MY_URL__}}'; var __my_url__ = '{{:__MY_URL__}}';
@ -47,6 +57,13 @@
{{/if}} {{/if}}
</head> </head>
<body> <body>
<!-- css钩子 -->
{{if isset($shopxo_is_develop) and $shopxo_is_develop eq true and (!isset($is_header) or $is_header eq 1)}}
<div class="plugins-tag">
<span>plugins_css</span>
</div>
{{/if}}
<!-- 公共header内钩子 --> <!-- 公共header内钩子 -->
{{if isset($shopxo_is_develop) and $shopxo_is_develop eq true and (!isset($is_header) or $is_header eq 1)}} {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true and (!isset($is_header) or $is_header eq 1)}}
<div class="plugins-tag"> <div class="plugins-tag">