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

+{{> layout/header_jian}}
+<div class="publish-container">
+    <form action="">
+        <div class="bg-top"></div>
+        <div class="bg-bottom"></div>
+        <div id="img-storage" class="img-storage clearfix">
+            <ul class="img-content clearfix">
+                <li id="add-btn" class="file-input">
+                    <input class="over-btn" type="button">
+                    <input class="add-img" type="file" />
+                </li>
+            </ul>
+            
+        </div>
+          
+    </form>
+</div>
+{{> layout/footer_jian}}
\ No newline at end of file

+{{> layout/header_jian}}
+<div class="detail-container clearfix">
+    {{#if trialStep}}
+        {{> common/trial_step}}
+    {{/ if}}
+
+    {{# header}}
+        {{> detail/detail_title}}
+    {{/ header}}
+    <div class="detail-body">
+        {{# content}}
+            {{> detail/trail_content}}
+        {{/ content}}
+        
+    </div>
+</div>
\ No newline at end of file

 {{> layout/header_jian}}
 <div class="detail-container clearfix">
-    {{! 试用步骤}}
     {{#if trialStep}}
         {{> common/trial_step}}
     {{/ if}}
     
-    {{! 内容页头部}}
     {{# header}}
         {{> detail/detail_title}}
     {{/ header}}
     <div class="detail-body">
-        {{! 内容页主体}}
         {{# content}}
             {{> detail/trail_content}}
         {{/ content}}
         
-        {{! 试用状态}}
         {{# trialStatus}}
             {{> common/trial_status}}
         {{/ trialStatus}}
 
-        {{! 申请表格}}
-        {{# if hasForm}}
+        {{# if formTip}}
             {{> detail/application_form}}
         {{/ if}}
 
-        {{! 提示框}}
         {{# if toolTip}}
             {{> detail/tooltip}}
         {{/ if}}

+{{> layout/writer_header320}}
+<div id="wx_pic" style="width:0px; height:0px; overflow:hidden"><img src="{{shareImg}}"/></div>
+<div id="trial-detail" class="detail">
+    {{# detailData}}
+    <h2 class="share-h2">{{title}}</h2>
+    <h3 class="share-h3">{{subTitle}}</h3>
+    <div class="author-channel">
+        {{# author}}
+        <p><a class="detail_author" href="{{link}}" target="_blank">Text:&nbsp;{{name}}</a></p>
+        {{/ author}}
+        {{# channel}}<a href="{{link}}">{{name}}</a>&nbsp;|&nbsp;{{/ channel}}
+        {{# twoChannel}}<a href="{{link}}">{{name}}</a>&nbsp;|&nbsp;{{/ twoChannel}}
+        <span time="{{time}}" class="time-format"></span>
+    </div>
+    {{/ detailData}}
+    <div class="detail-body">
+        {{# content}}
+            {{> detail/trail_content}}
+        {{/ content}}
+
+        {{# trialStatus}}
+            {{> common/trial_status}}
+        {{/ trialStatus}}
+        
+        {{# if formTip}}
+            {{> detail/application_form}}
+        {{/ if}}
+
+        {{# if toolTip}}
+            {{> detail/tooltip}}
+        {{/ if}}
+    </div>
+</div>

@@ -31,3 +31,6 @@
 {{# writer}}
     {{> script/writer}}
 {{/ writer}}
+{{# publish}}
+    {{> script/publish}}
+{{/ publish}}
\ No newline at end of file

 <div class="application-form">
     <div class="application-tips">
         <h2>TIPS</h2>
-        <p>如实填写个人资料以便我们选取试用网友</p>
-        <p>提交申请并分享该页面选中几率更高</p>
-        <p>成功领取试用并填写试用报告，会提高之后的选中几率</p>
+        <p>{{formTip}}</p>
     </div>
     <div class="form">
         <form action="">
@@ -99,7 +97,9 @@
                     <label class="checkbox-label" for="trouble9">肤色不均</label>
                 </span>
             </p>
-            <div class="application-reason" contentEditable="true"></div>
+            <div class="application-reason" contentEditable="true">
+                <span class="placeholder">你可以从肌肤现有问题，钟爱哪些产品等方面提交申请理由</span>
+            </div>
             <p class="clearfix">
                 <input class="submit-btn" type="button" value="免费申请">
             </p>

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