skyblued 2 years ago
parent
commit
7c506ff7ef

+ 0 - 8
src/pages/detail/speed.module.less

@@ -1,9 +1,5 @@
 .speed-change{
-  // height: 180px;
-  height: calc(90% - 65px);
-  // width: calc(140px * var(--screen));
   padding: calc(10px * var(--screen)) calc(15px * var(--screen));
-  // padding-top: calc(60px * var(--screen));
   .title{
       color: #999999;
       text-align: center;
@@ -18,12 +14,8 @@
       font-size: calc(8px * var(--screen))!important;
     }
     .van-button{
-      // width: 100 * @screen;
       height: calc(20px * var(--screen));
       line-height: calc(20px * var(--screen));
-      // i{
-      //   font-size: calc(8px * var(--screen));
-      // }
     }
   }
 }

+ 11 - 7
src/subpages/colexiu/buttons/icons/accompaniment.svg

@@ -2,16 +2,20 @@
 <svg width="29px" height="29px" viewBox="0 0 29 29" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
     <title>伴奏</title>
     <defs>
-        <path d="M14.5,5 C14.9198469,5 15.3333326,5.02709975 15.7387868,5.0796372 L15.739461,11.4914597 C15.425484,11.3833985 15.0883542,11.3247036 14.7374468,11.3247036 C13.0452347,11.3247036 11.6734257,12.6896792 11.6734257,14.3734619 C11.6734257,16.0572446 13.0452347,17.4222202 14.7374468,17.4222202 C16.429659,17.4222202 17.801468,16.0572446 17.801468,14.3734619 L17.7942219,14.1621325 L17.7942219,14.1621325 L17.7727995,13.954679 L17.7707276,5.57515703 C21.4060448,6.90159152 24,10.3757181 24,14.4526775 C24,19.6732471 19.7467051,23.9053549 14.5,23.9053549 C9.25329488,23.9053549 5,19.6732471 5,14.4526775 C5,9.23210785 9.25329488,5 14.5,5 Z M13.6485145,7.42213135 L13.5380921,7.43232999 C11.1412583,7.78453026 9.07005055,9.32180515 8.06867876,11.570923 C6.47021778,15.1611251 8.09835858,19.3711273 11.7018864,20.9755213 C15.3054142,22.5799152 19.5234944,20.9728183 21.1219554,17.3826162 C22.085337,15.2188257 21.8982132,12.7571482 20.6799325,10.7712115 C20.3864474,10.2927972 19.7606992,10.1428825 19.2822849,10.4363676 C18.8038706,10.7298528 18.6539559,11.355601 18.947441,11.8340153 C19.8194764,13.2555325 19.9529316,15.011182 19.2651692,16.5559217 C18.1242057,19.1185678 15.108704,20.2674799 12.5285809,19.1187351 C9.9484578,17.9699903 8.78450142,14.9602635 9.92546495,12.3976175 C10.6403077,10.7920543 12.1179292,9.69534616 13.8335833,9.44324113 C14.3888811,9.36164347 14.7728909,8.8453377 14.6912933,8.29003993 C14.6096956,7.73474215 14.0933898,7.35073233 13.5380921,7.43232999 Z" id="path-1"></path>
+        <linearGradient x1="-7.37257477e-16%" y1="-4.51028104e-15%" x2="100%" y2="100%" id="linearGradient-1">
+            <stop stop-color="#FF9C63" offset="0%"></stop>
+            <stop stop-color="#FF7144" offset="100%"></stop>
+        </linearGradient>
+        <path d="M14.5,5 C14.9198469,5 15.3333326,5.02709975 15.7387868,5.0796372 L15.739461,11.4914597 C15.425484,11.3833985 15.0883542,11.3247036 14.7374468,11.3247036 C13.0452347,11.3247036 11.6734257,12.6896792 11.6734257,14.3734619 C11.6734257,16.0572446 13.0452347,17.4222202 14.7374468,17.4222202 C16.429659,17.4222202 17.801468,16.0572446 17.801468,14.3734619 L17.7942219,14.1621325 L17.7942219,14.1621325 L17.7727995,13.954679 L17.7707276,5.57515703 C21.4060448,6.90159152 24,10.3757181 24,14.4526775 C24,19.6732471 19.7467051,23.9053549 14.5,23.9053549 C9.25329488,23.9053549 5,19.6732471 5,14.4526775 C5,9.23210785 9.25329488,5 14.5,5 Z M13.6485145,7.42213135 L13.5380921,7.43232999 C11.1412583,7.78453026 9.07005055,9.32180515 8.06867876,11.570923 C6.47021778,15.1611251 8.09835858,19.3711273 11.7018864,20.9755213 C15.3054142,22.5799152 19.5234944,20.9728183 21.1219554,17.3826162 C22.085337,15.2188257 21.8982132,12.7571482 20.6799325,10.7712115 C20.3864474,10.2927972 19.7606992,10.1428825 19.2822849,10.4363676 C18.8038706,10.7298528 18.6539559,11.355601 18.947441,11.8340153 C19.8194764,13.2555325 19.9529316,15.011182 19.2651692,16.5559217 C18.1242057,19.1185678 15.108704,20.2674799 12.5285809,19.1187351 C9.9484578,17.9699903 8.78450142,14.9602635 9.92546495,12.3976175 C10.6403077,10.7920543 12.1179292,9.69534616 13.8335833,9.44324113 C14.3888811,9.36164347 14.7728909,8.8453377 14.6912933,8.29003993 C14.6096956,7.73474215 14.0933898,7.35073233 13.5380921,7.43232999 Z" id="path-2"></path>
     </defs>
     <g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="主界面" transform="translate(-515.000000, -13.000000)">
-            <g id="伴奏" transform="translate(515.000000, 13.000000)">
-                <rect id="矩形备份-27" fill="#2DC7AA" x="0" y="0" width="29" height="29" rx="14.5"></rect>
-                <mask id="mask-2" fill="white">
-                    <use xlink:href="#path-1"></use>
+        <g id="练习模式2" transform="translate(-552.000000, -14.000000)">
+            <g id="伴奏" transform="translate(552.000000, 14.000000)">
+                <rect id="矩形备份-27" fill="url(#linearGradient-1)" x="0" y="0" width="29" height="29" rx="14.5"></rect>
+                <mask id="mask-3" fill="white">
+                    <use xlink:href="#path-2"></use>
                 </mask>
-                <use id="形状结合" fill="#FFFFFF" xlink:href="#path-1"></use>
+                <use id="形状结合" fill="#FFFFFF" xlink:href="#path-2"></use>
             </g>
         </g>
     </g>

+ 14 - 6
src/subpages/colexiu/buttons/icons/fingeringOff.svg

@@ -1,12 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg width="29px" height="29px" viewBox="0 0 29 29" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <title>切片</title>
+    <title>智能指法</title>
+    <defs>
+        <linearGradient x1="-7.37257477e-16%" y1="-4.51028104e-15%" x2="100%" y2="100%" id="linearGradient-1">
+            <stop stop-color="#FF9C63" offset="0%"></stop>
+            <stop stop-color="#FF7144" offset="100%"></stop>
+        </linearGradient>
+    </defs>
     <g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="曲谱评测(按钮合集)" transform="translate(-346.000000, -75.000000)">
-            <g id="智能指法" transform="translate(346.000000, 75.000000)">
-                <rect id="矩形备份-33" fill="#2DC7AA" x="0" y="0" width="29" height="29" rx="14.5"></rect>
-                <path d="M21.8314994,12.1141007 L19.528609,19.479859 C19.1777028,20.350761 19.0238859,20.9842104 17.7446236,21.8627487 C16.5000997,22.7174302 12.8864298,22.9082414 11.0592388,21.4220563 L21.8621438,11.450057 C21.9079839,11.6634482 21.9010198,11.8916353 21.8314994,12.1141007 Z M14.1933797,5.79560673 C14.8610107,5.79560673 15.4082789,6.3417841 15.4293697,7.02905123 L15.6028228,12.7533683 L16.5006337,8.32576795 C16.6369962,7.65304615 17.2679002,7.21304974 17.925713,7.33232149 L18.0006215,7.34577593 C18.6580707,7.46541132 19.1049761,8.10067887 19.0097042,8.7814006 L18.5942366,11.7436067 L9.69013425,19.9628117 C9.36752721,19.5675617 9.06758797,19.1674662 8.84978688,18.838046 L6.15162702,15.1169854 C5.73635768,14.54499 5.82690239,13.7384512 6.3581708,13.2791822 C6.88433126,12.8210327 7.68180369,12.8741758 8.14251991,13.3980903 L10.2835934,15.7951617 L9.30105593,8.7814006 C9.20578398,8.10067887 9.6523258,7.46504768 10.3101386,7.34577593 L10.3850471,7.33232149 C11.0428599,7.2126861 11.6737639,7.65268252 11.8101264,8.32576795 L12.70721,12.7533683 L12.8813904,7.02905123 C12.9021175,6.3417841 13.4493858,5.79560673 14.1173804,5.79560673 L14.1933797,5.79560673 Z" id="形状结合" fill="#FFFFFF" fill-rule="nonzero"></path>
-                <line x1="8.5" y1="9.5" x2="21.5" y2="21.5" id="直线备份" stroke="#FFFFFF" stroke-width="1.5" stroke-linecap="round" transform="translate(15.000000, 15.500000) scale(-1, 1) translate(-15.000000, -15.500000) "></line>
+        <g id="练习模式2" transform="translate(-650.000000, -14.000000)">
+            <g id="智能指法" transform="translate(650.000000, 14.000000)">
+                <rect id="矩形备份-33" fill="url(#linearGradient-1)" x="0" y="0" width="29" height="29" rx="14.5"></rect>
+                <g id="编组-30" transform="translate(5.800000, 5.800000)">
+                    <path d="M16.8932208,6.69623304 L14.4526566,14.502339 C14.0807721,15.4253062 13.9177595,16.0966251 12.5620189,17.0276851 C11.2430584,17.9334863 7.41318289,18.1356915 5.47680623,16.5605206 L16.9257689,5.99282456 C16.9742705,6.21887716 16.9668611,6.46058395 16.8932208,6.69623304 Z M8.79847084,0 C9.5060148,0 10.0860005,0.578829536 10.1083521,1.30718361 L10.2921748,7.37371794 L11.2436595,2.68142205 C11.3881742,1.96848287 12.0567956,1.50218211 12.7539345,1.6285843 L12.8333212,1.64284308 C13.5300747,1.76963065 14.0036976,2.44287645 13.90273,3.16429382 L13.462,6.304 L4.02623291,15.0144403 C3.68425373,14.5954712 3.36629419,14.1713471 3.13542155,13.8221564 L0.2759574,9.87863937 C-0.164138026,9.27244838 -0.0681802669,8.41769212 0.494848996,7.93096661 C1.05246495,7.44542751 1.89761274,7.50174773 2.38587199,8.05698343 L4.65494543,10.5973591 L3.61366886,3.16429382 C3.51270126,2.44287645 3.98593872,1.76924527 4.68307762,1.64284308 L4.76246436,1.6285843 C5.45960327,1.50179674 6.1282246,1.9680975 6.2727393,2.68142205 L7.22345332,7.37371794 L7.40804676,1.30718361 C7.430013,0.578829536 8.00999865,0 8.71792799,0 L8.79847084,0 Z" id="形状结合" fill="#FFFFFF" fill-rule="nonzero"></path>
+                    <line x1="2.76472334" y1="3.9258533" x2="16.5419034" y2="16.6432502" id="直线备份" stroke="#FFFFFF" stroke-width="1.5" stroke-linecap="round" transform="translate(9.653313, 10.284552) scale(-1, 1) translate(-9.653313, -10.284552) "></line>
+                </g>
             </g>
         </g>
     </g>

+ 9 - 7
src/subpages/colexiu/buttons/icons/pause.svg

@@ -2,17 +2,19 @@
 <svg width="40px" height="40px" viewBox="0 0 40 40" 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="99.3846973%" id="linearGradient-1">
-            <stop stop-color="#FFFFFF" offset="0%"></stop>
-            <stop stop-color="#FFFFFF" stop-opacity="0.589416077" offset="100%"></stop>
+        <linearGradient x1="15.3622126%" y1="15.0876404%" x2="89.7647319%" y2="86.8644279%" id="linearGradient-1">
+            <stop stop-color="#FF9C63" offset="0%"></stop>
+            <stop stop-color="#FF7144" offset="100%"></stop>
         </linearGradient>
     </defs>
     <g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="主界面播放中" transform="translate(-737.000000, -301.000000)">
+        <g id="练习模式2" transform="translate(-737.000000, -301.000000)">
             <g id="播放" transform="translate(737.000000, 301.000000)">
-                <rect id="矩形" fill="#2DC7AA" x="0" y="0" width="40" height="40" rx="20"></rect>
-                <path d="M14.5,11 C15.8807119,11 17,12.1192881 17,13.5 L17,26.5 C17,27.8807119 15.8807119,29 14.5,29 C13.1192881,29 12,27.8807119 12,26.5 L12,13.5 C12,12.1192881 13.1192881,11 14.5,11 Z" id="矩形" fill="url(#linearGradient-1)"></path>
-                <path d="M26.0066313,11 C27.3873432,11 28.5066313,12.1192881 28.5066313,13.5 L28.5066313,26.5 C28.5066313,27.8807119 27.3873432,29 26.0066313,29 C24.6259194,29 23.5066313,27.8807119 23.5066313,26.5 L23.5066313,13.5 C23.5066313,12.1192881 24.6259194,11 26.0066313,11 Z" id="矩形备份-30" fill="url(#linearGradient-1)"></path>
+                <rect id="矩形" fill="url(#linearGradient-1)" x="0" y="0" width="40" height="40" rx="20"></rect>
+                <g id="编组-27" transform="translate(14.000000, 12.000000)" fill="#FFFFFF">
+                    <rect id="矩形" x="0" y="0" width="4" height="16" rx="2"></rect>
+                    <rect id="矩形备份-13" x="8" y="0" width="4" height="16" rx="2"></rect>
+                </g>
             </g>
         </g>
     </g>

File diff suppressed because it is too large
+ 7 - 8
src/subpages/colexiu/buttons/icons/section2.svg


+ 4 - 9
src/subpages/colexiu/buttons/index.module.less

@@ -90,7 +90,6 @@
       flex-direction: column;
       > span {
         display: block;
-        margin-top: 2px;
         white-space: nowrap;
       }
     }
@@ -159,12 +158,10 @@
   }
   :global {
     .van-slider__button-wrapper {
-      width: 12px;
-      height: 8px;
-      line-height: 8px;
       background: linear-gradient(180deg, #ffd689 0%, #febd41 100%);
-      border-radius: 4px;
+      border-radius: 20Px;
       border: 1px solid #ffffff;
+      padding: 2Px 4Px;
       > div {
         background-color: transparent !important;
       }
@@ -234,12 +231,10 @@
   position: relative;
   .label {
     position: absolute;
-    width: 10px;
-    height: 7px;
     font-size: 4px;
-    color: #135d4f;
+    color: var(--primary-color);
     line-height: 7px;
-    background: linear-gradient(180deg, #ffd689 0%, #febd41 100%);
+    background: #FFE8B1;
     border-radius: 5px;
     border: 1px solid #ffffff;
     right: -4px;

Some files were not shown because too many files changed in this diff