diff --git a/src/login-sub/inviteCode.vue b/src/login-sub/inviteCode.vue index 7a3a7ae..73c768d 100644 --- a/src/login-sub/inviteCode.vue +++ b/src/login-sub/inviteCode.vue @@ -57,6 +57,7 @@ 就读学校 + * { }) return } + if (!formData.value.school) { + uni.showToast({ + title: '请输入学校', + icon: 'error', + mask: true, + }) + return + } savePerfectInfo({ nickName: formData.value.name, diff --git a/src/pages-evaluation-sub/rank/index.vue b/src/pages-evaluation-sub/rank/index.vue index dd5c090..9321c9f 100644 --- a/src/pages-evaluation-sub/rank/index.vue +++ b/src/pages-evaluation-sub/rank/index.vue @@ -76,7 +76,7 @@ 同分人数: - {{ betweenRanks?.ranges }} + {{ betweenRanks?.currentCount }} diff --git a/src/pages-sub/components/input/SearchInput.vue b/src/pages-sub/components/input/SearchInput.vue index 853df00..a149513 100644 --- a/src/pages-sub/components/input/SearchInput.vue +++ b/src/pages-sub/components/input/SearchInput.vue @@ -4,10 +4,11 @@ @@ -36,4 +37,8 @@ const searchValue = computed({ const handleConfirm = (e) => { emit('confirm', e.detail.value) } + +const handleInput = (e) => { + emit('confirm', e.detail.value) +} diff --git a/src/pages-sub/components/interval/NumberInterval.vue b/src/pages-sub/components/interval/NumberInterval.vue index 7589866..91fb2c5 100644 --- a/src/pages-sub/components/interval/NumberInterval.vue +++ b/src/pages-sub/components/interval/NumberInterval.vue @@ -40,7 +40,7 @@ + + diff --git a/src/pages-sub/home/adPoster/components/FeatureOfTeaching.vue b/src/pages-sub/home/adPoster/components/FeatureOfTeaching.vue new file mode 100644 index 0000000..9fc034c --- /dev/null +++ b/src/pages-sub/home/adPoster/components/FeatureOfTeaching.vue @@ -0,0 +1,117 @@ + + + + + diff --git a/src/pages-sub/home/adPoster/components/HeaderBg.vue b/src/pages-sub/home/adPoster/components/HeaderBg.vue new file mode 100644 index 0000000..497418e --- /dev/null +++ b/src/pages-sub/home/adPoster/components/HeaderBg.vue @@ -0,0 +1,59 @@ + + + + + diff --git a/src/pages-sub/home/adPoster/components/LivingGuarantee.vue b/src/pages-sub/home/adPoster/components/LivingGuarantee.vue new file mode 100644 index 0000000..d5d3fb5 --- /dev/null +++ b/src/pages-sub/home/adPoster/components/LivingGuarantee.vue @@ -0,0 +1,46 @@ + + + + + diff --git a/src/pages-sub/home/adPoster/components/RoundedBorder.vue b/src/pages-sub/home/adPoster/components/RoundedBorder.vue new file mode 100644 index 0000000..9aa843a --- /dev/null +++ b/src/pages-sub/home/adPoster/components/RoundedBorder.vue @@ -0,0 +1,30 @@ + + + + + diff --git a/src/pages-sub/home/adPoster/components/Schools.vue b/src/pages-sub/home/adPoster/components/Schools.vue new file mode 100644 index 0000000..1001148 --- /dev/null +++ b/src/pages-sub/home/adPoster/components/Schools.vue @@ -0,0 +1,62 @@ + + + + + diff --git a/src/pages-sub/home/adPoster/components/ShareButtonGroup.vue b/src/pages-sub/home/adPoster/components/ShareButtonGroup.vue new file mode 100644 index 0000000..a6b4728 --- /dev/null +++ b/src/pages-sub/home/adPoster/components/ShareButtonGroup.vue @@ -0,0 +1,52 @@ + + + diff --git a/src/pages-sub/home/adPoster/components/SpecialtiesInArt.vue b/src/pages-sub/home/adPoster/components/SpecialtiesInArt.vue new file mode 100644 index 0000000..6e72da4 --- /dev/null +++ b/src/pages-sub/home/adPoster/components/SpecialtiesInArt.vue @@ -0,0 +1,41 @@ + + + + + diff --git a/src/pages-sub/home/adPoster/index.vue b/src/pages-sub/home/adPoster/index.vue new file mode 100644 index 0000000..cee2b42 --- /dev/null +++ b/src/pages-sub/home/adPoster/index.vue @@ -0,0 +1,35 @@ + +{ + style: { + navigationBarTitleText: '深泉教育', + }, +} + + + + + + + diff --git a/src/pages-sub/home/adPoster/studyAboard.vue b/src/pages-sub/home/adPoster/studyAboard.vue new file mode 100644 index 0000000..34aba12 --- /dev/null +++ b/src/pages-sub/home/adPoster/studyAboard.vue @@ -0,0 +1,48 @@ + +{ + style: { + navigationBarTitleText: '深泉教育', + }, +} + + + + + diff --git a/src/pages-sub/home/college/index.vue b/src/pages-sub/home/college/index.vue index f66fabd..5f412ee 100644 --- a/src/pages-sub/home/college/index.vue +++ b/src/pages-sub/home/college/index.vue @@ -178,13 +178,17 @@ const itemClick = (item, index) => { const handleClear = (index: number) => { if (currentMenu.value === 1) { regionKeyInfo.value = [] + regionInfo.value = [] } else if (currentMenu.value === 2) { natureKeyInfo.value = [] + natureInfo.value = [] } else if (currentMenu.value === 3) { uniTypeKeyInfo.value = [] + uniTypeInfo.value = [] } subMenu.value[index].activation = false dropMenuRef.value.closeDropMenu() + handleCheck() } const handleRegionIdChange = (val) => { diff --git a/src/pages-sub/home/wishesList/index.vue b/src/pages-sub/home/wishesList/index.vue index 93619f0..76977ee 100644 --- a/src/pages-sub/home/wishesList/index.vue +++ b/src/pages-sub/home/wishesList/index.vue @@ -300,12 +300,7 @@ const handleRegionName = (val: string[]) => { province.value = val } -const sliderValue = ref([ - +userStore.userInfo.estimatedAchievement.expectedScore < 200 - ? +userStore.userInfo.estimatedAchievement.expectedScore - : +userStore.userInfo.estimatedAchievement.expectedScore - 100, - +userStore.userInfo.estimatedAchievement.expectedScore, -]) +const sliderValue = ref([0, 0]) const handleSliderChange = (val) => { collegeSearch.value.tModelValue = '-1' paging.value.reload() @@ -317,6 +312,24 @@ const { score, minScore, maxScore } = useScore( userStore.userInfo.estimatedAchievement.requireSubject, ) +watch( + () => maxScore.value, + () => { + if (maxScore.value !== 0) { + sliderValue.value[0] = + +userStore.userInfo.estimatedAchievement.expectedScore < minScore.value + 40 + ? minScore.value + : +userStore.userInfo.estimatedAchievement.expectedScore - 40 + + sliderValue.value[1] = + +userStore.userInfo.estimatedAchievement.expectedScore > maxScore.value - 40 + ? maxScore.value + : +userStore.userInfo.estimatedAchievement.expectedScore + 40 + } + }, + { immediate: true }, +) + const handlePreview = () => { if (majorCount.value === 0) { return diff --git a/src/pages-sub/ucenter/setting/userInfo.vue b/src/pages-sub/ucenter/setting/userInfo.vue index b10b007..240da11 100644 --- a/src/pages-sub/ucenter/setting/userInfo.vue +++ b/src/pages-sub/ucenter/setting/userInfo.vue @@ -59,6 +59,7 @@ > 就读学校 + * - 邀请码 + 大成联盟邀请码 { }) return } + if (!formData.value.school) { + uni.showToast({ + title: '请输入学校', + icon: 'error', + mask: true, + }) + return + } savePerfectInfo({ nickName: formData.value.name, diff --git a/src/pages.json b/src/pages.json index db0b2fc..71d20fe 100644 --- a/src/pages.json +++ b/src/pages.json @@ -125,6 +125,20 @@ "navigationStyle": "custom" } }, + { + "path": "home/adPoster/index", + "type": "page", + "style": { + "navigationBarTitleText": "深泉教育" + } + }, + { + "path": "home/adPoster/studyAboard", + "type": "page", + "style": { + "navigationBarTitleText": "深泉教育" + } + }, { "path": "home/autoFill/index", "type": "page", diff --git a/src/pages/home/components/ADSpace.vue b/src/pages/home/components/ADSpace.vue new file mode 100644 index 0000000..e21c0d8 --- /dev/null +++ b/src/pages/home/components/ADSpace.vue @@ -0,0 +1,45 @@ + + + diff --git a/src/pages/home/index/index.vue b/src/pages/home/index/index.vue index 383ed45..b0a06cd 100644 --- a/src/pages/home/index/index.vue +++ b/src/pages/home/index/index.vue @@ -46,6 +46,7 @@ + @@ -67,6 +68,7 @@ import HomeSubMenu from '@/components/home/SubMenu.vue' import HotRank from '@/components/home/HotRank.vue' import Consultation from '@/components/home/Consultation.vue' import FabButton from '@/components/fab/FabButton.vue' +import ADSpace from '../components/ADSpace.vue' import { getWxUserInfo } from '@/service/index/api' diff --git a/src/service/index/api.ts b/src/service/index/api.ts index bac49dd..fcc0d8c 100644 --- a/src/service/index/api.ts +++ b/src/service/index/api.ts @@ -478,3 +478,7 @@ export const getAssistant = () => { export const verifyInviteCode = ({ code }: { code: string }) => { return http.post('/api/weChatUserEx/verifyInviteCode', { code }) } + +export const getADBanner = ({ code }: { code: string } = { code: 'b001' }) => { + return http.get('/api/zhiYuan/banner', { code }) +} diff --git a/src/types/uni-pages.d.ts b/src/types/uni-pages.d.ts index 4d6a3d8..19e33c5 100644 --- a/src/types/uni-pages.d.ts +++ b/src/types/uni-pages.d.ts @@ -10,6 +10,8 @@ interface NavigateToOptions { "/pages/ucenter/index/index" | "/pages-sub/evaluation/assessmentPage" | "/pages-sub/customerService/index/index" | + "/pages-sub/home/adPoster/index" | + "/pages-sub/home/adPoster/studyAboard" | "/pages-sub/home/autoFill/index" | "/pages-sub/home/career/index" | "/pages-sub/home/career/info" |