From aee630b5466baf7c4edc301ab1574b32da38550f Mon Sep 17 00:00:00 2001
From: ZF sun <34314687@qq.com>
Date: Sat, 27 Jun 2026 15:08:01 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E7=BB=9F=E4=B8=80=E7=99=BB=E5=BD=95?=
=?UTF-8?q?=E8=B7=B3=E8=BD=AC=E9=80=BB=E8=BE=91=EF=BC=8C=E6=B7=BB=E5=8A=A0?=
=?UTF-8?q?redirectTo=E5=8F=82=E6=95=B0=E9=81=BF=E5=85=8D=E9=A1=B5?=
=?UTF-8?q?=E9=9D=A2=E6=A0=88=E6=BA=A2=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
1. 为所有登录跳转调用添加redirectTo跳转类型参数
2. 调整部分页面的onShow生命周期执行顺序和定时器包装
3. 补充缺失的ns-login组件引用到两个diy组件中
4. 修复部分页面登录后返回出现循环跳转的问题
---
components-diy/diy-listmenu.vue | 1 +
components-diy/diy-picture.vue | 1 +
.../_components/goods-detail-view/detail.js | 4 ++--
pages_goods/category.vue | 2 +-
pages_goods/public/js/detail.js | 6 +++---
pages_order/_components/common-payment/payment.js | 2 +-
pages_promotion/fenxiao/child_fenxiao.vue | 2 +-
pages_promotion/fenxiao/index.vue | 6 +++---
pages_promotion/fenxiao/order.vue | 2 +-
pages_promotion/fenxiao/order_detail.vue | 2 +-
pages_promotion/fenxiao/promote.vue | 2 +-
pages_promotion/fenxiao/promote_code.vue | 2 +-
pages_promotion/fenxiao/team.vue | 2 +-
pages_promotion/fenxiao/withdraw_list.vue | 2 +-
pages_promotion/merch/merchcategory.vue | 2 +-
pages_promotion/point/detail.vue | 2 +-
pages_promotion/point/list.vue | 4 ++--
pages_promotion/point/order_list.vue | 2 +-
pages_tool/form/form.vue | 2 +-
pages_tool/goods/coupon.vue | 2 +-
pages_tool/member/account.vue | 14 +++++++-------
pages_tool/member/address.vue | 7 ++++---
pages_tool/member/balance.vue | 14 +++++++-------
pages_tool/member/balance_detail.vue | 7 ++++---
pages_tool/member/bind_mobile.vue | 7 ++++---
pages_tool/member/card.vue | 2 +-
pages_tool/member/card_buy.vue | 2 +-
pages_tool/member/card_log.vue | 2 +-
pages_tool/member/coupon.vue | 12 ++++++------
pages_tool/member/invite_friends.vue | 2 +-
pages_tool/member/level.vue | 2 +-
pages_tool/member/point.vue | 10 +++++-----
pages_tool/member/public/js/common.js | 2 +-
pages_tool/member/public/js/info.js | 11 ++++++-----
pages_tool/member/public/js/signin.js | 2 +-
pages_tool/recharge/order_list.vue | 10 +++++-----
36 files changed, 81 insertions(+), 75 deletions(-)
diff --git a/components-diy/diy-listmenu.vue b/components-diy/diy-listmenu.vue
index a6e6b78..f90cd01 100644
--- a/components-diy/diy-listmenu.vue
+++ b/components-diy/diy-listmenu.vue
@@ -15,6 +15,7 @@
+
diff --git a/components-diy/diy-picture.vue b/components-diy/diy-picture.vue
index cf9aaed..ae1934d 100644
--- a/components-diy/diy-picture.vue
+++ b/components-diy/diy-picture.vue
@@ -11,6 +11,7 @@
-->
+
diff --git a/pages_goods/_components/goods-detail-view/detail.js b/pages_goods/_components/goods-detail-view/detail.js
index cddd796..b9fe092 100644
--- a/pages_goods/_components/goods-detail-view/detail.js
+++ b/pages_goods/_components/goods-detail-view/detail.js
@@ -262,9 +262,9 @@ export default {
return this.whetherCollection;
} else {
if (this.source_member) {
- this.$refs.login.open(this.shareUrl + '&source_member=' + this.source_member);
+ this.$refs.login.open(this.shareUrl + '&source_member=' + this.source_member, 'redirectTo');
} else {
- this.$refs.login.open(this.shareUrl);
+ this.$refs.login.open(this.shareUrl, 'redirectTo');
}
}
},
diff --git a/pages_goods/category.vue b/pages_goods/category.vue
index a0c1fa2..93209f8 100644
--- a/pages_goods/category.vue
+++ b/pages_goods/category.vue
@@ -83,7 +83,7 @@ export default {
});
},
toLogin() {
- this.$refs.login.open('/pages_goods/category')
+ this.$refs.login.open('/pages_goods/category', 'redirectTo');
}
},
onPullDownRefresh() {
diff --git a/pages_goods/public/js/detail.js b/pages_goods/public/js/detail.js
index dc44d68..dadf601 100644
--- a/pages_goods/public/js/detail.js
+++ b/pages_goods/public/js/detail.js
@@ -260,7 +260,7 @@ export default {
// 加入购物车
joinCart() {
if (!this.storeToken && this.preview == 0) {
- this.$refs.login.open(this.shareUrl);
+ this.$refs.login.open(this.shareUrl, 'redirectTo');
return;
}
if (this.goodsSkuDetail.is_virtual == 1) {
@@ -276,7 +276,7 @@ export default {
// 立即购买
buyNow() {
if (!this.storeToken && this.preview == 0) {
- this.$refs.login.open(this.shareUrl);
+ this.$refs.login.open(this.shareUrl, 'redirectTo');
return;
}
this.$refs.goodsSku.show("buy_now", () => {
@@ -352,7 +352,7 @@ export default {
},
});
} else {
- this.$refs.login.open(this.shareUrl);
+ this.$refs.login.open(this.shareUrl, 'redirectTo');
this.couponBtnSwitch = false;
}
},
diff --git a/pages_order/_components/common-payment/payment.js b/pages_order/_components/common-payment/payment.js
index 313a35f..c3de193 100644
--- a/pages_order/_components/common-payment/payment.js
+++ b/pages_order/_components/common-payment/payment.js
@@ -76,7 +76,7 @@ export default {
} else {
this.$nextTick(() => {
this.$refs.loadingCover.hide();
- this.$refs.login.open(this.$util.getCurrentRoute().path)
+ this.$refs.login.open(this.$util.getCurrentRoute().path, 'redirectTo');
})
}
this.getTransactionAgreement();
diff --git a/pages_promotion/fenxiao/child_fenxiao.vue b/pages_promotion/fenxiao/child_fenxiao.vue
index f543991..b076378 100644
--- a/pages_promotion/fenxiao/child_fenxiao.vue
+++ b/pages_promotion/fenxiao/child_fenxiao.vue
@@ -66,7 +66,7 @@ export default {
if (!this.storeToken) {
this.$nextTick(() => {
- this.$refs.login.open('/pages_promotion/fenxiao/childfenxiao');
+ this.$refs.login.open('/pages_promotion/fenxiao/childfenxiao', 'redirectTo');
});
}
},
diff --git a/pages_promotion/fenxiao/index.vue b/pages_promotion/fenxiao/index.vue
index f59156a..07df0ac 100644
--- a/pages_promotion/fenxiao/index.vue
+++ b/pages_promotion/fenxiao/index.vue
@@ -18,8 +18,8 @@
:src="$util.img('public/uniapp/fenxiao/index/commissionFission-level.png')"
alt="" class="level-icon">{{ info.level_name }}
- {{ $lang('superiorAgent') }}：{{ info.parent_name ? info.parent_name : $lang('headquarters') }}
- {{ $lang('invitedSuccess', { count: teamNum.num }) }}{{ $lang('superiorAgent') }}：{{ info.parent_name ? info.parent_name : $lang('headquarters') }}
+ {{ $lang('invitedSuccess', { count: teamNum.num }) }}