Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop

@@ -12,20 +12,7 @@
         {{^}}
             <div id="mainCart" class="shopping-cart-page yoho-page">
 
-            {{#if cartNav}}
-            <ul class="cart-nav clearfix">
-                <li class="active">
-                                <span>
-                                    普通商品({{commonGoodsCount}})
-                                </span>
-                </li>
-                <li>
-                                <span>
-                                    预售商品({{presellGoodsCount}})
-                                </span>
-                </li>
-            </ul>
-            {{/if}}
+
 
             {{#if showLoginInfo}}
             <p class="login-info">
@@ -34,6 +21,21 @@
                 <a class="btn btn-login" href="{{signurl}}">登录</a>
                 可以同步电脑和手机中的商品
             </p>
+            {{^}}
+                {{#if cartNav}}
+                <ul class="cart-nav clearfix">
+                    <li class="active">
+                                    <span>
+                                        普通商品({{commonGoodsCount}})
+                                    </span>
+                    </li>
+                    <li>
+                                    <span>
+                                        预售商品({{presellGoodsCount}})
+                                    </span>
+                    </li>
+                </ul>
+                {{/if}}
             {{/if}}
 
             {{# commonCart}}