Merge remote-tracking branch 'refs/remotes/origin/feature_收钱吧对接' into feature_会员权益

src/views/order/console.vue

@@ -470,7 +470,7 @@ const handleScanInput = (event: KeyboardEvent) => {
 
 // 定义查询支付状态的函数
 const queryPayStatusWithRetry = (data): Promise<boolean> => {
-    const intervals = [3000, 5000, 10000]
+    const intervals = [3000, 5000, 10000, 10000, 10000, 10000, 10000]
     let currentIndex = 0
     payingDialogVisible.value = true
 

src/views/order/index.vue

@@ -253,7 +253,7 @@ const handleScanInput = (event: KeyboardEvent) => {
 
 // 定义查询支付状态的函数
 const queryPayStatusWithRetry = (data): Promise<boolean> => {
-    const intervals = [3000, 5000, 10000]
+    const intervals = [3000, 5000, 10000, 10000, 10000, 10000, 10000]
     let currentIndex = 0
     payingDialogVisible.value = true
 

src/views/orders/list.vue

@@ -97,7 +97,7 @@
                         <div>
                             <div :style="row.status > 1 && row.status != 6 ? 'text-decoration: line-through;': ''" v-if="row.status > 1 && row.status != 6">订单金额:￥{{row.amount}}</div>
                             <div style="color: #f01414;" v-if="row.status >= 2 && row.status != 6">
-                              实付:￥{{row.payAmount || row.amount}}   {{row.status==4 ? '退款:￥' + row.refundAmount : ''}}
+                              实付金额:￥{{row.payAmount || row.amount}}
                             </div>
                             <div v-if="row.ticketNo" class="refund-info">
                                 <div style="font-size: 12px;">抵扣券券号:{{ row.ticketNo }}</div>