更新

dist/index.html

@@ -49,7 +49,11 @@
     
     <!-- <script type="module" src="/src/teacher/main.ts"></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 id="vite-legacy-polyfill" src="./assets/polyfills-legacy.d449268c.js"></script>
+=======
+    <script nomodule id="vite-legacy-polyfill" src="./assets/polyfills-legacy.293885b3.js"></script>
+>>>>>>> fine-music-score
     <script nomodule id="vite-legacy-entry" data-src="./assets/index-legacy.9ba43484.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
   </body>
 </html>

dist/teacher.html

@@ -48,7 +48,11 @@
     <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.d449268c.js"></script>
+=======
+    <script nomodule id="vite-legacy-polyfill" src="./assets/polyfills-legacy.293885b3.js"></script>
+>>>>>>> fine-music-score
     <script nomodule id="vite-legacy-entry" data-src="./assets/teacher-legacy.bc11cc23.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
   </body>
 </html>

src/views/shop-mall/components/tab-list/index.tsx

@@ -9,7 +9,7 @@ import styles from './index.module.less'
 export default defineComponent({
   name: 'tab-list',
   props: {
-    showAdd:{
+    showAdd: {
       type: Boolean,
       default: true
     },
@@ -131,7 +131,7 @@ export default defineComponent({
         <List
           v-model:loading={this.loading}
           finished={this.finished}
-          finishedText="没有更多了"
+          finishedText=" "
           immediateCheck={false}
           class={[styles.goodsList, 'mb12']}
           onLoad={this.getList}