|
|
@@ -171,11 +171,11 @@ export default {
|
|
|
self.$store.commit('setFamilyId', data.familyId)
|
|
|
uni.showToast({ title: '登录成功', icon: 'success' })
|
|
|
self.loading = false
|
|
|
- // 新用户,或存在待加入的家庭邀请(join.vue 已写入 pendingFamilyInviteCode):
|
|
|
- // 都进入个人信息完善页,填写家庭身份并提交加入申请
|
|
|
- var hasPendingFamilyInvite = !!uni.getStorageSync('pendingFamilyInviteCode')
|
|
|
- if (data.needsRoleSelect || hasPendingFamilyInvite) {
|
|
|
- uni.redirectTo({ url: '/pages/user-edit/user-edit?token=' + data.token + '&userId=' + data.userId + '&autoParent=true' })
|
|
|
+ // 注册零填写:新用户(needsRoleSelect)不再跳信息填写页,直接进首页
|
|
|
+ // 家庭邀请衔接:有 pendingFamilyInviteCode(join.vue 写入)→ 直接进 join-form 填真实姓名+家庭身份
|
|
|
+ var pendingInvite = uni.getStorageSync('pendingFamilyInviteCode')
|
|
|
+ if (pendingInvite) {
|
|
|
+ uni.redirectTo({ url: '/pages/invite/join-form?familyInviteCode=' + encodeURIComponent(pendingInvite) })
|
|
|
} else {
|
|
|
self.handlePostLoginRouting()
|
|
|
}
|