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

components/PositionList/index.vue

@@ -16,8 +16,8 @@
           <view class="d-flex align-center justify-space-between">
             <view class="font-size-13 ellipsis" style="max-width: 56%;">
               <span class="tag-gap" style="color: #808080;">
-                <span>{{item.job?.areaName }}</span>
-                <span class="divider-mx" v-if="item.job?.areaName && item.job?.eduName">|</span>
+                <span>{{item.job?.area?.str ?? '全国' }}</span>
+                <span class="divider-mx" v-if="item.job?.eduName">|</span>
                 <span>{{item.job?.eduName }}</span>
                 <span class="divider-mx" v-if="item.job?.expName">|</span>
                 <span>{{item.job?.expName }}</span>

pagesA/interview/item.vue

@@ -50,7 +50,7 @@ const props = defineProps({
 
 //岗位详情
 const toDetail = (item) =>{
-  uni.navigateTo({ url: `/pagesB/positionDetail/index?id=${item.job?.id}&area=${item.job.areaName}` })
+  uni.navigateTo({ url: `/pagesB/positionDetail/index?id=${item.job?.id}&area=${item.job.area?.str ?? '全国'}` })
 }
 
 const handleAction = (item, type) => {

pagesA/resumeOnline/index.vue

@@ -547,6 +547,8 @@ $px: 30rpx;
       }
       &-tags {
         display: flex;
+        flex-direction: row;
+        flex-wrap: wrap;
         .tag {
           border: 2rpx solid #008978;
           color: #008978;

pagesB/positionDetail/index.vue

@@ -14,8 +14,8 @@
           <view class="d-flex justify-space-between mt-5 align-baseline">
             <view style="font-size: 14px;">
               <span>
-                <span>{{positionInfo?.areaName }}</span>
-                <span class="viewider-mx" v-if="positionInfo?.areaName && positionInfo?.eduName">|</span>
+                <span>{{positionInfo?.area?.str ?? '全国' }}</span>
+                <span class="viewider-mx" v-if="positionInfo?.eduName">|</span>
                 <span>{{positionInfo?.eduName }}</span>
                 <span class="viewider-mx" v-if="positionInfo?.expName">|</span>
                 <span>{{positionInfo?.expName }}</span>
@@ -349,8 +349,8 @@ const createPoster = async () => {
   // 工作地区、工作经验、学历要求
   context.setFillStyle('#6c6e7b')
   context.setFontSize(20)
-  const area = (areaName.value !== 'undefined' && areaName.value !== '' && areaName.value !== 'null' ? areaName.value + ' | ' : '') || (positionInfo.value?.areaName ? positionInfo.value?.areaName + ' | ' : '')
-  const combinationText = (area || '') + (positionInfo.value.expName || '') + (positionInfo.value.eduName ? ' | ' + positionInfo.value.eduName : '')
+  const area = areaName.value + ' | '
+  const combinationText = area + (positionInfo.value.expName || '') + (positionInfo.value.eduName ? ' | ' + positionInfo.value.eduName : '')
   context.fillText(combinationText, 40, 130)
 
   // 薪资
@@ -434,7 +434,7 @@ async function getPositionDetail () {
     info.value = data
     positionInfo.value = { ...dealDictObjData({}, info.value), ...info.value, enterprise: dealDictObjData({}, data.enterprise) }
     loading.value = false
-
+    areaName.value = positionInfo.value.area?.str ?? '全国'
     // 生成分享图片
     createPoster()
   } finally {

pagesB/recommendEnterprise/index.vue

@@ -35,8 +35,8 @@
               </view>
               <view style="font-size: 13px;" class="ss-m-t-5">
                 <span class="tag-gap" style="color: #808080;">
-                  <span>{{ k.areaName }}</span>
-                  <span class="ss-m-x-10" v-if="k.areaName && k.eduName">|</span>
+                  <span>{{ k.area?.str ?? '全国' }}</span>
+                  <span class="ss-m-x-10" v-if="k.eduName">|</span>
                   <span>{{ k.eduName }}</span>
                   <span class="ss-m-x-10" v-if="k.expName">|</span>
                   <span>{{ k.expName }}</span>
@@ -95,7 +95,7 @@ const loadingMore = () => {
 
 // 职位详情
 const handleToPosition = (k) => {
-  const url = `/pagesB/positionDetail/index?id=${k.id}&area=${k.areaName}`
+  const url = `/pagesB/positionDetail/index?id=${k.id}&area=${k.area?.str ?? '全国'}`
   uni.navigateTo({ url })
 }