Merge branch 'master' of https://gitee.com/beiwu/jobslink-user-clent

api/mission.js

@@ -109,6 +109,32 @@ export const myMission = (current, size, status) => {
 	})
 }
 
+/*我的收藏*/
+export const myCollection = (current, size, status) => {
+	return request({
+		url: '/api/jobslink-api/works/jkworkscollect/getCollectListByUserId',
+		method: 'get',
+		params: {
+			current,
+			size,
+			status
+		}
+	})
+}
+
+/*浏览记录*/
+export const myBrowing = (current, size, status) => {
+	return request({
+		url: '/api/jobslink-api/user/useraction/getListByUserId',
+		method: 'get',
+		params: {
+			current,
+			size,
+			status
+		}
+	})
+}
+
 /*任务详情*/
 export const missionDetail = (missionNo) => {
 	return request({
@@ -133,24 +159,26 @@ export const workDetail = (workId) => {
 }
 
 /*获取收藏状态*/
-export const getCollectState = (workId) => {
+export const getCollectState = (workId, type) => {
 	return request({
 		url: '/api/jobslink-api/works/jkworkscollect/getCollectStatus',
 		method: 'get',
 		params: {
-			workId
+			workId,
+			type
 		}
 	})
 }
 
 /*收藏和取消收藏接口*/
-export const updateCollectStatus = (workId, status) => {
+export const updateCollectStatus = (workId, status, type) => {
 	return request({
 		url: '/api/jobslink-api/works/jkworkscollect/updateCollectStatus',
 		method: 'get',
 		params: {
 			workId,
-			status
+			status,
+			type
 		}
 	})
 }

components/companyList/applyList.vue

@@ -0,0 +1,225 @@
+<template>
+	<view class="body" @click="goInfo(companyitem)">
+		<view class="heads">
+			<view class="head_left">
+				<rich-text :nodes="string">
+				</rich-text>
+			</view>
+
+			<view class="head_right">
+				{{ companyitem.wage }}
+			</view>
+			
+		</view>
+		
+		
+		<view class="ask">
+			<view class="askList">
+				{{ companyitem.tradeNames }}
+			</view>
+			<view class="askList" v-for="(item, index) in skillNames" :key="index">
+				{{ item }}
+			</view>
+			<view style="flex:1;"></view>
+			<u-tag text="任务" v-if="companyitem.type == 0" plain size="mini" type="warning"></u-tag>
+			<u-tag text="岗位" v-if="companyitem.type == 1" plain size="mini"></u-tag>
+		</view>
+		<view style="width: 100%;height: 1rpx;background-color: #999;margin: 0 auto;opacity: .5;"></view>
+		<view class="timeAddress" style="position: relative;">
+			<view style="display: flex;align-items: center;">
+				<image src="../../static/img/city.png" style="width: 40rpx;height: 40rpx;margin-right: 10rpx;" mode=""></image>
+				<view style="font-size: 26rpx;color:#333;">{{ companyitem.missionCompanyName }}</view>
+			</view>
+			<view style="display: flex;align-items: center;position:absolute;right:0;">
+				<image src="../../static/img/location_new.png" style="width: 30rpx;height: 30rpx;" mode=""></image>
+				<view>2.2km</view>
+			</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>
+			<view class="comment_content allName gocomment" v-else>
+				评价
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+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 (item) {
+			// const isCan = this.noApply === false ? '0' : '1'
+			if(item.type == 0) {
+				uni.navigateTo({
+					url: `/pages/projectInfo/projectInfo?missionNo=${encodeURIComponent(item.missionNo)}&isCan=1`
+				})
+			} else if(item.type == 1) {
+				uni.navigateTo({
+					url: `/pages/projectInfo/workInfo?workId=${encodeURIComponent(item.id)}&isCan=1`
+				})
+			}
+		},
+		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 {
+	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;
+}
+
+.timeAddress {
+	display: flex;
+	align-items: center;
+	justify-content: space-between;
+	font-family: PingFangSC-Regular;
+	font-size: 24rpx;
+	color: #999999;
+	margin: 10rpx 0;
+	padding: 10rpx 0;
+}
+
+.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;
+}
+
+.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_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;
+}
+
+.body {
+	width: 690rpx;
+	margin: 0rpx auto;
+	background-color: #fefefe;
+	overflow: hidden;
+	box-sizing: border-box;
+	padding: 20rpx;
+	padding-bottom: 0;
+	border-radius: 20rpx;
+	margin-top: 20rpx;
+}
+
+.heads {
+	display: flex;
+	align-items: center;
+	justify-content: space-between;
+}
+</style>

components/companyList/collectionList.vue

@@ -0,0 +1,225 @@
+<template>
+	<view class="body" @click="goInfo(companyitem)">
+		<view class="heads">
+			<view class="head_left">
+				<rich-text :nodes="string">
+				</rich-text>
+			</view>
+
+			<view class="head_right">
+				{{ companyitem.wage }}
+			</view>
+			
+		</view>
+		
+		
+		<view class="ask">
+			<view class="askList">
+				{{ companyitem.tradeNames }}
+			</view>
+			<view class="askList" v-for="(item, index) in skillNames" :key="index">
+				{{ item }}
+			</view>
+			<view style="flex:1;"></view>
+			<u-tag text="任务" v-if="companyitem.type == 0" plain size="mini" type="warning"></u-tag>
+			<u-tag text="岗位" v-if="companyitem.type == 1" plain size="mini"></u-tag>
+		</view>
+		<view style="width: 100%;height: 1rpx;background-color: #999;margin: 0 auto;opacity: .5;"></view>
+		<view class="timeAddress" style="position: relative;">
+			<view style="display: flex;align-items: center;">
+				<image src="../../static/img/city.png" style="width: 40rpx;height: 40rpx;margin-right: 10rpx;" mode=""></image>
+				<view style="font-size: 26rpx;color:#333;">{{ companyitem.missionCompanyName }}</view>
+			</view>
+			<view style="display: flex;align-items: center;position:absolute;right:0;">
+				<image src="../../static/img/location_new.png" style="width: 30rpx;height: 30rpx;" mode=""></image>
+				<view>2.2km</view>
+			</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>
+			<view class="comment_content allName gocomment" v-else>
+				评价
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+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 (item) {
+			// const isCan = this.noApply === false ? '0' : '1'
+			if(item.type == 0) {
+				uni.navigateTo({
+					url: `/pages/projectInfo/projectInfo?missionNo=${encodeURIComponent(item.missionNo)}&isCan=1`
+				})
+			} else if(item.type == 1) {
+				uni.navigateTo({
+					url: `/pages/projectInfo/workInfo?workId=${encodeURIComponent(item.id)}&isCan=1`
+				})
+			}
+		},
+		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 {
+	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;
+}
+
+.timeAddress {
+	display: flex;
+	align-items: center;
+	justify-content: space-between;
+	font-family: PingFangSC-Regular;
+	font-size: 24rpx;
+	color: #999999;
+	margin: 10rpx 0;
+	padding: 10rpx 0;
+}
+
+.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;
+}
+
+.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_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;
+}
+
+.body {
+	width: 690rpx;
+	margin: 0rpx auto;
+	background-color: #fefefe;
+	overflow: hidden;
+	box-sizing: border-box;
+	padding: 20rpx;
+	padding-bottom: 0;
+	border-radius: 20rpx;
+	margin-top: 20rpx;
+}
+
+.heads {
+	display: flex;
+	align-items: center;
+	justify-content: space-between;
+}
+</style>

components/companyList/companyList.vue

@@ -7,7 +7,7 @@
 			</view>
 
 			<view class="head_right">
-				{{ companyitem.wage }}{{ wageUnit[companyitem.wageUnitCategory] }}
+				{{ companyitem.wage }}
 			</view>
 		</view>
 		<view class="ask">

pageMy/myProject/browsingHistory.vue

@@ -0,0 +1,201 @@
+<template>
+	<view class="body">
+		<!-- <view v-if="browsingResultList.length > 0" class="search-result">
+			<view v-for="(item, index) in browsingResultList" class="search-item" v-if="item.workname" :key="index" @click="">
+				<image src="../../static/img/search.svg" style="width: 32rpx;height: 32rpx;margin-right: 10rpx;" mode=""></image>
+				<view  style="flex:1">{{ item.workname }}</view>
+				<view class="type" v-if="item.type == 0">任务</view>
+				<view class="type" v-else-if="item.type == 1">岗位</view>
+				<view class="type" v-else-if="item.type == 2">政策</view>
+			</view>
+		</view> -->
+		<block v-for="(page, pIndex) in data" :key="pIndex">
+			<block v-for="(item, index) in page" :key="item.id">
+				<view class="search-item" @click="toDetail(item)">
+					<!-- <company-list :companyitem="item" :noApply="false"></company-list> -->
+					<image src="../../static/img/eyeopen.svg" style="width: 32rpx;height: 32rpx;margin-right: 10rpx;" mode=""></image>
+					<view  style="flex:1">{{ item.workname }}</view>
+					<view class="type" v-if="item.type == 0">任务</view>
+					<view class="type" v-else-if="item.type == 1">岗位</view>
+					<view class="type" v-else-if="item.type == 2">政策</view>
+					<view class="baddd"></view>
+				</view>
+			</block>
+		</block>
+		<view class="nothing" v-if="data.length === 0">
+			<image src="/static/img/pic_notask.svg" mode=""></image>
+			<view class="nothingContnt">
+				暂无浏览信息
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import vTabs from '@/components/v-tabs/v-tabs.vue';
+	import {
+		myBrowing
+	} from '@/api/mission.js';
+
+	export default {
+		components: {
+			vTabs,
+		},
+		data() {
+			return {
+				data: [],
+				activeTab: 0,
+				current: 1,
+				size: 10,
+				total: 0,
+				browsingResultList: []
+			}
+		},
+		onLoad: function() {
+			this.init()
+		},
+		/*页面滚动到底部 换页*/
+		onReachBottom: function() {
+			if (this.current <= Math.ceil(this.total / this.size)) {
+				this.getData();
+			} else {
+				uni.showToast({
+					icon: "none",
+					title: '已经是最后一页',
+				})
+			}
+		},
+		/*下拉刷新*/
+		onPullDownRefresh:function(){
+			this.init()
+		},
+		methods: {
+			init(){
+				this.current = 1
+				this.data = []
+				this.getData()
+			},
+			getData() {
+				var status = Number(this.activeTab) + 1
+				myBrowing(this.current, this.size, status).then(res => {
+					uni.stopPullDownRefresh();
+					console.log(res)
+					if (this.current === 1) {
+						this.data = [];
+					}
+					this.current += 1;
+					this.total = res.data.data.total;
+					if (res.data.data && res.data.data.records.length) {
+						this.data.push(res.data.data.records);
+					}
+				})
+			},
+			gomap: function() {
+				uni.navigateTo({
+					url: '../mapSeach/mapSeach'
+				})
+			},
+			changeTab: function(e) {
+				this.activeTab = e;
+				this.init()
+			},
+			toDetail(item) {
+				const no = item.id
+				// 判断是岗位还是任务 0：任务，1：岗位，2：政策
+				if(item.type == 0) {
+					uni.navigateTo({
+						url: `/pages/projectInfo/projectInfo?missionNo=${encodeURIComponent(no)}&isCan=1`
+					})
+				} else if(item.type == 1) {
+					uni.navigateTo({
+						url: `/pages/projectInfo/workInfo?workId=${encodeURIComponent(no)}&isCan=1`
+					})
+				} else if(item.type == 2) {
+					uni.navigateTo({
+						url:`/pages/user/policyContent?id=${no}`
+					})
+				}
+				
+			},
+		}
+	}
+</script>
+
+<style scoped>
+	page {
+		height: 100%;
+	}
+
+	.tab {
+		height: 46px;
+	}
+
+	.body {
+		height: 100%;
+	}
+	
+	.probody image {
+		width: 88rpx;
+		height: 88rpx;
+		position: absolute;
+		right: 0;
+		top: 0;
+	}
+	
+	.probody {
+		width: 100%;
+		position: relative;
+	}
+	
+	.baddd {
+		background: #f6f6f6;
+		height: 20rpx;
+	}
+	
+	.nothing {
+		height: 100%;
+		padding-top: 50%;
+		box-sizing: border-box;
+	}
+	
+	.nothing image {
+		width: 400rpx;
+		height: 200rpx;
+		display: block;
+		margin: 0 auto;
+	}
+	
+	.nothingContnt {
+		font-family: PingFangSC-Regular;
+		font-size: 28rpx;
+		color: #666;
+		margin-top: 30rpx;
+		text-align: center;
+	}
+	
+	.title {
+		font-size: 26rpx;
+		font-weight: bold;
+		border-bottom: 1rpx solid #ddd;
+		height: 60rpx;
+		line-height: 60rpx;
+	}
+	.search-item {
+		display: flex;
+		align-items: center;
+		font-size: 26rpx;
+		border-bottom: 1rpx solid #ddd;
+		height: 80rpx;
+		line-height: 80rpx;
+		padding: 10rpx 30rpx;
+	}
+	.search-item .type {
+		font-size: 20rpx;
+		color: #707070;
+		background-color: #dddddd;
+		border-radius: 15rpx;
+		height: 30rpx;
+		line-height: 30rpx;
+		padding: 0 20rpx;
+	}
+</style>

pageMy/myProject/myCollection.vue

@@ -0,0 +1,153 @@
+<template>
+	<view class="body">
+		<!-- <view class="tab">
+			<v-tabs :tabs="['全部任务','全部岗位']" v-model="activeTab" color="#999" activeColor="#000" fontSize="36rx"
+			 activeFontSize="36rpx" @change='changeTab' />
+		</view> -->
+		<block v-for="(page, pIndex) in data" :key="pIndex">
+			<block v-for="(item, index) in page" :key="item.id">
+				<view class="probody">
+					<company-list :companyitem="item" :noApply="false"></company-list>
+					<view class="baddd"></view>
+					<!-- <block>
+						<image src="/static/img/tab.orange.svg" mode="" v-if="item.status === 1"></image>
+						<image src="/static/img/tab.blue.svg" mode="" v-else-if="item.status === 2"></image>
+						<image src="/static/img/tab.green.svg" mode="" v-else-if="item.status === 3"></image>
+						<image src="/static/img/tab.gray.svg" mode="" v-else></image>
+					</block> -->
+				</view>
+			</block>
+		</block>
+		<view class="nothing" v-if="data.length === 0">
+			<image src="/static/img/pic_notask.svg" mode=""></image>
+			<view class="nothingContnt">
+				暂无收藏信息
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import vTabs from '@/components/v-tabs/v-tabs.vue';
+	import companyList from '@/components/companyList/collectionList.vue';
+	import {
+		myCollection
+	} from '@/api/mission.js';
+
+	export default {
+		components: {
+			vTabs,
+			companyList
+		},
+		data() {
+			return {
+				data: [],
+				activeTab: 0,
+				current: 1,
+				size: 10,
+				total: 0
+			}
+		},
+		onLoad: function() {
+			this.init()
+		},
+		/*页面滚动到底部 换页*/
+		onReachBottom: function() {
+			if (this.current <= Math.ceil(this.total / this.size)) {
+				this.getData();
+			} else {
+				uni.showToast({
+					icon: "none",
+					title: '已经是最后一页',
+				})
+			}
+		},
+		/*下拉刷新*/
+		onPullDownRefresh:function(){
+			this.init()
+		},
+		methods: {
+			init(){
+				this.current = 1
+				this.data = []
+				this.getData()
+			},
+			getData() {
+				var status = Number(this.activeTab) + 1
+				myCollection(this.current, this.size, status).then(res => {
+					uni.stopPullDownRefresh();
+					if (this.current === 1) {
+						this.data = [];
+					}
+					this.current += 1;
+					this.total = res.data.data.total;
+					if (res.data.data && res.data.data.records.length) {
+						this.data.push(res.data.data.records);
+					}
+				})
+			},
+			gomap: function() {
+				uni.navigateTo({
+					url: '../mapSeach/mapSeach'
+				})
+			},
+			changeTab: function(e) {
+				this.activeTab = e;
+				this.init()
+			}
+		}
+	}
+</script>
+
+<style scoped>
+	page {
+		height: 100%;
+	}
+
+	.tab {
+		height: 46px;
+	}
+
+	.body {
+		height: 100%;
+	}
+	
+	.probody image {
+		width: 88rpx;
+		height: 88rpx;
+		position: absolute;
+		right: 0;
+		top: 0;
+	}
+	
+	.probody {
+		width: 100%;
+		position: relative;
+	}
+	
+	.baddd {
+		background: #f6f6f6;
+		height: 20rpx;
+	}
+	
+	.nothing {
+		height: 100%;
+		padding-top: 50%;
+		box-sizing: border-box;
+	}
+	
+	.nothing image {
+		width: 400rpx;
+		height: 200rpx;
+		display: block;
+		margin: 0 auto;
+	}
+	
+	.nothingContnt {
+		font-family: PingFangSC-Regular;
+		font-size: 28rpx;
+		color: #666;
+		margin-top: 30rpx;
+		text-align: center;
+	}
+</style>

pageMy/myProject/myProject.vue

@@ -1,27 +1,27 @@
 <template>
 	<view class="body">
-		<view class="tab">
+		<!-- <view class="tab">
-			<v-tabs :tabs="['全部任务','抢成功','抢失败']" v-model="activeTab" color="#999" activeColor="#000" fontSize="36rx"
+			<v-tabs :tabs="['全部任务','全部岗位']" v-model="activeTab" color="#999" activeColor="#000" fontSize="36rx"
 			 activeFontSize="36rpx" @change='changeTab' />
-		</view>
+		</view> -->
 		<block v-for="(page, pIndex) in data" :key="pIndex">
 			<block v-for="(item, index) in page" :key="item.id">
 				<view class="probody">
 					<company-list :companyitem="item" :noApply="false"></company-list>
 					<view class="baddd"></view>
-					<block>
+					<!-- <block>
 						<image src="/static/img/tab.orange.svg" mode="" v-if="item.status === 1"></image>
 						<image src="/static/img/tab.blue.svg" mode="" v-else-if="item.status === 2"></image>
 						<image src="/static/img/tab.green.svg" mode="" v-else-if="item.status === 3"></image>
 						<image src="/static/img/tab.gray.svg" mode="" v-else></image>
-					</block>
+					</block> -->
 				</view>
 			</block>
 		</block>
 		<view class="nothing" v-if="data.length === 0">
 			<image src="/static/img/pic_notask.svg" mode=""></image>
 			<view class="nothingContnt">
-				暂无任务信息
+				暂无申请信息
 			</view>
 		</view>
 	</view>
@@ -29,7 +29,7 @@
 
 <script>
 	import vTabs from '@/components/v-tabs/v-tabs.vue';
-	import companyList from '@/components/companyList/companyList.vue';
+	import companyList from '@/components/companyList/applyList.vue';
 	import {
 		myMission
 	} from '@/api/mission.js';

pages.json

@@ -391,7 +391,23 @@
 		},{
 		    "path" : "myProject/myProject",
 		    "style" : {
-		        "navigationBarTitleText" : "我的任务",
+		        "navigationBarTitleText" : "我的申请",
+		        "navigationBarBackgroundColor" : "#FFFFFF",
+				"enablePullDownRefresh": true
+				
+		    }
+		},{
+		    "path" : "myProject/myCollection",
+		    "style" : {
+		        "navigationBarTitleText" : "我的收藏",
+		        "navigationBarBackgroundColor" : "#FFFFFF",
+				"enablePullDownRefresh": true
+				
+		    }
+		},{
+		    "path" : "myProject/browsingHistory",
+		    "style" : {
+		        "navigationBarTitleText" : "浏览记录",
 		        "navigationBarBackgroundColor" : "#FFFFFF",
 				"enablePullDownRefresh": true
 				

pages/index/index.vue

@@ -110,7 +110,7 @@
             		</view>
             	</view>
             </view>
-            <view class="serviceItem" @click="">
+            <view class="serviceItem" @click="toNewProject">
             	<view class="serviceItemContent">
             		<view class="itemIcon">
             			<image class="Icon_size" src="../../static/img/index/shenqing.png" mode=""></image>
@@ -198,7 +198,7 @@
         
 		<view class="latestMission">
 			<view class="cardTips" style="margin: 0 26rpx;display: flex;align-items: center;justify-content: space-between;padding-bottom: 10rpx;">
-				<view>最新资讯</view>
+				<view>政策资讯</view>
 				<view style="display: flex;align-items: center;" @click="toNewProject">
 					<view style="color:#707070;font-size:26rpx;margin-right: 10rpx;">更多</view>
 					<image src="../../static/img/right.svg" mode="" style="width: 14rpx;height: 26rpx;"></image>

pages/my/my.vue

@@ -24,13 +24,13 @@
 					<image src="../../static/img/job.svg" mode=""></image>
 					我的申请
 				</view>
-				<view class="BarList" @click="">
+				<view class="BarList" @click="go('/pageMy/myProject/myCollection')">
 					<image src="../../static/img/salary.svg" mode=""></image>
 					我的收藏
 				</view>
-				<view class="BarList" @click="">
+				<view class="BarList" @click="go('/pageMy/myProject/browsingHistory')">
 					<image src="../../static/img/contract.png" mode=""></image>
-					我的评价
+					浏览记录
 				</view>
 			</view>
 		</view>
@@ -67,16 +67,16 @@
 				我的申请
 				<image src="../../static/img/right.svg" mode=""></image>
 			</view> -->
-			<view class="btnList" @click="go('/pageMy/my/set')">
-				<image src="../../static/img/set.svg" mode=""></image>
-				设置
-				<image src="../../static/img/right.svg" mode=""></image>
-			</view>
 			<view class="btnList" @click="go('/pageMy/help/help')">
 				<image src="../../static/img/help.svg" mode=""></image>
 				帮助与反馈
 				<image src="../../static/img/right.svg" mode=""></image>
 			</view>
+			<view class="btnList" @click="go('/pageMy/my/set')">
+				<image src="../../static/img/set.svg" mode=""></image>
+				设置
+				<image src="../../static/img/right.svg" mode=""></image>
+			</view>
 		</view>
 		<view class="bottom" @click="makePhoneCall">
 			客服电话 18500206848 工作时间 9:00-18:00

pages/project/newProject.vue

@@ -10,7 +10,7 @@
 			<view class="typeButtonWrapper">
 				<view class="typeButtonLeft">
 
-					<view v-for="(item, index) in nonReactiveArray" :key="index" v-show="index == activeTab"
+					<view v-for="(item, index) in nonReactiveArray" :key="index" v-show="(activeTab!=2)&&(index==1||index==0)"
 						:class="['typeButton', index == activeTab ? 'activeButton' : '']" @click="changeTab(index)">{{ item
 						}}</view>
 				</view>
@@ -145,7 +145,7 @@ export default {
 			open: false,
 			showPopUp: false,
 
-			nonReactiveArray: ["最新任务", "最新岗位", "最新政策"],
+			nonReactiveArray: ["最新任务", "最新岗位", "政策资讯"],
 		}
 	},
 	onLoad: function (option) {

pages/projectInfo/projectInfo.vue

@@ -20,7 +20,7 @@
 				工种类型：{{info.worktypeNames}}
 			</view>
 			<view class="fee">
-				{{info.wage}}{{wageUnit[info.wageUnitCategory]}}
+				{{info.wage}}
 			</view>
 		</view>
 		<view class="head">
@@ -40,7 +40,7 @@
 					经验要求：{{experience[info.experienceDesc]}}
 				</view>
 			</view>
-			<view class="prolist proint">
+			<view class="prolist proint" style="font-weight: bold;color:#333;">
 				任务描述
 			</view>
 			<view class="prolist description">
@@ -70,9 +70,9 @@
 		</view>
 		<view class="head">
 			<view class="proname proneed">
-				联系方式
+				地址
 			</view>
-			<view class="prolist">
+			<!-- <view class="prolist">
 				<view class="protype">
 					联系人：{{info.callName}}
 				</view>
@@ -82,7 +82,7 @@
 			</view>
 			<view class="prolist" v-if="info.callNumber">
 				座机号：{{info.callNumber}}
-			</view>
+			</view> -->
 			<view class="prolist">
 				任务地址：{{info.address}}
 			</view>
@@ -131,7 +131,15 @@
 				<view v-if="nextBtn" class="down" @click="next">下一步</view>
 			</view>
 		</uniMask>
+		<u-popup closeable :show="showPopUp" mode="bottom" @close="closePopUp">
+			<view style="height: 200rpx;padding: 20rpx 40rpx;">
+			    <view style="font-size: 28rpx;font-weight: bold;">重要提示：</view>
+				<view style="font-size: 24rpx;color:#707070;margin-top:10rpx;">为保障个人基本劳动权益，建议通过平台用工的形式就业</view>
+				<view style="text-align: center;font-size:28rpx;margin-top: 30rpx;"> {{ info.callName }} : {{ info.callTel }}</view>
 			</view>
+		</u-popup>
+	</view>
+	
 	<view v-else-if="showCode" class="codeSealBox">
 		<!-- #ifdef H5 || APP-PLUS -->
 		<view class="closeCode" @click="closeShowCode" style="top: 124rpx;">+</view>
@@ -160,6 +168,7 @@
 	import dictionary from '@/common/textdata.js';
 	import {dateFormat} from "../../untils/format.js";
 	import uniMask from '@/components/uni-mask/mask.vue'
+	import uniPopup from '@/components/uni-popup/uni-popup.vue'
 	import validCode from '@/components/p-valid-code/p-valid-code.vue'
 	export default {
 		data() {
@@ -189,9 +198,10 @@
 				src: 'https://jlfiles.oss-cn-zhangjiakou.aliyuncs.com/jobslink-api/doc/%E7%94%B5%E5%AD%90%E5%90%88%E5%90%8C%E9%A2%84%E8%A7%88%E5%9B%BE%E7%89%87.png',
 				maxlength: 6,
 				collectStatus: 0, // 收藏状态
+				showPopUp: false,
 			}
 		},
-		components: {uniMask,validCode},
+		components: {uniMask,validCode,uniPopup},
 		onLoad: function(option) { //option为object类型，会序列化上个页面传递的参数
 			// this.$store.dispatch('setAutograph')
 			if (option.missionNo) {
@@ -223,18 +233,21 @@
 			collect() {
 				// console.log('收藏，取消收藏')
 				const status = this.collectStatus == 0 ? 1 : 0;
-				updateCollectStatus(this.info.id, status).then(res => {
+				updateCollectStatus(this.info.id, status, 0).then(res => {
 					if(res.data.code == 200) {
 						this.getCollectStatus()
 					}
 				})
 			},
 			callPhone() {
-				console.log('电话联系')
+				this.showPopUp = true;
+			},
+			closePopUp() {
+				this.showPopUp = false;
 			},
 			// 获取收藏状态
 			getCollectStatus() {
-				getCollectState(this.info.id).then(res => {
+				getCollectState(this.info.id, 0).then(res => {
 					// 0 未收藏，1 已收藏
 					// console.log(res)
 					this.collectStatus = res.data.data;

pages/projectInfo/workInfo.vue

@@ -43,7 +43,7 @@
 			<view class="prolist">
 				岗位地址：{{info.jobAddress}}
 			</view>
-			<view class="prolist proint">
+			<view class="prolist proint" style="font-weight: bold;color:#333;">
 				任务描述
 			</view>
 			<view class="prolist description">
@@ -77,21 +77,21 @@
 		</view>
 		<view class="head">
 			<view class="proname proneed">
-				联系方式
+				地址
 			</view>
-			<view class="prolist">
+			<!-- <view class="prolist">
 				<view class="protype">
 					联系人：{{info.callName}}
 				</view>
 				<view class="protype">
 					联系方式：{{info.callTel}}
 				</view>
-			</view>
+			</view> -->
-			<view class="prolist" v-if="info.callNumber">
+			<!-- <view class="prolist" v-if="info.callNumber">
 				座机号：{{info.callNumber}}
-			</view>
+			</view> -->
 			<view class="prolist">
-				任务地址：{{info.address}}
+				岗位地址：{{info.address}}
 			</view>
 			<map class="map" :latitude="latitude" :longitude="longitude" :markers="covers"></map>
 		</view>
@@ -138,7 +138,15 @@
 				<view v-if="nextBtn" class="down" @click="next">下一步</view>
 			</view>
 		</uniMask>
+		<u-popup closeable :show="showPopUp" mode="bottom" @close="closePopUp">
+			<view style="height: 200rpx;padding: 20rpx 40rpx;">
+			    <view style="font-size: 28rpx;font-weight: bold;">重要提示：</view>
+				<view style="font-size: 24rpx;color:#707070;margin-top:10rpx;">为保障个人基本劳动权益，建议通过平台用工的形式就业</view>
+				<view style="text-align: center;font-size:28rpx;margin-top: 30rpx;"> {{ info.callName }} : {{ info.callTel }}</view>
 			</view>
+		</u-popup>
+	</view>
+	
 	<view v-else-if="showCode" class="codeSealBox">
 		<!-- #ifdef H5 || APP-PLUS -->
 		<view class="closeCode" @click="closeShowCode" style="top: 124rpx;">+</view>
@@ -196,6 +204,7 @@
 				src: 'https://jlfiles.oss-cn-zhangjiakou.aliyuncs.com/jobslink-api/doc/%E7%94%B5%E5%AD%90%E5%90%88%E5%90%8C%E9%A2%84%E8%A7%88%E5%9B%BE%E7%89%87.png',
 				maxlength: 6,
 				collectStatus: 0, // 收藏状态
+				showPopUp: false,
 			}
 		},
 		components: {uniMask,validCode},
@@ -230,18 +239,21 @@
 			collect() {
 				// console.log('收藏，取消收藏')
 				const status = this.collectStatus == 0 ? 1 : 0;
-				updateCollectStatus(this.info.id, status).then(res => {
+				updateCollectStatus(this.info.id, status, 1).then(res => {
 					if(res.data.code == 200) {
 						this.getCollectStatus()
 					}
 				})
 			},
 			callPhone() {
-				console.log('电话联系')
+				this.showPopUp = true;
+			},
+			closePopUp() {
+				this.showPopUp = false;
 			},
 			// 获取收藏状态
 			getCollectStatus() {
-				getCollectState(this.info.id).then(res => {
+				getCollectState(this.info.id, 1).then(res => {
 					// 0 未收藏，1 已收藏
 					// console.log(res)
 					this.collectStatus = res.data.data;

pages/seach/seach.vue

@@ -5,7 +5,7 @@
 				<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="getNewList('search')"
-						placeholder="请输入任务名称或公司名称" />
+						placeholder="搜任务/搜岗位/搜政策" />
 					<view @click="getNewList('search')" style="width: 80rpx;height: 50rpx;color:#fff;background-color: #0091ff;font-size:24rpx;text-align: center;line-height: 50rpx;border-radius: 25rpx;;">搜索</view>
 				</view>
 				<!-- <view class="close" @click="closeBack">
@@ -27,11 +27,11 @@
 		<view v-show="!searchResultShow" class="search-history">
 			<view class="title">搜索记录</view>
 			<view class="clear" @click="clearKeyWords">
-				<image src="../../static/img/delete.png" style="width: 20rpx;height: 20rpx;" mode=""></image>
+				<image src="../../static/img/delete.png" style="width: 24rpx;height: 24rpx;" mode=""></image>
 				<view style="margin-left: 5rpx;">清空</view>
 			</view>
 			<view class="wrapper" v-if="searchHistoryList.length > 0">
-				<view class="item" v-for="(item, index) in searchHistoryList">
+				<view class="item" v-for="(item, index) in searchHistoryList" @click="keyWordsClick(item.keywords)">
 					{{ item.keywords }}
 				</view>
 			</view>
@@ -160,6 +160,11 @@ export default {
 				}
 			})
 		},
+		keyWordsClick(keyWords) {
+			console.log(keyWords)
+			this.keywords = keyWords;
+			this.getNewList();
+		},
 		//最新任务；
 		getList: function (type) {
 			//改变搜索条件，页码值变为1
@@ -282,8 +287,7 @@ export default {
 
 .headSearch .search-item {
 	display: flex;
-	width: 90%;
+	padding: 0 10rpx;
-	padding: 0 24rpx;
 	height: 60rpx;
 	line-height: 60rpx;
 	background: rgba(249, 249, 249, 1);
@@ -329,7 +333,7 @@ export default {
 }
 .search-history {
 	background-color: #fff;
-	padding: 10rpx 20rpx;
+	padding: 10rpx 40rpx;
 	position: relative;
 }
 .search-history .title {
@@ -338,9 +342,9 @@ export default {
 }
 .search-history .clear {
 	position: absolute;
-	right: 20rpx;
+	right: 40rpx;
 	top: 10rpx;
-	font-size: 20rpx;
+	font-size: 24rpx;
 	display: flex;
 	align-items: center;
 	color: #707070;
@@ -353,11 +357,12 @@ export default {
 .search-history .wrapper {
 	display: flex;
 	flex-wrap: wrap;
+	margin-top: 10rpx;
 }
 .search-history .wrapper .item {
-	font-size: 20rpx;
+	font-size: 24rpx;
 	background-color: #f6f6f6;
-	padding: 10rpx;
+	padding: 8rpx 12rpx;
 	border-radius: 20rpx;
 	margin-right: 10rpx;
 }

vue.config.js

@@ -3,8 +3,8 @@ module.exports = {
         port: 1887,
         proxy: {
             '/api': {
-                // target: 'http://192.168.3.108:8000', // 本地服务接口地址
+                target: 'http://192.168.3.104:8000', // 本地服务接口地址
-				target: "http://39.98.184.58:8000",  // 阿里云后台地址
+				// target: "http://39.98.184.58:8000",  // 阿里云后台地址
 				// target: "http://192.168.0.101:8000",  // 本地网关
                 ws: true,
                 pathRewrite: {