From 10cd9e216f787d999b278a36072f61a3affaab03 Mon Sep 17 00:00:00 2001
From: songwc <songwc@dongwu-inc.com>
Date: Mon, 19 Sep 2022 17:31:31 +0800
Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9A=E5=A2=9E=E5=8A=A0ballot=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E6=8C=89=E9=92=AE=E9=BC=A0=E6=A0=87=E7=A7=BB=E5=85=A5?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/ballot/ballot.vue        |  1 +
 src/views/debate/debate.vue        |  5 -----
 src/views/examination/ExamPage.vue | 26 ++++++++++++++++++++++++--
 3 files changed, 25 insertions(+), 7 deletions(-)

diff --git a/src/views/ballot/ballot.vue b/src/views/ballot/ballot.vue
index 09101d6..592e9be 100644
--- a/src/views/ballot/ballot.vue
+++ b/src/views/ballot/ballot.vue
@@ -155,6 +155,7 @@ export default {
       height: 23px;
       border-radius: 50%;
       border: 0;
+      cursor: pointer;
     }
     .btn01 {
       background-image: url("../../assets/image/prev.png");
diff --git a/src/views/debate/debate.vue b/src/views/debate/debate.vue
index f964a8a..b79b77d 100644
--- a/src/views/debate/debate.vue
+++ b/src/views/debate/debate.vue
@@ -385,12 +385,7 @@ export default {
   }
 
   .detailinfo {
-<<<<<<< HEAD
-    // width: calc(100% + 20px);
-    // width: calc(100%);
-=======
     width: 100%;
->>>>>>> 52b6d3fe7525cbcd7226c2cdfd69cbd044a1670b
     margin-top: 20px;
     // height: 10px;
     background: #ffffff;
diff --git a/src/views/examination/ExamPage.vue b/src/views/examination/ExamPage.vue
index d358a07..862790b 100644
--- a/src/views/examination/ExamPage.vue
+++ b/src/views/examination/ExamPage.vue
@@ -59,11 +59,11 @@
         <!-- 开始考试按钮 -->
         <button class="starttest">开始考试</button>
         <!-- 开始考试按钮 -->
-        <div class="righttitle" style="padding-top: 80px">
+        <div class="righttitleE">
           <img width="20px" height="20px" src="../../assets/image/yuan.png" />
 
           <div class="text">历史纪录</div>
-          <div class="box" style="top: 94px"></div>
+          <div class="box"></div>
         </div>
 
         <div class="history">
@@ -219,6 +219,27 @@ export default {
         font-weight: 800;
         color: #ffffff;
         left: calc(50% - 73px);
+        cursor: pointer;
+      }
+      .righttitleE {
+        display: flex;
+        margin-top: 110px;
+        // padding-top: 30px;
+        position: relative;
+        .text {
+          margin-left: 8px;
+          font-size: 16px;
+          color: rgba(51, 51, 51, 1);
+          font-weight: 800;
+        }
+        .box {
+          width: 75px;
+          height: 10px;
+          background-color: rgba(36, 120, 255, 0.15);
+          position: absolute;
+          left: 23px;
+          top: 14px;
+        }
       }
       .history {
         position: relative;
@@ -270,6 +291,7 @@ export default {
           color: #2478ff;
           background-color: #fff;
           border: 0;
+          cursor: pointer;
         }
         .historycontent {
           width: 59px;