Merge branch 'fix/cart' into 'develop'
购物车页面，未登录时，不显示普通商品／预售商品 选项 See merge request !45
Showing
1 changed file
with
16 additions
and
14 deletions
| @@ -12,20 +12,7 @@ | @@ -12,20 +12,7 @@ | ||
| 12 | {{^}} | 12 | {{^}} |
| 13 | <div id="mainCart" class="shopping-cart-page yoho-page"> | 13 | <div id="mainCart" class="shopping-cart-page yoho-page"> |
| 14 | 14 | ||
| 15 | - {{#if cartNav}} | ||
| 16 | - <ul class="cart-nav clearfix"> | ||
| 17 | - <li class="active"> | ||
| 18 | - <span> | ||
| 19 | - 普通商品({{commonGoodsCount}}) | ||
| 20 | - </span> | ||
| 21 | - </li> | ||
| 22 | - <li> | ||
| 23 | - <span> | ||
| 24 | - 预售商品({{presellGoodsCount}}) | ||
| 25 | - </span> | ||
| 26 | - </li> | ||
| 27 | - </ul> | ||
| 28 | - {{/if}} | 15 | + |
| 29 | 16 | ||
| 30 | {{#if showLoginInfo}} | 17 | {{#if showLoginInfo}} |
| 31 | <p class="login-info"> | 18 | <p class="login-info"> |
| @@ -34,6 +21,21 @@ | @@ -34,6 +21,21 @@ | ||
| 34 | <a class="btn btn-login" href="{{signurl}}">登录</a> | 21 | <a class="btn btn-login" href="{{signurl}}">登录</a> |
| 35 | 可以同步电脑和手机中的商品 | 22 | 可以同步电脑和手机中的商品 |
| 36 | </p> | 23 | </p> |
| 24 | + {{^}} | ||
| 25 | + {{#if cartNav}} | ||
| 26 | + <ul class="cart-nav clearfix"> | ||
| 27 | + <li class="active"> | ||
| 28 | + <span> | ||
| 29 | + 普通商品({{commonGoodsCount}}) | ||
| 30 | + </span> | ||
| 31 | + </li> | ||
| 32 | + <li> | ||
| 33 | + <span> | ||
| 34 | + 预售商品({{presellGoodsCount}}) | ||
| 35 | + </span> | ||
| 36 | + </li> | ||
| 37 | + </ul> | ||
| 38 | + {{/if}} | ||
| 37 | {{/if}} | 39 | {{/if}} |
| 38 | 40 | ||
| 39 | {{# commonCart}} | 41 | {{# commonCart}} |
-
Please register or login to post a comment