diff --git a/src/pages-evaluation-sub/composable/rankAreaEchart.ts b/src/pages-evaluation-sub/composable/rankAreaEchart.ts
index 60d9a3a..6ebbdae 100644
--- a/src/pages-evaluation-sub/composable/rankAreaEchart.ts
+++ b/src/pages-evaluation-sub/composable/rankAreaEchart.ts
@@ -26,6 +26,8 @@ export const initRankAreaEchart = ({
show: false,
},
grid: {
+ left: '16',
+ right: '16',
containLabel: false,
},
series: [
diff --git a/src/pages-evaluation-sub/evaluate/academicReport/CapabilityReport.vue b/src/pages-evaluation-sub/evaluate/academicReport/CapabilityReport.vue
index 405cf90..ca7b8ce 100644
--- a/src/pages-evaluation-sub/evaluate/academicReport/CapabilityReport.vue
+++ b/src/pages-evaluation-sub/evaluate/academicReport/CapabilityReport.vue
@@ -7,7 +7,7 @@
-
+
智能AI顾问
-->
-
+
diff --git a/src/pages-sub/home/autoFill/index.vue b/src/pages-sub/home/autoFill/index.vue
index bec35a1..fd872d6 100644
--- a/src/pages-sub/home/autoFill/index.vue
+++ b/src/pages-sub/home/autoFill/index.vue
@@ -21,7 +21,7 @@
{
- uni.navigateBack()
-}
-
const show = ref(false)
const badgeValue = ref(1)
diff --git a/src/pages-sub/home/career/components/CareerInfo.vue b/src/pages-sub/home/career/components/CareerInfo.vue
index fc3fd70..9186399 100644
--- a/src/pages-sub/home/career/components/CareerInfo.vue
+++ b/src/pages-sub/home/career/components/CareerInfo.vue
@@ -2,14 +2,14 @@
简介
-
+
{{ careerInfo.intro }}
职业定义
-
+
{{ careerInfo.definition }}
diff --git a/src/pages-sub/home/career/components/DevelopmentProspect.vue b/src/pages-sub/home/career/components/DevelopmentProspect.vue
index 5fc1d5e..21eb9a6 100644
--- a/src/pages-sub/home/career/components/DevelopmentProspect.vue
+++ b/src/pages-sub/home/career/components/DevelopmentProspect.vue
@@ -4,19 +4,19 @@
发展前景
行业发展前景
-
+
{{ prospect.industry }}
个人发展路径
-
+
{{ prospect.person }}
职业的就业趋势
-
+
{{ prospect.career }}
@@ -26,19 +26,19 @@
薪资待遇
薪资结构
-
+
{{ salary.structure }}
满意度
-
+
{{ salary.satisfaction }}
福利制度
-
+
{{ salary.welfare }}
diff --git a/src/pages-sub/home/career/components/KnowledgeBackground.vue b/src/pages-sub/home/career/components/KnowledgeBackground.vue
index a5d27d4..fe6d4dc 100644
--- a/src/pages-sub/home/career/components/KnowledgeBackground.vue
+++ b/src/pages-sub/home/career/components/KnowledgeBackground.vue
@@ -2,28 +2,28 @@
学历要求
-
+
{{ knowledgeInfo.diplomas }}
行业知识
-
+
{{ knowledgeInfo.trade }}
专业知识
-
+
{{ knowledgeInfo.pro }}
大学课程
-
+
{{ jsonCurriculum.important }}
diff --git a/src/pages-sub/home/career/components/LeftMenu.vue b/src/pages-sub/home/career/components/LeftMenu.vue
index e39fcd1..64b1c58 100644
--- a/src/pages-sub/home/career/components/LeftMenu.vue
+++ b/src/pages-sub/home/career/components/LeftMenu.vue
@@ -1,11 +1,11 @@
-
-
+
+
-
+
diff --git a/src/pages-sub/home/career/components/VocationalSkill.vue b/src/pages-sub/home/career/components/VocationalSkill.vue
index 930a1f6..787cd4a 100644
--- a/src/pages-sub/home/career/components/VocationalSkill.vue
+++ b/src/pages-sub/home/career/components/VocationalSkill.vue
@@ -3,14 +3,14 @@
职业技能
- 专业技能
-
+ 专业技能
+
{{ proSkill.skill_pro }}
- 通用技能
-
+ 通用技能
+
{{ proSkill.skill_general }}
@@ -19,14 +19,14 @@
从业资格
- 必须项
-
+ 必须项
+
{{ qualification.necessary }}
- 附加项
-
+ 附加项
+
{{ qualification.addition }}
@@ -34,7 +34,7 @@
职业道德
-
+
{{ ethics }}
diff --git a/src/pages-sub/home/career/index.vue b/src/pages-sub/home/career/index.vue
index 8459f43..94b6129 100644
--- a/src/pages-sub/home/career/index.vue
+++ b/src/pages-sub/home/career/index.vue
@@ -21,8 +21,8 @@
-
-
+
+
diff --git a/src/pages-sub/home/college/components/Profile.vue b/src/pages-sub/home/college/components/Profile.vue
index 3365ae1..b627179 100644
--- a/src/pages-sub/home/college/components/Profile.vue
+++ b/src/pages-sub/home/college/components/Profile.vue
@@ -36,7 +36,7 @@
-
+
{{ universityResult?.detail }}
diff --git a/src/pages-sub/home/college/info.vue b/src/pages-sub/home/college/info.vue
index 2712f58..2600f47 100644
--- a/src/pages-sub/home/college/info.vue
+++ b/src/pages-sub/home/college/info.vue
@@ -41,9 +41,9 @@
{{ universityBaseInfo?.universityResult.features.slice(0, 4).join('/ ') }}
-
@@ -203,8 +203,7 @@ const handleStar = () => {
border: 2rpx solid #eee !important;
color: #636363 !important;
- width: unset !important;
- min-width: unset !important;
+ min-width: max-content !important;
border-radius: 12rpx !important;
margin-right: 0 !important;
padding: 12rpx !important;
@@ -215,5 +214,6 @@ const handleStar = () => {
align-items: center !important;
font-size: 24rpx !important;
+ width: max-content !important;
}
diff --git a/src/pages-sub/home/components/Phase.vue b/src/pages-sub/home/components/Phase.vue
index b6a0ed1..4c182f9 100644
--- a/src/pages-sub/home/components/Phase.vue
+++ b/src/pages-sub/home/components/Phase.vue
@@ -21,6 +21,7 @@ import { getBatchDynamicData, getWxUserInfo } from '@/service/index/api'
import RadioGroup from '@/pages-sub/components/radio-group/RadioGroup.vue'
import Radio from '@/pages-sub/components/radio-group/Radio.vue'
import { useUserStore } from '@/store/user'
+import { useRules } from '@/pages-sub/home/inputScore/useRules'
const userStore = useUserStore()
@@ -52,7 +53,8 @@ const fetchBatchData = () => {
}
onLoad(() => {
- fetchBatchData()
+ useRules(fetchBatchData)
+
// if (userStore.userInfo.batchDataUrl) {
// fetchBatchData()
// } else {
diff --git a/src/pages-sub/home/distinguish/index.vue b/src/pages-sub/home/distinguish/index.vue
index bf97eea..b614c19 100644
--- a/src/pages-sub/home/distinguish/index.vue
+++ b/src/pages-sub/home/distinguish/index.vue
@@ -45,10 +45,10 @@
-
+
-
+
@@ -80,10 +80,15 @@
- 暂无数据
+
+ 没有数据哦~
diff --git a/src/pages-sub/home/expand/index.vue b/src/pages-sub/home/expand/index.vue
index 68555a9..4319172 100644
--- a/src/pages-sub/home/expand/index.vue
+++ b/src/pages-sub/home/expand/index.vue
@@ -15,6 +15,7 @@
@virtualListChange="virtualListChange"
@query="queryList"
:auto-show-system-loading="true"
+ :safe-area-inset-bottom="true"
>
@@ -30,7 +31,7 @@
-
+
-
+
-
+
@@ -68,10 +69,14 @@
- 院校
- 招生专业
- {{ tModel.year }}计划
- 较{{ tModel.year - 1 }}
+ 院校
+ 招生专业
+
+ {{ tModel.year }}计划
+
+
+ 较{{ tModel.year - 1 }}
+
-
+
{{ item.name }}
@@ -93,9 +98,9 @@
- {{ item.planCount }}
- {{ item.newPlan }}人
-
+ {{ item.planCount }}
+ {{ item.newPlan }}人
+
相同
{{ item.newPlan - item.oldPlan }}
diff --git a/src/pages-sub/home/inputScore/useRules.ts b/src/pages-sub/home/inputScore/useRules.ts
index d5e099c..020f8c0 100644
--- a/src/pages-sub/home/inputScore/useRules.ts
+++ b/src/pages-sub/home/inputScore/useRules.ts
@@ -12,7 +12,7 @@ export const requireSubject = ref('')
// 任意选择科目
export const optionalSubject = ref([])
-export const useRules = () => {
+export const useRules = (callback?: any) => {
getCountryRules().then((res) => {
if (res.code === 200) {
const results = res.result as RuleResult[]
@@ -26,6 +26,7 @@ export const useRules = () => {
return
}
splitSubject(requireSubjectList.value, optionalSubjectList.value)
+ callback()
}
})
}
diff --git a/src/pages-sub/home/line/index.vue b/src/pages-sub/home/line/index.vue
index a973b50..82e7cf0 100644
--- a/src/pages-sub/home/line/index.vue
+++ b/src/pages-sub/home/line/index.vue
@@ -21,7 +21,7 @@
-
+
-
+
-
+
-
+
diff --git a/src/pages-sub/home/major/index.vue b/src/pages-sub/home/major/index.vue
index a113b29..2535d3c 100644
--- a/src/pages-sub/home/major/index.vue
+++ b/src/pages-sub/home/major/index.vue
@@ -13,7 +13,6 @@
bg-color="transparent"
:bordered="false"
left-arrow
- title="查职业"
@click-left="navigatorBack"
content-class="justify-start"
>
diff --git a/src/pages-sub/home/styles/navbar-background.scss b/src/pages-sub/home/styles/navbar-background.scss
index 5c3dd30..ad677b9 100644
--- a/src/pages-sub/home/styles/navbar-background.scss
+++ b/src/pages-sub/home/styles/navbar-background.scss
@@ -1,7 +1,7 @@
.custom-background {
background-image: linear-gradient(
173deg,
- rgb(177, 221, 250) 0,
+ rgb(228, 241, 247) 0,
rgb(177, 221, 250) 13%,
rgba(255, 255, 255, 1) 80%,
rgba(255, 255, 255, 1) 100%
diff --git a/src/pages-sub/home/wishesList/components/CollegeMajor.vue b/src/pages-sub/home/wishesList/components/CollegeMajor.vue
index e84e34f..31a67e0 100644
--- a/src/pages-sub/home/wishesList/components/CollegeMajor.vue
+++ b/src/pages-sub/home/wishesList/components/CollegeMajor.vue
@@ -2,7 +2,7 @@
diff --git a/src/pages-sub/home/wishesList/components/DataTable.vue b/src/pages-sub/home/wishesList/components/DataTable.vue
index 8bfb076..5688294 100644
--- a/src/pages-sub/home/wishesList/components/DataTable.vue
+++ b/src/pages-sub/home/wishesList/components/DataTable.vue
@@ -6,7 +6,7 @@
{{ headItem.label }}
@@ -26,7 +26,7 @@
>
diff --git a/src/pages-sub/home/wishesList/components/ScrollListItem.vue b/src/pages-sub/home/wishesList/components/ScrollListItem.vue
index 5c753a1..ef0ab68 100644
--- a/src/pages-sub/home/wishesList/components/ScrollListItem.vue
+++ b/src/pages-sub/home/wishesList/components/ScrollListItem.vue
@@ -15,8 +15,7 @@
college.items.reduce((a, b) => a + Number(b.percentAge.replace('%', '')), 0) /
college.items.length,
)
- }}
- %
+ }}%
@@ -40,9 +39,9 @@
-
+
专业{{ college.items.length }}
diff --git a/src/pages-sub/home/wishesList/components/ScrollListItemAction.vue b/src/pages-sub/home/wishesList/components/ScrollListItemAction.vue
index 38b803c..ee67d6e 100644
--- a/src/pages-sub/home/wishesList/components/ScrollListItemAction.vue
+++ b/src/pages-sub/home/wishesList/components/ScrollListItemAction.vue
@@ -8,7 +8,7 @@
{{ college?.city }}·{{ college?.educationCategory }}
-
+
已填
@@ -18,7 +18,6 @@
-
diff --git a/src/pages-sub/home/wishesList/index.vue b/src/pages-sub/home/wishesList/index.vue
index 9d948fc..44d49ef 100644
--- a/src/pages-sub/home/wishesList/index.vue
+++ b/src/pages-sub/home/wishesList/index.vue
@@ -1,7 +1,7 @@
{
style: {
- navigationBarTitleText: '我的志愿表',
+ navigationStyle: 'custom',
},
}
@@ -17,6 +17,14 @@
:auto-show-system-loading="true"
>
+
@@ -135,6 +143,8 @@ import ScrollListItemAction from './components/ScrollListItemAction.vue'
import ScrollListItem from './components/ScrollListItem.vue'
import HeaderTip from './components/HeaderTip.vue'
+import Navbar from '@/pages-sub/components/navbar/Navbar.vue'
+
import { getPlanProListByFilter } from '@/service/index/api'
import { useUserStore } from '@/store/user'
@@ -142,6 +152,10 @@ import { coverTypeModel, useScore } from './composable/useWishesList'
const userStore = useUserStore()
+const navigatorBack = () => {
+ uni.navigateBack()
+}
+
const schoolList = ref([])
const paging = ref(null)
const filterMenuRef = ref(null)
diff --git a/src/pages-sub/ucenter/active/activePage.vue b/src/pages-sub/ucenter/active/activePage.vue
index 321f6a4..ca4711b 100644
--- a/src/pages-sub/ucenter/active/activePage.vue
+++ b/src/pages-sub/ucenter/active/activePage.vue
@@ -7,7 +7,7 @@
-
+
-
+
{{ isVIP ? '已开通' : '立即兑换' }}
-
+
到期时间:{{ endTime }}
-
+
兑换规则
1.适用对象:普通类文理科考生、新高考选科类考生 (提前批次及艺术体育类考生暂不适用)
diff --git a/src/pages-sub/ucenter/star/myStar.vue b/src/pages-sub/ucenter/star/myStar.vue
index 76d6799..816cac5 100644
--- a/src/pages-sub/ucenter/star/myStar.vue
+++ b/src/pages-sub/ucenter/star/myStar.vue
@@ -16,7 +16,7 @@
@query="queryList"
:auto-show-system-loading="true"
>
-
+
-
+
{
- if (item.isAppointment) {
- deleteMyAppointment({ id: item.appointId }).then((res) => {
- if (res.code === 200) {
- list.value[index].isAppointment = !item.isAppointment
- delete list.value[index].appointId
+ uni.showModal({
+ title: '预约',
+ content: item.isAppointment ? '是否取消预约' : '是否预约',
+ success: (res) => {
+ if (res.confirm) {
+ if (item.isAppointment) {
+ deleteMyAppointment({ id: item.appointId }).then((res) => {
+ if (res.code === 200) {
+ list.value[index].isAppointment = !item.isAppointment
+ delete list.value[index].appointId
+ }
+ })
+ } else {
+ addSpecial({
+ sId: item.id,
+ openId: userStore.userInfo?.estimatedAchievement.wxId.toString(),
+ appointmentTime: '2025-07-31',
+ isDelete: item.isAppointment,
+ }).then((res) => {
+ if (res.code === 200) {
+ list.value[index].isAppointment = !item.isAppointment
+ list.value[index].appointId = res.result
+ uni.showToast({
+ title: item.isAppointment ? '预约成功' : '取消预约成功',
+ })
+ } else {
+ uni.showToast({
+ title: res.message,
+ icon: 'none',
+ })
+ }
+ })
+ }
+ } else if (res.cancel) {
}
- })
- } else {
- addSpecial({
- sId: item.id,
- openId: userStore.userInfo?.estimatedAchievement.wxId.toString(),
- appointmentTime: '2025-07-31',
- isDelete: item.isAppointment,
- }).then((res) => {
- if (res.code === 200) {
- list.value[index].isAppointment = !item.isAppointment
- list.value[index].appointId = res.result
- uni.showToast({
- title: item.isAppointment ? '预约成功' : '取消预约成功',
- })
- } else {
- uni.showToast({
- title: res.message,
- icon: 'none',
- })
- }
- })
- }
+ },
+ })
}
diff --git a/src/pages/home/index/index.vue b/src/pages/home/index/index.vue
index b3fb279..e6cd2e6 100644
--- a/src/pages/home/index/index.vue
+++ b/src/pages/home/index/index.vue
@@ -76,9 +76,13 @@ onShow(() => {
getWxUserInfo().then((resp) => {
const infoData = resp.result as unknown as {
userExtend: { provinceCode: string }
+ batchName: string
+ batchDataUrl: string
}
if (userStore.userInfo.city.code === infoData.userExtend.provinceCode) {
userStore.setEstimatedAchievement(infoData.userExtend)
+ userStore.setBatchName(infoData.batchName)
+ userStore.setBatchDataUrl(infoData.batchDataUrl)
return
}
})
diff --git a/src/pages/ucenter/index/index.vue b/src/pages/ucenter/index/index.vue
index a2a8649..0a997fd 100644
--- a/src/pages/ucenter/index/index.vue
+++ b/src/pages/ucenter/index/index.vue
@@ -8,7 +8,7 @@
-
+
诸多分析特权免费查看
@@ -173,7 +173,7 @@ const toSetting = () => {