Authored by 郭成尧

Merge branch 'develop' of git.yoho.cn:fe/yohoblk-wap into develop

... ... @@ -28,7 +28,7 @@ const component = {
page: 'index',
noLocalCSS: true,
head_ico: proData && proData.head_ico ? helpers.image(proData.head_ico, 200, 200) : '',
nickname: proData ? proData.nickname : '登录/注册'
nickname: Object.keys(proData).length ? proData.nickname : '登录/注册'
};
res.render('index', Object.assign(result, data[1]));
... ... @@ -41,7 +41,6 @@ const component = {
var gender = '';
data = data || {};
if (data.gender === '1') {
gender = 'men';
} else if (data.gender === '2') {
... ...
... ... @@ -12,7 +12,7 @@ const helpers = global.yoho.helpers;
*/
const _getUserProfileData = exports.getUserProfileData = (uid) => {
if (!uid) {
return;
return Promise.resolve({});
}
return api.get('', {
... ... @@ -33,7 +33,7 @@ const _getUserProfileData = exports.getUserProfileData = (uid) => {
*/
const _getInfoNumData = (uid) => {
if (!uid) {
return;
return Promise.resolve({});
}
return api.all([api.get('', {
... ...