Merge branch 'yuwen' into '1a86cad6'

update

See merge request !16

src/pages/sixthFormStudent.vue

 <template>
     <div class="sixth-page">
-        <div class="left">
         <!-- 身心健康 -->
-            <div class="left-top" @click="healthy"></div>
+        <img class="left-top" @click="healthy" src="../../static/images/sixthForm/btn.png" alt="">
         <!-- 学业分析 -->
-            <div class="left-bottom" @click="study"></div>
-        </div>
-        <div class="center">
+        <img class="left-bottom" @click="study" src="../../static/images/sixthForm/btn.png" alt="">
         <!-- 搜索 -->
         <div class="research">
             <div class="select-item">
@@ -44,8 +41,6 @@
                 搜索
             </div>
         </div>
-        </div>
-        <div class="right">
         <div class="right-top" @click="integration"></div>
         <div class="right-bottom">
             <div class="title"></div>
@@ -59,7 +54,6 @@
             </div>
         </div>
         <div class="edit" @click="edit"></div>
-        </div>
         <bullet-frame
             :visible="visible"
             @beforeClose="closePopup"
@@ -251,14 +245,12 @@ export default {
 .sixth-page{
     width: 1920px;
     height: 1080px;
-    background: url('@{imagePath}bg.png') no-repeat center;
+    background: url('@{imagePath}bg.png') no-repeat left top;
     margin: 0 auto;
     overflow: hidden;
-    .left{
     .left-top{
         width: 96px;
         height: 22px;
-            background: url('@{imagePath}btn.png') no-repeat;
         position: absolute;
         top: 111px;
         left: 408px;
@@ -271,8 +263,6 @@ export default {
         bottom: 271px;
         left: 408px;
     }
-    }
-    .center{
     .research{
         width: 828px;
         height: 70px;
@@ -323,8 +313,6 @@ export default {
             margin-top: 20px;
         }
     }
-    }
-    .right{
     .right-top{
         width: 96px;
         height: 22px;
@@ -351,7 +339,6 @@ export default {
         top: 39px;
         left: 1822px;
     }
-    }
 }
 .bulletImg{
     width: 1428px;