lex 1 gadu atpakaļ
vecāks
revīzija
affb0c6ef0

+ 1 - 1
dev-dist/sw.js

@@ -82,7 +82,7 @@ define(['./workbox-5357ef54'], (function (workbox) { 'use strict';
     "revision": "3ca0b8505b4bec776b69afdba2768812"
   }, {
     "url": "index.html",
-    "revision": "0.7vcjhpo07n8"
+    "revision": "0.jjj1p42pfu8"
   }], {});
   workbox.cleanupOutdatedCaches();
   workbox.registerRoute(new workbox.NavigationRoute(workbox.createHandlerBoundToURL("index.html"), {

+ 1 - 1
public/version.json

@@ -1 +1 @@
-{"version":1708567231465}
+{"version":1708657056312}

+ 6 - 3
src/components/TheAuth/index.tsx

@@ -27,9 +27,9 @@ export default defineComponent({
         return /macintosh|mac os x/i.test(navigator.userAgent);
       })();
       if (isMac) {
-        window.open('https://oss.dayaedu.com/https-ssl/Mac-安全证书.cer');
+        window.open('https://oss.dayaedu.com/https-ssl/安全证书.cer');
       } else {
-        window.open('https://oss.dayaedu.com/https-ssl/Win-安全证书.pfx');
+        window.open('https://oss.dayaedu.com/https-ssl/安全证书.pfx');
       }
       // emit('close');
     };
@@ -138,7 +138,10 @@ export default defineComponent({
                     <div class={styles.stepNum}>04</div>
                     <div class={styles.stepContent}>
                       <p class={styles.txt}>
-                        在【选择证书】弹窗中点击<span>【确定】</span>按钮
+                        在【选择证书】弹窗中点击<span>【确定】</span>
+                        按钮(若浏览器没有弹出该弹窗请
+                        <span class={styles.red}>重启电脑</span>
+                        后重试)
                       </p>
                       <img src={w7} class={styles.w7} />
                     </div>

+ 8 - 2
src/views/content-information/content-instrument/index.module.less

@@ -100,8 +100,14 @@
   padding: 32px 20px;
   background-color: #fff;
   border-radius: 20px;
-  min-height: 100%;
-  // min-height: calc(100% - 104px);
+  // min-height: 100%;
+  min-height: calc(100vh - 192px);
+
+  &.listWrapEmpty {
+    display: flex;
+    flex-direction: column;
+    justify-content: center;
+  }
 
   :global {
     .n-tabs-tab-pad {

+ 15 - 2
src/views/content-information/content-instrument/index.tsx

@@ -12,6 +12,7 @@ import icon_back from '../../xiaoku-music/images/icon_back.png';
 import { useRoute, useRouter } from 'vue-router';
 import List from './components/list';
 import { api_knowledgeWikiCategoryType_page } from '../api';
+import TheEmpty from '/src/components/TheEmpty';
 
 export default defineComponent({
   name: 'content-instrument',
@@ -20,10 +21,12 @@ export default defineComponent({
     const router = useRouter();
     const state = reactive({
       tabValue: '',
-      categoryList: [] as any
+      categoryList: [] as any,
+      loading: false
     });
 
     const getCategoryList = async () => {
+      state.loading = true;
       try {
         const { data } = await api_knowledgeWikiCategoryType_page({
           type: 'INSTRUMENT',
@@ -40,6 +43,7 @@ export default defineComponent({
       } catch {
         //
       }
+      state.loading = false;
     };
 
     getCategoryList();
@@ -58,7 +62,16 @@ export default defineComponent({
         </NSpace>
 
         <div class={styles.wrap}>
-          <div class={styles.listWrap}>
+          <div
+            class={[
+              styles.listWrap,
+              !state.loading &&
+                state.categoryList.length <= 0 &&
+                styles.listWrapEmpty
+            ]}>
+            {!state.loading && state.categoryList.length <= 0 && (
+              <TheEmpty description="暂无乐器百科" />
+            )}
             <NTabs
               defaultValue="myResources"
               paneClass={styles.paneTitle}

+ 9 - 1
src/views/content-information/content-music/index.module.less

@@ -100,8 +100,16 @@
   padding: 32px 20px;
   background-color: #fff;
   border-radius: 20px;
-  min-height: 100%;
+  // min-height: 100%;
   width: calc(100vw - 164px); // min-height: calc(100% - 104px);
+  // min-height: 100%;
+  min-height: calc(100vh - 192px);
+
+  &.listWrapEmpty {
+    display: flex;
+    flex-direction: column;
+    justify-content: center;
+  }
 
   :global {
     .n-tabs-tab-pad {

+ 15 - 2
src/views/content-information/content-music/index.tsx

@@ -11,6 +11,7 @@ import icon_back from '../../xiaoku-music/images/icon_back.png';
 import { useRouter } from 'vue-router';
 import List from './components/list';
 import { api_knowledgeWikiCategoryType_page } from '../api';
+import TheEmpty from '/src/components/TheEmpty';
 
 // 164px 244px
 export default defineComponent({
@@ -20,10 +21,12 @@ export default defineComponent({
     const router = useRouter();
     const state = reactive({
       tabValue: '',
-      categoryList: [] as any
+      categoryList: [] as any,
+      loading: false
     });
 
     const getCategoryList = async () => {
+      state.loading = true;
       try {
         const { data } = await api_knowledgeWikiCategoryType_page({
           type: 'MUSIC',
@@ -40,6 +43,7 @@ export default defineComponent({
       } catch {
         //
       }
+      state.loading = false;
     };
 
     getCategoryList();
@@ -58,7 +62,16 @@ export default defineComponent({
         </NSpace>
 
         <div class={styles.wrap}>
-          <div class={styles.listWrap}>
+          <div
+            class={[
+              styles.listWrap,
+              !state.loading &&
+                state.categoryList.length <= 0 &&
+                styles.listWrapEmpty
+            ]}>
+            {!state.loading && state.categoryList.length <= 0 && (
+              <TheEmpty description="暂无名曲鉴赏" />
+            )}
             <NTabs
               defaultValue="myResources"
               paneClass={styles.paneTitle}

+ 10 - 2
src/views/content-information/content-musician/index.module.less

@@ -100,8 +100,16 @@
   padding: 32px 20px;
   background-color: #fff;
   border-radius: 20px;
-  min-height: 100%;
-  // min-height: calc(100% - 104px);
+
+
+  // min-height: 100%;
+  min-height: calc(100vh - 192px);
+
+  &.listWrapEmpty {
+    display: flex;
+    flex-direction: column;
+    justify-content: center;
+  }
 
   :global {
     .n-tabs-tab-pad {

+ 15 - 2
src/views/content-information/content-musician/index.tsx

@@ -12,6 +12,7 @@ import icon_back from '../../xiaoku-music/images/icon_back.png';
 import { useRoute, useRouter } from 'vue-router';
 import List from './components/list';
 import { api_knowledgeWikiCategoryType_page } from '../api';
+import TheEmpty from '/src/components/TheEmpty';
 
 export default defineComponent({
   name: 'content-musician',
@@ -20,10 +21,12 @@ export default defineComponent({
     const router = useRouter();
     const state = reactive({
       tabValue: '',
-      categoryList: [] as any
+      categoryList: [] as any,
+      loading: false
     });
 
     const getCategoryList = async () => {
+      state.loading = true;
       try {
         const { data } = await api_knowledgeWikiCategoryType_page({
           type: 'MUSICIAN',
@@ -40,6 +43,7 @@ export default defineComponent({
       } catch {
         //
       }
+      state.loading = false;
     };
 
     getCategoryList();
@@ -58,7 +62,16 @@ export default defineComponent({
         </NSpace>
 
         <div class={styles.wrap}>
-          <div class={styles.listWrap}>
+          <div
+            class={[
+              styles.listWrap,
+              !state.loading &&
+                state.categoryList.length <= 0 &&
+                styles.listWrapEmpty
+            ]}>
+            {!state.loading && state.categoryList.length <= 0 && (
+              <TheEmpty description="暂无音乐家" />
+            )}
             <NTabs
               defaultValue="myResources"
               paneClass={styles.paneTitle}