fix

src/pages/pg2-2/index.vue

@@ -1,5 +1,6 @@
 <template>
   <div class="page pg-bg pg2-2">
+    <GoBack class="goback abs" @click="router.go(-1)" />
     <div class="bk-pd content">
       <Animate
         class="txt"
@@ -134,8 +135,11 @@ import { Splide, SplideSlide, SplideTrack } from "@splidejs/vue-splide";
 import Bell from "@/components/Bell.vue";
 import Btn from "@/components/Btn.vue";
 import Animate from "@/components/Animate.vue";
-
+import GoBack from "@/components/GoBack.vue";
+import { useRouter } from "vue-router";
 import Ink from "./Ink.vue";
+
+const router = useRouter();
 const inkActive = ref(false);
 const slideIndexRef = ref(0);
 

src/pages/pg2/index.vue

@@ -41,18 +41,28 @@
           :ready="show"
         />
       </div>
-
     </div>
 
     <div class="groups abs">
       <div>
-        <InkEffect class="ink-ruins" src="./images/pg2/废墟color.png" :speed="10" :active="inkActive" :clearable="true" />
+        <InkEffect
+          class="ink-ruins"
+          src="./images/pg2/废墟color.png"
+          :speed="10"
+          :active="inkActive"
+          :clearable="true"
+        />
         <img class="ruins" src="/images/pg2/废墟.png" alt />
       </div>
     </div>
     <div class="flower1">
       <div>
-        <img :class="{'flower-fly': show}" src="/images/pg2/flower1.png" alt="" @animationend="inkActive = true" />
+        <img
+          :class="{ 'flower-fly': show }"
+          src="/images/pg2/flower1.png"
+          alt=""
+          @animationend="inkActive = true"
+        />
       </div>
     </div>
 
@@ -63,8 +73,10 @@
     </div>
 
     <div class="footer txt">
-      了解故事
-      <img src="/images/pg2/箭头-右.png" alt />
+      <div @click="router.push('/pg2-2')">
+        了解故事
+        <img src="/images/pg2/箭头-右.png" alt />
+      </div>
     </div>
 
     <DownArrow />
@@ -72,56 +84,56 @@
 </template>
 
 <script setup>
-  import { reactive, ref, watch } from "vue";
-  import { useRouter } from "vue-router";
-  import Bell from "@/components/Bell.vue";
-  import Animate from "@/components/Animate.vue";
-  import InkEffect from "@/components/InkEffect.vue";
-  import DownArrow from '@/components/DownArrow.vue';
-  // import Cloud from "./Cloud.vue";
-  // import Smoke from "./smoke.vue";
-  // import Flower1 from "./flower/Flower1.vue";
-  // import Flower2 from "./flower/Flower2.vue";
-  // import Flower3 from "./flower/Flower3.vue";
-  import usePageShow from "../usePageShow";
-
-  const router = useRouter();
-  const inkActive = ref(false);
-
-  const onClick = () => {
-    router.push(`/pg2-2`);
-  };
-
-  const flowerAnimate = reactive({
-    left: "",
-    right: "",
-  });
-
-  let lastRatio = 0;
-  const flowShow = ({ intersectionRatio }) => {
-    console.log(intersectionRatio);
-    const isIn = intersectionRatio > 0.5 && intersectionRatio > lastRatio;
-    const isOut = intersectionRatio < 0.9 && intersectionRatio < lastRatio;
-
-    if (isIn) {
-      flowerAnimate.left = "animate__fadeInLeft";
-      flowerAnimate.right = "animate__fadeInRight";
-    }
-    if (isOut) {
-      flowerAnimate.left = "animate__fadeOutLeft";
-      flowerAnimate.right = "animate__fadeOutRight";
-    }
+import { reactive, ref, watch } from "vue";
+import { useRouter } from "vue-router";
+import Bell from "@/components/Bell.vue";
+import Animate from "@/components/Animate.vue";
+import InkEffect from "@/components/InkEffect.vue";
+import DownArrow from "@/components/DownArrow.vue";
+// import Cloud from "./Cloud.vue";
+// import Smoke from "./smoke.vue";
+// import Flower1 from "./flower/Flower1.vue";
+// import Flower2 from "./flower/Flower2.vue";
+// import Flower3 from "./flower/Flower3.vue";
+import usePageShow from "../usePageShow";
 
-    lastRatio = intersectionRatio;
-  };
+const router = useRouter();
+const inkActive = ref(false);
 
-  const [pgRef, show] = usePageShow(flowShow);
+const onClick = () => {
+  router.push(`/pg2-2`);
+};
 
-  watch(show, (val) => {
-    if (!val) {
-      inkActive.value = false;
-    }
-  })
+const flowerAnimate = reactive({
+  left: "",
+  right: "",
+});
+
+let lastRatio = 0;
+const flowShow = ({ intersectionRatio }) => {
+  console.log(intersectionRatio);
+  const isIn = intersectionRatio > 0.5 && intersectionRatio > lastRatio;
+  const isOut = intersectionRatio < 0.9 && intersectionRatio < lastRatio;
+
+  if (isIn) {
+    flowerAnimate.left = "animate__fadeInLeft";
+    flowerAnimate.right = "animate__fadeInRight";
+  }
+  if (isOut) {
+    flowerAnimate.left = "animate__fadeOutLeft";
+    flowerAnimate.right = "animate__fadeOutRight";
+  }
+
+  lastRatio = intersectionRatio;
+};
+
+const [pgRef, show] = usePageShow(flowShow);
+
+watch(show, (val) => {
+  if (!val) {
+    inkActive.value = false;
+  }
+});
 </script>
 
 <style lang="less" scoped>
@@ -203,7 +215,6 @@
       width: 50px;
     }
   }
-  
 
   .flower-fly {
     transform-origin: left bottom;
@@ -242,12 +253,18 @@
     width: 100%;
     text-align: center;
     font-size: 24px;
-    img {
-      width: 15px;
-      height: 25px;
-      display: inline;
-      width: auto;
-      vertical-align: text-bottom;
+    div {
+      display: flex;
+      justify-content: center;
+      align-items: center;
+      img {
+        width: 15px;
+        height: 25px;
+        display: inline;
+        width: auto;
+        vertical-align: text-bottom;
+        margin-left: 10px;
+      }
     }
   }
 }

src/pages/pg4/Share.vue

@@ -4,15 +4,9 @@
       <img src="/images/pg4/btn_share.png" alt="" @click="emit('share')">
       <img src="/images/pg4/btn_badge.png" alt="" @click="emit('badge')">
     </div>
-<<<<<<< HEAD
     <div class="share-txt txt">
       目前总种植数量: {{user.num}}
     </div>
-=======
-    <!-- <div class="share-txt txt">
-      目前总种植数量: 35896690
-    </div> -->
->>>>>>> f53b432b2d3c7347c2e754fdcb77bb2d3b53ed34
   </div>
 </template>