Commit f552f3035a45eca312306bed8c4490781b76a5a7
1 parent
1be24b58
[年会抽奖]调试头像尺寸
Showing
1 changed file
with
4 additions
and
55 deletions
mobile.js
... | ... | @@ -107,7 +107,7 @@ var action = { |
107 | 107 | if (action.userInfo) { |
108 | 108 | var userAvatar = action.userAvatar || defaultAvatar; |
109 | 109 | $('#home_user_avatar').attr('src', userAvatar); |
110 | - action.loadImage('.user-avatar .avatar-img', userAvatar); | |
110 | + action.loadImage('.user-avatar .avatar-img', '.user-avatar .avatar-img-wrap'); | |
111 | 111 | $('#home_user_name').html(action.userInfo.realname); |
112 | 112 | $('#home_prize_no').html(action.userInfo.prize_no); |
113 | 113 | $('#home_table_no').html(action.userInfo.table_no); |
... | ... | @@ -145,7 +145,7 @@ var action = { |
145 | 145 | isShowProgressTips: 1, // 进度提示 |
146 | 146 | success: function(res) { |
147 | 147 | $('.pic-avatar').attr('src', localIds); |
148 | - action.loadImage('.pic-avatar', localIds); | |
148 | + action.loadImage('.pic-avatar', '.pic-avatar-wrap'); | |
149 | 149 | action.mediaId = res.serverId; // 返回图片的服务器端ID,即 mediaId |
150 | 150 | console.log('action.mediaId: ', action.mediaId); |
151 | 151 | $('#upload_unavailable').hide(); |
... | ... | @@ -165,10 +165,8 @@ var action = { |
165 | 165 | } |
166 | 166 | }); |
167 | 167 | }, |
168 | - loadImage: function(dom, src) { | |
169 | - var width = $(dom).width(); | |
170 | - var img = new Image(); | |
171 | - img.src = src; // 改变图片的src | |
168 | + loadImage: function(dom, parent) { | |
169 | + var width = $(parent).width(); | |
172 | 170 | $(dom).on('load', function() { |
173 | 171 | var imgWidth = $(dom).width(); |
174 | 172 | var imgHeight = $(dom).height(); |
... | ... | @@ -201,55 +199,6 @@ var action = { |
201 | 199 | }); |
202 | 200 | } |
203 | 201 | }); |
204 | - if (img.complete) { // 判断是否有缓存 | |
205 | - console.log('img complete'); | |
206 | - console.log('width: ', width); | |
207 | - console.log('img-width: ' + img.width, 'img-height: ' + img.height); | |
208 | - var ratio = img.width / img.height; | |
209 | - if (ratio > 1) { | |
210 | - img.height = width; | |
211 | - img.width = width * ratio; | |
212 | - var margin = (img.width - width) / 2; | |
213 | - $(dom).css({ | |
214 | - 'margin-left': -margin + 'px' | |
215 | - }); | |
216 | - } else if (ratio < 1) { | |
217 | - img.width = width; | |
218 | - img.height = width / ratio; | |
219 | - var margin = (img.height - width) / 2; | |
220 | - $(dom).css({ | |
221 | - 'margin-top': -margin + 'px' | |
222 | - }); | |
223 | - } else { | |
224 | - img.width = width; | |
225 | - img.height = width; | |
226 | - } | |
227 | - } else { | |
228 | - img.onload = function() { | |
229 | - console.log('img onload'); | |
230 | - console.log('width: ', width); | |
231 | - console.log('img-width: ' + img.width, 'img-height: ' + img.height); | |
232 | - var ratio = img.width / img.height; | |
233 | - if (ratio > 1) { | |
234 | - img.height = width; | |
235 | - img.width = width * ratio; | |
236 | - var margin = (img.width - width) / 2; | |
237 | - $(dom).css({ | |
238 | - 'margin-left': -margin + 'px' | |
239 | - }); | |
240 | - } else if (ratio < 1) { | |
241 | - img.width = width; | |
242 | - img.height = width / ratio; | |
243 | - var margin = (img.height - width) / 2; | |
244 | - $(dom).css({ | |
245 | - 'margin-top': -margin + 'px' | |
246 | - }); | |
247 | - } else { | |
248 | - img.width = width; | |
249 | - img.height = width; | |
250 | - } | |
251 | - } | |
252 | - } | |
253 | 202 | }, |
254 | 203 | // 上传头像 |
255 | 204 | uploadImage: function() { | ... | ... |