|
@@ -172,29 +172,15 @@ Page({
|
|
|
await this.onAddress(this.data.formData);
|
|
await this.onAddress(this.data.formData);
|
|
|
}
|
|
}
|
|
|
this.setData({ saving: false });
|
|
this.setData({ saving: false });
|
|
|
- // if (this.data.type === "orderDetail") {
|
|
|
|
|
- // // 订单详情页
|
|
|
|
|
- // wx.redirectTo({
|
|
|
|
|
- // url: "/module/article/pages/order-detail/order-detail",
|
|
|
|
|
- // });
|
|
|
|
|
- // } else if (this.data.type === "orderList") {
|
|
|
|
|
- // // 订单列表页
|
|
|
|
|
- // wx.redirectTo({
|
|
|
|
|
- // url: "/module/article/pages/order-list/order-list",
|
|
|
|
|
- // });
|
|
|
|
|
- // }
|
|
|
|
|
- // 返回上一页
|
|
|
|
|
|
|
+ // 返回上一页(避免 redirectTo 造成 manage-address 重复入栈)
|
|
|
const pages = getCurrentPages();
|
|
const pages = getCurrentPages();
|
|
|
if (pages.length > 1) {
|
|
if (pages.length > 1) {
|
|
|
- const prevPage = pages[pages.length - 2];
|
|
|
|
|
- if (
|
|
|
|
|
- prevPage.route ===
|
|
|
|
|
- "module/article/pages/manage-address/manage-address"
|
|
|
|
|
- ) {
|
|
|
|
|
- wx.redirectTo({
|
|
|
|
|
- url: "/module/article/pages/manage-address/manage-address",
|
|
|
|
|
- });
|
|
|
|
|
- }
|
|
|
|
|
|
|
+ wx.navigateBack();
|
|
|
|
|
+ } else {
|
|
|
|
|
+ // 极端情况下没有上一页(比如被 reLaunch 打开),兜底回地址管理
|
|
|
|
|
+ wx.redirectTo({
|
|
|
|
|
+ url: "/module/article/pages/manage-address/manage-address",
|
|
|
|
|
+ });
|
|
|
}
|
|
}
|
|
|
// 保存成功后可自动跳转或提示
|
|
// 保存成功后可自动跳转或提示
|
|
|
} catch (error: any) {
|
|
} catch (error: any) {
|