From 8891954e61f2ee46c3834305faaa747cdc246a23 Mon Sep 17 00:00:00 2001
From: "XGL-THINKPAD-X1\\rucky" <ruckyshao@gmail.com>
Date: Wed, 24 Jan 2024 15:41:36 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=88=E5=B9=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Question.vue | 9 ++++++++-
 src/components/Result.vue   | 2 +-
 src/page/Home/App.vue       | 2 +-
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/components/Question.vue b/src/components/Question.vue
index 2a2412e..c529503 100644
--- a/src/components/Question.vue
+++ b/src/components/Question.vue
@@ -1,6 +1,6 @@
 <script setup name="Question">
 import gsap from "gsap";
-import { Toast } from "vant";
+import { Toast,Progress  } from "vant";
 import { data } from "@/data";
 import { debounceTap, FYShuffle, mostValue, judgeBigScreen } from "@/plugins";
 import { useMainStore } from "@/store";
@@ -288,7 +288,14 @@ onMounted(() => {
         </div>
       </div>
     </div>
+    <Progress
+      :percentage="(currentId+1)/12 *100"
+      pivot-color="#7232dd"
+      :show-pivot="false"
+      color="linear-gradient(to right, rgb(255 153 153), rgb(221 50 50))"
+    />
   </div>
+
 </template>
 
 <style lang='scss' scope>
diff --git a/src/components/Result.vue b/src/components/Result.vue
index e0aed2c..e34f2f1 100644
--- a/src/components/Result.vue
+++ b/src/components/Result.vue
@@ -129,7 +129,7 @@ const createPoster = (event) => {
         {
           name: "eqcode",
           src: eqcodePic.value,
-          pos: { w: 140, h: 140, x: 66, y: 1070 },
+          pos: { w: 140, h: 140, x: bgId.value == 3 ? 75 : 66, y: 1070 },
         },
       ],
       // 字体素材
diff --git a/src/page/Home/App.vue b/src/page/Home/App.vue
index 6f92746..0d083a0 100644
--- a/src/page/Home/App.vue
+++ b/src/page/Home/App.vue
@@ -233,7 +233,7 @@ const playMusic = () => {
 }
 
 #musicBtn {
-  @include pos(60px, 60px, 80px, 40px);
+  @include pos(60px, 60px, 650px, 30px);
   z-index: 99;
 }