Inicio Explorar Axuda
Iniciar sesión
liushengqiang
/
music-score
1
0
Fork 0
Ficheiros Incidencias 0 Pull Requests 0 Wiki
Explorar o código

pull

TIANYONG hai 5 meses
pai
e6aab6f2e8
achega
780c3dc4b1
Modificáronse 10 ficheiros con 168 adicións e 56 borrados
Dividir vista Mostrar estatísticas de Diff
  1. 10 10
      dist/colexiu.html
  2. 9 9
      dist/index.html
  3. 6 6
      dist/instrument.html
  4. 11 11
      dist/orchestra.html
  5. 7 7
      dist/report-share.html
  6. 10 5
      src/page-instrument/component/the-music-list/filterList.tsx
  7. BIN=BIN
      src/page-instrument/component/the-music-list/imgs/sj.png
  8. 91 1
      src/page-instrument/component/the-music-list/index.module.less
  9. 24 7
      src/page-instrument/component/the-music-list/list.tsx
  10. 0 0
      stats.html

+ 10 - 10
dist/colexiu.html
Ver ficheiro 

@@ -2,7 +2,7 @@
 
 <html lang="en">
 
 
 <head>
 
-  <script type="module" crossorigin src="./js/polyfills-b8a66e79.js"></script>
 
+  <script type="module" crossorigin src="./js/polyfills-b0c0e255.js"></script>
 
 
   <meta charset="UTF-8" />
 
   <link rel="icon" type="image/svg+xml" href="./vite.svg" />
 
@@ -40,13 +40,13 @@
 
       },
 
     })
 
   </script>
 
-  <script type="module" crossorigin src="./js/colexiu-8f21f91b.js"></script>
 
-  <link rel="modulepreload" crossorigin href="./js/index-8a1666ee.js">
 
-  <link rel="modulepreload" crossorigin href="./js/index-5fac93ec.js">
 
-  <link rel="modulepreload" crossorigin href="./js/index-688e8da2.js">
 
-  <link rel="modulepreload" crossorigin href="./js/index-7e5bfaf7.js">
 
-  <link rel="stylesheet" href="./css/index-bfccc570.css">
 
-  <link rel="stylesheet" href="./css/colexiu-62f31c4f.css">
 
+  <script type="module" crossorigin src="./js/colexiu-778cbad7.js"></script>
 
+  <link rel="modulepreload" crossorigin href="./js/index-51fbe084.js">
 
+  <link rel="modulepreload" crossorigin href="./js/index-61a09fd0.js">
 
+  <link rel="modulepreload" crossorigin href="./js/index-3634bb78.js">
 
+  <link rel="modulepreload" crossorigin href="./js/index-82ae1bf9.js">
 
+  <link rel="stylesheet" href="./css/index-a00803b9.css">
 
+  <link rel="stylesheet" href="./css/colexiu-e8b419b5.css">
 
   <script type="module">import.meta.url;import("_").catch(()=>1);async function* g(){};window.__vite_is_modern_browser=true;</script>
 
   <script type="module">!function(){if(window.__vite_is_modern_browser)return;console.warn("vite: loading legacy chunks, syntax error above and the same error below 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>
 
@@ -56,8 +56,8 @@
 
   <img id="loading" class="show" src="./loading.svg" alt="loading" />
 
   
   <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>
 
-  <script nomodule crossorigin id="vite-legacy-polyfill" src="./js/polyfills-legacy-e8d424cd.js"></script>
 
-  <script nomodule crossorigin id="vite-legacy-entry" data-src="./js/colexiu-legacy-6617f054.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
 
+  <script nomodule crossorigin id="vite-legacy-polyfill" src="./js/polyfills-legacy-40603d5c.js"></script>
 
+  <script nomodule crossorigin id="vite-legacy-entry" data-src="./js/colexiu-legacy-76e947ae.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
 
 </body>
 
 
 </html>

+ 9 - 9
dist/index.html
Ver ficheiro 

@@ -2,7 +2,7 @@
 
 <html lang="ZH-cn">
 
 
 <head>
 
-  <script type="module" crossorigin src="./js/polyfills-b8a66e79.js"></script>
 
+  <script type="module" crossorigin src="./js/polyfills-b0c0e255.js"></script>
 
 
   <meta charset="UTF-8">
 
   <link rel="icon" href="./favicon.ico" />
 
@@ -75,13 +75,13 @@
 
       }
 
     })
 
   </script>
 
-  <script type="module" crossorigin src="./js/gym-3e0ef7c3.js"></script>
 
-  <link rel="modulepreload" crossorigin href="./js/index-8a1666ee.js">
 
-  <link rel="modulepreload" crossorigin href="./js/index-5fac93ec.js">
 
-  <link rel="modulepreload" crossorigin href="./js/index-a56063b2.js">
 
-  <link rel="modulepreload" crossorigin href="./js/index-7e5bfaf7.js">
 
+  <script type="module" crossorigin src="./js/gym-dde473f1.js"></script>
 
+  <link rel="modulepreload" crossorigin href="./js/index-51fbe084.js">
 
+  <link rel="modulepreload" crossorigin href="./js/index-61a09fd0.js">
 
+  <link rel="modulepreload" crossorigin href="./js/index-6307631c.js">
 
+  <link rel="modulepreload" crossorigin href="./js/index-82ae1bf9.js">
 
   <link rel="modulepreload" crossorigin href="./js/plyr.min-c8c2777b.js">
 
-  <link rel="stylesheet" href="./css/index-bfccc570.css">
 
+  <link rel="stylesheet" href="./css/index-a00803b9.css">
 
   <link rel="stylesheet" href="./css/index-85f95688.css">
 
   <link rel="stylesheet" href="./css/plyr-ad8ef5ae.css">
 
   <link rel="stylesheet" href="./css/index-171cd132.css">
 
@@ -98,8 +98,8 @@
 
   <img id="loading" class="show" src="./loading.svg" alt="loading" />
 
   
   <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>
 
-  <script nomodule crossorigin id="vite-legacy-polyfill" src="./js/polyfills-legacy-e8d424cd.js"></script>
 
-  <script nomodule crossorigin id="vite-legacy-entry" data-src="./js/gym-legacy-e3a81806.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
 
+  <script nomodule crossorigin id="vite-legacy-polyfill" src="./js/polyfills-legacy-40603d5c.js"></script>
 
+  <script nomodule crossorigin id="vite-legacy-entry" data-src="./js/gym-legacy-a2d5a453.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
 
 </body>
 
 
 </html>

+ 6 - 6
dist/instrument.html
Ver ficheiro 

@@ -2,7 +2,7 @@
 
 <html lang="en">
 
 
 <head>
 
-  <script type="module" crossorigin src="./js/polyfills-b8a66e79.js"></script>
 
+  <script type="module" crossorigin src="./js/polyfills-b0c0e255.js"></script>
 
 
   <meta charset="UTF-8" />
 
   <meta name="viewport"
 
@@ -41,9 +41,9 @@
 
       })
 
     }
 
   </script>
 
-  <script type="module" crossorigin src="./js/instrument-e32de23d.js"></script>
 
-  <link rel="modulepreload" crossorigin href="./js/index-8a1666ee.js">
 
-  <link rel="stylesheet" href="./css/index-bfccc570.css">
 
+  <script type="module" crossorigin src="./js/instrument-21f5b176.js"></script>
 
+  <link rel="modulepreload" crossorigin href="./js/index-51fbe084.js">
 
+  <link rel="stylesheet" href="./css/index-a00803b9.css">
 
   <link rel="stylesheet" href="./css/instrument-118f68d3.css">
 
   <script type="module">import.meta.url;import("_").catch(()=>1);async function* g(){};window.__vite_is_modern_browser=true;</script>
 
   <script type="module">!function(){if(window.__vite_is_modern_browser)return;console.warn("vite: loading legacy chunks, syntax error above and the same error below 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>
 
@@ -67,8 +67,8 @@
 
     var vConsole = new window.VConsole();
 
   </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>
 
-  <script nomodule crossorigin id="vite-legacy-polyfill" src="./js/polyfills-legacy-e8d424cd.js"></script>
 
-  <script nomodule crossorigin id="vite-legacy-entry" data-src="./js/instrument-legacy-cf882de6.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
 
+  <script nomodule crossorigin id="vite-legacy-polyfill" src="./js/polyfills-legacy-40603d5c.js"></script>
 
+  <script nomodule crossorigin id="vite-legacy-entry" data-src="./js/instrument-legacy-3a2ac47a.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
 
 </body>
 
 
 </html>

+ 11 - 11
dist/orchestra.html
Ver ficheiro 

@@ -2,7 +2,7 @@
 
 <html lang="en">
 
 
 <head>
 
-  <script type="module" crossorigin src="./js/polyfills-b8a66e79.js"></script>
 
+  <script type="module" crossorigin src="./js/polyfills-b0c0e255.js"></script>
 
 
   <meta charset="UTF-8" />
 
   <!-- <link rel="icon" type="image/svg+xml" href="/vite.svg" /> -->
 
@@ -41,15 +41,15 @@
 
       transition: opacity .3s;
 
     }
 
   </style>
 
-  <script type="module" crossorigin src="./js/orchestra-c6653921.js"></script>
 
-  <link rel="modulepreload" crossorigin href="./js/index-8a1666ee.js">
 
-  <link rel="modulepreload" crossorigin href="./js/index-5fac93ec.js">
 
-  <link rel="modulepreload" crossorigin href="./js/index-688e8da2.js">
 
-  <link rel="modulepreload" crossorigin href="./js/index-a56063b2.js">
 
-  <link rel="modulepreload" crossorigin href="./js/index-7e5bfaf7.js">
 
-  <link rel="stylesheet" href="./css/index-bfccc570.css">
 
+  <script type="module" crossorigin src="./js/orchestra-4bb5d104.js"></script>
 
+  <link rel="modulepreload" crossorigin href="./js/index-51fbe084.js">
 
+  <link rel="modulepreload" crossorigin href="./js/index-61a09fd0.js">
 
+  <link rel="modulepreload" crossorigin href="./js/index-3634bb78.js">
 
+  <link rel="modulepreload" crossorigin href="./js/index-6307631c.js">
 
+  <link rel="modulepreload" crossorigin href="./js/index-82ae1bf9.js">
 
+  <link rel="stylesheet" href="./css/index-a00803b9.css">
 
   <link rel="stylesheet" href="./css/index-85f95688.css">
 
-  <link rel="stylesheet" href="./css/orchestra-8bc1a9c0.css">
 
+  <link rel="stylesheet" href="./css/orchestra-8e05e751.css">
 
   <script type="module">import.meta.url;import("_").catch(()=>1);async function* g(){};window.__vite_is_modern_browser=true;</script>
 
   <script type="module">!function(){if(window.__vite_is_modern_browser)return;console.warn("vite: loading legacy chunks, syntax error above and the same error below 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>
 
@@ -70,8 +70,8 @@
 
   </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>
 
-  <script nomodule crossorigin id="vite-legacy-polyfill" src="./js/polyfills-legacy-e8d424cd.js"></script>
 
-  <script nomodule crossorigin id="vite-legacy-entry" data-src="./js/orchestra-legacy-771214c1.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
 
+  <script nomodule crossorigin id="vite-legacy-polyfill" src="./js/polyfills-legacy-40603d5c.js"></script>
 
+  <script nomodule crossorigin id="vite-legacy-entry" data-src="./js/orchestra-legacy-0d1b7089.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
 
 </body>
 
 
 </html>

+ 7 - 7
dist/report-share.html
Ver ficheiro 

@@ -2,7 +2,7 @@
 
 <html lang="en">
 
 
 <head>
 
-  <script type="module" crossorigin src="./js/polyfills-b8a66e79.js"></script>
 
+  <script type="module" crossorigin src="./js/polyfills-b0c0e255.js"></script>
 
 
   <meta charset="UTF-8" />
 
   <!-- <link rel="icon" type="image/svg+xml" href="/vite.svg" /> -->
 
@@ -25,11 +25,11 @@
 
       transition: opacity .3s;
 
     }
 
   </style>
 
-  <script type="module" crossorigin src="./js/report-share-6aeef28a.js"></script>
 
-  <link rel="modulepreload" crossorigin href="./js/index-8a1666ee.js">
 
+  <script type="module" crossorigin src="./js/report-share-af4ecdc9.js"></script>
 
+  <link rel="modulepreload" crossorigin href="./js/index-51fbe084.js">
 
   <link rel="modulepreload" crossorigin href="./js/plyr.min-c8c2777b.js">
 
-  <link rel="modulepreload" crossorigin href="./js/index-7e5bfaf7.js">
 
-  <link rel="stylesheet" href="./css/index-bfccc570.css">
 
+  <link rel="modulepreload" crossorigin href="./js/index-82ae1bf9.js">
 
+  <link rel="stylesheet" href="./css/index-a00803b9.css">
 
   <link rel="stylesheet" href="./css/plyr-ad8ef5ae.css">
 
   <link rel="stylesheet" href="./css/report-share-0f4c3151.css">
 
   <script type="module">import.meta.url;import("_").catch(()=>1);async function* g(){};window.__vite_is_modern_browser=true;</script>
 
@@ -52,8 +52,8 @@
 
   </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>
 
-  <script nomodule crossorigin id="vite-legacy-polyfill" src="./js/polyfills-legacy-e8d424cd.js"></script>
 
-  <script nomodule crossorigin id="vite-legacy-entry" data-src="./js/report-share-legacy-d729c9dd.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
 
+  <script nomodule crossorigin id="vite-legacy-polyfill" src="./js/polyfills-legacy-40603d5c.js"></script>
 
+  <script nomodule crossorigin id="vite-legacy-entry" data-src="./js/report-share-legacy-c96e55bc.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
 
 </body>
 
 
 </html>

+ 10 - 5
src/page-instrument/component/the-music-list/filterList.tsx
Ver ficheiro 

@@ -8,6 +8,7 @@ import quxiaoImg from "./imgs/quxiao.png"
 
 import zhankaiImg from "./imgs/zhankai.png"
 
 import shouqiImg from "./imgs/shouqi.png"
 
 import sjImg from "./imgs/sj.png"
 
+import xiangImg from "./imgs/xiang.png"
 
 import closeImg from "../../header-top/image/closeImg.png"
 
 import state, { IPlatform } from "/src/state";
 
 import { getQuery } from "/src/utils/queryString";
 
@@ -40,7 +41,7 @@ export default defineComponent({
 
         }
 
         function handleConfirm() {
 
             emit("handleConfirm",{
 
-                audioPlayTypes:  queryObj.audioPlayTypes ? queryObj.audioPlayTypes.split(",") : [],
 
+                audioPlayTypes:  queryObj.audioPlayTypes,
 
                 musicTutorialIds: queryObj.grade ? queryObj.grade : queryObj.course,
 
                 musicTagIds: queryObj.sheetTag,
 
                 musicalInstrumentId: queryObj.subject.id
 
@@ -110,7 +111,11 @@ export default defineComponent({
 
         state.platform === IPlatform.PC && getSubjectList() // 老师端才加载乐器
 
         const subjectList = ref<any[]>([])
 
         function getSubjectList(){
 
-            api_subjectList({}).then(res => {
 
+            api_subjectList({
 
+                delFlag: 0,
 
+                page: 1,
 
+                rows: 999,
 
+            }).then(res => {
 
                 if(res.code === 200){
 
                     subjectList.value = [...res.data.map((item:any)=>{
 
                         return item.instruments.length > 1 ? Object.assign(item,{ isExpand: ref(false) }) : item
 
@@ -161,7 +166,7 @@ export default defineComponent({
 
                                         <div class={styles.titCon}>
 
                                             标签
 
                                         </div>
 
-                                        <div class={styles.filterCon}>
 
+                                        <div class={[styles.filterCon, styles.sheetTag]}>
 
                                             {
 
                                                 sheetTagObj.value.map(item => {
 
                                                     return <div class={[styles.tabBox, queryObj.sheetTag === item.id && styles.tabActive]} onClick={() => { handleSelSheetTag(item) }}>{item.name}</div>
 
@@ -200,7 +205,7 @@ export default defineComponent({
 
                                                 })
 
                                             }
 
                                             {
 
-                                                !isExpand.value && 
+                                                !isExpand.value && courseObj.value.length>5 &&
 
                                                     <div class={[styles.tabBox, styles.zhankaiImg]} onClick={handleExpand}>
 
                                                         查看更多
 
                                                         <img src={zhankaiImg} />
 
@@ -256,7 +261,7 @@ export default defineComponent({
 
                                                                     <div class={[styles.tabBox, styles.tabBoxPopCon, isActiveSubjectPop(item) && styles.tabActive]}>
 
                                                                         <div class={[styles.tabBoxPop, item.isExpand && styles.actTabBoxPop]}>
 
                                                                             <div>{isActiveSubjectPop(item)?queryObj.subject.name:item.name}</div>
 
-                                                                            <img class={styles.sjImg} src={sjImg} />
 
+                                                                            <img class={styles.sjImg} src={isActiveSubjectPop(item) ? xiangImg : sjImg} />
 
                                                                         </div>
 
                                                                     </div>
 
                                                                 )

BIN=BIN
src/page-instrument/component/the-music-list/imgs/sj.png
Ver ficheiro


+ 91 - 1
src/page-instrument/component/the-music-list/index.module.less
Ver ficheiro 

@@ -167,6 +167,78 @@
 
                 margin: 0 6px 0 4px;
 
                 width: 9px;
 
                 height: 5px;
 
+                &.onImg{
 
+                    transform: rotate(180deg);
 
+                }
 
+            }
 
+        }
 
+        .dropdownMenu1{
 
+            border-right: 1px solid #DADCE5;
 
+            margin-right: 8px;
 
+            :global{
 
+                .van-dropdown-menu__bar{
 
+                    height: 20px;
 
+                    background: transparent;
 
+                    box-shadow: initial;
 
+                    .van-dropdown-menu__item{
 
+                        padding: 0 8px 0 0;
 
+                    }
 
+                    .van-dropdown-menu__title{
 
+                        --van-gray-4: #0CA2EA;
 
+                        font-weight: 400;
 
+                        font-size: 14px;
 
+                        color: #0CA2EA;
 
+                        padding: 0 12px 0 0;
 
+                        &::after{
 
+                            right: 0;
 
+                            opacity: initial;
 
+                        }
 
+                    }
 
+                }
 
+                .van-dropdown-item.van-dropdown-item--down{
 
+                    left: 36px;
 
+                    width: 148px;
 
+                    margin-top: 7px;
 
+                    .van-dropdown-item__content{
 
+                        margin-left: 10px;
 
+                        padding: 0 10px;
 
+                        width: 128px;
 
+                        box-shadow: 0px 2px 14px 0px rgba(0,0,0,0.12);
 
+                        border-radius: 8px;
 
+                        .van-cell{
 
+                            margin-top: 6px;
 
+                            padding: 0;
 
+                            font-weight: 400;
 
+                            font-size: 14px;
 
+                            color: #323233;
 
+                            line-height: 32px;
 
+                            text-align: center;
 
+                            &::after{
 
+                                border: none;
 
+                            }
 
+                            &:last-child{
 
+                                margin-bottom: 6px;
 
+                            }
 
+                            &.van-dropdown-item__option--active{
 
+                                background: #EEF8FF;
 
+                                border-radius: 4px;
 
+                                color: #1CACF1;
 
+                                font-weight: 500;
 
+                            }
 
+                            .van-cell__value{
 
+                                display: none;
 
+                            }
 
+                        }
 
+                    }
 
+                }
 
+            }
 
+            &.currItem{
 
+                :global{
 
+                    .van-dropdown-menu__bar  .van-dropdown-menu__title{
 
+                        color: #1CACF1;
 
+                        --van-gray-4:#1CACF1;
 
+                    }
 
+                }
 
             }
 
         }
 
     }
 
@@ -227,10 +299,16 @@
 
         }
 
     }
 
     .content{
 
+        padding-right: 15px;
 
+        flex-grow: 1;
 
+        overflow: hidden;
 
         .name{
 
             font-weight: 600;
 
             font-size: 16px;
 
             color: #333333;
 
+            white-space: nowrap;
 
+            overflow: hidden;
 
+            text-overflow: ellipsis;
 
         }
 
         .detail{
 
             display: flex;
 
@@ -245,6 +323,7 @@
 
                 border-radius: 4px;
 
                 border: 0.6px solid #FFC5C5;
 
                 font-size: 10px;
 
+                flex-shrink: 0;
 
                 >img{
 
                     width: 8px;
 
                     height: 11px;
 
@@ -256,12 +335,17 @@
 
                 }
 
             }
 
             .author {
 
+                flex-shrink: 1;
 
                 margin-left: 6px;
 
                 font-weight: 400;
 
                 font-size: 13px;
 
                 color: rgba(0,0,0,0.5);
 
+                white-space: nowrap;
 
+                overflow: hidden;
 
+                text-overflow: ellipsis;
 
             }
 
             .playType,.singType{
 
+                flex-shrink: 0;
 
                 margin-left: 5px;
 
                 width: 26px;
 
                 height: 14px;
 
@@ -439,6 +523,12 @@
 
                         padding: 0 10px;
 
                     }
 
                 }
 
+                &.sheetTag{
 
+                    .tabBox{
 
+                        width: calc(33.33% - 10px);
 
+                        padding: 0 8px;
 
+                    }
 
+                }
 
                 .tabBox{
 
                     cursor: pointer;
 
                     width: calc(25% - 10px);
 
@@ -557,7 +647,7 @@
 
         white-space: nowrap;
 
         overflow: hidden;
 
         text-overflow: ellipsis;
 
-        &.active{
 
+        &.active,&:hover{
 
             background: #EEF8FF;
 
             color: #1CACF1;
 
             font-weight: 500;

+ 24 - 7
src/page-instrument/component/the-music-list/list.tsx
Ver ficheiro 

@@ -24,6 +24,12 @@ export default defineComponent({
 
     },
 
   },
 
   setup(props) {
 
+    const audioPlayTypesOption = [
 
+      { text: '全部场景', value: "" },
 
+      { text: '演奏', value: "PLAY" },
 
+      { text: '演唱', value: "SING" },
 
+      { text: '演奏+演唱', value: "PLAY,SING" },
 
+    ]
 
     const query: any = getQuery();
 
     const forms = reactive({
 
       name: "",
 
@@ -32,10 +38,10 @@ export default defineComponent({
 
       musicSheetCategoriesId: state.bizMusicCategoryId,
 
       recentFlag: props.recentFlag ? true : null,
 
       excludeMusicId: props.recentFlag ? null : state.examSongId,
 
-      audioPlayTypes: [],
 
+      audioPlayTypes: "",
 
       musicTutorialIds: "",
 
       musicTagIds: "",
 
-      musicalInstrumentId: query.instrumentId || ""
 
+      musicalInstrumentId: props.recentFlag ? "" : query.instrumentId
 
     });
 
     const data = reactive({
 
       isFocus: false,
 
@@ -49,7 +55,12 @@ export default defineComponent({
 
       if (!data.hasNext) return;
 
       data.loading = true;
 
       try {
 
-        const res = await api_musicSheetPage(forms);
 
+        const res = await api_musicSheetPage({
 
+          ...forms,
 
+          ...{
 
+            audioPlayTypes: forms.audioPlayTypes ? forms.audioPlayTypes.split(",") : []
 
+          }
 
+        });
 
         if (res?.code === 200 && Array.isArray(res.data?.rows)) {
 
           data.list = [...data.list, ...res.data.rows];
 
         }
 
@@ -113,10 +124,16 @@ export default defineComponent({
 
     return () => (
 
       <div class={styles.wrap}>
 
         <div class={[styles.searchBox,data.isFocus && styles.isFocus]}>
 
-          <div class={styles.dropdownMenu} onClick={() => { filterShow.value = true }}>
 
-            <div>筛选</div>
 
-            <img src={xiangImg} />
 
-          </div>
 
+          {
 
+            props.recentFlag ?
 
+            <DropdownMenu class={[styles.dropdownMenu1]} overlay={false}>
 
+              <DropdownItem onChange={handleQuery} v-model={forms.audioPlayTypes} options={audioPlayTypesOption}/>
 
+            </DropdownMenu> :
 
+            <div class={styles.dropdownMenu} onClick={() => { filterShow.value = true }}>
 
+              <div>筛选</div>
 
+              <img class={filterShow.value && styles.onImg} src={xiangImg} />
 
+            </div>
 
+          }
 
           <img src={searImg} />
 
           <Field placeholder="请输入曲目名称" v-model={forms.name} autocomplete="off" onFocus={()=>{ data.isFocus = true }} onBlur={()=>{ data.isFocus = false }} />
 
           <div class={styles.searchBtn} onClick={handleQuery}>搜索</div>

A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
stats.html


Algúns arquivos non se mostraron porque demasiados arquivos cambiaron neste cambio