Merge branch 'develop' into test

@@ -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>