提交

1

src/components/col-header/index.css

@@ -12,6 +12,7 @@
   margin-right:55px;
   width: 113px;
   height: 26px;
+  cursor: pointer;
 }
 
 .normalItem {

src/components/col-header/index.tsx

@@ -45,6 +45,11 @@ export default defineComponent({
       scrollTop > 70 ? (this.isTop = true) : (this.isTop = false)
     })
   },
+  methods:{
+    gotoMain(){
+      this.$router.push({path:'/'})
+    }
+  },
   watch: {
     $route(res: any) {
       console.log(res)
@@ -73,7 +78,7 @@ export default defineComponent({
           ]}
         >
           <div class="flex items-center h-full">
-            <div class="logoWrap">
+            <div class="logoWrap" onClick={()=>this.gotoMain()}>
               <img class="w-full" src={logo} alt="" />
             </div>
             <div class="flex">

src/components/col-header/modals/index.module.less

@@ -68,7 +68,7 @@
       font-size: 18px;
       font-family: PingFangSC-Medium, PingFang SC;
       font-weight: 500;
-      color: #000000;
+      color: #333;
       line-height: 25px;
     }
     .dropdownItemsubTitle {

src/components/hotSearch/index.module.less

@@ -19,7 +19,7 @@
     }
     h5 {
       font-weight: 500;
-      color: #000000;
+      color: #333;
       line-height: 28px;
       font-size: 20px;
     }
@@ -33,8 +33,8 @@
       color: #666;
     }
     .arrow {
-      width: 20px;
-      height: 20px;
+      width: 16px;
+      height: 16px;
       margin-left: 8px;
     }
   }

src/components/searchInput/index.module.less

@@ -9,7 +9,7 @@
   border-radius: 30px;
   overflow: hidden;
   border: none !important;
-  padding: 0 20px;
+  padding: 0 10px 0 20px;
 }
 :global {
   .inputSelect {
@@ -40,13 +40,13 @@
   }
   .el-select {
     --el-select-input-focus-border-color: transparent;
-    color: #000!important;;
+    color: #333!important;;
 
     font-weight: 500;
   }
   .el-select .el-input.is-focus .el-input__inner {
     border: 0px !important;
-    color: #000!important;;
+    color: #333!important;;
 
     font-weight: 500;
   }

src/components/searchInput/while.module.less

@@ -40,13 +40,13 @@
     }
     .el-select {
       --el-select-input-focus-border-color: transparent;
-      color: #000 !important;
+      color: #333 !important;
 
       font-weight: 500;
     }
     .el-select .el-input.is-focus .el-input__inner {
       border: 0px !important;
-      color: #000 !important;
+      color: #333 !important;
 
       font-weight: 500;
     }

src/views/albumDetail/index.module.less

@@ -41,7 +41,7 @@
           font-size: 24px;
           font-family: PingFangSC-Semibold, PingFang SC;
           font-weight: 600;
-          color: #000000;
+          color: #333;
           line-height: 37px;
           margin-bottom: 16px;
         }
@@ -116,7 +116,7 @@
       line-height: 48px;
       font-size: 20px;
       font-weight: 600;
-      color: #000000;
+      color: #333;
       display: flex;
       flex-direction: row;
       align-items: center;
@@ -149,7 +149,7 @@
           flex-direction: row;
           align-items: center;
           font-weight: 600;
-          color: #000000;
+          color: #333;
           line-height: 30px;
           font-size: 18px;
           img {

src/views/albumDetail/modals/index.module.less

@@ -11,7 +11,7 @@
     line-height: 25px;
     font-size: 16px;
     font-weight: 500;
-    color: #000000;
+    color: #333;
     margin: 8px 0 0;
   }
   .hold {

src/views/downLoad/index.module.less

@@ -60,7 +60,7 @@
           border-radius: 14px;
           margin-right: 40px;
           h5 {
-            color: #000;
+            color: #333;
             font-size: 20px;
             margin-bottom: 16px;
             font-weight: 500;

src/views/muiscDetial/index.module.less

@@ -28,7 +28,7 @@
         p {
           min-width: 60px;
           font-weight: 600;
-          color: #000000;
+          color: #333;
           line-height: 28px;
         }
       }
@@ -81,7 +81,7 @@
         font-size: 16px;
         font-family: PingFangSC-Semibold, PingFang SC;
         font-weight: 600;
-        color: #000000;
+        color: #333;
         line-height: 22px;
         position: absolute;
         z-index: 10;
@@ -129,7 +129,7 @@
       font-size: 18px;
       font-family: PingFangSC-Semibold, PingFang SC;
       font-weight: 600;
-      color: #000000;
+      color: #333;
       line-height: 28px;
       margin-bottom: 15px;
     }
@@ -151,7 +151,7 @@
         font-size: 16px;
         font-family: PingFangSC-Regular, PingFang SC;
         font-weight: 400;
-        color: #000000;
+        color: #333;
         line-height: 25px;
       }
     }
@@ -195,7 +195,7 @@
             font-size: 18px;
             font-family: PingFangSC-Semibold, PingFang SC;
             font-weight: 600;
-            color: #000000;
+            color: #333;
             line-height: 28px;
             span {
               margin-right: 12px;
@@ -245,7 +245,7 @@
           font-size: 20px;
           font-family: PingFangSC-Medium, PingFang SC;
           font-weight: 500;
-          color: #000000;
+          color: #333;
           line-height: 28px;
           img {
             width: 26px;
@@ -264,7 +264,7 @@
         padding-bottom: 12px;
         span {
           font-size: 20px;
-          color: #000;
+          color: #333;
           line-height: 28px;
           font-weight: 600;
         }
@@ -317,7 +317,7 @@
         h5 {
           font-size: 16px;
           font-weight: 500;
-          color: #000000;
+          color: #333;
           line-height: 30px;
         }
         .wrapRight {
@@ -338,7 +338,7 @@
         font-size: 18px;
         font-family: PingFangSC-Semibold, PingFang SC;
         font-weight: 600;
-        color: #000000;
+        color: #333;
         line-height: 25px;
         margin-bottom: 14px;
       }

src/views/musicLibrary/index.module.less

@@ -44,7 +44,7 @@
     margin-top: 37px;
     font-size: 22px;
     font-weight: 500;
-    color: #000000;
+    color: #333;
     line-height: 30px;
   }
   padding: 34px 0 15px;
@@ -90,7 +90,7 @@
     h5 {
       font-size: 22px;
       font-weight: 500;
-      color: #000000;
+      color: #333;
       line-height: 30px;
       margin-bottom: 14px;
     }

src/views/musicLibrary/index.tsx

@@ -96,7 +96,7 @@ export default defineComponent({
 
               <searchInput isWhile={false} onStartSearch={(val:any)=>gotoSearch(val)}></searchInput>
               <div class={styles.hotSearch}>
-              <hotSearch onHotTag={(val:string)=>{gotoSearch(val)}} type={''}></hotSearch>
+              <hotSearch onHotTag={(val:string)=>{gotoSearch(val)}} type={'more'}></hotSearch>
               </div>
               <h5 class={styles.hotAlbum}>热门专辑</h5>
               <div class={styles.albumList}>

src/views/user-info/live-operation/course-preview/index.module.less

@@ -118,7 +118,7 @@
   justify-content: space-around;
   .videoTitleText {
     font-size: 15px;
-    color: #000;
+    color: #333;
     max-width: 210px;
   }
   .videoTitleContent {

src/views/user-info/model/practice-timer/index.module.less

@@ -11,7 +11,7 @@
   .tipsTitle {
     font-size: 18px;
     font-weight: 500;
-    color: #000000;
+    color: #333;
     line-height: 25px;
   }
 

src/views/user-info/video-operation/course-preview/index.module.less

@@ -118,7 +118,7 @@
   justify-content: space-around;
   .videoTitleText {
     font-size: 15px;
-    color: #000;
+    color: #333;
     max-width: 210px;
   }
   .videoTitleContent {

src/views/videoDetailList/index.module.less

@@ -34,7 +34,7 @@
     font-size: 18px;
     font-family: PingFangSC-Medium, PingFang SC;
     font-weight: 600;
-    color: #000000;
+    color: #333;
     line-height: 28px;
     img {
       width: 22px;
@@ -70,7 +70,7 @@
       font-size: 18px;
       font-family: PingFangSC-Medium, PingFang SC;
       font-weight: 600;
-      color: #000000;
+      color: #333;
       line-height: 28px;
       align-items: center;
       img {
@@ -118,7 +118,7 @@
           font-size: 18px;
           font-family: PingFangSC-Semibold, PingFang SC;
           font-weight: 600;
-          color: #000000;
+          color: #333;
           line-height: 25px;
           span {
             margin-right: 12px;
@@ -169,7 +169,7 @@
         font-size: 20px;
         font-family: PingFangSC-Medium, PingFang SC;
         font-weight: 500;
-        color: #000000;
+        color: #333;
         line-height: 28px;
         img {
           width: 26px;
@@ -189,7 +189,7 @@
       font-size: 16px;
       span {
         font-size: 16px;
-        color: #000;
+        color: #333;
         line-height: 28px;
         font-weight: 600;
       }
@@ -239,7 +239,7 @@
       font-size: 16px;
       font-family: PingFangSC-Semibold, PingFang SC;
       font-weight: 600;
-      color: #000000;
+      color: #333;
       line-height: 30px;
       margin-bottom: 11px;
     }

src/views/videoDetailList/modals/showVideoDetail.tsx

@@ -34,9 +34,10 @@ export default defineComponent({
     }
     return () => (
       <>
-        {/*   styleValue={{ with: '159px', height: '89px' }} */}
+        {/*    */}
         <div class={classes.wrap}>
           <colVideo
+          styleValue={{ with: '800px', height: '450px' }}
             controls={false}
             src={state.item.videoUrl}
             class={classes.videoItemVideo}

src/views/videoDetailList/modals/videoCourseItem.module.less

@@ -2,7 +2,7 @@
   display: flex;
   flex-direction: row;
   margin-bottom: 12px;
-  img {
+  .videoImgWrapImg {
     width: 240px;
     margin-right: 10px;
   }
@@ -22,14 +22,14 @@
   .courseInfo {
     padding-top: 8px;
     h4 {
-      font-size: 20px;
+      font-size: 17px;
       font-weight: 600;
-      color: #000000;
+      color: #333;
       line-height: 28px;
       margin-bottom: 2px;
     }
     .courseDetial {
-      font-size: 18px;
+      font-size: 16px;
       font-family: PingFangSC-Regular, PingFang SC;
       font-weight: 400;
       color: #666666;
@@ -40,7 +40,6 @@
       -webkit-line-clamp: 4;
       -webkit-box-orient: vertical;
     }
-
   }
 }
 .scanTxt {
@@ -48,29 +47,29 @@
     color: var(--el-color-primary);
   }
 }
+.videoWrap {
+  :global {
+    .el-dialog {
+      --el-dialog-width: 440px !important;
+      --el-dialog-bg-color: transparent !important;
+    }
+    .el-dialog__header,
+    .el-dialog__body {
+      padding: 0;
+    }
+    --el-border-color-light: transparent !important;
+    .el-tabs {
+      --el-tabs-header-height: 35px !important;
+    }
 
-:global {
-
-  .el-dialog {
-    --el-dialog-width: 440px !important;
-    --el-dialog-bg-color: transparent !important;
-  }
-  .el-dialog__header,
-  .el-dialog__body {
-    padding: 0;
-  }
-  --el-border-color-light: transparent !important;
-  .el-tabs {
-    --el-tabs-header-height: 35px !important;
-  }
-
-  .el-tabs__content {
-    overflow: inherit;
-  }
+    .el-tabs__content {
+      overflow: inherit;
+    }
 
-  .el-tabs__item {
-    @apply text-lg !important;
-    --el-text-color-primary: #666 !important;
+    .el-tabs__item {
+      @apply text-lg !important;
+      --el-text-color-primary: #666 !important;
+    }
   }
 }
 

src/views/videoDetailList/modals/videoCourseItem.tsx

@@ -1,5 +1,4 @@
-
-import { defineComponent , toRefs, reactive, onMounted, ref,watch } from 'vue'
+import { defineComponent, toRefs, reactive, onMounted, ref, watch } from 'vue'
 import player from '../images/player.png'
 import classes from './videoCourseItem.module.less'
 import detaile from '@/components/videoDetailItem/images/detaile.png'
@@ -14,14 +13,14 @@ export default defineComponent({
       default: {}
     }
   },
-  components:{
-    downModel,
+  components: {
+    downModel
   },
   setup(props, conent) {
     const state = reactive({
-      title:props.item,
-      item:props.item,
-      showDown:false
+      title: props.item,
+      item: props.item,
+      showDown: false
     })
     watch(
       () => props.item,
@@ -31,28 +30,34 @@ export default defineComponent({
     )
     return () => (
       <>
-        <div class={classes.videoWrap} onClick={()=>{state.showDown = true}}>
-          <div  class={classes.videoImgWrap}>
-          <img src={state.item.coverUrl?state.item.coverUrl: detaile} alt="" />
-          <img src={player} alt="" class={classes.player} />
+        <div
+          class={classes.videoWrap}
+          onClick={() => {
+            state.showDown = true
+          }}
+        >
+          <div class={classes.videoImgWrap}>
+            <img
+          class={ classes.videoImgWrapImg}
+              src={state.item.coverUrl ? state.item.coverUrl : detaile}
+              alt=""
+            />
+            <img src={player} alt="" class={classes.player} />
           </div>
 
-            <div class={classes.courseInfo}>
-              <h4>{state.item.videoTitle}</h4>
-              <p class={classes.courseDetial}>
-              {state.item.videoContent}
-              </p>
-            </div>
-
-        </div>
-        <ElDialog
+          <div class={classes.courseInfo}>
+            <h4>{state.item.videoTitle}</h4>
+            <p class={classes.courseDetial}>{state.item.videoContent}</p>
+          </div>
+          <ElDialog
             modelValue={state.showDown}
             onUpdate:modelValue={val => (state.showDown = val)}
             closeOnClickModal={false}
             closeOnPressEscape={false}
           >
-            <downModel onClose={()=>state.showDown = false}></downModel>
+            <downModel onClose={() => (state.showDown = false)}></downModel>
           </ElDialog>
+        </div>
       </>
     )
   }

src/views/videoDetailList/videoDetail.tsx

@@ -82,8 +82,8 @@ export default defineComponent({
         page_size: [5, 20, 40, 50] // 选择限制显示条数
       },
       userType: '',
-      showVideoDetail:false,
-      activeItem:null as any
+      showVideoDetail: false,
+      activeItem: null as any
     })
 
     const route = useRoute()
@@ -169,9 +169,9 @@ export default defineComponent({
         console.log(e)
       }
     }
-    const openVideo = (item:any)=>{
-      state.activeItem = item;
-      state.showVideoDetail = true;
+    const openVideo = (item: any) => {
+      state.activeItem = item
+      state.showVideoDetail = true
     }
     onMounted(() => {
       if (route.query.id) {
@@ -298,14 +298,21 @@ export default defineComponent({
                   {state.teacherDetail.styleVideo &&
                     state.teacherDetail.styleVideo.map((item: any) => {
                       return (
-                        <div class={styles.videoItem} onClick={()=>openVideo(item)}>
+                        <div
+                          class={styles.videoItem}
+                          onClick={() => openVideo(item)}
+                        >
                           {/* <colVideo
                             styleValue={{ with: '159px', height: '89px' }}
                             controls={false}
                             src={item.videoUrl}
                             class={styles.videoItemVideo}
                           /> */}
-                          <video  class={styles.videoItemVideo}   src={item.videoUrl} controls={false}></video>
+                          <video
+                            class={styles.videoItemVideo}
+                            src={item.videoUrl}
+                            controls={false}
+                          ></video>
                           <img src={player} alt="" class={styles.player} />
                         </div>
                       )
@@ -338,12 +345,16 @@ export default defineComponent({
             </div>
           </div>
           <ElDialog
+          title='个人风采'
             modelValue={state.showVideoDetail}
             onUpdate:modelValue={val => (state.showVideoDetail = val)}
             closeOnClickModal={true}
             closeOnPressEscape={false}
           >
-            <showVideoDetail item={state.activeItem} onClose={()=>state.showVideoDetail = false}></showVideoDetail>
+            <showVideoDetail
+              item={state.activeItem}
+              onClose={() => (state.showVideoDetail = false)}
+            ></showVideoDetail>
           </ElDialog>
         </div>
       </>