合并

dist/index.html

@@ -5,8 +5,13 @@
     <link rel="icon" href="./favicon.ico" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <title>管乐迷</title>
+<<<<<<< HEAD
     <script type="module" crossorigin src="./assets/index.3f974276.js"></script>
     <link rel="modulepreload" href="./assets/vendor.9de3b924.js">
+=======
+    <script type="module" crossorigin src="./assets/index.d8afb49d.js"></script>
+    <link rel="modulepreload" href="./assets/vendor.95d457e9.js">
+>>>>>>> dc9b40bfc66ffc00777789f8141efb27acb94063
     <link rel="stylesheet" href="./assets/index.fb6968e4.css">
     <script type="module">!function(){try{new Function("m","return import(m)")}catch(o){console.warn("vite: loading legacy build because dynamic import is unsupported, syntax error above should be ignored");var e=document.getElementById("vite-legacy-polyfill"),n=document.createElement("script");n.src=e.src,n.onload=function(){System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))},document.body.appendChild(n)}}();</script>
   </head>
@@ -14,7 +19,12 @@
     <div id="app"></div>
     
     <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 id="vite-legacy-polyfill" src="./assets/polyfills-legacy.68541211.js"></script>
     <script nomodule id="vite-legacy-entry" data-src="./assets/index-legacy.edca0e79.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+=======
+    <script nomodule id="vite-legacy-polyfill" src="./assets/polyfills-legacy.8bd03f24.js"></script>
+    <script nomodule id="vite-legacy-entry" data-src="./assets/index-legacy.22076fbe.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+>>>>>>> dc9b40bfc66ffc00777789f8141efb27acb94063
   </body>
 </html>

src/components/live-broadcast/preview.module.less

@@ -85,12 +85,6 @@
     padding: 12px;
     background: #ffffff;
     border-radius: 11px;
-    border-image: linear-gradient(
-        180deg,
-        rgba(255, 255, 255, 1),
-        rgba(255, 255, 255, 1)
-      )
-      1 1;
     .start {
       width: 50px;
       height: 59px;