feat:合并

src/App.vue

@@ -1,6 +1,6 @@
 <template>
   <div id="container">
-    <!-- <div id="nav">
+    <div id="nav">
       <router-link
         v-for="item in routes"
         :key="item.path"
@@ -12,7 +12,7 @@
       >
         {{ item.name }}
       </router-link>
-    </div> -->
+    </div>
     <main>
       <router-view />
     </main>

src/views/ballot/ballot.vue

@@ -10,9 +10,9 @@
 
       <div class="preNext">
         <button class="btn btn01"></button>
-        <span class="content">上一个</span>
+        <span class="content" style="margin-left: 6px">上一个</span>
         <span class="content" style="margin-left: 31px">下一个</span>
-        <button class="btn btn02"></button>
+        <button class="btn btn02" style="margin-left: 6px"></button>
       </div>
     </div>
     <!-- 面包屑导航 -->
@@ -149,12 +149,14 @@ export default {
       display: inline-block;
       position: relative;
       top: -6px;
+      cursor: pointer;
     }
     .btn {
       width: 23px;
       height: 23px;
       border-radius: 50%;
       border: 0;
+      cursor: pointer;
     }
     .btn01 {
       background-image: url("../../assets/image/prev.png");

src/views/debate/debate.vue

@@ -9,9 +9,9 @@
       <div style="font-weight: 700; font-size: 16px">辩论详情</div>
       <div class="preNext">
         <button class="btn btn01"></button>
-        <span class="content">上一个</span>
+        <span class="content" style="margin-left: 6px">上一个</span>
         <span class="content" style="margin-left: 31px">下一个</span>
-        <button class="btn btn02"></button>
+        <button class="btn btn02" style="margin-left: 6px"></button>
       </div>
     </div>
     <!-- 面包屑导航 -->
@@ -361,12 +361,14 @@ export default {
       display: inline-block;
       position: relative;
       top: -6px;
+      cursor: pointer;
     }
     .btn {
       width: 23px;
       height: 23px;
       border-radius: 50%;
       border: 0;
+      cursor: pointer;
     }
     .btn01 {
       background-image: url("../../assets/image/prev.png");
@@ -382,6 +384,7 @@ export default {
     line-height: 24px;
     height: 24px;
     font-weight: 600;
+    color: #ffffff;
   }
 
   .detailinfo {

src/views/examination/ExamPage.vue

@@ -59,11 +59,11 @@
         <!-- 开始考试按钮 -->
         <button class="starttest" style="cursor: pointer">开始考试</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;

src/views/homework/homework.vue

@@ -10,9 +10,9 @@
 
       <div class="preNext">
         <button class="btn btn01"></button>
-        <span class="content">上一个</span>
+        <span class="content" style="margin-left: 6px">上一个</span>
         <span class="content" style="margin-left: 31px">下一个</span>
-        <button class="btn btn02"></button>
+        <button class="btn btn02" style="margin-left: 6px"></button>
       </div>
     </div>
     <!-- 面包屑导航 -->
@@ -39,7 +39,7 @@
               </div>
             </div>
 
-            <button class="shangchuan">上传</button>
+            <button class="shangchuan" style="cursor: pointer">上传</button>
 
             <div class="uploadDetail">
               <div class="triangle"></div>
@@ -238,12 +238,14 @@ export default {
       display: inline-block;
       position: relative;
       top: -6px;
+      cursor: pointer;
     }
     .btn {
       width: 23px;
       height: 23px;
       border-radius: 50%;
       border: 0;
+      cursor: pointer;
     }
     .btn01 {
       background-image: url("../../assets/image/prev.png");
@@ -380,6 +382,7 @@ export default {
           }
         }
         .shangchuan {
+          z-index: 999;
           font-size: 16px;
           font-family: PingFang SC;
           font-weight: 800;
@@ -461,6 +464,7 @@ export default {
                 background-color: #fff;
                 color: #277aff;
                 margin-top: 20px;
+                cursor: pointer;
               }
               .btndetail {
                 margin-left: 25px;
@@ -510,6 +514,7 @@ export default {
                 background-color: #fff;
                 color: #277aff;
                 margin-top: 20px;
+                cursor: pointer;
               }
               .btndetail {
                 margin-left: 25px;
@@ -559,6 +564,7 @@ export default {
                 background-color: #fff;
                 color: #277aff;
                 margin-top: 20px;
+                cursor: pointer;
               }
               .btndetail {
                 margin-left: 25px;
@@ -568,6 +574,8 @@ export default {
         }
 
         .tijiao {
+          z-index: 999;
+          cursor: pointer;
           margin-top: 22px;
           margin-left: 480px;
           width: 33px;

src/views/liveBroadcast/LiveBroadcast.vue

@@ -10,9 +10,9 @@
 
       <div class="preNext">
         <button class="btn btn01"></button>
-        <span class="content">上一个</span>
+        <span class="content" style="margin-left: 6px">上一个</span>
         <span class="content" style="margin-left: 31px">下一个</span>
-        <button class="btn btn02"></button>
+        <button class="btn btn02" style="margin-left: 6px"></button>
       </div>
     </div>
     <!-- 面包屑导航 -->
@@ -206,12 +206,14 @@ export default {
       display: inline-block;
       position: relative;
       top: -6px;
+      cursor: pointer;
     }
     .btn {
       width: 23px;
       height: 23px;
       border-radius: 50%;
       border: 0;
+      cursor: pointer;
     }
     .btn01 {
       background-image: url("../../assets/image/prev.png");

src/views/moreActive/MoreActive.vue

@@ -10,9 +10,9 @@
 
       <div class="preNext">
         <button class="btn btn01"></button>
-        <span class="content">上一个</span>
+        <span class="content" style="margin-left: 6px">上一个</span>
         <span class="content" style="margin-left: 31px">下一个</span>
-        <button class="btn btn02"></button>
+        <button class="btn btn02" style="margin-left: 6px"></button>
       </div>
     </div>
     <!-- 面包屑导航 -->
@@ -141,12 +141,14 @@ export default {
       display: inline-block;
       position: relative;
       top: -6px;
+      cursor: pointer;
     }
     .btn {
       width: 23px;
       height: 23px;
       border-radius: 50%;
       border: 0;
+      cursor: pointer;
     }
     .btn01 {
       background-image: url("../../assets/image/prev.png");

src/views/starttest/StartTest.vue

@@ -0,0 +1,93 @@
+<template>
+  <div class="surveydetail">
+    <!-- 标题 -->
+    <div class="title">考试模式</div>
+    <!-- 标题 -->
+    <!-- 详细内容 -->
+    <div class="bascinfo">
+      <!-- 中间盒子 -->
+      <div class="middle clearfix">
+        <div class="righttitle">
+          <img width="20px" height="20px" src="../../assets/image/yuan.png" />
+
+          <div class="text">阶段性考试</div>
+          <div class="box"></div>
+        </div>
+        <div class="line clearfix">
+          <div class="wrong">判断题</div>
+        </div>
+      </div>
+    </div>
+    <!-- 详细内容 -->
+  </div>
+</template>
+
+<script>
+export default {
+  name: "StartTest",
+};
+</script>
+
+<style scoped lang="scss">
+.surveydetail {
+  .title {
+    font-size: 20px;
+    font-weight: 800;
+    color: #ffffff;
+    line-height: 24px;
+    margin-top: 17px;
+    margin-left: 0px;
+  }
+  .clearfix:before,
+  .clearfix:after {
+    content: "";
+    display: table;
+    clear: both;
+  }
+  .bascinfo {
+    min-height: 800px;
+    width: 100%;
+    background: #ffffff;
+    border-radius: 8px;
+    margin-top: 24px;
+    display: flex;
+    // flex-direction: column;
+    // justify-content: center;
+    .middle {
+      margin-left: 510px;
+      .righttitle {
+        display: flex;
+        padding-top: 30px;
+        position: relative;
+        .text {
+          margin-left: 8px;
+          font-size: 16px;
+          color: rgba(51, 51, 51, 1);
+          font-weight: 800;
+        }
+        .box {
+          width: 90px;
+          height: 10px;
+          background-color: rgba(36, 120, 255, 0.15);
+          position: absolute;
+          left: 23px;
+          top: 44px;
+        }
+      }
+      .line {
+        margin-top: 20px;
+        width: 841px;
+        height: 50px;
+        background: #f2f5f7;
+        .wrong {
+          font-size: 16px;
+          font-weight: 800;
+          color: #333333;
+          margin-top: 14px;
+          margin-left: 28px;
+        }
+      }
+    }
+  }
+}
+</style>