Merge branch 'master' of https://git.citupro.com/zhengnaiwen_citu/menduner-uniapp

pages/index/position.vue

@@ -59,13 +59,6 @@ import { getRewardEventList } from '@/utils/eventList'
 import { getMorningNewsArticle } from '@/api/content'
 import { getWebContent } from '@/api/common'
 
-// setTimeout(() => { // 测试
-//   const url = '/pagesB/jobFair/jobFairEntShare?jobFairId=1889880551008010241&enterpriseId=1'
-//   uni.navigateTo({
-//     url
-//   })
-// }, 100)
-
 onLoad(() => {
   wx.showShareMenu({
     withShareTicket: true,

pagesB/jobFair/jobFairShare.vue

@@ -123,7 +123,7 @@ const handleShareCode = async () => {
   const result = await saveShareQuery({ jobFairId })
 	const query = {
 		scene: 'id=' + result.data,
-    path: `pagesB/jobFair/${isEnt ? 'enterprisesClassification' : 'positionClassification'}`,
+    path: `pagesB/jobFair/${!isEnt ? 'enterprisesClassification' : 'positionClassification'}`,
 		width: 200,
 		autoColor: false,
 		checkPath: true,

pagesB/jobFair/positionClassification.vue

@@ -82,12 +82,14 @@ const entName = ref('')
 const showShareBtn = ref(false)
 
 onLoad(async (options) => {
-  // 网站二维码分享
+  // 海报二维码分享
 	if (options.scene) {
     const scene = decodeURIComponent(options.scene)
+    console.log(scene, 'scene')
     const key = scene.split('=')[1]
     if (!key) return
     const res = await getShareQueryById({key})
+    console.log(res, 'result')
     options.jobFairId = res?.data?.jobFairId
     options.enterpriseId = res?.data?.enterpriseId
     options.backgroundColor = res?.data?.backgroundColor