wangshusheng / YOHOBUYPC · Commits

Go to a project

Authored by 毕凯
Commit a34958965aa74e220638c43ace14a3c873e8bdc5 2 parents 9f6756f3 a6996b0d

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

Inline Side-by-side
Showing 1 changed file with 10 additions and 8 deletions
@@ -12,6 +12,16 @@ @@ -12,6 +12,16 @@
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 +
  16 +
  17 + {{#if showLoginInfo}}
  18 + <p class="login-info">
  19 + <span class="iconfont">&#xe628;</span>
  20 + 请您先
  21 + <a class="btn btn-login" href="{{signurl}}">登录</a>
  22 + 可以同步电脑和手机中的商品
  23 + </p>
  24 + {{^}}
15 {{#if cartNav}} 25 {{#if cartNav}}
16 <ul class="cart-nav clearfix"> 26 <ul class="cart-nav clearfix">
17 <li class="active"> 27 <li class="active">
@@ -26,14 +36,6 @@ @@ -26,14 +36,6 @@
26 </li> 36 </li>
27 </ul> 37 </ul>
28 {{/if}} 38 {{/if}}
29 -  
30 - {{#if showLoginInfo}}  
31 - <p class="login-info">  
32 - <span class="iconfont">&#xe628;</span>  
33 - 请您先  
34 - <a class="btn btn-login" href="{{signurl}}">登录</a>  
35 - 可以同步电脑和手机中的商品  
36 - </p>  
37 {{/if}} 39 {{/if}}
38 40
39 {{# commonCart}} 41 {{# commonCart}}