Merge branch 'yangqingjie' into '1a86cad6'

update

See merge request !7

runner @ 88c88180

-Subproject commit 3e4439c28ae19ff665cfef1192ba73ee32590e66
+Subproject commit 88c881800bc3ed5c011c05dc0d3668296c9bde95

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