Merge branch 'newVersion'

src/components/col-footer/index.module.less

@@ -121,7 +121,7 @@
   height: 98px;
   background: #d8d8d8;
   border-radius: 8px;
-  border: 1px solid #979797;
+  // border: 1px solid #979797;
 }
 .qrcodeWrap {
   display: flex;

src/components/videoDetailItem/index.module.less

@@ -203,7 +203,7 @@
       height: 35px;
       background: #2dc7aa;
       border-radius: 10px;
-      border: 1px solid #4bb39e;
+      // border: 1px solid #4bb39e;
       line-height: 33px;
       cursor: pointer;
       text-align: center;

src/views/albumDetail/index.module.less

@@ -1,5 +1,5 @@
 .wall {
-  height: 70px;
+  height: 60px;
   margin-bottom: 18px;
 }
 .wrap {

src/views/downLoad/index.module.less

@@ -1,14 +1,17 @@
 .bgWhite {
   background-color: #fff;
-  background: url('./images/downBg.png') no-repeat center;
-  background-size: cover;
+  position: relative;
   .wall {
     height: 60px;
   }
   .container {
-    width: 1200px;
-    margin: 0 auto;
-    padding: 127px 0 122px;
+    background: url('./images/downBg.png') no-repeat center;
+    background-size: cover;
+    // margin-top: 70px;
+    width: 1162px;
+    height: 868px;
+    margin: 60px auto 0;
+    padding: 94px 0 0px;
     display: flex;
     flex-direction: row;
     // align-items: center;
@@ -16,30 +19,36 @@
     .imgWrap {
       position: relative;
       .finch {
-        width: 200px;
-        height: 250px;
+        width: 155px;
+        height: 195px;
         position: absolute;
-        bottom: -32px;
-        left: -126px;
+        bottom: 50px;
+        left: -240px;
       }
       .demo {
         width: 427px;
       }
     }
     .textWrap {
+      padding-left: 80px;
       h4 {
-        font-size: 32px;
+        font-size: 38px;
         font-weight: 600;
         color: #333333;
-        line-height: 45px;
-        margin-bottom: 24px;
+        line-height: 53px;
+        margin-bottom: 60px;
       }
       .subtitle {
+        display: flex;
+        flex-direction: row;
+        align-items: top;
+
         font-size: 18px;
         font-weight: 400;
         color: #666666;
-        line-height: 25px;
+        line-height: 30px;
         margin-bottom: 7px;
+
         .dot {
           display: inline-block;
           width: 14px;
@@ -48,12 +57,17 @@
           border: 4px solid #e0f7f3;
           border-radius: 50%;
           margin-right: 10px;
+          position: relative;
+          top: 9px;
+        }
+        p {
+          width: 403px;
         }
       }
       .codeList {
         display: flex;
         flex-direction: row;
-        margin-top: 60px;
+        margin-top: 130px;
         .codeItem {
           background-color: #fff;
           box-shadow: 0px 1px 4px 0px rgba(0, 0, 0, 0.08);
@@ -98,4 +112,12 @@
       }
     }
   }
+  .joinWrap {
+    width: 1162px;
+    height: 150px;
+    position: absolute;
+    bottom: 0;
+    left: 50%;
+    margin-left: -581px;
+  }
 }

src/views/downLoad/index.tsx

@@ -8,6 +8,7 @@ import andIcon from './images/andIcon.png'
 import code from '@/common/images/studentCode.png'
 import studentCode from '@/common/images/studentCode.png'
 import teacherCode from '@/common/images/teacherCode.png'
+import joinUs from './images/joinUs.png'
 import { Vue3Lottie } from 'vue3-lottie'
 import 'vue3-lottie/dist/style.css'
 import AstronautJSON  from '@/common/animate/kulexiuyunjiaolian.json'
@@ -21,24 +22,22 @@ export default defineComponent({
   },
   render() {
     return (
-
+    <div>
+      <div class={styles.wall}></div>
       <div class={styles.bgWhite}>
-          <div class={styles.wall}></div>
+
         <div class={styles.container}>
-          <div class={styles.imgWrap}>
-            <img src={demo} class={styles.demo} alt="" />
-            {/* <img src={finch} class={styles.finch} alt="" /> height="200" :width="200"  */}
-            <Vue3Lottie animationData={AstronautJSON} class={styles.finch}/>
-          </div>
-          <div class={styles.textWrap}>
+        <div class={styles.textWrap}>
             <h4>下载酷乐秀APP</h4>
             <p class={styles.subtitle}>
               <span class={styles.dot}></span>
-              酷乐秀学院：器乐教学平台，课程信息一目了然,专业网络教室
+              <p> 酷乐秀学院：器乐教学平台，课程信息一目了然,专业网络教室</p>
+
             </p>
             <p class={styles.subtitle}>
               <span class={styles.dot}></span>
-              酷乐秀：您的学习好帮手，专业教师一对一，器乐练习云教练
+              <p>酷乐秀：您的学习好帮手，专业教师一对一，器乐练习云教练</p>
+
             </p>
             <div class={styles.codeList}>
               <div class={styles.codeItem}>
@@ -81,8 +80,18 @@ export default defineComponent({
               </div>
             </div>
           </div>
+          <div class={styles.imgWrap}>
+            {/* <img src={demo} class={styles.demo} alt="" /> */}
+            <Vue3Lottie animationData={AstronautJSON} class={styles.finch}/>
+          </div>
+
+        </div>
+        <div style={{'height':'110px'}}></div>
+        <div class={styles.joinWrap}>
+          <img src={joinUs} alt="" />
         </div>
       </div>
+      </div>
     )
   }
 })

src/views/home/index.module.less

@@ -10,7 +10,7 @@
   padding: 62px 0 16px;
   .titleWrap {
     text-align: left;
-    margin-bottom: 11px;
+    margin-bottom: 24px;
     display: flex;
     flex-direction: row;
     align-items: center;

src/views/muiscDetial/index.module.less

@@ -1,5 +1,5 @@
 .wall {
-  height: 70px;
+  height: 60px;
 }
 .musicWraps {
   min-height: 100vh;

src/views/videoDetailList/index.tsx

@@ -91,7 +91,7 @@ export default defineComponent({
     return () => (
       <>
         <div>
-          <div class="wall" style={{ height: '70px' }}></div>
+          <div class="wall" style={{ height: '60px' }}></div>
           <div class={styles.w1200}>
             <div class={styles.section}>
               <searchInput

src/views/videoDetailList/videoDetail.tsx

@@ -189,7 +189,7 @@ export default defineComponent({
     return () => (
       <>
         <div class={styles.allWrap}>
-          <div class="wall" style={{ height: '70px' }}></div>
+          <div class="wall" style={{ height: '60px' }}></div>
           <div class={[styles.w1200, styles.detailWrap]}>
             <div class={styles.detailLeft}>
               <img