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

@@ -66,7 +66,7 @@
 
         <h2 class="beauty-top-h2">本周试用排行榜</h2>
         {{# top}}
-        <div class="top-list top-list-{{ranking}}">
+        <a class="top-list top-list-{{ranking}}" href="{{link}}" target="_blank">
             <span class="top-leading"></span>
 
             <div class="top-content">
@@ -75,7 +75,7 @@
                 <h3>{{subTitle}}</h3>
             </div>
             <span class="top-like-num {{bestLike}}">{{likeNum}}</span>
-        </div>
+        </a>
         {{/ top}}
         {{/ topTen}}
     </div>
@@ -112,7 +112,7 @@
 
         <h2 class="beauty-top-h2">本周试用排行榜</h2>
         {{# top}}
-        <div class="top-list top-list-{{ranking}}">
+        <a class="top-list top-list-{{ranking}}" href="{{link}}" target="_blank">
             <span class="top-leading"></span>
 
             <div class="top-content">
@@ -121,7 +121,7 @@
                 <h3>{{subTitle}}</h3>
             </div>
             <span class="top-like-num {{bestLike}}">{{likeNum}}</span>
-        </div>
+        </a>
         {{/ top}}
         {{/ topTen}}
     </div>
@@ -159,7 +159,7 @@
 
         <h2 class="beauty-top-h2">本周试用排行榜</h2>
         {{# top}}
-        <div class="top-list top-list-{{ranking}}">
+        <a class="top-list top-list-{{ranking}}" href="{{link}}" target="_blank">
             <span class="top-leading"></span>
 
             <div class="top-content">
@@ -168,7 +168,7 @@
                 <h3>{{subTitle}}</h3>
             </div>
             <span class="top-like-num {{bestLike}}">{{likeNum}}</span>
-        </div>
+        </a>
         {{/ top}}
         {{/ topTen}}
     </div>
@@ -206,7 +206,7 @@
 
         <h2 class="beauty-top-h2">本周试用排行榜</h2>
         {{# top}}
-        <div class="top-list top-list-{{ranking}}">
+        <a class="top-list top-list-{{ranking}}" href="{{link}}" target="_blank">
             <span class="top-leading"></span>
 
             <div class="top-content">
@@ -215,7 +215,7 @@
                 <h3>{{subTitle}}</h3>
             </div>
             <span class="top-like-num {{bestLike}}">{{likeNum}}</span>
-        </div>
+        </a>
         {{/ top}}
         {{/ topTen}}
     </div>

@@ -5,17 +5,24 @@
         {{#content}}
         <li class="content-item channel-{{channelType}}">
             <a class="img-link" href="{{link}}" target="_blank" onclick="YOHODCLICK('channel','mobile','content')">
-                <img class="lazy" data-original="{{img}}" src="data:image/gif;base64,R0lGODlhAQABAJEAAAAAAP///93d3f///yH5BAEAAAMALAAAAAABAAEAAAICVAEAOw==" alt=""/>
+                <img class="lazy" data-original="{{img}}"
+                     src="data:image/gif;base64,R0lGODlhAQABAJEAAAAAAP///93d3f///yH5BAEAAAMALAAAAAABAAEAAAICVAEAOw=="
+                     alt=""/>
             </a>
+
             <h2>
                 <a href="{{link}}" target="_blank" onclick="YOHODCLICK('channel','mobile','content')">{{title}}</a>
             </h2>
+
             <h3>
                 <a href="{{link}}" target="_blank" onclick="YOHODCLICK('channel','mobile','content')">{{subTitle}}</a>
             </h3>
             <time>
-                {{# channel}}<a href="{{link}}" onclick="YOHODCLICK('channel','mobile','contentChannel')">{{name}}</a>&nbsp;|&nbsp;{{/ channel}}
-                {{# subChannel}}<a href="{{link}}" onclick="YOHODCLICK('channel','mobile','contentChannel')">{{name}}</a>&nbsp;|&nbsp;{{/ subChannel}}
+                {{# channel}}<a href="{{link}}" onclick="YOHODCLICK('channel','mobile','contentChannel')">{{name}}</a>&nbsp;|&nbsp;{{/
+                channel}}
+                {{# subChannel}}<a href="{{link}}"
+                                   onclick="YOHODCLICK('channel','mobile','contentChannel')">{{name}}</a>&nbsp;|&nbsp;{{/
+                subChannel}}
                 <span time="{{time}}" class="time-format"></span>
             </time>
             <p>
@@ -27,18 +34,23 @@
         {{# topTen}}
         <li class="content-item channel-{{channelType}} channel-beauty-top">
             <a class="img-link" href="{{link}}" target="_blank" onclick="YOHODCLICK('channel','mobile','content')">
-                <img class="lazy" data-original="{{img}}" src="data:image/gif;base64,R0lGODlhAQABAJEAAAAAAP///93d3f///yH5BAEAAAMALAAAAAABAAEAAAICVAEAOw==" alt=""/>
+                <img class="lazy" data-original="{{img}}"
+                     src="data:image/gif;base64,R0lGODlhAQABAJEAAAAAAP///93d3f///yH5BAEAAAMALAAAAAABAAEAAAICVAEAOw=="
+                     alt=""/>
             </a>
+
             <h2 class="beauty-top-h2">本周试用排行榜</h2>
             {{# top}}
-                <div class="top-list top-list-{{ranking}}">
+            <a class="top-list top-list-{{ranking}}" href="{{link}}" target="_blank">
                 <span class="top-leading"></span>
+
                 <div class="top-content">
                     <h2>{{title}}</h2>
+
                     <h3>{{subTitle}}</h3>
                 </div>
                 <span class="top-like-num {{bestLike}}">{{likeNum}}</span>
-                </div>
+            </a>
             {{/ top}}
         </li>
         {{/ topTen}}
@@ -46,17 +58,24 @@
         {{#contentTwo}}
         <li class="content-item channel-{{channelType}}">
             <a class="img-link" href="{{link}}" target="_blank" onclick="YOHODCLICK('channel','mobile','content')">
-                <img class="lazy" data-original="{{img}}" src="data:image/gif;base64,R0lGODlhAQABAJEAAAAAAP///93d3f///yH5BAEAAAMALAAAAAABAAEAAAICVAEAOw==" alt=""/>
+                <img class="lazy" data-original="{{img}}"
+                     src="data:image/gif;base64,R0lGODlhAQABAJEAAAAAAP///93d3f///yH5BAEAAAMALAAAAAABAAEAAAICVAEAOw=="
+                     alt=""/>
             </a>
+
             <h2>
                 <a href="{{link}}" target="_blank" onclick="YOHODCLICK('channel','mobile','content')">{{title}}</a>
             </h2>
+
             <h3>
                 <a href="{{link}}" target="_blank" onclick="YOHODCLICK('channel','mobile','content')">{{subTitle}}</a>
             </h3>
             <time>
-                {{# channel}}<a href="{{link}}" onclick="YOHODCLICK('channel','mobile','contentChannel')">{{name}}</a>&nbsp;|&nbsp;{{/ channel}}
-                {{# subChannel}}<a href="{{link}}" onclick="YOHODCLICK('channel','mobile','contentChannel')">{{name}}</a>&nbsp;|&nbsp;{{/ subChannel}}
+                {{# channel}}<a href="{{link}}" onclick="YOHODCLICK('channel','mobile','contentChannel')">{{name}}</a>&nbsp;|&nbsp;{{/
+                channel}}
+                {{# subChannel}}<a href="{{link}}"
+                                   onclick="YOHODCLICK('channel','mobile','contentChannel')">{{name}}</a>&nbsp;|&nbsp;{{/
+                subChannel}}
                 <span time="{{time}}" class="time-format"></span>
             </time>
             <p>

@@ -24,16 +24,17 @@
 
                     <div class="trial-product-info">
                         <span>价格：{{price}}元&nbsp;/&nbsp;</span>
-                        <span>规格：{{size}}ml&nbsp;中样&nbsp;/&nbsp;</span>
+                        <span>规格：{{size}}&nbsp;{{standand}}&nbsp;/&nbsp;</span>
                         <span>数量：{{num}}份</span>
                     </div>
                     <time>
                         <span>申请时间：{{timeStart}}——{{timeEnd}}</span>
                         <span class="trial-time-overplus">距离结束还有{{timeOverplus}}</span>
                     </time>
-                    <div class="trial-submit {{# over}} trial-over {{/ over}}">
-                        <a class="apply-link" href="{{applyLink}}">免费申请</a>
-                        <span class="apply-like-num iconfont">&#xe600;&nbsp;{{likeNum}}</span>
+                    <div class="trial-submit">
+                        {{# isOver}}<b class="apply-link apply-link-over">活动已结束</b>{{/ isOver}}
+                        {{^ isOver}}<a class="apply-link" href="{{applyLink}}">免费申请</a>{{/ isOver}}
+                        <span class="apply-like-num {{# isLike}}apply-dislike{{/ isLike}}">&#xe600;{{likeNum}}</span>
                     </div>
                 </div>
             </li>
@@ -52,7 +53,7 @@
 
             <h2 class="beauty-top-h2">本周试用排行榜</h2>
             {{# top}}
-            <div class="top-list top-list-{{ranking}}">
+            <a class="top-list top-list-{{ranking}}" href="{{link}}" target="_blank">
                 <span class="top-leading"></span>
 
                 <div class="top-content">
@@ -61,7 +62,7 @@
                     <h3>{{subTitle}}</h3>
                 </div>
                 <span class="top-like-num {{bestLike}}">{{likeNum}}</span>
-            </div>
+            </a>
             {{/ top}}
             {{/ topTen}}
         </div>

 {{> layout/writer_header320}}
 <div class="trial-nav">
-    <span class="trial-nav-l trial-nav-active">试用中心</span>
+    <span class="trial-nav-l">试用中心</span>
     <span class="trial-nav-r">我的试用</span>
 </div>
 
@@ -8,7 +8,7 @@
     {{> channel/banner320}}
     <div class="home-content">
         <ul>
-            {{# content}}
+            {{# contentCenter}}
             <li class="content-item channel-{{channelType}} channel-beauty-trial">
                 <a class="img-link" href="{{link}}" target="_blank" onclick="YOHODCLICK('channel','mobile','content')">
                     <img class="lazy" data-original="{{img}}"
@@ -27,7 +27,7 @@
 
                 <div class="trial-product-info">
                     <span>价格：{{price}}元&nbsp;/&nbsp;</span>
-                    <span>规格：{{size}}ml&nbsp;中样&nbsp;/&nbsp;</span>
+                    <span>规格：{{size}}&nbsp;{{standand}}&nbsp;/&nbsp;</span>
                     <span>数量：{{num}}份</span>
                 </div>
                 <time class="{{# success}}trial-time-success{{/ success}}{{# fail}}trial-time-fail{{/ fail}}{{# ing}}trial-time-ing{{/ ing}}">
@@ -35,19 +35,108 @@
                     <span class="trial-time-overplus">距离结束还有{{timeOverplus}}</span>
                 </time>
                 <div class="trial-submit">
-                    <a class="apply-link" href="{{applyLink}}">免费申请</a>
-                    <span class="apply-like-num">{{likeNum}}</span>
+                    {{# isOver}}<b class="apply-link apply-link-over">活动已结束</b>{{/ isOver}}
+                    {{^ isOver}}<a class="apply-link" href="{{applyLink}}">免费申请</a>{{/ isOver}}
+                    <span class="apply-like-num {{# isLike}}apply-dislike{{/ isLike}}">&#xe600;{{likeNum}}</span>
                 </div>
             </li>
-            {{/ content}}
+            {{/ contentCenter}}
         </ul>
+        {{# contentCenterSwitch}}
         {{> channel/page320}}
+        {{/ contentCenterSwitch}}
     </div>
 </div>
 <div class="trial-r-content trial-content">
-    <div class="home-content">
+    <div class="home-content trial-tab-content-ing">
+        <ul>
+            {{# trialIng}}
+            <li class="content-item channel-{{channelType}} channel-beauty-trial">
+                <a class="img-link" href="{{link}}" target="_blank" onclick="YOHODCLICK('channel','mobile','content')">
+                    <img class="lazy" data-original="{{img}}"
+                         src="data:image/gif;base64,R0lGODlhAQABAJEAAAAAAP///93d3f///yH5BAEAAAMALAAAAAABAAEAAAICVAEAOw=="
+                         alt=""/>
+                </a>
+
+                <h2>
+                    <a href="{{link}}" target="_blank" onclick="YOHODCLICK('channel','mobile','content')">{{title}}</a>
+                </h2>
+
+                <h3>
+                    <a href="{{link}}" target="_blank"
+                       onclick="YOHODCLICK('channel','mobile','content')">{{subTitle}}</a>
+                </h3>
+
+                <time class="{{# success}}trial-time-success{{/ success}}{{# fail}}trial-time-fail{{/ fail}}{{# ing}}trial-time-ing{{/ ing}}">
+                    <span>申请时间：{{timeStart}}</span>
+                </time>
+                <div class="apply-status">
+                    {{# success}}申请成功{{/ success}}{{# fail}}审核未通过{{/ fail}}{{# ing}}申请待审核{{/ ing}}
+                </div>
+                <div class="trial-submit">
+                    <a class="apply-detail-link" href="{{applyDetailLink}}">查看详情</a>
+                </div>
+            </li>
+            {{/ trialIng}}
+        </ul>
+
+        {{# trialIngSwitch}}
+        {{> channel/page320}}
+        {{/ trialIngSwitch}}
+
+        {{^ trialIng}}
+        <div class="noting-trial-tip">
+            <p>您还没有申请中的试用品</p>
+            <b>立即去</b><a href="#">免费申请</a>
+        </div>
+        {{/ trialIng}}
+    </div>
+    <div class="home-content trial-tab-content-success">
+        <ul>
+            {{# trialSuccess}}
+            <li class="content-item channel-{{channelType}} channel-beauty-trial">
+                <a class="img-link" href="{{link}}" target="_blank" onclick="YOHODCLICK('channel','mobile','content')">
+                    <img class="lazy" data-original="{{img}}"
+                         src="data:image/gif;base64,R0lGODlhAQABAJEAAAAAAP///93d3f///yH5BAEAAAMALAAAAAABAAEAAAICVAEAOw=="
+                         alt=""/>
+                </a>
+
+                <h2>
+                    <a href="{{link}}" target="_blank" onclick="YOHODCLICK('channel','mobile','content')">{{title}}</a>
+                </h2>
+
+                <h3>
+                    <a href="{{link}}" target="_blank"
+                       onclick="YOHODCLICK('channel','mobile','content')">{{subTitle}}</a>
+                </h3>
+
+                <time class="{{# success}}trial-time-success{{/ success}}{{# fail}}trial-time-fail{{/ fail}}{{# ing}}trial-time-ing{{/ ing}}">
+                    <span>申请时间：{{timeStart}}</span>
+                </time>
+                <div class="apply-status">
+                    {{# success}}申请成功{{/ success}}{{# fail}}审核未通过{{/ fail}}{{# ing}}申请待审核{{/ ing}}
+                </div>
+                <div class="trial-submit">
+                    <a class="apply-detail-link" href="{{applyDetailLink}}">查看详情</a>
+                </div>
+            </li>
+            {{/ trialSuccess}}
+        </ul>
+
+        {{# trialSuccessSwitch}}
+        {{> channel/page320}}
+        {{/ trialSuccessSwitch}}
+
+        {{^ trialSuccess}}
+        <div class="noting-trial-tip">
+            <p>您还没有申请成功的试用品</p>
+            <b>立即去</b><a href="#">免费申请</a>
+        </div>
+        {{/ trialSuccess}}
+    </div>
+    <div class="home-content trial-tab-content-fail">
         <ul>
-            {{# content}}
+            {{# trialFail}}
             <li class="content-item channel-{{channelType}} channel-beauty-trial">
                 <a class="img-link" href="{{link}}" target="_blank" onclick="YOHODCLICK('channel','mobile','content')">
                     <img class="lazy" data-original="{{img}}"
@@ -74,22 +163,30 @@
                     <a class="apply-detail-link" href="{{applyDetailLink}}">查看详情</a>
                 </div>
             </li>
-            {{/ content}}
+            {{/ trialFail}}
         </ul>
+
+        {{# trialFailSwitch}}
         {{> channel/page320}}
+        {{/ trialFailSwitch}}
+
+        {{^ trialFail}}
+        <div class="noting-trial-tip">
+            <p>您还没有申请中的试用品</p>
+            <b>立即去</b><a href="#">免费申请</a>
+        </div>
+        {{/ trialFail}}
     </div>
 </div>
 {{> default/download320}}
 <!--trialCat-->
-{{# trialCat}}
 <div id="trial-cat">
     <div class="trial-cat-main">
         <ul>
-            <li><a href="{{ing}}" onclick="YOHODCLICK('trial','mobile','')"></a></li>
-            <li><a href="{{success}}" onclick="YOHODCLICK('trial','mobile','')"></a></li>
-            <li><a href="{{fail}}" onclick="YOHODCLICK('trial','mobile','')"></a></li>
+            <li><span onclick="YOHODCLICK('trial','mobile','')"></span></li>
+            <li><span onclick="YOHODCLICK('trial','mobile','')"></span></li>
+            <li><span onclick="YOHODCLICK('trial','mobile','')"></span></li>
         </ul>
     </div>
 </div>
-{{/ trialCat}}
 {{> layout/footer320}}
\ No newline at end of file

@@ -12,7 +12,8 @@
             <ul>
                 {{# trialIng}}
                 <li class="content-trial-item channel-{{channelType}} channel-beauty-trial {{# noBorder}} no-border {{/ noBorder}}">
-                    <a class="img-link" href="{{link}}" target="_blank" onclick="YOHODCLICK('channel','mobile','content')">
+                    <a class="img-link" href="{{link}}" target="_blank"
+                       onclick="YOHODCLICK('channel','mobile','content')">
                         <img class="lazy" data-original="{{img}}"
                              src="data:image/gif;base64,R0lGODlhAQABAJEAAAAAAP///93d3f///yH5BAEAAAMALAAAAAABAAEAAAICVAEAOw=="
                              alt=""/>
@@ -35,14 +36,19 @@
                         <div class="apply-status">
                             {{# success}}申请成功{{/ success}}{{# fail}}审核未通过{{/ fail}}{{# ing}}申请待审核{{/ ing}}
                         </div>
-                        <div class="trial-submit {{# over}} trial-over {{/ over}}">
-                            <a class="apply-link" href="{{applyLink}}">免费申请</a>
-                            <span class="apply-like-num iconfont">&#xe600;&nbsp;{{likeNum}}</span>
+                        <div class="trial-submit">
+                            <a class="apply-link" href="{{applyDetailLink}}">查看详情</a>
                         </div>
                     </div>
                 </li>
                 {{/ trialIng}}
             </ul>
+            {{^ trialIng}}
+            <div class="no-trial">
+                您没有正在申请的试用品<br />
+                <span>立即去</span><a href="">免费申请</a>
+            </div>
+            {{/ trialIng}}
         </div>
     </div>
     <div class="trial-tab-content-success">
@@ -50,7 +56,8 @@
             <ul>
                 {{# trialSuccess}}
                 <li class="content-trial-item channel-{{channelType}} channel-beauty-trial {{# noBorder}} no-border {{/ noBorder}}">
-                    <a class="img-link" href="{{link}}" target="_blank" onclick="YOHODCLICK('channel','mobile','content')">
+                    <a class="img-link" href="{{link}}" target="_blank"
+                       onclick="YOHODCLICK('channel','mobile','content')">
                         <img class="lazy" data-original="{{img}}"
                              src="data:image/gif;base64,R0lGODlhAQABAJEAAAAAAP///93d3f///yH5BAEAAAMALAAAAAABAAEAAAICVAEAOw=="
                              alt=""/>
@@ -73,14 +80,19 @@
                         <div class="apply-status">
                             {{# success}}申请成功{{/ success}}{{# fail}}审核未通过{{/ fail}}{{# ing}}申请待审核{{/ ing}}
                         </div>
-                        <div class="trial-submit {{# over}} trial-over {{/ over}}">
-                            <a class="apply-link" href="{{applyLink}}">免费申请</a>
-                            <span class="apply-like-num iconfont">&#xe600;&nbsp;{{likeNum}}</span>
+                        <div class="trial-submit">
+                            <a class="apply-link" href="{{applyDetailLink}}">查看详情</a>
                         </div>
                     </div>
                 </li>
                 {{/ trialSuccess}}
             </ul>
+            {{^ trialSuccess}}
+            <div class="no-trial">
+                您没有申请成功的试用品<br />
+                <span>立即去</span><a href="">免费申请</a>
+            </div>
+            {{/ trialSuccess}}
         </div>
     </div>
     <div class="trial-tab-content-fail">
@@ -88,7 +100,8 @@
             <ul>
                 {{# trialFail}}
                 <li class="content-trial-item channel-{{channelType}} channel-beauty-trial {{# noBorder}} no-border {{/ noBorder}}">
-                    <a class="img-link" href="{{link}}" target="_blank" onclick="YOHODCLICK('channel','mobile','content')">
+                    <a class="img-link" href="{{link}}" target="_blank"
+                       onclick="YOHODCLICK('channel','mobile','content')">
                         <img class="lazy" data-original="{{img}}"
                              src="data:image/gif;base64,R0lGODlhAQABAJEAAAAAAP///93d3f///yH5BAEAAAMALAAAAAABAAEAAAICVAEAOw=="
                              alt=""/>
@@ -111,14 +124,19 @@
                         <div class="apply-status">
                             {{# success}}申请成功{{/ success}}{{# fail}}审核未通过{{/ fail}}{{# ing}}申请待审核{{/ ing}}
                         </div>
-                        <div class="trial-submit {{# over}} trial-over {{/ over}}">
-                            <a class="apply-link" href="{{applyLink}}">免费申请</a>
-                            <span class="apply-like-num iconfont">&#xe600;&nbsp;{{likeNum}}</span>
+                        <div class="trial-submit">
+                            <a class="apply-link" href="{{applyDetailLink}}">查看详情</a>
                         </div>
                     </div>
                 </li>
                 {{/ trialFail}}
             </ul>
+            {{^ trialFail}}
+            <div class="no-trial">
+                您没有申请失败的试用品<br />
+                <span>立即去</span><a href="">免费申请</a>
+            </div>
+            {{/ trialFail}}
         </div>
     </div>
 </div>