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/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
     }
 ]