src/components/Question.vue

@@ -154,12 +154,7 @@ const getClass = (item) => {
             </div>
           </div>
           <div class="question-tips" v-for="(t, i) in questionList[currentId].tips" :key="i">
-            <div v-if='questionList[currentId].tips.length == 1'>
             {{ isChecked ? `${['回答错误！', '回答正确！'][checkedOption.result]}` : `提示：${t}` }}
-            </div>
-            <div v-else>
-            {{ isChecked ? `${i==0?['回答错误！', '回答正确！'][checkedOption.result]:''}` : `${i==0?'提示：':''}${t}` }}
-            </div>
           </div>
         </div>
         <div class="return-btn" @click="nextQuestion($event)"></div>
@@ -280,7 +275,7 @@ const getClass = (item) => {
           font-family: 'HarmonyOS_Sans_SC_Regular';
           color: #ab7133;
           text-align: center;
-          padding: 5px;
+          padding: 10px;
         }
 
 

src/data/index.js

@@ -92,13 +92,6 @@ export const data = [
         result: 0,
       },
     ],
-<<<<<<< HEAD
-    tips: [
-      `全国最早实行对外开放的`,
-      `四个经济特区之一`
-    ],
-=======
     tips: [`全国最早实行对外开放的四个经济特区之一`],
->>>>>>> 5d8a8f95c11f0c188f14ac80980c820e348aa1c2
   },
 ];