This commit is contained in:
@@ -67,14 +67,14 @@
|
||||
</view>
|
||||
|
||||
<RenewalPaymentPopup ref="renewalPopupRef" :identifier="userStore.state.identifier"
|
||||
paymentRefreshTarget="order-list" @completed="resetOrderListAndLoad" />
|
||||
paymentRefreshTarget="order-list" @completed="refreshOrderState" />
|
||||
</view>
|
||||
</template>
|
||||
|
||||
<script setup>
|
||||
import { ref, reactive, computed, onMounted } from 'vue';
|
||||
import { ref, reactive, computed } from 'vue';
|
||||
import { onReachBottom, onShow } from '@dcloudio/uni-app';
|
||||
import { orderApi } from '@/api/index.js';
|
||||
import { assetApi, orderApi } from '@/api/index.js';
|
||||
import RenewalPaymentPopup from '@/components/RenewalPaymentPopup.vue';
|
||||
import { useUserStore } from '@/store/index.js';
|
||||
import {
|
||||
@@ -121,17 +121,25 @@
|
||||
loadOrderList();
|
||||
};
|
||||
|
||||
const refreshOrderState = () => {
|
||||
resetOrderListAndLoad();
|
||||
// 订单支付、退款及套餐生效后,读取后端实际轮询状态,不推测已恢复。
|
||||
return assetApi.getInfo(userStore.state.identifier).catch(error => {
|
||||
console.error('刷新订单关联资产状态失败', error);
|
||||
});
|
||||
};
|
||||
|
||||
const scheduleOrderStatusRefresh = () => {
|
||||
uni.showToast({
|
||||
title: '正在同步支付状态',
|
||||
icon: 'none'
|
||||
});
|
||||
resetOrderListAndLoad();
|
||||
refreshOrderState();
|
||||
setTimeout(() => {
|
||||
resetOrderListAndLoad();
|
||||
}, 1500);
|
||||
setTimeout(() => {
|
||||
resetOrderListAndLoad();
|
||||
refreshOrderState();
|
||||
}, 3000);
|
||||
};
|
||||
|
||||
@@ -232,16 +240,13 @@
|
||||
|
||||
onShow(() => {
|
||||
if (!consumePendingPaymentRefresh(PAYMENT_REFRESH_TARGETS.ORDER_LIST)) {
|
||||
refreshOrderState();
|
||||
return;
|
||||
}
|
||||
|
||||
scheduleOrderStatusRefresh();
|
||||
});
|
||||
|
||||
onMounted(() => {
|
||||
loadOrderList();
|
||||
});
|
||||
|
||||
onReachBottom(() => {
|
||||
loadMore();
|
||||
});
|
||||
|
||||
Reference in New Issue
Block a user