Compare commits
6 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 533170f0a9 | |||
| b1924e2623 | |||
| e12663052f | |||
| 842defea21 | |||
| d392ff98b7 | |||
| 18870f3e7d |
+1
-1
@@ -3,7 +3,7 @@
|
||||
*/
|
||||
const prod = {
|
||||
// 业务 API 地址(vms-api)
|
||||
apiBaseUrl: 'http://101.200.86.98:4000',
|
||||
apiBaseUrl: 'https://vmsapi.arklinksmart.cn',
|
||||
|
||||
// 网关地址(vms-gateway)— 用户授权、短信等接口走网关
|
||||
apiGatewayUrl: 'https://gateway.arklinksmart.cn',
|
||||
|
||||
+12
-10
@@ -181,7 +181,7 @@ export default {
|
||||
loading: false,
|
||||
categoryList: [],
|
||||
activeCategory: 'all',
|
||||
userInfo: { nickname: '', phone: '', avatar: '' },
|
||||
userInfo: { user_id: '', nickname: '', phone: '', avatar: '' },
|
||||
avatarClickCount: 0,
|
||||
avatarClickTimer: null,
|
||||
fromPage: '', // 记录从哪个页面跳转过来的
|
||||
@@ -199,8 +199,7 @@ export default {
|
||||
},
|
||||
computed: {
|
||||
userId() {
|
||||
const info = getCachedUserInfo();
|
||||
return (info && info.user_id) || '';
|
||||
return this.userInfo.user_id || '';
|
||||
},
|
||||
canGoBack() {
|
||||
// 有上一页,或者从 tab 切换过来的,都可以返回
|
||||
@@ -304,7 +303,7 @@ export default {
|
||||
if (cached) {
|
||||
this.userInfo = { ...this.userInfo, ...cached };
|
||||
} else {
|
||||
this.userInfo = { nickname: '', phone: '', avatar: '' };
|
||||
this.userInfo = { user_id: '', nickname: '', phone: '', avatar: '' };
|
||||
}
|
||||
console.log('[index] this.userInfo:', JSON.stringify(this.userInfo, null, 2));
|
||||
},
|
||||
@@ -317,6 +316,7 @@ export default {
|
||||
this.userInfo = { ...this.userInfo, ...cached };
|
||||
} else {
|
||||
this.userInfo = {
|
||||
user_id: config.mockUser.user_info.user_id || '',
|
||||
nickname: config.mockUser.user_info.nickname || '',
|
||||
phone: config.mockUser.user_info.phone || '',
|
||||
avatar: config.mockUser.user_info.avatar || '',
|
||||
@@ -415,16 +415,18 @@ export default {
|
||||
// 检查用户信息,若缓存中没有则调接口获取
|
||||
if (!this.userId) {
|
||||
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 || {};
|
||||
if (infoData.user_id) {
|
||||
const userInfo = infoData.user_info || {};
|
||||
if (userInfo.user_id) {
|
||||
const existing = getCachedUserInfo() || {};
|
||||
uni.setStorageSync('user_info', {
|
||||
...existing,
|
||||
user_id: infoData.user_id,
|
||||
nickname: infoData.nickname || existing.nickname || '',
|
||||
avatar: infoData.avatar || existing.avatar || '',
|
||||
phone: infoData.phone || existing.phone || '',
|
||||
user_id: userInfo.user_id,
|
||||
nickname: userInfo.nickname || existing.nickname || '',
|
||||
avatar: userInfo.avatar || existing.avatar || '',
|
||||
phone: userInfo.phone || existing.phone || '',
|
||||
});
|
||||
this.loadUserInfo();
|
||||
}
|
||||
|
||||
@@ -183,23 +183,32 @@ export default {
|
||||
});
|
||||
|
||||
const ret = res.data || {};
|
||||
console.log('[register] 注册响应:', JSON.stringify(ret, null, 2));
|
||||
|
||||
if (ret.code === 0 && ret.data) {
|
||||
// 保存 token
|
||||
uni.setStorageSync('token', ret.data.token);
|
||||
|
||||
// Mock 模式下,合并真实注册信息和 mock 配置
|
||||
// 存储 user_info(接口返回 user_info.user_id 和 phone)
|
||||
const existing = uni.getStorageSync('user_info') || {};
|
||||
const apiUserInfo = ret.data.user_info || {};
|
||||
const userInfo = {
|
||||
user_id: apiUserInfo.user_id || existing.user_id || '',
|
||||
phone: apiUserInfo.phone || this.phone || existing.phone || '',
|
||||
nickname: existing.nickname || '',
|
||||
avatar: existing.avatar || '',
|
||||
};
|
||||
|
||||
// Mock 模式下补充 mock 数据
|
||||
if (config.mockWechatLogin) {
|
||||
const mockInfo = config.mockUser.user_info;
|
||||
const userInfo = {
|
||||
user_id: ret.data.user_id || mockInfo.user_id,
|
||||
phone: this.phone, // 使用真实注册的手机号
|
||||
nickname: mockInfo.nickname,
|
||||
avatar: mockInfo.avatar,
|
||||
};
|
||||
uni.setStorageSync('user_info', userInfo);
|
||||
console.log('[register] Mock 模式,合并用户信息:', userInfo);
|
||||
userInfo.nickname = userInfo.nickname || mockInfo.nickname;
|
||||
userInfo.avatar = userInfo.avatar || mockInfo.avatar;
|
||||
}
|
||||
|
||||
uni.setStorageSync('user_info', userInfo);
|
||||
console.log('[register] 存储 user_info:', userInfo);
|
||||
|
||||
// 清除临时数据
|
||||
uni.removeStorageSync('temp_token');
|
||||
uni.removeStorageSync('auth_info');
|
||||
|
||||
Reference in New Issue
Block a user