TIANYONG преди 6 месеца
родител
ревизия
65a8d1e5a8

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

@@ -13,7 +13,9 @@
                 justify-content: center;
                 height: 22px;
                 .van-tabs__nav--line{
-                    padding-bottom: 0;
+                    padding: 0 50px 0 66px;
+                    width: 100%;
+                    justify-content: space-between;
                     background-color: initial;
                     .van-tab{
                         text-align: center;

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

@@ -99,9 +99,9 @@
                                     margin-bottom: 6px;
                                 }
                                 &.van-dropdown-item__option--active{
-                                    background: #E6F9F8;
+                                    background: #E5F8F4;
                                     border-radius: 8px;
-                                    color: #00B2A7;
+                                    color: #14B698;
                                     font-weight: 600;
                                 }
                                 .van-cell__value{
@@ -114,8 +114,8 @@
                 &.currItem{
                     :global{
                         .van-dropdown-menu__bar  .van-dropdown-menu__title{
-                            color: #00B2A7;
-                            --van-gray-4:#00B2A7;
+                            color: #14B698;
+                            --van-gray-4:#14B698;
                         }
                     }
                 }
@@ -131,7 +131,7 @@
                         font-weight: 500;
                         font-size: 14px;
                         color: #131415;
-                        caret-color: #01C1B5;
+                        caret-color: #2DC7AA;
                         min-height: 80px;
                         &::placeholder {
                             font-weight: 400;

+ 3 - 3
src/page-instrument/evaluat-model/evaluat-result/index.module.less

@@ -150,10 +150,10 @@
 
         .rightBadge {
             position: absolute;
-            top: -59px;
+            top: -58px;
             right: -9px;
-            width: 160px;
-            height: 106px;
+            width: 142px;
+            height: 103px;
             z-index: -3;
         }
     }

BIN
src/page-instrument/header-top/image/bg.png


BIN
src/page-instrument/header-top/image/photo.png


+ 10 - 11
src/page-instrument/header-top/index.module.less

@@ -185,24 +185,23 @@
     height: 100%;
     position: relative;
     z-index: 9;
-    padding-top: 13px;
     .btn {
         position: relative;
         display: flex;
         flex-direction: column;
         align-items: center;
         cursor: pointer;
-        margin-right: 24px;
-        &.modeType{
-            margin-right: 14px;
-        }
+        margin-right: 30px;
+        // &.modeType{
+        //     margin-right: 14px;
+        // }
         &:last-child {
             margin-right: 0;
         }
 
         .iconBtn {
-            width: 27px;
-            height: 27px;
+            width: 24px;
+            height: 24px;
         }
 
         span {
@@ -490,10 +489,10 @@
 
     .modeTitle {
         width: auto;
-        height: 50px;
+        height: 55px;
         position: absolute;
         left: 50%;
-        top: 22px;
+        top: 10px;
         transform: translateX(-50%);
     }
 
@@ -523,14 +522,14 @@
         }
         .vipIcon {
             position: absolute;
-            left: 30px;
+            left: 28px;
             top: 12px;
             width: 55px;
             height: 21px;
         }
         .svipIcon {
             position: absolute;
-            left: 30px;
+            left: 28px;
             top: 12px;
             width: 63px;
             height: 21px;

+ 9 - 10
src/page-instrument/header-top/settting/index.module.less

@@ -71,7 +71,7 @@
                 .titbtn {
                     width: 78px;
                     height: 25px;
-                    background: linear-gradient( 135deg, #04C8BB 0%, #60E0C5 100%);
+                    background: linear-gradient( 132deg, #20C9A9 0%, #6DE0AC 100%);
                     border-radius: 13px;
                     font-weight: 600;
                     font-size: 14px;
@@ -163,7 +163,6 @@
                         text-align: center;
                         line-height: 25px;
                         margin-right: 8px;
-                        margin-bottom: 8px;
                         cursor: pointer;
                         background: #F2F2F2;
                         border-radius: 4px;
@@ -181,14 +180,14 @@
                 }
                 .qhBox {
                     >div {
-                        width: 56px;
+                        width: 60px;
+                    }
+                }                
+                .speBox {
+                    >div {
+                        margin-bottom: 8px;
                     }
                 }                
-                // .speBox {
-                //     >div {
-                //         width: 54px;
-                //     }
-                // }                
                 .frequency{
                     display: flex;
                     align-items: center;
@@ -202,7 +201,7 @@
                         line-height: 29px;
                         font-weight: 600;
                         font-size: 15px;
-                        color: #00B2A7;
+                        color: #14B698;
                     }
                     .btn{
                         width: 24px;
@@ -225,7 +224,7 @@
                             .van-field__control{
                                 font-weight: 600;
                                 font-size: 15px;
-                                color: #00B2A7;
+                                color: #14B698;
                                 caret-color: #36CFB3;
                             }
                         }

+ 1 - 1
src/page-instrument/header-top/settting/index.tsx

@@ -272,7 +272,7 @@ export default defineComponent({
                             state.enableNotation || state.specialShowNotation ? 
                             <div class={styles.cellBox}>
                                 <div class={styles.tit}>转谱</div>
-                                <div class={styles.radioBox}>
+                                <div class={[styles.radioBox, styles.qhBox]}>
                                     {
                                         notationList.value.map(item=>{
                                             return <div class={ state.musicRenderType===item.value && styles.active } onClick={ async ()=>{ 

+ 3 - 0
src/page-instrument/view-detail/index.module.less

@@ -382,6 +382,9 @@
             }
         }
     }
+    .lottie{
+        width: 120px;
+    }
     .loadingTip {
         font-size: 14px;
         color: #fff;

+ 10 - 5
src/page-instrument/view-detail/loading.tsx

@@ -1,6 +1,7 @@
 import { defineComponent} from "vue"
 import styles from "./index.module.less"
 import state from "/src/state"
+import animGif from "./images/refresh_anim.gif";
 
 export default defineComponent({
    name: "loading",
@@ -14,12 +15,16 @@ export default defineComponent({
    setup(props) {
       return () => (
          <div class={[styles.loadingPop, state.isPreView && styles.isPreView]} style={{ display: state.isLoading ? "flex" : "none" }}>
-            <div class={styles.loadingCssBox}>
-                <div class={styles.loadingCssItem}></div>
-                <div class={styles.loadingCssItem}></div>
-                <div class={styles.loadingCssItem}></div>
-                <div class={styles.loadingCssItem}></div>
+            {
+               props.tipText === '音频资源加载中,请稍后…' ? 
+               <img class={styles.lottie} src={animGif} /> :
+               <div class={styles.loadingCssBox}>
+                  <div class={styles.loadingCssItem}></div>
+                  <div class={styles.loadingCssItem}></div>
+                  <div class={styles.loadingCssItem}></div>
+                  <div class={styles.loadingCssItem}></div>
             </div>
+            }
             <div class={styles.loadingTip}>{props.tipText}</div>
          </div>
       )

BIN
src/page-instrument/view-evaluat-report/component/share-top/image/back_icon.png


BIN
src/page-instrument/view-evaluat-report/component/share-top/image/closeImg.png


BIN
src/page-instrument/view-evaluat-report/component/share-top/image/icon-shiyi.png


+ 1 - 1
src/page-instrument/view-evaluat-report/component/share-top/index.module.less

@@ -148,7 +148,7 @@
     }
 
     .active {
-        background: #CDF3F1;
+        background: #D3F3ED;
         border-radius: 8px;
 
         .mScore,

+ 4 - 3
src/view/abnormal-pop/index.tsx

@@ -3,6 +3,7 @@ import styles from "./index.module.less";
 import state from "/src/state";
 import { popImgs } from "/src/view/evaluating";
 import { evaluatingData } from "/src/view/evaluating";
+import animBg from "/src/page-instrument/view-detail/images/refresh_anim.gif";
 
 export default defineComponent({
   name: "abnormal-pop",
@@ -30,13 +31,13 @@ export default defineComponent({
           // 	<p>正在连接服务器,请稍后…</p>
           // </div>
           <div class={styles.loadingPop}>
-            <div class={styles.loadingCssBox}>
+            {/* <div class={styles.loadingCssBox}>
                 <div class={styles.loadingCssItem}></div>
                 <div class={styles.loadingCssItem}></div>
                 <div class={styles.loadingCssItem}></div>
                 <div class={styles.loadingCssItem}></div>
-            </div>            
-            {/* <Vue3Lottie animationData={animBg} class={styles.loadingIcon}></Vue3Lottie> */}
+            </div>             */}
+             <img class={styles.loadingIcon} src={animBg} />
             <div class={styles.loadingTip}>正在连接中,请稍等…</div>
             <div class={styles.loadingClose} onClick={() => emit("close")}>
               取消连接

BIN
src/view/plugins/toggleMusicSheet/choosePartName/imgs/changeName.png


BIN
src/view/plugins/toggleMusicSheet/choosePartName/imgs/okBtn.png


+ 3 - 3
src/view/plugins/toggleMusicSheet/choosePartName/index.module.less

@@ -82,9 +82,9 @@
           margin-right: 10px;
           padding: 0 8px;
           &.active{
-            background: #F2FFFC;
-            border-color: #01C1B5;
-            color: #00B2A7;
+            background: #EDFFFC;
+            border-color: #2DC7AA;
+            color: #14B698;
           }
         }
       }