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

src/components/BulletFrame/index.vue

@@ -51,7 +51,7 @@ export default {
         top: 0px;
         right: 0px;
         bottom: 0px;
-        background-color: rgba(0, 0, 0, 0.3);
+        background-color: rgba(0, 0, 0, 0.6);
         display: flex;
         justify-content: center;
         align-items: center;
@@ -61,16 +61,16 @@ export default {
             // padding: 90px 30px 30px 30px;
             position: relative;
             background: radial-gradient(circle, #0D375F, #091F33);
-            border: 3px solid;
-            border-image: linear-gradient(0deg, #71BEF9, #1E5D92, #002D52, #1F5E93, #71BEF8) 3 3;
+            // border: 3px solid;
+            // border-image: linear-gradient(0deg, #71BEF9, #1E5D92, #002D52, #1F5E93, #71BEF8) 3 3;
 
             .close {
                 cursor: pointer;
                 position: fixed;
-                top: 155px;
-                right: 315px;
-                width: 40px;
-                height: 40px;
+                top: 145px;
+                right: 395px;
+                width: 80px;
+                height: 80px;
                 z-index: 1;
                 // background: url('../../../static/images/close.png') no-repeat left top;
             }
@@ -81,7 +81,7 @@ export default {
                 width: 1352px;
                 height: 792px;
                 z-index: 0;
-                overflow: hidden;
+                // overflow: hidden;
             }
         }
     }

src/pages/class3.vue

@@ -146,10 +146,10 @@ export default {
         * @method Search  查询更多
         */
         Search () {
-            // if (this.studentName === '小王') {
-            //     this.$router.push({path: '/student'})
-            // }
-            this.$router.push({path: '/student'})
+            if (this.studentName === '顾雨辰' && this.gradeRes.name === '三年级' && this.classRes.name === '四班' && this.sexRes.name === '女') {
+                this.$router.push({path: '/student'})
+            }
+            this.$message('暂无数据')
         }
     }
 

src/pages/junior.vue

@@ -39,7 +39,7 @@ export default {
             height: 35px;
             width: 83px;
             margin: 15px;
-            margin-top: 63px;
+            margin-top: 45px;
             background: url('../../static/images/back.png') no-repeat left top;
         }
     }

src/pages/primary.vue

@@ -39,7 +39,7 @@ export default {
             height: 35px;
             width: 83px;
             margin: 15px;
-            margin-top: 63px;
+            margin-top: 45px;
             background: url('../../static/images/back.png') no-repeat left top;
         }
     }