diff --git a/pages/zyb/fillVolunteer/mockList.vue b/pages/zyb/fillVolunteer/mockList.vue
index 027a812..ea74c17 100644
--- a/pages/zyb/fillVolunteer/mockList.vue
+++ b/pages/zyb/fillVolunteer/mockList.vue
@@ -1,11 +1,10 @@
-
+
-
+
@@ -890,30 +847,30 @@ export default {
我的成绩
-
-
+
+
省份:{{ scoreInfo.province }}
- 选科:{{ scoreInfo.cognitioPolyclinic ==='文科'?'历史组':'物理组' }}
+ 选科:{{ scoreInfo.cognitioPolyclinic === '文科' ? '历史组' : '物理组' }}
类别:{{ scoreInfo.professionalCategory }}
文化成绩:{{ scoreInfo.culturalScore }}
{{ scoreInfo.professionalCategory === '音乐类' ? '主项成绩' : '统考成绩' }}:{{
- scoreInfo.professionalScore
- }}
+ scoreInfo.professionalScore
+ }}
- 音乐表演声乐:{{ scoreInfo.yybysy }}
- 音乐表演器乐:{{ scoreInfo.yybyqy }}
- 音乐教育:{{ scoreInfo.yyjy }}
- 服装表演:{{ scoreInfo.fzby }}
- 戏剧影视导演:{{ scoreInfo.xjysdy }}
- 戏剧影视表演:{{ scoreInfo.xjysby }}
+ 音乐表演声乐:{{ scoreInfo.yybysy }}
+ 音乐表演器乐:{{ scoreInfo.yybyqy }}
+ 音乐教育:{{ scoreInfo.yyjy }}
+ 服装表演:{{ scoreInfo.fzby }}
+ 戏剧影视导演:{{ scoreInfo.xjysdy }}
+ 戏剧影视表演:{{ scoreInfo.xjysby }}
@@ -925,68 +882,67 @@ export default {
-
- {{ tab.name }}
+ :scroll-into-view="scrollInto">
+
+ {{ tab.name }}
-
- {{ tab.name }}
+ :scroll-into-view="scrollInto" v-if="tabBars[tabIndex] && tabBars[tabIndex].childrenTabBars">
+
+ {{ tab.name }}
-
+
-
-
+
+
{{ vipInfo && vipInfo.vipLevel >= 2 ? num.nlq : '??' }}
- 难录取
+ 难录取
-
-
-
+
+
+
{{ vipInfo && vipInfo.vipLevel >= 2 ? num.kcj : '??' }}
- 可冲击
+ 可冲击
-
-
-
+
+
+
{{ (vipInfo && vipInfo.vipLevel >= 2) ? num.jwt : '??' }}
- 较稳妥
+ 较稳妥
-
-
-
+
+
+
{{ (vipInfo && vipInfo.vipLevel >= 2) ? num.kbd : '??' }}
- 可保底
+ 可保底
@@ -997,24 +953,24 @@ export default {
-
+
-
+
-
+
院校代码[{{ item.schoolCode }}]
{{ item.province }}
-
+
-
+
{{ vipInfo && vipInfo.vipLevel >= 2 ? formatDecimal(item.enrollProbability) : '??' }}
-
+
@@ -1028,12 +984,12 @@ export default {
- 新增
+ 新增
[{{ item.enrollmentCode }}]{{ item.majorName }}
- {{item.tuition}}
+ {{ item.tuition }}
{{ item.majorDetail }}
-
+
{{ item.otherScoreLimitation }}
@@ -1041,15 +997,16 @@ export default {
+ v-if="vipInfo && (item.privateStudentScore || item.studentConvertedScore) && vipInfo.vipLevel >= 2">
计算分
-
- {{ item.privateStudentScore||item.studentConvertedScore }}
+
+ {{ item.privateStudentScore || item.studentConvertedScore }}
-
+
折合分
-
+
{{ item.studentScore }}
@@ -1061,7 +1018,7 @@ export default {
-
+
{{ history.year }}年录取最低分:
{{ history.admissionLine }}分
@@ -1081,55 +1038,70 @@ export default {
暂未发布
-
+
查看可选专业
-
+
+
+
+
+
+ 已填志愿信息
+
+
+
+
+
+
-
+
{{ otherMajor.schoolName }}
+ style="position: relative;top: 5rpx" />
-
+ v-if="otherMajor.nowMajor">
+
- [{{ otherMajor.nowMajor.enrollmentCode }}]{{ otherMajor.nowMajor.majorName }}
- {{otherMajor.nowMajor.tuition}}
+ [{{ otherMajor.nowMajor.enrollmentCode }}]{{
+ otherMajor.nowMajor.majorName }}
+ {{ otherMajor.nowMajor.tuition }}
{{ otherMajor.nowMajor.majorDetail }}
+ v-if="otherMajor.nowMajor.otherScoreLimitation && otherMajor.nowMajor.otherScoreLimitation !== ''">
{{ otherMajor.nowMajor.otherScoreLimitation }}
-
-
- {{ (vipInfo && vipInfo.vipLevel >= 2) ? formatDecimal(otherMajor.nowMajor.enrollProbability) : '??' }}
+
+
+ {{ (vipInfo && vipInfo.vipLevel >= 2) ? formatDecimal(otherMajor.nowMajor.enrollProbability) : '??'
+ }}
+ v-if="(vipInfo && vipInfo.vipLevel >= 2)" />
@@ -1137,7 +1109,7 @@ export default {
-
+
{{ history.year }}年录取最低分:
{{ history.admissionLine }}分
@@ -1147,7 +1119,7 @@ export default {
折合分
+ :style="'color:' + checkColorText(otherMajor.nowMajor.enrollProbability)">
{{ (vipInfo && vipInfo.vipLevel >= 2) ? otherMajor.nowMajor.studentScore : '??' }}
@@ -1155,8 +1127,8 @@ export default {
{{ StaticConstant.year }}省内计划录取:
{{
- otherMajor.nowMajor.planNum
- }}人
+ otherMajor.nowMajor.planNum
+ }}人
暂未发布
@@ -1172,12 +1144,12 @@ export default {
-
+ :class="otherMajor.nowMajor.volunteerIndexs ? 'volunteerIndexs' : 'saveVolunteer'">
+
{{
- otherMajor.nowMajor.volunteerIndexs ? '志愿' + otherMajor.nowMajor.volunteerIndexs : '加入志愿表'
- }}
+ otherMajor.nowMajor.volunteerIndexs ? '志愿' + otherMajor.nowMajor.volunteerIndexs : '加入志愿表'
+ }}
@@ -1188,27 +1160,27 @@ export default {
-
+ v-for="(item, index) in otherMajor.list" :key="index"
+ :class="index === otherMajor.list.length ? '' : 'border-bottom'">
+
[{{ item.enrollmentCode }}]{{ item.majorName }}
- {{item.tuition}}
+ {{ item.tuition }}
{{ item.majorDetail }}
-
+
{{ item.otherScoreLimitation }}分
-
-
+
+
{{ (vipInfo && vipInfo.vipLevel >= 2) ? formatDecimal(item.enrollProbability) : '??' }}
-
+
@@ -1216,7 +1188,7 @@ export default {
-
+
{{ history.year }}年录取最低分:
{{ history.admissionLine }}分
@@ -1224,10 +1196,10 @@ export default {
+ v-show="app.globalData.StaticConstant.showZeSuan">
折合分
-
+
{{ vipInfo && vipInfo.vipLevel >= 2 ? item.studentScore : '??' }}
@@ -1247,22 +1219,23 @@ export default {
-
+ :class="item.volunteerIndexs ? 'volunteerIndexs' : 'saveVolunteer'">
+
{{ item.volunteerIndexs ? '志愿' + item.volunteerIndexs : '加入志愿表' }}
-
+
-
-
+
+
-
+
+
@@ -1365,7 +1338,7 @@ export default {
padding-right: 34rpx;
}
- .uni-tab-item2{
+ .uni-tab-item2 {
/* #ifndef APP-PLUS */
display: inline-block;
/* #endif */
@@ -1507,6 +1480,7 @@ export default {
.header {
border-top: 3rpx solid #f6f6f6;
background-color: white;
+
//min-height: 500rpx;
//搜索栏
.search-view {
@@ -1570,11 +1544,13 @@ export default {
/*推荐志愿列表 start*/
.fillVolunteer {
+
/*padding:0 30rpx 10rpx 30rpx;*/
.volunteerItem {
background-color: white;
padding: 30rpx;
margin: 10rpx 0;
+
/*院校标签*/
.tags {
display: flex;
@@ -1630,7 +1606,8 @@ export default {
/* 回到顶部 start*/
.top {
position: relative;
- display: none; /* 先将元素隐藏 */
+ display: none;
+ /* 先将元素隐藏 */
transition: 0.5s;
}
@@ -1652,5 +1629,4 @@ scroll-view ::-webkit-scrollbar {
height: 0;
background-color: transparent;
}
-
diff --git a/pages/zyb/vip/index.vue b/pages/zyb/vip/index.vue
index 8343308..141056e 100644
--- a/pages/zyb/vip/index.vue
+++ b/pages/zyb/vip/index.vue
@@ -6,7 +6,7 @@ import StaticConstant from "@/common/StaticConstant";
import ApiConstant from "@/common/ApiConstant";
import ImagesConstant from "@/common/ImagesConstant";
import Request from '@/common/request';
-import {stringIsNotEmpty} from "../../../common/util";
+import {stringIsNotEmpty} from "@/common/util";
import Image from "../../component/image/image.vue";
const app = getApp()
let request = new Request()