'修改第五题提示换行问题'

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");
       }
 

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;

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");
             }
 

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
   },
 ];