yitisheng
/
yitisheng-mini-app
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat:备份页面

This commit is contained in:
zhouwentao 2025-11-25 10:59:42 +08:00
parent 7f884a7367
commit e2b67fddaa
2 changed files with 247 additions and 271 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

516
pages/zyb/fillVolunteer/mockList.vue
View File

@ -1,11 +1,10 @@
<script> <script>
import StaticConstant from "@/common/StaticConstant"; import StaticConstant from "@/common/StaticConstant";
import ApiConstant from "@/common/ApiConstant"; import ApiConstant from "@/common/ApiConstant";
import Request from '@/common/request' import Request from '@/common/request';
import ImagesConstant from "@/common/ImagesConstant"; import ImagesConstant from "@/common/ImagesConstant";
import {arrayIsNotEmpty} from "@/common/util"; import { arrayIsNotEmpty, stringIsNotEmpty } from "@/common/util";
import vip from "../vip/index.vue"; import vip from "../vip/index.vue";
import {stringIsNotEmpty} from "../../../common/util";
const app = getApp() const app = getApp()
@ -18,9 +17,9 @@ const MAX_CACHE_PAGE = 3;
export default { export default {
name: "模拟填报", name: "模拟填报",
computed: { computed: {
app(){ app() {
return app return app
}, },
vip() { vip() {
return vip return vip
}, },
@ -34,10 +33,11 @@ export default {
data() { data() {
return { return {
/// ///
num: {kcj: 0, jwt: 0, nlq: 0, kbd: 0,}, num: { kcj: 0, jwt: 0, nlq: 0, kbd: 0, },
circle: {kcj: 0, jwt: 0, nlq: 0, kbd: 0,},//百分比 circle: { kcj: 0, jwt: 0, nlq: 0, kbd: 0, },//百分比
modelVale: 0, modelVale: 0,
topFlag: false,//显示回到顶部 topFlag: false,//显示回到顶部
otherMajor: { otherMajor: {
visible: false, visible: false,
status: 'noMore', status: 'noMore',
@ -50,7 +50,7 @@ export default {
schoolName: '', schoolName: '',
paneName: '全部', paneName: '全部',
batch: '提前批', batch: '提前批',
kslx:'统考', kslx: '统考',
rulesEnrollProbabilityList: [],//录取方式 rulesEnrollProbabilityList: [],//录取方式
rulesEnrollProbability: '', rulesEnrollProbability: '',
kyjxList: [],//科研教学 kyjxList: [],//科研教学
@ -72,7 +72,7 @@ export default {
menuList: [], menuList: [],
/*筛选项 参数 end*/ /*筛选项 参数 end*/
tabIndex: 0, tabIndex: 0,
tabIndex2:1, tabIndex2: 1,
scrollInto: "", scrollInto: "",
newsList: [], newsList: [],
cacheTab: [], cacheTab: [],
@ -84,6 +84,9 @@ export default {
total: 0, total: 0,
},//分页结果 },//分页结果
filledVolunteer: { filledVolunteer: {
visible: false,
status: 'noMore',
volunteerId: '', volunteerId: '',
volunteerName: '', volunteerName: '',
volunteerEarlyAdmissionList: [],//本科提前批 volunteerEarlyAdmissionList: [],//本科提前批
@ -111,29 +114,15 @@ export default {
this.selectForm.batch = e.batch; this.selectForm.batch = e.batch;
this.filledVolunteer.volunteerId = e.volunteerId; this.filledVolunteer.volunteerId = e.volunteerId;
} }
if (e.rulesEnrollProbability) { // 判断是否带着录取方式进入页面的
//如果进入页面带着录取方式 this.selectForm.rulesEnrollProbabilityList = e.rulesEnrollProbability ? [e.rulesEnrollProbability] : []
this.selectForm.rulesEnrollProbabilityList = [e.rulesEnrollProbability] //遍历筛选菜单，回显高亮录取方式
//遍历筛选菜单，回显高亮录取方式 for (let i = 0; i < this.menuList.length; i++) {
for (let i = 0; i < this.menuList.length; i++) { if (this.menuList[i].title === '筛选') {
if (this.menuList[i].title === '筛选') { for (let j = 0; j < this.menuList[i].children.length; j++) {
for (let j = 0; j < this.menuList[i].children.length; j++) { if (this.menuList[i].children[j].title === '录取方式') {
if (this.menuList[i].children[j].title === '录取方式') { this.menuList[i].children[j].value = this.selectForm.rulesEnrollProbabilityList
this.menuList[i].children[j].value=[e.rulesEnrollProbability] break
break
}
}
}
}
}else{
this.selectForm.rulesEnrollProbabilityList = []
for (let i = 0; i < this.menuList.length; i++) {
if (this.menuList[i].title === '筛选') {
for (let j = 0; j < this.menuList[i].children.length; j++) {
if (this.menuList[i].children[j].title === '录取方式') {
this.menuList[i].children[j].value=[]
break
}
} }
} }
} }
@ -153,6 +142,7 @@ export default {
this.artVolunteerDetail() this.artVolunteerDetail()
this.loadMenu() this.loadMenu()
}, },
// 当翻滚到底部时
onReachBottom() { onReachBottom() {
if (this.vipInfo && this.vipInfo.vipLevel >= 2) { if (this.vipInfo && this.vipInfo.vipLevel >= 2) {
this.loadMore() this.loadMore()
@ -222,7 +212,7 @@ export default {
//加载筛选项 //加载筛选项
request.get(ApiConstant.Major.rulesEnrollrobabilityMenuList, { request.get(ApiConstant.Major.rulesEnrollrobabilityMenuList, {
professionalCategory: this.scoreInfo.professionalCategory professionalCategory: this.scoreInfo.professionalCategory
}, {showLoading: false}).then(r => { }, { showLoading: false }).then(r => {
if (r.success) { if (r.success) {
this.menuList[2].children[0].options = [...r.result] this.menuList[2].children[0].options = [...r.result]
} }
@ -233,28 +223,7 @@ export default {
}, },
search() { search() {
if (!this.vipInfo || !stringIsNotEmpty(this.vipInfo.vipLevel) || this.vipInfo.vipLevel < 2) { this.checkVip();
uni.showModal({
title: 'VIP专享',
// 提示文字
content: '该功能为增值内容，开通会员后即可免费查看！',
// 取消按钮的文字自定义
cancelText: "取消",
// 确认按钮的文字自定义
confirmText: "开通服务",
//删除字体的颜色
confirmColor: 'red',
//取消字体的颜色
cancelColor: '#dddddd',
success: function (res) {
if (res.confirm) {
// 执行确认后的操作
that.goto('/pages/zyb/vip/index')
}
}
})
return
}
this.recommendVolunteerList = [] this.recommendVolunteerList = []
this.selectForm.paneName = '全部' this.selectForm.paneName = '全部'
this.page.current = 1 this.page.current = 1
@ -282,13 +251,13 @@ export default {
} }
//判断选择的是本科批还是其他的 //判断选择的是本科批还是其他的
//如果选的本科提前批（校考） //如果选的本科提前批（校考）
if(this.tabBars[index].id ==='校考'){ if (this.tabBars[index].id === '校考') {
this.selectForm.kslx = '校考' this.selectForm.kslx = '校考'
this.selectForm.batch = '' this.selectForm.batch = ''
}else{ } else {
this.selectForm.kslx = '统考' this.selectForm.kslx = '统考'
this.selectForm.batch = this.tabBars[index].id this.selectForm.batch = this.tabBars[index].id
if (this.selectForm.batch ==='本科' && this.scoreInfo.professionalCategory !== '体育类') { if (this.selectForm.batch === '本科' && this.scoreInfo.professionalCategory !== '体育类') {
//如果是艺术类，选择的本科，那就选择到本科下的985/211提前批 //如果是艺术类，选择的本科，那就选择到本科下的985/211提前批
this.selectForm.batch = '本科A段' this.selectForm.batch = '本科A段'
this.tabIndex2 = 1 this.tabIndex2 = 1
@ -349,7 +318,7 @@ export default {
/*填报志愿*/ /*填报志愿*/
saveVolunteer(item) { saveVolunteer(item) {
let that = this let that = this
let batch = item.batch==='高职高专'?'高职高专':'本科'; let batch = item.batch === '高职高专' ? '高职高专' : '本科';
uni.showModal({ uni.showModal({
title: item.volunteerIndexs ? '移除志愿' : '确认志愿', title: item.volunteerIndexs ? '移除志愿' : '确认志愿',
content: '[' + item.schoolCode + ']' + item.schoolName + '-' + batch + '-[' + item.enrollmentCode + ']' + item.majorName, content: '[' + item.schoolCode + ']' + item.schoolName + '-' + batch + '-[' + item.enrollmentCode + ']' + item.majorName,
@ -364,14 +333,14 @@ export default {
enrollmentCode: item.enrollmentCode, enrollmentCode: item.enrollmentCode,
enrollProbability: item.enrollProbability, enrollProbability: item.enrollProbability,
studentConvertedScore: parseFloat(item.studentConvertedScore), studentConvertedScore: parseFloat(item.studentConvertedScore),
category:item.category category: item.category
}).then(r => { }).then(r => {
if (r.success) { if (r.success) {
if (r.result) { if (r.result) {
that.filledVolunteer.volunteerId = r.result that.filledVolunteer.volunteerId = r.result
} }
setTimeout(function () { setTimeout(function () {
uni.showToast({title: '添加成功', icon: "none"}); uni.showToast({ title: '添加成功', icon: "none" });
}, 500) }, 500)
that.artVolunteerDetail('load') that.artVolunteerDetail('load')
setTimeout(function () { setTimeout(function () {
@ -379,11 +348,11 @@ export default {
}, 500) }, 500)
} else { } else {
setTimeout(function () { setTimeout(function () {
uni.showToast({title: r.message, icon: "none"}); uni.showToast({ title: r.message, icon: "none" });
}, 500) }, 500)
} }
}).catch(err => { }).catch(err => {
uni.showToast({title: err.message, icon: "none"}); uni.showToast({ title: err.message, icon: "none" });
}).finally(() => { }).finally(() => {
}); });
@ -398,49 +367,47 @@ export default {
this.selectForm.batch = this.scoreInfo.batch this.selectForm.batch = this.scoreInfo.batch
//======目前所有批次的专业都可以看到 start //======目前所有批次的专业都可以看到 start
if (this.scoreInfo.professionalCategory === '体育类') { if (this.scoreInfo.professionalCategory === '体育类') {
this.tabBars = [{name: '本科', id: '本科'}, {name: '高职高专', id: '高职高专'}] this.tabBars = [{ name: '本科', id: '本科' }, { name: '高职高专', id: '高职高专' }]
} else { } else {
this.tabBars = [{name: '本科提前批', id: '校考'}, this.tabBars = [{ name: '本科提前批', id: '校考' },
{ {
name: '本科批', id: '本科', childrenTabBars: [ name: '本科批', id: '本科', childrenTabBars: [
{name: '985/211/双一流', id: '提前批'}, { name: '985/211/双一流', id: '提前批' },
{name: '公办本科', id: '本科A段'}, {name: '民办本科', id: '本科B段'} { name: '公办本科', id: '本科A段' }, { name: '民办本科', id: '本科B段' }
] ]
}, {name: '高职高专', id: '高职高专'}] }, { name: '高职高专', id: '高职高专' }]
} }
//======目前所有批次的专业都可以看到 end //======目前所有批次的专业都可以看到 end
console.log('qqq')
//====================调整默认选中的导航栏 start //====================调整默认选中的导航栏 start
if (this.scoreInfo.professionalCategory === '体育类') { if (this.scoreInfo.professionalCategory === '体育类') {
if(this.scoreInfo.batch === '本科'){ if (this.scoreInfo.batch === '本科') {
this.tabIndex = 0; this.tabIndex = 0;
}else{ } else {
this.tabIndex = 1; this.tabIndex = 1;
} }
}else{ } else {
if (this.scoreInfo.batch === '本科A段' || this.scoreInfo.batch === '本科B段') { if (this.scoreInfo.batch === '本科A段' || this.scoreInfo.batch === '本科B段') {
this.selectForm.batch = this.scoreInfo.batch this.selectForm.batch = this.scoreInfo.batch
if (this.scoreInfo.batch === '本科B段'){ if (this.scoreInfo.batch === '本科B段') {
this.tabIndex2 = 2 this.tabIndex2 = 2
} }
this.tabIndex = 1; this.tabIndex = 1;
} else if(this.scoreInfo.batch === '高职高专' && this.scoreInfo.professionalCategory!=='体育类'){ } else if (this.scoreInfo.batch === '高职高专' && this.scoreInfo.professionalCategory !== '体育类') {
this.tabIndex = 2; this.tabIndex = 2;
} }
else { else {
for (let i = 0; i < this.tabBars.length; i++) { for (let i = 0; i < this.tabBars.length; i++) {
if (this.tabBars[i].id === this.selectForm.batch) { if (this.tabBars[i].id === this.selectForm.batch) {
//选中 //选中
this.tabIndex = i; this.tabIndex = i;
break; break;
} }
} }
} }
} }
//=====================调整默认选中的导航栏 end //=====================调整默认选中的导航栏 end
} }
request.get(ApiConstant.Volunteer.artVolunteerDetail, {id: this.filledVolunteer.volunteerId}).then(res => { request.get(ApiConstant.Volunteer.artVolunteerDetail, { id: this.filledVolunteer.volunteerId }).then(res => {
if (res.success) { if (res.success) {
let dataResult = res.result let dataResult = res.result
//有数据情况下 //有数据情况下
@ -462,18 +429,14 @@ export default {
} }
indexs = 1; indexs = 1;
let volunteerUndergraduateList2 = []; let volunteerUndergraduateList2 = [];
while (indexs <= app.globalData.StaticConstant.benZhiYuanNum) { let record = {}
let record = {actives: false, indexs: indexs} for (let i = 0; i < volunteerUndergraduateList.length; i++) {
for (let i = 0; i < volunteerUndergraduateList.length; i++) { record = volunteerUndergraduateList[i]
if (volunteerUndergraduateList[i].indexs === indexs) { record.actives = true
record = volunteerUndergraduateList[i]
record.actives = true
}
}
volunteerUndergraduateList2.push(record) volunteerUndergraduateList2.push(record)
indexs++;
} }
this.filledVolunteer.volunteerUndergraduateList = volunteerUndergraduateList2 this.filledVolunteer.volunteerUndergraduateList = volunteerUndergraduateList2
//==================================本科 end //==================================本科 end
//==================================高职高专 start //==================================高职高专 start
let volunteerJuniorCollegeList = dataResult.volunteerRecordJuniorCollegeList; let volunteerJuniorCollegeList = dataResult.volunteerRecordJuniorCollegeList;
@ -481,21 +444,11 @@ export default {
key = volunteerJuniorCollegeList[i].enrollmentCode + "_" + volunteerJuniorCollegeList[i].majorCode + "_" + volunteerJuniorCollegeList[i].schoolCode key = volunteerJuniorCollegeList[i].enrollmentCode + "_" + volunteerJuniorCollegeList[i].majorCode + "_" + volunteerJuniorCollegeList[i].schoolCode
volunteerMap.set(key, volunteerJuniorCollegeList[i]) volunteerMap.set(key, volunteerJuniorCollegeList[i])
} }
indexs = 1;
let volunteerJuniorCollegeList2 = []; let volunteerJuniorCollegeList2 = [];
while (indexs <= app.globalData.StaticConstant.zhuanZhiYuanNum) { for (let i = 0; i < volunteerJuniorCollegeList.length; i++) {
let record = { record = volunteerJuniorCollegeList[i]
actives: false, record.actives = true
indexs: indexs
}
for (let i = 0; i < volunteerJuniorCollegeList.length; i++) {
if (volunteerJuniorCollegeList[i].indexs === indexs) {
record = volunteerJuniorCollegeList[i]
record.actives = true
}
}
volunteerJuniorCollegeList2.push(record) volunteerJuniorCollegeList2.push(record)
indexs++;
} }
this.filledVolunteer.volunteerJuniorCollegeList = volunteerJuniorCollegeList2 this.filledVolunteer.volunteerJuniorCollegeList = volunteerJuniorCollegeList2
} }
@ -539,7 +492,7 @@ export default {
} }
} }
}, },
getHaveMajorBatchList(){ getHaveMajorBatchList() {
let kyjxStrs = '' let kyjxStrs = ''
if (this.selectForm.kyjxList && this.selectForm.kyjxList.length > 0) { if (this.selectForm.kyjxList && this.selectForm.kyjxList.length > 0) {
kyjxStrs = this.selectForm.kyjxList.join(',') kyjxStrs = this.selectForm.kyjxList.join(',')
@ -570,34 +523,34 @@ export default {
schoolNatureStrs: schoolNatureStrs, schoolNatureStrs: schoolNatureStrs,
kyjxStrs: kyjxStrs, kyjxStrs: kyjxStrs,
scoreId: this.scoreInfo.id, scoreId: this.scoreInfo.id,
kslx:this.selectForm.kslx kslx: this.selectForm.kslx
} }
request.get(ApiConstant.Major.groupByBatchNumber, params).then(res => { request.get(ApiConstant.Major.groupByBatchNumber, params).then(res => {
if (res.success) { if (res.success) {
let haveMajorList = res.result let haveMajorList = res.result
if (arrayIsNotEmpty(haveMajorList)) { if (arrayIsNotEmpty(haveMajorList)) {
if(haveMajorList.includes('提前批')){ if (haveMajorList.includes('提前批')) {
this.tabIndex=1 this.tabIndex = 1
this.tabIndex2=0 this.tabIndex2 = 0
this.selectForm.batch='提前批' this.selectForm.batch = '提前批'
} else if(haveMajorList.includes('本科A段')){ } else if (haveMajorList.includes('本科A段')) {
this.tabIndex=1 this.tabIndex = 1
this.tabIndex2=1 this.tabIndex2 = 1
this.selectForm.batch='本科A段' this.selectForm.batch = '本科A段'
} else if(haveMajorList.includes('本科B段')){ } else if (haveMajorList.includes('本科B段')) {
this.tabIndex=1 this.tabIndex = 1
this.tabIndex2=2 this.tabIndex2 = 2
this.selectForm.batch='本科B段' this.selectForm.batch = '本科B段'
} else if(haveMajorList.includes('本科批') || haveMajorList.includes('本科')){ } else if (haveMajorList.includes('本科批') || haveMajorList.includes('本科')) {
this.tabIndex=0 this.tabIndex = 0
this.selectForm.batch='本科' this.selectForm.batch = '本科'
} else if(haveMajorList.includes('高职高专')){ } else if (haveMajorList.includes('高职高专')) {
if(this.scoreInfo.professionalCategory==='体育类'){ if (this.scoreInfo.professionalCategory === '体育类') {
this.tabIndex=1 this.tabIndex = 1
}else{ } else {
this.tabIndex=2 this.tabIndex = 2
} }
this.selectForm.batch='高职高专' this.selectForm.batch = '高职高专'
} }
} }
console.log(result.haveMajorList) console.log(result.haveMajorList)
@ -645,7 +598,7 @@ export default {
schoolNatureStrs: schoolNatureStrs, schoolNatureStrs: schoolNatureStrs,
kyjxStrs: kyjxStrs, kyjxStrs: kyjxStrs,
scoreId: this.scoreInfo.id, scoreId: this.scoreInfo.id,
kslx:this.selectForm.kslx kslx: this.selectForm.kslx
} }
request.get(ApiConstant.Major.recommendMajorPage, params).then(res => { request.get(ApiConstant.Major.recommendMajorPage, params).then(res => {
if (res.success) { if (res.success) {
@ -724,17 +677,17 @@ export default {
} }
return ImagesConstant.bao.nanluqu; return ImagesConstant.bao.nanluqu;
}, },
//格式化录取概率 //格式化录取概率
formatDecimal(e) { formatDecimal(e) {
try { try {
if(e <= 0){ if (e <= 0) {
return '无概率' return '无概率'
} }
return parseFloat(e).toFixed(2) + '%'; return parseFloat(e).toFixed(2) + '%';
} catch (error) { } catch (error) {
return '??'; return '??';
} }
}, },
checkColorText(e) { checkColorText(e) {
if (this.vipInfo && this.vipInfo.vipLevel < 2) { if (this.vipInfo && this.vipInfo.vipLevel < 2) {
return '#868686'; return '#868686';
@ -783,7 +736,7 @@ export default {
//当前选中的专业 key //当前选中的专业 key
let eKey = e.enrollmentCode + "_" + e.majorCode + "_" + e.schoolCode let eKey = e.enrollmentCode + "_" + e.majorCode + "_" + e.schoolCode
this.otherMajor.status = 'loading' this.otherMajor.status = 'loading'
request.get(ApiConstant.Major.recommendSchoolOtherMajor, params, {showLoad: false}).then(res => { request.get(ApiConstant.Major.recommendSchoolOtherMajor, params, { showLoad: false }).then(res => {
console.log('返回值') console.log('返回值')
console.log(res) console.log(res)
if (res.success && res.result) { if (res.success && res.result) {
@ -817,9 +770,18 @@ export default {
this.otherMajor.status = 'noMore' this.otherMajor.status = 'noMore'
}); });
}, },
onFillVolunteerOpen(e){
console.log(this.filledVolunteer);
this.filledVolunteer.visible = true
},
onFillVolunteerClose(){
console.log('关闭已填报专业');
this.filledVolunteer.visible = false
},
//打开选择其他专业 //打开选择其他专业
onOtherMajorOpen(e) { onOtherMajorOpen(e) {
this.otherMajor.nowMajor = {...e} this.otherMajor.nowMajor = { ...e }
this.otherMajor.schoolName = e.schoolName this.otherMajor.schoolName = e.schoolName
this.otherMajor.visible = true this.otherMajor.visible = true
this.getOtherMajorList() this.getOtherMajorList()
@ -860,29 +822,24 @@ export default {
</script> </script>
<template> <template>
<view class="divider"/> <view class="divider" />
<view class="backcolorwhite"> <view class="backcolorwhite">
<view class="header"> <view class="header">
<view class="search-view"> <view class="search-view">
<view style="display: flex;height: 100rpx;border-bottom: 1px solid #f5f5f5;"> <view style="display: flex;height: 100rpx;border-bottom: 1px solid #f5f5f5;">
<view style="width: 90%"> <view style="width: 90%">
<uni-search-bar class="uni-mt-10" radius="100" placeholder="请输入院校" v-model="selectForm.schoolName" <uni-search-bar class="uni-mt-10" radius="100" placeholder="请输入院校" v-model="selectForm.schoolName"
@clear="clearInput" cancelButton="none" @confirm="search"/> @clear="clearInput" cancelButton="none" @confirm="search" />
</view> </view>
<view style="width: 10%;line-height: 100rpx"> <view style="width: 10%;line-height: 100rpx">
<text @click="search">搜索</text> <text @click="search">搜索</text>
</view> </view>
</view> </view>
<le-dropdown <le-dropdown v-model:menuList="menuList" themeColor="#3d76fd" :duration="200" :isCeiling="true"
v-model:menuList="menuList" @onConfirm="onConfirm" @onChange="onChange"></le-dropdown>
themeColor="#3d76fd"
:duration="200"
:isCeiling="true"
@onConfirm="onConfirm"
@onChange="onChange"></le-dropdown>
</view> </view>
</view> </view>
<view class="divider"/> <view class="divider" />
<!--我的成绩 卡片--> <!--我的成绩 卡片-->
<view class="uni-flex uni-row"> <view class="uni-flex uni-row">
<view class="score-card"> <view class="score-card">
@ -890,30 +847,30 @@ export default {
<view class="flex-item-8"> <view class="flex-item-8">
<text style="font-size: 50rpx">我的成绩</text> <text style="font-size: 50rpx">我的成绩</text>
</view> </view>
<view class="flex-item-2" @click="goto('/pages/zyb/score/edit?scoreId='+this.scoreInfo.id)"> <view class="flex-item-2" @click="goto('/pages/zyb/score/edit?scoreId=' + this.scoreInfo.id)">
<image :src="ImagesConstant.edit" class="icon50 float-right" style="line-height: 50rpx"/> <image :src="ImagesConstant.edit" class="icon50 float-right" style="line-height: 50rpx" />
</view> </view>
</view> </view>
<view class="text-list"> <view class="text-list">
<text class="t">省份：{{ scoreInfo.province }}</text> <text class="t">省份：{{ scoreInfo.province }}</text>
<text class="t">选科：{{ scoreInfo.cognitioPolyclinic ==='文科'?'历史组':'物理组' }}</text> <text class="t">选科：{{ scoreInfo.cognitioPolyclinic === '文科' ? '历史组' : '物理组' }}</text>
<text class="t">类别：{{ scoreInfo.professionalCategory }}</text> <text class="t">类别：{{ scoreInfo.professionalCategory }}</text>
</view> </view>
<view class="text-list"> <view class="text-list">
<text class="t">文化成绩：{{ scoreInfo.culturalScore }}</text> <text class="t">文化成绩：{{ scoreInfo.culturalScore }}</text>
<text class="t">{{ scoreInfo.professionalCategory === '音乐类' ? '主项成绩' : '统考成绩' }}：{{ <text class="t">{{ scoreInfo.professionalCategory === '音乐类' ? '主项成绩' : '统考成绩' }}：{{
scoreInfo.professionalScore scoreInfo.professionalScore
}} }}
</text> </text>
</view> </view>
<view class="text-list" v-if="scoreInfo"> <view class="text-list" v-if="scoreInfo">
<text class="t" v-if="scoreInfo.yybysy && scoreInfo.yybysy!==0">音乐表演声乐：{{ scoreInfo.yybysy }}</text> <text class="t" v-if="scoreInfo.yybysy && scoreInfo.yybysy !== 0">音乐表演声乐：{{ scoreInfo.yybysy }}</text>
<text class="t" v-if="scoreInfo.yybyqy && scoreInfo.yybyqy!==0">音乐表演器乐：{{ scoreInfo.yybyqy }}</text> <text class="t" v-if="scoreInfo.yybyqy && scoreInfo.yybyqy !== 0">音乐表演器乐：{{ scoreInfo.yybyqy }}</text>
<text class="t" v-if="scoreInfo.yyjy && scoreInfo.yyjy!==0">音乐教育：{{ scoreInfo.yyjy }}</text> <text class="t" v-if="scoreInfo.yyjy && scoreInfo.yyjy !== 0">音乐教育：{{ scoreInfo.yyjy }}</text>
<text class="t" v-if="scoreInfo.fzby && scoreInfo.fzby!==0">服装表演：{{ scoreInfo.fzby }}</text> <text class="t" v-if="scoreInfo.fzby && scoreInfo.fzby !== 0">服装表演：{{ scoreInfo.fzby }}</text>
<text class="t" v-if="scoreInfo.xjysdy && scoreInfo.xjysdy!==0">戏剧影视导演：{{ scoreInfo.xjysdy }}</text> <text class="t" v-if="scoreInfo.xjysdy && scoreInfo.xjysdy !== 0">戏剧影视导演：{{ scoreInfo.xjysdy }}</text>
<text class="t" v-if="scoreInfo.xjysby && scoreInfo.xjysby!==0">戏剧影视表演：{{ scoreInfo.xjysby }}</text> <text class="t" v-if="scoreInfo.xjysby && scoreInfo.xjysby !== 0">戏剧影视表演：{{ scoreInfo.xjysby }}</text>
</view> </view>
</view> </view>
</view> </view>
@ -925,68 +882,67 @@ export default {
<!--导航栏--> <!--导航栏-->
<view class="tabs"> <view class="tabs">
<scroll-view id="tab-bar" class="scroll-h" :scroll-x="true" :show-scrollbar="false" <scroll-view id="tab-bar" class="scroll-h" :scroll-x="true" :show-scrollbar="false"
:scroll-into-view="scrollInto"> :scroll-into-view="scrollInto">
<view v-for="(tab,index) in tabBars" :key="tab.id" class="uni-tab-item" :id="tab.id" :data-current="index" <view v-for="(tab, index) in tabBars" :key="tab.id" class="uni-tab-item" :id="tab.id" :data-current="index"
@click="ontabtap"> @click="ontabtap">
<text class="uni-tab-item-title" :class="tabIndex===index ? 'uni-tab-item-title-active' : ''">{{ tab.name }} <text class="uni-tab-item-title" :class="tabIndex === index ? 'uni-tab-item-title-active' : ''">{{ tab.name }}
</text> </text>
</view> </view>
</scroll-view> </scroll-view>
<scroll-view id="tab-bar" class="scroll-h border-top" :scroll-x="true" :show-scrollbar="false" <scroll-view id="tab-bar" class="scroll-h border-top" :scroll-x="true" :show-scrollbar="false"
:scroll-into-view="scrollInto" v-if="tabBars[tabIndex] && tabBars[tabIndex].childrenTabBars"> :scroll-into-view="scrollInto" v-if="tabBars[tabIndex] && tabBars[tabIndex].childrenTabBars">
<view v-for="(tab,index) in tabBars[tabIndex].childrenTabBars" :key="tab.id" class="uni-tab-item2" :id="tab.id" <view v-for="(tab, index) in tabBars[tabIndex].childrenTabBars" :key="tab.id" class="uni-tab-item2" :id="tab.id"
:data-current="index" :data-current="index" @click="ontabtap2">
@click="ontabtap2"> <text class="uni-tab-item-title" :class="tabIndex2 === index ? 'uni-tab-item-title-active' : ''">{{ tab.name }}
<text class="uni-tab-item-title" :class="tabIndex2===index ? 'uni-tab-item-title-active' : ''">{{ tab.name }}
</text> </text>
</view> </view>
</scroll-view> </scroll-view>
<view class="uni-flex uni-row flex border-top" style="padding: 20rpx 0 10rpx 0" v-if="selectForm.kslx==='统考'"> <view class="uni-flex uni-row flex border-top" style="padding: 20rpx 0 10rpx 0" v-if="selectForm.kslx === '统考'">
<view class="flex-item-05"></view> <view class="flex-item-05"></view>
<view class="flex-item-2" v-if="num.nlq!==0" @click="switchPane('难录取')"> <view class="flex-item-2" v-if="num.nlq !== 0" @click="switchPane('难录取')">
<l-circle v-model:current="modelVale" :percent="(vipInfo && vipInfo.vipLevel>=2)?circle.nlq:0" size="130rpx" <l-circle v-model:current="modelVale" :percent="(vipInfo && vipInfo.vipLevel >= 2) ? circle.nlq : 0" size="130rpx"
strokeColor="#c83428"> strokeColor="#c83428">
<view class="centerTxt"> <view class="centerTxt">
<view class="num"> <view class="num">
{{ vipInfo && vipInfo.vipLevel >= 2 ? num.nlq : '??' }} {{ vipInfo && vipInfo.vipLevel >= 2 ? num.nlq : '??' }}
</view> </view>
<view class="txt" :class="selectForm.paneName==='难录取'?'red':''">难录取</view> <view class="txt" :class="selectForm.paneName === '难录取' ? 'red' : ''">难录取</view>
</view> </view>
</l-circle> </l-circle>
</view> </view>
<view class="flex-item-05" v-if="num.kcj!==0"></view> <view class="flex-item-05" v-if="num.kcj !== 0"></view>
<view class="flex-item-2" v-if="num.kcj!==0" @click="switchPane('可冲击')"> <view class="flex-item-2" v-if="num.kcj !== 0" @click="switchPane('可冲击')">
<l-circle v-model:current="modelVale" :percent="(vipInfo && vipInfo.vipLevel>=2)?circle.kcj:0" size="130rpx" <l-circle v-model:current="modelVale" :percent="(vipInfo && vipInfo.vipLevel >= 2) ? circle.kcj : 0" size="130rpx"
strokeColor="#F8880E"> strokeColor="#F8880E">
<view class="centerTxt"> <view class="centerTxt">
<view class="num"> <view class="num">
{{ vipInfo && vipInfo.vipLevel >= 2 ? num.kcj : '??' }} {{ vipInfo && vipInfo.vipLevel >= 2 ? num.kcj : '??' }}
</view> </view>
<view class="txt" :class="selectForm.paneName==='可冲击'?'redOrange2':''">可冲击</view> <view class="txt" :class="selectForm.paneName === '可冲击' ? 'redOrange2' : ''">可冲击</view>
</view> </view>
</l-circle> </l-circle>
</view> </view>
<view class="flex-item-05" v-if="num.jwt!==0"></view> <view class="flex-item-05" v-if="num.jwt !== 0"></view>
<view class="flex-item-2" v-if="num.jwt!==0" @click="switchPane('较稳妥')"> <view class="flex-item-2" v-if="num.jwt !== 0" @click="switchPane('较稳妥')">
<l-circle v-model:current="modelVale" :percent="(vipInfo && vipInfo.vipLevel>=2) ?circle.jwt:0" size="130rpx" <l-circle v-model:current="modelVale" :percent="(vipInfo && vipInfo.vipLevel >= 2) ? circle.jwt : 0" size="130rpx"
strokeColor="#4975fd"> strokeColor="#4975fd">
<view class="centerTxt"> <view class="centerTxt">
<view class="num"> <view class="num">
{{ (vipInfo && vipInfo.vipLevel >= 2) ? num.jwt : '??' }} {{ (vipInfo && vipInfo.vipLevel >= 2) ? num.jwt : '??' }}
</view> </view>
<view class="txt" :class="selectForm.paneName==='较稳妥'?'blue':''">较稳妥</view> <view class="txt" :class="selectForm.paneName === '较稳妥' ? 'blue' : ''">较稳妥</view>
</view> </view>
</l-circle> </l-circle>
</view> </view>
<view class="flex-item-05" v-if="num.kbd!==0"></view> <view class="flex-item-05" v-if="num.kbd !== 0"></view>
<view class="flex-item-2" v-if="num.kbd!==0" @click="switchPane('可保底')"> <view class="flex-item-2" v-if="num.kbd !== 0" @click="switchPane('可保底')">
<l-circle v-model:current="modelVale" :percent="(vipInfo && vipInfo.vipLevel>=2) ?circle.kbd:0" size="130rpx" <l-circle v-model:current="modelVale" :percent="(vipInfo && vipInfo.vipLevel >= 2) ? circle.kbd : 0" size="130rpx"
strokeColor="#3e8e43"> strokeColor="#3e8e43">
<view class="centerTxt"> <view class="centerTxt">
<view class="num"> <view class="num">
{{ (vipInfo && vipInfo.vipLevel >= 2) ? num.kbd : '??' }} {{ (vipInfo && vipInfo.vipLevel >= 2) ? num.kbd : '??' }}
</view> </view>
<view class="txt" :class="selectForm.paneName==='可保底'?'green':''">可保底</view> <view class="txt" :class="selectForm.paneName === '可保底' ? 'green' : ''">可保底</view>
</view> </view>
</l-circle> </l-circle>
</view> </view>
@ -997,24 +953,24 @@ export default {
<page-head title="当前为系统模拟计划，请注意辨别"></page-head> <page-head title="当前为系统模拟计划，请注意辨别"></page-head>
<!--推荐列表--> <!--推荐列表-->
<view class="fillVolunteer"> <view class="fillVolunteer">
<view class="volunteerItem radius8" v-for="(item,index) in recommendVolunteerList" :key="index"> <view class="volunteerItem radius8" v-for="(item, index) in recommendVolunteerList" :key="index">
<!--院校信息--> <!--院校信息-->
<view class="flex" @click="goto('/pages/zyb/school/detail?schoolCode='+item.schoolCode)"> <view class="flex" @click="goto('/pages/zyb/school/detail?schoolCode=' + item.schoolCode)">
<!--院校图片--> <!--院校图片-->
<view class="flex-item-22"> <view class="flex-item-22">
<image :src="item.schoolIcon||ImagesConstant.defaultIcon" class="icon128"/> <image :src="item.schoolIcon || ImagesConstant.defaultIcon" class="icon128" />
</view> </view>
<!--院校代码--> <!--院校代码-->
<view class="flex-item-77"> <view class="flex-item-77">
<view class="flex slateGray"> <view class="flex slateGray">
<text class="flex-item-4">院校代码[{{ item.schoolCode }}]</text> <text class="flex-item-4">院校代码[{{ item.schoolCode }}]</text>
<text class="flex-item-25">{{ item.province }}</text> <text class="flex-item-25">{{ item.province }}</text>
<view class="flex-item-35" v-if="selectForm.kslx==='统考'"> <view class="flex-item-35" v-if="selectForm.kslx === '统考'">
<view style="float: right;line-height: 50rpx;" class="font-weight-600"> <view style="float: right;line-height: 50rpx;" class="font-weight-600">
<text class="font-size-mini" :style="'color:'+checkColorText(item.enrollProbability)"> <text class="font-size-mini" :style="'color:' + checkColorText(item.enrollProbability)">
{{ vipInfo && vipInfo.vipLevel >= 2 ? formatDecimal(item.enrollProbability) : '??' }} {{ vipInfo && vipInfo.vipLevel >= 2 ? formatDecimal(item.enrollProbability) : '??' }}
</text> </text>
<image :src="checkBao(item.enrollProbability)" class="icon50" v-if="vipInfo && vipInfo.vipLevel>=2"/> <image :src="checkBao(item.enrollProbability)" class="icon50" v-if="vipInfo && vipInfo.vipLevel >= 2" />
</view> </view>
</view> </view>
</view> </view>
@ -1028,12 +984,12 @@ export default {
</view> </view>
<view class="flex"> <view class="flex">
<view class="flex-item-65 slateGray" style="line-height: 50rpx"> <view class="flex-item-65 slateGray" style="line-height: 50rpx">
<text v-if="item.state==='新增'" style="color: red;font-size: 25rpx">新增</text> <text v-if="item.state === '新增'" style="color: red;font-size: 25rpx">新增</text>
<text class="tag">[{{ item.enrollmentCode }}]{{ item.majorName }}</text> <text class="tag">[{{ item.enrollmentCode }}]{{ item.majorName }}</text>
<text class="tag">{{item.tuition}}</text> <text class="tag">{{ item.tuition }}</text>
<text v-if="item.limitation">{{ item.majorDetail }}</text> <text v-if="item.limitation">{{ item.majorDetail }}</text>
<text class="margin-left-10"> <text class="margin-left-10">
<text class="tag" v-if="item.otherScoreLimitation && item.otherScoreLimitation!==''"> <text class="tag" v-if="item.otherScoreLimitation && item.otherScoreLimitation !== ''">
{{ item.otherScoreLimitation }} {{ item.otherScoreLimitation }}
</text> </text>
</text> </text>
@ -1041,15 +997,16 @@ export default {
</view> </view>
<view class="flex-item-35"> <view class="flex-item-35">
<view style="float: right;line-height: 50rpx;" class="font-weight-600" <view style="float: right;line-height: 50rpx;" class="font-weight-600"
v-if="vipInfo && (item.privateStudentScore||item.studentConvertedScore) && vipInfo.vipLevel >= 2"> v-if="vipInfo && (item.privateStudentScore || item.studentConvertedScore) && vipInfo.vipLevel >= 2">
<text>计算分</text> <text>计算分</text>
<text class="font-size-mini margin-left-10" :style="'color:'+checkColorText(item.enrollProbability)"> <text class="font-size-mini margin-left-10" :style="'color:' + checkColorText(item.enrollProbability)">
{{ item.privateStudentScore||item.studentConvertedScore }} {{ item.privateStudentScore || item.studentConvertedScore }}
</text> </text>
</view> </view>
<view style="float: right;line-height: 50rpx;" class="font-weight-600" v-show="app.globalData.StaticConstant.showZeSuan"> <view style="float: right;line-height: 50rpx;" class="font-weight-600"
v-show="app.globalData.StaticConstant.showZeSuan">
<text>折合分</text> <text>折合分</text>
<text class="font-size-mini margin-left-10" :style="'color:'+checkColorText(item.enrollProbability)"> <text class="font-size-mini margin-left-10" :style="'color:' + checkColorText(item.enrollProbability)">
{{ item.studentScore }} {{ item.studentScore }}
</text> </text>
</view> </view>
@ -1061,7 +1018,7 @@ export default {
<!--招录信息--> <!--招录信息-->
<view class="flex font-size-mini"> <view class="flex font-size-mini">
<view class="flex-item-5" style="line-height: 40rpx"> <view class="flex-item-5" style="line-height: 40rpx">
<view v-for="(history,h) in item.historyMajorEnrollList" :key="h"> <view v-for="(history, h) in item.historyMajorEnrollList" :key="h">
<text>{{ history.year }}年录取最低分：</text> <text>{{ history.year }}年录取最低分：</text>
<text class="red">{{ history.admissionLine }}分</text> <text class="red">{{ history.admissionLine }}分</text>
</view> </view>
@ -1081,55 +1038,70 @@ export default {
<text v-else class="blue">暂未发布</text> <text v-else class="blue">暂未发布</text>
</view> </view>
<view class="flex-item-3"> <view class="flex-item-3">
<view :class="item.volunteerIndexs?'volunteer-item-active':''" class="otherMajorBtn radius8" <view :class="item.volunteerIndexs ? 'volunteer-item-active' : ''" class="otherMajorBtn radius8"
@click="onOtherMajorOpen(item)"> @click="onOtherMajorOpen(item)">
<text>查看可选专业</text> <text>查看可选专业</text>
</view> </view>
</view> </view>
</view> </view>
</view> </view>
<view class="container" @click="loadMore" v-if="userInfo.vipFlag"> <view class="container" @click="loadMore" v-if="userInfo.vipFlag">
<uni-load-more :status="status" :content-text="contentText"/> <uni-load-more :status="status" :content-text="contentText" />
</view> </view>
</view> </view>
<!--已填志愿-->
<px-popup-bottom :background="'#ffffff'" :color="'black'" :visible.sync="filledVolunteer.visible" title="" maxHeight="1200"
radius="40" @close="onFillVolunteerClose">
<view class="flexWrap" style="height: 50rpx;line-height: 50rpx">
<view class="flex-item-8">
<text class="darkGray font-weight-550">已填志愿信息</text>
</view>
<view class="flex-item-2">
<image @click="onFillVolunteerClose" :src="ImagesConstant.close" class="icon32 float-right"
style="position: relative;top: 5rpx" />
</view>
</view>
</px-popup-bottom>
<!--其他专业--> <!--其他专业-->
<px-popup-bottom :background="'#ffffff'" :color="'black'" :visible.sync="otherMajor.visible" title="" <px-popup-bottom :background="'#ffffff'" :color="'black'" :visible.sync="otherMajor.visible" title="" maxHeight="1200"
maxHeight="1200" radius="40" @close="onOtherMajorClose"> radius="40" @close="onOtherMajorClose">
<view class="flexWrap" style="height: 50rpx;line-height: 50rpx"> <view class="flexWrap" style="height: 50rpx;line-height: 50rpx">
<view class="flex-item-8"> <view class="flex-item-8">
<text class="darkGray font-weight-550">{{ otherMajor.schoolName }}</text> <text class="darkGray font-weight-550">{{ otherMajor.schoolName }}</text>
</view> </view>
<view class="flex-item-2"> <view class="flex-item-2">
<image @click="onOtherMajorClose" :src="ImagesConstant.close" class="icon32 float-right" <image @click="onOtherMajorClose" :src="ImagesConstant.close" class="icon32 float-right"
style="position: relative;top: 5rpx"/> style="position: relative;top: 5rpx" />
</view> </view>
</view> </view>
<view class="fillVolunteer" style="padding: 0"> <view class="fillVolunteer" style="padding: 0">
<scroll-view scroll-y="true" style="height: 800rpx;margin-top: 30rpx"> <scroll-view scroll-y="true" style="height: 800rpx;margin-top: 30rpx">
<!--选择的专业--> <!--选择的专业-->
<view class="volunteerItem radius15" style="background-color: #f9f9fb;padding: 20rpx 20rpx" <view class="volunteerItem radius15" style="background-color: #f9f9fb;padding: 20rpx 20rpx"
v-if="otherMajor.nowMajor"> v-if="otherMajor.nowMajor">
<view class="flexWrap" @click="goto('/pages/zyb/school/detail?schoolCode='+otherMajor.nowMajor.schoolCode)"> <view class="flexWrap" @click="goto('/pages/zyb/school/detail?schoolCode=' + otherMajor.nowMajor.schoolCode)">
<view class="flex-item-10 flexWrap"> <view class="flex-item-10 flexWrap">
<view class="flex-item-65 font-weight-b" style="line-height: 50rpx"> <view class="flex-item-65 font-weight-b" style="line-height: 50rpx">
<text class="" style="display: flex;">[{{ otherMajor.nowMajor.enrollmentCode }}]{{ otherMajor.nowMajor.majorName }}</text> <text class="" style="display: flex;">[{{ otherMajor.nowMajor.enrollmentCode }}]{{
<text class="tag">{{otherMajor.nowMajor.tuition}}</text> otherMajor.nowMajor.majorName }}</text>
<text class="tag">{{ otherMajor.nowMajor.tuition }}</text>
<text v-if="otherMajor.nowMajor.majorDetail">{{ otherMajor.nowMajor.majorDetail }}</text> <text v-if="otherMajor.nowMajor.majorDetail">{{ otherMajor.nowMajor.majorDetail }}</text>
<!-- <text v-if="otherMajor.nowMajor.limitation">({{otherMajor.nowMajor.limitation}})</text>--> <!-- <text v-if="otherMajor.nowMajor.limitation">({{otherMajor.nowMajor.limitation}})</text>-->
<text class="margin-left-10"> <text class="margin-left-10">
<text class="tag" <text class="tag"
v-if="otherMajor.nowMajor.otherScoreLimitation && otherMajor.nowMajor.otherScoreLimitation!==''"> v-if="otherMajor.nowMajor.otherScoreLimitation && otherMajor.nowMajor.otherScoreLimitation !== ''">
{{ otherMajor.nowMajor.otherScoreLimitation }} {{ otherMajor.nowMajor.otherScoreLimitation }}
</text> </text>
</text> </text>
</view> </view>
<view class="flex-item-35"> <view class="flex-item-35">
<view style="float: right;line-height: 50rpx;" class="font-weight-600" v-if="selectForm.kslx==='统考'"> <view style="float: right;line-height: 50rpx;" class="font-weight-600" v-if="selectForm.kslx === '统考'">
<text class="font-size-mini" :style="'color:'+checkColorText(otherMajor.nowMajor.enrollProbability)"> <text class="font-size-mini" :style="'color:' + checkColorText(otherMajor.nowMajor.enrollProbability)">
{{ (vipInfo && vipInfo.vipLevel >= 2) ? formatDecimal(otherMajor.nowMajor.enrollProbability) : '??' }} {{ (vipInfo && vipInfo.vipLevel >= 2) ? formatDecimal(otherMajor.nowMajor.enrollProbability) : '??'
}}
</text> </text>
<image :src="checkBao(otherMajor.nowMajor.enrollProbability)" class="icon50" <image :src="checkBao(otherMajor.nowMajor.enrollProbability)" class="icon50"
v-if="(vipInfo&&vipInfo.vipLevel>=2)"/> v-if="(vipInfo && vipInfo.vipLevel >= 2)" />
</view> </view>
</view> </view>
</view> </view>
@ -1137,7 +1109,7 @@ export default {
<!--招录信息--> <!--招录信息-->
<view class="flex font-size-mini"> <view class="flex font-size-mini">
<view class="flex-item-5" style="line-height: 40rpx"> <view class="flex-item-5" style="line-height: 40rpx">
<view v-for="(history,h) in otherMajor.nowMajor.historyMajorEnrollList" :key="h"> <view v-for="(history, h) in otherMajor.nowMajor.historyMajorEnrollList" :key="h">
<text>{{ history.year }}年录取最低分：</text> <text>{{ history.year }}年录取最低分：</text>
<text class="red">{{ history.admissionLine }}分</text> <text class="red">{{ history.admissionLine }}分</text>
</view> </view>
@ -1147,7 +1119,7 @@ export default {
<view style="float: right;line-height: 50rpx;" class="font-weight-600"> <view style="float: right;line-height: 50rpx;" class="font-weight-600">
<text>折合分</text> <text>折合分</text>
<text class="font-size-mini margin-left-10" <text class="font-size-mini margin-left-10"
:style="'color:'+checkColorText(otherMajor.nowMajor.enrollProbability)"> :style="'color:' + checkColorText(otherMajor.nowMajor.enrollProbability)">
{{ (vipInfo && vipInfo.vipLevel >= 2) ? otherMajor.nowMajor.studentScore : '??' }} {{ (vipInfo && vipInfo.vipLevel >= 2) ? otherMajor.nowMajor.studentScore : '??' }}
</text> </text>
</view> </view>
@ -1155,8 +1127,8 @@ export default {
<view class="flex" style="float: right"> <view class="flex" style="float: right">
<text>{{ StaticConstant.year }}省内计划录取：</text> <text>{{ StaticConstant.year }}省内计划录取：</text>
<text v-if="otherMajor.nowMajor.planNum" class="green font-weight-600">{{ <text v-if="otherMajor.nowMajor.planNum" class="green font-weight-600">{{
otherMajor.nowMajor.planNum otherMajor.nowMajor.planNum
}}人 }}人
</text> </text>
<text v-else class="green">暂未发布</text> <text v-else class="green">暂未发布</text>
</view> </view>
@ -1172,12 +1144,12 @@ export default {
</view> </view>
<view class="flex-item-3" v-if="otherMajor.nowMajor.enrollProbability"> <view class="flex-item-3" v-if="otherMajor.nowMajor.enrollProbability">
<view class="radius10 font-weight-b" @click="saveVolunteer(otherMajor.nowMajor)" <view class="radius10 font-weight-b" @click="saveVolunteer(otherMajor.nowMajor)"
:class="otherMajor.nowMajor.volunteerIndexs?'volunteerIndexs':'saveVolunteer'"> :class="otherMajor.nowMajor.volunteerIndexs ? 'volunteerIndexs' : 'saveVolunteer'">
<image :src="otherMajor.nowMajor.volunteerIndexs?ImagesConstant.duigou_orange:ImagesConstant.add_orange" <image :src="otherMajor.nowMajor.volunteerIndexs ? ImagesConstant.duigou_orange : ImagesConstant.add_orange"
class="icon32"/> class="icon32" />
<text>{{ <text>{{
otherMajor.nowMajor.volunteerIndexs ? '志愿' + otherMajor.nowMajor.volunteerIndexs : '加入志愿表' otherMajor.nowMajor.volunteerIndexs ? '志愿' + otherMajor.nowMajor.volunteerIndexs : '加入志愿表'
}} }}
</text> </text>
</view> </view>
</view> </view>
@ -1188,27 +1160,27 @@ export default {
</view> </view>
<!--院校下其他的专业--> <!--院校下其他的专业-->
<view class="volunteerItem radius15" style="background-color: #f9f9fb;padding: 20rpx 20rpx" <view class="volunteerItem radius15" style="background-color: #f9f9fb;padding: 20rpx 20rpx"
v-for="(item,index) in otherMajor.list" :key="index" v-for="(item, index) in otherMajor.list" :key="index"
:class="index === otherMajor.list.length?'':'border-bottom'"> :class="index === otherMajor.list.length ? '' : 'border-bottom'">
<view class="flexWrap" @click="goto('/pages/zyb/school/detail?schoolCode='+item.schoolCode)"> <view class="flexWrap" @click="goto('/pages/zyb/school/detail?schoolCode=' + item.schoolCode)">
<view class="flex-item-10 flexWrap"> <view class="flex-item-10 flexWrap">
<view class="flex-item-65 font-weight-b" style="line-height: 50rpx"> <view class="flex-item-65 font-weight-b" style="line-height: 50rpx">
<text class="" style="display: flex;">[{{ item.enrollmentCode }}]{{ item.majorName }}</text> <text class="" style="display: flex;">[{{ item.enrollmentCode }}]{{ item.majorName }}</text>
<text class="tag">{{item.tuition}}</text> <text class="tag">{{ item.tuition }}</text>
<text v-if="item.majorDetail">{{ item.majorDetail }}</text> <text v-if="item.majorDetail">{{ item.majorDetail }}</text>
<!-- <text v-if="item.limitation">({{item.limitation}})</text>--> <!-- <text v-if="item.limitation">({{item.limitation}})</text>-->
<text class="margin-left-10"> <text class="margin-left-10">
<text class="tag" v-if="item.otherScoreLimitation && item.otherScoreLimitation!==''"> <text class="tag" v-if="item.otherScoreLimitation && item.otherScoreLimitation !== ''">
{{ item.otherScoreLimitation }}分 {{ item.otherScoreLimitation }}分
</text> </text>
</text> </text>
</view> </view>
<view class="flex-item-35"> <view class="flex-item-35">
<view style="float: right;line-height: 50rpx;" class="font-weight-600" v-if="selectForm.kslx==='统考'"> <view style="float: right;line-height: 50rpx;" class="font-weight-600" v-if="selectForm.kslx === '统考'">
<text class="font-size-mini" :style="'color:'+checkColorText(item.enrollProbability)"> <text class="font-size-mini" :style="'color:' + checkColorText(item.enrollProbability)">
{{ (vipInfo && vipInfo.vipLevel >= 2) ? formatDecimal(item.enrollProbability) : '??' }} {{ (vipInfo && vipInfo.vipLevel >= 2) ? formatDecimal(item.enrollProbability) : '??' }}
</text> </text>
<image :src="checkBao(item.enrollProbability)" class="icon50" v-if="vipInfo&&vipInfo.vipLevel>=2"/> <image :src="checkBao(item.enrollProbability)" class="icon50" v-if="vipInfo && vipInfo.vipLevel >= 2" />
</view> </view>
</view> </view>
</view> </view>
@ -1216,7 +1188,7 @@ export default {
<!--招录信息--> <!--招录信息-->
<view class="flex font-size-mini"> <view class="flex font-size-mini">
<view class="flex-item-5" style="line-height: 40rpx"> <view class="flex-item-5" style="line-height: 40rpx">
<view v-for="(history,h) in item.historyMajorEnrollList" :key="h"> <view v-for="(history, h) in item.historyMajorEnrollList" :key="h">
<text>{{ history.year }}年录取最低分：</text> <text>{{ history.year }}年录取最低分：</text>
<text class="red">{{ history.admissionLine }}分</text> <text class="red">{{ history.admissionLine }}分</text>
</view> </view>
@ -1224,10 +1196,10 @@ export default {
<view class="flex-item-5" style="line-height: 40rpx"> <view class="flex-item-5" style="line-height: 40rpx">
<view class="flex" style="float: right"> <view class="flex" style="float: right">
<view style="float: right;line-height: 50rpx;" class="font-weight-600" <view style="float: right;line-height: 50rpx;" class="font-weight-600"
v-show="app.globalData.StaticConstant.showZeSuan"> v-show="app.globalData.StaticConstant.showZeSuan">
<!--v-if="item.studentConvertedScore"--> <!--v-if="item.studentConvertedScore"-->
<text>折合分</text> <text>折合分</text>
<text class="font-size-mini margin-left-10" :style="'color:'+checkColorText(item.enrollProbability)"> <text class="font-size-mini margin-left-10" :style="'color:' + checkColorText(item.enrollProbability)">
{{ vipInfo && vipInfo.vipLevel >= 2 ? item.studentScore : '??' }} {{ vipInfo && vipInfo.vipLevel >= 2 ? item.studentScore : '??' }}
</text> </text>
</view> </view>
@ -1247,22 +1219,23 @@ export default {
</view> </view>
<view class="flex-item-3" v-if="item.enrollProbability"> <view class="flex-item-3" v-if="item.enrollProbability">
<view class="radius10 font-weight-b" @click="saveVolunteer(item)" <view class="radius10 font-weight-b" @click="saveVolunteer(item)"
:class="item.volunteerIndexs?'volunteerIndexs':'saveVolunteer'"> :class="item.volunteerIndexs ? 'volunteerIndexs' : 'saveVolunteer'">
<image :src="item.volunteerIndexs?ImagesConstant.duigou_orange:ImagesConstant.add_orange" <image :src="item.volunteerIndexs ? ImagesConstant.duigou_orange : ImagesConstant.add_orange"
class="icon32"/> class="icon32" />
<text>{{ item.volunteerIndexs ? '志愿' + item.volunteerIndexs : '加入志愿表' }}</text> <text>{{ item.volunteerIndexs ? '志愿' + item.volunteerIndexs : '加入志愿表' }}</text>
</view> </view>
</view> </view>
</view> </view>
</view> </view>
<uni-load-more :status="otherMajor.status" :content-text="contentText"/> <uni-load-more :status="otherMajor.status" :content-text="contentText" />
</scroll-view> </scroll-view>
</view> </view>
</px-popup-bottom> </px-popup-bottom>
<view v-if="recommendVolunteerList && recommendVolunteerList.length>0"> <view v-if="recommendVolunteerList && recommendVolunteerList.length > 0">
<my-checkvip :vip-flag="(vipInfo && vipInfo.vipLevel>=2)"/> <my-checkvip :vip-flag="(vipInfo && vipInfo.vipLevel >= 2)" />
</view> </view>
<view class="top" :style="{'display':(topFlag===true? 'block':'none')}"> <uni-icons class="topc" style="top: 73%;" type="eye" size="40" @click="onFillVolunteerOpen"></uni-icons>
<view class="top" :style="{ 'display': (topFlag === true ? 'block' : 'none') }">
<uni-icons class="topc" type="arrowthinup" size="40" @click="clickTop"></uni-icons> <uni-icons class="topc" type="arrowthinup" size="40" @click="clickTop"></uni-icons>
</view> </view>
</template> </template>
@ -1365,7 +1338,7 @@ export default {
padding-right: 34rpx; padding-right: 34rpx;
} }
.uni-tab-item2{ .uni-tab-item2 {
/* #ifndef APP-PLUS */ /* #ifndef APP-PLUS */
display: inline-block; display: inline-block;
/* #endif */ /* #endif */
@ -1507,6 +1480,7 @@ export default {
.header { .header {
border-top: 3rpx solid #f6f6f6; border-top: 3rpx solid #f6f6f6;
background-color: white; background-color: white;
//min-height: 500rpx; //min-height: 500rpx;
//搜索栏 //搜索栏
.search-view { .search-view {
@ -1570,11 +1544,13 @@ export default {
/*推荐志愿列表 start*/ /*推荐志愿列表 start*/
.fillVolunteer { .fillVolunteer {
/*padding:0 30rpx 10rpx 30rpx;*/ /*padding:0 30rpx 10rpx 30rpx;*/
.volunteerItem { .volunteerItem {
background-color: white; background-color: white;
padding: 30rpx; padding: 30rpx;
margin: 10rpx 0; margin: 10rpx 0;
/*院校标签*/ /*院校标签*/
.tags { .tags {
display: flex; display: flex;
@ -1630,7 +1606,8 @@ export default {
/* 回到顶部 start*/ /* 回到顶部 start*/
.top { .top {
position: relative; position: relative;
display: none; /* 先将元素隐藏 */ display: none;
/* 先将元素隐藏 */
transition: 0.5s; transition: 0.5s;
} }
@ -1652,5 +1629,4 @@ scroll-view ::-webkit-scrollbar {
height: 0; height: 0;
background-color: transparent; background-color: transparent;
} }
</style> </style>

2
pages/zyb/vip/index.vue
View File

@ -6,7 +6,7 @@ import StaticConstant from "@/common/StaticConstant";
import ApiConstant from "@/common/ApiConstant"; import ApiConstant from "@/common/ApiConstant";
import ImagesConstant from "@/common/ImagesConstant"; import ImagesConstant from "@/common/ImagesConstant";
import Request from '@/common/request'; import Request from '@/common/request';
import {stringIsNotEmpty} from "../../../common/util"; import {stringIsNotEmpty} from "@/common/util";
import Image from "../../component/image/image.vue"; import Image from "../../component/image/image.vue";
const app = getApp() const app = getApp()
let request = new Request() let request = new Request()