Merge branch 'jobFair' of https://git.citupro.com/zhengnaiwen_citu/menduner into jobFair

src/views/recruit/components/jobFairEntShare/index.vue

@@ -25,7 +25,8 @@ const props = defineProps({
 	positionList: Array,
 	jobFairId: String,
 	enterpriseId: String,
-	bgImg: String
+	bgImg: String,
+  backgroundColor: String
 })
 
 const loading = ref(false)
@@ -137,10 +138,16 @@ const drawCanvas = () => {
     }
     
     // 保存分享参数
-    const result = await saveShareQuery({ id: '14304' })
+    const params = {
+      jobFairId: props.jobFairId,
+      enterpriseId: props.enterpriseId,
+      entName: props.enterpriseName,
+      backgroundColor: props.backgroundColor
+    }
+    const result = await saveShareQuery(params)
     const query = {
       scene: 'id=' + result,
-      path: 'pagesB/positionDetail/index',
+      path: 'pagesB/jobFair/positionClassification',
       width: 200,
       autoColor: false,
       checkPath: true,

src/views/recruit/enterprise/jobFair/details.vue

@@ -69,9 +69,12 @@
         <JobFairEntShare 
           :show="showShare" 
           :enterpriseName="enterpriseName" 
-          :logoUrl="logoUrl" 
+          :logoUrl="logoUrl"
+          :jobFairId="id"
+          :enterpriseId="entBaseInfo?.id"
           :positionList="positionList" 
-          :bgImg="bgImg" 
+          :bgImg="bgImg"
+          :backgroundColor="bgColor" 
           @success="handlePreview"
         ></JobFairEntShare>
       </div>
@@ -122,6 +125,7 @@ const logoUrl = ref(entBaseInfo.value.logoUrl)
 const previewSrc  = ref('')
 const positionList = ref([])
 const bgImg = ref('')
+const bgColor = ref('')
 
 // 职位列表
 const getJobList = async () => {
@@ -179,6 +183,7 @@ const getJob = async () => {
   const data = await getJobFair(id)
   if (!data) return
   bgImg.value = data.contentImg
+  bgColor.value = data.backgroundColour
 }
 getJob()
 

src/views/recruit/personal/jobFair/details/components/jobCard.vue

@@ -127,11 +127,11 @@ const handleClick = (id) => {
 
 <style scoped lang="scss">
 .salary {
-	color: #cec149;
+	color: var(--v-primary-base);
 	font-weight: 700;
 }
 .job-name {
-	color: #345768;
+	color: #0E100F;
 	font-weight: 700;
 	max-width: 420px;
 }

src/views/recruit/personal/jobFair/details/components/jobCard1.vue

@@ -78,7 +78,7 @@ const handleClickEnterprise = (id) => {
   min-height: auto;
 }
 .salary {
-	color: #fe574a;
+	color: var(--v-primary-base);
 	font-size: 20px;
 }
 .job-name {
@@ -88,9 +88,12 @@ const handleClickEnterprise = (id) => {
 		color: var(--v-primary-base)
 	}
 }
-.enterprise-name:hover {
+.enterprise-name {
+	color: #0E100F;
+	&:hover {
 	color: var(--v-primary-base)
 }
+}
 .loading {
   margin-top: 8px;
   text-align: center;

src/views/recruit/personal/jobFair/details/entJobCard.vue

@@ -20,9 +20,12 @@
       <JobFairEntShare 
         :show="showShare" 
         :enterpriseName="enterpriseName" 
-        :logoUrl="logoUrl" 
+        :logoUrl="logoUrl"
+        :jobFairId="route.params.id"
+        :enterpriseId="route.query.enterpriseId"
         :positionList="positionList" 
-        :bgImg="jobFair?.contentImg" 
+        :bgImg="jobFair?.contentImg"
+        :backgroundColor="jobFair?.backgroundColour" 
         @success="handlePreview"
       ></JobFairEntShare>
     </div>

src/views/recruit/personal/jobFair/details/enterprises.vue

@@ -199,7 +199,7 @@ const handleShare = () => {
     }
     
     // 保存分享参数
-    const result = await saveShareQuery({ jobFairId: jobFair.value.id })
+    const result = await saveShareQuery({ jobFairId: route.params.id })
     const query = {
       scene: 'id=' + result,
       path: 'pagesB/jobFair/positionClassification',