ued / yohogirls_mustache · Commits

Go to a project

Authored by happyhour7
Commit 91970e169a2ed8bdc1d548a30cfd2464dca09222 2 parents 85a329ed 5f4c9f17

Merge branch 'develop' into test 

Conflicts:
	partials/layout/header.html
	partials/layout/header_fan.html
	partials/layout/header_jian.html
Inline Side-by-side
Showing 4 changed files with 10 additions and 5 deletions
@@ -4,7 +4,7 @@ @@ -4,7 +4,7 @@
4 <img src="http://cmsres.test.yoho.cn/res/new/girls/assets/images/detail/qr.png" alt=""> 4 <img src="http://cmsres.test.yoho.cn/res/new/girls/assets/images/detail/qr.png" alt="">
5 </div> 5 </div>
6 <div class="app-main"> 6 <div class="app-main">
7 - <h6>Yoho!Boys</h6> 7 + <h6>Yoho!Girls</h6>
8 <p>We love to Play & Learn</p> 8 <p>We love to Play & Learn</p>
9 <div class="download-btn clearfix"> 9 <div class="download-btn clearfix">
10 <a href="{{iosUrl}}"><img src="http://cmsres.test.yoho.cn/res/new/girls/assets/images/detail/ios-download-1024.png" alt=""></a> 10 <a href="{{iosUrl}}"><img src="http://cmsres.test.yoho.cn/res/new/girls/assets/images/detail/ios-download-1024.png" alt=""></a>
  1 +
1 {{^ fanti}} 2 {{^ fanti}}
2 {{> layout/header_jian}} 3 {{> layout/header_jian}}
3 {{/ fanti}} 4 {{/ fanti}}
4 {{# fanti}} 5 {{# fanti}}
5 {{> layout/header_fan}} 6 {{> layout/header_fan}}
  7 +
6 {{/ fanti}} 8 {{/ fanti}}
@@ -17,7 +17,7 @@ @@ -17,7 +17,7 @@
17 <li class="item enterprise-girls item-choosen"><span>YOHO!GIRLS</span><a href="http://www.yohogirls.com" target="_blank">女生潮流</a></li> 17 <li class="item enterprise-girls item-choosen"><span>YOHO!GIRLS</span><a href="http://www.yohogirls.com" target="_blank">女生潮流</a></li>
18 <li class="item enterprise-show"><span>YOHO!SHOW</span><a href="http://www.yohoshow.com" target="_blank">物趣分享</a></li> 18 <li class="item enterprise-show"><span>YOHO!SHOW</span><a href="http://www.yohoshow.com" target="_blank">物趣分享</a></li>
19 <li class="item enterprise-yohood"><span>YOHOOD</span><a href="http://www.yohood.cn" target="_blank">潮流嘉年華</a></li> 19 <li class="item enterprise-yohood"><span>YOHOOD</span><a href="http://www.yohood.cn" target="_blank">潮流嘉年華</a></li>
20 - <li class="jianfan"><a href="/go/location">简</a>&nbsp;<a class="unchoosen">/</a>&nbsp;<a class="choosen" href="javascript;">繁</a></li> 20 + <li class="jianfan"><a class="unchoosen" href="/go/location">简</a>&nbsp;<a class="unchoosen">/</a>&nbsp;<a class="choosen" href="#">繁</a></li>
21 </ul> 21 </ul>
22 </div> 22 </div>
23 23
@@ -139,7 +139,8 @@ @@ -139,7 +139,8 @@
139 <li class="item enterprise-girls item-choosen"><span>YOHO!GIRLS</span><a href="http://www.yohogirls.com" target="_blank">女生潮流</a></li> 139 <li class="item enterprise-girls item-choosen"><span>YOHO!GIRLS</span><a href="http://www.yohogirls.com" target="_blank">女生潮流</a></li>
140 <li class="item enterprise-show"><span>YOHO!SHOW</span><a href="http://www.yohoshow.com" target="_blank">物趣分享</a></li> 140 <li class="item enterprise-show"><span>YOHO!SHOW</span><a href="http://www.yohoshow.com" target="_blank">物趣分享</a></li>
141 <li class="item enterprise-yohood"><span>YOHOOD</span><a href="http://www.yohood.cn" target="_blank">潮流嘉年華</a></li> 141 <li class="item enterprise-yohood"><span>YOHOOD</span><a href="http://www.yohood.cn" target="_blank">潮流嘉年華</a></li>
142 - <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> 142 +
  143 + <li class="jianfan"><a class="unchoosen" href="/go/location">简</a>&nbsp;<a class="unchoosen">/</a>&nbsp;<a class="choosen" href="#">繁</a></li>
143 </ul> 144 </ul>
144 </div> 145 </div>
145 146
@@ -17,7 +17,9 @@ @@ -17,7 +17,9 @@
17 <li class="item enterprise-girls item-choosen"><span>YOHO!GIRLS</span><a href="http://www.yohogirls.com" target="_blank">女生潮流</a></li> 17 <li class="item enterprise-girls item-choosen"><span>YOHO!GIRLS</span><a href="http://www.yohogirls.com" target="_blank">女生潮流</a></li>
18 <li class="item enterprise-show"><span>YOHO!SHOW</span><a href="http://www.yohoshow.com" target="_blank">物趣分享</a></li> 18 <li class="item enterprise-show"><span>YOHO!SHOW</span><a href="http://www.yohoshow.com" target="_blank">物趣分享</a></li>
19 <li class="item enterprise-yohood"><span>YOHOOD</span><a href="http://www.yohood.cn" target="_blank">潮流嘉年华</a></li> 19 <li class="item enterprise-yohood"><span>YOHOOD</span><a href="http://www.yohood.cn" target="_blank">潮流嘉年华</a></li>
20 - <li class="jianfan"><a class="choosen" href="javascript;">简</a>&nbsp;<a class="unchoosen">/</a>&nbsp;<a class="unchoosen" href="/go/location">繁</a></li> 20 +
  21 + <li class="jianfan"><a class="choosen" href="#">简</a>&nbsp;<a class="unchoosen">/</a>&nbsp;<a class="unchoosen" href="/go/location">繁</a></li>
  22 +
21 </ul> 23 </ul>
22 </div> 24 </div>
23 25
@@ -140,7 +142,7 @@ @@ -140,7 +142,7 @@
140 <li class="item enterprise-girls item-choosen"><span>YOHO!GIRLS</span><a href="http://www.yohogirls.com" target="_blank">女生潮流</a></li> 142 <li class="item enterprise-girls item-choosen"><span>YOHO!GIRLS</span><a href="http://www.yohogirls.com" target="_blank">女生潮流</a></li>
141 <li class="item enterprise-show"><span>YOHO!SHOW</span><a href="http://www.yohoshow.com" target="_blank">物趣分享</a></li> 143 <li class="item enterprise-show"><span>YOHO!SHOW</span><a href="http://www.yohoshow.com" target="_blank">物趣分享</a></li>
142 <li class="item enterprise-yohood"><span>YOHOOD</span><a href="http://www.yohood.cn" target="_blank">潮流嘉年华</a></li> 144 <li class="item enterprise-yohood"><span>YOHOOD</span><a href="http://www.yohood.cn" target="_blank">潮流嘉年华</a></li>
143 - <li class="jianfan"><a class="choosen" href="javascript;">简</a>&nbsp;<a class="unchoosen">/</a>&nbsp;<a class="unchoosen" href="/go/location">繁</a></li> 145 + <li class="jianfan"><a class="choosen" href="#">简</a>&nbsp;<a class="unchoosen">/</a>&nbsp;<a class="unchoosen" href="/go/location">繁</a></li>
144 </ul> 146 </ul>
145 </div> 147 </div>
146 148