Merge branch 'yuwen' into '1a86cad6'

Yuwen

See merge request !8

src/pages/sixthFormStudent.vue

@@ -60,6 +60,15 @@
             </div>
             <div class="edit" @click="edit"></div>
         </div>
+        <bullet-frame  
+            :visible="visible"
+            @beforeClose="closePopup"
+            :layout="{width: '1102px', height: '792px'}"
+            >
+            <div>
+                <img :src="pics[currIndex]" />
+            </div>
+        </bullet-frame>
     </div>
 </template>
 <script>
@@ -111,6 +120,13 @@ export default {
             ],
             // 老师姓名
             studentName: '',
+            visible: false,
+            currIndex: 999,
+            pics: [
+                require('../../static/images/sixthForm/healthy.png'),
+                require('../../static/images/sixthForm/study.png'),
+                require('../../static/images/sixthForm/integration.png')
+            ],
             activeImgs: [active1, active2, active3],
             swiperOption: {
                 watchSlidesProgress: true,
@@ -232,6 +248,7 @@ export default {
     height: 1080px;
     background: url('@{imagePath}bg.png') no-repeat center;
     margin: 0 auto;
+    verflow: hidden;
     .left{
         .left-top{
             width: 96px;
@@ -239,7 +256,7 @@ export default {
             background: url('@{imagePath}btn.png') no-repeat;
             position: absolute;
             top: 111px;
-            left: 548px;
+            left: 408px;
         }
         .left-bottom{
             width: 96px;
@@ -247,7 +264,7 @@ export default {
             background: url('@{imagePath}btn.png') no-repeat;
             position: absolute;
             bottom: 271px;
-            left: 548px;
+            left: 408px;
         }
     }
     .center{
@@ -257,7 +274,7 @@ export default {
             background: url('@{imagePath}research.png') no-repeat;
             position: absolute;
             top: 736px;
-            left: 696px;
+            left: 546px;
             display: flex;
             .select-item {
                 position: relative;
@@ -309,12 +326,12 @@ export default {
             background: url('@{imagePath}btn.png') no-repeat;
             position: absolute;
             top: 110px;
-            left: 1938px;
+            left: 1798px;
         }
         .right-bottom{
             position: absolute;
             top: 821px;
-            left: 1556px;
+            left: 1406px;
             .title{
                 width: 152px;
                 height: 18px;
@@ -327,7 +344,7 @@ export default {
             background: url('@{imagePath}return.png');
             position: absolute;
             top: 39px;
-            left: 1962px;
+            left: 1822px;
         }
     }
 }