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

src/pages/growth.vue

 <template>
-    <div class="grow"></div>
+    <div class="grow">
+        <div class="edit" @click="edit1"></div>
+    </div>
 </template>
 <script>
 export default {
+    data () {
+        return {
 
+        }
+    },
+    methods: {
+        /**
+        * @method edit1 返回
+        */
+        edit1 () {
+            this.$router.back('/sixthForm')
+        }
+    }
 }
 </script>
 <style lang="less" scoped>
@@ -12,5 +26,14 @@ export default {
     height: 1080px;
     background: url('../../static/images/sixthForm/grow.png') no-repeat center;
     margin: 0 auto;
+    overflow: hidden;
+    .edit{
+        width: 83px;
+        height: 35px;
+        background: url('../../static/images/sixthForm/return.png') no-repeat;
+        position: absolute;
+        top: 39px;
+        left: 1822px;
+    }
 }
 </style>

src/pages/sixthFormStudent.vue

 <template>
     <div class="sixth-page">
-        <div class="left">
         <!-- 身心健康 -->
-            <div class="left-top" @click="healthy"></div>
+        <img class="left-top" @click="healthy" src="../../static/images/sixthForm/btn.png" alt="">
         <!-- 学业分析 -->
-            <div class="left-bottom" @click="study"></div>
-        </div>
-        <div class="center">
+        <img class="left-bottom" @click="study" src="../../static/images/sixthForm/btn.png" alt="">
         <!-- 搜索 -->
         <div class="research">
             <div class="select-item">
@@ -44,8 +41,6 @@
                 搜索
             </div>
         </div>
-        </div>
-        <div class="right">
         <div class="right-top" @click="integration"></div>
         <div class="right-bottom">
             <div class="title"></div>
@@ -59,7 +54,6 @@
             </div>
         </div>
         <div class="edit" @click="edit"></div>
-        </div>
         <bullet-frame
             :visible="visible"
             @beforeClose="closePopup"
@@ -107,7 +101,10 @@ export default {
             classList: [
                 {name: '一班'},
                 {name: '二班'},
-                {name: '三班'}
+                {name: '三班'},
+                {name: '四班'},
+                {name: '五班'},
+                {name: '六班'}
             ],
             // 选择性别
             sexRes: {
@@ -204,21 +201,23 @@ export default {
         * @method Search  搜索
         */
         Search () {
-            this.$router.push({path: '/growth'})
+            if (this.gradeRes.name === '六年级' && this.classRes.name === '六班' && this.sexRes.name === '女' && this.studentName === '沈凡婷') {
+                this.$router.push({path: '/growthPer'})
+            } else {
+                this.$message('暂无数据')
+            }
         }
     }
 }
 </script>
 <style lang="less">
 #swiper1 {
-    widows: 500px;
-    height: 208px;
-
+    widows: 450px;
+    height: 258px;
     .swiper-container {
         padding-top: 20px;
         width: 100%;
         height: 100%;
-
         .swiper-slide {
             width: 393px !important;
             height: 208px;
@@ -246,14 +245,12 @@ export default {
 .sixth-page{
     width: 1920px;
     height: 1080px;
-    background: url('@{imagePath}bg.png') no-repeat center;
+    background: url('@{imagePath}bg.png') no-repeat left top;
     margin: 0 auto;
-    verflow: hidden;
-    .left{
+    overflow: hidden;
     .left-top{
         width: 96px;
         height: 22px;
-            background: url('@{imagePath}btn.png') no-repeat;
         position: absolute;
         top: 111px;
         left: 408px;
@@ -266,8 +263,6 @@ export default {
         bottom: 271px;
         left: 408px;
     }
-    }
-    .center{
     .research{
         width: 828px;
         height: 70px;
@@ -318,8 +313,6 @@ export default {
             margin-top: 20px;
         }
     }
-    }
-    .right{
     .right-top{
         width: 96px;
         height: 22px;
@@ -346,7 +339,6 @@ export default {
         top: 39px;
         left: 1822px;
     }
-    }
 }
 .bulletImg{
     width: 1428px;

src/router/routes.js

@@ -15,7 +15,7 @@ import student from '@/pages/class3-student.vue'
 // 六年级菊园学子
 import sixthForm from '@/pages/sixthFormStudent.vue'
 // 六年级菊园个人
-import growth from '@/pages/growth.vue'
+import growthPer from '@/pages/growth.vue'
 export default [
     {
         path: '/',
@@ -54,7 +54,7 @@ export default [
         component: sixthForm
     },
     {
-        path: '/growth',
-        component: growth
+        path: '/growthPer',
+        component: growthPer
     }
 ]