Compare commits
2 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| b1924e2623 | |||
| e12663052f |
@@ -181,7 +181,7 @@ export default {
|
|||||||
loading: false,
|
loading: false,
|
||||||
categoryList: [],
|
categoryList: [],
|
||||||
activeCategory: 'all',
|
activeCategory: 'all',
|
||||||
userInfo: { nickname: '', phone: '', avatar: '' },
|
userInfo: { user_id: '', nickname: '', phone: '', avatar: '' },
|
||||||
avatarClickCount: 0,
|
avatarClickCount: 0,
|
||||||
avatarClickTimer: null,
|
avatarClickTimer: null,
|
||||||
fromPage: '', // 记录从哪个页面跳转过来的
|
fromPage: '', // 记录从哪个页面跳转过来的
|
||||||
@@ -199,8 +199,7 @@ export default {
|
|||||||
},
|
},
|
||||||
computed: {
|
computed: {
|
||||||
userId() {
|
userId() {
|
||||||
const info = getCachedUserInfo();
|
return this.userInfo.user_id || '';
|
||||||
return (info && info.user_id) || '';
|
|
||||||
},
|
},
|
||||||
canGoBack() {
|
canGoBack() {
|
||||||
// 有上一页,或者从 tab 切换过来的,都可以返回
|
// 有上一页,或者从 tab 切换过来的,都可以返回
|
||||||
@@ -304,7 +303,7 @@ export default {
|
|||||||
if (cached) {
|
if (cached) {
|
||||||
this.userInfo = { ...this.userInfo, ...cached };
|
this.userInfo = { ...this.userInfo, ...cached };
|
||||||
} else {
|
} else {
|
||||||
this.userInfo = { nickname: '', phone: '', avatar: '' };
|
this.userInfo = { user_id: '', nickname: '', phone: '', avatar: '' };
|
||||||
}
|
}
|
||||||
console.log('[index] this.userInfo:', JSON.stringify(this.userInfo, null, 2));
|
console.log('[index] this.userInfo:', JSON.stringify(this.userInfo, null, 2));
|
||||||
},
|
},
|
||||||
@@ -317,6 +316,7 @@ export default {
|
|||||||
this.userInfo = { ...this.userInfo, ...cached };
|
this.userInfo = { ...this.userInfo, ...cached };
|
||||||
} else {
|
} else {
|
||||||
this.userInfo = {
|
this.userInfo = {
|
||||||
|
user_id: config.mockUser.user_info.user_id || '',
|
||||||
nickname: config.mockUser.user_info.nickname || '',
|
nickname: config.mockUser.user_info.nickname || '',
|
||||||
phone: config.mockUser.user_info.phone || '',
|
phone: config.mockUser.user_info.phone || '',
|
||||||
avatar: config.mockUser.user_info.avatar || '',
|
avatar: config.mockUser.user_info.avatar || '',
|
||||||
@@ -415,7 +415,8 @@ export default {
|
|||||||
// 检查用户信息,若缓存中没有则调接口获取
|
// 检查用户信息,若缓存中没有则调接口获取
|
||||||
if (!this.userId) {
|
if (!this.userId) {
|
||||||
try {
|
try {
|
||||||
const infoRes = await gatewayGet('/api/v1/user/info', {});
|
const openId = uni.getStorageSync('openid') || '';
|
||||||
|
const infoRes = await gatewayGet('/api/v1/user/info', { open_id: openId });
|
||||||
const infoData = (infoRes.data || {}).data || {};
|
const infoData = (infoRes.data || {}).data || {};
|
||||||
if (infoData.user_id) {
|
if (infoData.user_id) {
|
||||||
const existing = getCachedUserInfo() || {};
|
const existing = getCachedUserInfo() || {};
|
||||||
|
|||||||
Reference in New Issue
Block a user