From cf3f4597a149fbc132dbb0d64595ce86b20f3201 Mon Sep 17 00:00:00 2001
From: dengxin <2390584170@qq.com>
Date: Sat, 17 Feb 2024 18:22:11 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8B=9B=E8=81=98=E9=A1=B5=E9=9D=A2ui=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/companyList/companyList.vue     | 315 +++++++++++----------
 components/vertical-menu/vertical-menu.vue |  27 +-
 pageMy/my/resume/index.vue                 |  11 +-
 pages.json                                 |   2 +-
 pages/project/project.vue                  | 235 ++++++++-------
 pages/seach/seach.vue                      | 284 ++++++++++++-------
 6 files changed, 498 insertions(+), 376 deletions(-)

diff --git a/components/companyList/companyList.vue b/components/companyList/companyList.vue
index a339843..a982aef 100644
--- a/components/companyList/companyList.vue
+++ b/components/companyList/companyList.vue
@@ -7,34 +7,34 @@
 			</view>
 
 			<view class="head_right">
-				{{companyitem.wage}}{{wageUnit[companyitem.wageUnitCategory]}}
+				{{ companyitem.wage }}{{ wageUnit[companyitem.wageUnitCategory] }}
 			</view>
 		</view>
 		<view class="ask">
-			<view class="askList" v-for="(item,index) in skillNames" :key="index">
-				{{item}}
+			<view class="askList" v-for="(item, index) in skillNames" :key="index">
+				{{ item }}
 			</view>
 		</view>
 		<view class="allName">
-			{{companyitem.companyName}}
+			{{ companyitem.companyName }}
 		</view>
 		<view class="timeAddress">
 			<view>
-				报名截止日期：{{dateFormat(companyitem.etimePub)}}
+				报名截止日期：{{ dateFormat(companyitem.etimePub) }}
 			</view>
 			<view v-if="near">
-				{{companyitem.distanceStr}}km
+				{{ companyitem.distanceStr }}km
 			</view>
 			<view v-else>
-				{{getCity(companyitem.cityId)}}
+				{{ getCity(companyitem.cityId) }}
 			</view>
 		</view>
 		<view class="comment" v-if='comment' @tap.stop="goComment(companyitem.missionNo)">
-			<view class="comment_content commentimg" v-if='companyitem.scoreAll>0'>
-				<image class="commentimg_image" src="../../static/img/star.full.svg" v-for="index1 in companyitem.scoreAll" mode=""
-				 :key="index1"></image>
-				<image class="commentimg_image" src="../../static/img/star.empty.svg" v-for="index2 in (5-companyitem.scoreAll)"
-				 mode="" :key="index2"></image>
+			<view class="comment_content commentimg" v-if='companyitem.scoreAll > 0'>
+				<image class="commentimg_image" src="../../static/img/star.full.svg" v-for="index1 in companyitem.scoreAll"
+					mode="" :key="index1"></image>
+				<image class="commentimg_image" src="../../static/img/star.empty.svg"
+					v-for="index2 in (5 - companyitem.scoreAll)" mode="" :key="index2"></image>
 			</view>
 			<view class="comment_content allName gocomment" v-else>
 				评价
@@ -44,165 +44,168 @@
 </template>
 
 <script>
-	import {
+import {
+	toDoller,
+	dateFormat
+} from "../../untils/format.js";
+import dictionary from '@/common/textdata.js';
+
+export default {
+	beforeCreate: function () { },
+	props: {
+		companyitem: {
+			type: Object,
+			default() { return [] }
+		},
+		comment: {
+			type: Boolean,
+			default: false
+		},
+		noApply: {
+			type: Boolean,
+			default: true
+		},
+		near: {
+			type: Boolean,
+			default: false
+		}
+	},
+	data() {
+		return {
+			...dictionary,
+			string: "<div style='overflow: hidden;white-space: nowrap;text-overflow: ellipsis;'>" + this.companyitem.missionTitle +
+				"</div>"
+		};
+	},
+	computed: {
+		skillNames() {
+			return this.companyitem.skillNames.split(',')
+		}
+	},
+	methods: {
+		goComment: function (no) {
+			uni.navigateTo({
+				url: `../../pageMy/mycomment/mycomment?missionNo=${encodeURIComponent(no)}`
+			})
+		},
+		goInfo: function (no) {
+			const isCan = this.noApply === false ? '0' : '1'
+			uni.navigateTo({
+				url: `/pages/projectInfo/projectInfo?missionNo=${encodeURIComponent(no)}&isCan=${isCan}`
+			})
+		},
+		getCity: function (val) {
+			if (val) {
+				let areas = this.$store.getters.getAreaParents(val)
+				if (areas.length === 3) {
+					return areas[0].label + '-' + areas[1].label + '-' + areas[2].label
+				}
+			}
+		},
 		toDoller,
 		dateFormat
-	} from "../../untils/format.js";
-	import dictionary from '@/common/textdata.js';
-
-	export default {
-		beforeCreate: function() {},
-		props: {
-			companyitem: {
-				type: Object,
-				default(){ return [] }
-			},
-			comment: {
-				type: Boolean,
-				default: false
-			},
-			noApply: {
-				type: Boolean,
-				default: true
-			},
-			near: {
-				type: Boolean,
-				default: false
-			}
-		},
-		data() {
-			return {
-				...dictionary,
-				string: "<div style='overflow: hidden;white-space: nowrap;text-overflow: ellipsis;'>" + this.companyitem.missionTitle +
-					"</div>"
-			};
-		},
-		computed: {
-			skillNames() {
-				return this.companyitem.skillNames.split(',')
-			}
-		},
-		methods: {
-			goComment: function(no) {
-				uni.navigateTo({
-					url: `../../pageMy/mycomment/mycomment?missionNo=${encodeURIComponent(no)}`
-				})
-			},
-			goInfo: function(no) {
-				const isCan = this.noApply === false ? '0' : '1'
-				uni.navigateTo({
-					url: `/pages/projectInfo/projectInfo?missionNo=${encodeURIComponent(no)}&isCan=${isCan}`
-				})
-			},
-			getCity: function(val) {
-				if (val) {
-					let areas = this.$store.getters.getAreaParents(val)
-					if (areas.length === 3) {
-						return areas[0].label + '-' + areas[1].label + '-' + areas[2].label
-					}
-				}
-			},
-			toDoller,
-			dateFormat
-		}
 	}
+}
 </script>
 
 <style>
-	.commentimg_image {
-		width: 40rpx;
-		height: 40rpx;
-	}
+.commentimg_image {
+	width: 40rpx;
+	height: 40rpx;
+}
 
-	.commentimg {
-		display: flex;
-		align-items: center;
-		justify-content: flex-end;
-	}
+.commentimg {
+	display: flex;
+	align-items: center;
+	justify-content: flex-end;
+}
 
-	.gocomment {
-		font-size: 26rpx !important;
-		border-radius: 5rpx;
-		border: 1rpx solid #c3c3c3;
-		width: 160rpx;
-		text-align: center;
-		float: right;
-		height: 50rpx;
-		line-height: 50rpx;
-	}
+.gocomment {
+	font-size: 26rpx !important;
+	border-radius: 5rpx;
+	border: 1rpx solid #c3c3c3;
+	width: 160rpx;
+	text-align: center;
+	float: right;
+	height: 50rpx;
+	line-height: 50rpx;
+}
 
-	.timeAddress {
-		display: flex;
-		align-items: center;
-		justify-content: space-between;
-		font-family: PingFangSC-Regular;
-		font-size: 24rpx;
-		color: #999999;
-		margin: 10rpx 0;
-	}
+.timeAddress {
+	display: flex;
+	align-items: center;
+	justify-content: space-between;
+	font-family: PingFangSC-Regular;
+	font-size: 24rpx;
+	color: #999999;
+	margin: 10rpx 0;
+}
 
-	.allName {
-		font-family: PingFangSC-Regular;
-		font-size: 28rpx;
-		color: #666666;
-	}
+.allName {
+	font-family: PingFangSC-Regular;
+	font-size: 28rpx;
+	color: #666666;
+}
 
-	.askList {
-		width: 14%;
-		font-family: PingFangSC-Regular;
-		font-size: 24rpx;
-		color: #666666;
-		background-color: #f6f6f6;
-		padding: 5rpx 15rpx;
-		margin-right: 10rpx;
-		margin-bottom: 10rpx;
-	}
+.askList {
+	/* width: 14%; */
+	font-family: PingFangSC-Regular;
+	font-size: 24rpx;
+	color: #666666;
+	background-color: #f6f6f6;
+	padding: 5rpx 15rpx;
+	margin-right: 10rpx;
+	margin-bottom: 10rpx;
+}
 
-	.ask {
-		overflow: hidden;
-		width: 100%;
-		display: flex;
-		align-items: center;
-		flex-wrap: wrap;
-		justify-content: flex-start;
-		margin: 20rpx 0;
-	}
+.ask {
+	overflow: hidden;
+	width: 100%;
+	display: flex;
+	align-items: center;
+	flex-wrap: wrap;
+	justify-content: flex-start;
+	margin: 20rpx 0;
+}
 
-	.head_right {
-		ont-family: PingFangSC-Medium;
-		font-size: 28rpx;
-		color: #F46161;
-		font-weight: bold;
-	}
+.head_right {
+	ont-family: PingFangSC-Medium;
+	font-size: 28rpx;
+	color: #F46161;
+	font-weight: bold;
+}
 
-	.head_left {
-		font-family: PingFangSC-Medium;
-		font-size: 32rpx;
-		font-weight: bold;
-		color: #333333;
-		width: 400rpx;
-		overflow: hidden;
-		white-space: nowrap;
-		/*不换行*/
-		text-overflow: ellipsis;
-		/*超出部分文字以...显示*/
-	}
+.head_left {
+	font-family: PingFangSC-Medium;
+	font-size: 32rpx;
+	font-weight: bold;
+	color: #333333;
+	width: 350rpx;
+	overflow: hidden;
+	white-space: nowrap;
+	/*不换行*/
+	text-overflow: ellipsis;
+	/*超出部分文字以...显示*/
+}
 
-	.highlight {
-		color: #F46161;
-	}
+.highlight {
+	color: #F46161;
+}
 
-	.body {
-		width: 690rpx;
-		margin: 0rpx auto;
-		padding: 20rpx 0;
-		background-color: #fefefe;
-		overflow: hidden;
-	}
+.body {
+	width: 690rpx;
+	margin: 0rpx auto;
+	background-color: #fefefe;
+	overflow: hidden;
+	box-sizing: border-box;
+	padding: 20rpx;
+	border-radius: 20rpx;
+	margin-top: 20rpx;
+}
 
-	.heads {
-		display: flex;
-		align-items: center;
-		justify-content: space-between;
-	}
+.heads {
+	display: flex;
+	align-items: center;
+	justify-content: space-between;
+}
 </style>
diff --git a/components/vertical-menu/vertical-menu.vue b/components/vertical-menu/vertical-menu.vue
index 74fc3cb..29c91a7 100644
--- a/components/vertical-menu/vertical-menu.vue
+++ b/components/vertical-menu/vertical-menu.vue
@@ -26,7 +26,7 @@
                             <view @click="clickFunc({ 'type': 'industry' })" v-else-if="item.name === `行业`"
                                 class="thumb-box thumb-box1">
                                 <u-cell-group>
-                                    <u-cell icon="map" :title="areaModal.industry" :isLink="true"
+                                    <u-cell icon="calendar" :title="industryModal.industry" :isLink="true"
                                         arrow-direction="down"></u-cell>
                                 </u-cell-group>
                             </view>
@@ -45,8 +45,8 @@
 
         </view>
         <view class="buttonWrapper">
-            <view class="cancelButton">取消</view>
-            <view class="sureButton">确定</view>
+            <view class="cancelButton" @click="closePopUp">取消</view>
+            <view class="sureButton" @click="subMitPopUp({submitData,areaModal,industryModal})">确定</view>
         </view>
         <!-- 省市 -->
         <data-picker :show="areaModal.addressShow" @confirm='confirmAddress' @cancel='areaModal.addressShow = false'
@@ -54,7 +54,8 @@
             :defaultIds="areaModal.defaultIds" :showToolbar="false" :showBottombar="true"
             :labelName="areaModal.labelName"></data-picker>
         <!-- 行业 -->
-        <u-picker @confirm="pickerIndustryFunc" @cancel="industryModal.industryShow = false" :show="industryModal.industryShow" :columns="industryModal.industry"></u-picker>
+        <u-picker @confirm="pickerIndustryFunc" keyName="name" @cancel="industryModal.industryShow = false"
+            :show="industryModal.industryShow" :columns="industryModal.industryList"></u-picker>
     </view>
 </template>
 
@@ -62,6 +63,16 @@
 import classifyData from './classifyData.js';
 import { getTrade } from '@/api/resume.js'
 export default {
+    props: {
+        closePopUp: {
+            type: Function,
+            required: true
+        },
+        subMitPopUp: {
+            type: Function,
+            required: true
+        },
+    },
     components: {
         // vTabs,
         // companyList, verticalMenu
@@ -92,10 +103,9 @@ export default {
 
             },
             industryModal: {
-                industry: [['中国', '美国', '日本']],
+                industry: "",
+                industryList: [[]],
                 industryShow: false,
-
-
             },
 
             submitData: {},
@@ -120,6 +130,8 @@ export default {
                     }
                 })
                 this.tabbar = newData;
+                this.industryModal.industry = res.data.data[0]?.name
+                this.industryModal.industryList = [res.data.data]
 
             })
         },
@@ -286,6 +298,7 @@ export default {
         },
         pickerIndustryFunc(val) {
             console.log(val);
+            this.industryModal.industry = val.value[0].name;
             this.industryModal.industryShow = false
         }
 
diff --git a/pageMy/my/resume/index.vue b/pageMy/my/resume/index.vue
index b33ca37..95de7d1 100644
--- a/pageMy/my/resume/index.vue
+++ b/pageMy/my/resume/index.vue
@@ -41,7 +41,8 @@
 					您想工作的地点
 				</view>
 				<view v-bind:class="['jobText']">
-					{{ myResume.city == {} ? myResume.city.id ? getCity(myResume.city.id) : myResume.city.workplace : '请选择' }}
+					{{ myResume.city == {} ? myResume.city.id ? getCity(myResume.city.id) : myResume.city.workplace : '请选择'
+					}}
 				</view>
 			</view>
 			<image src="../../../static/img/right.svg" mode=""></image>
@@ -374,7 +375,9 @@ export default {
 	color: #666666;
 	background: #ffffff;
 	overflow-y: auto;
-	white-space: nowrap;
+	/* white-space: nowrap; */
+	overflow-wrap: break-word;
+	word-wrap: break-word;
 }
 
 .list image {
@@ -386,9 +389,11 @@ export default {
 .list {
 	padding: 0 15px 0 30rpx;
 	height: 126rpx;
-	line-height: 126rpx;
+	/* line-height: 126rpx; */
 	background: #fff;
 	border-bottom: 1px solid #f2f2f2;
+	display: flex;
+	align-items: center;
 }
 
 .title image {
diff --git a/pages.json b/pages.json
index 786410e..b127937 100644
--- a/pages.json
+++ b/pages.json
@@ -105,7 +105,7 @@
         {
             "path" : "pages/seach/seach",
             "style" : {
-                "navigationBarTitleText" : "",
+                "navigationBarTitleText" : "德阳市灵活就业平台",
                 "navigationBarBackgroundColor" : "#FFFFFF"
             }
         },
diff --git a/pages/project/project.vue b/pages/project/project.vue
index ac4a4a4..0716d9b 100644
--- a/pages/project/project.vue
+++ b/pages/project/project.vue
@@ -1,91 +1,87 @@
 <template>
 	<view>
 		<view class="titleSearch">
-			<view class="searchName">抢任务</view>
+			<view class="searchName">搜 索</view>
 
-			<u-search @focus="goSeach" shape="round" :showAction="false"></u-search>
-		</view>
-		<view>
-			<view>任务</view>
-			<view>岗位</view>
-			<view>推荐</view>
+			<u-search placeholder="搜任务/搜岗位/搜政策" @focus="goSeach" shape="round" :showAction="false"></u-search>
 		</view>
 
+		<view class="content">
+			<view class="typeButtonWrapper">
+				<view class="typeButtonLeft">
 
-		<!-- 筛选 -->
-		<view class="screenButton" @click="showPopUp = true">
-			筛选
-			<view class="arrow-up-right"> </view>
+					<view v-for="(item, index) in nonReactiveArray" :key="index"
+						:class="['typeButton', index == activeTab ? 'activeButton' : '']" @click="changeTab(index)">{{ item
+						}}</view>
+				</view>
+				<!-- 筛选 -->
+				<view class="screenButton" @click="showPopUp = true">
+					筛选
+					<view class="arrow-up-right"> </view>
+				</view>
+			</view>
+
+			<u-popup closeable :show="showPopUp" mode="right" @close="closePopUp">
+				<view class="popUpWrapper">
+					<verticalMenu :closePopUp="closePopUp" :subMitPopUp="subMitPopUp" />
+				</view>
+			</u-popup>
+
+			<block v-if="activeTab == 0">
+				<view v-if="newList.length > 0">
+					<block v-for="(item, index) in newList" :key="index">
+						<companyList :companyitem="item"></companyList>
+					</block>
+				</view>
+				<view v-else>
+					<image src="../../static/img/pic_notask.svg" class="nothing" mode=""></image>
+					<view class="nothing_text">暂无信息</view>
+				</view>
+			</block>
+
+			<block v-if="activeTab == 1">
+				<view>
+					<view class="location" @click="gomap">
+						<image src="../../static/img/location.svg" mode=""></image>
+						{{ currentAddress }}（切换位置）
+						<image src="../../static/img/right.svg" mode=""></image>
+					</view>
+				</view>
+
+				<view v-if="companyList.length > 0">
+					<block v-for="(item, index) in companyList" :key="item.id">
+						<companyList :companyitem="item" :near="activeTab === 0"></companyList>
+					</block>
+				</view>
+				<view v-else>
+					<image src="../../static/img/pic_notask.svg" mode="" class="nothing"></image>
+					<view class="nothingContnt">
+						暂无信息
+					</view>
+				</view>
+			</block>
+
+			<block v-if="activeTab == 2">
+				<view v-if="recommendList.length > 0">
+					<block v-for="(item, index) in recommendList" :key="item.id">
+						<companyList :companyitem="item"></companyList>
+					</block>
+				</view>
+
+				<view v-else>
+					<image src="../../static/img/pic_notask.svg" mode="" class="nothing"></image>
+					<view class="nothingContnt">
+						完善技能，获取精推荐
+					</view>
+					<view class="btn" @click="goResume">
+						完善技能
+					</view>
+				</view>
+			</block>
+
+			<cs-button></cs-button>
 		</view>
-		<u-popup closeable :show="showPopUp" mode="right" @close="closePopUp" @open="openPopUp">
-			<view class="popUpWrapper">
-				<verticalMenu></verticalMenu>
-			</view>
-		</u-popup>
-		<!-- <v-tabs :tabs="['最新', '附近', '推荐']" height="45px" v-model="activeTab" color="#999" activeColor="#000"
-			fontSize="36rpx" activeFontSize="36rpx" @change='changeTab' />
-		<image src="../../static/img/search.svg" @click="goSeach" class="topseach" mode=""></image> -->
 
-
-
-		<block v-if="activeTab == 0">
-			<view v-if="newList.length > 0">
-				<block v-for="(item, index) in newList" :key="index">
-					<companyList :companyitem="item"></companyList>
-					<view class="baddd"></view>
-				</block>
-			</view>
-			<view v-else>
-				<image src="../../static/img/pic_notask.svg" class="nothing" mode=""></image>
-				<view class="nothing_text">暂无信息</view>
-			</view>
-		</block>
-
-		<block v-if="activeTab == 1">
-			<view>
-				<view class="baddd"></view>
-				<view class="location" @click="gomap">
-					<image src="../../static/img/location.svg" mode=""></image>
-					{{ currentAddress }}（切换位置）
-					<image src="../../static/img/right.svg" mode=""></image>
-				</view>
-				<view class="baddd"></view>
-			</view>
-
-			<view v-if="companyList.length > 0">
-				<block v-for="(item, index) in companyList" :key="item.id">
-					<companyList :companyitem="item" :near="activeTab === 0"></companyList>
-					<view class="baddd"></view>
-				</block>
-			</view>
-			<view v-else>
-				<image src="../../static/img/pic_notask.svg" mode="" class="nothing"></image>
-				<view class="nothingContnt">
-					暂无信息
-				</view>
-			</view>
-		</block>
-
-		<block v-if="activeTab == 2">
-			<view v-if="recommendList.length > 0">
-				<block v-for="(item, index) in recommendList" :key="item.id">
-					<companyList :companyitem="item"></companyList>
-					<view class="baddd"></view>
-				</block>
-			</view>
-
-			<view v-else>
-				<image src="../../static/img/pic_notask.svg" mode="" class="nothing"></image>
-				<view class="nothingContnt">
-					完善技能，获取精推荐
-				</view>
-				<view class="btn" @click="goResume">
-					完善技能
-				</view>
-			</view>
-		</block>
-
-		<cs-button></cs-button>
 	</view>
 </template>
 
@@ -102,11 +98,13 @@ import {
 	getcoder
 } from "@/api/map.js";
 import verticalMenu from '@/components/vertical-menu/vertical-menu.vue';
+
 export default {
 	components: {
 		vTabs,
 		companyList, verticalMenu
 	},
+
 	data() {
 		return {
 			activeTab: 0,
@@ -136,12 +134,8 @@ export default {
 			key: 'FW3BZ-6JTK6-GCUS5-MZCRR-3GPR5-HJFEI',
 			open: false,
 			showPopUp: false,
-			indexList: ["年龄", "学历", "工资"],
-			itemArr: [
-				['列表A1', '列表A2', '列表A3'],
-				['列表B1', '列表B2', '列表B3'],
-				['列表C1', '列表C2', '列表C3'],
-			]
+
+			nonReactiveArray: ["任务", "岗位", "推荐"],
 		}
 	},
 	onLoad: function () {
@@ -362,42 +356,78 @@ export default {
 			}
 		},
 
-		openPopUp() {
-			// console.log('open');
-		},
+
 		closePopUp() {
 			this.showPopUp = false
-			// console.log('close');
+		},
+		subMitPopUp({submitData,areaModal,industryModal}) {
+			console.log(submitData,areaModal,industryModal,"------确定");
+			this.showPopUp = false
 		}
 	}
 }
 </script>
 
-<style>
-.titleSearch{
+<style scoped>
+.titleSearch {
 	display: flex;
 	width: 80%;
 	margin: 0 auto;
 	font-size: 22px;
 	font-weight: bold;
-	padding: 10rpx;
-	
-}
-.searchName{
-	margin-right: 15rpx;
+	padding: 20rpx;
 }
 
+
+
+.searchName {
+	margin-right: 28rpx;
+}
+
+.content {
+	background-color: #f3f4f8;
+	padding-top: 20rpx;
+	min-height: 80vh;
+}
+
+
+
 .screenButton {
-	position: absolute;
+	/* position: absolute;
 	top: 10px;
 	z-index: 1;
-	left: 30rpx;
-	/* border: 1px solid black; */
+	left: 30rpx; */
+	position: relative;
 	width: 50px;
 	text-align: center;
 	line-height: 30px;
 	font-size: 14px;
-	background-color: #f3f4f8;
+	background-color: #fff;
+}
+
+.typeButtonWrapper {
+	width: 92%;
+	margin: 0 auto;
+	display: flex;
+	justify-content: space-between;
+	/* margin-bottom: 10rpx; */
+}
+
+.typeButtonLeft {
+	display: flex;
+}
+
+.typeButton {
+	font-size: 14px;
+	padding: 10rpx 40rpx;
+	background: #fff;
+	border-radius: 50px;
+	margin-right: 10rpx;
+}
+
+.activeButton {
+	color: #4171f9;
+	background-color: #cfdaf8;
 }
 
 .arrow-up-right {
@@ -478,10 +508,7 @@ export default {
 	margin-top: 300rpx;
 }
 
-.baddd {
-	background: #f6f6f6;
-	height: 20rpx;
-}
+
 
 .popUpWrapper {
 	width: 100%;
diff --git a/pages/seach/seach.vue b/pages/seach/seach.vue
index 7364acd..aa6fce9 100644
--- a/pages/seach/seach.vue
+++ b/pages/seach/seach.vue
@@ -1,17 +1,67 @@
 <template>
-	<view>
+	<view class="mainWrapper">
 		<view class="headSearch">
 			<view class="search-view">
 				<view class="search-item">
 					<image src="../../static/img/search.svg" style="width: 32rpx;height: 32rpx;" mode=""></image>
-					<input type="text" confirm-type="搜索"  v-model="keywords" @confirm="getList('search')"  placeholder="请输入任务名称或公司名称"/>
+					<input type="text" confirm-type="搜索" v-model="keywords" @confirm="getList('search')"
+						placeholder="请输入任务名称或公司名称" />
 				</view>
 				<view class="close" @click="closeBack">
 					取消
 				</view>
 			</view>
 		</view>
-		<view  v-if="companyList.length>0">
+		<v-tabs :tabs="['推荐任务', '推荐服务', '推荐政策']" height="45px" v-model="activeTab" color="#999" activeColor="#000"
+			fontSize="30rpx" activeFontSize="31rpx" @change='changeTab' />
+
+
+		<block v-if="activeTab == 0">
+			<view v-if="companyList.length > 0">
+				<block v-for="(item, index) in companyList" :key="item.id">
+					<companyList :companyitem="item"></companyList>
+				</block>
+			</view>
+			<view v-else>
+				<image src="../../static/img/pic_notask.svg" mode="" class="nothing"></image>
+				<view class="nothingContnt">
+					暂无信息
+				</view>
+			</view>
+		</block>
+		<block v-if="activeTab == 1">
+			<view v-if="newList.length > 0">
+				<block v-for="(item, index) in newList" :key="index">
+					<companyList :companyitem="item"></companyList>
+				</block>
+			</view>
+			<view v-else>
+				<image src="../../static/img/pic_notask.svg" class="nothing" mode=""></image>
+				<view class="nothingContnt">暂无信息</view>
+			</view>
+		</block>
+
+
+
+		<block v-if="activeTab == 2">
+			<view v-if="recommendList.length > 0">
+				<block v-for="(item, index) in recommendList" :key="item.id">
+					<companyList :companyitem="item"></companyList>
+				</block>
+			</view>
+
+			<view v-else>
+				<image src="../../static/img/pic_notask.svg" mode="" class="nothing"></image>
+				<view class="nothingContnt">
+					完善技能，获取精推荐
+				</view>
+				<!-- <view class="btn" @click="goResume">
+					完善技能
+				</view> -->
+			</view>
+		</block>
+
+		<!-- <view v-if="companyList.length > 0">
 			<block v-for="(item, index) in companyList" :key="item.id">
 				<companyList :companyitem="item"></companyList>
 				<view class="baddd"></view>
@@ -22,81 +72,88 @@
 			<view class="nothingContnt">
 				暂无任务信息
 			</view>
-		</view>
+		</view> -->
 	</view>
-
 </template>
 
 <script>
-import {newMissionAll} from '@/api/mission.js';
+import { newMissionAll } from '@/api/mission.js';
 import companyList from '@/components/companyList/companyList.vue';
+import vTabs from '@/components/v-tabs/v-tabs.vue';
 import testData from '@/common/textdata.js';
 export default {
 	components: {
-		companyList
+		companyList,
+		vTabs,
 	},
 	data() {
 		return {
+			activeTab: 0,
 			companyList: [],
-			keywords:'',
-			page:{
-				current:1,
-				size:10,
-				total:0
+			recommendList: [],
+			newList: [],
+			keywords: '',
+			page: {
+				current: 1,
+				size: 10,
+				total: 0
 			}
 		};
 	},
-	onLoad:function(option) {
-		this.keywords = option.keywords?option.keywords:''
+	onLoad: function (option) {
+		this.keywords = option.keywords ? option.keywords : ''
 	},
-	onShow:function(){
+	onShow: function () {
 		this.getList('search');
 	},
 	/*页面滚动到底部*/
-	onReachBottom:function(){
+	onReachBottom: function () {
 		this.upLoad()
 	},
 	methods: {
 		//最新任务；
-		getList:function(type){
+		getList: function (type) {
 			//改变搜索条件，页码值变为1
-			if(type==='search'){
+			if (type === 'search') {
 				this.page.current = 1;
 			};
-			if(this.keywords){
-				newMissionAll(this.page.current,this.page.size,this.keywords).then(res => {
-					if(this.page.current===1){
-						this.companyList=[];
-					}
-					this.page.current +=1;
-					this.page.total = res.data.data.total;
-					if(res.data.data&&res.data.data.records.length){
-						this.companyList = this.companyList.concat(res.data.data.records);
-					}
-					//搜索关键词高亮
-					if(this.companyList.length){
-						this.companyList.forEach((item, index) => {
-							item.missionTitle = this.getInf(item.missionTitle, this.keywords);
-						});
-					}
-				})
-			}		
+			// if (this.keywords) {
+			newMissionAll(this.page.current, this.page.size, this.keywords).then(res => {
+				if (this.page.current === 1) {
+					this.companyList = [];
+				}
+				this.page.current += 1;
+				this.page.total = res.data.data.total;
+				if (res.data.data && res.data.data.records.length) {
+					this.companyList = this.companyList.concat(res.data.data.records);
+
+				}
+				//搜索关键词高亮
+				// if (this.companyList.length) {
+				// 	this.companyList.forEach((item, index) => {
+				// 		item.missionTitle = this.getInf(item.missionTitle, this.keywords);
+				// 	});
+				// }
+				console.log(this.companyList, '----------');
+			})
+			// }
 		},
+
 		//上拉加载
-		upLoad:function(){
-			if(this.page.current<=Math.ceil(this.page.total/this.page.size)){
+		upLoad: function () {
+			if (this.page.current <= Math.ceil(this.page.total / this.page.size)) {
 				this.getList();
-			}else{
+			} else {
 				uni.showToast({
 					icon: "none",
 					title: '已经是最后一页',
 				})
-				return 
+				return
 			}
 		},
-		closeBack(){
+		closeBack() {
 			uni.navigateBack({
-				delta:1
+				delta: 1
 			})
 		},
 		/**
@@ -110,71 +167,88 @@ export default {
 				let replaceString = "<span style='color: #1b66ff;'>" + key + "</span>" // 高亮替换
 				return str.replace(replaceReg, replaceString);
 			}
-		}
+		},
+
+		changeTab: function (e) {
+			this.activeTab = e;
+		},
 	}
 };
 </script>
 
-<style>
-	.baddd{
-		background-color: #f6f6f6;
-		height: 20rpx;
-	}
-	.close{
-		position: absolute;
-		right: 24rpx;
-		top: 0;
-		height: 60rpx;
-		padding: 5rpx 0;
-		line-height: 60rpx;
-		font-family: PingFangSC-Regular;
-		font-size: 32rpx;
-		color: #333333;
-	}
-	.headSearch .search-view {
-		border-bottom: 1rpx solid #dddddd;
-	    padding: 10rpx 32rpx;
-	    background: rgba(255, 255, 255, 1);
-	}
-	.headSearch .search-item{
-		display: flex;
-		width: 80%;
-	    padding: 0 24rpx;
-		height: 60rpx;
-		line-height: 60rpx;
-	    background: rgba(249, 249, 249, 1);
-	    border-radius: 200px;
-	    align-items: center;
-	}
-	.headSearch .search-item input {
-	    padding: 0 24rpx;
-	    height: 80rpx;
-	    font-weight: 400;
-	    flex: 1;
-	    text-align: start;
-	    font-size: 28rpx;
-	    font-family: PingFang-SC-Bold, PingFang-SC;
-	    color: rgba(51, 51, 51, 1);
-	}
-	.headSearch .search-item .placeholderClass {
-	    color: #CCCCCC; 
-	}
-	.headSearch .search-item image {
-	    height: 32rpx;
-	    width: 32rpx;
-	}
-	.nothingContnt{
-		font-family: PingFangSC-Regular;
-		font-size: 28rpx;
-		color: #666;
-		margin-top: 30rpx;
-		text-align: center;
-	}
-	.nothing{
-		width: 400rpx;
-		height: 200rpx;
-		display: block;
-		margin: 0 auto;
-		margin-top: 50%;
-	}
+<style scoped>
+.mainWrapper{
+	background-color: #f3f4f8;
+	min-height: 95vh;
+}
+.baddd {
+	background-color: #f6f6f6;
+	height: 20rpx;
+}
+
+.close {
+	position: absolute;
+	right: 24rpx;
+	top: 6rpx;
+	height: 60rpx;
+	padding: 5rpx 0;
+	line-height: 60rpx;
+	font-family: PingFangSC-Regular;
+	font-size: 32rpx;
+	color: #333333;
+}
+
+.headSearch .search-view {
+	border-bottom: 1rpx solid #dddddd;
+	padding: 10rpx 32rpx;
+	background: rgba(255, 255, 255, 1);
+}
+
+.headSearch .search-item {
+	display: flex;
+	width: 80%;
+	padding: 0 24rpx;
+	height: 60rpx;
+	line-height: 60rpx;
+	background: rgba(249, 249, 249, 1);
+	border-radius: 200px;
+	align-items: center;
+	border: 1px solid #0091ff;
+}
+
+.headSearch .search-item input {
+	padding: 0 24rpx;
+	height: 80rpx;
+	font-weight: 400;
+	flex: 1;
+	text-align: start;
+	font-size: 28rpx;
+	font-family: PingFang-SC-Bold, PingFang-SC;
+	color: rgba(51, 51, 51, 1);
+}
+
+.headSearch .search-item .placeholderClass {
+	color: #CCCCCC;
+}
+
+.headSearch .search-item image {
+	height: 32rpx;
+	width: 32rpx;
+}
+
+.nothing {
+	width: 400rpx;
+	height: 200rpx;
+	display: block;
+	margin: 0 auto;
+	margin-top: 50%;
+}
+
+.nothingContnt {
+	font-family: PingFangSC-Regular;
+	font-size: 28rpx;
+	color: #333333;
+	margin-top: 30rpx;
+	text-align: center;
+}
 </style>