Browse Source

Merge branch 'guide'

mo 1 year ago
parent
commit
358493890d

+ 3 - 0
src/custom-plugins/guide-page/index.module.less

@@ -58,6 +58,9 @@
   transform: scale(1.2);
   border-radius: 8px;
 }
+.noscalc {
+  transform: none !important;
+}
 
 .item {
   position: absolute;

+ 31 - 21
src/custom-plugins/guide-page/woring-guide.tsx

@@ -21,19 +21,25 @@ export default defineComponent({
             // top: "2.98rem",
             left:'4.5rem'
           },
+          // imgStyle: {
+          //   width:'5.46rem',
+          //   height:'2.6rem',
+          //   top: "1.2rem",
+          //   left:'2.1rem'
+          // },
           imgStyle: {
-            width:'5.46rem',
-            height:'2.6rem',
+            width:'8.19rem',
+            height:'3.9rem',
             top: "1.2rem",
-            left:'2.1rem'
+            left:'0.8rem'
           },
           btnsStyle: {
-            top: "4.2rem",
+            top: "5.8rem",
             left:'3.5rem'
           },
-          boxStyle:{
-            transform: 'scale(1)'
-          },
+          // boxStyle:{
+          //   transform: 'scale(1)'
+          // },
           type:'bottom'
         },
         {
@@ -45,18 +51,18 @@ export default defineComponent({
             left:'4.5rem'
           },
           imgStyle: {
+            width:'8.19rem',
+            height:'3.9rem',
             top: "1.2rem",
-            left:'2.1rem',
-            width:'5.46rem',
-            height:'2.6rem',
+            left:'0.8rem'
           },
           btnsStyle: {
-            top: "4.2rem",
+            top: "5.8rem",
             left:'3.5rem'
           },
-          boxStyle:{
-            transform: 'scale(1)'
-          },
+          // boxStyle:{
+          //   transform: 'scale(1)'
+          // },
           type:'bottom'
         },
         {
@@ -68,16 +74,18 @@ export default defineComponent({
             transform: 'rotate(180deg)'
           },
           imgStyle: {
-            top: "-5.4rem",
-            left:'2.1rem'
+            width:'8.19rem',
+            height:'3.9rem',
+            top: "-7.4rem",
+            left:'0.8rem'
           },
           btnsStyle: {
             top: "-2.4rem",
             left:'2.5rem'
           },
-          boxStyle:{
-            transform: 'scale(1)'
-          },
+          // boxStyle:{
+          //   transform: 'scale(1)'
+          // },
         },
       ],
       step: 0,
@@ -111,9 +119,11 @@ export default defineComponent({
         var docEl = document.documentElement;
         var clientWidth = docEl.clientWidth;
         if(clientWidth>750){
+          console.log('PAD')
           isPad.value = true;
         }else{
           isPad.value = false;
+          console.log('PHONE')
         }
         getStepELe();
       },500)
@@ -151,7 +161,7 @@ export default defineComponent({
       <Popup teleport="body" overlay={false} closeOnClickOverlay={false} class={["popup-custom", styles.guidePopup]} v-model:show={tipShow.value}>
       <div class={styles.content} onClick={() => handleNext()}>
       {data.step!=data.steps.length-1&&<div
-          class={styles.backBtn}
+          class={[styles.backBtn,styles.right]}
           onClick={(e: Event) => {
             e.stopPropagation();
            endGuide()
@@ -160,7 +170,7 @@ export default defineComponent({
 
           跳过
         </div>}
-        <div class={styles.box} style={{...data.box,...data.steps[data.step].boxStyle}} id={`modeType-${data.step}`}>
+        <div class={[styles.box,styles.noscalc]} style={{...data.box,}} id={`modeType-${data.step}`}>
           {data.steps.map((item: any, index) => (
             //   top: `${item.imgStyle?.height}`    top: `${item.eleRect?.top}px`,
             <div