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

@@ -53,7 +53,7 @@
         {{> channel/item}}
         {{/ topItemsLeft}}
     </div>
-    <div class="trial-top">
+    <div class="trial-top trial-has-bottom-border">
         {{# topTen}}
         <span class="content-item-detail-a-img">
             <a href="{{link}}" target="_blank" class="link" title="{{title}}"
@@ -99,7 +99,7 @@
         {{> channel/item}}
         {{/ topItemsLeft}}
     </div>
-    <div class="trial-top">
+    <div class="trial-top trial-has-bottom-border">
         {{# topTen}}
         <span class="content-item-detail-a-img">
             <a href="{{link}}" target="_blank" class="link" title="{{title}}"

 {{> layout/header_jian}}
 <div class="trial-tab-select">
     <div class="tab-select-wrapper">
-        <span class="trial-tab-ing trial-tab-active">申请中</span>
+        <span class="trial-tab-ing">申请中</span>
         <span class="trial-tab-success">申请成功</span>
         <span class="trial-tab-fail">申请失败</span>
     </div>
 </div>
 <div class="content {{# channel}}content-{{.}}{{/ channel}} clearfix" id="beauuty-trial-list">
-    <div class="trial-tab-content-ing trial-tab-content-active">
-        <div class="trial-content-left">
+    <div class="trial-tab-content-ing">
+        <div class="trial-content-left" style="float:none;">
             <ul>
                 {{# trialIng}}
                 <li class="content-trial-item channel-{{channelType}} channel-beauty-trial {{# noBorder}} no-border {{/ noBorder}}">
@@ -50,9 +50,12 @@
             </div>
             {{/ trialIng}}
         </div>
+        {{# trialIngSwitch}}
+        {{> channel/trial_pager}}
+        {{/ trialIngSwitch}}
     </div>
     <div class="trial-tab-content-success">
-        <div class="trial-content-left">
+        <div class="trial-content-left" style="float:none;">
             <ul>
                 {{# trialSuccess}}
                 <li class="content-trial-item channel-{{channelType}} channel-beauty-trial {{# noBorder}} no-border {{/ noBorder}}">
@@ -94,9 +97,12 @@
             </div>
             {{/ trialSuccess}}
         </div>
+        {{# trialSuccessSwitch}}
+        {{> channel/trial_pager}}
+        {{/ trialSuccessSwitch}}
     </div>
     <div class="trial-tab-content-fail">
-        <div class="trial-content-left">
+        <div class="trial-content-left" style="float:none;">
             <ul>
                 {{# trialFail}}
                 <li class="content-trial-item channel-{{channelType}} channel-beauty-trial {{# noBorder}} no-border {{/ noBorder}}">
@@ -138,6 +144,9 @@
             </div>
             {{/ trialFail}}
         </div>
+        {{# trialFailSwitch}}
+        {{> channel/trial_pager}}
+        {{/ trialFailSwitch}}
     </div>
 </div>
 {{> layout/footer_jian}}
\ No newline at end of file

+<div class="pager-content">
+    <div class="channel-index-pager pager-channel-{{channel}}">
+        {{# pager}}
+            <a class="pager-item {{# isChoosen}} pager-item-choosen{{/ isChoosen}}" href="{{link}}" onclick="YOHODCLICK('pager','web','pagerContentChannel')">{{text}}</a>
+        {{/ pager}}
+    </div>
+</div>
\ No newline at end of file