fe / yohobuywap-node · Commits

Go to a project

Authored by 郭成尧
Commit 799390e1ca3ddbab5ff0318dfbbc703011ecef9f 2 parents 7f3af1fa 07210518

Merge branch 'release/6.0.2' of git.yoho.cn:fe/yohobuywap-node into release/6.0.2

Inline Side-by-side
Showing 2 changed files with 2 additions and 2 deletions
... ... @@ -256,7 +256,7 @@ module.exports = class extends global.yoho.BaseModel {
result[0].data.gender = (result[0].data.gender === '1' ? '男' : '女');
result[0].data.qrcodeLink = helpers.urlFormat('/home/user/qrcode', {
token: _.get(result[0], 'data.uid', null) ?
crypto.encryption('yoho9646yoho9646', _.get(result, 'data.uid', null) + '') : '',
crypto.encryption('yoho9646yoho9646', _.get(result[0], 'data.uid', null) + '') : '',
icon: _.get(result[0], 'data.head_ico', ''),
uname: _.get(result[0], 'data.nickname', ''),
vip: _.get(result[0], 'data.vip_info.cur_level')
... ...
... ... @@ -587,7 +587,7 @@ function search(opt) {
});
}
if (data === '' || (data.list && data.list.length <= 0)) {
if (data === '' || (data.list && data.list.length <= 0) || data.length === 0) {
nav.end = true;
if (nav.reload && !firstScreen) {
if (data.total === 0) {
... ...