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

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

@@ -1,5 +1,6 @@
 <template>
   <v-card class="card-box pa-4" :style="`background-color: ${jobFairInfo?.backgroundColour}`">
+    <Loading :visible="jobListLoading" :contained="true"></Loading>
     <div class="position-relative">
       <div class="text-center my-6 mx-10 px-15 font-weight-bold font-size-20" style="color: #fff">{{ jobFairInfo?.title?.replace(/<\/?p[^>]*>/gi, '') }}</div>
       <div class="d-flex justify-space-between mb-3 align-center">
@@ -13,7 +14,8 @@
           <v-btn color="#fff" v-if="jobFairInfo?.contentImg" :style="`color: ${jobFairInfo?.backgroundColour || 'var(--v-primary-base)'}`" prepend-icon="mdi-share" @click="handleShare">我的分享海报</v-btn>
         </div>
       </div>
-      <JobItem :items="jobList" @refresh="getJobList(), getJobNum()"></JobItem>
+      <div v-if="jobListLoading" class="centerText color-777">加载中...</div>
+      <JobItem v-else :items="jobList" @refresh="getJobList(), getJobNum()"></JobItem>
 
       <v-navigation-drawer v-model="showDrawer" location="right" temporary width="600">
         <Loading :visible="positionLoading" :contained="true"></Loading>
@@ -140,10 +142,15 @@ const previewSrc  = ref('')
 const positionList = ref([])
 
 // 职位列表
+const jobListLoading = ref(true)
 const getJobList = async () => {
-  const data = await getJobFairPosition(id)
-  if (!data || !data.length) return jobList.value = []
-  jobList.value = dealDictArrayData([], data)
+  try {
+    const data = await getJobFairPosition(id)
+    if (!data || !data.length) return jobList.value = []
+    jobList.value = dealDictArrayData([], data)
+  } finally {
+    jobListLoading.value = false
+  }
 }
 
 // const handleAdd = async () => {
@@ -282,4 +289,11 @@ const handleShare = () => {
 .actions:hover {
   color: var(--v-primary-base);
 }
+
+.centerText {
+  height: 50vh;
+  line-height: 50vh;
+  text-align: center;
+  color: #fff;
+}
 </style>

src/views/recruit/enterprise/positionManagement/components/add.vue

@@ -233,6 +233,8 @@ const saveEmit = async (retry) => {
   loading.value = true
   try {
     const res = await saveJobAdvertised({ ...submitParams, fair: props.isFair ? true : false }) // fair：是否为招聘会职位编辑-必填
+    if (showExtend.value) await handleSaveExtend(res) // 保存扩展信息
+
     // status：99为待支付职位，弹窗支付
     if (submitParams?.status && submitParams?.status === '99') {
       loading.value = true
@@ -245,9 +247,6 @@ const saveEmit = async (retry) => {
       return
     }
 
-    // 保存扩展信息
-    if (showExtend.value) await handleSaveExtend(res)
-
     Snackbar.success(submitParams.id ? t('common.editSuccessMsg') : '发布成功')
     handleCancel()
   } catch (error) {