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

pages/index/position.vue

@@ -35,7 +35,7 @@
             <view class="white-bgc px-10 stickFilter">
             <FilterList :list="filterList" idValue="label" @change="handleSearch"></FilterList>
           </view>
-          <PositionList :list="positionListData" :noMore="false" :showJobFairEntrance="true"></PositionList>
+          <PositionList :list="positionListData" :noMore="false" :showJobFairEntrance="false"></PositionList>
           <uni-load-more :status="more" />
         </view>
       </scroll-view>
@@ -109,7 +109,8 @@ const gridList = [
   { label: '门墩儿猎头', icon: '/static/img/headhunting.png', path: '/pagesB/headhunting/index' },
   { label: '精选企业', icon: '/static/img/enterprise.png', path: '/pagesB/recommendEnterprise/index' },
   { label: '酒店英语', icon: '/static/img/group.png', weiXinPublicUrl: 'https://mp.weixin.qq.com/s/zta8NvNaJOFhPxq9NAE9pw' },
-  { label: '早报资讯', icon: '/static/img/information.png', id: 'morningNews' },
+  // { label: '早报资讯', icon: '/static/img/information.png', id: 'morningNews' },
+  { label: '招聘会', icon: '/static/img/information.png', path: '/pagesB/jobFair/index' },
   { label: '了解门墩儿', icon: '/static/img/contact.png', path: '/pagesB/about/index' }
 ]
 

pagesB/jobFair/index.vue

@@ -2,10 +2,10 @@
 <template>
   <view style="padding-bottom: 30px; ">
     <view v-if="items.length">
-      <uni-card v-for="val in items" :key="val.id">
+      <uni-card v-for="val in items" :key="val.id" @tap="handleToJobFairEnterprises(val)">
         <image v-if="val?.previewImg" class="ss-m-t-10" :src="val.previewImg" 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" style="background-color: #00B760; color: #fff;" type="primary" @tap="handleToJobFairEnterprises(val)">查看详情</button>
+        <button class="ss-m-t-20 ss-m-b-10" style="background-color: #00B760; color: #fff;" type="primary">查看详情</button>
       </uni-card>
     </view>
     <view v-else class="nodata-img-parent">
@@ -33,15 +33,7 @@ const handleToJobFairEnterprises = (val) => {
     uni.showToast({ title: '进去招聘会失败！', icon: 'none' })
   }
   let url = `/pagesB/jobFair/${Number(val?.category) ? 'positionClassification': 'enterprisesClassification'}?jobFairId=${val.id}`
-  // const tagData = val?.tag?.length ? JSON.stringify(val.tag) : null
-  // if (tagData) url = url + `&tagData=${tagData}`
-  console.log('url:', url)
 	uni.navigateTo({url})
-	// let text = val.title ? val.title.replace(/<[^>]+>/g, ' ') : '' // 去掉所有 HTML 标签
-	// text = text ? text.replace(/\s+/g, ' ').trim() : '' // 去掉多余的空格
-	// uni.navigateTo({
-	// 	url: `/pagesB/jobFair/enterprises?jobFairId=${val.id}&jobFairName=${text}`
-	// })
 }
 
 </script>

utils/config.js

@@ -13,7 +13,7 @@ const config = {
   }
 }
 
-export const envObj = config['produce']
+export const envObj = config['httpsTest']
 
 export const baseUrl = envObj.baseUrl