提交

1

src/page-instrument/custom-plugins/guide-page/index.module.less

@@ -167,7 +167,7 @@
         line-height: 25px;
         font-size: 9px;
         padding: 0;
-        margin-right:20px;
+        margin-right:10px;
         cursor: pointer;
         text-align: center;
         color: #fff;

src/page-instrument/custom-plugins/guide-page/student-bottom.tsx

@@ -18,7 +18,7 @@ export default defineComponent({
           eleRect: {} as DOMRect,
           img: getImage("studentB1.png"),
           handStyle: {
-            top: "-1.41rem",
+            top: "-1.39rem",
             left:'1.4rem',
             transform: 'rotate(180deg)'
           },
@@ -38,7 +38,7 @@ export default defineComponent({
           img: getImage("studentB2.png"),
           handStyle: {
             top: "-1.39rem",
-            left:'0.15rem',
+            left:'1.5rem',
             transform: 'rotate(180deg)'
           },
           imgStyle: {
@@ -48,7 +48,7 @@ export default defineComponent({
           },
           btnsStyle: {
             top: "-1.61rem",
-            left:'1.3rem',
+            left:'2.3rem',
           },
         },
         {
@@ -56,19 +56,19 @@ export default defineComponent({
           img: getImage("studentB3.png"),
           handStyle: {
             top: "-1.39rem",
-            left:'2.8rem',
+            left:'1.4rem',
             transform: 'rotate(180deg)'
           },
           imgStyle: {
             top: "-4.5rem",
             width:'6.48rem',
             height:'3.01rem',
-            left:'-2.9rem'
+            left:'-4.3rem'
 
           },
           btnsStyle: {
             top: "-1.1rem",
-            left:'-1.8rem',
+            left:'-3.2rem',
           },
         },
       ],
@@ -123,15 +123,16 @@ export default defineComponent({
     return () => (
       <Popup teleport="body" overlay={false} closeOnClickOverlay={false} class={["popup-custom", styles.guidePopup]} v-model:show={tipShow.value}>
       <div class={styles.content} onClick={() => handleNext()}>
-        <div
+      {data.step!=data.steps.length-1&&<div
           class={styles.backBtn}
           onClick={(e: Event) => {
             e.stopPropagation();
            endGuide()
           }}
         >
+     
           跳过
-        </div>
+        </div>} 
         <div class={styles.box} style={data.box} id={`modeType-${data.step}`}>
           {data.steps.map((item: any, index) => (
 

src/page-instrument/custom-plugins/guide-page/student-top.tsx

@@ -23,13 +23,13 @@ export default defineComponent({
             left:'0.3rem'
           },
           imgStyle: {
-            top: "1.52rem",
+            top: "1.9rem",
             width:'5.64rem',
             height:'2.77rem',
             left:'-2rem'
           },
           btnsStyle: {
-            top: "4.6rem",
+            top: "4.9rem",
             left:'-0.7rem'
           },
         },
@@ -42,13 +42,13 @@ export default defineComponent({
   
           },
           imgStyle: {
-            top: "1.52rem",
-            width:'5.64rem',
+            top: "1.9rem",
+            width:'5.46rem',
             height:'2.77rem',
             left:'-2rem'
           },
           btnsStyle: {
-            top: "4.6rem",
+            top: "4.9rem",
             left:'-0.7rem'
           },
         },
@@ -60,7 +60,7 @@ export default defineComponent({
             left:'0.3rem',
           },
           imgStyle: {
-            top: "1.8rem",
+            top: "1.9rem",
             width:'5.46rem',
             height:'2.30rem',
             left:'-2rem'
@@ -98,13 +98,13 @@ export default defineComponent({
           },
           imgStyle: {
             top: "1.8rem",
-            width:'4.46rem',
+            width:'5.46rem',
             height:'2.6rem',
-            left:'-2rem'
+            left:'-3rem'
           },
           btnsStyle: {
             top: "4.6rem",
-            left:'-0.7rem'
+            left:'-1.3rem'
           },
         },
         {
@@ -141,8 +141,8 @@ export default defineComponent({
               left:'-5.5rem'
             },
             btnsStyle: {
-              top: "4.4rem",
-              left:'-2.7rem'
+              top: "4.2rem",
+              left:'-3.7rem'
             },
           },      {
             ele: "",
@@ -219,16 +219,18 @@ export default defineComponent({
     }
     return () => (
       <Popup teleport="body" overlay={false} closeOnClickOverlay={false} class={["popup-custom", styles.guidePopup]} v-model:show={tipShow.value}>
-      <div class={styles.content} onClick={() => handleNext()}>
-        <div
+<div class={styles.content} onClick={() => handleNext()}>
+{data.step!=data.steps.length-1&&<div
           class={styles.backBtn}
           onClick={(e: Event) => {
             e.stopPropagation();
            endGuide()
           }}
         >
+        
           跳过
-        </div>
+        </div>} 
+        
         <div class={styles.box} style={data.box} id={`modeType-${data.step}`}>
           {data.steps.map((item: any, index) => (
 
@@ -241,6 +243,7 @@ export default defineComponent({
                 top: `${item.eleRect?.top}px`,
               }}
             >
+             
               <img class={styles.img} style={item.imgStyle} src={item.img} />
               <img class={styles.iconHead} style={item.handStyle} src={getImage("indexDot.png")} />
               <div class={styles.btns} style={item.btnsStyle}>

src/page-instrument/custom-plugins/guide-page/teacher-bootom.tsx

@@ -6,198 +6,6 @@ import { getImage } from "./images";
 import { getQuery } from "/src/utils/queryString";
 
 export default defineComponent({
-<<<<<<< Updated upstream
-  name: "aiTeacher-guide",
-  emits: ["close"],
-  setup(props, { emit }) {
-    const data = reactive({
-      box: {},
-      show: false,
-      steps: [
-        {
-          ele: "",
-          eleRect: {} as DOMRect,
-          img: getImage("aiTeacher1.png"),
-          handStyle: {
-            top: "0.91rem",
-          },
-          imgStyle: {
-            top: "-3.01rem",
-            width:'6.48rem',
-            height:'3.01rem',
-            left:'4.67rem'
-          },
-          btnsStyle: {
-            top: "-1.61rem",
-            left:'6rem'
-          },
-        },
-        {
-          ele: "",
-          img: getImage("aiTeacher2.png"),
-          handStyle: {
-            top: "-1.39rem",
-            left:'0.15rem',
-            transform: 'rotate(180deg)'
-          },
-          imgStyle: {
-            top: "-3.01rem",
-            width:'6.48rem',
-            height:'3.01rem',
-          },
-          btnsStyle: {
-            top: "-1.61rem",
-            left:'1.3rem',
-          },
-        },
-        {
-          ele: "",
-          img: getImage("aiTeacher3.png"),
-          handStyle: {
-            top: "-1.39rem",
-            left:'0.17rem',
-            transform: 'rotate(180deg)'
-          },
-          imgStyle: {
-            top: "-3.01rem",
-            width:'6.48rem',
-            height:'3.01rem',
-
-          },
-          btnsStyle: {
-            top: "-1.61rem",
-            left:'1.3rem',
-          },
-        },
-        {
-          ele: "",
-          img: getImage("aiTeacher4.png"),
-          handStyle: {
-            top: "-1.39rem",
-            left:'1.4rem',
-            transform: 'rotate(180deg)'
-          },
-          imgStyle: {
-            top: "-3.01rem",
-            width:'6.48rem',
-            height:'3.01rem',
-
-          },
-          btnsStyle: {
-            top: "-1.61rem",
-            left:'0.8rem',
-            "justify-content": "center",
-            padding: 0,
-          },
-        },
-      ],
-      step: 0,
-    });
-    
-    const tipShow = ref(false)
-   const guideInfo = localStorage.getItem('guideInfo')
-   const query: any = getQuery();
-   if(guideInfo&&JSON.parse(guideInfo).teacherBottom || !query.showGuide){
-    tipShow.value =false
-   }else {
-    tipShow.value =true
-   }
-    const getStepELe = () => {
-      console.log(`aiTeacher${data.step}`)
-      const ele: HTMLElement = document.getElementById(`aiTeacher-${data.step}`)!;
-      if (ele) {
-        const eleRect = ele.getBoundingClientRect();
-        data.box = {
-          left: eleRect.x + "px",
-          top: eleRect.y + "px",
-          width: eleRect.width + "px",
-          height: eleRect.height + "px",
-        };
-      }
-    };
-    onMounted(() => {
-      getStepELe();
-    });
-    const handleNext = () => {
-      if (data.step >= 3) {
-       endGuide();
-        return;
-      }
-      data.step = data.step + 1;
-      getStepELe();
-    };
-
-    const endGuide = ()=>{
-      let guideInfo = JSON.parse(localStorage.getItem('guideInfo') || '{}') || null
-      if(!guideInfo){
-        guideInfo = {teacherBottom:true}
-      }else{
-        guideInfo.teacherBottom = true
-      }
-      localStorage.setItem('guideInfo',JSON.stringify(guideInfo))
-      tipShow.value = false
-    //  localStorage.setItem('endC')
-    }
-    return () => (
-      <Popup teleport="body" overlay={false} closeOnClickOverlay={false} class={["popup-custom", styles.guidePopup]} v-model:show={tipShow.value}>
-      <div class={styles.content} onClick={() => handleNext()}>
-        <div
-          class={styles.backBtn}
-          onClick={(e: Event) => {
-            e.stopPropagation();
-           endGuide()
-          }}
-        >
-          跳过
-        </div>
-        <div class={styles.box} style={data.box} id={`modeType-${data.step}`}>
-          {data.steps.map((item: any, index) => (
-
-            <div
-              onClick={(e: Event) => e.stopPropagation()}
-              class={styles.item}
-              style={{
-                display: index === data.step ? "" : "none",
-                left: `${item.eleRect?.left}px`,
-                top: `${item.eleRect?.top}px`,
-              }}
-            >
-              <img class={styles.img} style={item.imgStyle} src={item.img} />
-              {/* <img class={styles.iconHead} style={item.handStyle} src={getImage("indexDot.png")} /> */}
-              <div class={styles.btns} style={item.btnsStyle}>
-                {data.step + 1 == data.steps.length ? (
-                  <>
-                      <div class={[styles.endBtn]}  onClick={() =>endGuide()}>
-                      完成
-                    </div>
-                    <div
-                      class={[styles.nextBtn]}
-                      style={{ "border-color": "#fff" }}
-                  
-                      onClick={() => {
-                        data.step = 0;
-                        getStepELe();
-                      }}
-                    >
-                      再看一遍
-                    </div>
-                
-                  </>
-                ) : (
-                  <Button class={styles.teacherBtn} round type="primary" onClick={() => handleNext()}>
-
-                    下一步 ({data.step + 1}/{data.steps.length})
-                  </Button>
-                )}
-              </div>
-            </div>
-          ))}
-        </div>
-      </div>
-      </Popup>
-    );
-  },
-=======
 	name: "aiTeacher-guide",
 	emits: ["close"],
 	setup(props, { emit }) {
@@ -356,15 +164,16 @@ export default defineComponent({
 				v-model:show={tipShow.value}
 			>
 				<div class={styles.content} onClick={() => handleNext()}>
-					<div
-						class={styles.backBtn}
-						onClick={(e: Event) => {
-							e.stopPropagation();
-							endGuide();
-						}}
-					>
-						跳过
-					</div>
+		<div
+          class={styles.backBtn}
+          onClick={(e: Event) => {
+            e.stopPropagation();
+           endGuide()
+          }}
+        >
+		
+          跳过
+        </div>
 					<div class={styles.box} style={{...data.box,...data.steps[data.step].boxStyle}} id={`modeType-${data.step}`}>
 						{data.steps.map((item: any, index) => (
 							<div
@@ -407,5 +216,4 @@ export default defineComponent({
 			</Popup>
 		);
 	},
->>>>>>> Stashed changes
 });