Merge branch 'master' of http://121.4.203.192:9000/mingxue/front

src/router/index.js

@@ -823,12 +823,17 @@ export const constantRoutes = [{
         children: [{
           path: '/zhiyuan/score',
           name:'输入高考成绩',
-          component: (resolve) => require(['@/views/career/zhiyuan/score'], resolve)
+          component: (resolve) => require(['@/views/career/zhiyuan/components/score'], resolve)
         },{
           path: '/zhiyuan/phase',
           name:'选择填报批次',
-          component: (resolve) => require(['@/views/career/zhiyuan/phase'], resolve)
-        },]
+          component: (resolve) => require(['@/views/career/zhiyuan/components/phase'], resolve)
+        },
+          {
+            path: '/zhiyuan/recommend',
+            name:'选择院校专业',
+            component: (resolve) => require(['@/views/career/zhiyuan/components/recommend'], resolve)
+          },]
       },
     ]
   }

src/views/career/zhiyuan/NewSimulatedVolunteer.vue

@@ -26,7 +26,7 @@ export default {
     }
   },
   created() {
-    // console.log(this.$route)
+    console.log(this.$route)
   }
 }
 </script>

src/views/career/zhiyuan/components/phase.vue

@@ -0,0 +1,59 @@
+<template>
+  <div class="phase">
+    <div class="pt40 pb40 fx-row jc-between">
+      <div class="left f14">
+        <span class="mr20">您的预估高考成绩</span>
+        <span class="mr20">选科科目：<em  class="f-primary">{{form.firstSubject }}<em v-for="item in form.lastSubject">,{{item}}</em> </em></span>
+        <span class="mr20">总分：<em  class="f-primary">{{ form.score }}</em></span>
+        <a href="/zhiyuan/score" class="f-red">
+          <i class="el-icon-edit-outline"></i>
+          修改成绩
+        </a>
+      </div>
+    </div>
+    <div class="recommend-wrap" style="width: 80%">
+      <div class="fx-row jc-between recommend ai-center">
+        <div class="left">
+          <p class="mb15 f20 bold f-666">普通类院校本科批</p>
+          <p class="f12 ">2021年本科批控制线： <span class="f-primary">历史 466， 物理 434</span></p>
+        </div>
+        <el-button type="primary">开始</el-button>
+      </div>
+      <div class="fx-row jc-between recommend ai-center">
+        <div class="left">
+          <p class="mb15 f20 bold f-666">普通类院校高职专科批</p>
+          <p class="f12 ">2021年高职专科批控制线：<span class="f-primary">历史 200， 物理 200</span></p>
+        </div>
+        <el-button type="primary" @click="$router.push('/zhiyuan/recommend')">开始</el-button>
+      </div>
+    </div>
+  </div>
+</template>
+<script>
+export default {
+  created() {
+    this.form = this.$route.query
+    console.log(this.$route.query)
+  },
+  data() {
+    return {
+      form:{}
+    }
+  }
+}
+</script>
+
+<style scoped>
+ .phase {
+  padding: 0 40px 0 100px;}
+ em{
+   font-weight: 400;
+   font-style: normal;
+ }
+ .recommend{
+   padding: 16px ;
+   margin-bottom: 15px;
+   background: #f1f1f1;
+
+ }
+</style>

src/views/career/zhiyuan/components/recommend.vue

@@ -0,0 +1,36 @@
+<template>
+  <div class="recommend">
+    <h3 class="text-center f-666 mt30">湖南2022年普通类本科批学校志愿智能模拟</h3>
+    <p class="mt10 f14">
+      <span class="mr20">您的高考成绩 (预估)</span>
+      <span class="mr20 f-primary">选科科目： <em class="f-primary">历史,生物,政治</em></span>
+      <span class="mr20">总分：<em class="f-primary">750</em> </span>
+      </p>
+    <div class="text-center mt20 mb20"><el-button type="primary">开始志愿选择</el-button></div>
+  </div>
+</template>
+<script>
+export default {
+  created() {
+    this.form = this.$route.query
+  },
+  data() {
+    return {
+      form:{}
+    }
+  }
+}
+</script>
+
+<style scoped>
+p{
+  background: #f3f3f3;
+  padding-left: 20px;
+  height: 36px;
+  line-height: 36px;
+}
+em{
+  font-weight: 400;
+  font-style: normal;
+}
+</style>

src/views/career/zhiyuan/phase.vue

@@ -1,38 +0,0 @@
-<template>
-  <div class="phase">
-    <div class="pt40 pb40 fx-row jc-between">
-      <div class="left f14">
-        <span class="mr20">您的预估高考成绩</span>
-        <span class="mr20">选科科目：<em  class="f-primary">{{form.firstSubject }}<em v-for="item in form.lastSubject">,{{item}}</em> </em></span>
-        <span class="mr20">总分：<em  class="f-primary">{{ form.score }}</em></span>
-        <a href="/zhiyuan/score" class="f-primary">
-          <i class="el-icon-edit-outline"></i>
-          修改成绩
-        </a>
-      </div>
-    </div>
-    <el-button type="primary" >下一步</el-button>
-  </div>
-</template>
-<script>
-export default {
-  created() {
-    this.form = this.$route.query
-    console.log(this.$route.query)
-  },
-  data() {
-    return {
-      form:{}
-    }
-  }
-}
-</script>
-
-<style scoped>
- .phase {
-  padding: 0 40px 0 100px;}
- em{
-   font-weight: 400;
-   font-style: normal;
- }
-</style>