上传修改

App.vue

@@ -4,6 +4,8 @@
 		},
 		onShow: function() {
 			// this.$store.commit('initConfig')
+			this.$store.commit('getJobTypeList')
+			// this.$store.commit('getAddressList')
 		},
 		onHide: function() {
 		}

api/api.js

@@ -21,8 +21,8 @@ const config = {
 	 */
 	// 微信登录接口
 	wxLogin: {
-		url: '/login/login',
-		method: 'POST', 
+		url: '/api/login/login',
+		method: 'GET', 
 		limit : 500,
 		showLoading : true,
 	},
@@ -52,6 +52,22 @@ const config = {
 	 */
 	
 	
+	//获取工种列表
+	commonQueryJobTypeList: {
+		url: '/api/common/queryJobTypeList',
+		method: 'GET',
+	},
+	//获取banner图列表
+	commonQueryBannerList: {
+		url: '/api/common/queryBannerList',
+		method: 'GET',
+	},
+	//获取开放地址列表
+	commonQueryAddressList: {
+		url: '/api/common/queryAddressList',
+		method: 'GET',
+	},
+	
 	
 	/**
 	 * 求职者的接口
@@ -68,10 +84,35 @@ const config = {
 		url: '/api/employee/queryJobById',
 		method: 'GET',
 	},
+	//我的收藏
+	employeeQueryCollectionJobList: {
+		url: '/api/employee/queryJobCollectionList',
+		method: 'GET',
+	},
+	//联系记录-我看过谁(我的找活)
+	employeeQueryWatchWho: {
+		url: '/api/employee/queryWatchWho',
+		method: 'GET',
+	},
+	//联系记录-谁看过我(谁看过我的简历)
+	employeeQueryWatchMe: {
+		url: '/api/employee/queryWatchMe',
+		method: 'GET',
+	},
 	
 	/**
 	 * boss的接口
 	 */
+	//获取简历列表
+	bossQueryJobList: {
+		url: '/api/boss/queryJobList',
+		method: 'GET',
+	},
+	//根据Id查看简历详情
+	bossQueryResumeById: {
+		url: '/api/boss/queryResumeById',
+		method: 'GET',
+	},
 }
 
 export function api(key, data, callback, loadingTitle) {

components/list/bossList/index.vue

@@ -39,22 +39,22 @@
 			}
 		},
 		methods: {
-			queryVideoList(){
+			getData(){
 				if(uni.getStorageSync('token')){
 					this.queryParams.token = uni.getStorageSync('token')
 				}
 				
 				this.$api(this.api, this.queryParams, res => {
 					if(res.code == 200){
-						this.list = res.result
-						// this.total = res.result.total
+						this.list = res.result.records
+						this.total = res.result.total
 					}
 				})
 			},
 			loadMoreData(){
 				if(this.queryParams.pageSize <= this.list.length){
 					this.queryParams.pageSize += 10
-					this.queryVideoList()
+					this.getData()
 				}
 			},
 		}

components/list/userList/index.vue

@@ -5,9 +5,9 @@
 	@scrolltolower="loadMoreData">
 		<view class="bossList">
 			<view
-				@click="$utils.navigateTo('/pages_order/boss/bossDetail?id=' + 123)"
+				@click="$utils.navigateTo('/pages_order/work/userDetail?id=' + item.id)"
 				:key="index"
-				v-for="(item, index) in 10">
+				v-for="(item, index) in list">
 				<userItem :item="item"/>
 			</view>
 		</view>
@@ -25,7 +25,7 @@
 				default : 'auto'
 			},
 			api : {
-				default : ''
+				default : 'bossQueryJobList'
 			}
 		},
 		data() {
@@ -35,26 +35,26 @@
 					pageSize: 10,
 				},
 				total : 0,
-				list : 10,
+				list : [],
 			}
 		},
 		methods: {
-			queryVideoList(){
+			getData(){
 				if(uni.getStorageSync('token')){
 					this.queryParams.token = uni.getStorageSync('token')
 				}
 				
 				this.$api(this.api, this.queryParams, res => {
 					if(res.code == 200){
-						this.list = res.result
-						// this.total = res.result.total
+						this.list = res.result.records
+						this.total = res.result.total
 					}
 				})
 			},
 			loadMoreData(){
 				if(this.queryParams.pageSize <= this.list.length){
 					this.queryParams.pageSize += 10
-					this.queryVideoList()
+					this.getData()
 				}
 			},
 		}

components/list/userList/userItem.vue

@@ -2,28 +2,49 @@
 	<view class="boss-item">
 		<view class="head">
 			<view class="headImage">
-				<image src="/static/image/center/headImage.png" mode=""></image>
+				<image :src="headImage" mode=""></image>
 			</view>
 			<view class="info">
 				<view class="name">
-					李老板
+					<!-- 李老板 -->
+					{{ item.name }}
 					<view>
-						装配电工
+						<!-- 装配电工 -->
+						{{ item.typeId_dictText }}
+					</view>
+					<view>
+						<!-- 装配电工 -->
+						{{ item.natureId_dictText }}
 					</view>
 				</view>
 				<view class="tips">
-					男 · 汉族 · 本科 · 应届生
+					<!-- 男 · 汉族 · 本科 · 应届生 -->
+					{{ item.sex }} · {{ item.nation }} · {{ item.qualification }} · 应届生
 				</view>
 			</view>
 			<view class="right">
-				<view class="price">
-					12-18K
+				<view class="price"
+				v-if="item.salaryLow > 1000">
+					<text>
+						{{ (item.salaryLow / 1000).toFixed(0) }}
+					</text>
+					<text
+					v-if="item.salaryUp">
+						-{{ (item.salaryUp / 1000).toFixed(0) }}
+					</text>
+					K
+				</view>
+				<view class="price" v-else>
+					<text>{{ item.salaryLow }}</text>
+					<text
+					v-if="item.salaryUp">-{{ item.salaryUp }}</text>
 				</view>
 			</view>
 		</view>
 		<view class="bottom">
 			<view class="time">
-				09月23日  16：20
+				<!-- 09月23日  16：20 -->
+				{{ $dayjs(item.createTime).format('YYYY-MM-DD') }}
 			</view>
 			<view class="phone">
 				<image src="/static/image/home/phone.png" mode=""></image>
@@ -35,11 +56,21 @@
 
 <script>
 	export default {
+		props : {
+			item : {
+				default : {}
+			}
+		},
 		data() {
 			return {
 				
 			}
 		},
+		computed : {
+			headImage(){
+				return this.item.headImage || '/static/image/center/headImage.png'
+			}
+		},
 		methods: {
 			
 		}

components/list/workList/workItem.vue

@@ -23,7 +23,7 @@
 		</view>
 		<view class="tag-list">
 			<view 
-			v-for="(t, i) in item.tab.split('、')"
+			v-for="(t, i) in item.tab && item.tab.split('、')"
 			:key="i">
 				{{ t }}
 			</view>

components/list/workList/workListSwipe.vue

@@ -8,7 +8,7 @@
 			<uv-swipe-action-item 
 			@click="e => clickSwipeAction(e, item)"
 			:options="options">
-				<workItem/>
+				<workItem :item="item"/>
 			</uv-swipe-action-item>
 		</view>
 	</uv-swipe-action>

components/screen/screenWork.vue

@@ -20,6 +20,12 @@
 			:value="dropItem('craft').value">
 			</uv-drop-down-item>
 
+			<uv-drop-down-item 
+			name="nature" type="2" 
+			:label="dropItem('nature').label" 
+			:value="dropItem('nature').value">
+			</uv-drop-down-item>
+
 			<uv-drop-down-item 
 			name="vip_type" 
 			type="1" 
@@ -67,11 +73,14 @@
 </template>
 
 <script>
+	import {
+		mapState,
+	} from 'vuex'
 	export default {
 		data() {
 			return {
 				// 表示value等于这些值，就属于默认值
-				defaultValue: [0, 'all'],
+				defaultValue: [0, 'all', 'all'],
 				// 筛选结果
 				result: [],
 				activeName: 'area',
@@ -109,6 +118,19 @@
 						},
 					]
 				},
+				nature: {
+					label: '性质',
+					value: 'all',
+					activeIndex: 0,
+					color: '#333',
+					activeColor: '#3796F8',
+					child: [
+						{
+							label: '全部',
+							value: 'all'
+						},
+					]
+				},
 				list : [
 					{
 						title : '您目前所属的年龄段',
@@ -147,6 +169,16 @@
 			currentDropItem() {
 				return this[this.activeName];
 			},
+			...mapState(['jobTypeList']),
+		},
+		mounted() {
+			console.log('=================================');
+			this.jobTypeList.forEach(n => {
+				this.craft.child.push({
+					label: n.name,
+					value: n.id,
+				})
+			})
 		},
 		methods: {
 			clickTag(item, i){

pages.json

@@ -92,6 +92,9 @@
 			},
 			{
 				"path": "mine/setting"
+			},
+			{
+				"path": "work/userDetail"
 			}
 		]
 	}],

pages/index/index.vue

@@ -3,10 +3,10 @@
 		
 		<view class="banner">
 			<uv-swiper
-			:list="bannerList" 
+			:list="banner" 
 			indicator
 			height="620rpx"
-			keyName="url"></uv-swiper>
+			keyName="image"></uv-swiper>
 			<!-- indicatorStyle="bottom: 100rpx;" -->
 			
 			<view class="top">
@@ -27,12 +27,12 @@
 			<view class="grid">
 				<uv-grid :border="false"
 				:col="5">
+				<!-- @click="$utils.navigateTo('/pages_order/work/workList?id=' + item.id)" -->
 					<uv-grid-item 
-					v-for="(item,index) in baseList"
-					@click="$utils.navigateTo('/pages_order/work/workList')"
+					v-for="(item,index) in jobTypeList"
 					:key="index">
-						<image class="grid-icon" :src="item.icon" mode="aspectFill"></image>
-						<text class="grid-text">{{item.title}}</text>
+						<image class="grid-icon" :src="item.image" mode="aspectFill"></image>
+						<text class="grid-text">{{item.name}}</text>
 					</uv-grid-item>
 				</uv-grid>
 			</view>
@@ -41,7 +41,6 @@
 		<!-- 筛选器 -->
 		<screenWork @clickItem="clickItem"/>
 		
-		
 		<!-- 老板看到的 -->
 		<userList ref="workList" v-if="role"/>
 		
@@ -62,7 +61,6 @@
 	import screenWork from '@/components/screen/screenWork.vue'
 	import {
 		mapState,
-		mapGetters
 	} from 'vuex'
 	export default {
 		components : {
@@ -73,42 +71,15 @@
 			userList
 		},
 		computed: {
-			...mapState(['userInfo', 'role']),
+			...mapState([
+				'userInfo', 
+				'role', 
+				'banner',
+				'jobTypeList'
+			]),
 		},
 		data() {
 			return {
-				baseList : [
-					{
-						icon : '/static/image/home/1.png',
-						title : '电工',
-						path : '/pages_order/service/applyRelic',
-					},
-					{
-						icon : '/static/image/home/1.png',
-						title : '焊工',
-						path : '/pages_order/service/applyRelic',
-					},
-					{
-						icon : '/static/image/home/1.png',
-						title : '叉车',
-						path : '/pages_order/service/applyRelic',
-					},
-					{
-						icon : '/static/image/home/1.png',
-						title : '钳工',
-						path : '/pages_order/service/applyRelic',
-					},
-					{
-						icon : '/static/image/home/1.png',
-						title : '其他招工',
-						path : '/pages_order/service/applyRelic',
-					},
-				],
-				bannerList: [
-					{
-						url: '/static/image/home/banner.png',
-					}, 
-				],
 				productList: [],
 				keyword : '',
 			}
@@ -118,8 +89,8 @@
 		// 	this.queryBannerList()
 		// },
 		onShow() {
-			this.$refs.workList.getData()()
-			this.queryBannerList()
+			this.$refs.workList.getData()
+			this.$store.commit('getBanner')
 		},
 		//滚动到屏幕底部
 		onReachBottom() {
@@ -128,9 +99,6 @@
 		methods: {
 			clickItem(){
 				
-			},
-			queryBannerList(){
-				
 			},
 		}
 	}

pages_order/mine/collect.vue

@@ -32,6 +32,7 @@
 						}
 					}, 
 				],
+				mixinsListApi : 'employeeQueryCollectionJobList',
 			}
 		},
 		methods: {

pages_order/mine/contactRecord.vue

@@ -17,7 +17,7 @@
 		</view>
 		
 		
-		<workList ref="workList" v-if="type == 0"/>
+		<workList api="employeeQueryWatchWho" ref="workList" v-if="type == 0"/>
 		<bossList ref="bossList" v-if="type == 1"/>
 	</view>
 </template>

pages_order/work/userDetail.vue

@@ -0,0 +1,221 @@
+<template>
+	<view class="page">
+		<navbar title="工作详情" leftClick @leftClick="$utils.navigateBack" />
+		
+		<view class="head">
+			<view class="headImage">
+				<image :src="detail.headImage" mode=""></image>
+				<view class="">
+					{{ detail.typeId_dictText }}
+				</view>
+			</view>
+			<view class="info">
+				<view class="name">
+					{{ detail.name }}
+				</view>
+				<view class="tips">
+					性别：{{ detail.sex }}
+				</view>
+				<view class="tips">
+					年龄：{{ detail.age }}岁
+				</view>
+				<view class="tips">
+					学历：{{ detail.qualification }}
+				</view>
+			</view>
+			<view class="right">
+				<view class="phone">
+					<image src="/static/image/home/phone.png" mode=""></image>
+					联系他
+				</view>
+			</view>
+		</view>
+		
+		
+		<view class="box">
+			
+			<view class="userinfo">
+				
+				<view class="line">
+					<view class="left">
+						联系电话
+					</view>
+					<view class="right">
+						联系电话
+					</view>
+				</view>
+				
+				<view class="line">
+					<view class="left">
+						期望工作地
+					</view>
+					<view class="right">
+						联系电话
+					</view>
+				</view>
+				
+			</view>
+			
+			<view class="info">
+				<view class="title2">
+					<text>个人介绍</text>
+					
+				</view>
+				
+				<!-- <view 
+				class="text" 
+				v-html="text">
+				</view> -->
+				<view 
+				class="text">
+					<uv-parse :content="detail.brief"></uv-parse>
+				</view>
+				<view class="tag-list">
+					<view v-for="(t, i) in detail.tab && detail.tab.split('、')">
+						{{ t }}
+					</view>
+				</view>
+			</view>
+			
+		</view>
+	</view>
+</template>
+
+<script>
+	let text = `岗位要求
+	1、全日制大专以上学历，艺术设计类相关专业;
+	2、两年以上平面、品牌、视觉设计等相关工作经验，能独立完成项目的设计工作，有 3C数码/个护健 康 类产品服务经验优先，有乙方工作经验佳;
+	3、具备一定的设计提案能力，能完整的呈现设计思路与创意，能清晰的表达设计逻辑与思考;
+	4、热爱设计，平面基本功扎实，拥有优良的审美与创意想法，对版式、色彩把控能力强;对工作富有责任心，具备团队沟通与协作能力;
+	5、精通 PS、AI、CDR 等平面设计软件，能独立完成日常平面设计工作内容，熟练使用 PPT/Keynote，能完成提案内容的材料美化工作。
+	`
+	import userHead from '../components/user/userHead.vue'
+	export default {
+		components : {
+			userHead,
+		},
+		data() {
+			return {
+				text : '',
+				id : 0,
+				detail : {},
+			}
+		},
+		onLoad({id}) {
+			this.id = id
+		},
+		onShow() {
+			this.text = this.$utils.stringFormatHtml(text)
+			this.getData()
+		},
+		methods: {
+			getData(){
+				this.$api('bossQueryResumeById', {
+					resumeId : this.id
+				}, res => {
+					if(res.code == 200){
+						this.detail = res.result
+					}
+				})
+			},
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+.page{
+	background-color: #fff;
+	min-height: 100vh;
+	.head {
+		display: flex;
+		align-items: center;
+		position: relative;
+		padding: 20rpx;
+		image {
+			width: 140rpx;
+			height: 140rpx;
+			border-radius: 50%;
+		}
+	
+		.headImage {
+			width: 160rpx;
+			margin-right: 40rpx;
+			display: flex;
+			flex-direction: column;
+			align-items: center;
+			justify-content: center;
+			view {
+				display: flex;
+				font-size: 24rpx;
+				align-items: center;
+				margin-left: 20rpx;
+				background: rgba($uni-color, 0.2);
+				color: $uni-color;
+				padding: 10rpx;
+				border-radius: 10rpx;
+				margin-top: 10rpx;
+			}
+		}
+	
+		.info {
+			font-size: 28rpx;
+	
+			.name {
+				font-size: 32rpx;
+				display: flex;
+				padding-bottom: 10rpx;
+	
+				view {
+					display: flex;
+					font-size: 20rpx;
+					align-items: center;
+					padding-left: 20rpx;
+				}
+			}
+	
+			.tips {
+				font-size: 26rpx;
+			}
+		}
+		.right{
+			margin-left: auto;
+			.phone{
+				background-color: rgba($uni-color, 0.2);
+				color: $uni-color;
+				padding: 8rpx 16rpx;
+				border-radius: 10rpx;
+				image{
+					width: 24rpx;
+					height: 24rpx;
+				}
+			}
+		}
+	}
+	.box{
+		padding: 30rpx;
+		
+		.userinfo{
+			font-size: 28rpx;
+			color: #666666;
+			line-height: 44rpx;
+			margin-bottom: 40rpx;
+			.line{
+				margin-bottom: 20rpx;
+				display: flex;
+				.left{
+					width: 220rpx;
+					flex-shrink: 0;
+				}
+			}
+		}
+		
+		.info{
+			.text{
+				font-size: 24rpx;
+				color: #666666;
+				line-height: 44rpx;
+			}
+		}
+	}
+}
+</style>

pages_order/work/workDetail.vue

@@ -73,7 +73,7 @@
 				</view>
 				
 				<view class="tag-list">
-					<view v-for="(t, i) in detail.tab.split('、')">
+					<view v-for="(t, i) in detail.tab && detail.tab.split('、')">
 						{{ t }}
 					</view>
 				</view>

store/store.js

@@ -10,8 +10,11 @@ const store = new Vuex.Store({
 	state: {
 		configList: [], //配置列表
 		// 角色 true为老板 false为工人
-		role : false,
+		role : true,
 		userInfo : {}, //用户信息
+		banner : [],//轮播图
+		jobTypeList : [],//工种
+		addressList : [],//开放地址
 	},
 	getters: {
 	},
@@ -74,6 +77,42 @@ const store = new Vuex.Store({
 				}
 			})
 		},
+		// 获取工种列表
+		getJobTypeList(state){
+			api('commonQueryJobTypeList', {
+				pageNo : 1,
+				pageSize : 99999,
+			}, res => {
+				if(res.code != 200){
+					return
+				}
+				state.jobTypeList = res.result.records
+			})
+		},
+		// 获取开放地址
+		getAddressList(state){
+			api('commonQueryAddressList', {
+				pageNo : 1,
+				pageSize : 99999,
+			}, res => {
+				if(res.code != 200){
+					return
+				}
+				state.addressList = res.result.records
+			})
+		},
+		// 获取轮播图
+		getBanner(state){
+			api('commonQueryBannerList', {
+				pageNo : 1,
+				pageSize : 99999,
+			}, res => {
+				if(res.code != 200){
+					return
+				}
+				state.banner = res.result.records
+			})
+		},
 	},
 	actions: {},
 })