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

pagesB/jobFair/enterprisesClassification.vue

@@ -46,14 +46,15 @@
                   <span class="divider tag-gap1" v-if="val?.industryName && val?.scaleName"> | </span>
                   <span class="color-999">{{ val?.scaleName || '' }}</span>
                 </view>
-                <view class="ss-m-t-10" style="overflow: hidden; height: 57px;">
+                <view class="ss-m-t-10" style="overflow: hidden; height: 46px;">
                   <uni-tag 
-                    v-for="(job,i) in val?.lastJobTop5 || []"
+                    v-for="(tag,i) in val?.welfareList || []"
                     :key="i"
-                    :text="formatName(job.name)"
+                    class="ss-m-r-5"
+                    :text="tag"
                     inverted="false"
-                    size="default"
-                    custom-style="background-color: #00B760; color: #fff; border-color: #00B760; display: inline-block; border-radius: 15px; margin: 0 5px 5px 0;"
+                    size="mini"
+                    custom-style="background-color: #ececec; color: #666; border-color: #ececec; display: inline-block;"
                   />
                 </view>
               </view>

pagesB/positionDetail/index.vue

@@ -4,13 +4,13 @@
       <view class="box">
         <view v-if="loading" class="vertical80-center">{{ loadingText }}</view>
         <view v-else>
-          <view class="mt-5" style="display: flex; align-items: center;">
+          <view class="mt-5" style="display: flex;">
             <!-- 赏金 -->
             <view v-if="info.hire && info.hirePrice" class="hirePrice ss-m-r-10 d-flex align-center">
               <view class="iconfont icon-a-1_zhaopin ss-m-r-10" style="color: #e03506; font-size: 20px;"></view>
               <view>{{ `赏金：${commissionCalculation(info.hirePrice / 100, 1)}元` }}</view>
             </view>
-            <image v-if="isJobFair" src="/static/svg/jobFair.svg" class="ss-m-r-10" style="width: 22px; height: 22px;"></image>
+            <image v-if="isJobFair" src="/static/svg/jobFair.svg" class="ss-m-r-10" style="width: 30px; height: 30px;"></image>
             <!-- 职位名称 -->
             <h2 class="JobName" style="flex: 1;">{{ formatName(info.name) }}</h2>
           </view>