Merge branch 'hqyDevNewVersion' of http://git.dayaedu.com/liushengqiang/music-score into feature-tianyong-newVersion

src/page-instrument/component/the-music-list/index.module.less

@@ -113,6 +113,7 @@
                     font-weight: 400;
                     font-size: 13px;
                     color: #131415;
+                    caret-color: #1cacf1;
                     &::placeholder{
                         color: #AAAAAA;
                     }
@@ -171,7 +172,7 @@
                         .van-cell{
                             margin-top: 6px;
                             padding: 0;
-                            font-weight: 500;
+                            font-weight: 400;
                             font-size: 14px;
                             color: #323233;
                             line-height: 32px;
@@ -186,6 +187,7 @@
                                 background: #EEF8FF;
                                 border-radius: 4px;
                                 color: #1CACF1;
+                                font-weight: 500;
                             }
                             .van-cell__value{
                                 display: none;
@@ -269,11 +271,12 @@
             .usedNum{
                 display: flex;
                 align-items: center;
-                padding: 3px 5px;
-                height: 17px;
+                padding: 0 5px;
+                height: 14px;
                 background: #FFF8F7;
                 border-radius: 4px;
-                border: 1px solid #FFC5C5;
+                border: 0.6px solid #FFC5C5;
+                font-size: 10px;
                 >img{
                     width: 8px;
                     height: 11px;
@@ -281,7 +284,6 @@
                 >div{
                     margin-left: 3px;
                     font-weight: 400;
-                    font-size: 12px;
                     color: #FF6A6A
                 }
             }
@@ -294,12 +296,12 @@
             .playType,.singType{
                 margin-left: 5px;
                 width: 26px;
-                height: 17px;
+                height: 14px;
                 background: #FFFFFF;
                 border-radius: 3px;
                 text-align: center;
-                line-height: 17px;
-                border: 1px solid #15B2FD;
+                line-height: 14px;
+                border: 0.6px solid #15B2FD;
                 font-weight: 400;
                 font-size: 10px;
                 color: #15B2FD;

src/page-instrument/component/the-music-list/list.tsx

@@ -100,6 +100,11 @@ export default defineComponent({
           _t: Date.now(),
         });
     };
+    function formatNumber(num:number) {
+      return num >= 10000 
+          ? (num / 10000).toFixed(1).replace(/\.0$/, '') + "万" 
+          : num.toString();
+    }
     return () => (
       <div class={styles.wrap}>
         <div class={[styles.searchBox,data.isFocus && styles.isFocus]}>
@@ -129,7 +134,7 @@ export default defineComponent({
                 <div class={styles.content}>
                   <p class={styles.name}>{item.musicSheetName}</p>
                   <div class={styles.detail}>
-                    {item.usedNum && <div class={styles.usedNum}><img src={huoimg}/><div>{item.usedNum}</div></div>}
+                    {item.usedNum && <div class={styles.usedNum}><img src={huoimg}/><div>{formatNumber(item.usedNum)}</div></div>}
                     {
                       item.audioPlayTypes && item.audioPlayTypes.split(",").sort().map((type:"PLAY"|"SING")=>{
                         return <div class={type==="PLAY"?styles.playType:styles.singType}>{type==="PLAY"?"演奏":"演唱"}</div>

src/page-instrument/custom-plugins/helper-model/recommendation/index.module.less

@@ -14,8 +14,18 @@
     }
     &.evaluating{
         .head{
+            width: 394px;
+            height: 62px;
+            margin-bottom: -3px;
             background: url("/src/page-instrument/header-top/image/headImg2.png") no-repeat;
             background-size: 100% 100%; 
+            .headTit{
+                bottom: 11px;
+            }
+            .closeImg{
+                top: 2px;
+                right: -26px;
+            }
         }
         .content{
             background: #B0CDFF;

src/page-instrument/header-top/speed/index.module.less

@@ -17,8 +17,18 @@
     }
     &.evaluating{
         .head{
+            width: 394px;
+            height: 62px;
+            margin-bottom: -3px;
             background: url("../image/headImg2.png") no-repeat;
             background-size: 100% 100%; 
+            .headTit{
+                bottom: 11px;
+            }
+            .closeImg{
+                top: 2px;
+                right: -26px;
+            }
         }
         .content{
             background: #B0CDFF;

src/view/plugins/toggleMusicSheet/choosePartName/index.module.less

@@ -26,8 +26,18 @@
 }
 &.evaluating{
     .head{
-        background: url("../../../../page-instrument/header-top/image/headImg2.png") no-repeat;
-        background-size: 100% 100%; 
+      width: 394px;
+      height: 62px;
+      margin-bottom: -3px;
+      background: url("/src/page-instrument/header-top/image/headImg2.png") no-repeat;
+      background-size: 100% 100%; 
+      .headTit{
+          bottom: 11px;
+      }
+      .closeImg{
+          top: 2px;
+          right: -26px;
+      }
     }
     .pickerCon{
         background: #B0CDFF;