liushengqiang 2 vuotta sitten
vanhempi
commit
c78d00c897

+ 2 - 2
src/constant/instruments.ts

@@ -200,10 +200,10 @@ const instruments: any = {
 };
 };
 /** 获取分轨名称 */
 /** 获取分轨名称 */
 export const getInstrumentName = (name = '') => {
 export const getInstrumentName = (name = '') => {
-  name = name.toLocaleLowerCase().replaceAll(' ', '')
+  name = name.toLocaleLowerCase().replace(/ /g, '')
   if (!name) return ''
   if (!name) return ''
   for(let key in instruments){
   for(let key in instruments){
-    const _key = key.toLocaleLowerCase().replaceAll(' ', '')
+    const _key = key.toLocaleLowerCase().replace(/ /g, '')
     if (_key.includes(name) || name.includes(_key)){
     if (_key.includes(name) || name.includes(_key)){
       return instruments[key]
       return instruments[key]
     }
     }

+ 8 - 8
src/page-orchestra/header-top/image/info.svg

@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?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">
 <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>
     <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="编组-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>
                         <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>
                 </g>
                 </g>

+ 4 - 0
src/page-orchestra/header-top/settting/index.module.less

@@ -2,6 +2,10 @@
     position: relative;
     position: relative;
 }
 }
 
 
+.noticebar{
+    border-radius: 8px;
+}
+
 .closeBtn {
 .closeBtn {
     position: absolute;
     position: absolute;
     right: -12px;
     right: -12px;

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

@@ -27,7 +27,7 @@ export default defineComponent({
 				<div class={styles.content}>
 				<div class={styles.content}>
 					<Tabs border animated swipeable>
 					<Tabs border animated swipeable>
 						<Tab title="全局设置">
 						<Tab title="全局设置">
-							<NoticeBar class={styles.noticebar} left-icon={iconInfo} text="全局设置会更改所有乐谱练习及评测" />
+							<NoticeBar class={styles.noticebar} color="var(--van-primary-color)" background="rgb(255, 246, 232)" left-icon={iconInfo} text="全局设置会更改所有乐谱练习及评测" />
 							<Cell title="护眼模式" center>
 							<Cell title="护眼模式" center>
 								{{
 								{{
 									value: () => <Switch v-model={state.setting.eyeProtection}></Switch>,
 									value: () => <Switch v-model={state.setting.eyeProtection}></Switch>,

+ 1 - 1
src/view/fingering/index.module.less

@@ -4,7 +4,7 @@
   display: flex;
   display: flex;
   justify-content: space-evenly;
   justify-content: space-evenly;
   align-items: center;
   align-items: center;
-  padding: 2px 10px;
+  padding: 0 10px 6px 10px;
 }
 }
 .vertical{
 .vertical{
   padding: 10px 6px 10px 0;
   padding: 10px 6px 10px 0;