xjs
/
volunteer-4
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat: 更新提示

master
xjs 2025-05-23 11:38:17 +08:00
parent 3ba03d5912
commit 8ea064eba4
12 changed files with 57 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/pages-sub/customerService/index/index.vue
View File

@ -57,7 +57,7 @@
<script lang="ts" setup>
import Navbar from '@/pages-sub/components/navbar/Navbar.vue'
const phoneNumber = '400-621-1003'
const phoneNumber = '18724728603'
const makePhoneCall = () => {
uni

8
src/pages-sub/home/college/components/EnrollmentPlan.vue
View File

@ -24,15 +24,15 @@
<scroll-view class="mt-[38rpx] flex-1 pb-safe">
<WXXTable :data="tableData" v-if="!flag">
<WXXTableCol prop="universityName" label="院校名称" width="25%"></WXXTableCol>
<WXXTableCol prop="major" label="招生专业" width="37%"></WXXTableCol>
<!-- <WXXTableCol prop="universityName" label="院校名称" width="25%"></WXXTableCol> -->
<WXXTableCol prop="major" label="招生专业" width="62%"></WXXTableCol>
<WXXTableCol prop="plancount" label="计划数" width="13%"></WXXTableCol>
<WXXTableCol prop="academic" label="学制" width="10%"></WXXTableCol>
<WXXTableCol prop="fee" label="学费" width="15%"></WXXTableCol>
</WXXTable>
<WXXTable :data="tableData" v-else>
<WXXTableCol prop="universityName" label="院校名称" width="20%"></WXXTableCol>
<WXXTableCol prop="majorgroupname" label="专业组" width="15%"></WXXTableCol>
<!-- <WXXTableCol prop="universityName" label="院校名称" width="20%"></WXXTableCol> -->
<WXXTableCol prop="majorgroupname" label="专业组" width="35%"></WXXTableCol>
<WXXTableCol prop="major" label="招生专业" width="30%"></WXXTableCol>
<WXXTableCol prop="plancount" label="计划数" width="15%"></WXXTableCol>
<WXXTableCol prop="academic" label="学制" width="10%"></WXXTableCol>

8
src/pages-sub/home/major/components/MajorTreeList.vue
View File

@ -9,12 +9,12 @@
<CollapseItem v-for="(item, index) in subMajorList.items" :key="item.key" :name="`${index}`">
<template #title="{ expanded }">
<view class="header">
<text :class="`text-[24rpx] text-[#303030] ${expanded ? 'text-[#1580FF]!' : ''}`">
<text :class="`text-[26rpx] text-[#303030] ${expanded ? 'text-[#1580FF]!' : ''}`">
{{ item.name }}
</text>
<view class="flex items-center justify-between">
<text
:class="`mr-[12rpx] text-[24rpx] text-[#303030] ${expanded ? 'text-[#1580FF]!' : ''}`"
:class="`mr-[12rpx] text-[26rpx] text-[#303030] ${expanded ? 'text-[#1580FF]!' : ''}`"
>
{{ item.childMajors.length }}
</text>
@ -33,7 +33,9 @@
:key="childMajor.zymc"
@click="navigatorToMajorInfo(childMajor)"
>
{{ childMajor.zymc }}
<view class="ml-[32rpx]">
{{ childMajor.zymc }}
</view>
</view>
</view>
</CollapseItem>

6
src/pages-sub/home/wishesList/components/CustomCheckbox.vue
View File

@ -1,12 +1,12 @@
<template>
<view class="flex items-center">
<view class="i-carbon-checkbox w-[32rpx] h-[32rpx]" v-if="status === 1"></view>
<view class="i-carbon-checkbox w-[40rpx] h-[40rpx] text-[#ccc]" v-if="status === 1"></view>
<view
class="i-carbon-checkbox-undeterminate-filled w-[32rpx] h-[32rpx] text-[#1677FF]"
class="i-carbon-checkbox-undeterminate-filled w-[40rpx] h-[40rpx] text-[#1677FF]"
v-if="status === 2"
></view>
<view
class="i-carbon-checkbox-checked-filled w-[32rpx] h-[32rpx] text-[#1677FF]"
class="i-carbon-checkbox-checked-filled w-[40rpx] h-[40rpx] text-[#1677FF]"
v-if="status === 3"
></view>
</view>

19
src/pages-sub/home/wishesList/components/DataTable.vue
View File

@ -58,7 +58,7 @@
</view>
</view>
<MessageBox v-model:show="show" title="" :defaultPadding="false" defaultWidth="85%">
<!-- <MessageBox v-model:show="show" title="" :defaultPadding="false" defaultWidth="85%">
<template>
<view class="">
<view class="text-[#000] text-[36rpx] font-700 mt-[40rpx] text-center">{{ title }}</view>
@ -73,12 +73,12 @@
</view>
</view>
</template>
</MessageBox>
</MessageBox> -->
</view>
</template>
<script lang="ts" setup>
import MessageBox from '@/pages-sub/components/messageBox/MessageBox.vue'
// import MessageBox from '@/pages-sub/components/messageBox/MessageBox.vue'
defineOptions({
inheritAttrs: true,
@ -106,12 +106,19 @@ const showToast = (type: number) => {
tipContent.value =
'根据考生历年的等效位次 - 志愿历年录取位次的差值得出，位次差可更准确的与历年位次进行比较。'
}
uni.showModal({
title: title.value,
content: tipContent.value,
showCancel: false,
confirmColor: '#1580FF',
})
show.value = true
}
const handleSubmit = () => {
show.value = false
}
// const handleSubmit = () => {
// show.value = false
// }
const columns = ref([
{ label: '年份', key: 'year', width: '62rpx' },

10
src/pages-sub/home/wishesList/components/FilterMajorList.vue
View File

@ -17,12 +17,8 @@
</scroll-view>
</view>
<scroll-view class="pb-[14rpx] h-[40vh] pt-[32rpx] flex-1" :scroll-y="true">
<view>
<MajorTreeList
v-if="currentMenuObj"
v-model:subMajorList="currentMenuObj"
@change-check="handleChangeCheck"
/>
<view v-if="currentMenuObj">
<MajorTreeList v-model:subMajorList="currentMenuObj" @change-check="handleChangeCheck" />
</view>
</scroll-view>
</view>
@ -76,8 +72,6 @@ const changeMenu = (item: any) => {
}
const handleChangeCheck = (params) => {
console.log(params)
const groupIndex = menus.value.findIndex((menu) => menu.key === params.groupItem.key)
if (Object.prototype.toString.call(params.cIndex) === '[object Undefined]') {
// 选中了专业大类

10
src/pages-sub/home/wishesList/components/FilterMajorTreeList.vue
View File

@ -9,12 +9,12 @@
<CollapseItem v-for="(item, index) in subMajorList.items" :key="item.key" :name="`${index}`">
<template #title="{ expanded }">
<view class="header">
<text :class="`text-[24rpx] text-[#303030] ${expanded ? 'text-[#1580FF]!' : ''}`">
<text :class="`text-[26rpx] text-[#303030] ${expanded ? 'text-[#1580FF]!' : ''}`">
{{ item.name }}
</text>
<view class="flex items-center justify-between">
<text
:class="`mr-[12rpx] text-[24rpx] text-[#303030] ${expanded ? 'text-[#1580FF]!' : ''}`"
:class="`mr-[10rpx] text-[28rpx] text-[#303030] ${expanded ? 'text-[#1580FF]!' : ''}`"
>
{{ item.childMajors.length }}
</text>
@ -23,7 +23,7 @@
v-if="expanded"
></view>
<view class="i-carbon-chevron-down text-[16rpx]" v-else></view>
<view @click.stop="handleCheckSubMajor(item, index)" class="ml-[20rpx]">
<view @click.stop="handleCheckSubMajor(item, index)" class="ml-[8rpx]">
<CustomCheckbox :status="item.check" />
</view>
</view>
@ -36,7 +36,7 @@
:key="childMajor.zymc"
@click="handleCheckMajor(childMajor, index, cIndex)"
>
<view>
<view :class="`${childMajor.check === 3 ? 'text-[#1580FF]' : ''} ml-[32rpx]`">
{{ childMajor.zymc }}
</view>
<view class="mr-[32rpx]">
@ -73,7 +73,7 @@ const props = defineProps({
},
})
const collapseValue = ref<string>('0')
const collapseValue = ref<string>('')
const emits = defineEmits(['update:subMajorList', 'changeCheck'])
const handleCheckSubMajor = (_item: any, index: number) => {

12
src/pages-sub/home/wishesList/components/HeaderTip.vue
View File

@ -12,7 +12,7 @@
<view v-if="type === 0" class="flex items-center" @click="showToast">
<text>重要提示</text>
<text class="i-carbon-help"></text>
<MessageBox v-model:show="show" title="" :defaultPadding="false" defaultWidth="85%">
<!-- <MessageBox v-model:show="show" title="" :defaultPadding="false" defaultWidth="85%">
<template>
<view class="">
<view class="text-[#000] text-[36rpx] font-700 mt-[40rpx] text-center">重要提示</view>
@ -32,7 +32,7 @@
</view>
</view>
</template>
</MessageBox>
</MessageBox> -->
</view>
<HeaderModelTip v-if="type === 1" />
@ -55,7 +55,13 @@ defineProps({
const show = ref(false)
const showToast = () => {
show.value = true
uni.showModal({
title: '重要提示',
content:
'1.本平台基于历史分数及等效位次进行志愿推荐和风险评估，由于志愿填报本身存在不确定性，请谨慎参考。\r\n 2.在正式填报时，院校/专业名称及代码请务必与官方信息平台核对，若发现差异则以官方数据为准，本平台数据仅供参考。',
showCancel: false,
confirmColor: '#1580FF',
})
}
const handleSubmit = () => {

8
src/pages-sub/home/wishesList/index.vue
View File

@ -107,23 +107,23 @@
</z-paging>
<ActionSheet v-model:show="show" :title="actionTitle">
<Region
v-if="actionType === 2"
v-show="actionType === 2"
width="210rpx"
height="60rpx"
class="custom-check-group"
@change-name="handleRegionName"
/>
<FilterMenu v-if="actionType === 1" :show-phase="false" ref="filterMenuRef" :menuBit="28" />
<FilterMenu v-show="actionType === 1" :show-phase="false" ref="filterMenuRef" :menuBit="28" />
<CustomPickerView
v-if="actionType === 3"
v-show="actionType === 3"
:list="typeModelList"
v-model:modelValue="collegeSearch.tModelValue"
value-key="value"
label-key="name"
@change="handleTypeModelChange"
/>
<FilterMajorList ref="filterMajorRef" v-if="actionType === 4" :type="1050" class="h-full" />
<FilterMajorList ref="filterMajorRef" v-show="actionType === 4" :type="1050" class="h-full" />
<template #footer>
<view class="flex items-center justify-between mx-[32rpx] gap-[20rpx]">
<view class="cancel-btn" @click="show = false">取消</view>

2
src/pages-sub/home/wishesList/wishesList.vue
View File

@ -121,7 +121,7 @@ let vTbId = ref(0)
let webUrl = computed(() => {
if (vTbId.value !== 0) {
//sort.ycymedu.com
return `https://sort.ycymedu.com/sort-college?id=${vTbId.value}&token=${userStore.userInfo.token}&score=${userStore.userInfo.estimatedAchievement.expectedScore}&batchName=${userStore.userInfo.batchName}&subjectGroup=${userStore.userInfo.estimatedAchievement.subjectGroup}&location=${userStore.userInfo.estimatedAchievement.provinceCode}`
return `https://sort.ycymedu.com/sort-college?id=${vTbId.value}&token=${userStore.userInfo.token}&score=${userStore.userInfo.estimatedAchievement.expectedScore}&batchName=${userStore.userInfo.batchName}&subjectGroup=${userStore.userInfo.estimatedAchievement.subjectGroup}&location=${userStore.userInfo.estimatedAchievement.provinceCode}&timestamp=${new Date().getTime()}`
}
return ''
})

2
src/pages-sub/ucenter/setting/about.vue
View File

@ -42,7 +42,7 @@
</template>
<script setup lang="ts">
const phoneNumber = '0531-58786060'
const phoneNumber = '18724728603'
const makePhoneCall = () => {
uni

11
src/pages-sub/ucenter/star/myStar.vue
View File

@ -33,9 +33,13 @@
class="item-wrapper"
:id="`zp-id-${item.zp_index}`"
:key="item.zp_index"
v-for="(item, index) in starList"
v-for="item in starList"
>
<view class="flex gap-[24rpx] py-[40rpx] border-bt" v-if="currentTab === 0">
<view
class="flex gap-[24rpx] py-[40rpx] border-bt"
v-if="currentTab === 0"
@click.stop="navigatorTo(item)"
>
<image
class="min-w-[112rpx] min-h-[112rpx] w-[112rpx] h-[112rpx]"
:src="item.logo"
@ -121,6 +125,9 @@ const handleStar = (item: any) => {
})
}
}
const navigatorTo = (item: any) => {
uni.navigateTo({ url: `/pages-sub/home/college/info?collegeId=${item._id}` })
}
</script>
<style lang="scss" scoped>
.collect-btn {