diff --git a/.DS_Store b/.DS_Store index d38987d..0fe8cbb 100644 Binary files a/.DS_Store and b/.DS_Store differ diff --git a/App.vue b/App.vue index 859f969..73069f9 100644 --- a/App.vue +++ b/App.vue @@ -75,6 +75,29 @@ uni-modal, @font-face { font-family: DingTalk JinBuTi; - src: url('@/static/font/DingTalk JinBuTi_min.ttf'); + src: url('/static/font/DingTalk JinBuTi_min.woff2') format('woff2'); + font-display: swap; +} + +@font-face { + font-family: PingFangSC-Regular; + src: url('/static/font/PingFangSC-Regular.woff2') format('woff2'); + font-display: swap; +} + +@font-face { + font-family: PingFangSC-Medium; + src: url('/static/font/PingFangSC-Medium.woff2') format('woff2'); + font-display: swap; +} + +@font-face { + font-family: DIN-Medium; + src: url('/static/font/DIN-Medium.woff2') format('woff2'); + font-display: swap; +} + +body { + font-family: 'PingFangSC-Regular', 'PingFang SC', 'Microsoft YaHei', 'Helvetica Neue', Helvetica, Arial, sans-serif; } diff --git a/components/AppLayout/AppLayout.vue b/components/AppLayout/AppLayout.vue index 57ae6dc..e9b405f 100644 --- a/components/AppLayout/AppLayout.vue +++ b/components/AppLayout/AppLayout.vue @@ -110,9 +110,11 @@ const handleScrollToLower = () => { align-items: center; padding: 7rpx 3rpx; .header-title { + font-family: 'PingFangSC-Medium', 'PingFang SC', 'Helvetica Neue', Helvetica, Arial, 'Microsoft YaHei', sans-serif; color: #000000; font-weight: bold; .subtitle-text { + font-family: 'PingFangSC-Regular', 'PingFang SC', 'Microsoft YaHei', 'Helvetica Neue', Helvetica, Arial, sans-serif; font-weight: 400; font-size: 28rpx; color: #333333; diff --git a/components/md-render/md-render.vue b/components/md-render/md-render.vue index 17185ba..5362565 100644 --- a/components/md-render/md-render.vue +++ b/components/md-render/md-render.vue @@ -276,11 +276,13 @@ ol { align-items: center; justify-content: space-between .title-text + font-family: 'PingFangSC-Medium', 'PingFang SC', 'Helvetica Neue', Helvetica, Arial, 'Microsoft YaHei', sans-serif; max-width: calc(100% - 160rpx); overflow: hidden text-overflow: ellipsis font-size: 30rpx .card-salary + font-family: DIN-Medium; font-size: 28rpx; color: #FF6E1C; diff --git a/components/renderCompanys/renderCompanys.vue b/components/renderCompanys/renderCompanys.vue index b0a6003..5a1456d 100644 --- a/components/renderCompanys/renderCompanys.vue +++ b/components/renderCompanys/renderCompanys.vue @@ -9,8 +9,12 @@ - - 在招职位·{{ job.totalRecruitment || '-' }}个 + + + 在招职位· + {{ job.totalRecruitment || '-' }} + 个 + @@ -76,6 +80,7 @@ function nextDetail(company) { justify-content: space-between align-items: flex-start .company{ + font-family: 'PingFangSC-Medium', 'PingFang SC', 'Helvetica Neue', Helvetica, Arial, 'Microsoft YaHei', sans-serif; font-weight: 500; font-size: 32rpx; color: #333333; @@ -97,6 +102,7 @@ function nextDetail(company) { display: flex flex-wrap: wrap .tag{ + font-family: 'PingFangSC-Medium', 'PingFang SC', 'Helvetica Neue', Helvetica, Arial, 'Microsoft YaHei', sans-serif; width: fit-content; height: 30rpx; background: #F4F4F4; @@ -121,4 +127,7 @@ function nextDetail(company) { color: #6C7282; } } +.ris{ + font-family: 'PingFangSC-Medium', 'PingFang SC', 'Helvetica Neue', Helvetica, Arial, 'Microsoft YaHei', sans-serif; +} diff --git a/components/renderJobs/renderJobs.vue b/components/renderJobs/renderJobs.vue index 96cd980..bcb138c 100644 --- a/components/renderJobs/renderJobs.vue +++ b/components/renderJobs/renderJobs.vue @@ -99,11 +99,13 @@ function nextDetail(job) { justify-content: space-between align-items: flex-start .company{ + font-family: 'PingFangSC-Medium', 'PingFang SC', 'Helvetica Neue', Helvetica, Arial, 'Microsoft YaHei', sans-serif; font-weight: 500; font-size: 32rpx; color: #333333; } .salary{ + font-family: DIN-Medium; font-weight: 500; font-size: 28rpx; color: #4C6EFB; @@ -120,6 +122,7 @@ function nextDetail(job) { display: flex flex-wrap: wrap .tag{ + font-family: 'PingFangSC-Medium', 'PingFang SC', 'Helvetica Neue', Helvetica, Arial, 'Microsoft YaHei', sans-serif; width: fit-content; height: 30rpx; background: #F4F4F4; diff --git a/packageA/pages/choiceness/choiceness.vue b/packageA/pages/choiceness/choiceness.vue index e1b2e3e..16f89af 100644 --- a/packageA/pages/choiceness/choiceness.vue +++ b/packageA/pages/choiceness/choiceness.vue @@ -88,6 +88,7 @@ function seeDetail(item) { font-weight: 600; font-size: 32rpx; color: #333333; + font-family: 'PingFangSC-Medium', 'PingFang SC', 'Helvetica Neue', Helvetica, Arial, 'Microsoft YaHei', sans-serif; } .card-text{ margin-top: 16rpx diff --git a/packageA/pages/exhibitors/exhibitors.vue b/packageA/pages/exhibitors/exhibitors.vue index 73b8dc6..5853770 100644 --- a/packageA/pages/exhibitors/exhibitors.vue +++ b/packageA/pages/exhibitors/exhibitors.vue @@ -251,6 +251,7 @@ image { font-weight: 500; font-size: 32rpx; color: #333333; + font-family: 'PingFangSC-Medium', 'PingFang SC', 'Helvetica Neue', Helvetica, Arial, 'Microsoft YaHei', sans-serif; } .row2{ font-weight: 400; diff --git a/packageA/pages/myResume/myResume.vue b/packageA/pages/myResume/myResume.vue index 2018d66..9ad5638 100644 --- a/packageA/pages/myResume/myResume.vue +++ b/packageA/pages/myResume/myResume.vue @@ -54,7 +54,7 @@ {{ userInfo.salaryMin / 1000 }}k-{{ userInfo.salaryMax / 1000 }}k - 期望工资地: + 期望工作地: 青岛市- @@ -91,6 +91,7 @@ image{ padding: 52rpx 48rpx .tops-left{ .name{ + font-family: 'PingFangSC-Medium', 'PingFang SC', 'Helvetica Neue', Helvetica, Arial, 'Microsoft YaHei', sans-serif; font-weight: 600; font-size: 44rpx; color: #333333; @@ -140,6 +141,7 @@ image{ .mys-info{ padding: 28rpx .mys-h4{ + font-family: 'PingFangSC-Medium', 'PingFang SC', 'Helvetica Neue', Helvetica, Arial, 'Microsoft YaHei', sans-serif; font-weight: 600; font-size: 32rpx; color: #000000; diff --git a/packageA/pages/post/post.vue b/packageA/pages/post/post.vue index 09978cc..1759a31 100644 --- a/packageA/pages/post/post.vue +++ b/packageA/pages/post/post.vue @@ -113,10 +113,7 @@ v-for="(item, index) in matchingDegree" :key="index" class="progress-item" - :class="{ - active: index < currentStep - 1, - half: index < currentStep && currentStep < index + 1, // 半条 - }" + :class="getClass(index)" /> @@ -263,6 +260,21 @@ function jobCollection() { }); } } + +function getClass(index) { + const current = currentStep.value; + const floorIndex = Math.floor(current); + + if (index < floorIndex) { + return 'active'; + } else if (index === floorIndex) { + const decimal = current % 1; + const percent = Math.round(decimal * 100); + return `half${percent}`; + } else { + return ''; + } +} diff --git a/pages/index/index.vue b/pages/index/index.vue index 8120422..feebfaf 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -27,7 +27,18 @@ + + + + + + 左滑查看视频 + 快去体验吧~ + 去体验 + 1 + + @@ -45,11 +56,20 @@ import { storeToRefs } from 'pinia'; import { useReadMsg } from '@/stores/useReadMsg'; const { unreadCount } = storeToRefs(useReadMsg()); const showTabbar = ref(true); +const maskFristEntry = ref(false); + +onLoad(() => { + // 判断浏览器是否有 fristEntry 第一次进入 + // let fristEntry = uni.getStorageSync('fristEntry') === false ? false : true; // 默认未读 + // maskFristEntry.value = fristEntry ; + maskFristEntry.value = true; +}); onShow(() => { // 获取消息列表 useReadMsg().fetchMessages(); }); + const state = reactive({ current: 0, all: [{}], @@ -69,7 +89,7 @@ function changeShowTabbar(val) { showTabbar.value = val; } -// 查看消息类型 +//1 查看消息类型 function changeSwiperType(e) { const index = e.detail.current; state.current = index; @@ -87,11 +107,20 @@ function handleTabChange(index) { } } -// 查看消息类型 function changeSwiperMsgType(e) { const currented = e.detail.current; state.current = currented; } +// mask +function closeFristEntry() { + uni.setStorageSync('fristEntry', false); + maskFristEntry.value = false; +} + +function goExperience() { + closeFristEntry(); + state.current = 1; +} diff --git a/pages/login/login.vue b/pages/login/login.vue index ea4add3..29a6017 100644 --- a/pages/login/login.vue +++ b/pages/login/login.vue @@ -3,7 +3,7 @@