lex-xin 8 місяців тому
батько
коміт
1e41e94a1b

+ 13 - 6
src/views/cloudPractice/cloudPractice.tsx

@@ -95,6 +95,7 @@ export default defineComponent({
                xmlUrl: item?.xmlUrl,
                musicSheetType: item?.musicSheetType,
                audioFileUrl,
+               // titleImg: list?.titleImg,
                isComberRender: false
             }
          } else if (userStoreHook.roles === "GYT") {
@@ -105,7 +106,8 @@ export default defineComponent({
                xmlUrl: list?.xmlFileUrl,
                musicSheetType: list?.musicSheetType,
                audioFileUrl: list?.audioFileUrl,
-               isComberRender: list?.musicSubject === "1"
+               titleImg: list?.titleImg,
+               isComberRender: list?.musicSubjectId === "1"
             }
          } else if (userStoreHook.roles === "KLX") {
             const item: any = list.background?.[0]
@@ -116,6 +118,7 @@ export default defineComponent({
                xmlUrl: list?.xmlFileUrl,
                musicSheetType: list?.musicSheetType,
                audioFileUrl: item?.audioFileUrl,
+               titleImg: list?.titleImg,
                isComberRender: false
             }
          }
@@ -157,7 +160,7 @@ export default defineComponent({
       const handleGetSubject_gym = async () => {
          loading.value = true
          // , { categoriesId: state.categoryId || state.firstTreeId }
-         await httpAjaxErrMsg(querySubjectIds_gym).then(res => {
+         await httpAjaxErrMsg(querySubjectIds_gym, { categoriesId: state.firstTreeId }).then(res => {
             loading.value = false
             if (res.code === 200) {
                const result = res.data || []
@@ -517,7 +520,7 @@ export default defineComponent({
       /** 初始化数据 */
       const setDefaultData = async (type?: "first" | "category" | "level" | "type") => {
          if (userStoreHook.roles === "GYM") {
-            initCategories_gym(type)
+            await initCategories_gym(type)
          } else if (userStoreHook.roles === "GYT") {
             initCategories_gyt(type)
          } else if (userStoreHook.roles === "KLX") {
@@ -525,7 +528,7 @@ export default defineComponent({
          }
       }
 
-      const initCategories_gym = (type?: "first" | "category" | "level" | "type") => {
+      const initCategories_gym = async (type?: "first" | "category" | "level" | "type") => {
          if (storeData.value.length > 0 && !["category", "level", "type"].includes(type as any)) {
             let result: any = []
             if (type === "first" && state.firstTreeId) {
@@ -541,6 +544,8 @@ export default defineComponent({
                   sysMusicScoreCategoriesList: item.sysMusicScoreCategoriesList || []
                }
             })
+
+            await handleGetSubject_gym()
          }
          if (state.categoryList.length > 0 && !["level", "type"].includes(type as any)) {
             let result: any = []
@@ -867,7 +872,9 @@ export default defineComponent({
                                        trigger="click"
                                        class={"PopSelect"}
                                     >
-                                       <span class={[styles.iconTagName, state.categoryShow && styles.show]}>{state.categoryName}</span>
+                                       <span class={[styles.iconTagName, state.categoryShow && styles.show]}>
+                                          <span>{state.categoryName}</span>
+                                       </span>
                                     </NPopselect>
                                  </div>
                               )}
@@ -951,7 +958,7 @@ export default defineComponent({
                                              lazy
                                              objectFit="cover"
                                              previewDisabled={true}
-                                             src={icon_default}
+                                             src={item.titleImg || icon_default}
                                              onLoad={(e: any) => {
                                                 ;(e.target as any).dataset.loaded = "true"
                                              }}

+ 15 - 3
src/views/cloudPractice/index.module.scss

@@ -164,13 +164,15 @@
             height: 22px;
             background: url("../../img/cloudPractice/icon-tag.png") no-repeat center;
             background-size: contain;
-            vertical-align: text-bottom;
+            // vertical-align: text-bottom;
          }
          font-weight: 600;
          font-size: 18px;
          color: #333333;
          line-height: 22px;
          height: 22px;
+         display: flex;
+         align-items: center;
 
          &::after {
             content: "";
@@ -187,6 +189,14 @@
                transform: rotate(180deg);
             }
          }
+
+         span {
+            max-width: 440px;
+            white-space: nowrap;
+            overflow: hidden;
+            text-overflow: ellipsis;
+            display: inline-block;
+         }
       }
    }
 
@@ -203,7 +213,7 @@
 
       :global {
          .el-cascader .el-input .el-input__inner {
-            color: #994D1C;
+            color: #994d1c;
          }
       }
    }
@@ -219,7 +229,7 @@
          font-size: 16px;
          .el-input__icon {
             margin-left: 0;
-            color: #994D1C;
+            color: #994d1c;
          }
       }
       .el-cascader:not(.is-disabled):hover .el-input__wrapper {
@@ -255,6 +265,8 @@
       // min-width: 294px;
       min-height: 100%;
       padding: 0 20px;
+      min-height: auto;
+      flex: 1;
       // background: #fff;
       // border-radius: 16px;
       &.wrapListEmpty {