ued / yohogirls_mustache · Commits

Go to a project

Authored by lore-w
Commit c661516d0bfb1f1827147dde64f79ce1fd38f713 2 parents 19f4a3ee 20d0ddc1

Merge branch 'develop' of http://git.dev.yoho.cn/ued/yohogirls-mustache into develop

Inline Side-by-side
Showing 7 changed files with 15 additions and 19 deletions
@@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
2 <span class="content-item-detail-a-img"> 2 <span class="content-item-detail-a-img">
3 <a href="{{link}}" target="_blank" class="link" title="{{title}}"> 3 <a href="{{link}}" target="_blank" class="link" title="{{title}}">
4 <img class="lazy pic" src="{{img}}" data-original="{{img}}" alt="{{title}}" style="display: inline;"> 4 <img class="lazy pic" src="{{img}}" data-original="{{img}}" alt="{{title}}" style="display: inline;">
5 - <span class="arrow-bottom girl-channel-arrow{{# channelClass}}-{{.}}{{/ channelClass}}"></span> 5 + <span class="arrow-bottom girl-channel-arrow{{# channelType}}-{{.}}{{/ channelType}}"></span>
6 </a> 6 </a>
7 <span href="{{link}}" style="{{^ isVideo}}display:none;{{/ isVideo}}" target="_blank" class="video-icon" title="{{alt}}"></a> 7 <span href="{{link}}" style="{{^ isVideo}}display:none;{{/ isVideo}}" target="_blank" class="video-icon" title="{{alt}}"></a>
8 </span> 8 </span>
@@ -19,7 +19,7 @@ @@ -19,7 +19,7 @@
19 {{/ subChannel}} 19 {{/ subChannel}}
20 <span></span> 20 <span></span>
21 </span> 21 </span>
22 - <a href="{{link}}" target="_blank" class="content-item-title content-item-detail-title-style content-item-detail-title{{# channelClass}}-{{.}}{{/ channelClass}}" _title="{{title}}">{{title}}</a>  
23 - <a href="{{link}}" target="_blank" class="content-item-subtitle content-item-detail-title-style content-item-detail-subtitle{{# channelClass}}-{{.}} content-item-detail-subtitle-style{{/ channelClass}}" _title="{{subtitle}}">{{subtitle}}</a> 22 + <a href="{{link}}" target="_blank" class="content-item-title content-item-detail-title-style content-item-detail-title{{# channelType}}-{{.}}{{/ channelType}}" _title="{{title}}">{{title}}</a>
  23 + <a href="{{link}}" target="_blank" class="content-item-subtitle content-item-detail-title-style content-item-detail-subtitle{{# channelType}}-{{.}} content-item-detail-subtitle-style{{/ channelType}}" _title="{{subtitle}}">{{subtitle}}</a>
24 <a href="{{link}}" target="_blank" class="content-item-detail content-item-detail-detail" len="{{detailLength}}" _title="{{detail}}"></a> 24 <a href="{{link}}" target="_blank" class="content-item-detail content-item-detail-detail" len="{{detailLength}}" _title="{{detail}}"></a>
25 </div> 25 </div>
1 -<div class="home-item-public {{# borderClass}}home-item-border{{/ borderClass}} {{# channelClass}}content-{{.}}{{/ channelClass}}"> 1 +<div class="home-item-public {{# borderClass}}home-item-border{{/ borderClass}} {{# channelType}}content-{{.}}{{/ channelType}}">
2 <a href="{{link}}" target="_blank" class="img-link" title="{{title}}"> 2 <a href="{{link}}" target="_blank" class="img-link" title="{{title}}">
3 <img class="img lazy" data-original="{{img}}" alt="{{title}}"/> 3 <img class="img lazy" data-original="{{img}}" alt="{{title}}"/>
4 <span class="arrow-bottom girl-channel-arrow"></span> 4 <span class="arrow-bottom girl-channel-arrow"></span>
@@ -5,14 +5,14 @@ @@ -5,14 +5,14 @@
5 <span class='pop-img-container swiper-wrapper'> 5 <span class='pop-img-container swiper-wrapper'>
6 {{# pop}} 6 {{# pop}}
7 <span class='pop-link swiper-slide' href="{{link}}" target="_blank"> 7 <span class='pop-link swiper-slide' href="{{link}}" target="_blank">
8 - <img src='{{img}}' class='img'/>  
9 - <a class='title'_title='{{title}}'>{{title}}</a> 8 + <a><img src='{{img}}' class='img'/></a>
  9 + <a href='{{link}}' class='title'_title='{{title}}'>{{title}}</a>
10 <span class='date default-pop-date' _time='{{time}}'> 10 <span class='date default-pop-date' _time='{{time}}'>
11 {{#if channelClass}} 11 {{#if channelClass}}
12 - <a target="_blank" class="default-pop-subchannel" href="{{channelURL}}">{{channelClass}}</a>&nbsp;|&nbsp; 12 + <a target="_blank" href='{{link}}' class="default-pop-subchannel" href="{{channelURL}}">{{channelClass}}</a>&nbsp;|&nbsp;
13 {{/if}} 13 {{/if}}
14 </span> 14 </span>
15 - <a class='detail' _title='{{detail}}'>{{detail}}</a> 15 + <a class='detail' href='{{link}}' _title='{{detail}}'>{{detail}}</a>
16 </span> 16 </span>
17 {{/ pop}} 17 {{/ pop}}
18 </span> 18 </span>
@@ -5,14 +5,14 @@ @@ -5,14 +5,14 @@
5 <span class='pop-img-container swiper-wrapper'> 5 <span class='pop-img-container swiper-wrapper'>
6 {{# pop}} 6 {{# pop}}
7 <span class='pop-link swiper-slide' href="{{link}}" target="_blank"> 7 <span class='pop-link swiper-slide' href="{{link}}" target="_blank">
8 - <img src='{{img}}' class='img'/>  
9 - <a class='title'_title='{{title}}'>{{title}}</a> 8 + <a><img src='{{img}}' class='img'/></a>
  9 + <a href='{{link}}' class='title'_title='{{title}}'>{{title}}</a>
10 <span class='date default-pop-date' _time='{{time}}'> 10 <span class='date default-pop-date' _time='{{time}}'>
11 {{#if channelClass}} 11 {{#if channelClass}}
12 - <a target="_blank" class="default-pop-subchannel" href="{{channelURL}}">{{channelClass}}</a>&nbsp;|&nbsp; 12 + <a target="_blank" href='{{link}}' class="default-pop-subchannel" href="{{channelURL}}">{{channelClass}}</a>&nbsp;|&nbsp;
13 {{/if}} 13 {{/if}}
14 </span> 14 </span>
15 - <a class='detail' _title='{{detail}}'>{{detail}}</a> 15 + <a class='detail' href='{{link}}' _title='{{detail}}'>{{detail}}</a>
16 </span> 16 </span>
17 {{/ pop}} 17 {{/ pop}}
18 </span> 18 </span>
1 -{{> layout/header_jian }} 1 +{{> layout/header_fan }}
2 {{> default/channel_banner}} 2 {{> default/channel_banner}}
3 <!--六个小电视--> 3 <!--六个小电视-->
4 <div class="tv-area"> 4 <div class="tv-area">
@@ -71,4 +71,4 @@ @@ -71,4 +71,4 @@
71 </div> 71 </div>
72 </div> 72 </div>
73 </div> 73 </div>
74 -{{> layout/footer_jian }}  
  74 +{{> layout/footer_fan }}
@@ -29,6 +29,7 @@ @@ -29,6 +29,7 @@
29 <li class="item enterprise-show"><span>YOHO!SHOW</span><a href="http://www.yohoshow.com" target="_blank">物趣分享</a></li> 29 <li class="item enterprise-show"><span>YOHO!SHOW</span><a href="http://www.yohoshow.com" target="_blank">物趣分享</a></li>
30 <li class="item enterprise-yohood"><span>YO'HOOD</span><a href="http://www.yohood.cn" target="_blank">潮流嘉年華</a></li> 30 <li class="item enterprise-yohood"><span>YO'HOOD</span><a href="http://www.yohood.cn" target="_blank">潮流嘉年華</a></li>
31 <li class="jianfan"><a class="unchoosen" href="/go/location">简</a>&nbsp;<a class="unchoosen">/</a>&nbsp;<a class="choosen" href="#">繁</a></li> 31 <li class="jianfan"><a class="unchoosen" href="/go/location">简</a>&nbsp;<a class="unchoosen">/</a>&nbsp;<a class="choosen" href="#">繁</a></li>
  32 +
32 </ul> 33 </ul>
33 </div> 34 </div>
34 35
@@ -7,11 +7,6 @@ @@ -7,11 +7,6 @@
7 <p><span>{{date}} </span> | {{title}}</p> 7 <p><span>{{date}} </span> | {{title}}</p>
8 <p class="price">RMB15</p> 8 <p class="price">RMB15</p>
9 </div> 9 </div>
10 - {{# buyUrl}}  
11 - <div class="mags-buy">  
12 - <a target="_blank" href="{{url}}" class="buy-btn">立即購買</a>  
13 - </div>  
14 - {{/ buyUrl}}  
15 </div> 10 </div>
16 <div class="mags-slide"> 11 <div class="mags-slide">
17 <div class="slide-box swiper-container"> 12 <div class="slide-box swiper-container">