zhiyuan -fix

src/views/career/zhiyuan/NewSimulatedVolunteer.vue

@@ -18,8 +18,8 @@
     </div>
     <div class="content">
       <score ref="score" v-show="active.index == 0" ></score>
-      <phase @onFillIn="onFillIn" v-if="active.index == 1" :list="zytbBatchesList" :form="form"></phase>
-      <recommend :batch="batch" v-if="active.index == 2"></recommend>
+      <phase @onFillIn="onFillIn" v-if="active.index == 1" :list="zytbBatchesList" :formSubject="form"></phase>
+      <recommend :batch="batch" v-if="active.index == 2" :formSubject="form"></recommend>
     </div>
     <div class="text-center mt15">
       <el-button plain  @click="toReport">查看记录</el-button>

src/views/career/zhiyuan/batch.vue

@@ -76,7 +76,6 @@ export default {
     };
   },
   created() {
-    this.getLocations();
     this.getYears();
     this.getBatchList();
   },

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

@@ -3,8 +3,8 @@
     <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>
+        <span class="mr20">选科科目：<em  class="f-primary">{{formSubject.firstSubject }}<em v-for="item in formSubject.lastSubject">,{{item}}</em> </em></span>
+        <span class="mr20">总分：<em  class="f-primary">{{ formSubject.score }}</em></span>
       </div>
     </div>
     <div class="recommend-wrap" >
@@ -23,7 +23,7 @@
 <script>
 export default {
   props: {
-    form: {
+    formSubject: {
       type: Object,
       default: {}
     },

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

@@ -2,7 +2,7 @@
   <div style="width: 80%; margin:0 auto">
     <div class="zhiyuan-filter">
       <div class="header">
-        <h3 class="f-666">您的选考科目为：历史,生物,政治， 请手动选择志愿</h3>
+        <h3 class="f-666">您的选考科目为：<em>{{formSubject.firstSubject }}<em v-for="item in formSubject.lastSubject">,{{item}}</em> </em>， 请手动选择志愿</h3>
       </div>
       <div class="filters">
 <!--        <div class="filter">-->
@@ -84,6 +84,16 @@
 import { zytbFilter } from '@/api/webApi/webQue'
 
 export default {
+  props:{
+    formSubject: {
+      type: Object,
+      default: {}
+    },
+    batch: {
+      type: Object,
+      default:{}
+    }
+  },
   data() {
     return {
       filter_form: {
@@ -131,12 +141,6 @@ export default {
       }
     }
   },
-  props: {
-    batch: {
-      type: Object,
-      default:{}
-    }
-  },
   created() {
     this.$nextTick(_ => zytbFilter(this.batch.batch).then((res) => {
       this.filters = res.data;
@@ -219,6 +223,10 @@ export default {
   padding: 8px 8px;
   margin: 0;
 }
+em{
+  font-weight: 400;
+  font-style: normal;
+}
 >>>  .el-input--medium .el-input__inner{
   height: 30px;
   line-height: 30px;

src/views/career/zhiyuan/tips.vue

@@ -22,7 +22,7 @@
          '模拟填报共有四个步骤。',
        ]
      }
-   }
+   },
  }
 </script>
 

src/views/questioncenter/generating.vue

@@ -1107,9 +1107,6 @@ export default {
   display: flex;
 }
 
-.que-content-title .index {
-  margin-top: 5px;
-}
 
 .que-option {
   line-height: 40px;

src/views/questioncenter/smart.vue

@@ -325,6 +325,7 @@ export default {
       )
     },
     toDetails(item) {
+      this.dialogVisible=false
       this.$router.push({
         path: '/question-center/smartExercise/answerDetailas',
         query: {