fe / YOHOBUYPC · Commits

Go to a project

Authored by xuqi
Commit c8597c86fb497a61104ba263c3cc6a742bea4f1a 2 parents 9ae04cbf 84821671

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

Inline Side-by-side
Showing 2 changed files with 53 additions and 8 deletions
@@ -52,6 +52,19 @@ @@ -52,6 +52,19 @@
52 } 52 }
53 } 53 }
54 54
  55 + .login-btn {
  56 + display: block;
  57 + position: absolute;
  58 + top: pxToRem(40px);
  59 + left: pxToRem(194px);
  60 + width: pxToRem(244px);
  61 + height: pxToRem(82px);
  62 + line-height: pxToRem(82px);
  63 + color: #fff;
  64 + border: pxToRem(4px) solid #fff;
  65 + text-align: center;
  66 + }
  67 +
55 .my-link { 68 .my-link {
56 margin-bottom: pxToRem(30px); 69 margin-bottom: pxToRem(30px);
57 padding: pxToRem(6px) 0; 70 padding: pxToRem(6px) 0;
@@ -60,12 +73,35 @@ @@ -60,12 +73,35 @@
60 height: pxToRem(76px); 73 height: pxToRem(76px);
61 74
62 .link-item { 75 .link-item {
  76 + position: relative;
63 float: left; 77 float: left;
64 color: #fff; 78 color: #fff;
65 font-size: pxToRem(22px); 79 font-size: pxToRem(22px);
66 line-height: pxToRem(38px); 80 line-height: pxToRem(38px);
67 width: pxToRem(213px); 81 width: pxToRem(213px);
68 82
  83 + &:after {
  84 + content: '';
  85 + position: absolute;
  86 + right: 0;
  87 + top: pxToRem(24px);
  88 + width: 0;
  89 + height: pxToRem(44px);
  90 + border-right: 1px solid #fff;
  91 + }
  92 +
  93 + &:last-of-type:after {
  94 + content: none;
  95 + }
  96 + }
  97 +
  98 + &.no-login {
  99 + padding: 0;
  100 + height: pxToRem(88px);
  101 + .link-item {
  102 + font-size: pxToRem(32px);
  103 + line-height: pxToRem(88px);
  104 + }
69 } 105 }
70 } 106 }
71 107
1 {{> layout/header}} 1 {{> layout/header}}
2 <div class="my-page yoho-page"> 2 <div class="my-page yoho-page">
3 <div class="my-header"> 3 <div class="my-header">
  4 + {{#isLogin}}
4 <a class="user-info" href="/home/personaldetails"> 5 <a class="user-info" href="/home/personaldetails">
5 <img class="user-avatar" src="{{head_ico}}"> 6 <img class="user-avatar" src="{{head_ico}}">
6 <span class="username">{{profile_name}}</span> 7 <span class="username">{{profile_name}}</span>
@@ -9,18 +10,26 @@ @@ -9,18 +10,26 @@
9 {{/vip_info}} 10 {{/vip_info}}
10 <div class="iconfont more-icon">&#xe604;</div> 11 <div class="iconfont more-icon">&#xe604;</div>
11 </a> 12 </a>
  13 + {{/isLogin}}
  14 + {{^isLogin}}
  15 + <div class="user-info">
  16 + <a class="login-btn" href="http://m.dev.yohobuy.com/signin.html">
  17 + 登录/注册
  18 + </a>
  19 + </div>
  20 + {{/isLogin}}
12 </div> 21 </div>
13 - <div class="my-link clearfix"> 22 + <div class="my-link clearfix {{^isLogin}}no-login{{/isLogin}}">
14 <a class="link-item" href="/home/favorite"> 23 <a class="link-item" href="/home/favorite">
15 - {{product_favorite_total}} 24 + {{#if product_favorite_total}}{{product_favorite_total}}{{/if}}
16 <p>收藏的商品</p> 25 <p>收藏的商品</p>
17 </a> 26 </a>
18 <a class="link-item" href="/home/favorite?tab=brand"> 27 <a class="link-item" href="/home/favorite?tab=brand">
19 - {{brand_favorite_total}} 28 + {{#if brand_favorite_total}}{{brand_favorite_total}}{{/if}}
20 <p>收藏的品牌</p> 29 <p>收藏的品牌</p>
21 </a> 30 </a>
22 <a class="link-item" href="/home/"> 31 <a class="link-item" href="/home/">
23 - {{product_browse}} 32 + {{#if product_browse}}{{product_browse}}{{/if}}
24 <p>浏览记录</p> 33 <p>浏览记录</p>
25 </a> 34 </a>
26 </div> 35 </div>
@@ -50,26 +59,26 @@ @@ -50,26 +59,26 @@
50 <a class="list-item" href="/home/address"> 59 <a class="list-item" href="/home/address">
51 <span class="iconfont icon">&#xe637;</span> 60 <span class="iconfont icon">&#xe637;</span>
52 地址管理 61 地址管理
53 - <span class="iconfont num">{{address_num}} &#xe604;</span> 62 + <span class="iconfont num">{{#if address_num}}{{address_num}}{{/if}} &#xe604;</span>
54 </a> 63 </a>
55 </div> 64 </div>
56 <div class="group-list"> 65 <div class="group-list">
57 <a class="list-item" href="/home/coupons"> 66 <a class="list-item" href="/home/coupons">
58 <span class="iconfont icon">&#xe63a;</span> 67 <span class="iconfont icon">&#xe63a;</span>
59 优惠券 68 优惠券
60 - <span class="iconfont num">{{coupon_num}} &#xe604;</span> 69 + <span class="iconfont num">{{#if coupon_num}}{{coupon_num}}{{/if}} &#xe604;</span>
61 </a> 70 </a>
62 <a class="list-item" href="/home/currency"> 71 <a class="list-item" href="/home/currency">
63 <span class="iconfont icon">&#xe635;</span> 72 <span class="iconfont icon">&#xe635;</span>
64 YOHO 币 73 YOHO 币
65 - <span class="iconfont num">{{yoho_coin_num}} &#xe604;</span> 74 + <span class="iconfont num">{{#if yoho_coin_num}}{{yoho_coin_num}}{{/if}} &#xe604;</span>
66 </a> 75 </a>
67 </div> 76 </div>
68 <div class="group-list"> 77 <div class="group-list">
69 <a class="list-item" href="/home/message"> 78 <a class="list-item" href="/home/message">
70 <span class="iconfont icon">&#xe636;</span> 79 <span class="iconfont icon">&#xe636;</span>
71 消息 80 消息
72 - <span class="iconfont num">{{inbox_total}} &#xe604;</span> 81 + <span class="iconfont num">{{#if inbox_total}}{{inbox_total}}{{/if}} &#xe604;</span>
73 </a> 82 </a>
74 </div> 83 </div>
75 <div class="group-list"> 84 <div class="group-list">