lex-xin 3 months ago
parent
commit
add107601a

+ 4 - 4
src/tenant/music/courseList/index.module.less

@@ -1,11 +1,11 @@
 .courseList {
   min-height: 100vh;
-  // background-image: url('../../images/bg.png');
-  background: linear-gradient( 180deg, #FFE8CE 0%, rgba(251,233,213,0) 100%) #F8F8F8;
+  background-image: url('../../images/bg.png');
+  // background: linear-gradient( 180deg, #FFE8CE 0%, rgba(251,233,213,0) 100%) #F8F8F8;
   background-size: 100% 346px;
   background-repeat: no-repeat;
   box-sizing: border-box;
-  // background-color: #fafafa;
+  background-color: #F8F8F8;
 }
 
 .periodContent {
@@ -86,7 +86,7 @@
   .searchGroup {
     padding: 3px 10px 3px 7px;
     border-radius: 19px;
-    border: 1px solid rgba(255,128,87,0.5);
+    border: 1px solid rgba(254,36,81,0.4);
     font-size: 14px;
     color: rgba(0,0,0,0.4);
     line-height: 20px;

+ 1 - 1
src/tenant/music/courseListSearch/child-node.tsx

@@ -78,7 +78,7 @@ const ChildNode = defineComponent({
     const formatName = (name: string) => {
       if(!name || !props.search) return name
       const search: any = props.search
-      return name.replace(search, `<span style="color: #01C1B5;">${search}</span>`)
+      return name.replace(search, `<span style="color: #FE2451;">${search}</span>`)
     }
 
     console.log(props.collapse, "collapse")

+ 1 - 1
src/tenant/music/courseListSearch/index.module.less

@@ -155,7 +155,7 @@
 
 .finch {
   width: 150px;
-  margin: 140px auto 0;
+  margin: 20px auto 0;
 }
 
 .finchLoad {

+ 0 - 1
src/tenant/music/courseListSearch/index.tsx

@@ -13,7 +13,6 @@ import { useRoute } from 'vue-router';
 // import OEmpty from '@/components/o-empty';
 import { Cell, Collapse, CollapseItem } from 'vant';
 import ChildNode, { getImage } from './child-node';
-import iconSearch from './image/icon-search.png'
 import iconMenu from './image/icon-menu.png';
 import TheSticky from '@/components/the-sticky';
 import ColHeader from '@/components/col-header';

+ 29 - 10
src/tenant/music/coursewarePlay/component/point.module.less

@@ -44,19 +44,21 @@
     .van-search {
       padding-top: 10px !important;
       padding-bottom: 10px !important;
-    }
-    .van-search__content {
-      background: rgba(255,255,255,0.15) !important; 
-      border-color: transparent !important;
-
-      input::placeholder {
-        color: rgba(255,255,255,0.6) !important;
-      }
 
-      input {
-        color: rgba(255,255,255,0.9) !important;
+      .van-search__content {
+        background: rgba(255,255,255,0.15) !important; 
+        border-color: transparent !important;
+  
+        input::placeholder {
+          color: rgba(255,255,255,0.6) !important;
+        }
+  
+        input {
+          color: rgba(255,255,255,0.9) !important;
+        }
       }
     }
+    
     // .van-button {
     //   border-color: #FF8057 !important;
     //   background-color: #FF8057 !important;
@@ -71,6 +73,23 @@
   flex: 1;
   overflow-y: auto;
   padding: 0 20px;
+
+  .lading {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    font-size: 14px;
+    .loadingText {
+      padding-left: 8px;
+      color: rgba(255, 255, 255, 0.8);
+    }
+  }
+
+  :global {
+    .col-result-container {
+      padding-top: 0;
+    }
+  }
 }
 
 .collapse {

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

@@ -80,12 +80,12 @@ 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: #01C1B5;">${search}</span>`)
+      return name.replace(search, `<span style="color: #FE2451;">${search}</span>`)
    }
     return () => (
       <div class={styles.container}>
         <div class={styles.pointHeadSearch}>
-          <ColSearch type={'tenant'} placeholder='请输入素材关键词' modelValue={pointData.search} background='transparent' onSearch={(val: any) => {
+          <ColSearch type={'tenant'} inputBackground="white" placeholder='请输入素材关键词' modelValue={pointData.search} background='transparent' onSearch={(val: any) => {
             // 
             if(props.loading) return
             pointData.isSearch = true
@@ -101,7 +101,7 @@ export default defineComponent({
           </div>}
           
           {/* {props.loading && <OLoading />} */}
-          {!props.loading && !props.data.length &&  <ColResult btnStatus={false} tips="暂无搜索结果" />}
+          {!props.loading && !props.data.length &&  <ColResult classImgSize="SMALL" btnStatus={false} tips="暂无搜索结果" />}
           {props.data.length > 0 ? <Collapse
             class={styles.collapse}
             modelValue={pointData.active}

+ 10 - 3
src/tenant/music/coursewarePlay/index.tsx

@@ -460,7 +460,7 @@ export default defineComponent({
                       coursewareDetailId: itemResult.coursewareDetailId,
                       knowledgePointId: [itemResult.coursewareDetailId, item.knowledgePointId],
                       materialId: item.id,
-                      id: index + ''
+                      id: (i * 1000 + '') + index + ''
                     };
                   });
                 }
@@ -482,7 +482,7 @@ export default defineComponent({
                         content: item.content,
                         knowledgePointId: [itemResult.coursewareDetailId, n.id, item.knowledgePointId],
                         materialId: item.id,
-                        id: index + ''
+                        id: (i * 1000 + '') + index + ''
                       };
                     });
                     return cn;
@@ -891,6 +891,13 @@ export default defineComponent({
       if(data.source === 'search') {
         const item = data.itemList[index];
         data.detail = detailList.value?.find((child: any) => child.coursewareDetailId === item.coursewareDetailId)
+        popupData.tabActive = item.knowledgePointId;
+        popupData.itemActive = item.id;
+        popupData.itemName = item.name;
+        popupData.tabName = item.tabName;
+        if (item.typeCode == 'SONG') {
+          activeData.model = true;
+        }
       }
       // 如果是当前正在播放 或者是视频最后一个
       if (popupData.activeIndex == index) return
@@ -1387,7 +1394,7 @@ export default defineComponent({
                       }
                     })
                     data.itemList = tempList || []
-                    data.search = JSON.parse(JSON.stringify(data.searchTemp))
+                    data.search = data.searchTemp ? JSON.parse(JSON.stringify(data.searchTemp)) : ''
                   }
                   toggleMaterial(res.itemActive);
                 }}