diff --git a/src/assets/font/HarmonyOS_Sans_SC_Regular.ttf b/src/assets/font/HarmonyOS_Sans_SC_Regular.ttf
index 31009df..5f38b27 100644
Binary files a/src/assets/font/HarmonyOS_Sans_SC_Regular.ttf and b/src/assets/font/HarmonyOS_Sans_SC_Regular.ttf differ
diff --git a/src/assets/images/index/bg.jpg b/src/assets/images/index/bg.jpg
index d9f258e..efce8d8 100644
Binary files a/src/assets/images/index/bg.jpg and b/src/assets/images/index/bg.jpg differ
diff --git a/src/assets/images/index/card-1.png b/src/assets/images/index/card-1.png
index 806d572..01108ea 100644
Binary files a/src/assets/images/index/card-1.png and b/src/assets/images/index/card-1.png differ
diff --git a/src/assets/images/index/card-2.png b/src/assets/images/index/card-2.png
index 399c4d3..86cf592 100644
Binary files a/src/assets/images/index/card-2.png and b/src/assets/images/index/card-2.png differ
diff --git a/src/assets/images/index/card-3.png b/src/assets/images/index/card-3.png
index da15ac8..369880f 100644
Binary files a/src/assets/images/index/card-3.png and b/src/assets/images/index/card-3.png differ
diff --git a/src/assets/images/index/card-4.png b/src/assets/images/index/card-4.png
index 11e0fa8..f72f1e2 100644
Binary files a/src/assets/images/index/card-4.png and b/src/assets/images/index/card-4.png differ
diff --git a/src/assets/images/index/card-5.png b/src/assets/images/index/card-5.png
index 9ae1d62..95d6e50 100644
Binary files a/src/assets/images/index/card-5.png and b/src/assets/images/index/card-5.png differ
diff --git a/src/assets/images/index/line.png b/src/assets/images/index/line.png
index eaab74e..58638f7 100644
Binary files a/src/assets/images/index/line.png and b/src/assets/images/index/line.png differ
diff --git a/src/assets/images/index/logo.png b/src/assets/images/index/logo.png
index 9b61a83..be53484 100644
Binary files a/src/assets/images/index/logo.png and b/src/assets/images/index/logo.png differ
diff --git a/src/assets/images/index/megaphone.png b/src/assets/images/index/megaphone.png
index b9663c9..646c41b 100644
Binary files a/src/assets/images/index/megaphone.png and b/src/assets/images/index/megaphone.png differ
diff --git a/src/assets/images/index/paper.png b/src/assets/images/index/paper.png
index 11bbe3a..5a2cabd 100644
Binary files a/src/assets/images/index/paper.png and b/src/assets/images/index/paper.png differ
diff --git a/src/assets/images/index/text.png b/src/assets/images/index/text.png
index 3bc31fb..e660e09 100644
Binary files a/src/assets/images/index/text.png and b/src/assets/images/index/text.png differ
diff --git a/src/assets/images/index/time.png b/src/assets/images/index/time.png
index 4e095d9..43496bc 100644
Binary files a/src/assets/images/index/time.png and b/src/assets/images/index/time.png differ
diff --git a/src/assets/images/index/title.png b/src/assets/images/index/title.png
index 91c54ec..0e84705 100644
Binary files a/src/assets/images/index/title.png and b/src/assets/images/index/title.png differ
diff --git a/src/assets/images/load/icon-2.png b/src/assets/images/load/icon-2.png
index 6bb1b65..4b4f969 100644
Binary files a/src/assets/images/load/icon-2.png and b/src/assets/images/load/icon-2.png differ
diff --git a/src/assets/images/load/icon.png b/src/assets/images/load/icon.png
index 860679f..358a40f 100644
Binary files a/src/assets/images/load/icon.png and b/src/assets/images/load/icon.png differ
diff --git a/src/assets/images/qa/cls-btn.png b/src/assets/images/qa/cls-btn.png
index 921a026..9616dd6 100644
Binary files a/src/assets/images/qa/cls-btn.png and b/src/assets/images/qa/cls-btn.png differ
diff --git a/src/assets/images/qa/correct.png b/src/assets/images/qa/correct.png
index b81f278..dc3a798 100644
Binary files a/src/assets/images/qa/correct.png and b/src/assets/images/qa/correct.png differ
diff --git a/src/assets/images/qa/create-btn.png b/src/assets/images/qa/create-btn.png
index 44a185c..0f286a9 100644
Binary files a/src/assets/images/qa/create-btn.png and b/src/assets/images/qa/create-btn.png differ
diff --git a/src/assets/images/qa/incorrect.png b/src/assets/images/qa/incorrect.png
index 1389826..b61dd47 100644
Binary files a/src/assets/images/qa/incorrect.png and b/src/assets/images/qa/incorrect.png differ
diff --git a/src/assets/images/qa/megaphone.png b/src/assets/images/qa/megaphone.png
index 20eb2a0..fb07174 100644
Binary files a/src/assets/images/qa/megaphone.png and b/src/assets/images/qa/megaphone.png differ
diff --git a/src/assets/images/qa/paper.png b/src/assets/images/qa/paper.png
index ce7a82a..708f044 100644
Binary files a/src/assets/images/qa/paper.png and b/src/assets/images/qa/paper.png differ
diff --git a/src/assets/images/question-list/arrow-l.png b/src/assets/images/question-list/arrow-l.png
index 3660f4a..5804075 100644
Binary files a/src/assets/images/question-list/arrow-l.png and b/src/assets/images/question-list/arrow-l.png differ
diff --git a/src/assets/images/question-list/arrow-r.png b/src/assets/images/question-list/arrow-r.png
index a16fae0..62be4f7 100644
Binary files a/src/assets/images/question-list/arrow-r.png and b/src/assets/images/question-list/arrow-r.png differ
diff --git a/src/assets/images/question-list/btn.png b/src/assets/images/question-list/btn.png
index 67c9b50..94dbfb2 100644
Binary files a/src/assets/images/question-list/btn.png and b/src/assets/images/question-list/btn.png differ
diff --git a/src/assets/images/question-list/card-1.png b/src/assets/images/question-list/card-1.png
index 6fb735b..9786875 100644
Binary files a/src/assets/images/question-list/card-1.png and b/src/assets/images/question-list/card-1.png differ
diff --git a/src/assets/images/question-list/card-2.png b/src/assets/images/question-list/card-2.png
index 8539708..383f644 100644
Binary files a/src/assets/images/question-list/card-2.png and b/src/assets/images/question-list/card-2.png differ
diff --git a/src/assets/images/question-list/card-3.png b/src/assets/images/question-list/card-3.png
index 583365b..f12aa9c 100644
Binary files a/src/assets/images/question-list/card-3.png and b/src/assets/images/question-list/card-3.png differ
diff --git a/src/assets/images/question-list/card-4.png b/src/assets/images/question-list/card-4.png
index e2231b3..3da905b 100644
Binary files a/src/assets/images/question-list/card-4.png and b/src/assets/images/question-list/card-4.png differ
diff --git a/src/assets/images/question-list/card-5.png b/src/assets/images/question-list/card-5.png
index 83dcc92..28c0ca1 100644
Binary files a/src/assets/images/question-list/card-5.png and b/src/assets/images/question-list/card-5.png differ
diff --git a/src/assets/images/question-list/megaphone.png b/src/assets/images/question-list/megaphone.png
index 1a3ab3a..b45371f 100644
Binary files a/src/assets/images/question-list/megaphone.png and b/src/assets/images/question-list/megaphone.png differ
diff --git a/src/assets/images/result/card-1.png b/src/assets/images/result/card-1.png
index 5c60f95..133dc6d 100644
Binary files a/src/assets/images/result/card-1.png and b/src/assets/images/result/card-1.png differ
diff --git a/src/assets/images/result/card-2.png b/src/assets/images/result/card-2.png
index 90e8e75..376eed4 100644
Binary files a/src/assets/images/result/card-2.png and b/src/assets/images/result/card-2.png differ
diff --git a/src/assets/images/result/card-3.png b/src/assets/images/result/card-3.png
index 8578f5d..eeae498 100644
Binary files a/src/assets/images/result/card-3.png and b/src/assets/images/result/card-3.png differ
diff --git a/src/assets/images/result/card-4.png b/src/assets/images/result/card-4.png
index 79c80d5..1297112 100644
Binary files a/src/assets/images/result/card-4.png and b/src/assets/images/result/card-4.png differ
diff --git a/src/assets/images/result/card-5.png b/src/assets/images/result/card-5.png
index 3bb09da..ad75bc6 100644
Binary files a/src/assets/images/result/card-5.png and b/src/assets/images/result/card-5.png differ
diff --git a/src/assets/images/result/cls-btn.png b/src/assets/images/result/cls-btn.png
index 51ada70..e5720a3 100644
Binary files a/src/assets/images/result/cls-btn.png and b/src/assets/images/result/cls-btn.png differ
diff --git a/src/assets/images/result/go-draw-btn.png b/src/assets/images/result/go-draw-btn.png
index c03f83b..d7b6f90 100644
Binary files a/src/assets/images/result/go-draw-btn.png and b/src/assets/images/result/go-draw-btn.png differ
diff --git a/src/assets/images/result/go-share-btn.png b/src/assets/images/result/go-share-btn.png
index ee67575..cc47c7e 100644
Binary files a/src/assets/images/result/go-share-btn.png and b/src/assets/images/result/go-share-btn.png differ
diff --git a/src/assets/images/result/poster-1.jpg b/src/assets/images/result/poster-1.jpg
index 96285b2..3a60617 100644
Binary files a/src/assets/images/result/poster-1.jpg and b/src/assets/images/result/poster-1.jpg differ
diff --git a/src/assets/images/result/poster-2.jpg b/src/assets/images/result/poster-2.jpg
index 44911aa..bfa104b 100644
Binary files a/src/assets/images/result/poster-2.jpg and b/src/assets/images/result/poster-2.jpg differ
diff --git a/src/assets/images/result/poster-3.jpg b/src/assets/images/result/poster-3.jpg
index 5531367..249e5f1 100644
Binary files a/src/assets/images/result/poster-3.jpg and b/src/assets/images/result/poster-3.jpg differ
diff --git a/src/assets/images/result/poster-4.jpg b/src/assets/images/result/poster-4.jpg
index ab8b0ff..8b11ee5 100644
Binary files a/src/assets/images/result/poster-4.jpg and b/src/assets/images/result/poster-4.jpg differ
diff --git a/src/assets/images/result/poster-5.jpg b/src/assets/images/result/poster-5.jpg
index 7eb1f8f..ef15326 100644
Binary files a/src/assets/images/result/poster-5.jpg and b/src/assets/images/result/poster-5.jpg differ
diff --git a/src/assets/images/rule/arrow.png b/src/assets/images/rule/arrow.png
index 03869c6..3959543 100644
Binary files a/src/assets/images/rule/arrow.png and b/src/assets/images/rule/arrow.png differ
diff --git a/src/assets/images/rule/cls-btn.png b/src/assets/images/rule/cls-btn.png
index b645a61..384b92e 100644
Binary files a/src/assets/images/rule/cls-btn.png and b/src/assets/images/rule/cls-btn.png differ
diff --git a/src/assets/images/rule/icon.png b/src/assets/images/rule/icon.png
index a0f90c7..8e3c69b 100644
Binary files a/src/assets/images/rule/icon.png and b/src/assets/images/rule/icon.png differ
diff --git a/src/assets/images/rule/rule-box.png b/src/assets/images/rule/rule-box.png
index 15e2b84..4165880 100644
Binary files a/src/assets/images/rule/rule-box.png and b/src/assets/images/rule/rule-box.png differ
diff --git a/src/assets/images/share.jpg b/src/assets/images/share.jpg
index e34beb6..f613cca 100644
Binary files a/src/assets/images/share.jpg and b/src/assets/images/share.jpg differ
diff --git a/src/components/Index.vue b/src/components/Index.vue
index 43c783f..178a756 100644
--- a/src/components/Index.vue
+++ b/src/components/Index.vue
@@ -161,7 +161,7 @@ const showVC = () => {
       }
 
       .index-card-2 {
-        @include pos(227px, 159px, 275px, 260px);
+        @include pos(198px, 188px, 270px, 230px);
         @include bg_pos("index/card-2.png");
       }
 
diff --git a/src/components/Question.vue b/src/components/Question.vue
index 3f05d7e..5581389 100644
--- a/src/components/Question.vue
+++ b/src/components/Question.vue
@@ -193,7 +193,7 @@ const getClass = (item) => {
       @include bg_pos("qa/paper.png");
 
       .qa-question-box {
-        @include pos(563px, 660px, 74px, 126px);
+        @include pos(563px, 660px, 74px, 106px);
         display: flex;
         flex-direction: column;
         justify-content: space-around;
diff --git a/src/components/Result.vue b/src/components/Result.vue
index 14af7b5..7ebe4eb 100644
--- a/src/components/Result.vue
+++ b/src/components/Result.vue
@@ -17,7 +17,7 @@ console.log('海报id', posterId.value);
 // 二维码坐标
 const eqcodePosition = [
     {w:750,h:2107,x: 527, y: 1882},
-    {w:750,h:2183,x: 527, y: 1959},
+    {w:750,h:2111,x: 529, y: 1873},
     {w:750,h:2194,x: 527, y: 1973},
     {w:750,h:2045,x: 527, y: 1824},
     {w:750,h:2194,x: 527, y: 1979},
@@ -350,7 +350,7 @@ const posterCreate = (option, imageArr) => {
             @include box(713px, 995px);
         }
         .poster-box-2{
-            @include box(711px, 1041px);
+            @include box(711px, 1010px);
         }
         .poster-box-3{
             @include box(713px, 995px);
@@ -363,14 +363,14 @@ const posterCreate = (option, imageArr) => {
         }
 
         .btn-box {
-            @include box(550px, 99px);
+            @include box(550px, 104px);
             display: flex;
             justify-content: space-between;
             align-items: center;
             margin-top: 20px;
 
             .go-draw {
-                @include box(264px, 99px);
+                @include box(257px, 104px);
                 @include bg_pos("result/go-draw-btn.png");
             }
 
diff --git a/src/data/index.js b/src/data/index.js
index 70d7d69..584c750 100644
--- a/src/data/index.js
+++ b/src/data/index.js
@@ -1,7 +1,9 @@
 export const data = [
   {
     id: 1,
-    question: ["欢迎你打卡这座8D魔幻山城：轨道交通在楼宇腹中游走，立交桥如基因链螺旋攀升，万家灯火在悬崖上生长出十三层吊脚楼。这座将三维空间玩到极致的城市是？"],
+    question: [
+      "欢迎你打卡这座8D魔幻山城：轨道交通在楼宇腹中游走，立交桥如基因链螺旋攀升，万家灯火在悬崖上生长出十三层吊脚楼。这座将三维空间玩到极致的城市是？",
+    ],
     answer: [
       {
         aid: "A",
@@ -14,32 +16,32 @@ export const data = [
         result: 0,
       },
     ],
-    tips: [
-      `一座被火锅“包围”的城市`,
-    ],
+    tips: [`一座被火锅“包围”的城市`],
   },
   {
     id: 2,
-    question: ["欢迎你来到这处塞上秘境：沙海与翡翠绿洲相拥而眠，千年岩画镌刻着骆驼商队的丝路密码。母亲河在此织就翡翠腰带，烽燧残垣与星空共同丈量着天地琴弦。这处同时拥有流动史诗与永恒星辰的秘境是？"],
+    question: [
+      "千年明珠镶嵌在碧波之中，翠绿的龙井茶园与华美丝绸交织成如诗画卷。湖畔飘荡着茶香，钱塘江潮见证着岁月轮回。古塔倒影中藏着南宋古都的繁华记忆，运河的船桨声与古寺钟声和谐共鸣。这座把诗画意境刻进骨子里的千年古城是？",
+    ],
     answer: [
       {
         aid: "A",
-        text: "宁夏",
+        text: "杭州",
         result: 1,
       },
       {
         aid: "B",
-        text: "新疆",
+        text: "南昌",
         result: 0,
       },
     ],
-    tips: [
-      `有“塞上江南”美称的少数民族自治区`,
-    ],
+    tips: [`有“人间天堂”美称的城市。`],
   },
   {
     id: 3,
-    question: ["欢迎你打卡这座『四季如春』的童话城：鲜花在冬天抢了春天的戏，海鸥与彩云齐飞，石头森林藏着万年奇景，蓝花雨巷把街道染成紫色星河。问：这座被春天永久收藏的城市是？"],
+    question: [
+      "欢迎你打卡这座『四季如春』的童话城：鲜花在冬天抢了春天的戏，海鸥与彩云齐飞，石头森林藏着万年奇景，蓝花雨巷把街道染成紫色星河。问：这座被春天永久收藏的城市是？",
+    ],
     answer: [
       {
         aid: "A",
@@ -52,13 +54,13 @@ export const data = [
         result: 1,
       },
     ],
-    tips: [
-      `“彩云之南”的首府`,
-    ],
+    tips: [`“彩云之南”的首府`],
   },
   {
     id: 4,
-    question: ["欢迎你闯入这座通宵狂欢的『古今混搭城』：唐代楼阁挂满灯笼，网红不倒翁小姐姐在人群中飘摇。猜猜这是哪座古都的网红步行街，能把长安城的盛世繁华变成24小时不打烊的嘉年华？"],
+    question: [
+      "欢迎你闯入这座通宵狂欢的『古今混搭城』：唐代楼阁挂满灯笼，网红不倒翁小姐姐在人群中飘摇。猜猜这是哪座古都的网红步行街，能把长安城的盛世繁华变成24小时不打烊的嘉年华？",
+    ],
     answer: [
       {
         aid: "A",
@@ -71,13 +73,13 @@ export const data = [
         result: 1,
       },
     ],
-    tips: [
-      `拥有被成为“世界第八大奇迹”的秦始皇陵兵马俑`,
-    ],
+    tips: [`拥有被成为“世界第八大奇迹”的秦始皇陵兵马俑`],
   },
   {
     id: 5,
-    question: ["欢迎你来到这座『科技主题乐园』——摩天大楼间闪着AI电子屏瀑布，无人机表演在夜空中拼出会动的二维码，华强北的电子零件能拼出太空卫星，问：哪座城市用代码写诗，让城市灯光秀变成通往未来的动画片？"],
+    question: [
+      "欢迎你来到这座『科技主题乐园』——摩天大楼间闪着AI电子屏瀑布，无人机表演在夜空中拼出会动的二维码，华强北的电子零件能拼出太空卫星，问：哪座城市用代码写诗，让城市灯光秀变成通往未来的动画片？",
+    ],
     answer: [
       {
         aid: "A",
@@ -90,9 +92,13 @@ export const data = [
         result: 0,
       },
     ],
+<<<<<<< HEAD
     tips: [
       `全国最早实行对外开放的`,
       `四个经济特区之一`
     ],
+=======
+    tips: [`全国最早实行对外开放的四个经济特区之一`],
+>>>>>>> 5d8a8f95c11f0c188f14ac80980c820e348aa1c2
   },
 ];