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

pages.json

@@ -316,7 +316,7 @@
 				{
 					"path": "jobFair/positions",
 					"style": {
-						"navigationBarTitleText": "招聘会/岗位"
+						"navigationBarTitleText": "招聘会/职位"
 					}
 				}
 			]

pagesB/jobFair/enterprises.vue

@@ -7,7 +7,6 @@
           <!-- 顶部 -->
           <view class="white-bgc stick ss-p-t-10 ss-p-b-10">
             <view class="titleBox">
-              <view class="title">招聘会企业</view>
               <view class="jobFairName">{{ jobFairName }}</view>
             </view>
             <!-- 搜索条 -->

pagesB/jobFair/index.vue

@@ -3,9 +3,9 @@
   <view style="padding-bottom: 30px; ">
     <view v-if="items.length">
       <uni-card v-for="val in items" :key="val.id">
-        <image class="ss-m-t-10" :src="val.headImg" mode="widthFix" style="width: 100%; height: auto;"></image>
+        <image class="ss-m-t-10" :src="val.headImg" mode="widthFix" style="width: 100%; height: auto; border-radius: 6px;"></image>
         <view class="ss-m-t-20">活动时间：{{ timesTampChange(val.startTime, 'Y-M-D') }}至{{ timesTampChange(val.endTime, 'Y-M-D') }}</view>
-        <button class="ss-m-t-20 ss-m-b-10 main-button-color" type="primary" @tap="handleToJobFairEnterprises(val)">查看详情</button>
+        <button class="ss-m-t-20 ss-m-b-10" style="background-color: #00897B; color: #fff;" type="primary" @tap="handleToJobFairEnterprises(val)">查看详情</button>
       </uni-card>
     </view>
     <view v-else class="nodata-img-parent">
@@ -24,7 +24,6 @@ const items = ref([])
 const getList = async () => {
   const res = await getJobFairList()
   items.value = res?.data || []
-  // items.value = [...items.value, ...items.value, ...items.value, ...items.value, ...items.value, ...items.value, ...items.value, ...items.value, ...items.value, ...items.value, ...items.value]
 }
 getList()
 

pagesB/jobFair/positions.vue

@@ -7,7 +7,6 @@
           <!-- 顶部 -->
           <view class="white-bgc stick ss-p-t-10">
             <view class="titleBox">
-              <view class="title">招聘职位</view>
               <view class="entName">{{ entName }}</view>
             </view>
           </view>