Merge remote-tracking branch 'origin/1a86cad6' into xiaxs

src/components/BulletFrame/index.vue

@@ -67,10 +67,10 @@ export default {
             .close {
                 cursor: pointer;
                 position: fixed;
-                top: 180px;
-                right: 330px;
-                width: 35px;
-                height: 33px;
+                top: 155px;
+                right: 315px;
+                width: 40px;
+                height: 40px;
                 z-index: 1;
                 // background: url('../../../static/images/close.png') no-repeat left top;
             }
@@ -78,9 +78,10 @@ export default {
 
             .content {
                 position: relative;
-                width: 100%;
-                height: 100%;
+                width: 1352px;
+                height: 792px;
                 z-index: 0;
+                overflow: hidden;
             }
         }
     }

src/pages/class3-student.vue

@@ -20,6 +20,7 @@ export default {
 .student{
     width: 1920px;
     height: 1080px;
+    margin:0 auto;
     position: relative;
 
     .img1{

src/pages/class3.vue

@@ -48,10 +48,9 @@
     <bullet-frame  
     :visible="visible"
     @beforeClose="closePopup"
-    :layout="{width: '1102px', height: '792px'}"
     >
     <div>
-         <img :src="pics[currIndex]" />
+         <img class='bulletImg' :src="pics[currIndex]" />
     </div>
     </bullet-frame>
   </div>
@@ -147,10 +146,10 @@ export default {
         * @method Search  查询更多
         */
         Search () {
-            if (this.studentName === '小王') {
-                this.$router.push({path: '/student'})
-            }
-            console.log(123)
+            // if (this.studentName === '小王') {
+            //     this.$router.push({path: '/student'})
+            // }
+            this.$router.push({path: '/student'})
         }
     }
 
@@ -211,7 +210,6 @@ export default {
         padding:16px 0px 0px 19px;
         background: url('@{imagePath}kuang.png') no-repeat center;
         background-size: 100% 100%;
-        border: springgreen 1px solid;
 
         .select-item {
             position: relative;
@@ -256,5 +254,10 @@ export default {
         }
     }
 }
+.bulletImg{
+    width: 1428px;
+    height: 870px;
+    margin:-27px 0px 0px -40px;
+}
  
 </style>
\ No newline at end of file

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 class="bulletImg" :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,
@@ -233,6 +249,7 @@ export default {
     overflow: hidden;
     background: url('@{imagePath}bg.png') no-repeat center;
     margin: 0 auto;
+    verflow: hidden;
     .left{
         .left-top{
             width: 96px;
@@ -240,7 +257,7 @@ export default {
             background: url('@{imagePath}btn.png') no-repeat;
             position: absolute;
             top: 111px;
-            left: 548px;
+            left: 408px;
         }
         .left-bottom{
             width: 96px;
@@ -248,7 +265,7 @@ export default {
             background: url('@{imagePath}btn.png') no-repeat;
             position: absolute;
             bottom: 271px;
-            left: 548px;
+            left: 408px;
         }
     }
     .center{
@@ -258,7 +275,7 @@ export default {
             background: url('@{imagePath}research.png') no-repeat;
             position: absolute;
             top: 736px;
-            left: 696px;
+            left: 546px;
             display: flex;
             .select-item {
                 position: relative;
@@ -310,12 +327,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;
@@ -328,8 +345,13 @@ export default {
             background: url('@{imagePath}return.png');
             position: absolute;
             top: 39px;
-            left: 1962px;
+            left: 1822px;
         }
     }
 }
+.bulletImg{
+    width: 1428px;
+    height: 870px;
+    margin:-27px 0px 0px -40px;
+}
 </style>