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

src/pages/class3.vue

@@ -71,7 +71,7 @@ export default {
             pics: [
                 require('../../static/images/class3/health.png'),
                 require('../../static/images/class3/ronghe.png'),
-                require('../../static/images/class3/ronghe.png')
+                require('../../static/images/class3/shuiping.png')
             ],
             // 选择年级
             gradeRes: {
@@ -150,8 +150,9 @@ export default {
         Search () {
             if (this.studentName === '顾雨辰' && this.gradeRes.name === '三年级' && this.classRes.name === '四班' && this.sexRes.name === '女') {
                 this.$router.push({path: '/student'})
+            } else {
+                this.$message('暂无数据')
             }
-            this.$message('暂无数据')
         }
     }
 
@@ -187,8 +188,8 @@ export default {
     }
     .img3{
         position: absolute;
-        top:860px;
-        right:25px;
+        top:790px;
+       left:410px;
         width: 96px;
         height: 22px;
         cursor: pointer;

src/pages/growthRecord.vue

@@ -59,7 +59,7 @@ export default {
                     delay: 5000,
                     disableOnInteraction: false
                 },
-                spaceBetween: 10,
+                spaceBetween: 2,
                 loop: true,
                 speed: 500
             }
@@ -155,7 +155,8 @@ export default {
                 display: flex;
                 .gradethree{
                     width: 120px;
-                    height: 100%;
+                    height: 144px;
+                    margin-top: 243px;
                     margin-left: 457px;
                     cursor: pointer;
                 }

src/pages/junior.vue

@@ -11,7 +11,7 @@
 export default {
     methods: {
         back () {
-            this.$router.push('/growth')
+            this.$router.push('/growthRecord')
         }
     }
 }

src/pages/primary.vue

@@ -11,7 +11,7 @@
 export default {
     methods: {
         back () {
-            this.$router.push('/growth')
+            this.$router.push('/growthRecord')
         }
     }
 }

src/router/routes.js

@@ -32,7 +32,7 @@ export default [
         component: Index
     },
     {
-        path: '/growth',
+        path: '/growthRecord',
         component: growthRecord
     },
     {