Merge branch 'iteration-courseware-search'

src/components/col-result/index.tsx

@@ -49,6 +49,10 @@ export default defineComponent({
       type: String,
       default: '我知道了'
     },
+    projectType: {
+      type: String,
+      default: ""
+    },
     onClick: Function
   },
   methods: {
@@ -84,7 +88,7 @@ export default defineComponent({
           break
         case 'network':
           image =
-            state.projectType === 'tenant'
+            state.projectType === 'tenant' || this.projectType === "tenant"
               ? getAssetsHomeFile('network_tenant.png')
               : getAssetsHomeFile('network.png')
           break
@@ -93,13 +97,13 @@ export default defineComponent({
           break
         case 'notFond':
           image =
-            state.projectType === 'tenant'
+            state.projectType === 'tenant' || this.projectType === "tenant"
               ? getAssetsHomeFile('notFond_tenant.png')
               : getAssetsHomeFile('notFond.png')
           break
         default:
           image =
-            state.projectType === 'tenant'
+            state.projectType === 'tenant' || this.projectType === "tenant"
               ? getAssetsHomeFile('empty_tenant.png')
               : getAssetsHomeFile('empty.png')
           break

src/tenant/music/courseListSearch/index.module.less

@@ -1,8 +1,11 @@
 .courseListSearch {
+  // display: flex;
+  // flex-direction: column;
   min-height: 100vh;
-  background-color: #F8F8F8;
+  
   // background: linear-gradient(180deg, #7defe6 0%, rgba(255, 255, 255, 0) 170px);
-  background: linear-gradient( 180deg, #FCE5FA 0%, rgba(255,255,255,0) 100%);
+  background: linear-gradient( 180deg, #FCE5FA 0%, rgba(255,255,255,0) 170px);
+  background-color: #F8F8F8;
   box-sizing: border-box;
 
   :global {
@@ -18,8 +21,14 @@
       padding-left: 0;
     }
 
-    .o-result-container {
-      height: 90vh;
+    .col-result-container {
+      // height: 90vh;
+      height: 80%;
+      padding-top: 0;
+      padding-bottom: 0;
+      display: flex;
+      align-items: center;
+      justify-content: center;
     }
   }
 }

src/tenant/music/courseListSearch/index.tsx

@@ -414,7 +414,7 @@ export default defineComponent({
               ></Vue3Lottie>
               {/* <p class={styles.finchLoad}>加载中...</p> */}
             </div>}
-          {!data.loading && !data.list.length && <ColResult btnStatus={false} tips="暂无搜索结果" />}
+          {!data.loading && !data.list.length && <ColResult projectType='tenant' btnStatus={false} tips="暂无搜索结果" />}
         </div>
       </div>
     );

src/tenant/music/coursewarePlay/component/musicScore.tsx

@@ -46,6 +46,7 @@ export default defineComponent({
           id: props.music.content,
           Authorization: Authorization,
           isHideBack: "true",
+          isHideLoading: "true",
           limitModel: 'practice', // 只显示练习模式
           systemType: browserInfo.isStudent ? 'student' : 'teacher',
         }

src/tenant/music/coursewarePlay/component/points-search.tsx

@@ -80,7 +80,7 @@ export default defineComponent({
     function formatName(name: string) {
       if (!name || !pointData.search) return name
       const search: any = pointData.search
-      return name.replace(search, `<span style="color: #FE2451;">${search}</span>`)
+      return name.replace(search, `<span style="color: #FF6E8E;">${search}</span>`)
    }
     return () => (
       <div class={styles.container}>
@@ -101,7 +101,7 @@ export default defineComponent({
           </div>}
           
           {/* {props.loading && <OLoading />} */}
-          {!props.loading && !props.data.length &&  <ColResult classImgSize="SMALL" btnStatus={false} tips="暂无搜索结果" />}
+          {!props.loading && !props.data.length &&  <ColResult projectType='tenant' classImgSize="SMALL" btnStatus={false} tips="暂无搜索结果" />}
           {props.data.length > 0 ? <Collapse
             class={styles.collapse}
             modelValue={pointData.active}