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-35a54a14.js"></script>
+=======
+  <script nomodule crossorigin id="vite-legacy-polyfill" src="./assets/polyfills-legacy-c93c0c16.js"></script>
+>>>>>>> master
   <script nomodule crossorigin id="vite-legacy-entry" data-src="./assets/index-legacy-2f8f4cf8.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
 </body>
 

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

@@ -49,7 +49,7 @@ export default defineComponent({
       if (props.item?.orderNo) {
         const url = `${location.origin}${
           location.pathname
-        }#/order-detail?orderNo=${props.item?.orderNo}${
+        }#/collection-record-detail?orderNo=${props.item?.orderNo}${
           props.item.isRefund
             ? '&userRefundOrderId=' + props.item.userRefundOrderId
             : ''