ued / yohogirls_mustache · Commits

Go to a project

Authored by happyhour7@163.com
Commit 20d0ddc187afc71b710e921128ee10f990d11c6f 2 parents 1fcb7193 c450e99a

Merge branch 'web_develop' into develop

Inline Side-by-side
Showing 5 changed files with 11 additions and 15 deletions
@@ -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">