Authored by hf

Merge branch 'develop' into test

... ... @@ -2,48 +2,42 @@
{{> script/default}}
{{/ default}}
{{# fashion}}
{{> script/channel}}
{{> script/channel}}
{{/ fashion}}
{{# beauty}}
{{> script/channel}}
{{> script/channel}}
{{/ beauty}}
{{# sport}}
{{> script/channel}}
{{> script/channel}}
{{/ sport}}
{{# lifestyle}}
{{> script/channel}}
{{> script/channel}}
{{/ lifestyle}}
{{# video}}
{{> script/channel}}
{{> script/channel}}
{{/ video}}
{{# search}}
{{> script/search}}
{{/ search}}
{{# detail}}
{{> script/detail}}
{{/ detail}}
{{# magazine}}
{{> script/magazine}}
{{/ magazine}}
{{# feedback}}
{{> script/feedback}}
{{/ feedback}}
{{# writer}}
{{> script/writer}}
{{/ writer}}
{{/ writer}}
\ No newline at end of file
... ...
... ... @@ -6,7 +6,6 @@
</script>
{{/ default}}
{{# magazine}}
<script type="text/javascript">
seajs.use(['js/channel/magazine'], function (magazine) {
... ... @@ -32,7 +31,6 @@
</script>
{{/ writer}}
{{# detail}}
<script type="text/javascript">
seajs.use(['js/channel/detail'], function (detail) {
... ...
... ... @@ -26,7 +26,7 @@
<meta property="og:image:height" content="{{image_height}}"/>
<meta property="og:description" content="{{description}}"/>
{{/ isDetail}}
{{> common/environment_css}}
{{> common/environment_css}}
</head>
<body>
<!--开头的集团导航-->
... ...
<script type="text/javascript" charset="utf-8">
seajs.use(["js/public","js/channel"],function(){
});
seajs.use(["js/public", "js/channel"]);
</script>
\ No newline at end of file
... ...
<script type="text/javascript" charset="utf-8">
seajs.use(["js/public","js/home"],function(){
});
seajs.use(["js/public","js/home"]);
</script>
\ No newline at end of file
... ...
<script type="text/javascript">
seajs.use(["js/channel/fashion"],function(){
});
seajs.use(["js/channel/fashion"]);
</script>
\ No newline at end of file
... ...
<script type="text/javascript" charset="utf-8">
//详情页面JS
seajs.use(['js/channel/feedback', 'js/public'], function(feedback) {
if (feedback) {
feedback.init();
}
});
seajs.use(['js/channel/feedback', 'js/public'], function(feedback)
{
if (feedback)
{
feedback.init();
}
});
</script>
\ No newline at end of file
... ...
<script type="text/javascript" charset="utf-8">
//详情页面JS
seajs.use(['js/channel/magazine', 'js/public'], function(magazine) {
if (magazine) {
magazine.init();
}
});
seajs.use(['js/channel/magazine', 'js/public'], function(magazine)
{
if (magazine)
{
magazine.init();
}
});
</script>
\ No newline at end of file
... ...
<script type="text/javascript">
seajs.use(["js/public","js/channel/search"],function(){
});
seajs.use(["js/public","js/channel/search"]);
</script>
\ No newline at end of file
... ...
<script type="text/javascript">
seajs.use(["js/channel/fashion"],function(){
});
seajs.use(["js/channel/fashion"]);
</script>
\ No newline at end of file
... ...
<script type="text/javascript" charset="utf-8">
//编辑页面JS
seajs.use(['js/channel/writer', 'js/public'], function(writer) {
if (writer) {
seajs.use(['js/channel/writer', 'js/public'], function(writer)
{
if (writer)
{
writer.init();
}
});
... ...