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

@@ -15,7 +15,7 @@
         {{# trialStatus}}
             {{> common/trial_status}}
         {{/ trialStatus}}
-
+        
         {{#unless toolTip}}
             {{> detail/application_form}}
         {{/unless}}
@@ -35,11 +35,13 @@
         <div class="trial-top" style="padding-top: 0;">
             {{# topTen}}
             <div class="trial-user-info login-status">
-            <span class="trial-user-pic">
-                <img class="loginAvatar" src="http://rescdn.yohoboys.com/res/new/boys/images/detail/user-img120.png" alt=""/>
-                <i class="loginType"></i>
-            </span>
-                <span>我的试用</span>
+                <a href="javascript:;">
+                    <span class="trial-user-pic">
+                        <img class="loginAvatar" src="http://rescdn.yohoboys.com/res/new/boys/images/detail/user-img120.png" alt=""/>
+                        <i class="loginType"></i>
+                    </span>
+                    <span>我的试用</span>
+                </a>
             </div>
 
             <h2 class="beauty-top-h2">本周试用排行榜</h2>

@@ -17,7 +17,7 @@
         {{/ trialStatus}}
 
         {{#unless toolTip}}
-        {{> detail/application_form_hk}}
+            {{> detail/application_form}}
         {{/unless}}
 
         {{> detail/tooltip}}

@@ -7,4 +7,15 @@
     <div class="main-content">
         {{{mainHtml}}}
     </div>
+    {{# trialInfo}}
+    <div class="trail-info">
+        <p>
+            价格：<span>{{price}}</span>&nbsp;/&nbsp;
+            规格：<span>{{standard}}</span>&nbsp;/&nbsp;
+            数量：<span>{{num}}件</span>
+        </p>
+        <p>申请时间：{{applicationDate}}</p>
+        <p>距离结束还有{{endTime}}</p>
+    </div>
+    {{/ trialInfo}}
 </div>
\ No newline at end of file

 <script type="text/javascript" charset="utf-8">
-    seajs.use(['js/public','js/channel/review'], function() {});
+    seajs.use(['js/public','js/channel','js/channel/review'], function() {});
 </script>
\ No newline at end of file