黄琪勇 1 year ago
parent
commit
5509547a5c

+ 2 - 2
src/hooks/useDrag/dragbom.tsx

@@ -35,9 +35,9 @@ export default defineComponent({
       </div>
         {
           props.showGuide && 
-          <div class={[styles.guide, data.guidePos === "top" && styles.guideTop, 'bom_guide']}>
+          <div class={[styles.guide, data.guidePos === "top" && styles.guideTop, 'bom_guide']} onClick={() => emit("guideDone")}>
             <div class={styles.guideBg}></div>
-            <div class={styles.guideDone} onClick={() => emit("guideDone")}></div>
+            <div class={styles.guideDone} onClick={(e) => {e.stopPropagation();emit("guideDone")}}></div>
           </div>          
         }
 

+ 6 - 1
src/hooks/useDrag/index.ts

@@ -39,7 +39,6 @@ export default function useDrag(
           const classDom = document.querySelector(
             `.${className}`
           ) as HTMLElement;
-          console.log(classDom)
           if (classDom) {
             classDom.style.cursor = 'move';
             drag(classDom, boxClassDom, pos);
@@ -70,9 +69,15 @@ export default function useDrag(
     // 有缓存 用缓存的值,没有缓存用默认
     if (posCache) {
       pos.value = posCache;
+      nextTick(() => {
+        refreshPos();
+      });
     }
   }
   function refreshPos() {
+    if(pos.value.left === -1 && pos.value.top === -1){
+      return
+    }
     const boxClassDom = document.querySelector(`.${boxClass}`) as HTMLElement;
     if (!boxClassDom) return;
     const parentElementRect = boxClassDom.getBoundingClientRect();

+ 5 - 1
src/page-instrument/view-figner/change-subject/index.tsx

@@ -1,4 +1,4 @@
-import { defineComponent, onMounted, reactive } from "vue";
+import { defineComponent, onMounted, reactive, watch } from "vue";
 import styles from "./index.module.less";
 import { Button, showToast } from "vant";
 
@@ -22,6 +22,10 @@ export default defineComponent({
       selectList: [] as any,
     });
 
+    // subject 变化时候 重新刷新
+    watch(()=>props.subject,()=>{
+      selectItem()
+    })
     //
     const selectItem = () => {
       // const i: any = props.subjectList.find((item: any) => item.value === props.subject);

+ 2 - 2
src/page-instrument/view-figner/index.tsx

@@ -551,9 +551,9 @@ export default defineComponent({
         resetMode(true, 0);
         handleStop();
         gaumntPause();
-
+        data.tnoteShow = false
         // 重置乐器
-        if (res?.data?.data.code) {
+        if (res?.data?.data?.code) {
           data.subject = code;
           data.viewIndex = 0;
           data.tipShow = false;