Merge branch 'hqyDev' of http://git.dayaedu.com/liushengqiang/classroom-app into jenkins-test

src/hooks/useDrag/dragbom.tsx

@@ -32,11 +32,11 @@ export default defineComponent({
           <div class={[styles.box, styles.right]}></div>
         </div>
         {
-          props.showGuide && 
-          <div class={[styles.guide, data.guidePos === "top" && styles.guideTop, 'bom_guide']}>
+          props.showGuide &&
+          <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>          
+            <div class={styles.guideDone} onClick={(e) => {e.stopPropagation();emit("guideDone")}}></div>
+          </div>
         }
 
       </>

src/hooks/useDrag/index.module.less

@@ -27,11 +27,11 @@
     content: "";
     display: block;
     position: fixed;
-    left: 0;
-    top: 0;
+    left: -100%;
+    top: -100%;
     z-index: 9;
-    width: 100vw;
-    height: 100vh;
+    width: 200vw;
+    height: 200vh;
     background: rgba(0,0,0,0.2);
   }
   .guideBg {

src/hooks/useDrag/index.ts

@@ -69,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();

src/views/tempo-practice/index.module.less

@@ -12,6 +12,9 @@
   display: flex;
 
   &.modal {
+    .head{
+      padding: 0 23px 8px 23px;
+    }
     .iconBack {
       opacity: 0;
       pointer-events: none;
@@ -107,6 +110,8 @@
 
   .back {
     padding-top: 17px;
+    width: 46px;
+    height: 46px;
 
     img {
       width: 46px;
@@ -371,6 +376,7 @@
 }
 :global{
   .settingBoxClass_drag .settingContainer_pc{
-    height: 56vh !important;
+    border-radius: 16px;
+    height: 50vh !important;
   }
 }

src/views/tempo-practice/index.tsx

@@ -288,7 +288,7 @@ export default defineComponent({
               <img src={icon_setting} />
             </div>
           ) : (
-            <div></div>
+            <div class={styles.back}></div>
           )}
         </div>