Browse Source

Merge branch 'iteration-20250110-last' into dev

lex-xin 5 tháng trước cách đây
mục cha
commit
2a8118c33e

+ 3 - 4
src/main.ts

@@ -1,14 +1,14 @@
 import { createApp } from 'vue';
 import App from './App';
-import router, { parseQuery, setupRouter } from './router/index';
+import router, { setupRouter } from './router/index';
 import dayjs from 'dayjs';
 import { setupNaive } from './plugins';
 import { setupStore } from './store';
 import 'dayjs/locale/zh-cn';
 import './styles/index.less';
 import './utils/rem';
-import { storage } from './utils/storage';
-import { ACCESS_TOKEN_ADMIN } from './store/mutation-types';
+// import { storage } from './utils/storage';
+// import { ACCESS_TOKEN_ADMIN } from './store/mutation-types';
 import useErrorLog from './hooks/useErrorLog';
 
 async function setupApp() {
@@ -30,7 +30,6 @@ async function setupApp() {
   //   sessionStorage.removeItem('authLoadNum');
   //   storage.remove(ACCESS_TOKEN_ADMIN);
   // }
-  
   // app loading
   // const appLoading = createApp(AppLoading);
   // appLoading.mount('#appLoading');

+ 7 - 9
src/views/prepare-lessons/components/lesson-main/courseware-presets/related.tsx

@@ -33,15 +33,13 @@ export default defineComponent({
               </div>
             ),
             default: () => (
-              <>
-                <NTabPane name="myMusic" tab="相关课件">
-                  {/* <SelectMusic cardType={props.cardType} type="myMusic" /> */}
-                  <SelectRelated
-                    onAdd={(item: any) => emit('add', item)}
-                    onLook={(item: any) => emit('look', item)}
-                  />
-                </NTabPane>
-              </>
+              <NTabPane name="myMusic" tab="相关课件">
+                {/* <SelectMusic cardType={props.cardType} type="myMusic" /> */}
+                <SelectRelated
+                  onAdd={(item: any) => emit('add', item)}
+                  onLook={(item: any) => emit('look', item)}
+                />
+              </NTabPane>
             )
           }}
         </NTabs>