上传修改

api/api.js

@@ -121,7 +121,7 @@ const config = {
 		url: '/api/common/queryBill',
 		method: 'GET',
 	},
-	//项目列表
+	//记工记账项目列表
 	commonQueryNotebookList: {
 		url: '/api/common/queryNotebookList',
 		method: 'GET',
@@ -136,6 +136,11 @@ const config = {
 		url: '/api/common/queryScoreRecord',
 		method: 'GET',
 	},
+	//我的服务-获取VIP配置信息
+	commonQueryVipType: {
+		url: '/api/common/queryVipType',
+		method: 'GET',
+	},
 	
 	/**
 	 * 求职者的接口

components/list/bossList/bossItem.vue

@@ -6,7 +6,7 @@
 			</view>
 			<view class="info">
 				<view class="name">
-					李老板
+					{{ item.hanHaiMember.nickName }}
 					<view>
 						企业HR
 					</view>
@@ -20,13 +20,26 @@
 			</view>
 		</view>
 		<view class="item"
-		v-for="(item, index) in 2">
+		v-for="(t, index) in item.employJobList">
 			<view class="top">
 				<view class="title">
-					产品经理
+					{{ t.title }}
 				</view>
-				<view class="price">
-					12-18K
+				<view class="price"
+				v-if="t.salaryLow > 1000">
+					<text>
+						{{ (t.salaryLow / 1000).toFixed(0) }}
+					</text>
+					<text
+					v-if="t.salaryUp">
+						-{{ (t.salaryUp / 1000).toFixed(0) }}
+					</text>
+					K
+				</view>
+				<view class="price" v-else>
+					<text>{{ t.salaryLow }}</text>
+					<text
+					v-if="t.salaryUp">-{{ t.salaryUp }}</text>
 				</view>
 			</view>
 			<view class="bottom">
@@ -46,6 +59,7 @@
 
 <script>
 	export default {
+		props : ['item'],
 		data() {
 			return {
 				
@@ -86,7 +100,6 @@
 			font-size: 28rpx;
 	
 			.name {
-				font-size: 32rpx;
 				display: flex;
 				padding-bottom: 10rpx;
 				

components/list/bossList/index.vue

@@ -7,7 +7,7 @@
 			<view
 				@click="$utils.navigateTo('/pages_order/boss/bossDetail?id=' + 123)"
 				:key="index"
-				v-for="(item, index) in 10">
+				v-for="(item, index) in list">
 				<bossItem :item="item"/>
 			</view>
 		</view>
@@ -27,9 +27,6 @@
 			api : {
 				default : ''
 			},
-			list : {
-				default : []
-			}
 		},
 		data() {
 			return {
@@ -38,7 +35,7 @@
 					pageSize: 10,
 				},
 				total : 0,
-				list2 : 10,
+				list : [],
 			}
 		},
 		methods: {
@@ -49,8 +46,8 @@
 				
 				this.$api(this.api, this.queryParams, res => {
 					if(res.code == 200){
-						this.list2 = res.result.records
-						this.total = res.result.total
+						this.list = res.result.records || res.result
+						this.total = res.result.total || res.result.length
 					}
 				})
 			},

components/list/userList/index.vue

@@ -26,6 +26,9 @@
 			},
 			api : {
 				default : 'bossQueryJobList'
+			},
+			handleData : {
+				
 			}
 		},
 		data() {
@@ -46,8 +49,9 @@
 				
 				this.$api(this.api, this.queryParams, res => {
 					if(res.code == 200){
-						this.list = res.result.records
-						this.total = res.result.total
+						this.list = res.result.records || res.result
+						this.total = res.result.total || res.result.length
+						this.handleData && this.handleData(this)
 					}
 				})
 			},

components/list/userList/userListSwipe.vue

@@ -0,0 +1,57 @@
+<template>
+	<uv-swipe-action>
+		<view
+		v-for="(item, index) in list"
+		class="item"
+		:key="index"
+		>
+			<uv-swipe-action-item 
+			@click="e => clickSwipeAction(e, item)"
+			:options="options">
+				<userItem :item="item"/>
+			</uv-swipe-action-item>
+		</view>
+	</uv-swipe-action>
+</template>
+
+<script>
+	import userItem from './userItem.vue'
+	export default {
+		components : {
+			userItem
+		},
+		props : {
+			options : {
+				default : [
+					{
+						text: '删除',
+						style: {
+							backgroundColor: '#FA5A0A'
+						}
+					}, 
+				],
+			},
+			list : {
+				default : []
+			},
+		},
+		data() {
+			return {
+				
+			}
+		},
+		methods: {
+			clickSwipeAction(e, item){
+				this.$emit('clickSwipeAction', {e, item})
+			},
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+	.item{
+		margin: 20rpx;
+		border-radius: 20rpx;
+		overflow: hidden;
+	}
+</style>

components/list/workList/index.vue

@@ -46,8 +46,8 @@
 				
 				this.$api(this.api, this.queryParams, res => {
 					if(res.code == 200){
-						this.list = res.result.records
-						this.total = res.result.total
+						this.list = res.result.records || res.result
+						this.total = res.result.total || res.result.length
 					}
 				})
 			},

components/screen/screenWork.vue

@@ -161,7 +161,7 @@
 			currentDropItem() {
 				return this[this.activeName];
 			},
-			...mapState(['jobTypeList', 'natureList']),
+			...mapState(['jobTypeList', 'natureList', 'addressList']),
 		},
 		mounted() {
 			// 工种
@@ -181,6 +181,14 @@
 				})
 			})
 			this.list[1].tag = this.nature.child
+			
+			// 地址
+			this.addressList.forEach(n => {
+				this.area.child.push({
+					label: n.adress,
+					value: n.id,
+				})
+			})
 		},
 		methods: {
 			clickTag(item, i){

config.js

@@ -7,7 +7,7 @@ import uvUI from '@/uni_modules/uv-ui-tools'
 Vue.use(uvUI);
 
 // 当前环境
-const type = 'dev'
+const type = 'prod'
 
 
 // 环境配置

pages/index/index.vue

@@ -112,8 +112,9 @@
 			this.$refs.workList.loadMoreData()
 		},
 		methods: {
-			clickItem(){
-				
+			clickItem(result){
+				console.log(result);
+				this.$refs.workList.getData(result)
 			},
 			toAdd(){
 				if(this.role){

pages_order/components/user/userHead.vue

@@ -12,7 +12,8 @@
 			</view>
 		</view>
 		<view class="right">
-			<view class="phone">
+			<view class="phone"
+			@click="callPhone">
 				<image src="/static/image/home/phone.png" mode=""></image>
 				{{ phone }}
 			</view>
@@ -34,6 +35,9 @@
 			},
 			image : {
 				default : '/static/image/center/headImage.png'
+			},
+			phoneCall : {
+				
 			}
 		},
 		data() {
@@ -42,7 +46,17 @@
 			}
 		},
 		methods: {
-
+			callPhone(){
+				uni.makePhoneCall({
+					phoneNumber: this.phoneCall,
+					success() {
+						console.log('安卓拨打成功');
+					},
+					fail() {
+						console.log('安卓拨打失败');
+					}
+				})
+			},
 		}
 	}
 </script>

pages_order/mine/IntegralRecord.vue

@@ -7,15 +7,15 @@
 			<view class="number">
 				当前积分
 				<view>
-					{{ formal.score + temporarily.score }}
+					{{ formal.currentScore }}
 				</view>
 			</view>
 			<view class="bottom">
 				<view>
-					正式积分：{{ formal.score }}
+					正式积分：{{ formal.formalScore }}
 				</view>
 				<view>
-					临时积分：{{ temporarily.score }}
+					临时积分：{{ formal.tempScore }}
 				</view>
 			</view>
 		</view>
@@ -65,14 +65,8 @@
 				],
 				type : 0,
 				mixinsListApi : 'commonQueryScoreRecord',
-				// 正式积分
-				formal : {
-					score : 0
-				},
-				// 临时积分
-				temporarily : {
-					score : 0
-				},
+				// 积分
+				formal : {},
 			}
 		},
 		onLoad(e) {
@@ -92,16 +86,11 @@
 				this.getData()
 			},
 			getCounst(){
-				this.$api('commonQueryScore', {type : 0}, res => {
+				this.$api('commonQueryScore', 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/MemberRecharge.vue

@@ -23,33 +23,37 @@
 		<view class="openvip">开通VIP</view>
 
 		<view class="options">
-			<view class="option" v-for="(item,index) in 3" :key="index">
-				<view style="font-weight: 600;">普通VIP会员</view>
+			<view 
+			@click="vipId = item.id"
+			:class="{option : true, act : vipId == item.id}" 
+			v-for="(item,index) in list" :key="index">
+				<view style="font-weight: 600;">{{ item.name }}</view>
 				<view style="color: #FF2E2E;">
 					<text style="font-size: 20rpx;">￥</text>
-					<text style="font-size: 36rpx;">8</text>
+					<text style="font-size: 36rpx;">{{ item.price }}</text>
 				</view>
-				<view>包年</view>
+				<view>{{ item.remark }}</view>
 			</view>
 		</view>
 
-		<view class="block">
-			<view class="privilege">普通专属特权</view>
+		<view class="block" v-if="vip.id">
+			<view class="privilege">{{ vip.name }}</view>
 			<view class="cells">
-				<view class="cell">
+				<view class="cell" 
+				v-for="(item, index) in vip.keys">
 					<image src="../static/mine/characteristic.png" mode="aspectFill" />
 					<view class="text">
-						<view>特权一</view>
-						<view style="font-size: 24rpx;">该特权每天可免费查看2个号码。</view>
+						<view>{{ item[0] }}</view>
+						<view style="font-size: 24rpx;">该{{ item[1] }}</view>
 					</view>
 				</view>
-				<view class="cell">
+				<!-- <view class="cell">
 					<image src="../static/mine/integral.png" mode="aspectFill" />
 					<view class="text">
 						<view>特权二</view>
 						<view style="font-size: 24rpx;">快速发布，优先审核</view>
 					</view>
-				</view>
+				</view> -->
 			</view>
 			<view class="tail">
 				<view>
@@ -65,7 +69,7 @@
 		<view class="confirm">
 			<view class="box">
 				<view>
-					总计金额：￥8
+					总计金额：￥{{ vip.price }}
 				</view>
 				<view>
 					确认协议并支付
@@ -78,20 +82,50 @@
 </template>
 
 <script>
+	import mixinList from '@/mixins/list.js'
+	import { mapState } from 'vuex'
 	export default {
+		mixins : [mixinList],
 		data() {
 			return {
-				radiovalue: false
+				radiovalue: false,
+				mixinsListApi : 'commonQueryVipType',
+				vipId : ''
 			}
 		},
 		computed: {
 			headImage() {
 				return '/static/image/center/headImage.png'
 			},
-
+			...mapState([
+				'role', 
+			]),
+			vip(){
+				let vip = {}
+				this.list.forEach(n => {
+					if(n.id == this.vipId){
+						
+						let keys = n.perquisite.split('##')
+						
+						keys.forEach((s, i) => {
+							keys[i] = s.split('$$')
+						})
+						
+						n.keys = keys
+						
+						vip = n
+					}
+				})
+				return vip
+			},
 		},
 		methods: {
-
+			submit(){
+				
+			},
+			getDataThen(list){
+				this.vipId = list[0] && list[0].id
+			},
 		},
 	}
 </script>
@@ -157,8 +191,7 @@
 
 		.options {
 			display: flex;
-			justify-content: space-around;
-
+			flex-wrap: wrap;
 			.option {
 				display: flex;
 				justify-content: center;
@@ -168,12 +201,17 @@
 				width: 220rpx;
 				height: 240rpx;
 				border-radius: 16rpx;
-
+				box-sizing: border-box;
+				margin: 12rpx;
 				view {
 					margin-top: 15rpx;
 					font-size: 28rpx;
 				}
 			}
+			.act{
+				border: 4rpx solid $uni-color;
+				box-shadow: 0 0 10rpx 10rpx rgba($uni-color, 0.2);
+			}
 		}
 
 		.block {
@@ -188,13 +226,11 @@
 			.cells {
 				display: flex;
 				flex-direction: column;
-				justify-content: space-between;
-				height: 170rpx;
 
 				.cell {
 					display: flex;
 					align-items: center;
-
+					margin: 20rpx 0;
 					.text {
 						margin-left: 20rpx;
 						color: #707070;

pages_order/mine/collect.vue

@@ -7,8 +7,15 @@
 		color="#fff"
 		@leftClick="$utils.navigateBack"/>
 		
+		<userListSwipe 
+		:options="options" 
+		v-if="role"
+		@clickSwipeAction="clickSwipeAction"
+		:list="list2"/>
+		
 		<workListSwipe 
 		:options="options" 
+		v-else
 		@clickSwipeAction="clickSwipeAction"
 		:list="list2"/>
 	</view>
@@ -16,12 +23,14 @@
 
 <script>
 	import workListSwipe from '@/components/list/workList/workListSwipe.vue'
+	import userListSwipe from '@/components/list/userList/userListSwipe.vue'
 	import mixinList from '@/mixins/list.js'
 	import { mapState } from 'vuex'
 	export default {
 		mixins : [mixinList],
 		components : {
-			workListSwipe
+			workListSwipe,
+			userListSwipe,
 		},
 		data() {
 			return {
@@ -52,8 +61,13 @@
 			getDataThen(list, total, result){
 				let l = []
 				result.forEach(res => {
-					res.employJob.employCollectionJob = res.employCollectionJob
-					l.push(res.employJob)
+					if(this.role){
+						res.employResume.collection = res.employCollectionResume
+						l.push(res.employResume)
+					}else{
+						res.employJob.collection = res.employCollectionJob
+						l.push(res.employJob)
+					}
 				})
 				this.list2 = l
 			},

pages_order/mine/contract.vue

@@ -21,7 +21,8 @@
 				<image src="../static/contract/contract.png" alt="" />
 				<view class="itemList">
 					<view class="projectName">
-						xxxx电子合同
+						<!-- xxxx电子合同 -->
+						{{ item.title }}
 					</view>
 					<view class="buyer">
 						<!-- 甲方：湖南瀚海科技有限公司 -->

pages_order/mine/releaseWork.vue

@@ -9,16 +9,24 @@
 		color="#fff"
 		@leftClick="$utils.navigateBack"/>
 		
-		<statisticsNumber/>
+		<statisticsNumber :title="role ? '您当前的招工' : '您当前的找活'" :num="total"/>
 		
 		<workListSwipe 
 		:options="options" 
+		v-if="role"
+		@clickSwipeAction="clickSwipeAction"
+		:list="list"/>
+		
+		<userListSwipe 
+		:options="options" 
+		v-else
 		@clickSwipeAction="clickSwipeAction"
 		:list="list"/>
 	</view>
 </template>
 
 <script>
+	import userListSwipe from '@/components/list/userList/userListSwipe.vue'
 	import workListSwipe from '@/components/list/workList/workListSwipe.vue'
 	import statisticsNumber from '../components/statistics/statisticsNumber.vue'
 	import mixinList from '@/mixins/list.js'
@@ -26,8 +34,9 @@
 	export default {
 		mixins : [mixinList],
 		components : {
-			workListSwipe,
-			statisticsNumber
+			userListSwipe,
+			statisticsNumber,
+			workListSwipe
 		},
 		data() {
 			return {

pages_order/mine/seeMy.vue

@@ -7,14 +7,20 @@
 		color="#fff"
 		@leftClick="$utils.navigateBack"/>
 		
-		<statisticsNumber title="简历被查看量"/>
+		<!-- <statisticsNumber title="简历被查看量" /> -->
+		<statisticsNumber :title="role ? '招工被查看量' : '简历被查看量'" :num="total"/>
+		
+		<userList :api="mixinsListApi" ref="list" v-if="role"/>
+		
+		<bossList :api="mixinsListApi" ref="list" v-else/>
+		
 		
-		<bossList :api="mixinsListApi" ref="list" v-if="!role"/>
 	</view>
 </template>
 
 <script>
 	import bossList from '@/components/list/bossList/index.vue'
+	import userList from '@/components/list/userList/index.vue'
 	import statisticsNumber from '../components/statistics/statisticsNumber.vue'
 	// import mixinList from '@/mixins/list.js'
 	import { mapState } from 'vuex'
@@ -22,7 +28,8 @@
 		// mixins : [mixinList],
 		components : {
 			statisticsNumber,
-			bossList
+			bossList,
+			userList,
 		},
 		data() {
 			return {
@@ -41,6 +48,7 @@
 					}, 
 				],
 				mixinsListApi : '',
+				total : 0,
 			}
 		},
 		computed : {

pages_order/work/userDetail.vue

@@ -127,6 +127,7 @@
 				text : '',
 				id : 0,
 				detail : {},
+				collectionFlag : false,
 			}
 		},
 		onLoad({id}) {
@@ -146,7 +147,8 @@
 				}
 				this.$api('bossQueryResumeById', data, res => {
 					if(res.code == 200){
-						this.detail = res.result
+						this.detail = res.result.employResume
+						this.collectionFlag = res.result.collectionFlag
 					}
 				})
 			},

pages_order/work/workDetail.vue

@@ -31,7 +31,8 @@
 			</view>
 			
 			<view class="userHead">
-				<userHead/>
+				<userHead :headImage="detail.headImage"
+				:name="detail.name" :phoneCall="detail.phone"/>
 			</view>
 			
 			<view class="address">
@@ -110,6 +111,7 @@
 				text : '',
 				id : 0,
 				detail : {},
+				collectionFlag : false,
 			}
 		},
 		onLoad({id}) {
@@ -129,7 +131,8 @@
 				}
 				this.$api('employeeQueryJobById', data, res => {
 					if(res.code == 200){
-						this.detail = res.result
+						this.detail = res.result.employJob
+						this.collectionFlag = res.result.collectionFlag
 					}
 				})
 			},

store/store.js

@@ -10,7 +10,7 @@ const store = new Vuex.Store({
 	state: {
 		configList: [], //配置列表
 		// 角色 true为老板 false为工人
-		role : false,
+		role : true,
 		userInfo : {}, //用户信息
 		banner : [],//轮播图
 		jobTypeList : [],//工种
@@ -60,13 +60,13 @@ const store = new Vuex.Store({
 						state.userInfo = res.result.userInfo
 						uni.setStorageSync('token', res.result.token)
 						
-						if(!state.userInfo.nickName || !state.userInfo.headImage){
-							uni.navigateTo({
-								url: '/pages_order/auth/wxUserInfo'
-							})
-						}else{
+						// if(!state.userInfo.nickName || !state.userInfo.headImage){
+						// 	uni.navigateTo({
+						// 		url: '/pages_order/auth/wxUserInfo'
+						// 	})
+						// }else{
 							uni.navigateBack(-1)
-						}
+						// }
 					})
 				}
 			})