diff --git a/src/pages-sub/home/college/components/EnrollmentMark.vue b/src/pages-sub/home/college/components/EnrollmentMark.vue
index 24f8bde..b9e985d 100644
--- a/src/pages-sub/home/college/components/EnrollmentMark.vue
+++ b/src/pages-sub/home/college/components/EnrollmentMark.vue
@@ -8,22 +8,13 @@
{{ year }}
-
-
-
-
+
+
@@ -109,7 +100,7 @@ const getPlanProListData = async (newVal) => {
tableData.value = _res.newZsplanfusions.map((item) => {
let _item = item
_item.score = `最高分:${item.score_max !== '0' ? item.score_max : '--'} \n 最低分:${item.score_min !== '0' ? item.score_min : '--'} \n 平均分:${item.score_average !== '0' ? item.score_average : '--'}`
- _item.subjectAndCollege = ` 院校/批次:${item.subject_name} \n 选科:${item.second_subject}`
+ _item.subjectAndCollege = ` 院校/批次:${item.volunteer_type} \n 选科:${item.second_subject}`
return _item
})
diff --git a/src/pages-sub/home/components/FilterMenu.vue b/src/pages-sub/home/components/FilterMenu.vue
index 3b3c819..c418960 100644
--- a/src/pages-sub/home/components/FilterMenu.vue
+++ b/src/pages-sub/home/components/FilterMenu.vue
@@ -193,7 +193,6 @@ const handleRemove = (removeItem: { type: string; value: any }, index: number) =
defaultRegion.value = filterParams.value
.filter((item) => item.type === 'region' && item.value.code !== removeItem.value.code)
.map((item) => item.value.code)
- console.log(defaultRegion.value)
}
if (removeItem.type === 'nature') {
defaultNature.value = filterParams.value
@@ -224,11 +223,22 @@ const handleRemove = (removeItem: { type: string; value: any }, index: number) =
const handleConfirm = () => {
return {
- chooseRegion: chooseRegion.value,
- chooseNature: chooseNature.value,
- chooseUniType: chooseUniType.value,
- chooseCollegeFeature: chooseCollegeFeature.value,
- choosePhase: choosePhase.value,
+ chooseRegion: filterParams.value
+ .filter((item) => item.type === 'region')
+ .map((item) => item.value.name),
+ chooseNature: filterParams.value
+ .filter((item) => item.type === 'nature')
+ .map((item) => item.value.name),
+ chooseUniType: filterParams.value
+ .filter((item) => item.type === 'uniType')
+ .map((item) => item.value.name),
+ chooseCollegeFeature: filterParams.value
+ .filter((item) => item.type === 'collegeFeature')
+ .map((item) => item.value.name),
+ choosePhase: filterParams.value
+ .filter((item) => item.type === 'phase')
+ .map((item) => item.value.name)
+ .join(','),
}
}
diff --git a/src/pages-sub/home/wishesList/wishesList.vue b/src/pages-sub/home/wishesList/wishesList.vue
index dbfdbc5..b35da7d 100644
--- a/src/pages-sub/home/wishesList/wishesList.vue
+++ b/src/pages-sub/home/wishesList/wishesList.vue
@@ -103,7 +103,6 @@ const addWishList = () => {
}
saveWishList(params).then((res) => {
if (res.code === 200) {
- userStore.clearWishList()
vTbId.value = res.result as number
} else {
uni.showToast({
diff --git a/src/service/index/api.ts b/src/service/index/api.ts
index fcc0d8c..60638f8 100644
--- a/src/service/index/api.ts
+++ b/src/service/index/api.ts
@@ -155,7 +155,7 @@ export const getAdmissionMark = (params: {
batchName: string
locationCode: string
}) => {
- return http.get('/api/PlanPro/admissionMark', params)
+ return http.get('/api/PlanPro/admissionMarkV2', params)
}
export const deleteUnCollection = (params: { wxId: number; uId: number }) => {
diff --git a/src/store/user.ts b/src/store/user.ts
index 0e1a706..d2655b5 100644
--- a/src/store/user.ts
+++ b/src/store/user.ts
@@ -59,6 +59,7 @@ const initState = {
batchDataUrl: '',
batchName: '',
wishList: [],
+ wishListId: '',
isShowAi: true,
}
@@ -184,6 +185,14 @@ export const useUserStore = defineStore(
userInfo.value.wishList = []
}
+ const setWishListId = ({ id }: { id: number }) => {
+ userInfo.value.wishListId = id
+ }
+
+ const clearWishListId = () => {
+ userInfo.value.wishListId = ''
+ }
+
const setIsVIP = (val: boolean) => {
userInfo.value.estimatedAchievement.isVIP = val
}
@@ -231,6 +240,8 @@ export const useUserStore = defineStore(
setVipCode,
setIsShowAi,
setUserBaseInfo,
+ setWishListId,
+ clearWishListId,
}
},
{
diff --git a/src/types/app-type.d.ts b/src/types/app-type.d.ts
index a484c41..f717a8b 100644
--- a/src/types/app-type.d.ts
+++ b/src/types/app-type.d.ts
@@ -63,6 +63,7 @@ export type ExtraUserInfo = {
batchDataUrl: string
batchName: string
wishList: any[]
+ wishListId: string | number
isShowAi: boolean
mobile: string
sex: number