From 022b8bc83589ef0f57d7df5e4933f5647ac977be Mon Sep 17 00:00:00 2001
From: zhouwentao <1577701412@qq.com>
Date: Mon, 20 May 2024 16:16:56 +0800
Subject: [PATCH] updates
---
common/js/commonTool.js | 39 +
common/js/jumpTool.js | 24 +
components/my-top-button.vue | 34 -
pages/zyb/article/detail.vue | 134 ++
pages/zyb/article/list.vue | 255 +++
pages/zyb/article/list2.vue | 253 +++
pages/zyb/fillVolunteer/aiAuto.vue | 344 ++--
pages/zyb/fillVolunteer/detail.vue | 717 +++++---
pages/zyb/fillVolunteer/index.vue | 769 +++++---
pages/zyb/fillVolunteer/mockList.vue | 1557 +++++++++++++++++
pages/zyb/fillVolunteer/my-detail.vue | 938 ++++++++++
pages/zyb/fillVolunteer/my.vue | 50 +-
pages/zyb/fillVolunteer/old-detail.vue | 985 +++++++++++
pages/zyb/fuwenben/index.vue | 21 +
pages/zyb/historyScoreControlLine/data.js | 82 -
.../historyScoreControlLine/index-copu.vue | 162 ++
pages/zyb/historyScoreControlLine/index.vue | 144 +-
pages/zyb/home.vue | 769 ++++++--
pages/zyb/login.vue | 416 ++++-
pages/zyb/major/detail.vue | 279 +--
pages/zyb/major/list.vue | 13 +
pages/zyb/npee/index.vue | 106 +-
pages/zyb/npee/schoolNpee.vue | 241 +++
pages/zyb/npee/schoolNpeeDetail.vue | 144 ++
pages/zyb/order/detail.vue | 146 ++
pages/zyb/order/list.vue | 175 ++
pages/zyb/other/admissionsInformation.uvue | 15 -
pages/zyb/other/admissionsInformation.vue | 40 -
pages/zyb/other/calculateInvestment.vue | 176 +-
pages/zyb/other/checkRanking.vue | 6 +-
pages/zyb/other/commonProblem.vue | 12 +-
pages/zyb/other/feedback.vue | 230 +++
pages/zyb/other/updateLogs.vue | 5 +-
pages/zyb/other/useHelp.vue | 2 +-
pages/zyb/other/volunteerCardDesc.vue | 8 +-
pages/zyb/other/yifenyiduan.vue | 3 -
pages/zyb/qrcodeLogin.vue | 290 +++
pages/zyb/school/detail.vue | 429 +++--
pages/zyb/school/list.vue | 135 +-
pages/zyb/score/edit.vue | 493 ++++--
pages/zyb/settings.vue | 4 +-
pages/zyb/testCultural/detail.vue | 118 +-
pages/zyb/testCultural/index.vue | 133 +-
pages/zyb/user/bindPhone.vue | 186 ++
pages/zyb/user/detail.vue | 10 +-
pages/zyb/user/index.vue | 304 +++-
pages/zyb/vip/cardamom.vue | 29 +-
pages/zyb/vip/checkoutCounter.vue | 139 +-
pages/zyb/vip/index-bak.vue | 425 +++++
pages/zyb/vip/index.vue | 337 +++-
static/home_background.png | Bin 0 -> 134133 bytes
static/icons/add_orange.png | Bin 0 -> 1780 bytes
static/icons/avatar.png | Bin 0 -> 3209 bytes
static/icons/boshi.png | Bin 0 -> 3050 bytes
static/icons/clonse.png | Bin 0 -> 1030 bytes
static/icons/delete.png | Bin 0 -> 908 bytes
static/icons/duigou_orange.png | Bin 0 -> 1143 bytes
static/icons/edit.png | Bin 0 -> 1661 bytes
static/icons/gif/detail.gif | Bin 0 -> 2026 bytes
static/icons/gif/icons8-calendar.gif | Bin 0 -> 5498 bytes
static/icons/gif/icons8-cards.gif | Bin 0 -> 8519 bytes
static/icons/gif/icons8-cooperate.gif | Bin 0 -> 6107 bytes
static/icons/gif/icons8-customer-service.gif | Bin 0 -> 5633 bytes
static/icons/gif/icons8-doubt.gif | Bin 0 -> 5837 bytes
static/icons/gif/icons8-loading-heart.gif | Bin 0 -> 3409 bytes
static/icons/gif/icons8-man.gif | Bin 0 -> 4745 bytes
static/icons/gif/icons8-order.gif | Bin 0 -> 2964 bytes
static/icons/gif/icons8-wotuishi-settings.gif | Bin 0 -> 4960 bytes
.../glyph/icons-arrow-down-orange-90.png | Bin 0 -> 481 bytes
.../icons/glyph/icons-arrow-up-orange-90.png | Bin 0 -> 471 bytes
static/icons/icons8-home-active.png | Bin 0 -> 1140 bytes
static/icons/icons8-home.png | Bin 0 -> 861 bytes
static/icons/icons8-menu.png | Bin 0 -> 131 bytes
static/icons/icons8-notepad-active.png | Bin 0 -> 976 bytes
static/icons/icons8-notepad.png | Bin 0 -> 752 bytes
static/icons/icons8-select-96.png | Bin 0 -> 2041 bytes
static/icons/icons8-woman-active.png | Bin 0 -> 1660 bytes
static/icons/icons8-woman.png | Bin 0 -> 1180 bytes
static/icons/move.png | Bin 0 -> 641 bytes
static/icons/oneByOne.2bad329.png | Bin 0 -> 351704 bytes
static/icons/options/cewenhua.png | Bin 0 -> 11469 bytes
static/icons/options/chaweici.png | Bin 0 -> 1185 bytes
static/icons/options/chayuanxiao.png | Bin 0 -> 944 bytes
static/icons/options/chazhuanye.png | Bin 0 -> 9112 bytes
static/icons/options/dataLevelUp.png | Bin 0 -> 730 bytes
static/icons/options/gupiao.png | Bin 0 -> 707 bytes
static/icons/options/message.png | Bin 0 -> 681 bytes
static/icons/options/shengkongxian.png | Bin 0 -> 1132 bytes
static/icons/options/suantoudang.png | Bin 0 -> 1183 bytes
static/icons/options/tongji.png | Bin 0 -> 6720 bytes
static/icons/options/zhaoshengzhangcheng.png | Bin 0 -> 1200 bytes
static/icons/options/zhuanhuan.png | Bin 0 -> 10244 bytes
static/icons/search.png | Bin 0 -> 2107 bytes
static/icons/select_blue.png | Bin 0 -> 344 bytes
static/icons/shoucang-active.png | Bin 0 -> 1490 bytes
static/icons/shoucang.png | Bin 0 -> 1434 bytes
static/icons/shu.png | Bin 0 -> 2674 bytes
static/icons/success.png | Bin 0 -> 2299 bytes
static/icons/wechat.png | Bin 0 -> 2341 bytes
uni_modules/mp-html/README.md | 193 ++
uni_modules/mp-html/changelog.md | 138 ++
.../mp-html/components/mp-html/mp-html.vue | 498 ++++++
.../mp-html/components/mp-html/node/node.vue | 579 ++++++
.../mp-html/components/mp-html/parser.js | 1372 +++++++++++++++
uni_modules/mp-html/package.json | 76 +
.../static/app-plus/mp-html/js/handler.js | 1 +
.../app-plus/mp-html/js/uni.webview.min.js | 1 +
.../static/app-plus/mp-html/local.html | 1 +
108 files changed, 13265 insertions(+), 1920 deletions(-)
create mode 100644 common/js/commonTool.js
create mode 100644 common/js/jumpTool.js
delete mode 100644 components/my-top-button.vue
create mode 100644 pages/zyb/article/detail.vue
create mode 100644 pages/zyb/article/list.vue
create mode 100644 pages/zyb/article/list2.vue
create mode 100644 pages/zyb/fillVolunteer/mockList.vue
create mode 100644 pages/zyb/fillVolunteer/my-detail.vue
create mode 100644 pages/zyb/fillVolunteer/old-detail.vue
create mode 100644 pages/zyb/fuwenben/index.vue
delete mode 100644 pages/zyb/historyScoreControlLine/data.js
create mode 100644 pages/zyb/historyScoreControlLine/index-copu.vue
create mode 100644 pages/zyb/npee/schoolNpee.vue
create mode 100644 pages/zyb/npee/schoolNpeeDetail.vue
create mode 100644 pages/zyb/order/detail.vue
create mode 100644 pages/zyb/order/list.vue
delete mode 100644 pages/zyb/other/admissionsInformation.uvue
create mode 100644 pages/zyb/other/feedback.vue
create mode 100644 pages/zyb/qrcodeLogin.vue
create mode 100644 pages/zyb/user/bindPhone.vue
create mode 100644 pages/zyb/vip/index-bak.vue
create mode 100644 static/home_background.png
create mode 100644 static/icons/add_orange.png
create mode 100644 static/icons/avatar.png
create mode 100644 static/icons/boshi.png
create mode 100644 static/icons/clonse.png
create mode 100644 static/icons/delete.png
create mode 100644 static/icons/duigou_orange.png
create mode 100644 static/icons/edit.png
create mode 100644 static/icons/gif/detail.gif
create mode 100644 static/icons/gif/icons8-calendar.gif
create mode 100644 static/icons/gif/icons8-cards.gif
create mode 100644 static/icons/gif/icons8-cooperate.gif
create mode 100644 static/icons/gif/icons8-customer-service.gif
create mode 100644 static/icons/gif/icons8-doubt.gif
create mode 100644 static/icons/gif/icons8-loading-heart.gif
create mode 100644 static/icons/gif/icons8-man.gif
create mode 100644 static/icons/gif/icons8-order.gif
create mode 100644 static/icons/gif/icons8-wotuishi-settings.gif
create mode 100644 static/icons/glyph/icons-arrow-down-orange-90.png
create mode 100644 static/icons/glyph/icons-arrow-up-orange-90.png
create mode 100644 static/icons/icons8-home-active.png
create mode 100644 static/icons/icons8-home.png
create mode 100644 static/icons/icons8-menu.png
create mode 100644 static/icons/icons8-notepad-active.png
create mode 100644 static/icons/icons8-notepad.png
create mode 100644 static/icons/icons8-select-96.png
create mode 100644 static/icons/icons8-woman-active.png
create mode 100644 static/icons/icons8-woman.png
create mode 100644 static/icons/move.png
create mode 100644 static/icons/oneByOne.2bad329.png
create mode 100644 static/icons/options/cewenhua.png
create mode 100644 static/icons/options/chaweici.png
create mode 100644 static/icons/options/chayuanxiao.png
create mode 100644 static/icons/options/chazhuanye.png
create mode 100644 static/icons/options/dataLevelUp.png
create mode 100644 static/icons/options/gupiao.png
create mode 100644 static/icons/options/message.png
create mode 100644 static/icons/options/shengkongxian.png
create mode 100644 static/icons/options/suantoudang.png
create mode 100644 static/icons/options/tongji.png
create mode 100644 static/icons/options/zhaoshengzhangcheng.png
create mode 100644 static/icons/options/zhuanhuan.png
create mode 100644 static/icons/search.png
create mode 100644 static/icons/select_blue.png
create mode 100644 static/icons/shoucang-active.png
create mode 100644 static/icons/shoucang.png
create mode 100644 static/icons/shu.png
create mode 100644 static/icons/success.png
create mode 100644 static/icons/wechat.png
create mode 100644 uni_modules/mp-html/README.md
create mode 100644 uni_modules/mp-html/changelog.md
create mode 100644 uni_modules/mp-html/components/mp-html/mp-html.vue
create mode 100644 uni_modules/mp-html/components/mp-html/node/node.vue
create mode 100644 uni_modules/mp-html/components/mp-html/parser.js
create mode 100644 uni_modules/mp-html/package.json
create mode 100644 uni_modules/mp-html/static/app-plus/mp-html/js/handler.js
create mode 100644 uni_modules/mp-html/static/app-plus/mp-html/js/uni.webview.min.js
create mode 100644 uni_modules/mp-html/static/app-plus/mp-html/local.html
diff --git a/common/js/commonTool.js b/common/js/commonTool.js
new file mode 100644
index 0000000..517ddda
--- /dev/null
+++ b/common/js/commonTool.js
@@ -0,0 +1,39 @@
+import Request from '@/common/request'
+import ApiConstant from '../ApiConstant'
+let request = new Request()
+export default {
+ //调试vip信息
+ checkVipInfo(e){
+ if (e && e.skuCode) {
+ e.vipFlag = true
+ uni.setStorageSync('vipInfo',e)
+ }else{
+ uni.setStorageSync('vipInfo',{vipFlag:false})
+ }
+ },
+ //刷新vip信息
+ reloadVipInfo() {
+ request.get(ApiConstant.VIP.vipInfo,{},{showLoad:false}).then(r => {
+ console.log(r)
+ if (r.success) {
+ this.checkVipInfo(r.result)
+ }
+ }).catch(err => {
+ }).finally(() => {
+ });
+ },
+ //格式化处理
+ dateFormatYYYYMMDD(time) {
+ let date = new Date(time.replace(/-/g,'/'));
+ let year = date.getFullYear();
+ // 在日期格式中，月份是从0开始的，因此要加0，使用三元表达式在小于10的前面加0，以达到格式统一 如 09:11:05
+ let month = date.getMonth() + 1 < 10 ? "0" + (date.getMonth() + 1) : date.getMonth() + 1;
+ let day = date.getDate() < 10 ? "0" + date.getDate() : date.getDate();
+ let hours = date.getHours() < 10 ? "0" + date.getHours() : date.getHours();
+ let minutes = date.getMinutes() < 10 ? "0" + date.getMinutes() : date.getMinutes();
+ let seconds = date.getSeconds() < 10 ? "0" + date.getSeconds() : date.getSeconds();
+ // 拼接
+ // return year + "-" + month + "-" + day + " " + hours + ":" + minutes + ":" + seconds;
+ return year + "-" + month + "-" + day;
+ },
+}
diff --git a/common/js/jumpTool.js b/common/js/jumpTool.js
new file mode 100644
index 0000000..3cc0917
--- /dev/null
+++ b/common/js/jumpTool.js
@@ -0,0 +1,24 @@
+export default{
+ /*打开某个页面*/
+ goto(e) {
+ uni.navigateTo({
+ url: e
+ })
+ },
+ goLogin(){
+ this.goto('/pages/zyb/login')
+ },
+ goArticleDetail(e){
+ this.goto('/pages/zyb/article/detail?articleId='+e.id)
+ },
+ /*打开成绩修改界面*/
+ openScoreEdit() {
+ this.goto('/pages/zyb/score/edit')
+ },
+ openVip() {
+ this.goto('/pages/zyb/vip/index')
+ },
+ openFeedback(){
+ this.goto('/pages/zyb/other/feedback')
+ }
+}
diff --git a/components/my-top-button.vue b/components/my-top-button.vue
deleted file mode 100644
index 452578b..0000000
--- a/components/my-top-button.vue
+++ /dev/null
@@ -1,34 +0,0 @@
-
-
-
-
-
-
-
-
-
-
diff --git a/pages/zyb/article/detail.vue b/pages/zyb/article/detail.vue
new file mode 100644
index 0000000..f4c1a91
--- /dev/null
+++ b/pages/zyb/article/detail.vue
@@ -0,0 +1,134 @@
+
+
+
+
+
+
+
+ {{ articleInfo.title }}
+
+
+
+
+
+
+ {{ articleInfo.releaseTime }}
+
+
+
+
+
+
+
+
+
+
+ 返回首页
+
+
+
+
+
+
diff --git a/pages/zyb/article/list.vue b/pages/zyb/article/list.vue
new file mode 100644
index 0000000..1e194ad
--- /dev/null
+++ b/pages/zyb/article/list.vue
@@ -0,0 +1,255 @@
+
+
+
+
+
+
+
+
+
+
+
+ 搜索
+
+
+
+
+
+
+
+
+ {{ value.title }}
+
+ {{ value.schoolName }}
+ {{ value.releaseTime }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pages/zyb/article/list2.vue b/pages/zyb/article/list2.vue
new file mode 100644
index 0000000..96c2a30
--- /dev/null
+++ b/pages/zyb/article/list2.vue
@@ -0,0 +1,253 @@
+
+
+
+
+
+
+
+
+
+
+
+ 搜索
+
+
+
+
+
+
+
+
+ {{ value.title }}
+
+ {{ value.schoolName }}
+ {{ value.releaseTime }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pages/zyb/fillVolunteer/aiAuto.vue b/pages/zyb/fillVolunteer/aiAuto.vue
index 6a87524..2592cf8 100644
--- a/pages/zyb/fillVolunteer/aiAuto.vue
+++ b/pages/zyb/fillVolunteer/aiAuto.vue
@@ -19,7 +19,8 @@ export default {
},
data() {
return {
- avatar: 'http://files.yitisheng.vip/yitisheng.png',
+ vipInfo: {},
+ avatar: ImagesConstant.systemIcon,
code: '',
max: 9999,
min: 1,
@@ -32,20 +33,7 @@ export default {
majorBatch: {},
///专业列表
majorCodeArray: [],
- majorArray: [
- {majorCode: '130201', majorName: '音乐表演'},
- {majorCode: '130202', majorName: '音乐学'},
- {majorCode: '130203', majorName: '作曲与作曲技术理论'},
- {majorCode: '130204', majorName: '舞蹈表演'},
- {majorCode: '130205', majorName: '舞蹈学'},
- {majorCode: '130206', majorName: '舞蹈编导'},
- {majorCode: '130207', majorName: '舞蹈教育'},
- {majorCode: '130208', majorName: '航空服务艺术与管理'},
- {majorCode: '130209', majorName: '流行音乐'},
- {majorCode: '130210', majorName: '音乐治疗'},
- {majorCode: '130211', majorName: '流行舞蹈'},
- {majorCode: '130212', majorName: '音乐教育'},
- ],//专业列表
+ majorArray: [],//专业列表
majorVisible: false,
///偏好类型
schoolNatureSelectArray: [],
@@ -55,35 +43,7 @@ export default {
provinceSelectArray: [],
provinceArray: StaticConstant.provinceAllList,
provinceVisible: false,
- scoreInfo: {
- batch: "本科A段",
- chineseScore: 0,
- cognitioPolyclinic: "理科",
- createBy: "1757686194965893121",
- createTime: "2024-02-29 11:41:11",
- culturalScore: 405,
- educationalLevel: "2",
- englishScore: 0,
- fzby: 0,
- id: "1763046730696069122",
- isVip: 0,
- professionalCategory: "音乐类",
- professionalCategoryChildren: "音乐表演器乐,音乐教育",
- professionalCategoryChildrenList: ['音乐表演器乐', '音乐教育'],
- professionalScore: 200,
- province: "河南",
- ranking: 0,
- state: "1",
- subjects: null,
- type: "2",
- updateBy: null,
- updateTime: null,
- xjysby: 0,
- xjysdy: 0,
- yybyqy: 240,
- yybysy: 11,
- yyjy: 240
- },
+ scoreInfo: {},
userInfo: {},
listFlag: false,
recommendMajor: {},
@@ -95,7 +55,7 @@ export default {
{label: '我喜欢的院校类型', value: 1},
{label: '我喜欢的地域', value: 2}
],
- tabs: ['提前批', '本科A段', '本科B段', '高职高专']
+ tabs: ['本科批', '高职高专']
}
},
methods: {
@@ -167,7 +127,7 @@ export default {
save() {
console.log(this.recommendMajor)
let that = this
- if (!this.userInfo.vipFlag) {
+ if (!this.vipInfo || !stringIsNotEmpty(this.vipInfo.vipLevel) || this.vipInfo.vipLevel < 2) {
uni.showModal({
title: 'VIP专享',
// 提示文字
@@ -207,7 +167,7 @@ export default {
}
let batch = this.batchArray[this.batchIndex].value
this.currentTab = batch
- this.scrollLeft =(batch === '本科B段' || batch === '高职高专')?600:0;
+ this.scrollLeft = (batch === '本科B段' || batch === '高职高专') ? 600 : 0;
//获取填报信息
request.get(ApiConstant.Major.aiAuto, {
batch: batch,
@@ -305,28 +265,31 @@ export default {
//遍历专业志愿，组合成保存对象
for (let j = 0; j < recommendMajorElement.length; j++) {
let r = recommendMajorElement[j]
- let vr = {majorCode: r.majorCode, schoolCode: r.schoolCode, enrollmentCode: r.enrollmentCode,batch:batch,
- enrollProbability:r.enrollProbability,studentConvertedScore:r.studentConvertedScore}
+ let vr = {
+ majorCode: r.majorCode, schoolCode: r.schoolCode, enrollmentCode: r.enrollmentCode, batch: batch,
+ enrollProbability: r.enrollProbability, studentConvertedScore: r.studentConvertedScore
+ }
volunteerRecordList.push(vr)
}
}
let saveVolunteer = {
- scoreId:this.scoreInfo.id,
- category:this.scoreInfo.cognitioPolyclinic,
- volunteerName:this.volunteerName,
- volunteerRecordList:volunteerRecordList
+ scoreId: this.scoreInfo.id,
+ category: this.scoreInfo.cognitioPolyclinic,
+ volunteerName: this.volunteerName,
+ volunteerRecordList: volunteerRecordList
}
request.post(ApiConstant.Volunteer.saveAs, saveVolunteer).then(r => {
console.log(r)
if (r.success) {
+ request.getUserScore()
setTimeout(function () {
uni.showToast({title: '保存成功', icon: "none"});
//回到首页
uni.switchTab({
- url: '/pages/zyb/fillVolunteer/my'
+ url: '/pages/zyb/fillVolunteer/detail'
});
}, 500)
- }else{
+ } else {
setTimeout(function () {
uni.showToast({title: r.message, icon: "none"});
}, 500)
@@ -334,30 +297,30 @@ export default {
}).catch(err => {
}).finally(() => {
});
- }
+ },
},
onShow() {
},
onLoad() {
this.userInfo = uni.getStorageSync('userInfo')
let scoreInfo = uni.getStorageSync('scoreInfo')
+ this.vipInfo = uni.getStorageSync('vipInfo')
this.scoreInfo = scoreInfo
console.log(scoreInfo)
//判断专业
let batchArray = []
- if (scoreInfo.professionalCategory === '体育') {
+ if (scoreInfo.professionalCategory === '体育类') {
+ console.log('qvq')
if (scoreInfo.batch === '本科') {
batchArray.push({label: '体育类本科批', value: '本科'})
}
batchArray.push({label: '体育类专科批', value: '高职高专'})
} else {
- if (scoreInfo.batch === '本科A段') {
- batchArray.push({label: '艺术类本科提前批', value: '提前批'}, {
- label: '艺术本科A段',
- value: '本科A段'
- }, {label: '艺术本科B段', value: '本科B段'})
- } else if (scoreInfo.batch === '本科B段') {
- batchArray.push({label: '艺术本科B段', value: '本科B段'})
+ if (scoreInfo.batch === '本科A段' || scoreInfo.batch === '本科B段') {
+ batchArray.push({
+ label: '艺术类本科批',
+ value: '本科'
+ })
}
batchArray.push({label: '艺术类专科批', value: '高职高专'})
}
@@ -374,12 +337,16 @@ export default {
-
-
-
-
+
+
+ AI
+ 一键填报
+
+
武汉大学
@@ -397,64 +364,64 @@ export default {
四川大学
-
-
-
- {{ scoreInfo.professionalCategory }}
- {{ scoreInfo.culturalScore }}
- 文化分
-
- {{ scoreInfo.professionalScore }}
-
-
- {{
- stringIsNotEmpty(scoreInfo.professionalCategory) && scoreInfo.professionalCategory === '音乐类' ? '主项分' : '专业分'
- }}
-
-
-
-
- 音乐表演声乐
- {{ scoreInfo.yybysy }}
- 分
-
-
- 音乐表演器乐
- {{ scoreInfo.yybyqy }}
- 分
-
-
- 音乐教育
- {{ scoreInfo.yyjy }}
- 分
-
-
- 戏剧影视导演
- {{ scoreInfo.xjysdy }}
- 分
-
-
- 戏剧影视表演
- {{ scoreInfo.xjysby }}
- 分
-
-
- 服装表演
- {{ scoreInfo.fzby }}
- 分
-
-
-
+
@@ -479,12 +446,12 @@ export default {
-
-
+ -->
@@ -556,13 +523,13 @@ export default {
折合分:
- {{item.studentConvertedScore}}
+ {{ item.studentConvertedScore }}
真实分:
- {{item.studentScore}}
+ {{ item.studentScore }}
@@ -602,19 +569,17 @@ export default {
+ placeholder="请输入内容" @confirm="dialogInputConfirm">
-
-
-
+
-
-
@@ -658,7 +623,7 @@ export default {
-
-
-
diff --git a/pages/zyb/fillVolunteer/index.vue b/pages/zyb/fillVolunteer/index.vue
index 0120bba..ec77863 100644
--- a/pages/zyb/fillVolunteer/index.vue
+++ b/pages/zyb/fillVolunteer/index.vue
@@ -4,6 +4,8 @@ import ApiConstant from "@/common/ApiConstant";
import Request from '@/common/request'
import ImagesConstant from "@/common/ImagesConstant";
import {arrayIsNotEmpty} from "@/common/util";
+import vip from "../vip/index.vue";
+import {stringIsNotEmpty} from "../../../common/util";
let request = new Request()
// 缓存每页最多
@@ -14,6 +16,9 @@ const MAX_CACHE_PAGE = 3;
export default {
name: "模拟填报",
computed: {
+ vip() {
+ return vip
+ },
StaticConstant() {
return StaticConstant
},
@@ -28,19 +33,27 @@ export default {
circle: {kcj: 0, jwt: 0, nlq: 0, kbd: 0,},//百分比
modelVale: 0,
topFlag: false,//显示回到顶部
+ otherMajor: {
+ visible: false,
+ status: 'noMore',
+ schoolName: '',
+ nowMajor: [],
+ list: [],
+ },//其他专业数据
selectForm: {
- province:'',
+ province: '',
schoolName: '',
paneName: '全部',
batch: '提前批',
- rulesEnrollProbability:'',//录取方式
- tagsList:[],//院校标签
- addressList:[],//地区
- schoolNatureList:[],//办学类型
- },
- userInfo: {
- vipFlag: true
+ rulesEnrollProbabilityList:[],//录取方式
+ rulesEnrollProbability: '',
+ kyjxList: [],//科研教学
+ tagsList: [],//院校标签
+ addressList: [],//地区
+ schoolNatureList: [],//办学类型
},
+ userInfo: {},
+ vipInfo: {},
scoreInfo: {
province: null,//省份
cognitioPolyclinic: null,//科类
@@ -56,10 +69,7 @@ export default {
scrollInto: "",
newsList: [],
cacheTab: [],
- tabBars: [{name: '本科提前批', id: '提前批'}, {name: '本科A段', id: '本科A段'}, {
- name: '本科B段',
- id: '本科B段'
- }, {name: '高职高专', id: '高职高专'}],
+ tabBars: [],
recommendVolunteerList: [],//推荐志愿列表
page: {
current: 1,
@@ -79,39 +89,19 @@ export default {
years: StaticConstant.years,
//
status: 'more',
- statusTypes: [
- {
- value: 'more',
- text: '加载前',
- checked: true
- }, {
- value: 'loading',
- text: '加载中',
- checked: false
- }, {
- value: 'noMore',
- text: '没有更多',
- checked: false
- }
- ],
- contentText: {
- contentdown: '查看更多',
- contentrefresh: '加载中',
- contentnomore: '没有更多'
- },
+ statusTypes: StaticConstant.loadStatusTypes,
+ contentText: StaticConstant.loadContentText,
}
},
onShow(e) {
this.userInfo = uni.getStorageSync('userInfo')
- this.clearData()
- this.getUserScore()
},
onLoad(e) {
+ this.vipInfo = uni.getStorageSync('vipInfo')
if (e.batch && e.volunteerId) {
//从我的志愿 点击跳转而来
this.selectForm.batch = e.batch;
this.filledVolunteer.volunteerId = e.volunteerId;
- console.log(e)
}
setTimeout(() => {
this.tabBars.forEach((tabBar) => {
@@ -123,29 +113,50 @@ export default {
});
});
}, 350)
+ this.clearData()
+ this.artVolunteerDetail()
+ this.loadMenu()
},
onReachBottom() {
- if (this.userInfo.vipFlag) {
+ if (this.vipInfo && this.vipInfo.vipLevel >= 2) {
this.loadMore()
}
},
+ onShareAppMessage() {
+ return {
+ title: '艺体志愿宝-测一测你能上的大学', //分享标题
+ path: "/pages/zyb/fillVolunteer/index"
+ }
+ },
+ // 分享到微信朋友圈
+ onShareTimeline(res) {
+ return {
+ title: '测一测你能上的大学', //分享标题
+ path: "/pages/zyb/fillVolunteer/index"
+ }
+ },
methods: {
onConfirm(e) {
console.log('onConfirm')
- if(e.type ==='filter'){
+ if (e.type === 'filter') {
if (e.children) {
for (let i = 0; i < e.children.length; i++) {
- if (e.children[i].title === '录取方式') {
- this.selectForm.rulesEnrollProbability =e.children[i].value
- if (this.selectForm.rulesEnrollProbability === null) {
- this.selectForm.rulesEnrollProbability = ''
+ if (e.children[i].title === '科研教学') {
+ this.selectForm.kyjxList = e.children[i].value
+ if (this.selectForm.kyjxList === null) {
+ this.selectForm.kyjxList = []
}
- }else if (e.children[i].title === '院校标签') {
+ } else if (e.children[i].title === '录取方式') {
+ this.selectForm.rulesEnrollProbabilityList = e.children[i].value
+ if (this.selectForm.rulesEnrollProbabilityList === null) {
+ this.selectForm.rulesEnrollProbabilityList = []
+ }
+ } else if (e.children[i].title === '院校标签') {
this.selectForm.tagsList = e.children[i].value
if (this.selectForm.tagsList === null) {
this.selectForm.tagsList = []
}
- }else if (e.children[i].title === '办学类型') {
+ } else if (e.children[i].title === '办学类型') {
this.selectForm.schoolNatureList = e.children[i].value
if (this.selectForm.schoolNatureList === null) {
this.selectForm.schoolNatureList = []
@@ -156,7 +167,6 @@ export default {
}
}
}
- console.log(e)
this.clearData()
this.getRecommendVolunteerList()
},
@@ -172,7 +182,43 @@ export default {
this.page.current++;
this.getRecommendVolunteerList()
},
- search(res) {
+ loadMenu() {
+ //加载筛选项
+ request.get(ApiConstant.Major.rulesEnrollrobabilityMenuList, {
+ professionalCategory: this.scoreInfo.professionalCategory
+ }, {showLoading: false}).then(r => {
+ if (r.success) {
+ this.menuList[2].children[0].options = [...r.result]
+ }
+ }).catch(err => {
+ }).finally(() => {
+
+ });
+
+ },
+ search() {
+ if (!this.vipInfo || !stringIsNotEmpty(this.vipInfo.vipLevel) || this.vipInfo.vipLevel < 2) {
+ 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.selectForm.paneName = '全部'
this.page.current = 1
@@ -198,15 +244,16 @@ export default {
return;
}
this.selectForm.batch = this.tabBars[index].id
+ this.selectForm.paneName = '全部'
//清除页数
this.clearData()
this.getRecommendVolunteerList()
this.switchTab(index);
},
switchTab(index) {
- if (this.newsList[index].data.length === 0) {
- //this.getList(index);
- }
+ // if (this.newsList[index].data.length === 0) {
+ // //this.getList(index);
+ // }
if (this.tabIndex === index) {
return;
}
@@ -237,9 +284,6 @@ export default {
saveVolunteer(item) {
let that = this
let u = uni
- console.log('填报批次:')
- console.log(item.batch)
- console.log('填报专业,', item.schoolName + ";" + item.enrollmentCode + ";" + item.majorCode + ";" + item.majorName)
uni.showModal({
title: item.volunteerIndexs ? '移除志愿' : '确认志愿',
content: '[' + item.schoolCode + ']' + item.schoolName + '-' + item.batch + '-[' + item.enrollmentCode + ']' + item.majorName,
@@ -251,23 +295,28 @@ export default {
volunteerId: that.filledVolunteer.volunteerId,
schoolCode: item.schoolCode,
majorCode: item.majorCode,
- enrollmentCode: item.enrollmentCode
+ enrollmentCode: item.enrollmentCode,
+ enrollProbability: item.enrollProbability,
+ studentConvertedScore: parseFloat(item.studentConvertedScore)
}).then(r => {
if (r.success) {
- console.log(r)
if (r.result) {
that.filledVolunteer.volunteerId = r.result
}
setTimeout(function () {
uni.showToast({title: '添加成功', icon: "none"});
}, 500)
- that.getUserScore()
+ that.artVolunteerDetail('load')
+ setTimeout(function () {
+ that.getOtherMajorList()
+ }, 500)
} else {
setTimeout(function () {
uni.showToast({title: r.message, icon: "none"});
}, 500)
}
}).catch(err => {
+ uni.showToast({title: err.message, icon: "none"});
}).finally(() => {
});
@@ -275,18 +324,36 @@ export default {
}
});
},
- /*获取其他专业*/
- showOtherMajor(majorCode) {
- console.log(majorCode)
- request.get('/test', {
- "name": "zs"
- }).then(res => {
- console.log('返回值')
- console.log(res)
- })
- },
/*获取用户分数*/
- getUserScore() {
+ artVolunteerDetail(e) {
+ this.scoreInfo = uni.getStorageSync('scoreInfo')
+ if (this.scoreInfo.batch) {
+ this.selectForm.batch = this.scoreInfo.batch
+ //======目前所有批次的专业都可以看到 start
+ if (this.scoreInfo.professionalCategory === '体育类') {
+ this.tabBars = [{name: '本科', id: '本科'}, {name: '高职高专', id: '高职高专'}]
+ } else {
+ this.tabBars = [{name: '本科提前批', id: '提前批'}, {name: '本科A段', id: '本科A段'}, {
+ name: '本科B段',
+ id: '本科B段'
+ }, {name: '高职高专', id: '高职高专'}]
+ }
+ //======目前所有批次的专业都可以看到 end
+
+ /*调整默认选中的导航栏*/
+ if (this.scoreInfo.batch === '本科A段') {
+ this.selectForm.batch = '提前批'
+ this.tabIndex = 0;
+ } else {
+ for (let i = 0; i < this.tabBars.length; i++) {
+ if (this.tabBars[i].id === this.selectForm.batch) {
+ //选中
+ this.tabIndex = i;
+ break;
+ }
+ }
+ }
+ }
request.get(ApiConstant.Volunteer.artVolunteerDetail, {id: this.filledVolunteer.volunteerId}).then(res => {
if (res.success) {
let dataResult = res.result
@@ -294,40 +361,7 @@ export default {
const volunteerMap = new Map();
if (dataResult != null) {
// 分数信息
- this.scoreInfo = res.result.userScoreInfo
- //拆分子级专业类别
- if (this.scoreInfo) {
- }
-
- if (this.scoreInfo.batch) {
- this.selectForm.batch = this.scoreInfo.batch
- if (this.scoreInfo.batch === '本科A段') {
- this.tabBars = [{name: '本科提前批', id: '提前批'}, {name: '本科A段', id: '本科A段'}, {
- name: '本科B段',
- id: '本科B段'
- }, {name: '高职高专', id: '高职高专'}]
- } else if (this.scoreInfo.batch === '本科B段') {
- this.tabBars = [{name: '本科B段', id: '本科B段'}, {name: '高职高专', id: '高职高专'}]
- } else if (this.scoreInfo.batch === '本科') {
- this.tabBars = [{name: '本科', id: '本科'}, {name: '高职高专', id: '高职高专'}]
- } else {
- this.tabBars = [{name: '高职高专', id: '高职高专'}]
- }
-
- /*调整默认选中的导航栏*/
- if (this.scoreInfo.batch === '本科A段') {
- this.selectForm.batch = '提前批'
- this.tabIndex = 0;
- } else {
- for (let i = 0; i < this.tabBars.length; i++) {
- if (this.tabBars[i].id === this.selectForm.batch) {
- //选中
- this.tabIndex = i;
- break;
- }
- }
- }
- }
+ ///this.scoreInfo = res.result.userScoreInfo
// 处理 已填志愿信息
this.filledVolunteer.volunteerId = dataResult.id
this.filledVolunteer.volunteerName = dataResult.volunteerName
@@ -337,7 +371,7 @@ export default {
//==================================提前批 start
let volunteerRecordEarlyAdmissionList = dataResult.volunteerRecordEarlyAdmissionList;
for (let i = 0; i < volunteerRecordEarlyAdmissionList.length; i++) {
- key = volunteerRecordEarlyAdmissionList[i].majorCode + volunteerRecordEarlyAdmissionList[i].schoolCode
+ key = volunteerRecordEarlyAdmissionList[i].enrollmentCode + "_" + volunteerRecordEarlyAdmissionList[i].majorCode + "_" + volunteerRecordEarlyAdmissionList[i].schoolCode
volunteer = volunteerRecordEarlyAdmissionList[i]
volunteerMap.set(key, volunteerRecordEarlyAdmissionList[i])
}
@@ -362,7 +396,7 @@ export default {
//==================================本科A段 start
let volunteerUndergraduateAList = dataResult.volunteerRecordUndergraduateAList;
for (let i = 0; i < volunteerUndergraduateAList.length; i++) {
- key = volunteerUndergraduateAList[i].majorCode + volunteerUndergraduateAList[i].schoolCode
+ key = volunteerUndergraduateAList[i].enrollmentCode + "_" + volunteerUndergraduateAList[i].majorCode + "_" + volunteerUndergraduateAList[i].schoolCode
volunteerMap.set(key, volunteerUndergraduateAList[i])
}
indexs = 1;
@@ -383,7 +417,7 @@ export default {
//==================================本科B段 start
let volunteerUndergraduateBList = dataResult.volunteerRecordUndergraduateBList;
for (let i = 0; i < volunteerUndergraduateBList.length; i++) {
- key = volunteerUndergraduateBList[i].majorCode + volunteerUndergraduateBList[i].schoolCode
+ key = volunteerUndergraduateBList[i].enrollmentCode + "_" + volunteerUndergraduateBList[i].majorCode + "_" + volunteerUndergraduateBList[i].schoolCode
volunteerMap.set(key, volunteerUndergraduateBList[i])
}
indexs = 1;
@@ -403,7 +437,7 @@ export default {
//==================================本科 start
let volunteerUndergraduateList = dataResult.volunteerRecordUndergraduateList;
for (let i = 0; i < volunteerUndergraduateList.length; i++) {
- key = volunteerUndergraduateList[i].majorCode + volunteerUndergraduateList[i].schoolCode
+ key = volunteerUndergraduateList[i].enrollmentCode + "_" + volunteerUndergraduateList[i].majorCode + "_" + volunteerUndergraduateList[i].schoolCode
volunteerMap.set(key, volunteerUndergraduateList[i])
}
indexs = 1;
@@ -424,7 +458,7 @@ export default {
//==================================高职高专 start
let volunteerJuniorCollegeList = dataResult.volunteerRecordJuniorCollegeList;
for (let i = 0; i < volunteerJuniorCollegeList.length; i++) {
- key = volunteerJuniorCollegeList[i].majorCode + volunteerJuniorCollegeList[i].schoolCode
+ key = volunteerJuniorCollegeList[i].enrollmentCode + "_" + volunteerJuniorCollegeList[i].majorCode + "_" + volunteerJuniorCollegeList[i].schoolCode
volunteerMap.set(key, volunteerJuniorCollegeList[i])
}
indexs = 1;
@@ -458,20 +492,49 @@ export default {
}
}).catch(err => {
}).finally(() => {
- this.getRecommendVolunteerList()
+ if (e && e === 'load') {
+ this.laodRecommendVolunterList()
+ } else {
+ this.getRecommendVolunteerList()
+ }
});
},
- /*获取推荐志愿列表*/
+ //刷新推荐的志愿列表的志愿填报状态
+ laodRecommendVolunterList() {
+ //判断专业是否已经填报过
+ if (this.filledVolunteer.volunteerMap) {
+ let key = ''
+ let volunteer = {}
+ let recommendVolunteerList = this.recommendVolunteerList
+ if (recommendVolunteerList) {
+ for (let i = 0; i < recommendVolunteerList.length; i++) {
+ key = recommendVolunteerList[i].enrollmentCode + "_" + recommendVolunteerList[i].majorCode + "_" + recommendVolunteerList[i].schoolCode
+ volunteer = this.filledVolunteer.volunteerMap.get(key)
+ if (volunteer != null) {
+ //这个专业已填过
+ recommendVolunteerList[i].volunteerIndexs = volunteer.indexs
+ } else {
+ recommendVolunteerList[i].volunteerIndexs = ''
+ }
+ }
+ this.recommendVolunteerList = recommendVolunteerList
+ }
+ }
+ },
+ //获取推荐志愿列表
getRecommendVolunteerList() {
- console.log(this.selectForm.batch)
this.status = 'loading'
- let tagsStrs=''
- if (this.selectForm.tagsList && this.selectForm.tagsList.length>0) {
+ let kyjxStrs = ''
+ if (this.selectForm.kyjxList && this.selectForm.kyjxList.length > 0) {
+ kyjxStrs = this.selectForm.kyjxList.join(',')
+ }
+ let tagsStrs = ''
+ if (this.selectForm.tagsList && this.selectForm.tagsList.length > 0) {
tagsStrs = this.selectForm.tagsList.join(",")
}
- let schoolNatureStrs=''
- if (this.selectForm.schoolNatureList && this.selectForm.schoolNatureList.length>0) {
+ let schoolNatureStrs = ''
+ if (this.selectForm.schoolNatureList && this.selectForm.schoolNatureList.length > 0) {
schoolNatureStrs = this.selectForm.schoolNatureList.join(",")
}
//地区
@@ -479,22 +542,26 @@ export default {
if (arrayIsNotEmpty(this.selectForm.addressList)) {
province = this.selectForm.addressList.join(",")
}
+ //录取方式
+ let rulesEnrollProbability = ''
+ if (arrayIsNotEmpty(this.selectForm.rulesEnrollProbabilityList)) {
+ rulesEnrollProbability = this.selectForm.rulesEnrollProbabilityList.join(",")
+ }
let params = {
schoolName: this.selectForm.schoolName,//学校名称
pageNum: this.page.current,
- pageSize: this.page.pageSize,
+ pageSize: (this.vipInfo && this.vipInfo.vipLevel >= 2) ? this.page.pageSize : 3,
paneName: this.selectForm.paneName,
batch: this.selectForm.batch,
province: province,
- rulesEnrollProbability :this.selectForm.rulesEnrollProbability,
- tagsStrs:tagsStrs,
- schoolNatureStrs:schoolNatureStrs,
+ rulesEnrollProbability: rulesEnrollProbability,
+ tagsStrs: tagsStrs,
+ schoolNatureStrs: schoolNatureStrs,
+ kyjxStrs:kyjxStrs,
scoreId: this.scoreInfo.id,
}
request.get(ApiConstant.Major.recommendMajorPage, params).then(res => {
- console.log('返回值')
- console.log(res)
if (res.success) {
let result = res.result
let allNumber = result.allNumber
@@ -513,7 +580,7 @@ export default {
let volunteer = {}
if (result && records) {
for (let i = 0; i < records.length; i++) {
- key = records[i].majorCode + records[i].schoolCode
+ key = records[i].enrollmentCode + "_" + records[i].majorCode + "_" + records[i].schoolCode
volunteer = this.filledVolunteer.volunteerMap.get(key)
if (volunteer != null) {
//这个专业已填过
@@ -528,7 +595,7 @@ export default {
this.recommendVolunteerList = [...this.recommendVolunteerList, ...records]
if (result.pageList.current >= result.pageList.pages) {
this.status = 'noMore'
- } else{
+ } else {
this.status = 'more'
}
@@ -541,30 +608,15 @@ export default {
}).finally(() => {
});
},
- /*计算百分比*/
+ //计算百分比
toPercent(num, total) {
return (Math.round(num / total * 10000) / 100.00);// 小数点后两位百分比
},
- /*悬浮按钮*/
- trigger(e) {
- console.log(e)
- if (e.item.text === '回到顶部') {
- this.topBack()
- }
- },
clearInput() {
this.selectForm.schoolName = ''
},
- menuChange(e) {
- console.log('↓↓↓↓触发change事件↓↓↓↓')
- console.log(e)
- this.menuValue = e.value;
- console.log(this.menuValue)
- this.clearData()
- this.getRecommendVolunteerList()
- },
switchPane(e) {
- if (this.selectForm.paneName !== e) {
+ if (this.selectForm.paneName !== e && (this.vipInfo && this.vipInfo.vipLevel >= 2)) {
this.selectForm.paneName = e
} else {
this.selectForm.paneName = '全部'
@@ -579,29 +631,129 @@ export default {
checkBao(e) {
if (e >= 93) {
return ImagesConstant.bao.kebaodi;
- } else if (e < 92 && e >= 74) {
+ } else if (e < 93 && e >= 74) {
return ImagesConstant.bao.jiaowentuo;
- } else if (e < 73 && e >= 60) {
+ } else if (e < 74 && e >= 60) {
return ImagesConstant.bao.kechongji;
}
return ImagesConstant.bao.nanluqu;
},
checkColorText(e) {
- if (e >= 93) {
+ if (this.vipInfo && this.vipInfo.vipLevel < 2) {
+ return '#868686';
+ } else if (e >= 93) {
return '#3e8e43';
- } else if (e < 92 && e >= 74) {
+ } else if (e < 93 && e >= 74) {
return '#4975fd';
- } else if (e < 73 && e >= 60) {
+ } else if (e < 74 && e >= 60) {
return '#F8880E';
}
return '#c83428';
},
- top() { //回到顶部
+ clickTop() { //回到顶部
uni.pageScrollTo({
scrollTop: 0,
duration: 300
});
},
+
+ getOtherMajorList() {
+ this.otherMajor.list = []
+ let e = this.otherMajor.nowMajor
+ //判断当前第一个专业是否已选中
+ if (this.filledVolunteer.volunteerMap) {
+ let key = ''
+ let volunteer = {}
+ if (e) {
+ key = e.enrollmentCode + "_" + e.majorCode + "_" + e.schoolCode
+ volunteer = this.filledVolunteer.volunteerMap.get(key)
+ if (volunteer) {
+ this.otherMajor.nowMajor.volunteerIndexs = volunteer.indexs
+ } else {
+ this.otherMajor.nowMajor.volunteerIndexs = ''
+ }
+ }
+ }
+
+ //组装查询参数
+ let params = {
+ schoolCode: e.schoolCode,
+ batch: e.batch,
+ pageSize: this.vipInfo && this.vipInfo.vipLevel >= 2 ? 99 : 3,
+ professionalCategory: this.scoreInfo.professionalCategory,
+ cognitioPolyclinic: this.scoreInfo.cognitioPolyclinic
+ }
+ //当前选中的专业 key
+ let eKey = e.enrollmentCode + "_" + e.majorCode + "_" + e.schoolCode
+ this.otherMajor.status = 'loading'
+ request.get(ApiConstant.Major.recommendSchoolOtherMajor, params, {showLoad: false}).then(res => {
+ console.log('返回值')
+ console.log(res)
+ if (res.success && res.result) {
+ let records = res.result.list
+ //判断专业是否已经填报过
+ if (this.filledVolunteer.volunteerMap) {
+ let key = ''
+ let volunteer = {}
+ let list = []
+ if (records) {
+ for (let i = 0; i < records.length; i++) {
+ key = records[i].enrollmentCode + "_" + records[i].majorCode + "_" + records[i].schoolCode
+ if (eKey === key) {
+ continue
+ }
+ volunteer = this.filledVolunteer.volunteerMap.get(key)
+ if (volunteer != null) {
+ //这个专业已填过
+ records[i].volunteerIndexs = volunteer.indexs
+ } else {
+ records[i].volunteerIndexs = ''
+ }
+ list.push(records[i])
+ }
+ }
+ this.otherMajor.list = [...this.otherMajor.list, ...list]
+ }
+ }
+ }).catch(err => {
+ }).finally(() => {
+ this.otherMajor.status = 'noMore'
+ });
+ },
+ //打开选择其他专业
+ onOtherMajorOpen(e) {
+ this.otherMajor.nowMajor = {...e}
+ this.otherMajor.schoolName = e.schoolName
+ this.otherMajor.visible = true
+ this.getOtherMajorList()
+ },
+ onOtherMajorClose() {
+ this.otherMajor.visible = false
+ },
+ checkVip() {
+ if (!this.vipInfo || !this.vipInfo.vipFlag || this.vipInfo.vipLevel < 2) {
+ uni.showModal({
+ title: 'VIP专享',
+ // 提示文字
+ content: '该功能为增值内容，开通会员后即可免费查看！',
+ // 取消按钮的文字自定义
+ cancelText: "取消",
+ // 确认按钮的文字自定义
+ confirmText: "开通服务",
+ //删除字体的颜色
+ confirmColor: 'red',
+ //取消字体的颜色
+ cancelColor: '#dddddd',
+ success: function (res) {
+ if (res.confirm) {
+ // 执行确认后的操作
+ that.goto('/pages/zyb/vip/index')
+ }
+ }
+ })
+ return
+ }
+ }
},
onPageScroll(e) { //根据距离顶部距离是否显示回到顶部按钮
//当距离大于600时显示回到顶部按钮，//当距离小于600时隐藏回到顶部按钮
@@ -617,7 +769,8 @@ export default {
-
+
搜索
@@ -652,21 +805,26 @@ export default {
文化成绩：{{ scoreInfo.culturalScore }}
- 统考成绩：{{ scoreInfo.professionalScore }}
-
-
-
-
- {{item.categoryChildName}}：{{ item.categoryChildScore }}
+ {{ scoreInfo.professionalCategory === '音乐类' ? '主项成绩' : '统考成绩' }}：{{
+ scoreInfo.professionalScore
+ }}
+
+ 音乐表演声乐：{{ scoreInfo.yybysy }}
+ 音乐表演器乐：{{ scoreInfo.yybyqy }}
+ 音乐教育：{{ scoreInfo.yyjy }}
+ 服装表演：{{ scoreInfo.fzby }}
+ 戏剧影视导演：{{ scoreInfo.xjysdy }}
+ 戏剧影视表演：{{ scoreInfo.xjysby }}
+
-
-
-
+
-
-
-
+
+
+
+
- {{ num.nlq }}
+ {{ vipInfo && vipInfo.vipLevel >= 2 ? num.nlq : '??' }}
难录取
-
-
+
+
+
- {{ num.kcj }}
+ {{ vipInfo && vipInfo.vipLevel >= 2 ? num.kcj : '??' }}
- 可冲击
+ 可冲击
-
-
+
+
+
- {{ num.jwt }}
+ {{ (vipInfo && vipInfo.vipLevel >= 2) ? num.jwt : '??' }}
较稳妥
-
-
+
+
+
- {{ num.kbd }}
+ {{ (vipInfo && vipInfo.vipLevel >= 2) ? num.kbd : '??' }}
可保底
-
-
+
+
-
@@ -741,9 +906,9 @@ export default {
- {{ item.enrollProbability }}%
+ {{ vipInfo && vipInfo.vipLevel >= 2 ? item.enrollProbability : '??' }}%
-
+
@@ -752,26 +917,31 @@ export default {
- {{t}}
+ {{ t }}
[{{ item.enrollmentCode }}]{{ item.majorName }}
+ {{ item.majorDetail }}
+
+
+ {{ item.otherScoreLimitation }}
+
+
+
-
-
- 折合分:
-
-
+
+ 计算分
+
{{item.studentConvertedScore}}
-
- 真实分:
-
-
- {{item.studentScore}}
+
+
+ 折合分
+
+ {{ item.studentScore }}
@@ -802,25 +972,187 @@ export default {
暂未发布
-
-
+
+ 查看可选专业
+
-
-
-
+
+
+
+
+ {{ otherMajor.schoolName }}
+
+
+
+
+
+
+
+
+
+
+
+
+ [{{ otherMajor.nowMajor.enrollmentCode }}]{{ otherMajor.nowMajor.majorName }}
+ {{ otherMajor.nowMajor.majorDetail }}
+
+
+
+ {{ otherMajor.nowMajor.otherScoreLimitation }}
+
+
+
+
+
+
+ {{ (vipInfo && vipInfo.vipLevel >= 2) ? otherMajor.nowMajor.enrollProbability : '??' }}%
+
+
+
+
+
+
+
+
+
+
+ {{ history.year }}年录取最低分：
+ {{ history.admissionLine }}分
+
+
+
+
+
+ 折合分
+
+ {{ (vipInfo && vipInfo.vipLevel >= 2) ? otherMajor.nowMajor.studentConvertedScore : '??' }}
+
+
+
+
+ {{ StaticConstant.year }}省内计划录取：
+ {{
+ otherMajor.nowMajor.planNum
+ }}人
+
+ 暂未发布
+
+
+
+
+
+ {{ StaticConstant.year }}录取方式:
+
+ {{ otherMajor.nowMajor.rulesEnrollProbability }}
+
+ 暂未发布
+
+
+
+
+ {{
+ otherMajor.nowMajor.volunteerIndexs ? '志愿' + otherMajor.nowMajor.volunteerIndexs : '加入志愿表'
+ }}
+
+
+
+
+
+
+ *该组其他概率专业
+
+
+
+
+
+
+ [{{ item.enrollmentCode }}]{{ item.majorName }}
+ {{ item.majorDetail }}
+
+
+
+ {{ item.otherScoreLimitation }}分
+
+
+
+
+
+
+ {{ (vipInfo && vipInfo.vipLevel >= 2) ? item.enrollProbability : '??' }}%
+
+
+
+
+
+
+
+
+
+
+ {{ history.year }}年录取最低分：
+ {{ history.admissionLine }}分
+
+
+
+
+
+ 折合分
+
+ {{ vipInfo && vipInfo.vipLevel >= 2 ? item.studentConvertedScore : '??' }}
+
+
+
+
+ {{ StaticConstant.year }}省内计划录取：
+ {{ item.planNum }}人
+ 暂未发布
+
+
+
+
+
+ {{ StaticConstant.year }}录取方式:
+ {{ item.rulesEnrollProbability }}
+ 暂未发布
+
+
+
+
+ {{ item.volunteerIndexs ? '志愿' + item.volunteerIndexs : '加入志愿表' }}
+
+
+
+
+
+
+
+
+
+
+
-
+
@@ -839,6 +1171,10 @@ export default {
background-color: white !important;
}
+:deep(.common-page-head) {
+ padding: 10rpx !important;
+}
+
/*重置 uni-data-picker样式*/
:deep(.uni-data-tree) {
.placeholder {
@@ -868,7 +1204,7 @@ export default {
.text-list {
- margin-top: 30rpx;
+ margin-top: 15rpx;
margin-bottom: 10rpx;
.t {
@@ -1064,11 +1400,6 @@ export default {
padding: 15rpx 10rpx !important;
}
-:deep(.wei-dropdown-menu-bar) {
- box-shadow: none !important;
-}
-
-
/*圆环进度条内字体 start*/
.progressBox {
position: relative;
@@ -1124,11 +1455,12 @@ export default {
padding: 30rpx;
margin: 10rpx 0;
/*院校标签*/
- .tags{
+ .tags {
display: flex;
flex-direction: row;
flex-wrap: wrap;
}
+
.tags .tag {
margin-top: 10rpx;
margin-right: 10px;
@@ -1142,6 +1474,32 @@ export default {
}
}
+//其他专业按钮
+.otherMajorBtn {
+ color: #f96543;
+ border: 1rpx solid #f96543;
+ padding: 10rpx 10rpx;
+ text-align: center;
+}
+
+.volunteer-item-active {
+ background-color: #fef4f4;
+}
+
+
+.volunteerIndexs {
+ color: #f96543;
+ background-color: #fef3ec;
+ border: 1rpx solid #f96543;
+ padding: 10rpx 10rpx;
+}
+
+.saveVolunteer {
+ color: #f96543;
+ border: 1rpx solid #f96543;
+ padding: 10rpx 10rpx;
+}
+
/*推荐志愿列表 end*/
:deep(.uni-noticebar) {
@@ -1154,6 +1512,7 @@ export default {
display: none; /* 先将元素隐藏 */
transition: 0.5s;
}
+
.topc {
position: fixed;
right: 10rpx;
@@ -1164,5 +1523,13 @@ export default {
height: 40px;
line-height: 40px;
}
+
/* 回到顶部 end*/
+
+scroll-view ::-webkit-scrollbar {
+ width: 0;
+ height: 0;
+ background-color: transparent;
+}
+
diff --git a/pages/zyb/fillVolunteer/mockList.vue b/pages/zyb/fillVolunteer/mockList.vue
new file mode 100644
index 0000000..a0d12bb
--- /dev/null
+++ b/pages/zyb/fillVolunteer/mockList.vue
@@ -0,0 +1,1557 @@
+
+
+
+
+
+
+
+
+
+
+
+
+ 我的成绩
+
+
+
+
+
+
+
+ 省份：{{ scoreInfo.province }}
+ 选科：{{ scoreInfo.cognitioPolyclinic }}
+ 类别：{{ scoreInfo.professionalCategory }}
+
+
+ 文化成绩：{{ scoreInfo.culturalScore }}
+ {{ scoreInfo.professionalCategory === '音乐类' ? '主项成绩' : '统考成绩' }}：{{
+ scoreInfo.professionalScore
+ }}
+
+
+
+ 音乐表演声乐：{{ scoreInfo.yybysy }}
+ 音乐表演器乐：{{ scoreInfo.yybyqy }}
+ 音乐教育：{{ scoreInfo.yyjy }}
+ 服装表演：{{ scoreInfo.fzby }}
+ 戏剧影视导演：{{ scoreInfo.xjysdy }}
+ 戏剧影视表演：{{ scoreInfo.xjysby }}
+
+
+
+
+
+
+
+
+
+ {{ tab.name }}
+
+
+
+
+
+ {{ tab.name }}
+
+
+
+
+
+
+
+
+
+ {{ vipInfo && vipInfo.vipLevel >= 2 ? num.nlq : '??' }}
+
+ 难录取
+
+
+
+
+
+
+
+
+ {{ vipInfo && vipInfo.vipLevel >= 2 ? num.kcj : '??' }}
+
+ 可冲击
+
+
+
+
+
+
+
+
+ {{ (vipInfo && vipInfo.vipLevel >= 2) ? num.jwt : '??' }}
+
+ 较稳妥
+
+
+
+
+
+
+
+
+ {{ (vipInfo && vipInfo.vipLevel >= 2) ? num.kbd : '??' }}
+
+ 可保底
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 院校代码[{{ item.schoolCode }}]
+ {{ item.province }}
+
+
+
+ {{ vipInfo && vipInfo.vipLevel >= 2 ? item.enrollProbability : '??' }}%
+
+
+
+
+
+
+ {{ item.schoolName }}
+
+
+
+ {{ t }}
+
+
+
+
+ [{{ item.enrollmentCode }}]{{ item.majorName }}
+ {{ item.majorDetail }}
+
+
+ {{ item.otherScoreLimitation }}
+
+
+
+
+
+
+ 计算分
+
+ {{ item.privateStudentScore }}
+
+
+
+ 折合分
+
+ {{ item.studentScore }}
+
+
+
+
+
+
+
+
+
+
+
+ {{ history.year }}年录取最低分：
+ {{ history.admissionLine }}分
+
+
+
+
+ {{ StaticConstant.year }}省内计划录取：
+ {{ item.planNum }}人
+ 暂未发布
+
+
+
+
+
+ {{ StaticConstant.year }}录取方式:
+ {{ item.rulesEnrollProbability }}
+ 暂未发布
+
+
+
+ 查看可选专业
+
+
+
+
+
+
+ 1
+
+
+
+
+
+ {{ otherMajor.schoolName }}
+
+
+
+
+
+
+
+
+
+
+
+
+ [{{ otherMajor.nowMajor.enrollmentCode }}]{{ otherMajor.nowMajor.majorName }}
+ {{ otherMajor.nowMajor.majorDetail }}
+
+
+
+ {{ otherMajor.nowMajor.otherScoreLimitation }}
+
+
+
+
+
+
+ {{ (vipInfo && vipInfo.vipLevel >= 2) ? otherMajor.nowMajor.enrollProbability : '??' }}%
+
+
+
+
+
+
+
+
+
+
+ {{ history.year }}年录取最低分：
+ {{ history.admissionLine }}分
+
+
+
+
+
+ 折合分
+
+ {{ (vipInfo && vipInfo.vipLevel >= 2) ? otherMajor.nowMajor.studentConvertedScore : '??' }}
+
+
+
+
+ {{ StaticConstant.year }}省内计划录取：
+ {{
+ otherMajor.nowMajor.planNum
+ }}人
+
+ 暂未发布
+
+
+
+
+
+ {{ StaticConstant.year }}录取方式:
+
+ {{ otherMajor.nowMajor.rulesEnrollProbability }}
+
+ 暂未发布
+
+
+
+
+ {{
+ otherMajor.nowMajor.volunteerIndexs ? '志愿' + otherMajor.nowMajor.volunteerIndexs : '加入志愿表'
+ }}
+
+
+
+
+
+
+ *该组其他概率专业
+
+
+
+
+
+
+ [{{ item.enrollmentCode }}]{{ item.majorName }}
+ {{ item.majorDetail }}
+
+
+
+ {{ item.otherScoreLimitation }}分
+
+
+
+
+
+
+ {{ (vipInfo && vipInfo.vipLevel >= 2) ? item.enrollProbability : '??' }}%
+
+
+
+
+
+
+
+
+
+
+ {{ history.year }}年录取最低分：
+ {{ history.admissionLine }}分
+
+
+
+
+
+ 折合分
+
+ {{ vipInfo && vipInfo.vipLevel >= 2 ? item.studentConvertedScore : '??' }}
+
+
+
+
+ {{ StaticConstant.year }}省内计划录取：
+ {{ item.planNum }}人
+ 暂未发布
+
+
+
+
+
+ {{ StaticConstant.year }}录取方式:
+ {{ item.rulesEnrollProbability }}
+ 暂未发布
+
+
+
+
+ {{ item.volunteerIndexs ? '志愿' + item.volunteerIndexs : '加入志愿表' }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pages/zyb/fillVolunteer/my-detail.vue b/pages/zyb/fillVolunteer/my-detail.vue
new file mode 100644
index 0000000..3fe90bf
--- /dev/null
+++ b/pages/zyb/fillVolunteer/my-detail.vue
@@ -0,0 +1,938 @@
+
+
+
+
+
+
+ 当前没有成绩信息，请先修改成绩~
+ 修改成绩
+
+
+
+
+
+ {{ volunteerInfo.volunteerName }}
+
+
+ {{ scoreInfo.province }}
+ {{ scoreInfo.cognitioPolyclinic }}
+ {{ scoreInfo.professionalCategory }}
+
+
+
+
+
+ 文化分
+ {{ scoreInfo.culturalScore }}
+
+
+
+ 统考分
+ {{ scoreInfo.professionalScore }}
+
+
+
+
+ 音乐表演声乐
+ {{ scoreInfo.yybysy }}
+
+
+ 音乐表演器乐
+ {{ scoreInfo.yybyqy }}
+
+
+ 音乐教育
+ {{ scoreInfo.yyjy }}
+
+
+ 服装表演
+ {{ scoreInfo.fzby }}
+
+
+ 戏剧影视导演
+ {{ scoreInfo.xjysdy }}
+
+
+ 戏剧影视表演
+ {{ scoreInfo.xjysby }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{
+ citem.batchLabel
+ }}({{ getVolunteerNum(citem) }}/{{ citem.max }})
+
+ {{ citem.type }}
+
+
+
+ {{ citem.status ? '收起' : '展开' }}
+
+
+
+
+
+
+
+
+
+ {{ item.indexs }}
+
+
+
+ [{{ item.schoolCode }}]{{ item.schoolName }}
+
+
+
+
+
+ [{{ item.enrollmentCode }}]
+ {{ item.majorName }}
+
+
+ {{ item.enrollProbability }}%
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ item.indexs }}
+
+
+ 点击添加专业志愿
+
+
+
+
+
+
+
+
+
+
+
+
+ 创建志愿单
+
+
+
+
+
+
+
+
+
+ 移动志愿
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pages/zyb/fillVolunteer/my.vue b/pages/zyb/fillVolunteer/my.vue
index b4e36a1..8919be5 100644
--- a/pages/zyb/fillVolunteer/my.vue
+++ b/pages/zyb/fillVolunteer/my.vue
@@ -4,10 +4,12 @@ import ApiConstant from "@/common/ApiConstant";
import Request from '@/common/request'
import {formatTime} from "@/common/util";
import ImagesConstant from "@/common/ImagesConstant";
+import View from "../../component/view/view.vue";
let request = new Request()
export default {
name: "fillVolunteer-list",
+ components: {View},
computed: {
ImagesConstant() {
return ImagesConstant
@@ -35,7 +37,7 @@ export default {
});
},
/*点击新增志愿*/
- clickAdd(){
+ clickAdd() {
let that = this
uni.showLoading({
title: '创建志愿表'
@@ -44,7 +46,7 @@ export default {
if (res.success) {
setTimeout(function () {
uni.hideLoading();
- }, 1000)
+ }, 800)
setTimeout(function () {
that.getVolunteerList();
}, 1000)
@@ -59,10 +61,11 @@ export default {
});
},
clickEdit(e) {
- console.log('编辑')
- console.log(e)
+ let scoreInfo = uni.getStorageSync('scoreInfo')
+ let that = this
+ console.log(scoreInfo)
uni.navigateTo({
- url: 'detail?volunteerId=' + e
+ url: '/pages/zyb/fillVolunteer/my-detail?volunteerId=' + e
})
},
clickDelete(e) {
@@ -106,13 +109,16 @@ export default {
//下载
uni.showToast({title: '目前仅支持PC端下载', icon: "none"});
},
- formatDate(date) {
- console.log(date)
- let newDate = new Date(date);
- let year = newDate.getFullYear();
- let month = String(newDate.getMonth() + 1).padStart(2, '0');
- let day = String(newDate.getDate()).padStart(2, '0');
- return year + '-' + month + '-' + day;
+ formatDate(dateString) {
+ // 将日期字符串转换为Date对象
+ var date = new Date(dateString.replace(/-/g,'/'));
+ // 格式化为 "yyyy/MM/dd HH:mm:ss" 格式
+ return date.getFullYear() + "/" +
+ ("0" + (date.getMonth() + 1)).slice(-2) + "/" +
+ ("0" + date.getDate()).slice(-2) + " " +
+ ("0" + date.getHours()).slice(-2) + ":" +
+ ("0" + date.getMinutes()).slice(-2) + ":" +
+ ("0" + date.getSeconds()).slice(-2);
}
},
}
@@ -120,18 +126,20 @@ export default {
+
+ 系统仅保留前5条志愿表
+
-
+
-
+
{{ item.volunteerName }}
-
+
-
@@ -178,14 +186,16 @@ export default {
-
-
- 新增志愿
-
+
+
diff --git a/pages/zyb/fuwenben/index.vue b/pages/zyb/fuwenben/index.vue
new file mode 100644
index 0000000..0ca3bec
--- /dev/null
+++ b/pages/zyb/fuwenben/index.vue
@@ -0,0 +1,21 @@
+
+
+
+
+
+
+
+
+
diff --git a/pages/zyb/historyScoreControlLine/data.js b/pages/zyb/historyScoreControlLine/data.js
deleted file mode 100644
index 08305d2..0000000
--- a/pages/zyb/historyScoreControlLine/data.js
+++ /dev/null
@@ -1,82 +0,0 @@
-export const menuData = [
- {
- name: 'year', title: '年份', options: [
- {label: "2023", value: "2023"},
- {label: "2022", value: "2022"},
- {label: "2021", value: "2021"}
- ]
- },
- {
- name: 'professionalCategory', title: '专业类别', options: [
- {label: "音乐类", value: "音乐类"},
- {label: "国际标准舞类", value: "国际标准舞类"},
- {label: "播音与主持类", value: "播音与主持类"},
- {label: "表演类", value: "表演类"},
- {label: "编导制作类", value: "编导制作类"},
- {label: "书法类", value: "书法类"},
- {label: "艺术舞蹈类", value: "艺术舞蹈类"},
- {label: "美术类", value: "美术类"},
- {label: "体育类", value: "体育类"},
- ]
- },
- {
- name: 'category', title: '文理分科', options: [
- {label: "文科", value: "文科"},
- {label: "理科", value: "理科"},
- ]
- },
-]
-
-export const menuData1 = [
- {
- name: 'city', title: '城市', treeSelect: true, popupHeight: null, options: [
- {label: "全部", value: null, children: [{label: '全部', value: null}]},
- {
- label: "湖南省", value: "1",
- children: [
- {label: "全部", value: 35},
- {label: "长沙市", tip: 10, value: "1_1"},
- {label: "岳阳市", tip: 20, value: "1_2"},
- {label: "永州市", tip: 22, value: "1_4"},
- {label: "衡阳市", tip: 22, value: "1_5"},
- {label: "益阳市", tip: 22, value: "1_6"},
- {label: "张家界", tip: 22, value: "1_7"},
- ],
- },
- {
- label: "广东省", value: "2",
- children: [
- {label: "全部", value: null},
- {label: "广州市", value: "2_1"},
- {label: "惠州市", value: "2_2"},
- {label: "中山市", value: "2_3"},
- ],
- },
- {
- label: "浙江省", value: "3",
- children: [
- {label: "全部", value: null},
- {label: "杭州市", value: "3_1"},
- {label: "宁波市", value: "3_2"},
- {label: "温州市", value: "3_3"},
- ],
- },
- ]
- },
- {
- name: 'status', title: '状态', options: [
- {label: "全部状态", value: null},
- {label: "待付款", value: "1"},
- {label: "待发货", value: "2"},
- {label: "待收货", value: "3"},
- {label: "待评价", value: "4"}
- ]
- },
- {
- name: 'sort', title: '排序', options: [
- {label: "默认排序", value: null},
- {label: "销量排序", value: "1"},
- {label: "好评排序", value: "2"},
- ]
- }
-]
diff --git a/pages/zyb/historyScoreControlLine/index-copu.vue b/pages/zyb/historyScoreControlLine/index-copu.vue
new file mode 100644
index 0000000..ac87a04
--- /dev/null
+++ b/pages/zyb/historyScoreControlLine/index-copu.vue
@@ -0,0 +1,162 @@
+
+
+
+
+
+ 2024艺考改革，原专业满分{{scoreUpdate.oldScoreMax}}分调整为{{scoreUpdate.scoreMax}}分。
+
+
+
+
+
+ 年份
+
+
+ 批次
+
+
+ 专业线(统/校)
+
+
+ 文化线(统/校)
+
+
+
+
+
+
+
+
+ {{ item.year }}
+
+
+
+
+
+ {{ it.batch || '-' }}
+
+
+ {{ it.specialScore || '-' }}
+ /{{ it.specialScoreXk || '-' }}
+
+
+ {{ it.culturalScore || '-' }}
+ /{{ it.culturalScoreXk || '-' }}
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pages/zyb/historyScoreControlLine/index.vue b/pages/zyb/historyScoreControlLine/index.vue
index 2fb9dc7..e22820b 100644
--- a/pages/zyb/historyScoreControlLine/index.vue
+++ b/pages/zyb/historyScoreControlLine/index.vue
@@ -5,17 +5,22 @@ import ApiConstant from "@/common/ApiConstant";
import Request from '@/common/request'
import {onMounted} from "vue";
import StaticConstant from "@/common/StaticConstant";
+import View from "../../component/view/view.vue";
let request = new Request()
const dataList = ref()
+const userScoreInfo = ref()
const scoreUpdate = ref()
function getHistoryList() {
let that = this
let scoreInfo = uni.getStorageSync('scoreInfo')
+ userScoreInfo.value = scoreInfo
let data = {
professionalCategory: '美术与设计类',
category: '文科'
}
+ console.log(userScoreInfo.value)
+
if (scoreInfo && scoreInfo.professionalCategory) {
data.professionalCategory = scoreInfo.professionalCategory
}
@@ -54,57 +59,64 @@ onMounted(() => {
-
- 2024艺考改革，原专业满分{{scoreUpdate.oldScoreMax}}分调整为{{scoreUpdate.scoreMax}}分。
-
-
-
-
-
- 年份
+
+
+ 2024艺考改革，原专业满分{{scoreUpdate.oldScoreMax}}分调整为{{scoreUpdate.scoreMax}}分。
+
+
+ 河南省
+ {{userScoreInfo.professionalCategory}}
+ {{userScoreInfo.cognitioPolyclinic}}历年批次线
+
+
+
+
+
+ {{item.year}}
+
-
- 批次
-
-
- 专业线(统/校)
-
-
- 文化线(统/校)
-
-
-
-
-
-
-
-
- {{ item.year }}
-
-
-
-
-
- {{ it.batch || '-' }}
+
+
+
+
+
+ 批次
-
- {{ it.specialScore || '-' }}
- /{{ it.specialScoreXk || '-' }}
+
+
+ {{userScoreInfo.cognitioPolyclinic ==='文科'?'专业(文/理)':'专业(理/文)'}}
+
+ 专业(统/校)
-
- {{ it.culturalScore || '-' }}
- /{{ it.culturalScoreXk || '-' }}
+
+
+ {{userScoreInfo.cognitioPolyclinic ==='文科'?'文化(文/理)':'文化(理/文)'}}
+
+ 文化(统/校)
+
+
+
+
+
+ {{ it.batch || '-' }}
+
+
+ {{ it.specialScore || '-' }}
+ /{{ it.specialScoreXk || '-' }}
+
+
+ {{ it.culturalScore || '-' }}
+ /{{ it.culturalScoreXk || '-' }}
+
+
-
diff --git a/pages/zyb/home.vue b/pages/zyb/home.vue
index 0e0fa56..b0646d4 100644
--- a/pages/zyb/home.vue
+++ b/pages/zyb/home.vue
@@ -3,181 +3,582 @@ import StaticConstant from "@/common/StaticConstant";
import ImagesConstant from "@/common/ImagesConstant";
import ApiConstant from "@/common/ApiConstant";
import Request from "@/common/request";
+import JumpTool from "@/common/js/jumpTool";
+import jumpTool from "@/common/js/jumpTool";
let request = new Request()
export default {
name: "home",
components: {},
computed: {
+ jumpTool() {
+ return jumpTool
+ },
StaticConstant() {
return StaticConstant
}
},
data() {
return {
- scoreInfo: {
- province: '河南',//省份
- cognitioPolyclinic: '',//科类
- professionalCategory: '',//报考方向
- culturalScore: '',//文化分
- professionalScore: '',//统考分
- },
+ userStatus: false,
+ scoreInfo: null,
zyNum: null,//专业数量
defaultIcon: ImagesConstant.defaultIcon,//默认图片
- tjlb: {
+ fillVolunteer: {
+ all: null,//全部
kcj: null,//冲刺推荐
jwt: null,//较稳妥
kbd: null//可保底
},
options: StaticConstant.HomeOptions,
+ statusList: [{status: 'noMore'}, {status: 'noMore'},],
+ statusTypes: StaticConstant.loadStatusTypes,
+ contentText: StaticConstant.loadContentText,
+
+ admissionsRegulationsList: [],//招生章程
+ //底部tab切换
+ scrollLeft: 0,
+ topFlag: false,
+ //{id: 1, name: '招生章程', list: [], current: 1, pageSie: 5},
+ tabs: [{id: 2, name: '高考动态', current: 1, pageSie: 5, list: []}, {
+ id: 3,
+ name: '校内资讯', current: 1, pageSie: 5,
+ list: []
+ }],
+ currentTab: 0,
}
},
onShow() {
- let score = uni.getStorageSync('scoreInfo')
- let fillVolunteer = uni.getStorageSync('fillVolunteer')
- if (score !== undefined && score !== null) {
- this.scoreInfo = score
- if (!fillVolunteer || !fillVolunteer.all) {
- this.getRecommendMajorCount()
- fillVolunteer = uni.getStorageSync('fillVolunteer')
+ //进入页面后，判断是否登录了
+ let userInfo = uni.getStorageSync('userInfo')
+ if (userInfo) {
+ this.userStatus = true
+ //判断缓存中是否有成绩信息
+ this.scoreInfo = uni.getStorageSync('scoreInfo')
+ //缓存中是否有推荐院校数量
+ this.fillVolunteer = uni.getStorageSync('fillVolunteer')
+ if (!this.fillVolunteer || this.fillVolunteer === '' || !this.scoreInfo || this.scoreInfo === '') {
+ this.getUserScore()
}
}
-
- if (fillVolunteer) {
- this.zyNum = fillVolunteer.all
- this.tjlb.kcj = fillVolunteer.kcj
- this.tjlb.jwt = fillVolunteer.jwt
- this.tjlb.kbd = fillVolunteer.kbd
+ },
+ onLoad() {
+ this.getAdmissionsRegulationsList()
+ },
+ onReachBottom() {
+ this.loadMore()
+ },
+ onPageScroll(e) { //根据距离顶部距离是否显示回到顶部按钮
+ //当距离大于600时显示回到顶部按钮，//当距离小于600时隐藏回到顶部按钮
+ this.topFlag = e.scrollTop > 600;
+ },
+ onShareAppMessage() {
+ return {
+ title: StaticConstant.systemName, //分享标题
+ path: "/pages/zyb/home"
+ }
+ },
+ // 分享到微信朋友圈
+ onShareTimeline(res) {
+ return {
+ title: StaticConstant.systemName, //分享标题
+ path: "/pages/zyb/home"
}
},
methods: {
- goto(url) {
- uni.navigateTo({
- url: url
- })
- },
/*点击 操作菜单*/
optionItemChange(e) {
+ console.log('1111')
if (this.options && this.options[e.detail.index].url) {
- this.goto(this.options[e.detail.index].url)
+ if (this.options[e.detail.index].title !== '艺考考研' && this.options[e.detail.index].title !== '招生章程') {
+ if (this.checkUserScore()) {
+ JumpTool.goto(this.options[e.detail.index].url)
+ }
+ } else {
+ JumpTool.goto(this.options[e.detail.index].url)
+ }
}
},
- getRecommendMajorCount() {
- request.get(ApiConstant.Major.recommendMajorCount, {}).then(res => {
+ /*判断用户是否登录*/
+ checkUserStatus() {
+ if (!this.userStatus) {
+ JumpTool.goLogin()
+ return false
+ }
+ },
+ /*判断用户的分数信息*/
+ checkUserScore() {
+ //判断登录状态
+ this.checkUserStatus()
+ if (!this.scoreInfo) {
+ JumpTool.openScoreEdit()
+ return false
+ } else {
+ return true
+ }
+ },
+ onClickEditUserScore() {
+ JumpTool.openScoreEdit()
+ },
+ /*点击AI一键填报*/
+ onClickAi() {
+ if (this.checkUserScore()) {
+ JumpTool.goto('/pages/zyb/fillVolunteer/aiAuto')
+ }
+
+ },
+ /*点击模拟填报*/
+ onClickMn() {
+ if (this.checkUserScore()) {
+ //JumpTool.goto('/pages/zyb/fillVolunteer/index')
+ JumpTool.goto('/pages/zyb/fillVolunteer/mockList')
+ }
+ },
+ /*获取用户的分数信息*/
+ getUserScore() {
+ request.get(ApiConstant.Score.getScore, {}).then(res => {
if (res.success) {
- let result = res.result
- //将数据存入 缓存
- let fillVolunteer = {
- all: result.allNumber,
- kcj: result.kcj,
- jwt: result.jwt,
- nlq: result.nan,
- kbd: result.kbd
+ if (res.result) {
+ //接口返回了成绩
+ if (res.result.scoreInfo) {
+ uni.setStorageSync('scoreInfo', res.result.scoreInfo)
+ this.scoreInfo = res.result.scoreInfo
+ }
+ //从成绩中提取 可报院校专业数量
+ if (res.result.fillVolunteer) {
+ uni.setStorageSync('fillVolunteer', res.result.fillVolunteer)
+ this.fillVolunteer = res.result.fillVolunteer
+ }
+ if (res.result.volunteer) {
+ uni.setStorageSync('volunteer', res.result.volunteer)
+ this.volunteer = res.result.volunteer
+ }
}
- uni.setStorageSync('fillVolunteer', fillVolunteer)
+ } else {
+ //有异常
}
}).catch(err => {
}).finally(() => {
});
},
+ /*招生章程*/
+ getAdmissionsRegulationsList() {
+ this.setStatus('loading')
+ let params = {
+ type: this.tabs[this.currentTab].id,
+ pageNum: this.tabs[this.currentTab].current,
+ pageSize: 5
+ }
+ request.get(ApiConstant.Article.articlePage, params).then(res => {
+ console.log(res)
+ if (res.success) {
+ this.tabs[this.currentTab].current = res.result.current
+ this.tabs[this.currentTab].pages = res.result.pages
+ //追加到列表数据中
+ this.tabs[this.currentTab].list = [...this.tabs[this.currentTab].list, ...res.result.records]
+ if (res.result.current >= res.result.pages) {
+ this.setStatus('noMore')
+ } else {
+ this.setStatus('more')
+ }
+ } else {
+ }
+ }).catch(err => {
+ }).finally(() => {
+ });
+ },
+ setStatus(status) {
+ this.statusList[this.currentTab].status = status
+ },
+ loadMore() {
+ if (this.statusList[this.currentTab].status === 'noMore') {
+ return;
+ }
+ console.log('加载中')
+ this.tabs[this.currentTab].current++;
+ this.getAdmissionsRegulationsList()
+ },
+ /*回到顶部*/
+ clickTop() {
+ uni.pageScrollTo({
+ scrollTop: 0,
+ duration: 300
+ });
+ },
+ swichMenu(id) {
+ this.currentTab = id
+
+ this.title = ''
+ this.tabs[this.currentTab].current = 1
+ this.tabs[this.currentTab].list = []
+ this.getAdmissionsRegulationsList()
+
+ console.log(id)
+ //this.tabCurrent = 'tabNum'+ id
+ // 滑动swiper后，每个选项距离其父元素最左侧的距离
+ this.scrollLeft = 0;
+ for (let i = 0; i < id; i++) {
+ this.scrollLeft += 60
+ console.log(this.scrollLeft, 60, id)
+ }
+ },
}
}
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+ 输入分数
- {{ item.title }}
+
+ 查看可报院校
-
-
+
+
+
+ {{ fillVolunteer.allNumber }}
+ 所
+
+
+
+ 查看可报院校
+
+
+
+
+
+
+
+
+
+
+ ·
+ 冲刺
+ {{ userStatus && fillVolunteer.kcj || '--' }}
+
+
+ ·
+ 稳妥
+ {{ userStatus && fillVolunteer.jwt || '--' }}
+
+
+ ·
+ 保底
+ {{ userStatus && fillVolunteer.kbd || '--' }}
+
+
+
+
+
+
+ 登录/注册
+
+
+
+
+
+ AI一键填报
+ 推荐适合大学
+
+
+ 模拟填报
+ 找找适合的大学
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ item.title }}
+
+
+
+
+
+
+
+
+
+
+
+ {{ item.title }}
+
+ {{ item.releaseTime }}
+
+
+
+
+
+
+
+
+
+
diff --git a/pages/zyb/login.vue b/pages/zyb/login.vue
index 4711e15..e1917f7 100644
--- a/pages/zyb/login.vue
+++ b/pages/zyb/login.vue
@@ -4,6 +4,9 @@
import ApiConstant from "@/common/ApiConstant";
import Request from '@/common/request'
import StaticConstant from "@/common/StaticConstant";
+import commonTool from "../../common/js/commonTool";
+import {stringIsNotEmpty} from "../../common/util";
+
let request = new Request()
export default {
name: "home",
@@ -16,16 +19,95 @@ export default {
data() {
return {
checkFlag: false,
- isTick: true
+ showType: 1,
+ formData: {
+ userName: '',
+ password: '',
+ password2:''
+ },
+ isTick: true,
+ showFlag:false
}
},
onReady() {
-
+ },
+ onShow(){
+ // #ifdef MP-TOUTIAO
+ this.dyLogin()
+ // #endif
+ // #ifdef MP-WEIXIN
+ this.showFlag =true
+ // #endif
},
methods: {
- login(rrrr) {
+ //其他设备下线提示
+ otherSystemMessage(r){
+ if (r.result.loginState && r.result.loginState === 'more') {
+ uni.showToast({
+ title: '其他设备已下线，请稍等',
+ icon: 'none'
+ })
+ }
+ },
+ //刷新到首页
+ reloadHome(){
+ setTimeout(function () {
+ wx.reLaunch({
+ url: '/pages/zyb/home',
+ })
+ }, 500)
+ },
+ //抖音登录
+ dyLogin(){
+ //今日头条用户信息授权
+ let that = this
+ uni.login({
+ provider: 'toutiao',
+ success: function(loginRes) {
+ console.log(loginRes);
+ request.post(ApiConstant.User.dyLogin, {
+ code: loginRes.code,
+ anonymousCode: loginRes.anonymousCode,
+ }).then(r => {
+ console.log('请求登录', r)
+ if (r.success) {
+ console.log(r)
+ that.otherSystemMessage(r)
+ //token
+ uni.setStorageSync('token', r.result.token)
+ //用户信息
+ if (r.result.userInfo) {
+ uni.setStorageSync('userInfo', r.result.userInfo)
+ }
+ //vip信息
+ commonTool.checkVipInfo(r.result.vipInfo)
+ //重新打开首页
+ that.reloadHome()
+ } else {
+ uni.showToast({
+ title: r.message,
+ icon: 'none'
+ })
+ }
+ }).catch(err => {
+ }).finally(() => {
+ });
+ }
+ });
+ },
+ getPhoneNumber(e) {
+ console.log(e.detail.errMsg);
+ console.log(e.detail.iv);
+ console.log(e.detail.encryptedData);
+ if (!this.checkFlag) {
+ uni.showToast({
+ title: '请阅读后同意《艺体志愿宝用户协议》',
+ icon: 'none'
+ })
+ return
+ }
var sessionKey = ''
- if (rrrr && rrrr.detail && rrrr.detail.code) {
+ if (e && e.detail && e.detail.code) {
//选择授权
uni.login({
success: (res) => {
@@ -34,19 +116,24 @@ export default {
let code = res.code
request.post(ApiConstant.User.wxLogin, {
code: code,
- encryptedData: rrrr.detail.encryptedData,
- iv: rrrr.detail.iv
+ encryptedData: e.detail.encryptedData,
+ iv: e.detail.iv
}).then(r => {
console.log('请求登录', r)
if (r.success) {
console.log(r)
+ this.otherSystemMessage(r)
+ //token
uni.setStorageSync('token', r.result.token)
- uni.setStorageSync('userInfo', r.result.userInfo)
- //uni.setStorageSync('scoreInfo',r.result.scoreInfo)
- //跳转到首页
- wx.reLaunch({
- url: '/pages/zyb/home',
- })
+ //用户信息
+ if (r.result.userInfo) {
+ uni.setStorageSync('userInfo', r.result.userInfo)
+ }
+
+ //vip信息
+ commonTool.checkVipInfo(r.result.vipInfo)
+ //重新打开首页
+ this.reloadHome()
} else {
uni.showToast({
title: '微信授权登录失败',
@@ -70,71 +157,119 @@ export default {
})
return
}
- console.log(rrrr)
+ console.log(e)
},
- getPhoneNumber(r) {
- console.log('微信授权登录', r.detail)
- if (r.detail.userInfo) {
+ //密码登录
+ pwdLogin() {
+ if (!stringIsNotEmpty(this.formData.userName)) {
uni.showToast({
- title: '授权成功'
+ title: '请输入用户名',
+ icon: 'none'
})
- } else {
- // console.log('微信授权失败')
+ return
+ }
+ if (!stringIsNotEmpty(this.formData.password)) {
uni.showToast({
- title: '授权失败,请同意授权',
+ title: '请输入密码',
icon: 'none'
})
return
}
- let encryptedData = r.detail.encryptedData
- let iv = r.detail.iv
- // 获取code
- uni.getUserProfile({
- desc: 'Wexin', // 这个参数是必须的
- success: res => {
- console.log(res)
- },
- fail: err => {
- console.log(err)
- }
- })
-
- uni.login({
- success: (res) => {
- console.log('获取code', res)
- if (res.code) {
- let code = res.code
- apiLogin({
- code: code,
- loginType: '0',
- encryptedData: encryptedData,
- iv: iv
- }).then(res => {
- console.log('请求登录', res)
- const data = res[1]['data'];
- if (data.code === 200) {
- // 保存token
- uni.setStorageSync('token', data.data)
- // 判断跳转页面方法
-
- } else {
- console.log('微信授权登录失败')
- uni.showToast({
- title: '微信授权登录失败',
- icon: 'none'
- })
- return
- }
- });
- } else {
- uni.showModal({
- title: '未获取到code'
- })
- return
+ request.post(ApiConstant.User.login, {
+ username: this.formData.userName,
+ password: this.formData.password
+ }).then(r => {
+ if (r.success) {
+ console.log(r)
+ this.otherSystemMessage(r)
+ //token
+ uni.setStorageSync('token', r.result.token)
+ //用户信息
+ if (r.result.userInfo) {
+ uni.setStorageSync('userInfo', r.result.userInfo)
}
+ //vip信息
+ commonTool.checkVipInfo(r.result.vipInfo)
+ //重新打开首页
+ this.reloadHome()
+ } else {
+ uni.showToast({
+ title: r.message,
+ icon: 'none'
+ })
}
+ }).catch(err => {
+ }).finally(() => {
});
+
+ },
+ register(){
+ if (!stringIsNotEmpty(this.formData.userName)) {
+ uni.showToast({
+ title: '请输入手机号码',
+ icon: 'none'
+ })
+ return
+ }
+ let phoneNumberPattern = /^1[3-9]\d{9}$/;
+ let isValidPhoneNumber = phoneNumberPattern.test(this.formData.userName);
+ if (!isValidPhoneNumber) {
+ uni.showToast({
+ title: '手机号码格式不正确',
+ icon: 'none'
+ })
+ return
+ }
+ if (!stringIsNotEmpty(this.formData.password)) {
+ uni.showToast({
+ title: '请输入密码',
+ icon: 'none'
+ })
+ return
+ }
+ if (this.formData.password!==this.formData.password2) {
+ uni.showToast({
+ title: '两次密码不一致',
+ icon: 'none'
+ })
+ return
+ }
+ request.post(ApiConstant.User.register, {
+ username: this.formData.userName,
+ password: this.formData.password
+ }).then(r => {
+ if (r.success) {
+ console.log(r)
+ setTimeout(function () {
+ uni.showToast({
+ title: '注册成功',
+ icon: 'none'
+ })
+ }, 100)
+ //token
+ uni.setStorageSync('token', r.result.token)
+ //用户信息
+ if (r.result.userInfo) {
+ uni.setStorageSync('userInfo', r.result.userInfo)
+ }
+ //vip信息
+ commonTool.checkVipInfo(r.result.vipInfo)
+ //重新打开首页
+ this.reloadHome()
+
+ } else {
+ uni.showToast({
+ title: r.message,
+ icon: 'none'
+ })
+ }
+ }).catch(err => {
+ }).finally(() => {
+ });
+ },
+ //显示密码输入框
+ showPwdInput() {
},
gotoMianze() {
uni.navigateTo({
@@ -163,7 +298,7 @@ export default {
-
+
@@ -173,23 +308,103 @@ export default {
- 全国
- 600
- 万+考生的选择
+
+
+ 艺术生 更轻松的报志愿
-
-
+
+
+ /*#ifdef MP-TOUTIAO*/
+
+ /*#endif*/
+ /*#ifdef MP-WEIXIN*/
+
+ /*#endif*/
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 快捷登录
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 快捷登录
+
+
@@ -205,6 +420,38 @@ export default {
padding: 30rpx;
}
+.container {
+ height: 100%;
+}
+
+.uni-form-item .title {
+ padding: 20rpx 0;
+}
+
+/*表单 start*/
+.form-item {
+ display: flex;
+ align-items: center;
+ margin: 30rpx 0;
+}
+
+.form-item-label {
+ width: 20%;
+}
+
+.form-item-view {
+ width: 100%;
+ min-height: 80rpx;
+}
+
+.form-input {
+ border: 1rpx solid #e6e6e6;
+}
+
+.uni-input {
+ border: none;
+}
+
.textcenter {
text-align: center;
margin: 30rpx 0;
@@ -212,6 +459,7 @@ export default {
/*标题*/
.title {
+ font-family: "Bookshelf Symbol 7";
margin: 0 auto;
//color:white;
font-size: 90rpx;
@@ -223,11 +471,27 @@ export default {
font-size: 40rpx;
}
+.login-pwd-but {
+ color: #222222;
+ width: 500rpx;
+ background: #eeeeee;
+ //background-color: ;
+ border-radius: 10rpx;
+ font-weight: 550;
+}
+
///登录按钮
.login-but {
color: white;
width: 500rpx;
- background: linear-gradient(rgba(52, 145, 212, 0.83), #3658d0);
- border-radius: 50rpx
+ //background: linear-gradient(rgba(52, 145, 212, 0.83), #3658d0);
+ background: linear-gradient(#f96543, #f96543);
+ //background-color: ;
+ border-radius: 10rpx;
+ font-weight: 550;
+}
+
+.login-but-disabled {
+ background: #eeeeee;
}
diff --git a/pages/zyb/major/detail.vue b/pages/zyb/major/detail.vue
index f3aeade..7062ffb 100644
--- a/pages/zyb/major/detail.vue
+++ b/pages/zyb/major/detail.vue
@@ -1,13 +1,20 @@
@@ -40,10 +96,10 @@ export default {
+ @clear="clearTitleInput" cancelButton="none" @confirm="searchTitleClick"/>
- 搜索
+ 搜索
@@ -53,18 +109,21 @@ export default {
专业
-
-
+
+
{{ item.schoolName }}
- {{ item.type }}
+ {{ item.degreeNature }}
{{ item.majorName }}
+
+
+
@@ -104,7 +163,8 @@ export default {
.schoolList .schoolItem {
display: flex;
flex-direction: row;
- line-height: 90rpx;
+ padding: 30rpx 0;
+ //line-height: 90rpx;
}
.schoolList .schoolItem .td {
diff --git a/pages/zyb/npee/schoolNpee.vue b/pages/zyb/npee/schoolNpee.vue
new file mode 100644
index 0000000..e067daf
--- /dev/null
+++ b/pages/zyb/npee/schoolNpee.vue
@@ -0,0 +1,241 @@
+
+
+
+
+
+ {{ schoolName }}
+ 有保研资格
+
+
+
+
+
+
+
+
+ 学科类别
+ 专业
+
+
+
+
+
+
+
+ ({{ item.subjectCode }}){{ item.disciplineField }}
+
+ {{ item.majorName.replace('（专业学位）',"") }}
+
+
+
+
+
+
+
+
+
+ {{ child.researchDirection }}
+
+ 详情
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 学科类别
+ 专业
+
+
+
+
+
+
+
+ ({{ item.subjectCode }}){{ item.disciplineField }}
+
+ {{ item.majorName.replace('（专业学位）',"") }}
+
+
+
+
+
+
+
+
+
+ {{ child.researchDirection }}
+
+ 详情
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pages/zyb/npee/schoolNpeeDetail.vue b/pages/zyb/npee/schoolNpeeDetail.vue
new file mode 100644
index 0000000..cb3535a
--- /dev/null
+++ b/pages/zyb/npee/schoolNpeeDetail.vue
@@ -0,0 +1,144 @@
+
+
+
+
+
+
+
+
+ {{ detail.disciplineField }}
+
+
+ {{ detail.majorNameLimit }}
+
+
+ {{ detail.researchDirectionLimit }}
+
+
+
+
+ 学科类别
+
+
+ 专业
+
+
+ 研究方向
+
+
+
+
+
+
+ {{detailKeyList[key]}}
+
+
+ {{detail[key]||''}}
+
+
+
+
+
+
+ 考试范围
+
+
+ {{categoryList[k]}}:
+
+ {{item[k]}}
+
+
+
+
+
+
+
diff --git a/pages/zyb/order/detail.vue b/pages/zyb/order/detail.vue
new file mode 100644
index 0000000..c8c90ee
--- /dev/null
+++ b/pages/zyb/order/detail.vue
@@ -0,0 +1,146 @@
+
+
+
+
+
+
+ 订单号
+
+ {{ order.orderCode }}
+
+
+ {{ getTextByStatus(order.orderStatus) }}
+
+
+
+
+ {{ order.skuName }}
+
+
+
+ {{ order.skuDetail }}
+
+
+
+ 下单时间：{{ order.createTime }}
+
+
+
+ 付款时间：{{ order.paymentTime }}
+
+
+
+ 退款时间：{{ order.refundTime }}
+
+
+
+ ￥{{ order.totalAmount }}
+
+
+
+
+
+
diff --git a/pages/zyb/order/list.vue b/pages/zyb/order/list.vue
new file mode 100644
index 0000000..ef4e4ba
--- /dev/null
+++ b/pages/zyb/order/list.vue
@@ -0,0 +1,175 @@
+
+
+
+
+
+
+ 订单号
+
+ {{ order.orderCode }}
+
+
+ {{ getTextByStatus(order.orderStatus) }}
+
+
+
+
+ {{ order.skuName }}
+
+
+
+ {{ order.skuDetail }}
+
+
+
+ 下单时间：{{ order.createTime }}
+
+
+
+ 付款时间：{{ order.paymentTime }}
+
+
+
+ 退款时间：{{ order.refundTime }}
+
+
+
+ ￥{{ order.totalAmount }}
+
+
+
+
+
+
+ 暂无订单信息
+
+
+
+
+
+
+
diff --git a/pages/zyb/other/admissionsInformation.uvue b/pages/zyb/other/admissionsInformation.uvue
deleted file mode 100644
index 8340dfa..0000000
--- a/pages/zyb/other/admissionsInformation.uvue
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
diff --git a/pages/zyb/other/admissionsInformation.vue b/pages/zyb/other/admissionsInformation.vue
index 82f5b7a..2ecc612 100644
--- a/pages/zyb/other/admissionsInformation.vue
+++ b/pages/zyb/other/admissionsInformation.vue
@@ -16,57 +16,17 @@ export default {
},
data() {
return {
- searchText: '',
- list: [
- {
- title: '新疆艺术学院2024年本科招生简章',
- url: ''
- },
- {
- title: '新疆艺术学院2024年本科招生简章招生简章招生简章招生简章招生简章',
- url: ''
- }
- ]
}
},
methods: {
- clearSearchInput() {
-
- },
- searchClick() {
-
- }
}
}
-
-
-
-
-
-
-
- {{ item.title }}
-
-
-
-
-
-
diff --git a/pages/zyb/other/calculateInvestment.vue b/pages/zyb/other/calculateInvestment.vue
index 54a572c..3031c69 100644
--- a/pages/zyb/other/calculateInvestment.vue
+++ b/pages/zyb/other/calculateInvestment.vue
@@ -5,6 +5,8 @@
import StaticConstant from "@/common/StaticConstant";
import ApiConstant from "@/common/ApiConstant";
import Request from '@/common/request'
+import JumpTool from "@/common/js/jumpTool";
+import {stringIsNotEmpty} from "../../../common/util";
let request = new Request()
export default {
@@ -18,38 +20,29 @@ export default {
data() {
return {
show:true,
+ vipInfo:{},
+ scoreInfo:{},
//省份
provinceArray: StaticConstant.provinceList,
provinceIndex: 0,
//专业类别
- professionalCategoryArray: StaticConstant.professionalCategoryList.filter((item)=>{
- return item.value !=='体育类'
- }),
+ professionalCategoryArray: StaticConstant.professionalCategoryList,
professionalCategoryIndex: 0,
//文理分科选择参数
categoryArray: StaticConstant.categoryList,
categoryIndex: 0,
//批次
- batchArray: StaticConstant.batchAllList,
+ batchArray: [{label: '本科批', value: '本科'}, {label: '高职高专批', value: '高职高专'}],
batchIndex: 0,
culturalScore: '',//文化分
professionalScore: '',//统考分
- list:[
- {
- rulesEnrollProbability:'文过专排',
- probabilityOperator:'专业分',
- score:1,
- schoolNum:11
- },
- {
- rulesEnrollProbability:'文3专7',
- probabilityOperator:'文化分*0.04+专业分+0.233',
- score:1,
- schoolNum:5
- }
- ]
+ list:[]
}
},
+ onLoad(){
+ this.vipInfo = uni.getStorageSync('vipInfo')
+ this.scoreInfo = uni.getStorageSync('scoreInfo')
+ },
methods: {
bindProvinceArrayPickerChange(e) {
this.provinceIndex = e.detail.value
@@ -59,6 +52,7 @@ export default {
},
bindProfessionalCategoryArrayPickerChange(e) {
this.professionalCategoryIndex = e.detail.value
+ this.batchIndex = 0
},
bindBatchArrayPickerChange(e) {
this.batchIndex = e.detail.value
@@ -78,6 +72,30 @@ export default {
})
},
clickCalculate(){
+ if (!this.vipInfo || !stringIsNotEmpty(this.vipInfo.vipLevel) || this.vipInfo.vipLevel<1) {
+ uni.showModal({
+ title: 'VIP专享',
+ // 提示文字
+ content: '该功能为增值内容，开通会员后即可免费查看！',
+ // 取消按钮的文字自定义
+ cancelText: "取消",
+ // 确认按钮的文字自定义
+ confirmText: "开通服务",
+ //删除字体的颜色
+ confirmColor: 'red',
+ //取消字体的颜色
+ cancelColor: '#dddddd',
+ success: function (res) {
+ if (res.confirm) {
+ //JumpTool.openVip()
+ uni.navigateTo({
+ url: '/pages/zyb/vip/index'
+ })
+ }
+ }
+ })
+ return
+ }
if (!this.culturalScore) {
uni.showToast({
title: '请输入文化分',
@@ -98,8 +116,9 @@ export default {
province:this.provinceArray[this.provinceIndex].label,
culturalScore: this.culturalScore,//文化分
professionalScore: this.professionalScore,//统考分
- category:this.categoryArray[this.categoryIndex].name,
- professionalCategory:this.professionalCategoryArray[this.professionalCategoryIndex].label,
+ category:this.scoreInfo.cognitioPolyclinic,//this.categoryArray[this.categoryIndex].name
+ professionalCategory:this.scoreInfo.professionalCategory,
+ // this.professionalCategoryArray[this.professionalCategoryIndex].label
batch:this.batchArray[this.batchIndex].value
}).then(r => {
console.log(r)
@@ -111,6 +130,15 @@ export default {
}).finally(() => {
});
}
+ },
+ //跳转到填报页面
+ openMockList(e){
+ let url = '/pages/zyb/fillVolunteer/mockList'
+ //如果 关联的院校数量>0，则按录取方式跳转
+ if(e.schoolNum && e.schoolNum>0){
+ url+='?rulesEnrollProbability='+e.rulesEnrollProbability
+ }
+ JumpTool.goto(url);
}
}
}
@@ -125,33 +153,43 @@ export default {
-
+
-
+
+
+
+ 文化分
+
-
-
+
-
+
-
+
+
+
+ 专业分
+
-
-
+
@@ -160,7 +198,7 @@ export default {
- 省份
+ 省份
- 文理
+ 文理
- {{this.scoreInfo.cognitioPolyclinic}}
+
- 统考类别
+ 统考类别
- {{this.scoreInfo.professionalCategory}}
+
- 批次
+ 批次
@@ -211,7 +251,7 @@ export default {
- 省份
+ 省份
{{ provinceArray[provinceIndex].label }}
@@ -220,16 +260,16 @@ export default {
- 统考类别
+ 统考类别
- {{ professionalCategoryArray[professionalCategoryIndex].label }}
+ {{ scoreInfo.professionalCategory }}
- 批次
+ 批次
{{ batchArray[batchIndex].label }}
@@ -238,7 +278,7 @@ export default {
- 文化成绩
+ 文化成绩
{{ culturalScore }}
@@ -246,7 +286,7 @@ export default {
- 专业成绩
+ 专业成绩
{{ professionalScore }}
@@ -254,7 +294,7 @@ export default {
- 本批次所有院校录取规则为
+ 本批次所有院校录取规则为
@@ -271,15 +311,15 @@ export default {
{{item.probabilityOperator}}
{{item.score}}分
- 查看院校{{item.schoolNum}}所
+ 查看院校{{item.schoolNum}}所
-
+
+ style="background-color:#f2876a;color:white;font-size: 40rpx;width: 200rpx;height: 200rpx;border-radius: 50%;text-align: center;line-height: 200rpx">
{{show?'计算':'重置'}}
@@ -292,14 +332,26 @@ export default {
.body {
background: white;
height: 100%;
+ //min-height: 1000rpx;
padding: 0 15%;
}
+.color2{
+// background-color: #f78668;
+ background-color: #6b58fa;
+}
+
+.color3{
+// background-color: #399ee8;
+ background-color: #f35b3d;
+}
+
/*标题*/
.title {
- padding-top: 50rpx;
- color: #399ee8;
- font-size: 60rpx;
+ padding-top: 20rpx;
+ //color: #399ee8;
+ color: #8ebfe2;
+ font-size: 70rpx;
font-weight: 600;
}
@@ -309,7 +361,6 @@ export default {
box-shadow: 0 0 10rpx 5rpx #aaa;
.ftitle {
- background-color: #399ee8;
color: white;
border-radius: 10rpx;
font-size: 28rpx;
@@ -325,8 +376,8 @@ export default {
color: white;
border-radius: 10rpx;
font-size: 28rpx;
- margin: 0 auto;
- text-align: center;
+ //margin: 0 auto;
+ /*text-align: center;*/
height: 40rpx;
line-height: 40rpx;
}
@@ -353,13 +404,14 @@ export default {
margin-top: 100rpx;
.left-t {
- background-color: #399ee8;
+ //background-color: #399ee8;
+ //background-color: #8162fa;
color: white;
- height: 50rpx;
- line-height: 50rpx;
+ height: 40rpx;
+ line-height: 40rpx;
border-radius: 10rpx;
padding: 5rpx 10rpx;
- font-size: 33rpx;
+ font-size: 28rpx;
text-align: justify;
label {
display: inline-block;
@@ -372,9 +424,9 @@ export default {
.right-input {
padding: 5rpx 10rpx;
- height: 50rpx;
- line-height: 50rpx;
- font-size: 35rpx;
+ height: 40rpx;
+ line-height: 40rpx;
+ font-size: 28rpx;
}
.option-item {
@@ -394,7 +446,7 @@ export default {
}
.datalist{
- height: 700rpx;
+ height: 500rpx;
overflow:scroll;
text-align: center;
.th{
diff --git a/pages/zyb/other/checkRanking.vue b/pages/zyb/other/checkRanking.vue
index 484fcf5..3d0e062 100644
--- a/pages/zyb/other/checkRanking.vue
+++ b/pages/zyb/other/checkRanking.vue
@@ -111,9 +111,9 @@ export default {
-
+
-
+
@@ -178,7 +178,7 @@ export default {
- 您的分数已低于{{item.year}}公布的最低分，最低分为{{item.beginScore}}分，排名为{{item.rank}}名
+ 您的分数已低于{{item.year}}公布的最低分{{item.beginScore}}分
diff --git a/pages/zyb/other/commonProblem.vue b/pages/zyb/other/commonProblem.vue
index 9c10a33..c3876f1 100644
--- a/pages/zyb/other/commonProblem.vue
+++ b/pages/zyb/other/commonProblem.vue
@@ -4,9 +4,15 @@
+
+
+
+
+
+ 问题反馈
+
+
+
+
+
+
+ 问题类型
+
+
+ {{ typeArray[typeIndex].label }}
+
+
+
+
+ 问题描述
+
+
+
+
+
+ 联系人
+
+
+
+
+
+ 联系电话
+
+
+
+
+
+ 联系我们：{{StaticConstant.email}}
+
+
+
+ 提交问题
+
+
+
+
+
diff --git a/pages/zyb/other/updateLogs.vue b/pages/zyb/other/updateLogs.vue
index 945a968..c223bc0 100644
--- a/pages/zyb/other/updateLogs.vue
+++ b/pages/zyb/other/updateLogs.vue
@@ -25,13 +25,14 @@ export default {
},
onLoad() {
// 步骤数组数据反序
- this.stepData.reverse()
+ /*this.stepData.reverse()*/
},
}
-
+
+
diff --git a/pages/zyb/school/detail.vue b/pages/zyb/school/detail.vue
index ef2711c..289cbc1 100644
--- a/pages/zyb/school/detail.vue
+++ b/pages/zyb/school/detail.vue
@@ -3,10 +3,17 @@ import ApiConstant from "@/common/ApiConstant";
import Request from '@/common/request'
import StaticConstant from "@/common/StaticConstant";
import ImagesConstant from "@/common/ImagesConstant";
+import JumpTool from "@/common/js/jumpTool";
+import {arrayIsNotEmpty} from "../../../common/util";
+import View from "../../component/view/view.vue";
// 路径自行修改
let request = new Request()
export default {
+ components: {View},
computed: {
+ JumpTool() {
+ return JumpTool
+ },
ImagesConstant() {
return ImagesConstant
}
@@ -15,6 +22,7 @@ export default {
return {
culturalScore: '',//我的文化分
professionalScore: '',//我的专业分
+ scoreInfo: {},
category: '文科',//
schoolInfo: {},//学校信息
schoolCode: '',//学校编码
@@ -24,28 +32,15 @@ export default {
tab: 'zlxx',
scrollLeft: 0,
chartData: {},
- opts: {
- color: ["#1890FF", "#91CB74", "#FAC858", "#EE6666", "#73C0DE", "#3CA272", "#FC8452", "#9A60B4", "#ea7ccc"],
- padding: [5, 5, 5, 5],
- enableScroll: false,
- extra: {
- pie: {
- activeOpacity: 0.5,
- activeRadius: 10,
- offsetAngle: 0,
- labelWidth: 15,
- border: true,
- borderWidth: 3,
- borderColor: "#FFFFFF"
- }
- }
- },
+ opts: StaticConstant.opts,
fsxIndex: 0,//分数线选择
tdxIndex: 0,//投档线选择
majorList: [],//
professionalCategoryIndex: 0,//批次专业选择
professionalCategoryList: StaticConstant.professionalCategoryList,//
+ admissionsRegulationsList: [],//招生章程列表
historyScoreControlLineList: [],//批次线数据
+ subjectEvaluationList:[],//第四轮学科评估
}
},
onShow() {
@@ -54,23 +49,35 @@ export default {
if (e.schoolCode) {
this.schoolCode = e.schoolCode;
}
+ if (e.tab) {
+ this.tab = e.tab
+ }
// this.schoolCode = '2090'
this.getSchoolDetailInfo()
let scoreInfo = uni.getStorageSync('scoreInfo')
if (scoreInfo) {
+ this.scoreInfo = scoreInfo
this.culturalScore = scoreInfo.culturalScore
this.professionalScore = scoreInfo.professionalScore
this.category = scoreInfo.cognitioPolyclinic
}
-
},
methods: {
- goto(e){
+ goto(e) {
uni.navigateTo({
url: e
})
},
+ //查看科研点
+ gotoNpee() {
+ let url = '/pages/zyb/npee/schoolNpee?schoolId='
+ url += this.schoolInfo.id + "&schoolName=" + this.schoolInfo.schoolName
+ if (this.schoolInfo.schoolResearchTeaching && this.schoolInfo.schoolResearchTeaching.byzg) {
+ url += '&byzg=' + this.schoolInfo.schoolResearchTeaching.byzg
+ }
+ this.goto(url)
+ },
swichMenu(id) {
this.currentTab = id
console.log(id)
@@ -81,7 +88,7 @@ export default {
console.log(this.scrollLeft, 60, id)
}
},
- /*获取专业详情*/
+ //获取院校详情
getSchoolDetailInfo() {
let that = this
request.get(ApiConstant.School.schoolInfo, {
@@ -96,11 +103,15 @@ export default {
this.loadManData()
//获取院校开设专业
this.getSchoolMajorList()
+ this.getDoubleFirstPlan()
+ this.getSubjectEvaluation()
//加载 批次线
- this.getHistoryList()
+ //this.getHistoryList()
}
}).catch(err => {
}).finally(() => {
+ //获取招生章程
+ this.getAdmissionsRegulationsList()
});
},
//收藏院校
@@ -162,7 +173,7 @@ export default {
professionalCategory: this.professionalCategoryList[this.professionalCategoryIndex].value,
category: this.category,
pageSize: 999
- }).then(res => {
+ }, {showLoad: false}).then(res => {
if (res.success) {
this.historyScoreControlLineList = res.result.records
}
@@ -170,11 +181,12 @@ export default {
}).finally(() => {
});
},
- getSchoolMajorList(){
+ getSchoolMajorList() {
request.get(ApiConstant.Major.schoolMajorList, {
cognitioPolyclinic: this.category,
- schoolCode: this.schoolCode
- }).then(res => {
+ schoolCode: this.schoolCode,
+ professionalCategory: this.scoreInfo.professionalCategory
+ }, {showLoad: false}).then(res => {
if (res.success) {
this.majorList = res.result
}
@@ -182,6 +194,40 @@ export default {
}).finally(() => {
});
},
+ //获取双万计划
+ getDoubleFirstPlan() {
+ if (this.schoolInfo && this.schoolInfo.id) {
+ request.get(ApiConstant.School.doubleFirstPlan, {
+ schoolId: this.schoolInfo.id
+ }, {showLoad: false}).then(res => {
+ if (res.success) {
+ console.log(res)
+ this.doubleFirstPlan = res.result
+ //如果国家级跟省级 都有，给院校的标签里加一个 双万计划
+ if (arrayIsNotEmpty(this.doubleFirstPlan.gjjList) || arrayIsNotEmpty(this.doubleFirstPlan.sjList)) {
+ this.schoolInfo.tagsList.push('双万计划')
+ }
+ }
+ }).catch(err => {
+ }).finally(() => {
+ });
+ }
+ },
+ //获取第四轮学科评估
+ getSubjectEvaluation() {
+ if (this.schoolInfo && this.schoolInfo.id) {
+ request.get(ApiConstant.School.subjectEvaluation, {
+ schoolId: this.schoolInfo.id
+ }, {showLoad: false}).then(res => {
+ if (res.success) {
+ console.log(res)
+ this.subjectEvaluationList = res.result
+ }
+ }).catch(err => {
+ }).finally(() => {
+ });
+ }
+ },
//选择批次线下拉
bindPickerPcxChange(e) {
this.professionalCategoryIndex = e.detail.value
@@ -195,6 +241,24 @@ export default {
bindPicker_lqMajorChange(e) {
this.fsxIndex = e.detail.value
},
+ /*获取招生章程*/
+ getAdmissionsRegulationsList() {
+ let params = {
+ type: StaticConstant.TYPES.admissionsRegulations,
+ schoolId: this.schoolInfo.id,
+ pageNum: 1,
+ pageSize: 5
+ }
+ request.get(ApiConstant.Article.articlePage, params, {showLoad: false}).then(res => {
+ console.log(res)
+ if (res.success) {
+ this.admissionsRegulationsList = res.result.records
+ } else {
+ }
+ }).catch(err => {
+ }).finally(() => {
+ });
+ },
}
}
@@ -227,11 +291,23 @@ export default {
{{ schoolInfo.street }}
-
-
-
- 收藏
-
+
+
+
+ {{ schoolInfo.arwuRanking }}
+
+ 软科排名
+
+
+
+
+
+
+
+ 关注院校
+
+
@@ -239,48 +315,143 @@ export default {
-
-
-
-
-
+
+
+
+
+
+
+
-
-
-
-
- {{ schoolInfo.gjtszy }}
-
-
-
-
- {{ schoolInfo.stszy }}
-
-
-
-
-
-
-
-
-
-
- 官方网址：
-
+
+
+
+
+
+
+
+
+ {{ item.majorName }}
+
+
+
+
+
+
-
- 招生电话：
- {{ schoolInfo.schoolPhone }}
+
+
+
+
+
+
+
+
+ {{ item.majorName }}
+
+
+
+
+
+
-
- 校区地址：
- {{ schoolInfo.street }}
+
+
+
+
+
+
+
+
+ {{ item.subjectName }}
+
+
+ {{item.evaluationResult}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 专硕点 {{ schoolInfo.schoolResearchTeaching.professionalMasterDegreePoint }}
+
+
+
+
+ 学硕点 {{ schoolInfo.schoolResearchTeaching.academicMasterDegreePoint }}
+
+
+
+
+ 有博士点
+
+
-
-
+ 有保研资格
+
+ 有研究生院
+
+ 自划线院校
+
+
+
+ 暂无
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 官方网址：
+
+
+
+ 招生电话：
+ {{ schoolInfo.schoolPhone }}
+
+
+ 校区地址：
+ {{ schoolInfo.street }}
+
+
+
+
+
+
@@ -299,6 +470,17 @@ export default {
+
+
+ {{ item.title }}
+
+ {{ item.releaseTime }}
+
+
+
+
@@ -336,52 +518,11 @@ export default {
-
-
-
+
{{ majorList[fsxIndex].majorName }}
录取公式：
- {{ item.probabilityOperator || '未公布' }}
+ {{ item.probabilityOperator }}
+
+ {{
+ item.rulesEnrollProbability === '文过专排' ? '文化分过省控线，专业分排序' : item.rulesEnrollProbability === '专过文排' ? '专业分过省控线，文化分排序' : item.rulesEnrollProbability
+ }}
+
+ 未公布
录取分数：
@@ -430,9 +577,11 @@ export default {
-
+
{{ item.majorName }}
+ 校考
@@ -443,17 +592,6 @@ export default {
-
-
diff --git a/pages/zyb/school/list.vue b/pages/zyb/school/list.vue
index 8a39465..0b7ff3b 100644
--- a/pages/zyb/school/list.vue
+++ b/pages/zyb/school/list.vue
@@ -3,13 +3,11 @@ import StaticConstant from "@/common/StaticConstant";
import ApiConstant from "@/common/ApiConstant";
import Request from '@/common/request'
import ImagesConstant from "@/common/ImagesConstant";
-import MyTopButton from "@/components/my-top-button.vue";
import {arrayIsNotEmpty, yearAbridge} from "@/common/util";
let request = new Request()
export default {
name: "school-list",
- components: {MyTopButton},
computed: {
ImagesConstant() {
return ImagesConstant
@@ -26,6 +24,7 @@ export default {
selectForm: {
addressList: [],
institutionTypeList: [],
+ schoolType: "",
tagsList: [],
schoolNatureList: []
},
@@ -52,11 +51,10 @@ export default {
title: "算投档",
icon: ImagesConstant.std,
url: "/pages/zyb/other/calculateInvestment"
- },
+ }
],
- userInfo: {
- vipFlag: true,//是否是vip
- },
+ userInfo: {},
+ vipInfo: {},
topFlag: false,
nowProvince: {
status: 'more',
@@ -83,13 +81,27 @@ export default {
onLoad() {
this.getSchoolList()
this.userInfo = uni.getStorageSync('userInfo')
+ this.vipInfo = uni.getStorageSync('vipInfo')
},
- onReachBottom(){
+ onReachBottom() {
console.log("已经滚动到底部了")
- if (this.userInfo.vipFlag) {
+ if (this.vipInfo && this.vipInfo.vipFlag) {
this.loadMore()
}
},
+ onShareAppMessage() {
+ return {
+ title: '查院校', //分享标题
+ path: "/pages/zyb/school/list"
+ }
+ },
+ // 分享到微信朋友圈
+ onShareTimeline(res) {
+ return {
+ title: '查院校', //分享标题
+ path: "/pages/zyb/school/list"
+ }
+ },
methods: {
yearAbridge,
search(res) {
@@ -113,6 +125,8 @@ export default {
if (this.selectForm.tagsList === null) {
this.selectForm.tagsList = []
}
+ } else if (e.children[i].title === '院校层次') {
+ this.selectForm.schoolType = e.children[i].value
} else if (e.children[i].title === '办学类型') {
this.selectForm.schoolNatureList = e.children[i].value
if (this.selectForm.schoolNatureList === null) {
@@ -167,15 +181,15 @@ export default {
if (arrayIsNotEmpty(this.selectForm.schoolNatureList)) {
schoolNatureStrs = this.selectForm.schoolNatureList.join(",")
}
-
request.get(ApiConstant.School.searchSchoolList, {
schoolName: this.schoolName,
province: province,
institutionType: institutionType,
tagsStrs: tagsStrs,
schoolNatureStrs: schoolNatureStrs,
+ schoolType: this.selectForm.schoolType,
pageNum: this.nowProvince.current, pageSize: this.nowProvince.size
- }).then(r => {
+ }, {showLoad: false}).then(r => {
console.log(r)
if (r.success) {
this.nowProvince.current = r.result.current
@@ -194,8 +208,8 @@ export default {
}).finally(() => {
});
},
-
searchSchoolClick() {
+ this.checkVip()
this.nowProvince.current = 1
this.nowProvince.schoolList = []
this.nowProvince.total = 0
@@ -224,6 +238,18 @@ export default {
duration: 300
});
},
+
+ /*判断vip*/
+ checkVip() {
+ if (!this.vipInfo || !this.vipInfo.vipFlag) {
+ uni.showToast({
+ title: '开通VIP无限次查询',
+ duration: 1000,
+ icon: "none"
+ });
+ return
+ }
+ }
},
onPageScroll(e) { //根据距离顶部距离是否显示回到顶部按钮
//当距离大于600时显示回到顶部按钮，//当距离小于600时隐藏回到顶部按钮
@@ -251,20 +277,20 @@ export default {
+ style="height: 90rpx;width: 90rpx;"/>
{{ item.title }}
-
+
@@ -274,7 +300,8 @@ export default {
-
+
@@ -300,35 +327,57 @@ export default {
-
-
-
-
- 统考
+
+
+
+
+ {{ item.kslx }}
-
-
+
+
+
+ 23年省内计划录取:
+ {{ item.jhs }}人
-
-
- 23年省内计划录取:
- {{ item.jhs }}人
+
+
+
+
+
+ {{ item.kslx }}
+
+
+
+
+ {{ yearAbridge(item.zdfYear) }}年录取最低分:
+ {{ item.zdf }}分
+
+
+
+
+ {{item.luquYear}}年省内计划录取:
+ {{ item.jhs }}人
-
+
-
+
+
+
@@ -360,7 +409,7 @@ export default {
/*院校列表*/
.school-list {
- padding: 10rpx 20rpx;
+ padding: 10rpx 10rpx;
.school-item {
margin-bottom: 10rpx;
@@ -503,4 +552,20 @@ export default {
}
/* 回到顶部 end*/
+.tk-color {
+ color: #7568e9 !important;
+}
+
+.xk-color {
+ color: #f96543 !important;
+}
+
+.tk-background {
+ background-color: #eaecff;
+
+}
+
+.xk-background {
+ background-color: #fef4f4;
+}
diff --git a/pages/zyb/score/edit.vue b/pages/zyb/score/edit.vue
index f641875..a180952 100644
--- a/pages/zyb/score/edit.vue
+++ b/pages/zyb/score/edit.vue
@@ -16,17 +16,26 @@ export default {
data() {
return {
saveScoreInfo: {},
+ useCount:0,
+ residueCount: 0,
+ vipInfo: {},
+ oldScoreInfo: {},
scoreInfo: {
id: '',
province: '河南',//省份
- cognitioPolyclinic: '理科',//科类
+ cognitioPolyclinic: '文科',//科类
professionalCategory: '',//报考方向
culturalScore: '',//文化分
professionalScore: '',//统考分
chineseScore: '',
englishScore: ''
},
- provinceArray: [{name: "河南"}],//
+ formRuleFlag: false,//表单是否校验成功
+ provinceArray: [{
+ name: '河南',
+ text: "河南",
+ value: "河南",
+ },],//
cognitioPolyclinicArray: StaticConstant.categoryList,//文理分科
//===========================================================
professionalCategoryArray: StaticConstant.professionalCategoryList,//专业类别大类array
@@ -38,30 +47,46 @@ export default {
}
},
onShow() {
+ this.getEditScoreCount()
this.getUserScore()
+ this.vipInfo = uni.getStorageSync('vipInfo')
},
methods: {
+ stringIsNotEmpty() {
+ return stringIsNotEmpty
+ },
//获取用户的分数信息
getUserScore() {
- request.get(ApiConstant.Score.getScore, {}).then(res => {
+ let scoreInfo = uni.getStorageSync('scoreInfo')
+ this.oldScoreInfo = uni.getStorageSync('scoreInfo')
+ if (scoreInfo) {
+ this.scoreInfo = scoreInfo
+ //设置 报考方向 选择
+ let professionalCategory = this.scoreInfo.professionalCategory
+ for (let i = 0; i < this.professionalCategoryArray.length; i++) {
+ if (this.professionalCategoryArray[i].value === professionalCategory) {
+ this.professionalCategoryScoreMax = this.professionalCategoryArray[i].scoreMax
+ this.professionalCategoryIndex = i
+ }
+ }
+ let professionalCategoryChildren = this.scoreInfo.professionalCategoryChildren
+ if (professionalCategoryChildren !== undefined && professionalCategoryChildren !== '') {
+ this.pCategoryChildrenList = professionalCategoryChildren.split(',')
+ }
+ }
+ },
+ //获取用户可更改分数次数
+ getEditScoreCount() {
+ request.get(ApiConstant.Score.todayOfEditScoreCount, {}, {showLoad: false}).then(res => {
if (res.success) {
- this.scoreInfo = res.result
- //设置 报考方向 选择
- let professionalCategory = this.scoreInfo.professionalCategory
- for (let i = 0; i < this.professionalCategoryArray.length; i++) {
- if (this.professionalCategoryArray[i].value === professionalCategory) {
- this.professionalCategoryScoreMax = this.professionalCategoryArray[i].scoreMax
- this.professionalCategoryIndex = i
- }
- }
- let professionalCategoryChildren = this.scoreInfo.professionalCategoryChildren
- if (professionalCategoryChildren !== undefined && professionalCategoryChildren !== '') {
- this.pCategoryChildrenList = professionalCategoryChildren.split(',')
- }
+ console.log(res)
+ this.useCount = res.result.useCount
+ this.residueCount = res.result.residueCount
}
}).catch(err => {
}).finally(() => {
});
+
},
//保存用户的分数信息
saveScore() {
@@ -78,57 +103,99 @@ export default {
...this.saveScoreInfo
}).then(res => {
if (res.success) {
- uni.setStorageSync('scoreInfo', this.saveScoreInfo)
+ let scoreInfo = res.result
+ request.getUserScore()
+ /*uni.removeStorageSync('scoreInfo')//清除之前的成绩缓存
+ uni.setStorageSync('scoreInfo', scoreInfo)
uni.removeStorageSync('fillVolunteer')//清除可报志愿数量
- this.getRecommendMajorCount()
+ //全部推荐数量
+ let all = parseInt(scoreInfo.kcjNum) + parseInt(scoreInfo.jwtNum) + parseInt(scoreInfo.kbdNum);
+ //+parseInt(scoreInfo.nlqNum)
+ let fillVolunteer = {jwt: scoreInfo.jwtNum, kbd: scoreInfo.kbdNum, kcj: scoreInfo.kcjNum, allNumber: all}
+ uni.setStorageSync('fillVolunteer', fillVolunteer)*/
+ setTimeout(() => {
+ uni.reLaunch({
+ url: '/pages/zyb/home'
+ })
+ }, 800)
}
}).catch(err => {
}).finally(() => {
});
},
- getRecommendMajorCount() {
- request.get(ApiConstant.Major.recommendMajorCount, {}).then(res => {
- if (res.success) {
- let result = res.result
- //将数据存入 缓存
- let fillVolunteer = {
- all: result.allNumber,
- kcj: result.kcj,
- jwt: result.jwt,
- nlq: result.nan,
- kbd: result.kbd
+ checkForm() {
+ //省份
+ if (!this.scoreInfo.province) {
+ this.formRuleFlag = false
+ return;
+ }
+ //专业类别
+ if (!this.professionalCategoryArray[this.professionalCategoryIndex]) {
+ this.formRuleFlag = false
+ return
+ }
+ //子级专业分数
+ if (arrayIsNotEmpty(this.pCategoryChildrenList)) {
+ for (let i = 0; i < this.pCategoryChildrenList.length; i++) {
+ let name = this.pCategoryChildrenList[i]
+ //获取字节专业的属性，判断参数是否合格
+ let key = this.checkChildrenNameToKey(name)
+ let value = this.scoreInfo[key]
+
+ if (value === undefined || value === '') {
+ this.formRuleFlag = false
+ return
+ }
+ let score = parseInt(value)
+ if (typeof (score) !== 'number') {
+ this.formRuleFlag = false
+ return
}
- uni.setStorageSync('fillVolunteer', fillVolunteer)
}
- }).catch(err => {
- }).finally(() => {
- setTimeout(function () {
- uni.showToast({title: '保存成功', icon: "none"});
- //回到首页
- uni.switchTab({
- url: '/pages/zyb/home'
- });
- }, 500)
- });
+ }
+ //选考科目
+ if (!this.scoreInfo.cognitioPolyclinic) {
+ this.formRuleFlag = false
+ return
+ }
+ //统考成绩
+ if (this.professionalCategoryArray[this.professionalCategoryIndex].value !== '表演类' && !this.scoreInfo.professionalScore) {
+ this.formRuleFlag = false
+ return
+ }
+ //文化成绩
+ if (!this.scoreInfo.culturalScore) {
+ this.formRuleFlag = false
+ return
+ }
+ this.formRuleFlag = true
},
//选择考区
bindPicker_provinceChange: function (e) {
console.log('考区picker发送选择改变，携带值为：' + e)
this.scoreInfo.province = this.provinceArray[e.detail.value].name
+ this.checkForm()
},
//选择科目
- bindPicker_cognitioPolyclinicChange: function (e) {
- console.log('科目picker发送选择改变，携带值为：' + e.detail.value)
- this.scoreInfo.cognitioPolyclinic = this.cognitioPolyclinicArray[e.detail.value].name
- },
- //选择报考方向
- bindPicker_professionalCategoryChange: function (e) {
- console.log('报考方向picker发送选择改变，携带值为：' + e.detail.value)
- this.scoreInfo.professionalCategory = this.professionalCategoryArray[e.detail.value].value
+ switchKelei(e) {
+ this.scoreInfo.cognitioPolyclinic = e.name
+ this.checkForm()
},
formSubmit: function (e) {
let that = this
console.log('form发生了submit事件，携带数据为：' + JSON.stringify(e.detail.value))
+ //高考省份
+ if (!stringIsNotEmpty(this.scoreInfo.province)) {
+ uni.showToast({title: '请选择高考省份', icon: "none"});
+ return;
+ }
+ //选择科目（文理分科)
+ console.log(this.scoreInfo.cognitioPolyclinic)
+ if (!stringIsNotEmpty(this.scoreInfo.cognitioPolyclinic)) {
+ uni.showToast({title: '请选择选考科目', icon: "none"});
+ return;
+ }
+
//判断 输入分数
// 子级专业类别
if (arrayIsNotEmpty(this.pCategoryChildrenList)) {
@@ -153,6 +220,12 @@ export default {
}
this.scoreInfo[key] = score
}
+ this.scoreInfo.yybysy = this.scoreInfo.yybysy ? this.scoreInfo.yybysy : 0
+ this.scoreInfo.yybyqy = this.scoreInfo.yybyqy ? this.scoreInfo.yybyqy : 0
+ this.scoreInfo.yyjy = this.scoreInfo.yyjy ? this.scoreInfo.yyjy : 0
+ this.scoreInfo.fzby = this.scoreInfo.fzby ? this.scoreInfo.fzby : 0
+ this.scoreInfo.xjysdy = this.scoreInfo.xjysdy ? this.scoreInfo.xjysdy : 0
+ this.scoreInfo.xjysby = this.scoreInfo.xjysby ? this.scoreInfo.xjysby : 0
} else {
this.scoreInfo.yybysy = 0
this.scoreInfo.yybyqy = 0
@@ -163,26 +236,38 @@ export default {
}
//判断统考成绩
let professionalScore = parseInt(this.scoreInfo.professionalScore)
- console.log('professionalScore:' + professionalScore)
- if (isNaN(professionalScore) || professionalScore < 0 || professionalScore > this.professionalCategoryScoreMax) {
- if (this.professionalCategoryArray[this.professionalCategoryIndex].label === '音乐类') {
- uni.showToast({title: '请输入主项成绩', icon: "none"});
- } else {
- uni.showToast({title: '统考成绩请输入0~' + this.professionalCategoryScoreMax + '之间', icon: "none"});
+ if(this.professionalCategoryArray[this.professionalCategoryIndex].value !=='表演类'){
+ console.log('professionalScore:' + professionalScore)
+ if (isNaN(professionalScore) || professionalScore < 0 || professionalScore > this.professionalCategoryScoreMax) {
+ if (this.professionalCategoryIndex && this.professionalCategoryArray[this.professionalCategoryIndex].label === '音乐类') {
+ uni.showToast({title: '请输入主项成绩', icon: "none"});
+ } else {
+ if (this.professionalCategoryScoreMax) {
+ uni.showToast({title: '统考成绩请输入0~' + this.professionalCategoryScoreMax + '之间', icon: "none"});
+ } else {
+ uni.showToast({title: '请输入统考成绩', icon: "none"});
+ }
+
+ }
+ return;
}
- return;
}
//文化成绩
let culturalScore = parseInt(this.scoreInfo.culturalScore)
- if (isNaN(professionalScore) || culturalScore < 0 || culturalScore > 750) {
+ if (isNaN(culturalScore) || culturalScore < 0 || culturalScore > 750) {
uni.showToast({title: '文化分请输入0~750之间', icon: "none"});
return;
}
this.scoreInfo.professionalScore = parseInt(this.scoreInfo.professionalScore)
this.scoreInfo.culturalScore = culturalScore
+
+ let title = '文化成绩:' + this.scoreInfo.culturalScore
+ if (this.scoreInfo.professionalCategory !== '表演类') {
+ title += " " + (this.scoreInfo.professionalScore ? (this.pCategoryChildrenList && this.pCategoryChildrenList.length > 0 ? '主项成绩:' : '统考成绩:') + this.scoreInfo.professionalScore : "")
+ }
uni.showModal({
title: '确认高考成绩',
- content: '文化成绩:' + this.scoreInfo.culturalScore + " " + (this.scoreInfo.professionalScore ? (this.pCategoryChildrenList && this.pCategoryChildrenList.length > 0 ? '主项成绩:' : '统考成绩:') + this.scoreInfo.professionalScore : ""),
+ content: title,
confirmText: '确定',
cancelText: '取消',
success: function (res) {
@@ -196,7 +281,10 @@ export default {
console.log('清空数据')
},
onProfessionalCategory() {
- this.professionalCategoryVisible = true;
+ //其他用户只能改一次专业类别
+ if (this.vipInfo.vipLevel === 9 || this.oldScoreInfo === null || !stringIsNotEmpty(this.oldScoreInfo.professionalCategory)) {
+ this.professionalCategoryVisible = true;
+ }
},
onProfessionalCategoryClose() {
//如果 当前选择的包括方向 有子级
@@ -209,6 +297,7 @@ export default {
}
console.log('关闭')
this.professionalCategoryVisible = false
+ this.checkForm()
},
onProfessionalCategoryOpen() {
console.log('打开')
@@ -225,11 +314,13 @@ export default {
this.professionalCategoryVisible = false
}
this.pCategoryChildrenList = []
+ this.checkForm()
},
/*选择 子类*/
professionalCategoryChildrenChange(e) {
console.log(e)
this.pCategoryChildrenList = e.detail.value
+ this.checkForm()
},
checkChildrenNameToKey(e) {
if (e === '音乐表演声乐') {
@@ -251,114 +342,171 @@ export default {
-
-
-
-
- 统考/省联考成绩
- \n暂仅支持统考及省组织的联考科类成绩评估
+
+
+
+ 请输入成绩
-
-
+
+ 保存
+
+
+
+ 还可更改{{ 10-useCount}}次
+
+
+
+ 还可更改{{ 5-useCount }}次
+
+
+ 今日修改次数已用完
+
+
+ 注：仅可修改一次专业类别
-
diff --git a/pages/zyb/user/bindPhone.vue b/pages/zyb/user/bindPhone.vue
new file mode 100644
index 0000000..98f9690
--- /dev/null
+++ b/pages/zyb/user/bindPhone.vue
@@ -0,0 +1,186 @@
+
+
+
+
+
+
+
+
+
+
+
+ 绑定手机号码
+
+
+
+
+
+
+ 提示
+
+
+ -当前尚未补充手机号，为了更方便为您提供售后服务，请补充您的手机号码。
+
+
+
+
+
+
diff --git a/pages/zyb/user/detail.vue b/pages/zyb/user/detail.vue
index e1c157d..e497b03 100644
--- a/pages/zyb/user/detail.vue
+++ b/pages/zyb/user/detail.vue
@@ -2,9 +2,15 @@
import Request from '@/common/request'
import ApiConstant from "@/common/ApiConstant";
import Link from "@/pages/extUI/link/link.vue";
+import StaticConstant from "../../../common/StaticConstant";
let request = new Request()
export default {
name: "user-index",
+ computed: {
+ StaticConstant() {
+ return StaticConstant
+ }
+ },
components: {Link},
data() {
return {
@@ -25,7 +31,7 @@ export default {
},
onLoad() {
this.userInfo = uni.getStorageSync('userInfo')
- if (this.userInfo === null || this.userInfo.phone === null || this.userInfo.phone === undefined || this.userInfo.phone === '') {
+ if (this.userInfo === null) {
wx.reLaunch({
url: '/pages/zyb/login',
})
@@ -68,7 +74,7 @@ export default {
高考年份
- 2023
+ {{StaticConstant.year}}
diff --git a/pages/zyb/user/index.vue b/pages/zyb/user/index.vue
index 1a884a4..efb3432 100644
--- a/pages/zyb/user/index.vue
+++ b/pages/zyb/user/index.vue
@@ -3,12 +3,17 @@ import Request from '@/common/request'
import ApiConstant from "@/common/ApiConstant";
import StaticConstant from "@/common/StaticConstant";
import ImagesConstant from "@/common/ImagesConstant";
-import vip from "@/pages/zyb/vip/index.vue";
+import commonTool from "../../../common/js/commonTool";
+import NavImage from "../../template/nav-image/nav-image.vue";
let request = new Request()
export default {
name: "user-index",
+ components: {NavImage},
computed: {
+ commonTool() {
+ return commonTool
+ },
ImagesConstant() {
return ImagesConstant
},
@@ -18,45 +23,86 @@ export default {
},
data() {
return {
- avatar:'http://files.yitisheng.vip/yitisheng.png',
- volunteerName:'加载中',
- userInfo:{
- vipFlag: false
- },
- scoreInfo:{
- id:'',
- province: '',//省份
- cognitioPolyclinic: '',//科类
- professionalCategory: '',//报考方向
- culturalScore: '',//文化分
- professionalScore: '',//统考分
- chineseScore:'',
- englishScore:''
- },
+ avatar: ImagesConstant.systemIcon,
+ userInfo: {},
+ vipInfo: {},
+ scoreInfo: {},//成绩信息
+ volunteerInfo: {},//当前志愿单信息
itemList: [
{
- title: '更新快报',
- icon: '/static/icons/linear/calendar.png',
+ title: '会员卡激活',
+ icon:'/static/icons/gif/icons8-cards.gif',
+ url: '/pages/zyb/vip/cardamom'
+ },
+ // #ifdef MP-TOUTIAO
+ {
+ title: '我的订单',
+ icon:'/static/icons/gif/icons8-order.gif',
+ url: '/pages/zyb/order/list'
+ },
+ {
+ title: '联系客服',
+ type:'im',
+ icon:'/static/icons/gif/icons8-customer-service.gif',
+ },
+ // #endif
+ // #ifdef MP-WEIXIN
+ {
+ title: '联系客服',
+ type:'contact',
+ icon:'/static/icons/gif/icons8-customer-service.gif',
+ },
+ {
+ title: '专家一对一',
+ //icon: '/static/icons/linear/calendar.png',
+ icon: '/static/icons/gif/icons8-man.gif',
url: '/pages/zyb/other/updateLogs'
},
+ {
+ title: '商务合作',
+ //icon: '/static/icons/linear/quest.png',
+ icon: '/static/icons/gif/icons8-cooperate.gif',
+ method:'cooperate',
+ url: '/pages/zyb/other/commonProblem'
+ },
+ // #endif
+
+
+ /*{
+ title: '更新快报',
+ //icon: '/static/icons/linear/calendar.png',
+ icon: '/static/icons/gif/icons8-calendar.gif',
+ url: '/pages/zyb/other/updateLogs'
+ },*/
{
title: '我的收藏',
- icon: '/static/icons/linear/love.png',
+ //icon: '/static/icons/linear/love.png',
+ icon: '/static/icons/gif/icons8-loading-heart.gif',
url: '/pages/zyb/user/myCollect'
},
{
title: '使用说明',
- icon: '/static/icons/linear/illustrate.png',
+ //icon: '/static/icons/linear/illustrate.png',
+ icon: '/static/icons/gif/detail.gif',
url: '/pages/zyb/other/useHelp'
},
+
+ /* {
+ title: '问题反馈',
+ //icon: '/static/icons/linear/quest.png',
+ icon: '/static/icons/gif/icons8-doubt.gif',
+ url: '/pages/zyb/other/commonProblem'
+ },*/
{
title: '常见问题',
- icon: '/static/icons/linear/quest.png',
+ //icon: '/static/icons/linear/quest.png',
+ icon: '/static/icons/gif/icons8-doubt.gif',
url: '/pages/zyb/other/commonProblem'
},
{
title: '设置',
- icon: '/static/icons/linear/settings.png',
+ //icon: '/static/icons/linear/settings.png',
+ icon: '/static/icons/gif/icons8-wotuishi-settings.gif',
url: '/pages/zyb/settings'
},
@@ -64,60 +110,99 @@ export default {
]
}
},
- onShow(){
+ onShow() {
this.userInfo = uni.getStorageSync('userInfo')
- if (this.userInfo === null || this.userInfo.phone === null || this.userInfo.phone === undefined || this.userInfo.phone === '') {
+ if (this.userInfo === null || this.userInfo.id=== undefined) {
wx.reLaunch({
url: '/pages/zyb/login',
})
}
+ this.vipInfo = uni.getStorageSync('vipInfo')
this.getScore()
},
onLoad() {
},
methods: {
- //成绩信息
- getScore(){
- request.get(ApiConstant.Volunteer.volunteerInfo,{}).then(r => {
- console.log(r)
- if (r.success) {
- this.scoreInfo = r.result.userScoreInfo
- this.volunteerName = r.result.volunteerName
- try {
- uni.setStorageSync('scoreInfo',this.scoreInfo)
- } catch (e) {
- // error
- console.log('setScoreInfoError ',e)
- }
- }
- }).catch(err => {
- }).finally(() => {
- });
+ //获取成绩信息
+ getScore() {
+ this.scoreInfo = uni.getStorageSync('scoreInfo')
+ if (this.scoreInfo) {
+ this.volunteerInfo = uni.getStorageSync('volunteer')
+ }
},
gotoEditScore() {
console.log('前往修改成绩页面')
this.goto('/pages/zyb/score/edit')
},
- switchFillVolunteer(){
- uni.switchTab({
- url:'/pages/zyb/fillVolunteer/my'
- })
+ switchFillVolunteer() {
+ this.goto('/pages/zyb/fillVolunteer/my')
},
/*前往开通vip*/
- gotoOpenVip(){
+ gotoOpenVip() {
this.goto('/pages/zyb/vip/index')
},
+ /*商务合作弹框事件*/
+ cooperate(){
+ console.log('商务合作')
+ this.$refs.popup2.open("center")
+ },
+ cooperateClose(){
+ this.$refs.popup2.close()
+ },
goto(e) {
uni.navigateTo({
- url: e
+ url: e,
+ nimationType: 'pop-in',
+ animationDuration: 2000
})
},
+ previewImage(e){
+ console.log('e', e);
+ uni.previewImage({
+ // 需要预览的图片链接列表
+ urls: [],
+ // 为当前显示图片的链接/索引值
+ current: ImagesConstant.customerServiceQrCode,
+ // 图片指示器样式
+ indicator:'default',
+ // 是否可循环预览
+ loop:false,
+ // 长按图片显示操作菜单，如不填默认为保存相册
+ // longPressActions:{
+ // itemList:[this.l('发送给朋友'),this.l]
+ // },
+ success: res => {
+ console.log('res', res);
+ },
+ fail: err => {
+ console.log('err', err);
+ }
+ });
+ }
}
}
+
+
+
+
+
+
+