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

@@ -8,7 +8,7 @@
         {{# 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}}
+        {{# 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>

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

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

@@ -132,13 +132,15 @@
                 </span>
                 {{/each}}
             </p>
-            <div class="application-reason" contentEditable="true">
-                {{# reason}}
-                    {{.}}
-                {{/ reason}}
-                {{^ reason}}
-                <span class="placeholder">你可以从肌肤现有问题，钟爱哪些产品等方面提交申请理由</span>
-                {{/ reason}}
+            <div class="application-reason-wrap">
+                <div class="application-reason" contentEditable="true">
+                    {{# reason}}
+                        {{.}}
+                    {{/ reason}}
+                    {{^ reason}}
+                    <span class="placeholder">你可以从肌肤现有问题，钟爱哪些产品等方面提交申请理由</span>
+                    {{/ reason}}
+                </div>
             </div>
             <!-- <p class="clearfix">
                 <textarea class="application-reason"></textarea>

@@ -58,13 +58,15 @@
                 </span>
                 {{/each}}
             </p>
-            <div class="application-reason" contentEditable="true">
-                {{# reason}}
-                    {{.}}
-                {{/ reason}}
-                {{^ reason}}
-                <span class="placeholder">你可以從肌膚現有問題，鐘愛哪些產品等方面提交申請理由</span>
-                {{/ reason}}
+            <div class="application-reason-wrap">
+                <div class="application-reason" contentEditable="true">
+                    {{# reason}}
+                        {{.}}
+                    {{/ reason}}
+                    {{^ reason}}
+                    <span class="placeholder">你可以從肌膚現有問題，鐘愛哪些產品等方面提交申請理由</span>
+                    {{/ reason}}
+                </div>
             </div>
             <p class="clearfix">
                 <input id="submit-btn" class="submit-btn" type="submit" value="免費申請">

@@ -46,7 +46,7 @@
             <ul class="swiper-wrapper">
                 <li class="swiper-slide nav-default"><a href="/mobile.html" onclick="YOHODCLICK('channel','mobile','homeCN')">home</a></li>
                 <li class="swiper-slide nav-fashion"><a href="/fashion/mobile.html" onclick="YOHODCLICK('channel','mobile','fashionCN')">fashion</a></li>
-                <li class="swiper-slide nav-beauty"><a href="/beauty/mobile.html" onclick="YOHODCLICK('channel','mobile','beautyCN')">beauty</a></li>
+                <li class="swiper-slide nav-beauty"><a href="/channel/beauty/index" onclick="YOHODCLICK('channel','mobile','beautyCN')">beauty</a></li>
                 <li class="swiper-slide nav-sport"><a href="/sport/mobile.html" onclick="YOHODCLICK('channel','mobile','sport')">sport</a></li>
                 <li class="swiper-slide nav-lifestyle"><a href="/lifestyle/mobile.html" onclick="YOHODCLICK('channel','mobile','lifestyleCN')">lifestyle</a></li>
                 <li class="swiper-slide nav-magazine"><a href="/magazine/mobile.html" onclick="YOHODCLICK('channel','mobile','magazineCN')">magazine</a></li>

@@ -64,7 +64,7 @@
                 <span class="menu-link-channel menu-link-beauty beauty-choosen">
                     <a class="text">beauty</a>
                     <a class="hover-text">美容</a>
-                    <a class="menu" href="/beauty/index.html" onclick="YOHODCLICK('channel','web','beautyHK')"></a>
+                    <a class="menu" href="/channel/beauty/index" onclick="YOHODCLICK('channel','web','beautyHK')"></a>
                     <div class="submenu submenu-beauty">
                         <div class="submenu-loading"></div>
                         <div class="more-content"><a class="more-content" href="/beauty/index.html" onclick="YOHODCLICK('channel','web','moreBeautyHK')">More &gt;</a></div>

@@ -50,7 +50,7 @@
             <ul class="swiper-wrapper">
                 <li class="swiper-slide nav-default"><a href="/mobile.html" onclick="YOHODCLICK('channel','mobile','homeHK')">home</a></li>
                 <li class="swiper-slide nav-fashion"><a href="/fashion/mobile.html" onclick="YOHODCLICK('channel','mobile','fashionHK')">fashion</a></li>
-                <li class="swiper-slide nav-beauty"><a href="/beauty/mobile.html" onclick="YOHODCLICK('channel','mobile','beautyHK')">beauty</a></li>
+                <li class="swiper-slide nav-beauty"><a href="/channel/beauty/index" onclick="YOHODCLICK('channel','mobile','beautyHK')">beauty</a></li>
                 <li class="swiper-slide nav-sport"><a href="/sport/mobile.html" onclick="YOHODCLICK('channel','mobile','sport')">sport</a></li>
                 <li class="swiper-slide nav-lifestyle"><a href="/lifestyle/mobile.html" onclick="YOHODCLICK('channel','mobile','lifestyleHK')">lifestyle</a></li>
                 <li class="swiper-slide nav-magazine"><a href="/magazine/mobile.html" onclick="YOHODCLICK('channel','mobile','magazineHK')">magazine</a></li>

@@ -60,7 +60,7 @@
                     <span class="menu-link-channel menu-link-beauty beauty-choosen">
                         <a class="text">beauty</a>
                         <a class="hover-text">美容</a>
-                        <a class="menu" href="/beauty/index.html" onclick="YOHODCLICK('channel','web','beautyCN')"></a>
+                        <a class="menu" href="/channel/beauty/index" onclick="YOHODCLICK('channel','web','beautyCN')"></a>
                         <div class="submenu submenu-beauty">
                             <div class="submenu-loading"></div>
                             <div class="more-content"><a class="more-content" href="/beauty/index.html" onclick="YOHODCLICK('channel','web','moreBeautyCN')">More &gt;</a></div>