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

@@ -14,8 +14,20 @@
         {{# content}}
             {{> detail/trail_content}}
         {{/ content}}
+        
+        {{! 试用状态}}
+        {{# trialStatus}}
+            {{> common/trial_status}}
+        {{/ trialStatus}}
 
         {{! 申请表格}}
-        {{> detail/application_form}}
+        {{# if hasForm}}
+            {{> detail/application_form}}
+        {{/ if}}
+
+        {{! 提示框}}
+        {{# if toolTip}}
+            {{> detail/tooltip}}
+        {{/ if}}
     </div>
 </div>
\ No newline at end of file

+<div class="trial-status clearfix">
+    {{#if passCheck}}
+    <p class="pass-tip">您已经通过审核，发点试用心得吧～</p>
+    {{/ if}}
+    {{# if publishUrl}}
+    <a class="end-btn" href="javascript:;">活动已结束</a>
+    {{/ if}}
+    {{# like}}
+    <a class="user-like {{# isLike}}like{{/ isLike}}" href="javascript:;">
+        <span class="iconfont">&#xe600;</span>
+        <span class="like-num">{{num}}</span>
+    </a>
+    {{/ like}}
+    {{# if publishUrl}}
+    <a class="publish-btn" href="{{publishUrl}}">发试用心得</a>
+    {{/ if}}
+</div>
\ No newline at end of file

@@ -99,6 +99,7 @@
                     <label class="checkbox-label" for="trouble9">肤色不均</label>
                 </span>
             </p>
+            <div class="application-reason" contentEditable="true"></div>
             <p class="clearfix">
                 <input class="submit-btn" type="button" value="免费申请">
             </p>

+<div class="tooltip">
+    <p class="trial-tip">{{toolTip}}</p>
+    <p>请耐心等待系统审核</p>
+    <p>我们会短信通知您申请结果</p>
+</div>
\ No newline at end of file

@@ -25,10 +25,4 @@
         <p>距离结束还有{{endTime}}</p>
     </div>
     {{/ trailInfo}}
-    {{# like}}
-    <div class="user-like {{# isLike}}islike{{/ isLike}}">
-        <span class="iconfont">&#xe600;</span>
-        <span class="like-num">{{num}}</span>
-    </div>
-    {{/ like}}
 </div>
\ No newline at end of file