diff --git a/components/NotificationPopup.vue b/components/NotificationPopup.vue
index 0e4d4a6..1fe42aa 100644
--- a/components/NotificationPopup.vue
+++ b/components/NotificationPopup.vue
@@ -20,6 +20,11 @@
@@ -80,6 +80,9 @@
+
+
@@ -87,6 +90,7 @@
import { ref, reactive, onMounted, computed } from 'vue';
import { onShow } from '@dcloudio/uni-app';
import { assetApi, orderApi } from '@/api/index.js';
+ import RenewalPaymentPopup from '@/components/RenewalPaymentPopup.vue';
import { useUserStore } from '@/store/index.js';
import {
consumePendingPaymentRefresh,
@@ -108,6 +112,7 @@
const noMore = ref(false);
const page = ref(1);
const orderPayingId = ref(null);
+ const renewalPopupRef = ref(null);
const pageSize = 10;
const filterIndex = ref(0);
const allowedPaymentMethods = ref([]);
@@ -234,15 +239,14 @@
uni.navigateTo({ url: `/pages/order-detail/order-detail?id=${order.order_id}` });
};
- const startHistoricalRenewal = (order) => {
+ const startOrderRenewal = (order) => {
const packageIds = Array.isArray(order?.package_ids) ? order.package_ids.filter(Boolean) : [];
if (!packageIds.length) {
uni.showToast({ title: '当前订单暂无可续费套餐', icon: 'none' });
return;
}
const packageNames = Array.isArray(order.package_names) ? order.package_names : [];
- const query = `renewal_package_ids=${encodeURIComponent(packageIds.join(','))}&renewal_package_names=${encodeURIComponent(packageNames.join('|'))}`;
- uni.navigateTo({ url: `/pages/package-order/package-order?${query}` });
+ renewalPopupRef.value?.open(packageIds, packageNames);
};
const showOrderPaymentMethods = async (order) => {
diff --git a/utils/payment.js b/utils/payment.js
index b4180bb..5651f56 100644
--- a/utils/payment.js
+++ b/utils/payment.js
@@ -2,6 +2,7 @@ const ALIPAY_PENDING_REFRESH_KEY = 'pending_alipay_payment_refresh';
const ALIPAY_PAYMENT_DATA_KEY = 'pending_alipay_payment_data';
export const PAYMENT_REFRESH_TARGETS = {
+ HOME: 'home',
PACKAGE_ORDER: 'package-order',
ORDER_LIST: 'order-list',
MY_WALLET: 'my-wallet'