Merge branch 'develop' into test

Conflicts:
	partials/layout/header.html
	partials/layout/header_fan.html
	partials/layout/header_jian.html

@@ -4,7 +4,7 @@
         <img src="http://cmsres.test.yoho.cn/res/new/girls/assets/images/detail/qr.png" alt="">
     </div>
     <div class="app-main">
-        <h6>Yoho!Boys</h6>
+        <h6>Yoho!Girls</h6>
         <p>We love to Play & Learn</p>
         <div class="download-btn clearfix">
             <a href="{{iosUrl}}"><img src="http://cmsres.test.yoho.cn/res/new/girls/assets/images/detail/ios-download-1024.png" alt=""></a>

+
 {{^ fanti}}
     {{> layout/header_jian}}
 {{/ fanti}}
 {{# fanti}}
     {{> layout/header_fan}}
+
 {{/ fanti}}
\ No newline at end of file

@@ -17,7 +17,7 @@
                 <li class="item enterprise-girls item-choosen"><span>YOHO!GIRLS</span><a href="http://www.yohogirls.com" target="_blank">女生潮流</a></li>
                 <li class="item enterprise-show"><span>YOHO!SHOW</span><a href="http://www.yohoshow.com" target="_blank">物趣分享</a></li>
                 <li class="item enterprise-yohood"><span>YOHOOD</span><a href="http://www.yohood.cn" target="_blank">潮流嘉年華</a></li>
-                <li class="jianfan"><a href="/go/location">简</a>&nbsp;<a class="unchoosen">/</a>&nbsp;<a class="choosen" href="javascript;">繁</a></li>
+                <li class="jianfan"><a class="unchoosen"  href="/go/location">简</a>&nbsp;<a class="unchoosen">/</a>&nbsp;<a class="choosen" href="#">繁</a></li>
             </ul>
         </div>
 
@@ -139,7 +139,8 @@
                 <li class="item enterprise-girls item-choosen"><span>YOHO!GIRLS</span><a href="http://www.yohogirls.com" target="_blank">女生潮流</a></li>
                 <li class="item enterprise-show"><span>YOHO!SHOW</span><a href="http://www.yohoshow.com" target="_blank">物趣分享</a></li>
                 <li class="item enterprise-yohood"><span>YOHOOD</span><a href="http://www.yohood.cn" target="_blank">潮流嘉年華</a></li>
-                <li class="jianfan"><a class="unchoosen" href="javascript:;" href="/go/location">简</a>&nbsp;<a class="unchoosen">/</a>&nbsp;<a class="choosen" href="javascript;">繁</a></li>
+
+                <li class="jianfan"><a class="unchoosen"  href="/go/location">简</a>&nbsp;<a class="unchoosen">/</a>&nbsp;<a class="choosen" href="#">繁</a></li>
             </ul>
         </div>
         

@@ -17,7 +17,9 @@
                 <li class="item enterprise-girls item-choosen"><span>YOHO!GIRLS</span><a href="http://www.yohogirls.com" target="_blank">女生潮流</a></li>
                 <li class="item enterprise-show"><span>YOHO!SHOW</span><a href="http://www.yohoshow.com" target="_blank">物趣分享</a></li>
                 <li class="item enterprise-yohood"><span>YOHOOD</span><a href="http://www.yohood.cn" target="_blank">潮流嘉年华</a></li>
-                <li class="jianfan"><a class="choosen"  href="javascript;">简</a>&nbsp;<a class="unchoosen">/</a>&nbsp;<a class="unchoosen"  href="/go/location">繁</a></li>
+
+                <li class="jianfan"><a class="choosen"  href="#">简</a>&nbsp;<a class="unchoosen">/</a>&nbsp;<a class="unchoosen"  href="/go/location">繁</a></li>
+
             </ul>
         </div>
 
@@ -140,7 +142,7 @@
                 <li class="item enterprise-girls item-choosen"><span>YOHO!GIRLS</span><a href="http://www.yohogirls.com" target="_blank">女生潮流</a></li>
                 <li class="item enterprise-show"><span>YOHO!SHOW</span><a href="http://www.yohoshow.com" target="_blank">物趣分享</a></li>
                 <li class="item enterprise-yohood"><span>YOHOOD</span><a href="http://www.yohood.cn" target="_blank">潮流嘉年华</a></li>
-                <li class="jianfan"><a class="choosen"  href="javascript;">简</a>&nbsp;<a class="unchoosen">/</a>&nbsp;<a class="unchoosen"  href="/go/location">繁</a></li>
+                <li class="jianfan"><a class="choosen"  href="#">简</a>&nbsp;<a class="unchoosen">/</a>&nbsp;<a class="unchoosen"  href="/go/location">繁</a></li>
             </ul>
         </div>