Merge branch 'master' into dev

dist/index.html

@@ -58,7 +58,11 @@
       //   }
   </script>
   <script nomodule>!function(){var e=document,t=e.createElement("script");if(!("noModule"in t)&&"onbeforeload"in t){var n=!1;e.addEventListener("beforeload",(function(e){if(e.target===t)n=!0;else if(!e.target.hasAttribute("nomodule")||!n)return;e.preventDefault()}),!0),t.type="module",t.src=".",e.head.appendChild(t),t.remove()}}();</script>
+<<<<<<< HEAD
   <script nomodule crossorigin id="vite-legacy-polyfill" src="./assets/polyfills-legacy-be3c0157.js"></script>
+=======
+  <script nomodule crossorigin id="vite-legacy-polyfill" src="./assets/polyfills-legacy-9462d735.js"></script>
+>>>>>>> master
   <script nomodule crossorigin id="vite-legacy-entry" data-src="./assets/index-legacy-01c0efc6.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
 </body>
 

src/views/collection-record/component/item.tsx

@@ -47,15 +47,17 @@ export default defineComponent({
 
     const handleOpenDetail = () => {
       if (props.item?.orderNo) {
+        const url = `${location.origin}${
+          location.pathname
+        }#/order-detail?orderNo=${props.item?.orderNo}${
+          props.item.isRefund
+            ? '&userRefundOrderId=' + props.item.userRefundOrderId
+            : ''
+        }}`;
         postMessage({
           api: 'openWebView',
           content: {
-            url:
-              location.origin +
-              location.pathname +
-              '#/collection-record-detail?orderNo=' +
-              props.item?.orderNo + 
-              '&userRefundOrderId=' + props.item?.userRefundOrderId,
+            url,
             orientation: 1,
             isHideTitle: false
           }
@@ -94,7 +96,7 @@ export default defineComponent({
       showToast('申请退回成功');
       data.open = false;
       emit('close');
-      emit('refund')
+      emit('refund');
     };
 
     /** 继续支付 */

src/views/collection-record/component/list.tsx

@@ -90,7 +90,8 @@ export default defineComponent({
               paymentCashAmount: item.paymentCashAmount,
               createTime: item.refundTime,
               statusName: refundTypes[item.refundAudit],
-              statusColor: statusColors[item.status]
+              statusColor: statusColors[item.status],
+              isRefund: true, // 是退款列表
             };
           });
           data.finished = !res.data.next;