ued / yohogirls_mustache · Commits

Go to a project

Authored by hf
Commit d6d14fb33cba5005ddef202f225101b41986e607 2 parents cc075035 d6d86538

Merge branch 'develop' into test

Inline Side-by-side
Showing 11 changed files with 30 additions and 45 deletions
@@ -2,48 +2,42 @@ @@ -2,48 +2,42 @@
2 {{> script/default}} 2 {{> script/default}}
3 {{/ default}} 3 {{/ default}}
4 4
5 -  
6 {{# fashion}} 5 {{# fashion}}
7 - {{> script/channel}} 6 + {{> script/channel}}
8 {{/ fashion}} 7 {{/ fashion}}
9 8
10 {{# beauty}} 9 {{# beauty}}
11 - {{> script/channel}} 10 + {{> script/channel}}
12 {{/ beauty}} 11 {{/ beauty}}
13 12
14 {{# sport}} 13 {{# sport}}
15 - {{> script/channel}} 14 + {{> script/channel}}
16 {{/ sport}} 15 {{/ sport}}
17 16
18 {{# lifestyle}} 17 {{# lifestyle}}
19 - {{> script/channel}} 18 + {{> script/channel}}
20 {{/ lifestyle}} 19 {{/ lifestyle}}
21 20
22 {{# video}} 21 {{# video}}
23 - {{> script/channel}} 22 + {{> script/channel}}
24 {{/ video}} 23 {{/ video}}
25 24
26 -  
27 {{# search}} 25 {{# search}}
28 {{> script/search}} 26 {{> script/search}}
29 {{/ search}} 27 {{/ search}}
30 28
31 -  
32 {{# detail}} 29 {{# detail}}
33 {{> script/detail}} 30 {{> script/detail}}
34 {{/ detail}} 31 {{/ detail}}
35 32
36 -  
37 {{# magazine}} 33 {{# magazine}}
38 {{> script/magazine}} 34 {{> script/magazine}}
39 {{/ magazine}} 35 {{/ magazine}}
40 36
41 -  
42 {{# feedback}} 37 {{# feedback}}
43 {{> script/feedback}} 38 {{> script/feedback}}
44 {{/ feedback}} 39 {{/ feedback}}
45 40
46 {{# writer}} 41 {{# writer}}
47 {{> script/writer}} 42 {{> script/writer}}
48 -{{/ writer}}  
49 - 43 +{{/ writer}}
@@ -6,7 +6,6 @@ @@ -6,7 +6,6 @@
6 </script> 6 </script>
7 {{/ default}} 7 {{/ default}}
8 8
9 -  
10 {{# magazine}} 9 {{# magazine}}
11 <script type="text/javascript"> 10 <script type="text/javascript">
12 seajs.use(['js/channel/magazine'], function (magazine) { 11 seajs.use(['js/channel/magazine'], function (magazine) {
@@ -32,7 +31,6 @@ @@ -32,7 +31,6 @@
32 </script> 31 </script>
33 {{/ writer}} 32 {{/ writer}}
34 33
35 -  
36 {{# detail}} 34 {{# detail}}
37 <script type="text/javascript"> 35 <script type="text/javascript">
38 seajs.use(['js/channel/detail'], function (detail) { 36 seajs.use(['js/channel/detail'], function (detail) {
@@ -26,7 +26,7 @@ @@ -26,7 +26,7 @@
26 <meta property="og:image:height" content="{{image_height}}"/> 26 <meta property="og:image:height" content="{{image_height}}"/>
27 <meta property="og:description" content="{{description}}"/> 27 <meta property="og:description" content="{{description}}"/>
28 {{/ isDetail}} 28 {{/ isDetail}}
29 - {{> common/environment_css}} 29 + {{> common/environment_css}}
30 </head> 30 </head>
31 <body> 31 <body>
32 <!--开头的集团导航--> 32 <!--开头的集团导航-->
1 <script type="text/javascript" charset="utf-8"> 1 <script type="text/javascript" charset="utf-8">
2 - seajs.use(["js/public","js/channel"],function(){  
3 -  
4 - }); 2 + seajs.use(["js/public", "js/channel"]);
5 </script> 3 </script>
1 <script type="text/javascript" charset="utf-8"> 1 <script type="text/javascript" charset="utf-8">
2 - seajs.use(["js/public","js/home"],function(){  
3 -  
4 - }); 2 + seajs.use(["js/public","js/home"]);
5 </script> 3 </script>
1 <script type="text/javascript"> 1 <script type="text/javascript">
2 - seajs.use(["js/channel/fashion"],function(){  
3 -  
4 - }); 2 + seajs.use(["js/channel/fashion"]);
5 </script> 3 </script>
1 <script type="text/javascript" charset="utf-8"> 1 <script type="text/javascript" charset="utf-8">
2 - //详情页面JS  
3 - seajs.use(['js/channel/feedback', 'js/public'], function(feedback) {  
4 - if (feedback) {  
5 - feedback.init();  
6 - }  
7 - }); 2 +seajs.use(['js/channel/feedback', 'js/public'], function(feedback)
  3 +{
  4 + if (feedback)
  5 + {
  6 + feedback.init();
  7 + }
  8 +});
8 </script> 9 </script>
1 <script type="text/javascript" charset="utf-8"> 1 <script type="text/javascript" charset="utf-8">
2 - //详情页面JS  
3 - seajs.use(['js/channel/magazine', 'js/public'], function(magazine) {  
4 - if (magazine) {  
5 - magazine.init();  
6 - }  
7 - }); 2 +seajs.use(['js/channel/magazine', 'js/public'], function(magazine)
  3 +{
  4 + if (magazine)
  5 + {
  6 + magazine.init();
  7 + }
  8 +});
8 </script> 9 </script>
1 <script type="text/javascript"> 1 <script type="text/javascript">
2 - seajs.use(["js/public","js/channel/search"],function(){  
3 -  
4 - }); 2 + seajs.use(["js/public","js/channel/search"]);
5 </script> 3 </script>
1 <script type="text/javascript"> 1 <script type="text/javascript">
2 - seajs.use(["js/channel/fashion"],function(){  
3 -  
4 - }); 2 + seajs.use(["js/channel/fashion"]);
5 </script> 3 </script>
1 <script type="text/javascript" charset="utf-8"> 1 <script type="text/javascript" charset="utf-8">
2 - //编辑页面JS  
3 - seajs.use(['js/channel/writer', 'js/public'], function(writer) {  
4 - if (writer) { 2 + seajs.use(['js/channel/writer', 'js/public'], function(writer)
  3 + {
  4 + if (writer)
  5 + {
5 writer.init(); 6 writer.init();
6 } 7 }
7 }); 8 });