Xiao_123 1 hónapja
szülő
commit
767294a1db

+ 4 - 0
components.d.ts

@@ -30,6 +30,7 @@ declare module 'vue' {
     CtTextField: typeof import('./src/components/CtVuetify/CtTextField/index.vue')['default']
     DatePicker: typeof import('./src/components/DatePicker/index.vue')['default']
     Echarts: typeof import('./src/components/Echarts/index.vue')['default']
+    ElCascader: typeof import('element-plus/es')['ElCascader']
     ElConfigProvider: typeof import('element-plus/es')['ElConfigProvider']
     Empty: typeof import('./src/components/Empty/index.vue')['default']
     File: typeof import('./src/components/Upload/file.vue')['default']
@@ -73,4 +74,7 @@ declare module 'vue' {
     VerifySlide: typeof import('./src/components/Verifition/Verify/VerifySlide.vue')['default']
     WangEditor: typeof import('./src/components/FormUI/wangEditor/index.vue')['default']
   }
+  export interface ComponentCustomProperties {
+    vLoading: typeof import('element-plus/es')['ElLoadingDirective']
+  }
 }

+ 2 - 3
src/components/Enterprise/hotPromoted.vue

@@ -8,7 +8,7 @@
             <v-img :src="item?.enterprise.logoUrl || 'https://minio.citupro.com/dev/menduner/company-avatar.png'" alt="" width="77" height="77" style="border-radius: 4px;"/>
           </div>
           <div class="company-info cursor-pointer">
-            <h3 v-ellipse-tooltip>{{ formatName(item.enterprise.anotherName || item.enterprise.name) }}</h3>
+            <h3 v-ellipse-tooltip class="MiSans-Semibold">{{ formatName(item.enterprise.anotherName || item.enterprise.name) }}</h3>
             <p>
               {{ item?.enterprise.scaleName }}
               <span class="septal-line" v-if="item.enterprise.industryName"></span>
@@ -142,7 +142,6 @@ const handleMoreEnterprise = (item) => {
 .company-info h3 {
   height: 22px;
   font-size: 18px;
-  font-weight: 700;
   color: #0E100F;
   line-height: 22px;
   margin: 0 0 4px 0;
@@ -178,7 +177,7 @@ ul li {
 .salary {
   font-size: 16px;
   float: right;
-  font-weight: 700;
+  font-family: MiSans-Medium;
   color: #00B760;
   line-height: 22px;
   max-width: none;

+ 2 - 3
src/components/Position/item.vue

@@ -11,7 +11,7 @@
         <div class="job-info">
           <div class="sub-li-top">
             <div class="sub-li-info">
-              <p v-ellipse-tooltip :class="['name', {'default-active': item.active }]">{{ formatName(item.name) }}</p>
+              <p v-ellipse-tooltip class="MiSans-Semibold" :class="['name', {'default-active': item.active }]">{{ formatName(item.name) }}</p>
               <svg-icon v-if="tab === 3 && item.hire" name="pin" size="30"></svg-icon>
             </div>
           </div>
@@ -31,7 +31,7 @@
                 </span>
               </span>
             </div>
-            <div>
+            <div class="MiSans-Medium">
               <p v-if="!item.payFrom && !item.payTo" class="salary">面议</p>
               <p v-else class="salary">{{ item.payFrom ? item.payFrom + '-' : '' }}{{ item.payTo }}{{ item.payName ? '/' + item.payName : '' }}</p>
             </div>
@@ -148,7 +148,6 @@ const handlePosition = (item) => {
 }
 .salary {
   font-size: 16px;
-  font-weight: 700;
   color: #00B760;
   line-height: 22px;
   flex: none;

+ 3 - 3
src/components/Position/longStrip.vue

@@ -5,9 +5,9 @@
     >
       <div class="info-header">
         <div v-if="val.active && val.job.status === '0'" class="header-btn">
-          <v-btn v-if="showCancelDeliveryResumeBtn && val.cvRel?.status === '0'" color="primary" size="small" @click.stop="emits('cancelDeliveryResume', val.cvRel.id)">撤销投递简历</v-btn>
-          <v-btn v-if="props.showCancelBtn" class="half-button ml-3" color="primary" size="small" @click.stop="handleCancel(val)">取消收藏</v-btn>
-          <v-btn class="half-button ml-3" color="primary" size="small" @click.stop="toDetails(val)">立即沟通</v-btn>
+          <v-btn v-if="showCancelDeliveryResumeBtn && val.cvRel?.status === '0'" class="MiSans-Medium" color="primary" size="small" @click.stop="emits('cancelDeliveryResume', val.cvRel.id)">撤销投递简历</v-btn>
+          <v-btn v-if="props.showCancelBtn" class="half-button ml-3 MiSans-Medium" color="primary" size="small" @click.stop="handleCancel(val)">取消收藏</v-btn>
+          <v-btn class="half-button ml-3 MiSans-Medium" color="primary" size="small" @click.stop="toDetails(val)">立即沟通</v-btn>
         </div>
         <div v-if="val.job.status === '1'" class="font-size-14 header-btn color-error">职位已关闭</div>
         <div class="img-box">

+ 1 - 1
src/components/headSearch/index.vue

@@ -38,7 +38,7 @@
         @keyup.enter="handleSearch"
       ></v-text-field>
       <v-hover v-slot="{ isHovering, props }">
-        <v-btn v-bind="props" v-ripple.center class="searchBtn" @click="handleSearch" :class="isHovering ? 'elevation-10' : 'elevation-5'">搜索</v-btn>
+        <v-btn v-bind="props" v-ripple.center class="searchBtn MiSans-Medium" @click="handleSearch" :class="isHovering ? 'elevation-10' : 'elevation-5'">搜索</v-btn>
       </v-hover>
     </div>
   </div>

+ 60 - 1
src/styles/index.css

@@ -1,4 +1,64 @@
 @charset "UTF-8";
+/* assets/fonts.css */
+@font-face {
+  font-family: 'MiSans-Normal';
+  src: url("../assets/fonts/MiSans-Normal.woff2") format("woff2");
+  font-style: normal;
+  font-display: swap;
+}
+
+@font-face {
+  font-family: 'MiSans-Medium';
+  src: url("../assets/fonts/MiSans-Medium.woff2") format("woff2");
+  font-style: normal;
+  font-display: swap;
+}
+
+@font-face {
+  font-family: 'MiSans-Demibold';
+  src: url("../assets/fonts/MiSans-Demibold.woff2") format("woff2");
+  font-style: normal;
+  font-display: swap;
+}
+
+@font-face {
+  font-family: 'MiSans-Semibold';
+  src: url("../assets/fonts/MiSans-Semibold.woff2") format("woff2");
+  font-style: normal;
+  font-display: swap;
+}
+
+@font-face {
+  font-family: 'MiSans-Bold';
+  src: url("../assets/fonts/MiSans-Bold.woff2") format("woff2");
+  font-style: normal;
+  font-display: swap;
+}
+
+body {
+  font-family: MiSans-Normal;
+}
+
+.MiSans-Normal {
+  font-family: MiSans-Normal;
+}
+
+.MiSans-Medium {
+  font-family: MiSans-Medium;
+}
+
+.MiSans-Demibold {
+  font-family: MiSans-Demibold;
+}
+
+.MiSans-Semibold {
+  font-family: MiSans-Semibold;
+}
+
+.MiSans-Bold {
+  font-family: MiSans-Bold;
+}
+
 :root {
   --zIndex-dialog: 999;
   --default-bgc: #f2f4f7;
@@ -252,7 +312,6 @@
 
 .home-title {
   font-size: 30px;
-  font-weight: 600;
   color: #333333;
   margin: 0 15px;
   position: relative;

A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 0 - 0
src/styles/index.min.css


+ 0 - 1
src/styles/index.scss

@@ -252,7 +252,6 @@
 
 .home-title {
   font-size: 30px;
-  font-weight: 600;
   color: #333333;
   margin: 0 15px;
   position: relative;

+ 1 - 1
src/views/recruit/personal/home/components/advertisement/index.vue

@@ -2,7 +2,7 @@
 <template>
   <div class="contentBox py-10 px-3">
     <div class="d-flex align-center justify-center">
-      <div class="home-title">
+      <div class="home-title MiSans-Semibold">
         优选集团
         <div class="home-title-line"></div>
       </div>

+ 1 - 1
src/views/recruit/personal/home/components/hotJobs.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="default-width mb-6 d-flex align-center justify-center">
-    <span class="color-primary font-weight-bold" style="width: 80px; min-width: 80px;">{{ $t('position.popularPosition') }}:</span>
+    <span class="color-primary MiSans-Medium" style="width: 80px; min-width: 80px;">{{ $t('position.popularPosition') }}:</span>
     <div class="overflow-hidden py-3 pl-2" style="height: 60px; ">
       <v-hover v-slot="{ isHovering, props }" v-for="(item, index) in jobs" :key="index">
         <span 

+ 1 - 1
src/views/recruit/personal/home/components/hotPromotedPositions.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
     <div class="d-flex align-center justify-center">
-      <div class="home-title">
+      <div class="home-title MiSans-Semibold">
         精选职位
         <div class="home-title-line"></div>
       </div>

+ 1 - 1
src/views/recruit/personal/home/components/popularEnterprises.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
     <div class="d-flex align-center justify-center">
-      <div class="home-title">
+      <div class="home-title MiSans-Semibold">
         精选企业
         <div class="home-title-line"></div>
       </div>

+ 4 - 3
src/views/recruit/personal/jobFair/details/components/jobCard1.vue

@@ -6,7 +6,7 @@
 					<div class="d-flex justify-space-between">
 						<div class="d-flex align-center">
 							<svg-icon name="jobFair" class="mr-1" size="25"></svg-icon>
-							<p class="job-name font-weight-medium" v-ellipse-tooltip :style="{'max-width': !val.payFrom && !val.payTo ? '450px' : '320px'}">{{ formatName(val.name) }}</p>
+							<p class="job-name MiSans-Semibold" v-ellipse-tooltip :style="{'max-width': !val.payFrom && !val.payTo ? '450px' : '320px'}">{{ formatName(val.name) }}</p>
 						</div>
 						<p v-if="!val.payFrom && !val.payTo" class="salary">面议</p>
 						<p v-else class="salary ml-3">{{ val.payFrom ? val.payFrom + '-' : '' }}{{ val.payTo }}{{ val.payName ? '/' + val.payName : '' }}</p>
@@ -15,8 +15,8 @@
 						<div class="color-999 font-size-15">
 							<span v-for="k in desc" :key="k.mdi">
 								<span v-if="val[k.value] || k.value === 'areaName'" class="mr-5">
-									<v-icon color="var(--color-666)" size="15">{{ k.mdi }}</v-icon>
-									<span class="ml-1 tag-text">
+									<v-icon color="#666" size="15">{{ k.mdi }}</v-icon>
+									<span class="ml-1 tag-text color-666">
 										{{ k.value === 'areaName' ? !val.areaId ? '全国' : val.area?.str : val[k.value] }}
 									</span>
 								</span>
@@ -81,6 +81,7 @@ const handleClickEnterprise = (id) => {
 .salary {
 	color: var(--v-primary-base);
 	font-size: 20px;
+	font-family: MiSans-Medium;
 }
 .job-name {
 	font-size: 20px;

Nem az összes módosított fájl került megjelenítésre, mert túl sok fájl változott