sileya-ai
/
vr-shopxo-source
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

用户中心用户名丢失修复

feat/task1-c-wallet
Devil 2020-12-06 13:28:34 +08:00
parent 4f24373054
commit 238d5346ed
7 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
application/api/controller/User.php
View File

@ -537,6 +537,7 @@ class User extends Common
'avatar' => $this->user['avatar'],
'nickname' => $this->user['nickname'],
'username' => $this->user['username'],
'user_name_view' => $this->user['user_name_view'],
'user_order_status' => $user_order_status['data'],
'user_order_count' => $user_order_count,
'user_goods_favor_count' => $user_goods_favor_count,

6
sourcecode/alipay/default/pages/user/user.js
View File

@ -87,14 +87,14 @@ Page({
}
self.setData({
avatar: user.avatar || app.data.default_user_head_src,
nickname: user.nickname || '用户名',
nickname: user.user_name_view || user.nickname || '用户名',
});
},
});
} else {
self.setData({
avatar: user.avatar || app.data.default_user_head_src,
nickname: user.nickname || '用户名',
nickname: user.user_name_view || user.nickname || '用户名',
});
self.get_data();
@ -138,7 +138,7 @@ Page({
this.setData({
user_order_status_list: temp_user_order_status_list,
avatar: ((data.avatar || null) != null) ? data.avatar : ((this.data.avatar || null) == null ? app.data.default_user_head_src : this.data.avatar),
nickname: ((data.nickname || null) != null) ? data.nickname : this.data.nickname,
nickname: ((data.user_name_view || null) != null) ? data.user_name_view : this.data.nickname,
message_total: ((data.common_message_total || 0) == 0) ? 0 : data.common_message_total,
head_nav_list: temp_head_nav_list,
navigation: data.navigation || [],

6
sourcecode/baidu/default/pages/user/user.js
View File

@ -78,14 +78,14 @@ Page({
}
self.setData({
avatar: user.avatar || app.data.default_user_head_src,
nickname: user.nickname || '用户名',
nickname: user.user_name_view || user.nickname || '用户名',
});
},
});
} else {
self.setData({
avatar: user.avatar || app.data.default_user_head_src,
nickname: user.nickname || '用户名',
nickname: user.user_name_view || user.nickname || '用户名',
});
self.get_data();
@ -129,7 +129,7 @@ Page({
this.setData({
user_order_status_list: temp_user_order_status_list,
avatar: (data.avatar || null) != null ? data.avatar : (this.data.avatar || null) == null ? app.data.default_user_head_src : this.data.avatar,
nickname: ((data.nickname || null) != null) ? data.nickname : this.data.nickname,
nickname: ((data.user_name_view || null) != null) ? data.user_name_view : this.data.nickname,
message_total: (data.common_message_total || 0) == 0 ? 0 : data.common_message_total,
head_nav_list: temp_head_nav_list,
navigation: data.navigation || [],

6
sourcecode/qq/default/pages/user/user.js
View File

@ -73,14 +73,14 @@ Page({
}
self.setData({
avatar: user.avatar || app.data.default_user_head_src,
nickname: user.nickname || '用户名',
nickname: user.user_name_view || user.nickname || '用户名',
});
},
});
} else {
self.setData({
avatar: user.avatar || app.data.default_user_head_src,
nickname: user.nickname || '用户名',
nickname: user.user_name_view || user.nickname || '用户名',
});
self.get_data();
@ -124,7 +124,7 @@ Page({
this.setData({
user_order_status_list: temp_user_order_status_list,
avatar: ((data.avatar || null) != null) ? data.avatar : ((this.data.avatar || null) == null ? app.data.default_user_head_src : this.data.avatar),
nickname: ((data.nickname || null) != null) ? data.nickname : this.data.nickname,
nickname: ((data.user_name_view || null) != null) ? data.user_name_view : this.data.nickname,
message_total: ((data.common_message_total || 0) == 0) ? 0 : data.common_message_total,
head_nav_list: temp_head_nav_list,
navigation: data.navigation || [],

6
sourcecode/toutiao/default/pages/user/user.js
View File

@ -73,14 +73,14 @@ Page({
}
self.setData({
avatar: user.avatar || app.data.default_user_head_src,
nickname: user.nickname || '用户名',
nickname: user.user_name_view || user.nickname || '用户名',
});
},
});
} else {
self.setData({
avatar: user.avatar || app.data.default_user_head_src,
nickname: user.nickname || '用户名',
nickname: user.user_name_view || user.nickname || '用户名',
});
self.get_data();
@ -124,7 +124,7 @@ Page({
this.setData({
user_order_status_list: temp_user_order_status_list,
avatar: ((data.avatar || null) != null) ? data.avatar : ((this.data.avatar || null) == null ? app.data.default_user_head_src : this.data.avatar),
nickname: ((data.nickname || null) != null) ? data.nickname : this.data.nickname,
nickname: ((data.user_name_view || null) != null) ? data.user_name_view : this.data.nickname,
message_total: ((data.common_message_total || 0) == 0) ? 0 : data.common_message_total,
head_nav_list: temp_head_nav_list,
navigation: data.navigation || [],

2
sourcecode/weixin/default/app.js
View File

@ -74,7 +74,7 @@ App({
// 请求地址
request_url: "{{request_url}}",
request_url: 'http://shopxo.com/',
request_url: 'https://demo.shopxo.net/',
// request_url: 'https://dev.shopxo.net/',
// 基础信息
application_title: "{{application_title}}",

6
sourcecode/weixin/default/pages/user/user.js
View File

@ -73,14 +73,14 @@ Page({
}
self.setData({
avatar: user.avatar || app.data.default_user_head_src,
nickname: user.nickname || '用户名',
nickname: user.user_name_view || user.nickname || '用户名',
});
},
});
} else {
self.setData({
avatar: user.avatar || app.data.default_user_head_src,
nickname: user.nickname || '用户名',
nickname: user.user_name_view || user.nickname || '用户名',
});
self.get_data();
@ -124,7 +124,7 @@ Page({
this.setData({
user_order_status_list: temp_user_order_status_list,
avatar: ((data.avatar || null) != null) ? data.avatar : ((this.data.avatar || null) == null ? app.data.default_user_head_src : this.data.avatar),
nickname: ((data.nickname || null) != null) ? data.nickname : this.data.nickname,
nickname: ((data.user_name_view || null) != null) ? data.user_name_view : this.data.nickname,
message_total: ((data.common_message_total || 0) == 0) ? 0 : data.common_message_total,
head_nav_list: temp_head_nav_list,
navigation: data.navigation || [],