Merge branch 'develop' of git.dev.yoho.cn:web/yohobuy into develop
Showing
7 changed files
with
28 additions
and
15 deletions
| @@ -6,14 +6,17 @@ | @@ -6,14 +6,17 @@ | ||
| 6 | var $ = require('jquery'); | 6 | var $ = require('jquery'); |
| 7 | var $userAvatar = $('.user-avatar'), | 7 | var $userAvatar = $('.user-avatar'), |
| 8 | $listItem = $('.list-item'); | 8 | $listItem = $('.list-item'); |
| 9 | -var myImage = new Image(); | 9 | +var myImage = new Image(), |
| 10 | + avatar; | ||
| 10 | 11 | ||
| 11 | require('../product/recommend-for-you.js'); | 12 | require('../product/recommend-for-you.js'); |
| 12 | require('../product/suspend-cart.js'); | 13 | require('../product/suspend-cart.js'); |
| 13 | 14 | ||
| 14 | -myImage.src = $userAvatar.attr('src'); | ||
| 15 | -myImage.onerror = function() { | ||
| 16 | - $userAvatar.attr('src', 'http://static.dev.yohobuy.com/img/me/index/user-avatar.png'); | 15 | +// 部分老用户没有头像，显示默认头像 |
| 16 | +avatar = $userAvatar.data('avatar'); | ||
| 17 | +myImage.src = avatar; | ||
| 18 | +myImage.onload = function() { | ||
| 19 | + $userAvatar.css('background-image', 'url(' + avatar + ')'); | ||
| 17 | }; | 20 | }; |
| 18 | 21 | ||
| 19 | $('.yoho-page').on('touchstart', '.list-item, .type-item', function() { | 22 | $('.yoho-page').on('touchstart', '.list-item, .type-item', function() { |
| @@ -5,9 +5,12 @@ | @@ -5,9 +5,12 @@ | ||
| 5 | */ | 5 | */ |
| 6 | var $ = require('jquery'); | 6 | var $ = require('jquery'); |
| 7 | var $userAvatar = $('.user-avatar'); | 7 | var $userAvatar = $('.user-avatar'); |
| 8 | -var myImage = new Image(); | 8 | +var myImage = new Image(), |
| 9 | + avatar; | ||
| 9 | 10 | ||
| 10 | -myImage.src = $userAvatar.attr('src'); | ||
| 11 | -myImage.onerror = function() { | ||
| 12 | - $userAvatar.attr('src', 'http://static.dev.yohobuy.com/img/me/index/user-avatar.png'); | 11 | +// 部分老用户没有头像，显示默认头像 |
| 12 | +avatar = $userAvatar.data('avatar'); | ||
| 13 | +myImage.src = avatar; | ||
| 14 | +myImage.onload = function() { | ||
| 15 | + $userAvatar.css('background-image', 'url(' + avatar + ')'); | ||
| 13 | }; | 16 | }; |
| @@ -25,6 +25,8 @@ | @@ -25,6 +25,8 @@ | ||
| 25 | height: pxToRem(126px); | 25 | height: pxToRem(126px); |
| 26 | border-radius: 50%; | 26 | border-radius: 50%; |
| 27 | border: pxToRem(6px) solid #a7a8a9; | 27 | border: pxToRem(6px) solid #a7a8a9; |
| 28 | + background-image: image-url("me/index/user-avatar.png"); | ||
| 29 | + background-size: 100%; | ||
| 28 | } | 30 | } |
| 29 | 31 | ||
| 30 | .username { | 32 | .username { |
| @@ -17,6 +17,14 @@ | @@ -17,6 +17,14 @@ | ||
| 17 | } | 17 | } |
| 18 | height: 80rem / $pxConvertRem; | 18 | height: 80rem / $pxConvertRem; |
| 19 | border-bottom: 1px solid #e0e0e0; | 19 | border-bottom: 1px solid #e0e0e0; |
| 20 | + | ||
| 21 | + .user-avatar { | ||
| 22 | + width: 100%; | ||
| 23 | + height: 100%; | ||
| 24 | + background-image: image-url("me/index/user-avatar.png"); | ||
| 25 | + background-size: 100%; | ||
| 26 | + } | ||
| 27 | + | ||
| 20 | span{ | 28 | span{ |
| 21 | &:first-of-type{ | 29 | &:first-of-type{ |
| 22 | color: #444; | 30 | color: #444; |
| @@ -45,20 +45,17 @@ | @@ -45,20 +45,17 @@ | ||
| 45 | line-height: 1; | 45 | line-height: 1; |
| 46 | 46 | ||
| 47 | span { | 47 | span { |
| 48 | - display: block; | 48 | + display: inline-block; |
| 49 | // chrome 最小支持12px, 设计图是 10px ,用CSS3变换 | 49 | // chrome 最小支持12px, 设计图是 10px ,用CSS3变换 |
| 50 | @include transform(scale(0.875)); | 50 | @include transform(scale(0.875)); |
| 51 | } | 51 | } |
| 52 | 52 | ||
| 53 | .sale-price { | 53 | .sale-price { |
| 54 | color: #d9134f; | 54 | color: #d9134f; |
| 55 | - margin-left: pxToRem(-10px); | 55 | + margin-right: pxToRem(8px); |
| 56 | } | 56 | } |
| 57 | 57 | ||
| 58 | .old-price { | 58 | .old-price { |
| 59 | - position: absolute; | ||
| 60 | - top: 0; | ||
| 61 | - right: pxToRem(-4px); | ||
| 62 | color: #b0b0b0; | 59 | color: #b0b0b0; |
| 63 | text-decoration: line-through; | 60 | text-decoration: line-through; |
| 64 | } | 61 | } |
| @@ -3,7 +3,7 @@ | @@ -3,7 +3,7 @@ | ||
| 3 | <div class="my-header"> | 3 | <div class="my-header"> |
| 4 | {{#isLogin}} | 4 | {{#isLogin}} |
| 5 | <a class="user-info" href="/home/mydetails"> | 5 | <a class="user-info" href="/home/mydetails"> |
| 6 | - <img class="user-avatar" src="{{head_ico}}"> | 6 | + <span class="user-avatar" data-avatar="{{head_ico}}"></span> |
| 7 | <span class="username">{{profile_name}}</span> | 7 | <span class="username">{{profile_name}}</span> |
| 8 | {{#vip_info}} | 8 | {{#vip_info}} |
| 9 | <span class="vip-icon vip-{{next_level}}"></span> | 9 | <span class="vip-icon vip-{{next_level}}"></span> |
| 1 | {{> layout/header}} | 1 | {{> layout/header}} |
| 2 | <div class="personal-details"> | 2 | <div class="personal-details"> |
| 3 | <ul> | 3 | <ul> |
| 4 | - <li><span>头像</span><span><i class="head-portrait"><img class="user-avatar" src="{{ head_ico }}"></i></span></li> | 4 | + <li><span>头像</span><span><i class="head-portrait"><span class="user-avatar" data-avatar="{{ head_ico }}"></span></i></span></li> |
| 5 | <li><span>昵称</span><span>{{ username }}</span></li> | 5 | <li><span>昵称</span><span>{{ username }}</span></li> |
| 6 | <li><span>性别</span><span>{{ gender }}</span></li> | 6 | <li><span>性别</span><span>{{ gender }}</span></li> |
| 7 | <li><span>生日</span><span>{{ birthday }}</span></li> | 7 | <li><span>生日</span><span>{{ birthday }}</span></li> |
-
Please register or login to post a comment