Merge branch '2023-8-28' into 2023-8-29_上线

src/page-instrument/view-detail/index.module.less

@@ -109,9 +109,10 @@
         }
 
         .pcTitle {
-            flex: 1;
-            width: auto;
-            margin-left: auto;
+            position: absolute;
+            left: 50%;
+            top: 50%;
+            transform: translate(-50%, -50%);
 
             .van-notice-bar__wrap {
                 justify-content: center;

src/view/fingering/fingering-config.ts

@@ -204,6 +204,7 @@ export const subjectFingering = (subjectId: number | string): IFingering => {
 				orientation: 1,
 				code: "竖笛",
 				hasTizhi: true,
+				transform: `scale(1.3)`,
 			};
 		case "hulusi-flute": // 葫芦丝
 			return {
@@ -233,12 +234,13 @@ export const subjectFingering = (subjectId: number | string): IFingering => {
 				orientation: 0,
 				code: "陶笛",
 				hasTizhi: false,
+				transform: "rotate(-35deg) scale(1.3) translateX(0.2rem)",
 			};
 		case "melodica": // 口风琴
 			return {
 				name: "melodica",
 				direction: "transverse",
-				height: "1.8rem",
+				height: "2rem",
 				orientation: 0,
 				code: "口风琴",
 				hasTizhi: false,

src/view/fingering/index.module.less

@@ -4,12 +4,13 @@
   display: flex;
   justify-content: space-evenly;
   align-items: center;
-  padding: 0 10px 6px 10px;
+  padding: 0 10px 4px 10px;
+  overflow: hidden;
 }
 
 .vertical {
   position: relative;
-  padding: 10px 6px 10px 0;
+  padding: 10px 0 10px 0;
   box-shadow: rgba(0, 0, 0, 0.05) 0px 0px 10px;
 
   .imgs {

src/view/fingering/index.tsx

@@ -69,7 +69,7 @@ export default defineComponent({
 							onClick={() => doubeClick()}
 							class={[styles.fingeringContainer, styles.vertical, state.fingeringInfo.name]}
 						>
-							<div class={styles.imgs}>
+							<div class={styles.imgs} style={{transform: state.fingeringInfo.transform}}>
 								<img src={fingerData.subject?.json?.full} />
 								{rs.map((key: number | string, index: number) => {
 									const nk: string = typeof key === "string" ? key.replace("active-", "") : String(key);