位次和分页

src/views/career/zhiyuan/NewSimulatedVolunteer.vue

@@ -52,7 +52,8 @@ export default {
       form: {
         score: '',
         firstSubject: '',
-        lastSubject: []
+        lastSubject: [],
+        rank: ''
       },
       zytbBatchesList: [],
       currentStep: 0

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

@@ -5,6 +5,7 @@
         <span class="mr20">您的预估高考成绩</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>
+        <span class="mr20">位次：<em  class="f-primary">{{ formSubject.rank.lowestRank }}</em></span>
       </div>
     </div>
     <div class="recommend-wrap" >

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

@@ -3,7 +3,8 @@
     <div class="zhiyuan-filter">
       <div class="header">
         <h3 class="f-666">您的选考科目为：<em>{{ formSubject.firstSubject }}<em v-for="item in formSubject.lastSubject"
-        >,{{ item }}</em> </em>， 请手动选择志愿</h3>
+        >,{{ item }}</em> </em>，  <span class="mr20">总分：<em  class="f-primary">{{ formSubject.score }}</em></span>
+          <span class="mr20">位次：<em  class="f-primary">{{ formSubject.rank.lowestRank }}</em></span>请手动选择志愿</h3>
       </div>
       <div class="filters">
         <!-- 院校筛选条件 -->
@@ -54,7 +55,7 @@
          <div class="tags" style="width: 100%">
            <el-tag  @close="handleClose(item)" type="success" class="mr5 mb5"  closable v-for="item in checkedListName">{{item.name}}</el-tag>
          </div>
-        <el-button plain size="mini"  @click="getList">确认</el-button>
+        <el-button plain size="mini"  @click="confirm">确认</el-button>
         <el-button plain size="mini"  @click="clear">清除</el-button>
       </div>
     </div>
@@ -73,7 +74,6 @@
               <div class="head-college f16">
                 <el-tag type="success" size="mini" class="mr12">{{ collegeIndex + 1 }}</el-tag>
                 {{ `${college.university.name}(${college.recruitPlan.collegeCode })` }}
-                <i class="el-icon-delete delete-icon"></i>
               </div>
               <div class="majors f12">
                 <div class="major mt10" v-for="(major,majorIndex) in college.majors">
@@ -128,9 +128,9 @@ export default {
       show: false,
       localFilters: {
         picks: [
-          { label: '冲刺型', value: '0' },
-          { label: '稳妥型', value: '1' },
-          { label: '保守型', value: '2' }
+          { label: '冲刺型', value:0 },
+          { label: '稳妥型', value:1 },
+          { label: '保守型', value:2 }
         ]
       },
       pageForm: {
@@ -158,7 +158,7 @@ export default {
       const scrollDistance = dom.scrollHeight - dom.scrollTop - dom.clientHeight;
       console.log('scrollDistance',scrollDistance)
       // 判断是否到底，可以加载下一页
-      if (scrollDistance <= 10) {
+      if (scrollDistance <= 0.5) {
         this.load()
       }
     });
@@ -167,7 +167,7 @@ export default {
     filter_form:{
       deep:true,
       handler(){
-        this.getList()
+        this.confirm()
       }
     },
     selectedList:{
@@ -231,10 +231,13 @@ export default {
     },
   },
   methods: {
+    confirm() {
+      this.pageForm.pageNum = 1
+      this.getList()
+    },
     load() {
       if (Math.ceil(this.total / this.pageForm.pageSize) > this.pageForm.pageNum) {
         // 标识正在请求
-
         // 加载下一页方法
         if(!this.loading){
           //当前页数小于总页数就请求

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

@@ -19,7 +19,7 @@
         </el-checkbox-group>
       </el-form-item>
       <el-form-item label="您的位次">
-        <el-input   disabled placeholder="输入分数后查看位次" :value="rank.lowestRank"></el-input>
+        <el-input   disabled placeholder="输入分数后查看位次" :value="form.rank.lowestRank"></el-input>
         <span class="f12 f-666 ml10">当前为估分模拟，不需填写排名</span>
       </el-form-item>
     </el-form>
@@ -90,7 +90,7 @@ export default {
     },
     getRankByScore() {
       getRankByScore({mode:this.form.firstSubject,scoreRank:this.form.score}).then(res => {
-        this.rank = res.data
+        this.form.rank = res.data
         console.log(res)
       })
     },