修复背景:
账号注销成功后, 用户被重定向到 native 登录页 (手机号+验证码表单风格, 像 H5),
而不是微信小程序原生授权登录 (ns-login 弹窗 + getPhoneNumber 授权).
此外, 微信小程序下短时间内连发 reLaunch 会触发 native 错误:
appLaunch with non-empty page stack
以及历史遗留的 navigateTo push 登录页 + 旧页面在栈中导致的死循环问题.
主要修复:
1. util.js redirectTo reLaunch 分支 (4 平台兼容):
- H5 平台: window.location.replace (真正清空 history, 避免 history.back + router.replace 假清栈)
- 小程序平台 (mp-weixin/mp-harmony/...): 加 300ms 全局跳转锁 + setTimeout(0) 包裹
解决 appLaunch with non-empty page stack 错误
- APP/其他: 保留原生 uni.reLaunch
2. util.js redirectTo 入口智能默认 (跨平台兜底):
- 目标 == LOGIN_PAGE_URL && mode 是默认 navigateTo && 没传 back 参数
→ 自动改成 reLaunch (避免注销后死循环)
- 显式传 mode 或带 back 参数的场景保持原行为 (不影响登录后回原页面)
3. member-public.js mixin 增强:
- getLoginEntryUrl(): 跨平台登录入口智能分流
微信小程序/鸿蒙/其他小程序 → INDEX_PAGE_URL (首页, 走 ns-login 原生授权弹窗)
H5/快应用/APP → LOGIN_PAGE_URL (原生登录页)
- redirectToLoginOnce(): 统一封装 clearLoginState + 跳登录入口, 带 800ms 组件级防抖锁
- logout / getCancelStatus 兜底 / submitCancelApply 三个地方都改用 redirectToLoginOnce()
4. 5 个注销/退出流程页面改造:
- cancelsuccess.vue / cancelstatus.vue / cancellation.vue / cancelrefuse.vue
/ assets.vue: 跳登录入口全部用 redirectToLoginOnce (不再直接 redirectTo(LOGIN_PAGE_URL))
- cancellation.vue / cancelrefuse.vue: 加 memberPublic mixin (原本没有)
5. 取消了在 pages/index/public/js/index.js 中 onShow 自动弹登录弹窗的尝试
(因触发 Vue 框架的 dataset of null pre-existing 错误, 改由其他途径处理)
测试覆盖 (300+ 测试用例全部通过):
- tests/member-cancel-flow.test.js (28 个测试, 9 个用户故事场景)
- tests/redirectTo-relaunch-h5.test.js (11 个测试, 9 个跨平台场景)
- tests/redirectTo-real.test.js (12 个)
- tests/util.test.js (30 个)
- 其他 8 个测试文件全部通过
139 lines
3.2 KiB
Vue
139 lines
3.2 KiB
Vue
<template>
|
|
<view class="container" :style="themeColor">
|
|
<view class="agreement-box">
|
|
<view class="agreement-intro">
|
|
<view class="align-center agreement-title">{{ agreement.title }}</view>
|
|
<rich-text class="agreement-content" :nodes="agreement.content"></rich-text>
|
|
</view>
|
|
|
|
<view class="agreement-btn">
|
|
<view class="align-center agreement-btn-select">
|
|
<text v-if="isSelect" class="iconfont icon-dui color-base-text" @click="changeSelect"></text>
|
|
<text v-else class="iconfont icon-yuan_checkbox" @click="changeSelect"></text>
|
|
<text class="agreement-text" @click="changeSelect">{{ $lang('member.cancellation.agreeTermsText') }}</text>
|
|
</view>
|
|
<button class="btn color-base-bg" @click="next">{{ $lang('member.cancellation.nextStep') }}</button>
|
|
</view>
|
|
</view>
|
|
</view>
|
|
</template>
|
|
|
|
<script>
|
|
import htmlParser from '@/common/js/html-parser';
|
|
import memberPublic from './public/js/member-public.js';
|
|
|
|
export default {
|
|
mixins: [memberPublic],
|
|
data() {
|
|
return {
|
|
agreement: {},
|
|
isSelect: false
|
|
};
|
|
},
|
|
onLoad(option) {
|
|
if (option.back) this.back = option.back;
|
|
// 判断登录
|
|
if (!this.storeToken) {
|
|
// 跳登录入口 (mixin 提供, 内部带 800ms 防抖锁 + 跨平台分流:
|
|
// 微信小程序 / 鸿蒙下跳首页 INDEX_PAGE_URL, 走 ns-login 原生授权弹窗;
|
|
// H5 / APP 下跳原生登录页 LOGIN_PAGE_URL)
|
|
this.redirectToLoginOnce();
|
|
} else {
|
|
this.getCancelAgreement();
|
|
}
|
|
},
|
|
methods: {
|
|
getCancelAgreement() {
|
|
this.$api.sendRequest({
|
|
url: '/membercancel/api/membercancel/agreement',
|
|
success: res => {
|
|
if (res.code >= 0) {
|
|
this.agreement = res.data;
|
|
if (this.agreement.content) this.agreement.content = htmlParser(this.agreement.content);
|
|
} else if (res.code == -1) {
|
|
// 跳登录入口 (mixin 提供, 内部带 800ms 防抖锁 + 跨平台分流)
|
|
this.redirectToLoginOnce();
|
|
}
|
|
}
|
|
});
|
|
},
|
|
changeSelect() {
|
|
this.isSelect = this.isSelect == true ? false : true;
|
|
},
|
|
next() {
|
|
if (this.isSelect) {
|
|
this.$util.redirectTo('/pages_tool/member/assets');
|
|
} else {
|
|
this.$util.showToast({
|
|
title: this.$lang('member.cancellation.pleaseAgreeFirst')
|
|
});
|
|
}
|
|
}
|
|
}
|
|
};
|
|
</script>
|
|
|
|
<style lang="scss" scoped>
|
|
.agreement-box {
|
|
.align-center {
|
|
text-align: center;
|
|
}
|
|
|
|
.agreement-intro {
|
|
height: calc(100vh - 210rpx);
|
|
padding-top: 40rpx;
|
|
padding-left: 40rpx;
|
|
padding-right: 40rpx;
|
|
box-sizing: border-box;
|
|
overflow-y: auto;
|
|
|
|
.agreement-title {
|
|
font-size: 32rpx;
|
|
line-height: 60rpx;
|
|
margin-bottom: 10rpx;
|
|
}
|
|
|
|
.agreement-content {
|
|
font-size: 24rpx;
|
|
line-height: 44rpx;
|
|
}
|
|
}
|
|
|
|
.agreement-btn {
|
|
position: fixed;
|
|
width: 100%;
|
|
height: 210rpx;
|
|
bottom: 0;
|
|
padding-top: 16rpx;
|
|
box-sizing: border-box;
|
|
text-align: center;
|
|
|
|
.agreement-btn-select {
|
|
display: flex;
|
|
justify-content: center;
|
|
align-items: center;
|
|
}
|
|
|
|
.agreement-btn-select .iconfont {
|
|
color: #838383;
|
|
}
|
|
|
|
.agreement-text {
|
|
font-size: 28rpx;
|
|
color: #838383;
|
|
margin-left: 10rpx;
|
|
}
|
|
|
|
button {
|
|
display: inline-block;
|
|
margin-top: 20rpx;
|
|
color: var(--btn-text-color);
|
|
font-size: 28rpx;
|
|
width: 300rpx;
|
|
height: 80rpx;
|
|
line-height: 80rpx;
|
|
}
|
|
}
|
|
}
|
|
</style>
|