Merge branch 'newVersion' into online

src/components/banner/index.module.less

@@ -1,13 +1,17 @@
 .mySwiper {
   cursor: pointer;
 }
+.bannerImg {
+  object-fit: cover;
+  height: 400px;
+}
 
 :global {
   .bannerSwiper {
 
     .mySwiper {
       overflow: hidden;
-      min-height: 400px;
+      height: 400px;
       &:hover {
         .myprev,
         .mynext {
@@ -52,7 +56,7 @@
     .swiper-pagination {
       // height: 6px;
       // background-color: #fff;
-      bottom: 31px !important;
+      bottom: 24px !important;
     }
     .swiper-pagination-bullet-active {
       width: 50px;

src/components/banner/index.tsx

@@ -86,6 +86,7 @@ export default defineComponent({
                     <img
                       src={item.coverImage}
                       alt=""
+                      class={classes.bannerImg}
                       onClick={() => {
                         gotoBannerInfo(item)
                       }}

src/components/hotSearch/index.module.less

@@ -225,7 +225,8 @@
           margin-bottom: 14px;
           color: #666;
           font-size: 15px;
-          width: 80px;
+          min-width: 80px;
+          padding: 0 22px;
           height: 40px;
           text-align: center;
           border-radius: 10px;

src/views/albumDetail/index.module.less

@@ -47,6 +47,7 @@
           width: 190px;
           height: 190px;
           margin-right: 22px;
+
           .albumCover {
             width: 190px;
             height: 190px;
@@ -64,6 +65,7 @@
           // }
         }
         .albumInfoTopConent {
+          flex:1;
           h2 {
             font-size: 24px;
             font-family: PingFangSC-Semibold, PingFang SC;
@@ -85,7 +87,7 @@
             white-space: normal !important;
             -webkit-line-clamp: 4;
             -webkit-box-orient: vertical;
-            height: 95px;
+            min-height: 95px;
           }
           .tagWrap {
             display: flex;

src/views/musicLibrary/modals/albumItem/index.module.less

@@ -42,8 +42,8 @@
   .hold {
     .masker {
       visibility: hidden;
-      width: 180px;
-      height: 180px;
+      width: 186px;
+      height: 186px;
       background-color: rgba(0, 0, 0, 0.4);
       position: absolute;
       top: 0;
@@ -59,8 +59,8 @@
       }
     }
     position: relative;
-    width: 180px;
-    height: 180px;
+    width: 186px;
+    height: 186px;
     border-radius: 10px;
     overflow: hidden;
     img {
@@ -90,7 +90,7 @@
     overflow: hidden;
     text-overflow: ellipsis;
     white-space: nowrap;
-    width: 180px;
+    width: 186px;
   }
 
   span {

src/views/musicLibrary/modals/searchAlbum.tsx

@@ -34,7 +34,7 @@ export default defineComponent({
       isshowData: false,
       pageInfo: {
         // 分页规则
-        limit: 10, // 限制显示条数
+        limit: 40, // 限制显示条数
         page: 1, // 当前页
         total: 0, // 总条数
         page_size: [5,10, 20, 40, 50] // 选择限制显示条数

src/views/videoDetailList/index.module.less

@@ -174,7 +174,7 @@
 .detailRight {
   width: 360px;
   .teacherInfo {
-    padding: 18px 6px 24px 20px;
+    padding: 26px 6px 20px 24px;
     background-color: #fff;
     h2 {
       font-size: 18px;

src/views/videoDetailList/videoDetail.tsx

@@ -29,6 +29,7 @@ import { getUserInfo, getUserType, getAuth } from '@/helpers/utils'
 import showVideoDetail from './modals/showVideoDetail'
 import bookIcon from './images/bookIcon.png'
 import tree from './images/tree.png'
+import styleBG from './images/styleBG.jpg'
 import { ElDialog } from 'element-plus'
 export default defineComponent({
   name: 'videoDetailList',
@@ -284,17 +285,18 @@ export default defineComponent({
                     <p class={styles.fens}>粉丝数</p>
                   </div>
                 </div>
-                <div class={styles.titleWrap}>
+                {state.teacherDetail.introduction?  <div class={styles.titleWrap}>
                   {/* <img src={peopleIcon} alt="" /> */}
                   <span>个人介绍</span>
-                </div>
+                </div>:null}
                 <p class={styles.teacherDetail}>
                   {state.teacherDetail.introduction}
                 </p>
-                <div class={styles.titleWrap}>
+                {state.teacherDetail.styleVideo?  <div class={styles.titleWrap}>
                   {/* <img src={teacherIcon} alt="" /> */}
                   <span>老师风采</span>
-                </div>
+                </div>:null}
+
                 <div class={styles.teacherVideoList}>
                   {state.teacherDetail.styleVideo &&
                     state.teacherDetail.styleVideo.map((item: any) => {
@@ -314,7 +316,7 @@ export default defineComponent({
                             src={item.videoUrl}
                             controls={false}
                           ></video> */}
-                          <img  class={styles.videoItemVideo} src={item.cover} alt="" />
+                          <img  class={styles.videoItemVideo} src={item.cover?item.cover:styleBG} alt="" />
                           <img src={player} alt="" class={styles.player} />
                         </div>
                       )