فهرست منبع

feat: 模式切换、弹窗等UI

TIANYONG 4 ماه پیش
والد
کامیت
9867f8f3a5

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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


+ 13 - 3
src/page-instrument/header-top/index.module.less

@@ -330,7 +330,7 @@
             display: flex;
             align-items: center;
             justify-content: center;
-            background: #FE9825;
+            background: #FFC121;
             border-radius: 120px 120px 120px 1px;
             border: 1px solid #FFFFFF;
 
@@ -343,7 +343,7 @@
                 margin-left: 1px;
                 font-weight: 600;
                 font-size: 12px;
-                color: #ffffff;
+                color: #333333;
                 line-height: 16px;
             }
         }
@@ -468,6 +468,16 @@
         top: 20px;
         cursor: pointer;
     }
+
+    .modeTitle {
+        width: auto;
+        height: 28px;
+        position: absolute;
+        left: 50%;
+        top: 22px;
+        transform: translateX(-50%);
+    }
+
     .modeBox {
         width: 100%;
         display: flex;
@@ -475,7 +485,7 @@
         padding: 0 80px;
         position: relative;
         top: 50%;
-        transform: translateY(-50%);
+        transform: translateY(-42%);
 
         &.twoModeBox {
             justify-content: center;

+ 23 - 21
src/page-instrument/header-top/modeView.tsx

@@ -1,10 +1,11 @@
 import { defineComponent, onMounted, watch, reactive, ref, nextTick } from "vue";
 import styles from "./index.module.less";
 import backImg from "./image/icon-back.png";
+import titmeImg from "./image/modeTitle.png";
 import nameImg from "./image/zt.png";
-import lxMode from "./image/lxMode.json";
-import glMode from "./image/glMode.json";
-import pcMode from "./image/pcMode.json";
+// import lxMode from "./image/lxMode.json";
+// import glMode from "./image/glMode.json";
+// import pcMode from "./image/pcMode.json";
 import lxImg from "./image/lxImg.png";
 import glImg from "./image/glImg.png";
 import pcImg from "./image/pcImg.png";
@@ -75,37 +76,38 @@ export default defineComponent({
             headTopData.modeType = "show";
           }}
         />
+        <img src={titmeImg} class={styles.modeTitle} />
         <div class={[styles.modeBox, ((!state.isPercussion && !state.enableEvaluation) || (state.isPercussion && state.enableEvaluation) || (state.isPercussion && !state.enableEvaluation)) && styles.twoModeBox]}>
-          <Vue3Lottie ref={modeImgDom1} class={styles.modeImg} animationData={lxMode} autoPlay={false} loop={true} onClick={() => {
+          {/* <Vue3Lottie ref={modeImgDom1} class={styles.modeImg} animationData={lxMode} autoPlay={false} loop={true} onClick={() => {
             if(state.isSingleLine){
               smoothAnimationState.isShow.value = state.melodyLine;
             }
             headTopData.handleChangeModeType("practise")
-            }}></Vue3Lottie>
-          {/* <img class={styles.modeImg} src={lxImg} 
+            }}></Vue3Lottie> */}
+          <img class={styles.modeImg} src={lxImg} 
             onClick={() => {
               if(state.isSingleLine){
                 smoothAnimationState.isShow.value = state.melodyLine;
               }
               headTopData.handleChangeModeType("practise")
-            }} /> */}
+            }} />
           {!state.isPercussion && 
-              <Vue3Lottie ref={modeImgDom2} class={styles.modeImg} animationData={glMode} autoPlay={false} loop={true} onClick={() => headTopData.handleChangeModeType("follow")}></Vue3Lottie>
-              /* <img class={styles.modeImg} src={glImg} 
-                onClick={() => headTopData.handleChangeModeType("follow")} /> */
+              // <Vue3Lottie ref={modeImgDom2} class={styles.modeImg} animationData={glMode} autoPlay={false} loop={true} onClick={() => headTopData.handleChangeModeType("follow")}></Vue3Lottie>
+              <img class={styles.modeImg} src={glImg} 
+                onClick={() => headTopData.handleChangeModeType("follow")} />
           }
           {state.enableEvaluation && 
-            <Vue3Lottie ref={modeImgDom3} class={styles.modeImg} animationData={pcMode} autoPlay={false} loop={true} onClick={() => {
-               // 点击评测模式进入评测模块的需要检测耳机状态,通过返回按钮进入评测模块的,不检测耳机状态
-              evaluatingData.needCheckErjiStatus = true;
-              headTopData.handleChangeModeType("evaluating")
-            }}></Vue3Lottie>
-            // <img class={styles.modeImg} src={pcImg} 
-            //   onClick={() => {
-            //       // 点击评测模式进入评测模块的需要检测耳机状态,通过返回按钮进入评测模块的,不检测耳机状态
-            //       evaluatingData.needCheckErjiStatus = true;
-            //       headTopData.handleChangeModeType("evaluating")
-            //     }} />
+            // <Vue3Lottie ref={modeImgDom3} class={styles.modeImg} animationData={pcMode} autoPlay={false} loop={true} onClick={() => {
+            //    // 点击评测模式进入评测模块的需要检测耳机状态,通过返回按钮进入评测模块的,不检测耳机状态
+            //   evaluatingData.needCheckErjiStatus = true;
+            //   headTopData.handleChangeModeType("evaluating")
+            // }}></Vue3Lottie>
+            <img class={styles.modeImg} src={pcImg} 
+              onClick={() => {
+                  // 点击评测模式进入评测模块的需要检测耳机状态,通过返回按钮进入评测模块的,不检测耳机状态
+                  evaluatingData.needCheckErjiStatus = true;
+                  headTopData.handleChangeModeType("evaluating")
+                }} />
           }
         </div>
         {/** 延迟检测中途,socket出错,网络提示弹窗 */}

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

@@ -92,7 +92,7 @@
                                 height: 5px;
                                 background: #EAEAEA;
                                 .van-slider__bar{
-                                    background: #01C1B5;
+                                    background: #36CFB3;
                                     // &::after{
                                     //     position: absolute;
                                     //     content: "";
@@ -144,7 +144,7 @@
                                 height: 18px;
                                 background: #FFFFFF;
                                 border-radius: 50%;
-                                border: 4px solid #01C1B5;
+                                border: 4px solid #36CFB3;
                             }
                         }
                     }
@@ -154,7 +154,7 @@
                     justify-content:flex-end;
                     flex-wrap: wrap;
                     > div{
-                        width: 48px;
+                        width: 60px;
                         height: 25px;
                         font-weight: 600;
                         font-size: 14px;
@@ -174,15 +174,15 @@
                         }
                         &.active{
                             color: #ffffff;
-                            background: linear-gradient( 135deg, #04C8BB 0%, #60E0C5 100%);
+                            background: linear-gradient( 132deg, #20C9A9 0%, #6DE0AC 100%);
                         }
                     }
                 }
-                // .speBox {
-                //     >div {
-                //         width: 48px;
-                //     }
-                // }                
+                .speBox {
+                    >div {
+                        width: 54px;
+                    }
+                }                
                 .frequency{
                     display: flex;
                     align-items: center;
@@ -220,7 +220,7 @@
                                 font-weight: 600;
                                 font-size: 15px;
                                 color: #00B2A7;
-                                caret-color: #01C1B5;
+                                caret-color: #36CFB3;
                             }
                         }
                     }

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

@@ -63,7 +63,7 @@
                             background: #EAEAEA;
                             .van-slider__bar{
                                 max-width: 100%;
-                                background: #01C1B5;
+                                background: #36CFB3;
                                 // &::after{
                                 //     position: absolute;
                                 //     content: "";
@@ -116,7 +116,7 @@
                             height: 18px;
                             background: #FFFFFF;
                             border-radius: 50%;
-                            border: 4px solid #01C1B5;
+                            border: 4px solid #36CFB3;
                         }
                     }
                 }
@@ -141,7 +141,7 @@
                     margin-bottom: 10px;
                     margin-right: 3px;
                     &:active{
-                        background: #B3EDE9;
+                        background: #B9F2DF;
                         color: #131415;
                     }
                 }