UI改版

src/pages/detail/icons/icon-minus.svg

@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>速度减</title>
+    <defs>
+        <linearGradient x1="78.0181074%" y1="0%" x2="17.891049%" y2="91.0254311%" id="linearGradient-1">
+            <stop stop-color="#FFBF73" offset="0%"></stop>
+            <stop stop-color="#FF7C4C" offset="100%"></stop>
+        </linearGradient>
+        <circle id="path-2" cx="11" cy="11" r="11"></circle>
+        <filter x="-3.6%" y="-8.2%" width="107.3%" height="110.9%" filterUnits="objectBoundingBox" id="filter-3">
+            <feMorphology radius="0.1" operator="dilate" in="SourceAlpha" result="shadowSpreadOuter1"></feMorphology>
+            <feOffset dx="0" dy="-1" in="shadowSpreadOuter1" result="shadowOffsetOuter1"></feOffset>
+            <feColorMatrix values="0 0 0 0 0.950973732   0 0 0 0 0.401789517   0 0 0 0 0.19318466  0 0 0 1 0" type="matrix" in="shadowOffsetOuter1"></feColorMatrix>
+        </filter>
+    </defs>
+    <g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="全局设置备份" transform="translate(-702.000000, -242.000000)">
+            <g id="速度减" transform="translate(714.000000, 253.735585) scale(-1, -1) rotate(-540.000000) translate(-714.000000, -253.735585) translate(703.000000, 242.735585)">
+                <g id="椭圆形" transform="translate(11.000000, 11.000000) scale(1, -1) translate(-11.000000, -11.000000) ">
+                    <use fill="black" fill-opacity="1" filter="url(#filter-3)" xlink:href="#path-2"></use>
+                    <use fill="url(#linearGradient-1)" fill-rule="evenodd" xlink:href="#path-2"></use>
+                </g>
+                <path d="M3.88327154,8.2793598 C5.00451237,8.2793598 5.24625888,7.2567043 5.24625888,5.89555473 C5.24625888,4.53440515 5.02498524,3.2793598 3.9037444,3.2793598 C2.78250357,3.2793598 3.46218633,4.50402672 3.46218633,5.86517629 C3.46218633,7.22632586 2.7620307,8.2793598 3.88327154,8.2793598 Z" id="椭圆形备份-4" fill="#FFFFFF" opacity="0.49983724" transform="translate(4.246259, 5.779360) scale(-1, -1) rotate(39.000000) translate(-4.246259, -5.779360) "></path>
+                <rect id="矩形" fill="#FFFFFF" x="5" y="9.80441461" width="12" height="2.4" rx="1.2"></rect>
+            </g>
+        </g>
+    </g>
+</svg>

src/pages/detail/icons/icon-plus.svg

@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>速度加</title>
+    <defs>
+        <linearGradient x1="78.0181074%" y1="0%" x2="17.891049%" y2="91.0254311%" id="linearGradient-1">
+            <stop stop-color="#FFBF73" offset="0%"></stop>
+            <stop stop-color="#FF7C4C" offset="100%"></stop>
+        </linearGradient>
+        <circle id="path-2" cx="11" cy="11" r="11"></circle>
+        <filter x="-3.6%" y="-8.2%" width="107.3%" height="110.9%" filterUnits="objectBoundingBox" id="filter-3">
+            <feMorphology radius="0.1" operator="dilate" in="SourceAlpha" result="shadowSpreadOuter1"></feMorphology>
+            <feOffset dx="0" dy="-1" in="shadowSpreadOuter1" result="shadowOffsetOuter1"></feOffset>
+            <feColorMatrix values="0 0 0 0 0.950973732   0 0 0 0 0.401789517   0 0 0 0 0.19318466  0 0 0 1 0" type="matrix" in="shadowOffsetOuter1"></feColorMatrix>
+        </filter>
+    </defs>
+    <g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="全局设置备份" transform="translate(-702.000000, -82.000000)">
+            <g id="速度加" transform="translate(714.000000, 93.735585) scale(-1, -1) rotate(-360.000000) translate(-714.000000, -93.735585) translate(703.000000, 82.735585)">
+                <g id="椭圆形备份-3">
+                    <use fill="black" fill-opacity="1" filter="url(#filter-3)" xlink:href="#path-2"></use>
+                    <use fill="url(#linearGradient-1)" fill-rule="evenodd" xlink:href="#path-2"></use>
+                </g>
+                <path d="M11,5 C11.6627417,5 12.2,5.5372583 12.2,6.2 L12.199,9.799 L15.8,9.8 C16.4627417,9.8 17,10.3372583 17,11 C17,11.6627417 16.4627417,12.2 15.8,12.2 L12.199,12.199 L12.2,15.8 C12.2,16.4627417 11.6627417,17 11,17 C10.3372583,17 9.8,16.4627417 9.8,15.8 L9.799,12.199 L6.2,12.2 C5.5372583,12.2 5,11.6627417 5,11 C5,10.3372583 5.5372583,9.8 6.2,9.8 L9.799,9.799 L9.8,6.2 C9.8,5.5372583 10.3372583,5 11,5 Z" id="形状结合" fill="#FFFFFF"></path>
+                <path d="M17.3907538,18.6968307 C18.5119946,18.6968307 18.7537411,17.6741752 18.7537411,16.3130256 C18.7537411,14.951876 18.5324675,13.6968307 17.4112266,13.6968307 C16.2899858,13.6968307 16.9696686,14.9214976 16.9696686,16.2826472 C16.9696686,17.6437967 16.2695129,18.6968307 17.3907538,18.6968307 Z" id="椭圆形" fill="#FFFFFF" opacity="0.502278646" transform="translate(17.753741, 16.196831) rotate(39.000000) translate(-17.753741, -16.196831) "></path>
+            </g>
+        </g>
+    </g>
+</svg>

src/pages/detail/icons/icon-resetMinus.svg

@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>默认速度</title>
+    <defs>
+        <linearGradient x1="78.0181074%" y1="0%" x2="17.891049%" y2="91.0254311%" id="linearGradient-1">
+            <stop stop-color="#FFBF73" offset="0%"></stop>
+            <stop stop-color="#FF7C4C" offset="100%"></stop>
+        </linearGradient>
+        <circle id="path-2" cx="11" cy="11" r="11"></circle>
+        <filter x="-3.6%" y="-8.2%" width="107.3%" height="110.9%" filterUnits="objectBoundingBox" id="filter-3">
+            <feMorphology radius="0.1" operator="dilate" in="SourceAlpha" result="shadowSpreadOuter1"></feMorphology>
+            <feOffset dx="0" dy="-1" in="shadowSpreadOuter1" result="shadowOffsetOuter1"></feOffset>
+            <feColorMatrix values="0 0 0 0 0.950973732   0 0 0 0 0.401789517   0 0 0 0 0.19318466  0 0 0 1 0" type="matrix" in="shadowOffsetOuter1"></feColorMatrix>
+        </filter>
+    </defs>
+    <g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="全局设置备份" transform="translate(-702.000000, -273.000000)">
+            <g id="默认速度" transform="translate(703.000000, 273.735585)">
+                <g id="速度减备份-2" transform="translate(11.000000, 11.000000) scale(-1, -1) rotate(-540.000000) translate(-11.000000, -11.000000) ">
+                    <g id="椭圆形" transform="translate(11.000000, 11.000000) scale(1, -1) translate(-11.000000, -11.000000) ">
+                        <use fill="black" fill-opacity="1" filter="url(#filter-3)" xlink:href="#path-2"></use>
+                        <use fill="url(#linearGradient-1)" fill-rule="evenodd" xlink:href="#path-2"></use>
+                    </g>
+                    <path d="M3.88327154,8.2793598 C5.00451237,8.2793598 5.24625888,7.2567043 5.24625888,5.89555473 C5.24625888,4.53440515 5.02498524,3.2793598 3.9037444,3.2793598 C2.78250357,3.2793598 3.46218633,4.50402672 3.46218633,5.86517629 C3.46218633,7.22632586 2.7620307,8.2793598 3.88327154,8.2793598 Z" id="椭圆形备份-4" fill="#FFFFFF" opacity="0.501976376" transform="translate(4.246259, 5.779360) scale(-1, -1) rotate(39.000000) translate(-4.246259, -5.779360) "></path>
+                </g>
+                <g id="编组-5" transform="translate(5.537233, 6.011522)" stroke="#FFFFFF" stroke-linecap="round" stroke-width="2">
+                    <path d="M9.38581462,1.6705985 C8.39077004,0.677216052 7.01711911,0.0629557422 5.5,0.0629557422 C2.46243388,0.0629557422 0,2.52538962 0,5.56295574 C0,8.60052187 2.46243388,11.0629557 5.5,11.0629557 C7.91569843,11.0629557 9.96764798,9.50556162 10.7065732,7.34004882" id="路径"></path>
+                    <polyline id="路径" stroke-linejoin="round" points="10.3100541 0 10.6381256 2.67192844 7.96619719 3"></polyline>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>

src/pages/detail/speed.module.less

@@ -25,9 +25,7 @@
   font-size: calc(10 * var(--screen));
   display: flex;
   align-items: center;
-  // margin: 16 * @screen 0 35 * @screen 0;
   justify-content: space-between;
-  // height: 180px;
   height: calc(90% - 65px);
   max-height: 300PX;
   >span{
@@ -53,7 +51,6 @@
         }
       }
       .slider{
-        // height: 140px;
         height: calc(100vh - 40px - 65px - 20px - 20px);
         max-height: 240PX;
         margin: calc(10px * var(--screen)) 0;

src/pages/detail/speed.tsx

@@ -3,10 +3,10 @@ import { Button, Slider } from 'vant'
 import classnames from 'classnames'
 import detailState from '/src/pages/detail/state'
 import styles from './speed.module.less'
-import Icons from './icons/index.json'
 
-// import MinusIcon from './icons/minus.png'
-// import PlusIcon from './icons/plus.png'
+import iconMinus from './icons/icon-minus.svg'
+import iconPlus from './icons/icon-plus.svg'
+import iconresetMinus from './icons/icon-resetMinus.svg'
 
 const state = reactive({
   speed: 90,
@@ -73,7 +73,7 @@ export default defineComponent({
           <div>
             <Button
               color="#01C1B5"
-              icon={Icons.plus}
+              icon={iconPlus}
               type="primary"
               size="mini"
               round
@@ -108,7 +108,7 @@ export default defineComponent({
             <Button
               class={styles.min}
               color="#01C1B5"
-              icon={Icons.minus}
+              icon={iconMinus}
               type="primary"
               size="mini"
               round
@@ -118,7 +118,7 @@ export default defineComponent({
             <Button
               class={styles.reset}
               color="#01C1B5"
-              icon={Icons.minus}
+              icon={iconresetMinus}
               type="primary"
               size="mini"
               round

src/subpages/colexiu-report/main.ts

@@ -8,6 +8,15 @@ import '../colexiu/app.css'
 import '../../base.css'
 
 import App from './index'
+import { promisefiyPostMessage } from '/src/helpers/native-message'
+
+// 获取token
+promisefiyPostMessage({ api: 'getToken' }).then((res: any) => {
+  console.log('获取token', res)
+  if (res?.content?.accessToken) {
+    sessionStorage.setItem('Authorization', res.content.tokenType + ' ' + res.content.accessToken)
+  }
+})
 
 document.body.style.setProperty('--osdm-zoom', '' + formatZoom())
 

src/subpages/colexiu-share/main.ts

@@ -8,8 +8,16 @@ import '../colexiu/app.css'
 import '../../base.css'
 
 import App from './index'
+import { promisefiyPostMessage } from '/src/helpers/native-message'
 
 document.body.style.setProperty('--osdm-zoom', '' + formatZoom())
 
+// 获取token
+promisefiyPostMessage({ api: 'getToken' }).then((res: any) => {
+  console.log('获取token', res)
+  if (res?.content?.accessToken) {
+    sessionStorage.setItem('Authorization', res.content.tokenType + ' ' + res.content.accessToken)
+  }
+})
 close()
 createApp(App).mount('#app')

src/subpages/colexiu/buttons/icons/camera.svg

@@ -4,7 +4,7 @@
     <g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
         <g id="主界面（评测模式）" transform="translate(-656.000000, -14.000000)">
             <g id="摄像头" transform="translate(656.000000, 14.000000)">
-                <rect id="矩形备份-37" fill="#2DC7AA" x="0" y="0" width="29" height="29" rx="14.5"></rect>
+                <rect id="矩形备份-37" fill="#ff8057" x="0" y="0" width="29" height="29" rx="14.5"></rect>
                 <path d="M14.5,5 C19.1944204,5 23,8.80557963 23,13.5 C23,18.1944204 19.1944204,22 14.5,22 C9.80557963,22 6,18.1944204 6,13.5 C6,8.80557963 9.80557963,5 14.5,5 Z M14.5,8.5 C11.7385763,8.5 9.5,10.7385763 9.5,13.5 C9.5,16.2614237 11.7385763,18.5 14.5,18.5 C17.2614237,18.5 19.5,16.2614237 19.5,13.5 C19.5,10.7385763 17.2614237,8.5 14.5,8.5 Z M14.5,9.5 C16.709139,9.5 18.5,11.290861 18.5,13.5 C18.5,15.709139 16.709139,17.5 14.5,17.5 C12.290861,17.5 10.5,15.709139 10.5,13.5 C10.5,11.290861 12.290861,9.5 14.5,9.5 Z M14.5,7 C14.2238576,7 14,7.22385763 14,7.5 C14,7.77614237 14.2238576,8 14.5,8 C14.7761424,8 15,7.77614237 15,7.5 C15,7.22385763 14.7761424,7 14.5,7 Z" id="形状结合" fill="#FFFFFF"></path>
                 <path d="M12,17.5 C12,21.212779 13.9270132,24.47548 16.835438,26.3425014" id="路径" stroke="#FFFFFF" stroke-width="1.2" stroke-linecap="round" transform="translate(14.417719, 21.921251) rotate(-60.000000) translate(-14.417719, -21.921251) "></path>
             </g>

src/subpages/colexiu/buttons/index.module.less

@@ -158,7 +158,7 @@
   }
   :global {
     .van-slider__button-wrapper {
-      background: linear-gradient(180deg, #ffd689 0%, #febd41 100%);
+      background: #FFE8B1;
       border-radius: 20Px;
       border: 1px solid #ffffff;
       padding: 2Px 4Px;
@@ -166,7 +166,7 @@
         background-color: transparent !important;
       }
       span {
-        color: #135d4f !important;
+        color: #F67146 !important;
       }
     }
     .van-slider {
@@ -175,27 +175,14 @@
       margin-bottom: 2px !important;
       min-height: 35vh;
     }
-    .van-slider + button {
-      img {
-        content: url('./icons/jian.svg');
-      }
-    }
     .van-button {
       width: 10px !important;
       height: 10px !important;
       background-color: transparent !important;
       border: none !important;
       margin-left: 0 !important;
-      &:first-child {
-        img {
-          content: url('./icons/jia.svg');
-        }
-      }
       &:last-child {
         margin-top: 4px;
-        img {
-          content: url('./icons/reset-shengyin.svg');
-        }
       }
     }
     .van-button__icon,
@@ -221,10 +208,6 @@
     width: 100%;
     height: 100%;
   }
-  // .fillring {
-  // transform-origin: center;
-  // transform: rotate(-90deg);
-  // }
 }
 
 .speedButton {
@@ -338,9 +321,6 @@
     height: 32px;
     background: url('./icons/task-bg.svg') no-repeat center;
     background-size: cover;
-    // border: 1px solid #ffffff;
-    // border-radius: 5px 5px 0 5px;
-    // background-color: #ffe1b8;
     margin-right: 10px;
     color: #6f4900;
     font-size: 6px;
@@ -348,47 +328,6 @@
     padding: 4px;
     padding-top: 6px;
     box-sizing: border-box;
-    // position: relative;
-    // overflow: initial;
-    // overflow-x: hidden;
-    // overflow-y: initial;
-    // .triangle {
-    //   display: block;
-    //   position: absolute;
-    //   bottom: -7px;
-    //   right: -0.7px;
-    //   width: 10px;
-    //   height: 24px;
-    //   z-index: -1;
-    //   overflow: hidden;
-    //   border-right: 1px solid #ffffff;
-    //   &::before {
-    //     content: '';
-    //     display: block;
-    //     position: absolute;
-    //     bottom: 1px;
-    //     right: -5px;
-    //     border: 1px solid #ffffff;
-    //     border-radius: 3px;
-    //     background-color: #ffe1b8;
-    //     width: 10px;
-    //     height: 10px;
-    //     z-index: -1;
-    //     transform: rotate(-45deg);
-    //   }
-    // }
-    // &::after {
-    //   content: '';
-    //   display: block;
-    //   position: absolute;
-    //   bottom: -1px;
-    //   right: 0;
-    //   height: 1px;
-    //   width: 7.6px;
-    //   background-color: #ffe1b8;
-    //   z-index: 1;
-    //   border-radius: 1px;
-    // }
   }
 }
 

src/subpages/colexiu/index.tsx

@@ -58,7 +58,7 @@ export const MusicSheetRef = ref()
 export default defineComponent({
   name: 'Colexiu',
   setup() {
-    // const route = useRoute()
+    const route = useRoute()
     // console.log("🚀 ~ route", route.query, search)
     detailState.midiPlayIniting = true
     const renderLoading = ref(true)

src/subpages/colexiu/main.ts

@@ -7,15 +7,20 @@ import './lib-flexible'
 import 'animate.css'
 import './app.css'
 import '../../base.css'
-
+import App from './App'
+import router from './router'
+import { promisefiyPostMessage } from '/src/helpers/native-message'
+// 获取token
+promisefiyPostMessage({ api: 'getToken' }).then((res: any) => {
+  console.log('获取token', res)
+  if (res?.content?.accessToken) {
+    sessionStorage.setItem('Authorization', res.content.tokenType + ' ' + res.content.accessToken)
+  }
+})
 appState.clintNmae = 'colexiu'
-
 ;(window as any).DYEnvironment = 'colexiu'
 
 document.body.style.setProperty('--osdm-zoom', '' + formatZoom())
 
-import App from './App'
-import router from './router'
-
 close()
 createApp(App).use(router).mount('#app')

src/subpages/colexiu/popups/setting/icons/off.svg

@@ -1,33 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<svg width="46px" height="24px" viewBox="0 0 46 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <title>switch off备份@2x</title>
+<svg width="46px" height="23px" viewBox="0 0 46 23" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>切片</title>
     <defs>
-        <linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-1">
-            <stop stop-color="#FFFFFF" offset="0%"></stop>
-            <stop stop-color="#F2F2F2" offset="100%"></stop>
-        </linearGradient>
-        <rect id="path-2" x="15.6818182" y="2.09090909" width="27.1818182" height="18.8181818" rx="7"></rect>
-        <filter x="-12.9%" y="-13.3%" width="125.8%" height="137.2%" filterUnits="objectBoundingBox" id="filter-3">
+        <circle id="path-1" cx="11.5" cy="11.5" r="9.5"></circle>
+        <filter x="-10.5%" y="-5.3%" width="121.1%" height="121.1%" filterUnits="objectBoundingBox" id="filter-2">
             <feOffset dx="0" dy="1" in="SourceAlpha" result="shadowOffsetOuter1"></feOffset>
-            <feGaussianBlur stdDeviation="1" in="shadowOffsetOuter1" result="shadowBlurOuter1"></feGaussianBlur>
-            <feColorMatrix values="0 0 0 0 0.63062408   0 0 0 0 0.63062408   0 0 0 0 0.63062408  0 0 0 0.746606787 0" type="matrix" in="shadowBlurOuter1"></feColorMatrix>
+            <feGaussianBlur stdDeviation="0.5" in="shadowOffsetOuter1" result="shadowBlurOuter1"></feGaussianBlur>
+            <feColorMatrix values="0 0 0 0 0   0 0 0 0 0   0 0 0 0 0.00784313725  0 0 0 0.0986396416 0" type="matrix" in="shadowBlurOuter1"></feColorMatrix>
         </filter>
     </defs>
-    <g id="页面-2" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="全局设置" transform="translate(-495.000000, -122.000000)">
-            <g id="编组-22" transform="translate(246.000000, 23.000000)">
-                <g id="编组-19" transform="translate(25.000000, 99.000000)">
-                    <g id="switch-off备份" transform="translate(247.000000, 11.500000) scale(-1, 1) translate(-247.000000, -11.500000) translate(224.000000, 0.000000)">
-                        <rect id="矩形" fill="#D2D2D2" x="0" y="0" width="46" height="23" rx="9"></rect>
-                        <g id="矩形">
-                            <use fill="black" fill-opacity="1" filter="url(#filter-3)" xlink:href="#path-2"></use>
-                            <use fill="url(#linearGradient-1)" fill-rule="evenodd" xlink:href="#path-2"></use>
-                        </g>
-                        <g id="OFF" transform="translate(29.712631, 11.412864) scale(-1, 1) translate(-29.712631, -11.412864) translate(20.609807, 7.359364)" fill="#D0D0D0" fill-rule="nonzero">
-                            <path d="M3.476,0 C4.07,0 4.58516667,0.1045 5.0215,0.3135 C5.45783333,0.5225 5.819,0.8085 6.105,1.1715 C6.391,1.5345 6.60366667,1.96166667 6.743,2.453 C6.88233333,2.94433333 6.952,3.476 6.952,4.048 C6.952,4.62 6.88233333,5.1535 6.743,5.6485 C6.60366667,6.1435 6.391,6.5725 6.105,6.9355 C5.819,7.2985 5.45783333,7.5845 5.0215,7.7935 C4.58516667,8.0025 4.07,8.107 3.476,8.107 C2.904,8.107 2.40166667,8.00616667 1.969,7.8045 C1.53633333,7.60283333 1.17333333,7.32233333 0.88,6.963 C0.586666667,6.60366667 0.366666667,6.17466667 0.22,5.676 C0.0733333333,5.17733333 0,4.63466667 0,4.048 C0,3.48333333 0.066,2.9535 0.198,2.4585 C0.33,1.9635 0.537166667,1.5345 0.8195,1.1715 C1.10183333,0.8085 1.46116667,0.5225 1.8975,0.3135 C2.33383333,0.1045 2.86,0 3.476,0 Z M3.476,6.853 C3.86466667,6.853 4.18916667,6.7815 4.4495,6.6385 C4.70983333,6.4955 4.92066667,6.29933333 5.082,6.05 C5.24333333,5.80066667 5.357,5.50733333 5.423,5.17 C5.489,4.83266667 5.522,4.46966667 5.522,4.081 C5.522,3.69233333 5.48533333,3.32566667 5.412,2.981 C5.33866667,2.63633333 5.22133333,2.33566667 5.06,2.079 C4.89866667,1.82233333 4.68783333,1.62066667 4.4275,1.474 C4.16716667,1.32733333 3.85,1.254 3.476,1.254 C3.102,1.254 2.78483333,1.32916667 2.5245,1.4795 C2.26416667,1.62983333 2.05333333,1.8315 1.892,2.0845 C1.73066667,2.3375 1.61333333,2.63266667 1.54,2.97 C1.46666667,3.30733333 1.43,3.66666667 1.43,4.048 C1.43,4.39266667 1.463,4.73366667 1.529,5.071 C1.595,5.40833333 1.70866667,5.709 1.87,5.973 C2.03133333,6.237 2.24216667,6.44966667 2.5025,6.611 C2.76283333,6.77233333 3.08733333,6.853 3.476,6.853 Z" id="形状"></path>
-                            <path d="M11.671,3.311 C11.8836667,3.311 12.0523333,3.36233333 12.177,3.465 C12.2796667,3.56766667 12.331,3.72533333 12.331,3.938 C12.331,4.158 12.2796667,4.31383333 12.177,4.4055 C12.0743333,4.49716667 11.9056667,4.543 11.671,4.543 L9.339,4.543 L9.339,7.546 C9.339,7.64866667 9.28216667,7.7495 9.1685,7.8485 C9.05483333,7.9475 8.86966667,7.997 8.613,7.997 C8.35633333,7.997 8.17483333,7.9475 8.0685,7.8485 C7.96216667,7.7495 7.909,7.64866667 7.909,7.546 L7.909,0.825 C7.909,0.597666667 7.96766667,0.44 8.085,0.352 C8.20233333,0.264 8.37833333,0.22 8.613,0.22 L12.012,0.22 C12.2246667,0.22 12.3841667,0.265833333 12.4905,0.3575 C12.5968333,0.449166667 12.6536667,0.608666667 12.661,0.836 C12.6683333,1.06333333 12.6133333,1.22283333 12.496,1.3145 C12.3786667,1.40616667 12.2136667,1.452 12.001,1.452 L9.339,1.452 L9.339,3.311 L11.671,3.311 Z" id="路径"></path>
-                            <path d="M17.215,3.311 C17.4276667,3.311 17.5963333,3.36233333 17.721,3.465 C17.8236667,3.56766667 17.875,3.72533333 17.875,3.938 C17.875,4.158 17.8236667,4.31383333 17.721,4.4055 C17.6183333,4.49716667 17.4496667,4.543 17.215,4.543 L14.883,4.543 L14.883,7.546 C14.883,7.64866667 14.8261667,7.7495 14.7125,7.8485 C14.5988333,7.9475 14.4136667,7.997 14.157,7.997 C13.9003333,7.997 13.7188333,7.9475 13.6125,7.8485 C13.5061667,7.7495 13.453,7.64866667 13.453,7.546 L13.453,0.825 C13.453,0.597666667 13.5116667,0.44 13.629,0.352 C13.7463333,0.264 13.9223333,0.22 14.157,0.22 L17.556,0.22 C17.7686667,0.22 17.9281667,0.265833333 18.0345,0.3575 C18.1408333,0.449166667 18.1976667,0.608666667 18.205,0.836 C18.2123333,1.06333333 18.1573333,1.22283333 18.04,1.3145 C17.9226667,1.40616667 17.7576667,1.452 17.545,1.452 L14.883,1.452 L14.883,3.311 L17.215,3.311 Z" id="路径"></path>
-                        </g>
+    <g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="评测设置" transform="translate(-495.000000, -198.000000)">
+            <g id="编组-22" transform="translate(246.000000, 44.000000)">
+                <g id="开关-/关" transform="translate(249.000000, 154.000000)">
+                    <rect id="矩形" fill="#CCCCCC" x="0" y="0" width="46" height="23" rx="11.5"></rect>
+                    <g id="knob">
+                        <use fill="black" fill-opacity="1" filter="url(#filter-2)" xlink:href="#path-1"></use>
+                        <use fill="#FFFFFF" fill-rule="evenodd" xlink:href="#path-1"></use>
                     </g>
                 </g>
             </g>

src/subpages/colexiu/popups/setting/icons/on.svg

@@ -1,35 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<svg width="46px" height="24px" viewBox="0 0 46 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <title>switch off@2x</title>
+<svg width="46px" height="23px" viewBox="0 0 46 23" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>切片</title>
     <defs>
-        <linearGradient x1="78.0181074%" y1="0%" x2="78.0181074%" y2="100%" id="linearGradient-1">
-            <stop stop-color="#ff8057" offset="0%"></stop>
-            <stop stop-color="#ff8057" offset="100%"></stop>
-        </linearGradient>
-        <linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-2">
-            <stop stop-color="#FFFFFF" offset="0%"></stop>
-            <stop stop-color="#ff8057" offset="100%"></stop>
-        </linearGradient>
-        <rect id="path-3" x="2.09090909" y="2.09090909" width="27.1818182" height="18.8181818" rx="7"></rect>
-        <filter x="-12.9%" y="-13.3%" width="125.8%" height="137.2%" filterUnits="objectBoundingBox" id="filter-4">
+        <circle id="path-1" cx="34.5" cy="11.5" r="9.5"></circle>
+        <filter x="-10.5%" y="-5.3%" width="121.1%" height="121.1%" filterUnits="objectBoundingBox" id="filter-2">
             <feOffset dx="0" dy="1" in="SourceAlpha" result="shadowOffsetOuter1"></feOffset>
-            <feGaussianBlur stdDeviation="1" in="shadowOffsetOuter1" result="shadowBlurOuter1"></feGaussianBlur>
-            <feColorMatrix values="0 0 0 0 0.093603643   0 0 0 0 0.694167427   0 0 0 0 0.581074247  0 0 0 1 0" type="matrix" in="shadowBlurOuter1"></feColorMatrix>
+            <feGaussianBlur stdDeviation="0.5" in="shadowOffsetOuter1" result="shadowBlurOuter1"></feGaussianBlur>
+            <feColorMatrix values="0 0 0 0 0   0 0 0 0 0   0 0 0 0 0.00784313725  0 0 0 0.0986396416 0" type="matrix" in="shadowBlurOuter1"></feColorMatrix>
         </filter>
     </defs>
-    <g id="页面-2" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="全局设置" transform="translate(-495.000000, -254.000000)">
-            <g id="编组-22" transform="translate(246.000000, 23.000000)">
-                <g id="编组-19" transform="translate(25.000000, 99.000000)">
-                    <g id="switch-off" transform="translate(247.000000, 143.500000) scale(-1, 1) translate(-247.000000, -143.500000) translate(224.000000, 132.000000)">
-                        <rect id="矩形" fill="url(#linearGradient-1)" x="0" y="0" width="46" height="23" rx="9"></rect>
-                        <g id="矩形">
-                            <use fill="url(#linearGradient-2)" fill-rule="evenodd" xlink:href="#path-3"></use>
-                        </g>
-                        <g id="ON" transform="translate(16.680955, 11.412864) scale(-1, 1) translate(-16.680955, -11.412864) translate(9.668455, 7.359364)" fill="#ff8057" fill-rule="nonzero">
-                            <path d="M3.476,0 C4.07,0 4.58516667,0.1045 5.0215,0.3135 C5.45783333,0.5225 5.819,0.8085 6.105,1.1715 C6.391,1.5345 6.60366667,1.96166667 6.743,2.453 C6.88233333,2.94433333 6.952,3.476 6.952,4.048 C6.952,4.62 6.88233333,5.1535 6.743,5.6485 C6.60366667,6.1435 6.391,6.5725 6.105,6.9355 C5.819,7.2985 5.45783333,7.5845 5.0215,7.7935 C4.58516667,8.0025 4.07,8.107 3.476,8.107 C2.904,8.107 2.40166667,8.00616667 1.969,7.8045 C1.53633333,7.60283333 1.17333333,7.32233333 0.88,6.963 C0.586666667,6.60366667 0.366666667,6.17466667 0.22,5.676 C0.0733333333,5.17733333 0,4.63466667 0,4.048 C0,3.48333333 0.066,2.9535 0.198,2.4585 C0.33,1.9635 0.537166667,1.5345 0.8195,1.1715 C1.10183333,0.8085 1.46116667,0.5225 1.8975,0.3135 C2.33383333,0.1045 2.86,0 3.476,0 Z M3.476,6.853 C3.86466667,6.853 4.18916667,6.7815 4.4495,6.6385 C4.70983333,6.4955 4.92066667,6.29933333 5.082,6.05 C5.24333333,5.80066667 5.357,5.50733333 5.423,5.17 C5.489,4.83266667 5.522,4.46966667 5.522,4.081 C5.522,3.69233333 5.48533333,3.32566667 5.412,2.981 C5.33866667,2.63633333 5.22133333,2.33566667 5.06,2.079 C4.89866667,1.82233333 4.68783333,1.62066667 4.4275,1.474 C4.16716667,1.32733333 3.85,1.254 3.476,1.254 C3.102,1.254 2.78483333,1.32916667 2.5245,1.4795 C2.26416667,1.62983333 2.05333333,1.8315 1.892,2.0845 C1.73066667,2.3375 1.61333333,2.63266667 1.54,2.97 C1.46666667,3.30733333 1.43,3.66666667 1.43,4.048 C1.43,4.39266667 1.463,4.73366667 1.529,5.071 C1.595,5.40833333 1.70866667,5.709 1.87,5.973 C2.03133333,6.237 2.24216667,6.44966667 2.5025,6.611 C2.76283333,6.77233333 3.08733333,6.853 3.476,6.853 Z" id="形状"></path>
-                            <path d="M9.339,7.425 C9.339,7.57166667 9.284,7.70366667 9.174,7.821 C9.064,7.93833333 8.88066667,7.997 8.624,7.997 C8.36733333,7.997 8.184,7.93466667 8.074,7.81 C7.964,7.68533333 7.909,7.557 7.909,7.425 L7.909,0.627 C7.909,0.495 7.94566667,0.375833333 8.019,0.2695 C8.09233333,0.163166667 8.261,0.11 8.525,0.11 C8.67166667,0.11 8.79083333,0.154 8.8825,0.242 C8.97416667,0.33 9.053,0.418 9.119,0.506 L12.595,5.181 L12.595,0.682 C12.595,0.55 12.65,0.421666667 12.76,0.297 C12.87,0.172333333 13.0533333,0.11 13.31,0.11 C13.5666667,0.11 13.75,0.168666667 13.86,0.286 C13.97,0.403333333 14.025,0.535333333 14.025,0.682 L14.025,7.502 C14.025,7.62666667 13.9883333,7.74033333 13.915,7.843 C13.8416667,7.94566667 13.6766667,7.997 13.42,7.997 C13.2733333,7.997 13.1505,7.953 13.0515,7.865 C12.9525,7.777 12.87,7.689 12.804,7.601 L9.339,3.08 L9.339,7.425 Z" id="路径"></path>
-                        </g>
+    <g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="评测设置" transform="translate(-495.000000, -149.000000)">
+            <g id="编组-22" transform="translate(246.000000, 44.000000)">
+                <g id="开关-/关" transform="translate(249.000000, 105.000000)">
+                    <rect id="矩形" fill="#FF8057" x="0" y="0" width="46" height="23" rx="11.5"></rect>
+                    <g id="knob">
+                        <use fill="black" fill-opacity="1" filter="url(#filter-2)" xlink:href="#path-1"></use>
+                        <use fill="#FFFFFF" fill-rule="evenodd" xlink:href="#path-1"></use>
                     </g>
                 </g>
             </g>

src/subpages/colexiu/popups/setting/index.module.less

@@ -15,8 +15,7 @@
       height: 100%;
     }
     .van-tabs__content {
-      // flex: 1;
-      height: 100px;
+      height: 125px;
     }
     .van-tab__pane {
       height: 100%;
@@ -72,7 +71,7 @@
   width: 28px;
   color: #fff;
   font-size: 8px;
-  line-height: 16px;
+  line-height: 12px;
   text-align: center;
   background-color: var(--van-primary-color);
   border-radius: 20px;
@@ -171,8 +170,7 @@
       margin: 0 1px;
     }
     .van-radio[aria-checked='true'] {
-      background: linear-gradient(180deg, #ffffff 0%, #fbdacf 100%);
-      box-shadow: 0px 0px 1px 0px #fbdacf;
+      background: #fff;
       .van-radio__label {
         color: var(--primary-color);
       }

src/subpages/colexiu/popups/setting/info.svg

@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
     <title>编组</title>
-    <g id="页面-2" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="全局设置" transform="translate(-274.000000, -87.000000)" fill-rule="nonzero">
-            <g id="编组-22" transform="translate(246.000000, 23.000000)">
+    <g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="全局设置" transform="translate(-273.000000, -108.000000)" fill-rule="nonzero">
+            <g id="编组-22" transform="translate(246.000000, 44.000000)">
                 <g id="编组-3" transform="translate(15.000000, 54.000000)">
-                    <g id="编组" transform="translate(13.000000, 10.000000)">
-                        <path d="M8.00000178,0 C3.59200139,0 1.77986584e-06,3.59199961 1.77986584e-06,8 C1.77986584e-06,12.4079986 3.59200137,16 8.00000178,16 C12.4080004,16 16.0000018,12.4079986 16.0000018,8 C16.0000018,3.59199959 12.4080004,0 8.00000178,0 Z" id="路径" fill="#FEAC13"></path>
-                        <path d="M13.6672003,2.36159974 C14.6589912,3.35644003 15.3716365,4.59467148 15.7336,5.95199933 L5.95200111,15.7335982 C4.59467326,15.3716347 3.35644181,14.6589894 2.36160152,13.6671985 L7.44960095,8.57919905 C7.59360093,8.71599904 7.78800091,8.79999903 8.00000089,8.79999903 C8.44000085,8.79999903 8.80000081,8.43999907 8.80000081,7.99999911 L8.80000081,7.22879919 L13.6672003,2.36159974 Z M8.00000089,10.3999988 C7.56000093,10.3999988 7.20000097,10.7599988 7.20000097,11.1999988 C7.20000097,11.6399987 7.56000093,11.9999987 8.00000089,11.9999987 C8.44000085,11.9999987 8.80000081,11.6399987 8.80000081,11.1999988 C8.80000081,10.7599988 8.44000085,10.3999988 8.00000089,10.3999988 L8.00000089,10.3999988 Z" id="形状" fill="#FFB936"></path>
-                        <path d="M10.0936007,0.278399969 C11.4466535,0.647925598 12.6789481,1.36628136 13.6672003,2.36159974 L8.80000081,7.22879919 L8.80000081,4.79999946 C8.80000081,4.39199951 8.48960084,4.05199955 8.09280087,4.00559955 L8.00000089,3.99999956 C7.56000093,3.99999956 7.20000097,4.35999952 7.20000097,4.79999946 L7.20000097,7.99999911 C7.20000097,8.22719908 7.29600096,8.43359906 7.44960095,8.57919905 L2.36160152,13.6671985 C1.36628314,12.6789463 0.647927378,11.4466517 0.278401749,10.0935989 L10.0936007,0.278399969 Z" id="路径" fill="#FFC964"></path>
-                        <path d="M8,0 C8.7240008,0 9.42560073,0.0967999954 10.0936007,0.278399969 L0.278401749,10.0935989 C0.0931508027,9.4111699 -0.000470761078,8.70712498 0,8 C0,3.59199961 3.59200139,0 8,0 Z" id="路径" fill="#FFD78C"></path>
+                    <g id="编组" transform="translate(12.000000, 10.000000)">
+                        <path d="M8.00000178,0 C3.59200139,0 1.77986584e-06,3.59199961 1.77986584e-06,8 C1.77986584e-06,12.4079986 3.59200137,16 8.00000178,16 C12.4080004,16 16.0000018,12.4079986 16.0000018,8 C16.0000018,3.59199959 12.4080004,0 8.00000178,0 Z" id="路径" fill="#FF6939"></path>
+                        <path d="M13.6672003,2.36159974 C14.6589912,3.35644003 15.3716365,4.59467148 15.7336,5.95199933 L5.95200111,15.7335982 C4.59467326,15.3716347 3.35644181,14.6589894 2.36160152,13.6671985 L7.44960095,8.57919905 C7.59360093,8.71599904 7.78800091,8.79999903 8.00000089,8.79999903 C8.44000085,8.79999903 8.80000081,8.43999907 8.80000081,7.99999911 L8.80000081,7.22879919 L13.6672003,2.36159974 Z M8.00000089,10.3999988 C7.56000093,10.3999988 7.20000097,10.7599988 7.20000097,11.1999988 C7.20000097,11.6399987 7.56000093,11.9999987 8.00000089,11.9999987 C8.44000085,11.9999987 8.80000081,11.6399987 8.80000081,11.1999988 C8.80000081,10.7599988 8.44000085,10.3999988 8.00000089,10.3999988 L8.00000089,10.3999988 Z" id="形状" fill="#FF8057"></path>
+                        <path d="M10.0936007,0.278399969 C11.4466535,0.647925598 12.6789481,1.36628136 13.6672003,2.36159974 L8.80000081,7.22879919 L8.80000081,4.79999946 C8.80000081,4.39199951 8.48960084,4.05199955 8.09280087,4.00559955 L8.00000089,3.99999956 C7.56000093,3.99999956 7.20000097,4.35999952 7.20000097,4.79999946 L7.20000097,7.99999911 C7.20000097,8.22719908 7.29600096,8.43359906 7.44960095,8.57919905 L2.36160152,13.6671985 C1.36628314,12.6789463 0.647927378,11.4466517 0.278401749,10.0935989 L10.0936007,0.278399969 Z" id="路径" fill="#FF906C"></path>
+                        <path d="M8,0 C8.7240008,0 9.42560073,0.0967999954 10.0936007,0.278399969 L0.278401749,10.0935989 C0.0931508027,9.4111699 -0.000470761078,8.70712498 0,8 C0,3.59199961 3.59200139,0 8,0 Z" id="路径" fill="#FFAB90"></path>
                         <path d="M8.16000087,10.7199987 C8.68800081,10.7199987 9.12000076,11.1519987 9.12000076,11.6799986 C9.12000076,12.2079986 8.68800081,12.6399985 8.16000087,12.6399985 C7.63200092,12.6399985 7.20000097,12.2079986 7.20000097,11.6799986 C7.20000097,11.1519987 7.63200092,10.7199987 8.16000087,10.7199987 Z M8.16000087,3.03999967 C8.68800081,3.03999967 9.12000076,3.47199962 9.12000076,3.99999954 L9.12000076,7.83999909 C9.12000076,8.36799903 8.68800081,8.79999898 8.16000087,8.79999898 C7.63200092,8.79999898 7.20000097,8.36799903 7.20000097,7.83999909 L7.20000097,3.99999954 C7.20000097,3.4719996 7.63200092,3.03999967 8.16000087,3.03999967 Z" id="形状结合" fill="#FFFFFF"></path>
                     </g>
                 </g>

src/subpages/colexiu/popups/setting/sett.tsx

@@ -117,7 +117,7 @@ export default defineComponent({
       return (
         <>
           <div>
-            <NoticeBar class={styles.noticebar} left-icon={InfoIcon} text="全局设置会更改所有乐谱练习及评测" />
+            <NoticeBar class={styles.noticebar} left-icon={InfoIcon} background="#FFF6E8" color="var(--van-primary-color)" text="全局设置会更改所有乐谱练习及评测" />
             <div class={styles.groupBox} style={{ height: 'auto' }}>
               <Cell center border={false} title="护眼模式">
                 <Switch v-model={SettingState.sett.eyeProtection} {...switchProps}></Switch>