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

updates

This commit is contained in:
zhouwentao 2025-12-16 08:16:03 +08:00
parent e2b67fddaa
commit 5b7cd85266
23 changed files with 378 additions and 157 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/ApiConstant.js
View File

@ -75,6 +75,8 @@ export default {
exChangeIndexs: '/art/volunteer/exchangeIndexs',//交换志愿位置 exChangeIndexs: '/art/volunteer/exchangeIndexs',//交换志愿位置
updateFctj: '/art/volunteer/updateFctj',//修改服从调剂 updateFctj: '/art/volunteer/updateFctj',//修改服从调剂
resortVolunteer: '/art/volunteer/resortVolunteer', // 修改批次的志愿顺序 resortVolunteer: '/art/volunteer/resortVolunteer', // 修改批次的志愿顺序
saveFilledVolunteer: '/art/volunteer/saveFilledVolunteer', // 保存志愿明细至志愿表
}, },
Pay: { Pay: {
//vip1: '/wx/pay/v1/jsApiPay',//支付类型1 //vip1: '/wx/pay/v1/jsApiPay',//支付类型1

55
common/ImagesConstant.js
View File

@ -1,49 +1,50 @@
export default { export default {
defaultIcon:'http://files.yitisheng.vip/images/icons/swiper-dot.png', defaultIcon:'https://files.yitisheng.vip/images/icons/swiper-dot.png',
systemIcon:'https://mp-7a4eecb1-2a04-4d36-b050-1c4a78cc31a4.cdn.bspapp.com/images/yitisheng.png',//系统图片 systemIcon: 'https://files.yitisheng.vip/images/yitisheng.png',//系统图片
major:'http://files.yitisheng.vip/images/icons/major.png', jxywtj: 'https://files.yitisheng.vip/images/jxywtj.png',
skx:'http://files.yitisheng.vip/images/icons/options/shengkongxian.png',//省控线 major:'https://files.yitisheng.vip/images/icons/major.png',
cwh:'http://files.yitisheng.vip/images/icons/options/cewenhua.png',//测文化 skx:'https://files.yitisheng.vip/images/icons/options/shengkongxian.png',//省控线
cwc:'http://files.yitisheng.vip/images/icons/options/chaweici.png',//查位次 cwh:'https://files.yitisheng.vip/images/icons/options/cewenhua.png',//测文化
std:'http://files.yitisheng.vip/images/icons/options/suantoudang.png',//算投档 cwc:'https://files.yitisheng.vip/images/icons/options/chaweici.png',//查位次
customerServiceQrCode:'https://mp-7a4eecb1-2a04-4d36-b050-1c4a78cc31a4.cdn.bspapp.com/images/customerServiceQrCode.png',//客服二维码 std:'https://files.yitisheng.vip/images/icons/options/suantoudang.png',//算投档
customerServiceQrCode:'https://files.yitisheng.vip/images/customerServiceQrCode.png',//客服二维码
yxjs: '/static/icons/options/message.png',//院校介绍 yxjs: '/static/icons/options/message.png',//院校介绍
zlsj: '/static/icons/options/gupiao.png',//招录数据 zlsj: '/static/icons/options/gupiao.png',//招录数据
lqxx: '/static/icons/options/dataLevelUp.png',//录取信息 lqxx: '/static/icons/options/dataLevelUp.png',//录取信息
loveWhile:'http://files.yitisheng.vip/images/icons/love-while.png',//收藏按钮 loveWhile:'https://files.yitisheng.vip/images/icons/love-while.png',//收藏按钮
loveDarkturquoise:'http://files.yitisheng.vip/images/icons/love-darkturquoise.png',//已搜藏按钮 loveDarkturquoise:'https://files.yitisheng.vip/images/icons/love-darkturquoise.png',//已搜藏按钮
triangle_bottom:'http://files.yitisheng.vip/images/icons/direction/triangle_bottom.png',//三角-下拉选 triangle_bottom:'https://files.yitisheng.vip/images/icons/direction/triangle_bottom.png',//三角-下拉选
huiyuanquanyi:'http://files.yitisheng.vip/images/huiyuanquanyi.png',//会员权益 huiyuanquanyi:'https://files.yitisheng.vip/images/huiyuanquanyi.png',//会员权益
kfImage:'http://files.yitisheng.vip/images/kf.jpg',//客服二维码图片 kfImage:'https://files.yitisheng.vip/images/kf.jpg',//客服二维码图片
shuqian:'/static/icons/24gl-bookmarkMinus.png',//书签-时风绿 shuqian:'/static/icons/24gl-bookmarkMinus.png',//书签-时风绿
edit:'http://files.yitisheng.vip/images/icons/%E7%BC%96%E8%BE%91.png',//编辑 edit:'https://files.yitisheng.vip/images/icons/%E7%BC%96%E8%BE%91.png',//编辑
edit2:'/static/icons/edit.png', edit2:'/static/icons/edit.png',
cuti:{ cuti:{
edit:'http://files.yitisheng.vip/images/icons/cuti/edit.png',//编辑 edit:'https://files.yitisheng.vip/images/icons/cuti/edit.png',//编辑
delete:'http://files.yitisheng.vip/images/icons/cuti/delete.png',//删除 delete:'https://files.yitisheng.vip/images/icons/cuti/delete.png',//删除
}, },
//方向指针 //方向指针
keyboard:{ keyboard:{
arrowDown:'http://files.yitisheng.vip/images/icons/cuti/keyboard-arrow-down.png',//下方向 arrowDown:'https://files.yitisheng.vip/images/icons/cuti/keyboard-arrow-down.png',//下方向
arrowDown2:'http://files.yitisheng.vip/images/icons/cuti/keyboard-arrow-down2.png',//下方向 arrowDown2:'https://files.yitisheng.vip/images/icons/cuti/keyboard-arrow-down2.png',//下方向
arrowRightWhite:'http://files.yitisheng.vip/images/icons/cuti/keyboard-arrow-right-white.png',//右方向 白色 arrowRightWhite:'https://files.yitisheng.vip/images/icons/cuti/keyboard-arrow-right-white.png',//右方向 白色
arrowRight: 'http://files.yitisheng.vip/images/icons/cuti/keyboard-arrow-right.png',//右方向 arrowRight: 'https://files.yitisheng.vip/images/icons/cuti/keyboard-arrow-right.png',//右方向
}, },
bao:{ bao:{
jiaowentuo:'http://files.yitisheng.vip/images/icons/%E4%BF%9D/%E8%BE%83%E7%A8%B3%E5%A6%A5.png',//较稳妥 jiaowentuo:'https://files.yitisheng.vip/images/icons/%E4%BF%9D/%E8%BE%83%E7%A8%B3%E5%A6%A5.png',//较稳妥
kebaodi:'http://files.yitisheng.vip/images/icons/%E4%BF%9D/%E5%8F%AF%E4%BF%9D%E5%BA%95.png',//可保底 kebaodi:'https://files.yitisheng.vip/images/icons/%E4%BF%9D/%E5%8F%AF%E4%BF%9D%E5%BA%95.png',//可保底
nanluqu:'http://files.yitisheng.vip/images/icons/%E4%BF%9D/%E9%9A%BE%E5%BD%95%E5%8F%96.png',//难录取 nanluqu:'https://files.yitisheng.vip/images/icons/%E4%BF%9D/%E9%9A%BE%E5%BD%95%E5%8F%96.png',//难录取
kechongji:'http://files.yitisheng.vip/images/icons/%E4%BF%9D/%E5%8F%AF%E5%86%B2%E5%87%BB.png',//可冲击.png kechongji:'https://files.yitisheng.vip/images/icons/%E4%BF%9D/%E5%8F%AF%E5%86%B2%E5%87%BB.png',//可冲击.png
}, },
cdx: 'http://files.yitisheng.vip/images/icons/options/chayuanxiao.png', oneByOne: 'https://files.yitisheng.vip/images/oneByOne.2bad329.png',
czy: 'http://files.yitisheng.vip/images/icons/options/chazhuanye.png', cdx: 'https://files.yitisheng.vip/images/icons/options/chayuanxiao.png',
czy: 'https://files.yitisheng.vip/images/icons/options/chazhuanye.png',
close:'/static/icons/clonse.png',//关闭 close:'/static/icons/clonse.png',//关闭
duigou_orange:'/static/icons/duigou_orange.png',//对钩 duigou_orange:'/static/icons/duigou_orange.png',//对钩
add_orange:'/static/icons/add_orange.png',//添加 add_orange:'/static/icons/add_orange.png',//添加

20
common/StaticConstant.js
View File

@ -130,25 +130,25 @@ export default {
HomeOptions: [ HomeOptions: [
{ {
title: "查大学", title: "查大学",
//icon: "http://files.yitisheng.vip/images/icons/xx.png", //icon: "https://files.yitisheng.vip/images/icons/xx.png",
icon: ImagesConstant.cdx, icon: ImagesConstant.cdx,
url: "/pages/zyb/school/list" url: "/pages/zyb/school/list"
}, },
{ {
title: "查专业", title: "查专业",
//icon: 'http://files.yitisheng.vip/images/icons/major.png', //icon: 'https://files.yitisheng.vip/images/icons/major.png',
icon: ImagesConstant.czy, icon: ImagesConstant.czy,
url: "/pages/zyb/major/list", url: "/pages/zyb/major/list",
}, },
{ {
title: "省控线", title: "省控线",
//icon: 'http://files.yitisheng.vip/images/icons/skx.png', //icon: 'https://files.yitisheng.vip/images/icons/skx.png',
icon: ImagesConstant.skx, icon: ImagesConstant.skx,
url: "/pages/zyb/historyScoreControlLine/index" url: "/pages/zyb/historyScoreControlLine/index"
}, },
{ {
title: "测文化", title: "测文化",
//icon: "http://files.yitisheng.vip/images/icons/cwh.png", //icon: "https://files.yitisheng.vip/images/icons/cwh.png",
icon: ImagesConstant.cwh, icon: ImagesConstant.cwh,
url: "/pages/zyb/testCultural/index" url: "/pages/zyb/testCultural/index"
}, },
@ -159,7 +159,7 @@ export default {
}, },
{ {
title: "算投档", title: "算投档",
//icon: "http://files.yitisheng.vip/images/icons/jsq.png", //icon: "https://files.yitisheng.vip/images/icons/jsq.png",
icon: ImagesConstant.std, icon: ImagesConstant.std,
url: "/pages/zyb/other/calculateInvestment" url: "/pages/zyb/other/calculateInvestment"
}, },
@ -169,12 +169,12 @@ export default {
},*/ },*/
{ {
title: "艺考考研", title: "艺考考研",
icon:'http://files.yitisheng.vip/images/icons/options/tongji.png', icon:'https://files.yitisheng.vip/images/icons/options/tongji.png',
url: "/pages/zyb/npee/index" url: "/pages/zyb/npee/index"
}, },
{ {
title: "招生章程", title: "招生章程",
icon:'http://files.yitisheng.vip/images/icons/options/zhaoshengzhangcheng.png', icon:'https://files.yitisheng.vip/images/icons/options/zhaoshengzhangcheng.png',
url: "/pages/zyb/article/list" url: "/pages/zyb/article/list"
} }
],//首页菜单 ],//首页菜单
@ -413,6 +413,10 @@ export default {
{ {
label: "全国重点大学", label: "全国重点大学",
value: "全国重点大学" value: "全国重点大学"
},
{
label: "新增院校",
value: "新增院校"
} }
] ]
}, },
@ -460,7 +464,7 @@ export default {
contentrefresh: '加载中', contentrefresh: '加载中',
contentnomore: '没有更多' contentnomore: '没有更多'
}, },
remote: {},
opts:{ opts:{
color: ["#1890FF", "#91CB74", "#FAC858", "#EE6666", "#73C0DE", "#3CA272", "#FC8452", "#9A60B4", "#ea7ccc"], color: ["#1890FF", "#91CB74", "#FAC858", "#EE6666", "#73C0DE", "#3CA272", "#FC8452", "#9A60B4", "#ea7ccc"],
padding: [5, 5, 5, 5], padding: [5, 5, 5, 5],

2
common/operate.js
View File

@ -5,6 +5,6 @@ export default {
// api :"https://yitisheng.vip//jbttest/",//测试环境 // api :"https://yitisheng.vip//jbttest/",//测试环境
// 图片服务器 // 图片服务器
file:'http://files.yitisheng.vip', file:'https://files.yitisheng.vip',
} }

4
config/env.js
View File

@ -1,7 +1,7 @@
// 不同的环境变量配置 // 不同的环境变量配置
const wx_yitisheng_prod = { const wx_yitisheng_prod = {
// requestBaseUrl: 'https://yitisheng.vip/jbt', requestBaseUrl: 'https://yitisheng.vip/jbt',
requestBaseUrl: 'http://127.0.0.1:8080/jeecg-boot/', // requestBaseUrl: 'http://127.0.0.1:8080/jeecg-boot/',
appid: 'wxb9cf28f42ffa35e5', appid: 'wxb9cf28f42ffa35e5',
name:'艺体志愿宝' name:'艺体志愿宝'
} }

2
pages/template/ucharts/ucharts.vue
View File

@ -183,7 +183,7 @@
</template> </template>
<script> <script>
import uCharts from 'http://files.yitisheng.vip/js/u-charts/u-charts.js'; import uCharts from 'https://files.yitisheng.vip/js/u-charts/u-charts.js';
var _self; var _self;
var canvasObj = {}; var canvasObj = {};

9
pages/zyb/article/list.vue
View File

@ -57,13 +57,18 @@ import {dateUtils} from '@/common/util';
import ApiConstant from "@/common/ApiConstant"; import ApiConstant from "@/common/ApiConstant";
import Request from "@/common/request"; import Request from "@/common/request";
import StaticConstant from "@/common/StaticConstant"; import StaticConstant from "@/common/StaticConstant";
import ImagesConstant from '@/common/ImagesConstant';
let request = new Request() let request = new Request()
export default { export default {
computed:{
ImagesConstant() {
return ImagesConstant
}
},
data() { data() {
return { return {
banner: { banner: {
cover: 'https://mp-7a4eecb1-2a04-4d36-b050-1c4a78cc31a4.cdn.bspapp.com/images/jxywtj.png' cover: ImagesConstant.jxywtj
}, },
current: 1, current: 1,
pageSize: 10, pageSize: 10,

9
pages/zyb/article/list2.vue
View File

@ -57,13 +57,18 @@ import {dateUtils} from '@/common/util';
import ApiConstant from "@/common/ApiConstant"; import ApiConstant from "@/common/ApiConstant";
import Request from "@/common/request"; import Request from "@/common/request";
import StaticConstant from "@/common/StaticConstant"; import StaticConstant from "@/common/StaticConstant";
import ImagesConstant from '@/common/ImagesConstant';
let request = new Request() let request = new Request()
export default { export default {
computed:{
ImagesConstant(){
return ImagesConstant
}
},
data() { data() {
return { return {
banner: { banner: {
cover: 'https://mp-7a4eecb1-2a04-4d36-b050-1c4a78cc31a4.cdn.bspapp.com/images/jxywtj.png' cover: ImagesConstant.jxywtj,
}, },
current: 1, current: 1,
pageSize: 10, pageSize: 10,

6
pages/zyb/fillVolunteer/detail.vue
View File

@ -37,7 +37,7 @@
batchLabel: '提前批', batchLabel: '提前批',
batch: '提前批', batch: '提前批',
type: '顺序志愿', type: '顺序志愿',
max: app.globalData.StaticConstant.tiQianPiZhiYuanNum, max: app.globalData.StaticConstant.remote.tiQianPiZhiYuanNum,
status: false, status: false,
saveStatus: false saveStatus: false
}, },
@ -45,7 +45,7 @@
batchLabel: '本科批', batchLabel: '本科批',
batch: '本科批', batch: '本科批',
type: '平行志愿', type: '平行志愿',
max: app.globalData.StaticConstant.benZhiYuanNum, max: app.globalData.StaticConstant.remote.benZhiYuanNum,
status: false, status: false,
saveStatus: false saveStatus: false
}, },
@ -53,7 +53,7 @@
batchLabel: '高职高专', batchLabel: '高职高专',
batch: '高职高专', batch: '高职高专',
type: '平行志愿', type: '平行志愿',
max: app.globalData.StaticConstant.zhuanZhiYuanNum, max: app.globalData.StaticConstant.remote.zhuanZhiYuanNum,
status: false, status: false,
saveStatus: false saveStatus: false
}, },

19
pages/zyb/fillVolunteer/index.vue
View File

@ -674,11 +674,6 @@ export default {
</view> </view>
</view> </view>
</view> </view>
<!--通告栏-->
<!-- <view style="padding: 0 10rpx">
<uni-notice-bar show-icon text="有关2024年全国艺考省份政策及数据说明"
@click="goto('/pages/zyb/other/web-view?url=https://yitisheng.vip/wxSJIRHyQUBA/zkzc.html')"/>
</view>-->
<!--导航栏--> <!--导航栏-->
<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"
@ -793,7 +788,7 @@ export default {
</text> </text>
</view> </view>
<!--v-if="item.studentScore"--> <!--v-if="item.studentScore"-->
<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.remote.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 }}
@ -814,7 +809,7 @@ export default {
</view> </view>
<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">
<text>{{ app.globalData.StaticConstant.year }}省内计划录取：</text> <text>{{ app.globalData.StaticConstant.remote.year }}省内计划录取：</text>
<text v-if="item.planNum" class="green font-weight-600">{{ item.planNum }}人</text> <text v-if="item.planNum" class="green font-weight-600">{{ item.planNum }}人</text>
<text v-else class="green">暂未发布</text> <text v-else class="green">暂未发布</text>
</view> </view>
@ -822,7 +817,7 @@ export default {
</view> </view>
<view class="flex" style="line-height: 50rpx"> <view class="flex" style="line-height: 50rpx">
<view class="flex-item-7"> <view class="flex-item-7">
<text>{{ app.globalData.StaticConstant.year }}录取方式:</text> <text>{{ app.globalData.StaticConstant.remote.year }}录取方式:</text>
<text v-if="item.rulesEnrollProbability" class="blue">{{ item.rulesEnrollProbability }}</text> <text v-if="item.rulesEnrollProbability" class="blue">{{ item.rulesEnrollProbability }}</text>
<text v-else class="blue">暂未发布</text> <text v-else class="blue">暂未发布</text>
</view> </view>
@ -899,7 +894,7 @@ export default {
</view> </view>
</view> </view>
<view class="flex" style="float: right"> <view class="flex" style="float: right">
<text>{{ app.globalData.StaticConstant.year }}省内计划录取：</text> <text>{{ app.globalData.StaticConstant.remote.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
}}人 }}人
@ -910,7 +905,7 @@ export default {
</view> </view>
<view class="flex" style="line-height: 50rpx"> <view class="flex" style="line-height: 50rpx">
<view class="flex-item-7"> <view class="flex-item-7">
<text>{{ app.globalData.StaticConstant.year }}录取方式:</text> <text>{{ app.globalData.StaticConstant.remote.year }}录取方式:</text>
<text v-if="otherMajor.nowMajor.rulesEnrollProbability" class="blue"> <text v-if="otherMajor.nowMajor.rulesEnrollProbability" class="blue">
{{ otherMajor.nowMajor.rulesEnrollProbability }} {{ otherMajor.nowMajor.rulesEnrollProbability }}
</text> </text>
@ -977,7 +972,7 @@ export default {
</view> </view>
</view> </view>
<view class="flex" style="float: right"> <view class="flex" style="float: right">
<text>{{ app.globalData.StaticConstant.year }}省内计划录取：</text> <text>{{ app.globalData.StaticConstant.remote.year }}省内计划录取：</text>
<text v-if="item.planNum" class="green font-weight-600">{{ item.planNum }}人</text> <text v-if="item.planNum" class="green font-weight-600">{{ item.planNum }}人</text>
<text v-else class="green">暂未发布</text> <text v-else class="green">暂未发布</text>
</view> </view>
@ -985,7 +980,7 @@ export default {
</view> </view>
<view class="flex" style="line-height: 50rpx"> <view class="flex" style="line-height: 50rpx">
<view class="flex-item-7"> <view class="flex-item-7">
<text>{{ app.globalData.StaticConstant.year }}录取方式:</text> <text>{{ app.globalData.StaticConstant.remote.year }}录取方式:</text>
<text v-if="item.rulesEnrollProbability" class="blue">{{ item.rulesEnrollProbability }}</text> <text v-if="item.rulesEnrollProbability" class="blue">{{ item.rulesEnrollProbability }}</text>
<text v-else class="blue">暂未发布</text> <text v-else class="blue">暂未发布</text>
</view> </view>

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

@ -96,6 +96,7 @@ export default {
volunteerUndergraduateList: [],//体育本科 volunteerUndergraduateList: [],//体育本科
volunteerMap: new Map() volunteerMap: new Map()
},//已填志愿信息 },//已填志愿信息
currentEduLevel: '本科', // 当前学历层次
years: StaticConstant.years, years: StaticConstant.years,
// //
status: 'more', status: 'more',
@ -163,7 +164,6 @@ export default {
}, },
methods: { methods: {
onConfirm(e) { onConfirm(e) {
console.log('onConfirm')
if (e.type === 'filter') { if (e.type === 'filter') {
if (e.children) { if (e.children) {
for (let i = 0; i < e.children.length; i++) { for (let i = 0; i < e.children.length; i++) {
@ -315,10 +315,23 @@ export default {
this.newsList[e].data.length = 0; this.newsList[e].data.length = 0;
this.newsList[e].loadingText = "加载更多..."; this.newsList[e].loadingText = "加载更多...";
}, },
/*填报志愿*/ /*添加志愿项*/
saveVolunteer(item) { addVolunteerItem(item) {
let that = this const that = this;
let batch = item.batch === '高职高专' ? '高职高专' : '本科'; const batch = item.batch === '高职高专'? '高职高专' : '本科';
// 根据item的招生代码、专业代码和学校代码生成唯一的键值
const itemKey = `${item.enrollmentCode}_${item.majorCode}_${item.schoolCode}`;
// 根据batch的值确定要操作的志愿列表，高职高专对应volunteerJuniorCollegeList，本科对应volunteerUndergraduateList
const volunteerList = batch === '高职高专'? this.filledVolunteer.volunteerJuniorCollegeList : this.filledVolunteer.volunteerUndergraduateList;
if (!this.filledVolunteer.volunteerMap.has(itemKey)) {
// 如果志愿映射表中不存在该itemKey，则将其添加到志愿映射表中
this.filledVolunteer.volunteerMap.set(itemKey, item);
// 将该项添加到对应的志愿列表中
volunteerList.push({...item, indexs:volunteerList.length+1 });
}else{
this.deleteVolunteerItem(item)
}
if(true) return
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,
@ -360,6 +373,74 @@ export default {
} }
}); });
}, },
/*删除志愿项*/
deleteVolunteerItem(item) {
console.log('删除志愿项')
const batch = item.batch === '高职高专'? '高职高专' : '本科';
// 根据item的招生代码、专业代码和学校代码生成唯一的键值
const itemKey = `${item.enrollmentCode}_${item.majorCode}_${item.schoolCode}`;
// 根据batch的值确定要操作的志愿列表，高职高专对应volunteerJuniorCollegeList，本科对应volunteerUndergraduateList
const volunteerList = batch === '高职高专'? this.filledVolunteer.volunteerJuniorCollegeList : this.filledVolunteer.volunteerUndergraduateList;
if (this.filledVolunteer.volunteerMap.has(itemKey)) {
// 如果志愿映射表中已存在该itemKey，则删除该键值对
this.filledVolunteer.volunteerMap.delete(itemKey);
// 在对应的志愿列表中查找要删除的项的索引
const findIndex = volunteerList.findIndex((record) => `${record.enrollmentCode}_${record.majorCode}_${record.schoolCode}` === itemKey);
// 如果找到了要删除的项（索引不为 -1），则从志愿列表中移除该项
if (findIndex!== -1) {
volunteerList.splice(findIndex, 1);
}
// 重新给每个志愿项排个序号
volunteerList.forEach((volunteer, index) => {
volunteer.indexs = index + 1;
});
}
},
/*保存志愿表 */
saveFilledVolunteer(e){
let that = this
if(this.filledVolunteer.volunteerMap.size == 0){
uni.showToast({ title: '请先添加志愿', icon: "none" });
return;
}
console.log(this.filledVolunteer.volunteerMap)
let calculationMajorIdList = []
this.filledVolunteer.volunteerMap.forEach((value, key, map) => {
calculationMajorIdList.push(value.calculationMajorId? value.calculationMajorId : value.id)
});
uni.showModal({
title: '保存志愿表',
content: '确认保存志愿表吗',
confirmText: '确定',
cancelText: '取消',
success: function (res) {
if (res.confirm) {
request.post(ApiConstant.Volunteer.saveFilledVolunteer, {
volunteerId: that.filledVolunteer.volunteerId,
calculationMajorIdList: calculationMajorIdList
}).then(r => {
if (r.success) {
that.artVolunteerDetail('load')
setTimeout(function () {
that.getOtherMajorList()
}, 500)
setTimeout(function () {
uni.showToast({ title: '添加成功', icon: "none" });
}, 500)
} else {
setTimeout(function () {
uni.showToast({ title: r.message, icon: "none" });
}, 500)
}
}).catch(err => {
uni.showToast({ title: err.message, icon: "none" });
}).finally(() => {
});
}
}
});
},
/*获取用户分数*/ /*获取用户分数*/
artVolunteerDetail(e) { artVolunteerDetail(e) {
this.scoreInfo = uni.getStorageSync('scoreInfo') this.scoreInfo = uni.getStorageSync('scoreInfo')
@ -436,7 +517,7 @@ export default {
volunteerUndergraduateList2.push(record) volunteerUndergraduateList2.push(record)
} }
this.filledVolunteer.volunteerUndergraduateList = volunteerUndergraduateList2 this.filledVolunteer.volunteerUndergraduateList = volunteerUndergraduateList2
//==================================本科 end //==================================本科 end
//==================================高职高专 start //==================================高职高专 start
let volunteerJuniorCollegeList = dataResult.volunteerRecordJuniorCollegeList; let volunteerJuniorCollegeList = dataResult.volunteerRecordJuniorCollegeList;
@ -770,15 +851,25 @@ export default {
this.otherMajor.status = 'noMore' this.otherMajor.status = 'noMore'
}); });
}, },
onFillVolunteerOpen(e){ onFillVolunteerOpen(e) {
console.log(this.filledVolunteer); console.log(this.filledVolunteer);
this.filledVolunteer.visible = true this.filledVolunteer.visible = true
}, },
onFillVolunteerClose(){ onFillVolunteerClose() {
console.log('关闭已填报专业'); console.log('关闭已填报专业');
this.filledVolunteer.visible = false this.filledVolunteer.visible = false
}, },
onFillVolunteerOpen(e) {
console.log(this.filledVolunteer);
this.filledVolunteer.visible = true
},
// 切换学历层次
switchEduLevel(level) {
this.currentEduLevel = level
},
//打开选择其他专业 //打开选择其他专业
onOtherMajorOpen(e) { onOtherMajorOpen(e) {
this.otherMajor.nowMajor = { ...e } this.otherMajor.nowMajor = { ...e }
@ -893,15 +984,16 @@ export default {
: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" @click="ontabtap2"> :data-current="index" @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"
strokeColor="#c83428"> size="130rpx" 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 : '??' }}
@ -912,8 +1004,8 @@ export default {
</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"
strokeColor="#F8880E"> size="130rpx" 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 : '??' }}
@ -924,8 +1016,8 @@ export default {
</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"
strokeColor="#4975fd"> size="130rpx" 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 : '??' }}
@ -936,8 +1028,8 @@ export default {
</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"
strokeColor="#3e8e43"> size="130rpx" 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 : '??' }}
@ -993,7 +1085,6 @@ export default {
{{ 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" <view style="float: right;line-height: 50rpx;" class="font-weight-600"
@ -1004,7 +1095,7 @@ export default {
</text> </text>
</view> </view>
<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.remote.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 }}
@ -1033,12 +1124,13 @@ export default {
</view> </view>
<view class="flex" style="line-height: 50rpx"> <view class="flex" style="line-height: 50rpx">
<view class="flex-item-7"> <view class="flex-item-7">
<text>{{ app.globalData.StaticConstant.year }}录取方式1:</text> <text>{{ app.globalData.StaticConstant.remote.year }}录取方式1:</text>
<text v-if="item.rulesEnrollProbability" class="blue">{{ item.rulesEnrollProbability }}</text> <text v-if="item.rulesEnrollProbability" class="blue">{{ item.rulesEnrollProbability }}</text>
<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" <!-- item.volunteerIndexs -->
<view :class="filledVolunteer.volunteerMap.has(`${item.enrollmentCode}_${item.majorCode}_${item.schoolCode}`) ? 'volunteer-item-active' : ''" class="otherMajorBtn radius8"
@click="onOtherMajorOpen(item)"> @click="onOtherMajorOpen(item)">
<text>查看可选专业</text> <text>查看可选专业</text>
</view> </view>
@ -1049,9 +1141,9 @@ export default {
<uni-load-more :status="status" :content-text="contentText" /> <uni-load-more :status="status" :content-text="contentText" />
</view> </view>
</view> </view>
<!--已填志愿--> <!--已填志愿列表 Start-->
<px-popup-bottom :background="'#ffffff'" :color="'black'" :visible.sync="filledVolunteer.visible" title="" maxHeight="1200" <px-popup-bottom :background="'#ffffff'" :color="'black'" :visible.sync="filledVolunteer.visible" title=""
radius="40" @close="onFillVolunteerClose"> maxHeight="1200" radius="40" @close="onFillVolunteerClose">
<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">已填志愿信息</text> <text class="darkGray font-weight-550">已填志愿信息</text>
@ -1061,8 +1153,56 @@ export default {
style="position: relative;top: 5rpx" /> style="position: relative;top: 5rpx" />
</view> </view>
</view> </view>
<!-- 本科/专科切换标签 -->
<view class="edu-tabs">
<view class="edu-tab" :class="{ 'edu-tab-active': currentEduLevel === '本科' }" @click="switchEduLevel('本科')">
<text>本科</text>
</view>
<view class="edu-tab" :class="{ 'edu-tab-active': currentEduLevel === '专科' }" @click="switchEduLevel('专科')">
<text>专科</text>
</view>
</view>
<!-- 根据学历层次显示对应的志愿列表 -->
<scroll-view scroll-y="true" style="height: 800rpx;margin: 30rpx 0">
<view class="filled-volunteer-list">
<view v-for="(item, index) in currentEduLevel === '本科'? filledVolunteer.volunteerUndergraduateList : filledVolunteer.volunteerJuniorCollegeList" :key="index" class="volunteer-item">
<view class="flexWrap">
<view class="flex-item-15 select">
<view class="selectIndex">
<text style="line-height: 50rpx">{{ item.indexs }}</text>
</view>
</view>
<view class="flex-item-65" style="height: 60rpx;"
@click="goto('/pages/zyb/school/detail?schoolCode=' + item.schoolCode)">
<text>[{{ item.schoolCode }}]{{ item.schoolName }}</text>
</view>
<view class="flex-item-20">
<view class="float-right">
<image @click="deleteVolunteerItem(item)" src="/static/icons/delete.png"
class="icon50 margin-left-50" />
</view>
</view>
</view>
<view class="flexWrap marginTopBot20">
<view class="flex-item-15 select"></view>
<view class="flex-item-85">
<text class="darkGray">[{{ item.enrollmentCode }}]</text>
<text class="margin-left-10">{{ item.majorName }}</text>
</view>
</view>
</view>
<view v-if="filledVolunteer.volunteerUndergraduateList.length === 0" class="no-data">
<text>暂无志愿</text>
</view>
</view>
</scroll-view>
<view class="volunteer-item-active" @click="saveFilledVolunteer">
保存
</view>
</px-popup-bottom> </px-popup-bottom>
<!--其他专业--> <!--已填志愿列表 End-->
<!--其他专业 Start-->
<px-popup-bottom :background="'#ffffff'" :color="'black'" :visible.sync="otherMajor.visible" title="" maxHeight="1200" <px-popup-bottom :background="'#ffffff'" :color="'black'" :visible.sync="otherMajor.visible" title="" 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">
@ -1096,7 +1236,8 @@ 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" 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>
@ -1115,7 +1256,7 @@ export default {
</view> </view>
</view> </view>
<view class="flex-item-5" style="line-height: 40rpx"> <view class="flex-item-5" style="line-height: 40rpx">
<view class="flex" style="float: right" v-show="app.globalData.StaticConstant.showZeSuan"> <view class="flex" style="float: right" v-show="app.globalData.StaticConstant.remote.showZeSuan">
<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"
@ -1142,15 +1283,12 @@ export default {
</text> </text>
<text v-else class="blue">暂未发布</text> <text v-else class="blue">暂未发布</text>
</view> </view>
<view class="flex-item-3" v-if="otherMajor.nowMajor.enrollProbability"> <view class="flex-item-3">
<view class="radius10 font-weight-b" @click="saveVolunteer(otherMajor.nowMajor)" <!-- v-if="otherMajor.nowMajor.enrollProbability" -->
:class="otherMajor.nowMajor.volunteerIndexs ? 'volunteerIndexs' : 'saveVolunteer'"> <view :class="filledVolunteer.volunteerMap.has(`${otherMajor.nowMajor.enrollmentCode}_${otherMajor.nowMajor.majorCode}_${otherMajor.nowMajor.schoolCode}`) ? 'volunteer-item-active' : ''" class="otherMajorBtn radius8"
<image :src="otherMajor.nowMajor.volunteerIndexs ? ImagesConstant.duigou_orange : ImagesConstant.add_orange" @click="addVolunteerItem(otherMajor.nowMajor)">
class="icon32" /> <!-- <image :src="filledVolunteer.volunteerMap.has(`${item.enrollmentCode}_${item.majorCode}_${item.schoolCode}`) ? ImagesConstant.duigou_orange : ImagesConstant.add_orange" class="icon32" /> -->
<text>{{ <text>{{ filledVolunteer.volunteerMap.has(`${otherMajor.nowMajor.enrollmentCode}_${otherMajor.nowMajor.majorCode}_${otherMajor.nowMajor.schoolCode}`) ? '已加入志愿' : '加入志愿表' }}</text>
otherMajor.nowMajor.volunteerIndexs ? '志愿' + otherMajor.nowMajor.volunteerIndexs : '加入志愿表'
}}
</text>
</view> </view>
</view> </view>
</view> </view>
@ -1180,7 +1318,8 @@ export default {
<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>
@ -1196,10 +1335,11 @@ 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.remote.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>
@ -1217,12 +1357,12 @@ export default {
<text v-if="item.rulesEnrollProbability" class="blue">{{ item.rulesEnrollProbability }}</text> <text v-if="item.rulesEnrollProbability" class="blue">{{ item.rulesEnrollProbability }}</text>
<text v-else class="blue">暂未发布</text> <text v-else class="blue">暂未发布</text>
</view> </view>
<view class="flex-item-3" v-if="item.enrollProbability"> <view class="flex-item-3">
<view class="radius10 font-weight-b" @click="saveVolunteer(item)" <!-- v-if="item.enrollProbability" -->
:class="item.volunteerIndexs ? 'volunteerIndexs' : 'saveVolunteer'"> <view :class="filledVolunteer.volunteerMap.has(`${item.enrollmentCode}_${item.majorCode}_${item.schoolCode}`) ? 'volunteer-item-active' : ''" class="otherMajorBtn radius8"
<image :src="item.volunteerIndexs ? ImagesConstant.duigou_orange : ImagesConstant.add_orange" @click="addVolunteerItem(item)">
class="icon32" /> <!-- <image :src="filledVolunteer.volunteerMap.has(`${item.enrollmentCode}_${item.majorCode}_${item.schoolCode}`) ? ImagesConstant.duigou_orange : ImagesConstant.add_orange" class="icon32" /> -->
<text>{{ item.volunteerIndexs ? '志愿' + item.volunteerIndexs : '加入志愿表' }}</text> <text>{{ filledVolunteer.volunteerMap.has(`${item.enrollmentCode}_${item.majorCode}_${item.schoolCode}`) ? '已加入志愿' : '加入志愿表' }}</text>
</view> </view>
</view> </view>
</view> </view>
@ -1231,13 +1371,16 @@ export default {
</scroll-view> </scroll-view>
</view> </view>
</px-popup-bottom> </px-popup-bottom>
<!--其他专业 End-->
<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>
<uni-icons class="topc" style="top: 73%;" type="eye" size="40" @click="onFillVolunteerOpen"></uni-icons> <view class="top" :style="{'display': (topFlag === true ? 'block' : 'none') }">
<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>
<view style="position: fixed;padding: 15rpx 0;bottom: 0;background: white;border-top: 5rpx solid #F4F5F7; width: 100%;height: 80rpx;display: flex;justify-content: flex-end;">
<view class="volunteer-item-active" style="position: absolute;right: 30rpx;" @click="onFillVolunteerOpen">查看志愿表{{`(${filledVolunteer.volunteerMap.size})`}}</view>
</view>
</template> </template>
<style scoped lang="scss"> <style scoped lang="scss">
@ -1544,7 +1687,7 @@ export default {
/*推荐志愿列表 start*/ /*推荐志愿列表 start*/
.fillVolunteer { .fillVolunteer {
padding-bottom: 100rpx;
/*padding:0 30rpx 10rpx 30rpx;*/ /*padding:0 30rpx 10rpx 30rpx;*/
.volunteerItem { .volunteerItem {
background-color: white; background-color: white;
@ -1580,7 +1723,15 @@ export default {
} }
.volunteer-item-active { .volunteer-item-active {
background-color: #fef4f4; //background-color: #fef4f4;
color: #ffffff;
background: #f96543;
border: 1rpx solid #f96543;
padding: 10rpx 10rpx;
text-align: center;
height: 50rpx;
line-height: 50rpx;
border-radius: 10rpx;
} }
@ -1591,7 +1742,7 @@ export default {
padding: 10rpx 10rpx; padding: 10rpx 10rpx;
} }
.saveVolunteer { .addVolunteerItem {
color: #f96543; color: #f96543;
border: 1rpx solid #f96543; border: 1rpx solid #f96543;
padding: 10rpx 10rpx; padding: 10rpx 10rpx;
@ -1624,6 +1775,60 @@ export default {
/* 回到顶部 end*/ /* 回到顶部 end*/
/* 学历层次切换标签 */
.edu-tabs {
display: flex;
background: #f5f5f5;
border-radius: 50rpx;
padding: 10rpx;
margin: 20rpx 20rpx;
}
.edu-tab {
flex: 1;
text-align: center;
padding: 10rpx;
border-radius: 50rpx;
color: #666;
}
.edu-tab-active {
background: #fff;
color: #3d76fd;
box-shadow: 0 2rpx 10rpx rgba(0, 0, 0, 0.1);
}
.filled-volunteer-list {
padding: 0 20rpx;
}
.volunteer-item {
background-color: white;
margin-bottom: 10rpx;
padding: 10rpx 10rpx 0rpx 0rpx;
border-radius: 8rpx;
}
.select {
.selectIndex {
background-color: #feeee2;
color: #f96712;
width: 20rpx;
height: 50rpx;
margin: auto 0;
line-height: 50rpx;
padding: 0 20rpx;
text-align: center;
border-radius: 6rpx;
}
}
.no-data {
text-align: center;
padding: 40rpx;
color: #999;
}
scroll-view ::-webkit-scrollbar { scroll-view ::-webkit-scrollbar {
width: 0; width: 0;
height: 0; height: 0;

12
pages/zyb/home.vue
View File

@ -232,15 +232,11 @@ export default {
}, },
async getSystemConfig(){ async getSystemConfig(){
console.log(`wx.getSystemInfoSync()`, wx.getSystemInfoSync())
let miniConfig = await app.globalData.CommonTool.loadStaticConfig('miniConfig') let miniConfig = await app.globalData.CommonTool.loadStaticConfig('miniConfig')
console.log(miniConfig) app.globalData.StaticConstant.remote = miniConfig
app.globalData.StaticConstant.year = miniConfig.nowYear console.log('app.globalData.StaticConstant.remote ', app.globalData.StaticConstant.remote)
app.globalData.StaticConstant.showZeSuan = miniConfig.showZeSuan
app.globalData.StaticConstant.tiQianPiZhiYuanNum = miniConfig.tiQianPiZhiYuanNum
app.globalData.StaticConstant.benZhiYuanNum = miniConfig.zhuanZhiYuanNum
app.globalData.StaticConstant.zhuanZhiYuanNum = miniConfig.zhuanZhiYuanNum
app.globalData.StaticConstant.contact = miniConfig.contact
app.globalData.StaticConstant.memberDeadline = miniConfig.memberDeadline
}, },
} }
} }

4
pages/zyb/login.vue
View File

@ -406,9 +406,7 @@ export default {
<checkbox value="cb"/> <checkbox value="cb"/>
登录代表{{ systemName }} 登录代表{{ systemName }}
<text style="color: #4975fd" @click="gotoXieyi">{{systemName}}用户协议、</text> <text style="color: #4975fd" @click="gotoXieyi">{{systemName}}用户协议、</text>
<text style="color: #4975fd" @click="gotoMianze">免责声明、</text> <text style="color: #4975fd" @click="gotoMianze">免责声明</text>，并授权使用您的{{ systemName }}账号信息（如昵称、头像）以便您统一管理
，
并授权使用您的{{ systemName }}账号信息（如昵称、头像）以便您统一管理
</label> </label>
</checkbox-group> </checkbox-group>
</view> </view>

10
pages/zyb/other/updateLogs.vue
View File

@ -1,9 +1,15 @@
<script> <script>
import ImagesConstant from '@/common/ImagesConstant';
export default { export default {
components: {}, components: {
ImagesConstant(){
return ImagesConstant
}
},
data() { data() {
return { return {
colors:'#fa436a', colors:'#fa436a',
oneByOne: ImagesConstant.oneByOne,
//模拟后台返回的数据 //模拟后台返回的数据
stepData: [ stepData: [
{ {
@ -31,7 +37,7 @@ export default {
</script> </script>
<template> <template>
<image src="https://mp-7a4eecb1-2a04-4d36-b050-1c4a78cc31a4.cdn.bspapp.com/images/oneByOne.png" style="width: 100%;height: 500%"/> <image :src="oneByOne" style="width: 100%;height: 500%"/>
<!-- <cc-defineStep :colors="colors" :stepData="stepData"></cc-defineStep>--> <!-- <cc-defineStep :colors="colors" :stepData="stepData"></cc-defineStep>-->
</template> </template>

26
pages/zyb/other/useHelp.vue
View File

@ -7,7 +7,13 @@ export default {
computed: { computed: {
StaticConstant() { StaticConstant() {
return StaticConstant return StaticConstant
},
app(){
return getApp()
} }
},
onShow() {
console.log(getApp().globalData.StaticConstant.remote)
} }
} }
</script> </script>
@ -25,16 +31,16 @@ export default {
<view class="text-group"> <view class="text-group">
<text class="text-l uni-flex flex red bold">简要说明</text> <text class="text-l uni-flex flex red bold">简要说明</text>
<text class="text-l uni-flex flex"> <text class="text-l uni-flex flex">
1适用考生:艺术类考生(自主招生及普通类考生暂不适用) # 适用考生:艺术类考生(自主招生及普通类考生暂不适用)
</text> </text>
<text class="text-l uni-flex flex"> <text class="text-l uni-flex flex">
1 适用批次:提前批次、普通批次 # 适用批次:提前批次、普通批次
</text> </text>
<text class="text-l uni-flex flex"> <text class="text-l uni-flex flex">
1 系统数据来源于教育部、各省考试院级各院校招生办 # 系统数据来源于教育部、各省考试院级各院校招生办
</text> </text>
<text class="text-l uni-flex flex"> <text class="text-l uni-flex flex">
1 部分专业数据为空可能为当年不在查询地招生或者部分院校历年未公布，若录取数据与院校公布不一致请以各院校公布数据为准 # 部分专业数据为空可能为当年不在查询地招生或者部分院校历年未公布，若录取数据与院校公布不一致请以各院校公布数据为准
</text> </text>
</view> </view>
@ -135,7 +141,7 @@ export default {
<view class="text-group"> <view class="text-group">
<text class="text-l uni-flex flex bold">多次购买问题(含在线，卡密激活)</text> <text class="text-l uni-flex flex bold">多次购买问题(含在线，卡密激活)</text>
<text class="text-l uni-flex flex"> <text class="text-l uni-flex flex">
多次购买将会增加服务周期，2024年服务周期结束时间为8月31号，再次购买周期结束时间延长至2025年8月31号，此次类推。 多次购买将会增加服务周期，{{app.globalData.StaticConstant.remote.nowYear}}年服务周期结束时间为8月31号，再次购买周期结束时间延长至{{parseInt(app.globalData.StaticConstant.remote.nowYear)+1}}年8月31号，此次类推。
</text> </text>
</view> </view>
@ -156,22 +162,22 @@ export default {
<view class="text-group"> <view class="text-group">
<text class="text-l uni-flex flex bold">数据更新的时间和情况</text> <text class="text-l uni-flex flex bold">数据更新的时间和情况</text>
<text class="text-l uni-flex flex"> <text class="text-l uni-flex flex">
目前系统中有2023年各省招生计划及平行志愿批次的投档分数，2023年录取分数陆续公布中。 目前系统中有{{app.globalData.StaticConstant.remote.nowYear}}年各省招生计划及平行志愿批次的投档分数，{{app.globalData.StaticConstant.remote.nowYear}}年录取分数陆续公布中。
</text> </text>
</view> </view>
<view class="text-group"> <view class="text-group">
<text class="text-l uni-flex flex bold">数据风险说明</text> <text class="text-l uni-flex flex bold">数据风险说明</text>
<text class="text-l uni-flex flex"> <text class="text-l uni-flex flex">
1 系统数据来源于教育部门，由合作网站提供。 # 系统数据来源于教育部门，由合作网站提供。
</text> </text>
<text class="text-l uni-flex flex"> <text class="text-l uni-flex flex">
1 部分年份数据如果为空可能是当年不在查询地招生系统数据不包含高考加分，如果录取数据与院校公布数据不一致，请以各高校正式公布的数据为准。 # 部分年份数据如果为空可能是当年不在查询地招生系统数据不包含高考加分，如果录取数据与院校公布数据不一致，请以各高校正式公布的数据为准。
</text> </text>
<text class="text-l uni-flex flex"> <text class="text-l uni-flex flex">
1 由于高考填报志愿是一个动态变化的过程，不本系统查询的历年高校录取数据仅作为填报志愿参考，请综合各种信息进行报考，勿仅以此填报志愿。 # 由于高考填报志愿是一个动态变化的过程，不本系统查询的历年高校录取数据仅作为填报志愿参考，请综合各种信息进行报考，勿仅以此填报志愿。
</text> </text>
<text class="text-l uni-flex flex"> <text class="text-l uni-flex flex">
1 最终解释权归河南及第生涯信息科技有限公司所有。 # 最终解释权归河南及第生涯信息科技有限公司所有。
</text> </text>
</view> </view>
</view> </view>

12
pages/zyb/other/volunteerCardDesc.vue
View File

@ -12,23 +12,21 @@ export default {
data() { data() {
return { return {
playerType: '艺术类', playerType: '艺术类',
list:[]
} }
}, },
onShow() {
},
onLoad() { onLoad() {
this.playerType = commonTool.getPlayerType() this.playerType = commonTool.getPlayerType()
this.list = app.globalData.StaticConstant.remote.volunteerCardDescList
} }
} }
</script> </script>
<template> <template>
<view class="body"> <view class="body">
<text class="text-l uni-flex flex">（一）、适用范围:{{playerType}}文理科考生(自主招生暂不适用)。</text> <text class="text-l uni-flex flex" v-for="(item,index) in list" :key="index">{{ item }}</text>
<text class="text-l uni-flex flex">（二）、使用期限:自购买起，截止到{{app.globalData.StaticConstant.memberDeadline}}有效。</text>
<text class="text-l uni-flex flex">（三）、分数修改次数:每届服务期内高考分数放榜前可修改10次，放榜后只可修改1次。</text>
<text class="text-l uni-flex flex">（四）、系统数据来源于及第生涯部门，由合作网站提供。</text>
<text class="text-l uni-flex flex">（五）、部分年份数据如果为空可能是当年不在查询地招生。系统数据不包含高考加分，如果录取数据与院校公布数据不一致，请以高校正式公布的数据为准。</text>
<text class="text-l uni-flex flex">（六）、由于高考填报志愿是一个动态变化的过程，本系统查询的历年高校录取数据仅作为填报志愿参考，请综合各种信息进行报考，勿仅以此填报志愿。</text>
<text class="text-l uni-flex flex">（七）、本卡为电子卡，不记名，不挂失，一经出售，概不退换! 最终解释权归本平台所有。</text>
</view> </view>
</template> </template>

2
pages/zyb/other/yifenyiduan.vue
View File

@ -89,7 +89,7 @@ export default {
</view> </view>
<view class="body"> <view class="body">
<view class="image1"> <view class="image1">
<image src="http://files.yitisheng.vip/images/zsjz2.png" style="height: 200rpx;width:100%"/> <image src="https://files.yitisheng.vip/images/zsjz2.png" style="height: 200rpx;width:100%"/>
</view> </view>
<!--简章列表--> <!--简章列表-->
<view class="list"> <view class="list">

2
pages/zyb/qrcodeLogin.vue
View File

@ -195,7 +195,7 @@ export default {
<checkbox value="cb"/> <checkbox value="cb"/>
登录代表{{ StaticConstant.systemName }} 登录代表{{ StaticConstant.systemName }}
<text style="color: #4975fd" @click="gotoXieyi">{{commonTool.getSystemName()}}用户协议、</text> <text style="color: #4975fd" @click="gotoXieyi">{{commonTool.getSystemName()}}用户协议、</text>
<text style="color: #4975fd" @click="gotoMianze">免责声明、</text> <text style="color: #4975fd" @click="gotoMianze">免责声明</text>
， ，
并授权使用您的{{ StaticConstant.systemName }}账号信息（如昵称、头像）以便您统一管理 并授权使用您的{{ StaticConstant.systemName }}账号信息（如昵称、头像）以便您统一管理
</label> </label>

14
pages/zyb/user/index.vue
View File

@ -165,7 +165,7 @@
// 需要预览的图片链接列表 // 需要预览的图片链接列表
urls: [], urls: [],
// 为当前显示图片的链接/索引值 // 为当前显示图片的链接/索引值
current: app.globalData.StaticConstant.contact.images, current: app.globalData.StaticConstant.remote.contact.images,
// 图片指示器样式 // 图片指示器样式
indicator: 'default', indicator: 'default',
// 是否可循环预览 // 是否可循环预览
@ -197,11 +197,11 @@
<view class="popup-content radius15" style="padding: 30rpx 30rpx"> <view class="popup-content radius15" style="padding: 30rpx 30rpx">
<view class="font-size-mini4 font-weight-b" style="text-align: center">添加老师微信</view> <view class="font-size-mini4 font-weight-b" style="text-align: center">添加老师微信</view>
<image @click="previewImage" :show-menu-by-longpress="true" <image @click="previewImage" :show-menu-by-longpress="true"
:src="app.globalData.StaticConstant.contact.images" style="width: 600rpx;height: 600rpx" /> :src="app.globalData.StaticConstant.remote.contact.images" style="width: 600rpx;height: 600rpx" />
<view class="flexWrap marginTopBot20 margin-top-20"><text <view class="flexWrap marginTopBot20 margin-top-20"><text
class="text">联系人：{{app.globalData.StaticConstant.contact.personName}}</text></view> class="text">联系人：{{app.globalData.StaticConstant.remote.contact.personName}}</text></view>
<view class="flexWrap marginTopBot20"><text <view class="flexWrap marginTopBot20"><text
class="text">电话：{{app.globalData.StaticConstant.contact.personNumber}}(微信同号)</text></view> class="text">电话：{{app.globalData.StaticConstant.remote.contact.personNumber}}(微信同号)</text></view>
<view class="font-size-mini4 font-weight-b margin-top-20 margin-top-20" @click="cooperateClose" <view class="font-size-mini4 font-weight-b margin-top-20 margin-top-20" @click="cooperateClose"
style="text-align: center">知道了</view> style="text-align: center">知道了</view>
</view> </view>
@ -211,9 +211,9 @@
<view class="popup-content radius15" style="padding: 30rpx 50rpx"> <view class="popup-content radius15" style="padding: 30rpx 50rpx">
<view class="font-size-mini4 font-weight-b" style="text-align: center">商务合作</view> <view class="font-size-mini4 font-weight-b" style="text-align: center">商务合作</view>
<view class="flexWrap marginTopBot20 margin-top-20"><text <view class="flexWrap marginTopBot20 margin-top-20"><text
class="text">联系人：{{app.globalData.StaticConstant.contact.personName}}</text></view> class="text">联系人：{{app.globalData.StaticConstant.remote.contact.personName}}</text></view>
<view class="flexWrap marginTopBot20"><text <view class="flexWrap marginTopBot20"><text
class="text">电话：{{app.globalData.StaticConstant.contact.personNumber}}(微信同号)</text></view> class="text">电话：{{app.globalData.StaticConstant.remote.contact.personNumber}}(微信同号)</text></view>
<view class="font-size-mini4 font-weight-b margin-top-20 margin-top-20" @click="cooperateClose" <view class="font-size-mini4 font-weight-b margin-top-20 margin-top-20" @click="cooperateClose"
style="text-align: center">知道了</view> style="text-align: center">知道了</view>
</view> </view>
@ -232,7 +232,7 @@
</view> </view>
<view class="flex"> <view class="flex">
<text style="line-height: 50rpx">{{ scoreInfo.province }}</text> <text style="line-height: 50rpx">{{ scoreInfo.province }}</text>
<text style="line-height: 50rpx;font-size: 24rpx">/2024</text> <text style="line-height: 50rpx;font-size: 24rpx">/{{ new Date().getFullYear() }}</text>
</view> </view>
</view> </view>
<!--按钮--> <!--按钮-->

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

@ -93,7 +93,7 @@ export default {
<view class="text-body"> <view class="text-body">
<text class="text-item">-适用范围:{{playerType}}文理科考生(自主招生暂不适用)。</text> <text class="text-item">-适用范围:{{playerType}}文理科考生(自主招生暂不适用)。</text>
<text class="text-item"> <text class="text-item">
-使用期限:自购买起，截止到{{app.globalData.StaticConstant.memberDeadline}}有效。分数修改次数:每届服务期内高考分数放榜前每日可修改10次，放榜后仅可修改1次。 -使用期限:自购买起，截止到{{app.globalData.StaticConstant.remote.memberDeadline}}有效。分数修改次数:每届服务期内高考分数放榜前每日可修改10次，放榜后仅可修改1次。
</text> </text>
<text class="text-item">-系统数据来源于{{ StaticConstant.bm }}部门，由合作网站提供。</text> <text class="text-item">-系统数据来源于{{ StaticConstant.bm }}部门，由合作网站提供。</text>
<text class="text-item"> <text class="text-item">

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

@ -218,7 +218,7 @@ export default {
</view> </view>
<view class="flex font-size-mini2 brown"> <view class="flex font-size-mini2 brown">
<text v-if="item.skuCode==='9000'">咨询详谈</text> <text v-if="item.skuCode==='9000'">咨询详谈</text>
<text v-else>'有效期截至：{{app.globalData.StaticConstant.memberDeadline}}</text> <text v-else>'有效期截至：{{app.globalData.StaticConstant.remote.memberDeadline}}</text>
</view> </view>
</view> </view>
<view class="flex-item-3 brown marginRight" style="padding: 30rpx 0;text-align: right"> <view class="flex-item-3 brown marginRight" style="padding: 30rpx 0;text-align: right">

BIN
static/icons/oneByOne.2bad329.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 344 KiB

14
wxcomponents/vant/common/utils.js
View File

@ -16,13 +16,13 @@ export function nextTick(fn) {
fn(); fn();
}, 1000 / 30); }, 1000 / 30);
} }
let systemInfo = null; // let systemInfo = null;
export function getSystemInfoSync() { // export function getSystemInfoSync() {
if (systemInfo == null) { // if (systemInfo == null) {
systemInfo = wx.getSystemInfoSync(); // systemInfo = wx.getSystemInfoSync();
} // }
return systemInfo; // return systemInfo;
} // }
export function addUnit(value) { export function addUnit(value) {
if (!isDef(value)) { if (!isDef(value)) {
return undefined; return undefined;