上传修改

App.vue

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

api/api.js

@@ -101,6 +101,11 @@ const config = {
 		url: '/api/common/queryJobTypeList',
 		method: 'GET',
 	},
+	//获取工作性质列表
+	commonQueryJobNatureList: {
+		url: '/api/common/queryJobNatureList',
+		method: 'GET',
+	},
 	//获取banner图列表
 	commonQueryBannerList: {
 		url: '/api/common/queryBannerList',
@@ -139,7 +144,7 @@ const config = {
 	
 	//获取工作信息列表
 	employeeQueryJobList: {
-		url: '/api/employee/queryJobList',
+		url: '/api/employee/queryJobListByAll',
 		method: 'GET',
 	},
 	//根据Id查看工作详情
@@ -152,12 +157,17 @@ const config = {
 		url: '/api/employee/queryJobCollectionList',
 		method: 'GET',
 	},
-	//联系记录-我看过谁(我的找活)
+	//我的找活
+	employeeQueryResumeByUserId: {
+		url: '/api/employee/queryResumeByUserId',
+		method: 'GET',
+	},
+	//联系记录-我看过谁
 	employeeQueryWatchWho: {
 		url: '/api/employee/queryWatchWho',
 		method: 'GET',
 	},
-	//联系记录-谁看过我(谁看过我的简历)
+	//联系记录-谁看过我
 	employeeQueryWatchMe: {
 		url: '/api/employee/queryWatchMe',
 		method: 'GET',
@@ -191,12 +201,17 @@ const config = {
 		url: '/api/boss/queryJobCollectionList',
 		method: 'GET',
 	},
-	//会员中心-联系记录-我看过谁(我的招工)
+	//我的招工
+	bossQueryJobListByUserId: {
+		url: '/api/boss/queryJobListByUserId',
+		method: 'GET',
+	},
+	//会员中心-联系记录-我看过谁
 	bossQueryWatchWho: {
 		url: '/api/boss/queryWatchWho',
 		method: 'GET',
 	},
-	//会员中心-联系记录-谁看过我(谁看过我的招工)
+	//会员中心-联系记录-谁看过我
 	bossQueryWatchMe: {
 		url: '/api/boss/queryWatchMe',
 		method: 'GET',

components/list/bossList/index.vue

@@ -26,6 +26,9 @@
 			},
 			api : {
 				default : ''
+			},
+			list : {
+				default : []
 			}
 		},
 		data() {
@@ -35,7 +38,7 @@
 					pageSize: 10,
 				},
 				total : 0,
-				list : 10,
+				list2 : 10,
 			}
 		},
 		methods: {
@@ -46,7 +49,7 @@
 				
 				this.$api(this.api, this.queryParams, res => {
 					if(res.code == 200){
-						this.list = res.result.records
+						this.list2 = res.result.records
 						this.total = res.result.total
 					}
 				})

components/screen/screenWork.vue

@@ -58,7 +58,7 @@
 							@click="clickTag(item, i)"
 							v-for="(t, i) in item.tag"
 							:key="t">
-								{{ t }}
+								{{ t.label }}
 							</view>
 						</view>
 					</view>
@@ -95,14 +95,6 @@
 							label: '全国',
 							value: 0,
 						},
-						{
-							label: '金牌讲解员',
-							value: 1
-						},
-						{
-							label: '专业讲解员',
-							value: 2
-						},
 					]
 				},
 				craft: {
@@ -132,11 +124,11 @@
 					]
 				},
 				list : [
-					{
-						title : '您目前所属的年龄段',
-						tag : ['18岁～35岁', '35岁～45岁', '45岁～50岁', '50岁以上'],
-						index : 0,
-					},
+					// {
+					// 	title : '您目前所属的年龄段',
+					// 	tag : ['18岁～35岁', '35岁～45岁', '45岁～50岁', '50岁以上'],
+					// 	index : 0,
+					// },
 					{
 						title : '您希望从事的工种',
 						tag : ['电工', '焊工', '叉车', '其他'],
@@ -169,16 +161,26 @@
 			currentDropItem() {
 				return this[this.activeName];
 			},
-			...mapState(['jobTypeList']),
+			...mapState(['jobTypeList', 'natureList']),
 		},
 		mounted() {
-			console.log('=================================');
+			// 工种
 			this.jobTypeList.forEach(n => {
 				this.craft.child.push({
 					label: n.name,
 					value: n.id,
 				})
 			})
+			this.list[0].tag = this.craft.child
+			
+			// 工作性质
+			this.natureList.forEach(n => {
+				this.nature.child.push({
+					label: n.name,
+					value: n.id,
+				})
+			})
+			this.list[1].tag = this.nature.child
 		},
 		methods: {
 			clickTag(item, i){

config.js

@@ -13,7 +13,7 @@ const type = 'dev'
 // 环境配置
 const config = {
 	dev : {
-		baseUrl : 'https://employadmin.augcl.com/employ-api',
+		baseUrl : 'http://augcl.natapp1.cc/employ-api',
 	},
 	prod : {
 		baseUrl : 'https://employadmin.augcl.com/employ-api',

pages.json

@@ -21,7 +21,8 @@
 		{
 			"path": "pages/index/center",
 			"style": {
-				"navigationBarTitleText": ""
+				"navigationBarTitleText": "",
+				"navigationBarTextStyle": "white"
 			}
 		}
 	],
@@ -55,16 +56,32 @@
 				"path": "work/workDetail"
 			},
 			{
-				"path": "mine/collect"
+				"path": "mine/collect",
+				"style": {
+					"navigationBarTitleText": "",
+					"navigationBarTextStyle": "white"
+				}
 			},
 			{
-				"path": "mine/contactRecord"
+				"path": "mine/contactRecord",
+				"style": {
+					"navigationBarTitleText": "",
+					"navigationBarTextStyle": "white"
+				}
 			},
 			{
-				"path": "mine/releaseWork"
+				"path": "mine/releaseWork",
+				"style": {
+					"navigationBarTitleText": "",
+					"navigationBarTextStyle": "white"
+				}
 			},
 			{
-				"path": "mine/seeMy"
+				"path": "mine/seeMy",
+				"style": {
+					"navigationBarTitleText": "",
+					"navigationBarTextStyle": "white"
+				}
 			},
 			{
 				"path": "mine/contract"

pages/index/center.vue

@@ -96,7 +96,7 @@
 				<uv-grid :col="4" :border="false">
 					<uv-grid-item @click="$utils.navigateTo('/pages_order/mine/releaseWork')">
 						<image class="image" src="/static/image/center/a1.png" mode=""></image>
-						<text class="grid-text">我的找活</text>
+						<text class="grid-text">{{ role ? '我的招工' : '我的找活'}}</text>
 					</uv-grid-item>
 			
 					<uv-grid-item @click="$utils.navigateTo('/pages_order/mine/seeMy')">
@@ -190,7 +190,7 @@
 			tabber,
 		},
 		computed: {
-			...mapState(['userInfo']),
+			...mapState(['userInfo', 'role']),
 			headImage(){
 				return '/static/image/center/headImage.png'
 			},

pages_order/mine/IntegralRecord.vue

@@ -7,15 +7,15 @@
 			<view class="number">
 				当前积分
 				<view>
-					0
+					{{ formal.score + temporarily.score }}
 				</view>
 			</view>
 			<view class="bottom">
 				<view>
-					正式积分：0
+					正式积分：{{ formal.score }}
 				</view>
 				<view>
-					临时积分：0
+					临时积分：{{ temporarily.score }}
 				</view>
 			</view>
 		</view>
@@ -53,29 +53,6 @@
 		data() {
 			return {
 				title : '积分记录',
-				agentFlow : {
-					total : 0,
-					records : [
-						{
-							type : 0,
-							money : 100,
-							createTime : '2024-04-02 20:00',
-							title : "佣金提现",
-						},
-						{
-							type : 0,
-							money : 100,
-							createTime : '2024-04-02 20:00',
-							title : "佣金提现",
-						},
-						{
-							type : 0,
-							money : 100,
-							createTime : '2024-04-02 20:00',
-							title : "佣金提现",
-						},
-					]
-				},
 				x : ['+', '-'],
 				status : 0,
 				tabs: [
@@ -88,12 +65,23 @@
 				],
 				type : 0,
 				mixinsListApi : 'commonQueryScoreRecord',
+				// 正式积分
+				formal : {
+					score : 0
+				},
+				// 临时积分
+				temporarily : {
+					score : 0
+				},
 			}
 		},
 		onLoad(e) {
 			this.status = e.status
 			this.queryParams.type = this.type
 		},
+		onShow() {
+			this.getCounst()
+		},
 		methods: {
 			leftClick() {		//返回钱包
 				uni.navigateBack(-1)
@@ -101,6 +89,19 @@
 			clickTabs({index}) {
 				this.type = index
 				this.queryParams.type = this.type
+				this.getData()
+			},
+			getCounst(){
+				this.$api('commonQueryScore', {type : 0}, res => {
+					if(res.code == 200){
+						this.formal = res.result
+					}
+				})
+				this.$api('commonQueryScore', {type : 1}, res => {
+					if(res.code == 200){
+						this.temporarily = res.result
+					}
+				})
 			},
 		}
 	}

pages_order/mine/collect.vue

@@ -10,7 +10,7 @@
 		<workListSwipe 
 		:options="options" 
 		@clickSwipeAction="clickSwipeAction"
-		:list="list"/>
+		:list="list2"/>
 	</view>
 </template>
 
@@ -34,6 +34,7 @@
 					}, 
 				],
 				mixinsListApi : 'employeeQueryCollectionJobList',
+				list2 : [],
 			}
 		},
 		computed : {
@@ -48,6 +49,14 @@
 			clickSwipeAction({e, item}){
 				console.log(e, item);
 			},
+			getDataThen(list, total, result){
+				let l = []
+				result.forEach(res => {
+					res.employJob.employCollectionJob = res.employCollectionJob
+					l.push(res.employJob)
+				})
+				this.list2 = l
+			},
 		}
 	}
 </script>

pages_order/mine/contactRecord.vue

@@ -16,19 +16,25 @@
 			@click="clickTabs"></uv-tabs>
 		</view>
 		
+		<!-- 工人看到的 -->
+		<workList :api="api" ref="list" v-if="!role && type == 0"/>
+		<bossList :api="api" ref="list" v-if="!role && type == 1"/>
 		
-		<workList api="employeeQueryWatchWho" ref="workList" v-if="type == 0"/>
-		<bossList ref="bossList" v-if="type == 1"/>
+		<!-- 老板看到的 -->
+		<userList :api="api" ref="list" v-if="role"/>
 	</view>
 </template>
 
 <script>
 	import workList from '@/components/list/workList/index.vue'
 	import bossList from '@/components/list/bossList/index.vue'
+	import userList from '@/components/list/userList/index.vue'
+	import { mapState } from 'vuex'
 	export default {
 		components : {
 			bossList,
 			workList,
+			userList,
 		},
 		data() {
 			return {
@@ -41,13 +47,40 @@
 					},
 				],
 				type : 0,
+				api : ''
 			}
 		},
+		computed : {
+			...mapState([
+				'role', 
+			]),
+		},
+		onLoad() {
+			this.setApi()
+		},
+		onShow() {
+			this.$nextTick(() => {
+				this.$refs.list.getData()
+			})
+		},
+		onReachBottom() {
+			this.$refs.list.loadMoreData()
+		},
 		methods: {
 			clickTabs({index}) {
 				this.type = index
+				this.setApi()
+				this.$nextTick(() => {
+					this.$refs.list.getData()
+				})
+			},
+			setApi(){
+				if(this.role){
+					this.api = ['bossQueryWatchWho', 'bossQueryWatchMe'][this.type]
+				}else{
+					this.api = ['employeeQueryWatchWho', 'employeeQueryWatchMe'][this.type]
+				}
 			},
-			
 		}
 	}
 </script>

pages_order/mine/releaseWork.vue

@@ -3,6 +3,7 @@
 	<view class="page">
 		
 		<navbar title="我的找活" 
+		:title="role ? '我的招工' : '我的找活'"
 		bgColor="#3796F8" 
 		leftClick 
 		color="#fff"
@@ -13,7 +14,7 @@
 		<workListSwipe 
 		:options="options" 
 		@clickSwipeAction="clickSwipeAction"
-		:list="10"/>
+		:list="list"/>
 	</view>
 </template>
 
@@ -21,6 +22,7 @@
 	import workListSwipe from '@/components/list/workList/workListSwipe.vue'
 	import statisticsNumber from '../components/statistics/statisticsNumber.vue'
 	import mixinList from '@/mixins/list.js'
+	import { mapState } from 'vuex'
 	export default {
 		mixins : [mixinList],
 		components : {
@@ -43,8 +45,17 @@
 						}
 					}, 
 				],
+				mixinsListApi : 'employeeQueryResumeByUserId',
 			}
 		},
+		computed : {
+			...mapState([
+				'role', 
+			]),
+		},
+		onLoad() {
+			this.mixinsListApi = this.role ? 'bossQueryJobListByUserId' : 'employeeQueryResumeByUserId'
+		},
 		methods: {
 			clickSwipeAction({e, item}){
 				console.log(e, item);

pages_order/mine/seeMy.vue

@@ -1,7 +1,7 @@
 <template>
 	<!-- 谁看过我 -->
 	<view class="page">
-		<navbar title="谁看过我简历"
+		<navbar :title="role ? '谁看过我的招工' : '谁看过我的简历'"
 		bgColor="#3796F8" 
 		leftClick 
 		color="#fff"
@@ -9,17 +9,17 @@
 		
 		<statisticsNumber title="简历被查看量"/>
 		
-		<bossList ref="bossList" v-if="!role"/>
+		<bossList :api="mixinsListApi" ref="list" v-if="!role"/>
 	</view>
 </template>
 
 <script>
 	import bossList from '@/components/list/bossList/index.vue'
 	import statisticsNumber from '../components/statistics/statisticsNumber.vue'
-	import mixinList from '@/mixins/list.js'
+	// import mixinList from '@/mixins/list.js'
 	import { mapState } from 'vuex'
 	export default {
-		mixins : [mixinList],
+		// mixins : [mixinList],
 		components : {
 			statisticsNumber,
 			bossList
@@ -40,7 +40,7 @@
 						}
 					}, 
 				],
-				mixinsListApi : 'bossQueryWatchMe',
+				mixinsListApi : '',
 			}
 		},
 		computed : {
@@ -51,6 +51,14 @@
 		onLoad() {
 			this.mixinsListApi = (this.role ? 'boss' : 'employee') + 'QueryWatchMe'
 		},
+		onShow() {
+			this.$nextTick(() => {
+				this.$refs.list.getData()
+			})
+		},
+		onReachBottom() {
+			this.$refs.list.loadMoreData()
+		},
 		methods: {
 			clickSwipeAction({e, item}){
 				console.log(e, item);

pages_order/work/userDetail.vue

@@ -138,9 +138,13 @@
 		},
 		methods: {
 			getData(){
-				this.$api('bossQueryResumeById', {
+				let data = {
 					resumeId : this.id
-				}, res => {
+				}
+				if(uni.getStorageSync('token')){
+					data.token = uni.getStorageSync('token')
+				}
+				this.$api('bossQueryResumeById', data, res => {
 					if(res.code == 200){
 						this.detail = res.result
 					}

pages_order/work/workDetail.vue

@@ -121,9 +121,13 @@
 		},
 		methods: {
 			getData(){
-				this.$api('employeeQueryJobById', {
+				let data = {
 					jobId : this.id
-				}, res => {
+				}
+				if(uni.getStorageSync('token')){
+					data.token = uni.getStorageSync('token')
+				}
+				this.$api('employeeQueryJobById', data, res => {
 					if(res.code == 200){
 						this.detail = res.result
 					}

store/store.js

@@ -14,6 +14,7 @@ const store = new Vuex.Store({
 		userInfo : {}, //用户信息
 		banner : [],//轮播图
 		jobTypeList : [],//工种
+		natureList : [],//工作性质
 		addressList : [],//开放地址
 	},
 	getters: {
@@ -113,6 +114,18 @@ const store = new Vuex.Store({
 				state.banner = res.result.records
 			})
 		},
+		// 获取工作性质列表
+		getNatureList(state){
+			api('commonQueryJobNatureList', {
+				pageNo : 1,
+				pageSize : 99999,
+			}, res => {
+				if(res.code != 200){
+					return
+				}
+				state.natureList = res.result.records
+			})
+		},
 		logout(state){
 			uni.showModal({
 				title: '确认退出登录吗',