Merge branch 'recruit-enterprise' of https://git.citupro.com/zhengnaiwen_citu/menduner-uniapp into recruit-enterprise

pages/index/communicate.vue

@@ -167,7 +167,6 @@ async function init () {
 
 <style scoped lang="scss">
 .scrollBox {
-	padding-bottom: 24rpx;
   box-sizing: border-box;
 }
 .box {
@@ -225,7 +224,7 @@ async function init () {
 }
 .height {
 	height: 100vh;
-	padding-bottom: 120rpx;
+	padding-bottom: 100px;
 	box-sizing: border-box;
 }
 .enterAvatar{

pages/index/components/condition.vue

@@ -6,8 +6,8 @@
         radius="5"
         placeholder="输入关键字"
         cancelButton="none"
-        :focus="false"
 				bgColor="#fff"
+        :focus="false"
 				@clear="handleSearch('content', null)"
         @confirm="handleSearch('content', params.content)"
       ></uni-search-bar>
@@ -30,6 +30,8 @@ import { getPersonConditionSearchPage } from '@/api/search'
 import { dealDictArrayData } from '@/utils/position'
 import { timesTampChange, getTimeDifferenceInChinese } from '@/utils/date'
 
+// defineProps({ navbarHeight: [Number, String] })
+
 const query = ref({
 	pageNo: 1,
 	pageSize: 10
@@ -144,11 +146,9 @@ const loadingMore = () => {
   box-sizing: border-box;
 	height: 0 !important;
 }
-.stickFilter {
-  z-index: 1;
-  position: sticky;
-  box-shadow: 0px 10rpx 12rpx 0px rgba(195, 195, 195, .25);
-  top: 110rpx;
-	background-color: #fff;
-}
+// .stick {
+//   z-index: 1;
+//   position: sticky;
+//   background-color: #fff;
+// }
 </style>

pages/index/components/recommend.vue

@@ -1,6 +1,6 @@
 <template>
 	<view class="box defaultBgc">
-		<view style="padding: 10px 15px 10px 15px;">
+		<view style="padding: 10px">
 			<uni-data-select 
 				v-model="query.jobId" 
 				:clear="false" 
@@ -19,12 +19,13 @@
 </template>
 
 <script setup>
-import { ref, nextTick } from 'vue'
+import { ref } from 'vue'
 import TalentItem from './talentItem.vue'
 import { getPersonRecommendPage } from '@/api/search'
 import { dealDictArrayData } from '@/utils/position'
 
-defineProps({ jobList: Array })
+defineProps({ jobList: Array, navbarHeight: [Number, String] })
+
 
 const query = ref({
 	pageNo: 1,
@@ -96,4 +97,9 @@ const loadingMore = () => {
   box-sizing: border-box;
 	height: 0 !important;
 }
+// .stick {
+//   z-index: 1;
+//   position: sticky;
+//   background-color: #fff;
+// }
 </style>

pages/index/search.vue

@@ -5,7 +5,8 @@
 			<view :style="{'padding-top': navbarHeight + 'px'}">
 				<view class="commonBackground"></view>
 				<view class="box defaultBgc">
-					<view style="padding: 0 15px 0 15px;">
+          <!-- <SwiperAd v-if="swiperAdList?.length" margin="0 10px 10px 10px" :list="swiperAdList" imgUrlKey="img" :strType="false" /> -->
+					<view>
 						<uni-segmented-control 
 							:current="current"
 							:values="tabList"
@@ -16,10 +17,10 @@
 					</view>
 
 					<!-- 职位推荐 -->
-					<RecommendPage v-if="current === 0" :jobList="jobList" />
+					<RecommendPage v-if="current === 0" :jobList="jobList" :navbarHeight="navbarHeight" />
 
 					<!-- 条件筛选 -->
-					<ConditionPage v-else />
+					<ConditionPage v-else :navbarHeight="navbarHeight" />
 				</view>
 			</view>
 		</layout-page>
@@ -31,6 +32,7 @@ import { ref, watch, onMounted } from 'vue'
 import { onShow } from '@dcloudio/uni-app'
 import layoutPage from '@/layout'
 import Navbar from '@/components/Navbar'
+// import SwiperAd from '@/components/SwiperAd'
 import { getAccessToken } from '@/utils/request'
 import { showAuthModal } from '@/hooks/useModal'
 import { getJobAdvertised } from '@/api/search'
@@ -38,6 +40,7 @@ import { userStore } from '@/store/user'
 import { formatName } from '@/utils/getText'
 import RecommendPage from './components/recommend.vue'
 import ConditionPage from './components/condition.vue'
+import { getWebContent } from '@/api/common'
 
 const navbarHeight = ref(0)
 
@@ -61,6 +64,13 @@ const current = ref(0)
 const tabList = ['职位推荐', '条件筛选']
 const useUserStore = userStore()
 
+// 获取轮播图
+const swiperAdList = ref([])
+const getSystemWebContent = async () => {
+  const { data } = await getWebContent()
+  swiperAdList.value = data?.appHomeCarousel || []
+}
+
 // 职位列表
 const jobList = ref([])
 const getJobList = async () => {
@@ -79,6 +89,8 @@ watch(() => useUserStore.refreshToken, () => {
 }, { immediate: true })
 
 onShow(() => {
+	// getSystemWebContent()
+
 	// 设置自定义tabbar选中值
   const currentPage = getCurrentPages()[0]  // 获取当前页面实例
   const currentTabBar = currentPage?.getTabBar?.()
@@ -87,7 +99,6 @@ onShow(() => {
   currentTabBar?.setData({ selected: 0 })
 
 	if (!getAccessToken()) return showAuthModal()
-
 })
 
 const changeControl = (e) =>{
@@ -96,12 +107,23 @@ const changeControl = (e) =>{
 </script>
 
 <style scoped lang="scss">
-:deep(.uni-select__selector-item) {
-	display: block !important;
-	text-align: left !important;
-	max-width: 100% !important;
-	white-space: nowrap !important;
-	text-overflow: ellipsis !important;
-	overflow: hidden !important;
+:deep {
+	.uni-select__selector-item {
+		display: block !important;
+		text-align: left !important;
+		max-width: 100% !important;
+		white-space: nowrap !important;
+		text-overflow: ellipsis !important;
+		overflow: hidden !important;
+	}
+	.uni-select {
+		background-color: #fff !important;
+	}
 }
+// .stick {
+//   z-index: 1;
+//   position: sticky;
+//   background-color: #fff;
+// }
+
 </style>