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

src/pages/growth.vue

@@ -25,6 +25,7 @@ export default {
     width: 1920px;
     height: 1080px;
     background: url('../../static/images/sixthForm/grow.png') no-repeat center;
+    position: relative;
     margin: 0 auto;
     overflow: hidden;
     .edit{

src/pages/sixthFormStudent.vue

@@ -195,7 +195,7 @@ export default {
         * @method edit 返回
         */
         edit () {
-            this.$router.back(-1)
+            this.$router.push({path: '/growth'})
         },
         /**
         * @method Search  搜索
@@ -249,6 +249,7 @@ export default {
     width: 1920px;
     height: 1080px;
     background: url('@{imagePath}bg.png') no-repeat left top;
+    position: relative;
     margin: 0 auto;
     overflow: hidden;
     .left-top{