更新

src/page-instrument/custom-plugins/guide-driver/index.tsx

@@ -59,8 +59,6 @@ export const PractiseDriver = defineComponent({
 
     const driverOptions = (): Config => {
       let length = 10;
-<<<<<<< HEAD
-=======
 
       if (!props.statusAll.playBtnStatus) {
         length -= 1;
@@ -70,7 +68,6 @@ export const PractiseDriver = defineComponent({
         length -= 1;
       }
 
->>>>>>> ad48312a4218b12b77f39afa7da0b336de34b76c
       // 显示指法
       if (!state.setting.displayFingering) {
         length -= 1;
@@ -97,11 +94,7 @@ export const PractiseDriver = defineComponent({
           length -= 1;
         }
       }
-<<<<<<< HEAD
-      console.log(props.statusAll, "statusAll", length);
-=======
       console.log(props.statusAll, "statusAll", length, state.setting.displayFingering);
->>>>>>> ad48312a4218b12b77f39afa7da0b336de34b76c
 
       let options: Config = {
         showProgress: false,
@@ -117,28 +110,6 @@ export const PractiseDriver = defineComponent({
         onHighlighted: () => {
           driverNextStatus.value = false;
         },
-<<<<<<< HEAD
-        steps: [
-          {
-            element: ".driver-1",
-            popover: {
-              title: "",
-              description: "",
-              popoverClass: "popoverClass popoverClass1",
-              align: "end",
-              side: "top",
-              nextBtnText: `下一步 (1/${length})`,
-              showButtons: ["next"],
-              onPopoverRender: (popover: PopoverDOM, options: { config: Config; state: State }) => {
-                options.config.stageRadius = 1000;
-                options.config.stagePadding = 0;
-              },
-            },
-          },
-        ] as DriveStep[],
-      };
-
-=======
         steps: [] as DriveStep[],
       };
 
@@ -161,7 +132,6 @@ export const PractiseDriver = defineComponent({
         });
       }
 
->>>>>>> ad48312a4218b12b77f39afa7da0b336de34b76c
       if (props.statusAll.playType) {
         options.steps?.push({
           element: ".driver-2",
@@ -268,75 +238,6 @@ export const PractiseDriver = defineComponent({
           // 是否有指法图
           // 乐器方向不一样引导位置不一样
           options.steps?.push({
-<<<<<<< HEAD
-            element: ".driver-7",
-            popover: {
-              title: "",
-              description: "",
-              popoverClass: `popoverClass ${state.fingeringInfo.direction === "transverse" ? "popoverClass7 popoverClose" : "popoverClass7-1 popoverClose"}`,
-              align: state.fingeringInfo.direction === "transverse" ? "start" : "center",
-              side: state.fingeringInfo.direction === "transverse" ? "top" : "left",
-              prevBtnText: "再看一遍",
-              doneBtnText: "完成",
-              showButtons: ["next", "previous"],
-              onPopoverRender: (popover: PopoverDOM, options: { config: Config; state: State }) => {
-                if (state.fingeringInfo.direction === "transverse") driverInitialPosition(popover, options);
-              },
-              onPrevClick: () => {
-                driverObj.drive(0);
-              },
-              onNextClick: () => {
-                onDriverClose();
-              },
-            },
-          });
-        } else {
-          options.steps?.push({
-            element: ".driver-6",
-            popover: {
-              title: "",
-              description: "",
-              popoverClass: "popoverClass popoverClass6 popoverClose",
-              align: "start",
-              side: "top",
-              prevBtnText: "再看一遍",
-              doneBtnText: "完成",
-              showButtons: ["next", "previous"],
-              onPopoverRender: (popover: PopoverDOM, options: { config: Config; state: State }) => {
-                driverInitialPosition(popover, options);
-              },
-              onPrevClick: () => {
-                driverObj.drive(0);
-              },
-              onNextClick: () => {
-                onDriverClose();
-              },
-            },
-          });
-        }
-      } else {
-        options.steps?.push({
-          element: ".driver-6",
-          popover: {
-            title: "",
-            description: "",
-            popoverClass: "popoverClass popoverClass6",
-            align: "start",
-            side: "top",
-            nextBtnText: `下一步 (${options.steps.length + 1}/${length})`, //"下一步6/" + length,
-            showButtons: ["next"],
-            onPopoverRender: (popover: PopoverDOM, options: { config: Config; state: State }) => {
-              driverInitialPosition(popover, options);
-            },
-          },
-        });
-
-        if (state.setting.displayFingering) {
-          // 是否有指法图
-          // 乐器方向不一样引导位置不一样
-          options.steps?.push({
-=======
->>>>>>> ad48312a4218b12b77f39afa7da0b336de34b76c
             element: ".driver-7",
             popover: {
               title: "",
@@ -344,14 +245,9 @@ export const PractiseDriver = defineComponent({
               popoverClass: `popoverClass ${state.fingeringInfo.direction === "transverse" ? "popoverClass7 popoverClose" : "popoverClass7-1 popoverClose"}`,
               align: state.fingeringInfo.direction === "transverse" ? "start" : "center",
               side: state.fingeringInfo.direction === "transverse" ? "top" : "left",
-<<<<<<< HEAD
-              nextBtnText: `下一步 (${options.steps?.length + 1}/${length})`,
-              showButtons: ["next"],
-=======
               prevBtnText: "再看一遍",
               doneBtnText: "完成",
               showButtons: ["next", "previous"],
->>>>>>> ad48312a4218b12b77f39afa7da0b336de34b76c
               onPopoverRender: (popover: PopoverDOM, options: { config: Config; state: State }) => {
                 if (state.fingeringInfo.direction === "transverse") driverInitialPosition(popover, options);
               },
@@ -363,11 +259,6 @@ export const PractiseDriver = defineComponent({
               },
             },
           });
-<<<<<<< HEAD
-        }
-
-        if (!props.statusAll.modelTypeStatus) {
-=======
         } else {
           options.steps?.push({
             element: ".driver-6",
@@ -495,7 +386,6 @@ export const PractiseDriver = defineComponent({
               },
             });
           }
->>>>>>> ad48312a4218b12b77f39afa7da0b336de34b76c
           options.steps?.push({
             //props.statusAll.titleType === "TEXT" ? ".driver-8 .van-notice-bar__content" :
             element: ".driver-8",
@@ -505,8 +395,6 @@ export const PractiseDriver = defineComponent({
               popoverClass: "popoverClass popoverClass8 popoverClose",
               align: "start",
               side: "bottom",
-<<<<<<< HEAD
-=======
               prevBtnText: "再看一遍",
               doneBtnText: "完成",
               showButtons: ["next", "previous"],
@@ -610,21 +498,15 @@ export const PractiseDriver = defineComponent({
               popoverClass: "popoverClass popoverClass9 popoverClose",
               align: "end",
               side: "bottom",
->>>>>>> ad48312a4218b12b77f39afa7da0b336de34b76c
               prevBtnText: "再看一遍",
               doneBtnText: "完成",
               showButtons: ["next", "previous"],
               onPopoverRender: (popover: PopoverDOM, options: { config: Config; state: State }) => {
-                if (props.statusAll.titleType === "TEXT") {
-                  options.config.stageRadius = 5;
-                  options.config.stagePadding = 5;
-                } else {
-                  options.config.stageRadius = 1000;
-                  options.config.stagePadding = 0;
-                }
+                options.config.stageRadius = 1000;
+                options.config.stagePadding = 0;
                 try {
                   const rect = options.state.activeElement?.getBoundingClientRect();
-                  popover.wrapper.style.marginLeft = (rect?.width || 0) / 2 - 4 + "px";
+                  popover.wrapper.style.marginLeft = -((rect?.width || 0) / 2 - 8) + "px";
                 } catch {}
               },
               onPrevClick: () => {
@@ -635,67 +517,6 @@ export const PractiseDriver = defineComponent({
               },
             },
           });
-<<<<<<< HEAD
-        } else {
-          options.steps?.push(
-            {
-              //  .van-notice-bar__content
-              // element: ".driver-8 .van-notice-bar__content",
-              // props.statusAll.titleType === "TEXT" ? ".driver-8 .van-notice-bar__content" :
-              element: ".driver-8",
-              popover: {
-                title: "",
-                description: "",
-                popoverClass: "popoverClass popoverClass8",
-                align: "start",
-                side: "bottom",
-                nextBtnText: `下一步 (${options.steps.length + 1}/${length})`,
-                showButtons: ["next"],
-                onPopoverRender: (popover: PopoverDOM, options: { config: Config; state: State }) => {
-                  if (props.statusAll.titleType === "TEXT") {
-                    options.config.stageRadius = 5;
-                    options.config.stagePadding = 5;
-                  } else {
-                    options.config.stageRadius = 1000;
-                    options.config.stagePadding = 0;
-                  }
-                  try {
-                    const rect = options.state.activeElement?.getBoundingClientRect();
-                    popover.wrapper.style.marginLeft = (rect?.width || 0) / 2 - 4 + "px";
-                  } catch {}
-                },
-              },
-            },
-            {
-              element: ".driver-9",
-              popover: {
-                title: "",
-                description: "",
-                popoverClass: "popoverClass popoverClass9 popoverClose",
-                align: "end",
-                side: "bottom",
-                prevBtnText: "再看一遍",
-                doneBtnText: "完成",
-                showButtons: ["next", "previous"],
-                onPopoverRender: (popover: PopoverDOM, options: { config: Config; state: State }) => {
-                  options.config.stageRadius = 1000;
-                  options.config.stagePadding = 0;
-                  try {
-                    const rect = options.state.activeElement?.getBoundingClientRect();
-                    popover.wrapper.style.marginLeft = -((rect?.width || 0) / 2 - 8) + "px";
-                  } catch {}
-                },
-                onPrevClick: () => {
-                  driverObj.drive(0);
-                },
-                onNextClick: () => {
-                  onDriverClose();
-                },
-              },
-            }
-          );
-=======
->>>>>>> ad48312a4218b12b77f39afa7da0b336de34b76c
         }
       }
 
@@ -1686,4 +1507,4 @@ export const EvaluatingReportDriver = defineComponent({
       </Teleport>
     );
   },
-});
+});

src/page-instrument/header-top/index.tsx

@@ -866,7 +866,7 @@ export default defineComponent({
               <img style={{ display: state.section.length === 2 ? "" : "none" }} class={styles.iconBtn} src={headImg(`section2.png`)} />
               <span>选段</span>
             </div>
-            {(
+            {
               <>
                 <div
                   style={{ display: metronomeBtn.value.display ? "" : "none" }}
@@ -890,7 +890,7 @@ export default defineComponent({
                   </Popup>
                 }
               </>
-            )}
+            }
             {/* {state.enableNotation ? (
               <Popover trigger="manual" v-model:show={headData.musicTypeShow} class={state.platform === IPlatform.PC && styles.pcTransPop} placement={state.platform === IPlatform.PC ? "top-end" : "bottom-end"} overlay={false} offset={state.platform === IPlatform.PC ? [0, 40] : [0, 8]}>
                 {{