上传修改

components/config/configPopup.vue

@@ -40,6 +40,9 @@
 	.configPopup {
 		.content{
 			padding: 30rpx 20rpx;
+			overflow: scroll;
+			height: 100%;
+			box-sizing: border-box;
 		}
 	}
 </style>

components/list/bossList/bossItem.vue

@@ -2,11 +2,11 @@
 	<view class="boss-item">
 		<view class="head">
 			<view class="headImage">
-				<image src="/static/image/center/headImage.png" mode=""></image>
+				<image :src="item.headImage" mode=""></image>
 			</view>
 			<view class="info">
 				<view class="name">
-					{{ item.hanHaiMember.nickName }}
+					{{ item.nickName }}
 					<view>
 						企业HR
 					</view>

components/list/userList/index.vue

@@ -8,7 +8,7 @@
 				@click="$utils.navigateTo('/pages_order/work/userDetail?id=' + item.id)"
 				:key="index"
 				v-for="(item, index) in list">
-				<userItem :item="item"/>
+				<userItem :item="keyName ? item[keyName] : item"/>
 			</view>
 		</view>
 	</scroll-view>
@@ -27,9 +27,8 @@
 			api : {
 				default : 'bossQueryJobList'
 			},
-			handleData : {
-				
-			}
+			handleData : {},
+			keyName : {}
 		},
 		data() {
 			return {

components/list/userList/userListSwipe.vue

@@ -8,7 +8,7 @@
 			<uv-swipe-action-item 
 			@click="e => clickSwipeAction(e, item)"
 			:options="options">
-				<userItem :item="item"/>
+				<userItem :item="keyName ? item[keyName] : item"/>
 			</uv-swipe-action-item>
 		</view>
 	</uv-swipe-action>
@@ -34,6 +34,7 @@
 			list : {
 				default : []
 			},
+			keyName : {}
 		},
 		data() {
 			return {

components/list/workList/index.vue

@@ -8,7 +8,7 @@
 				@click="$utils.navigateTo('/pages_order/work/workDetail?id=' + item.id)"
 				:key="index"
 				v-for="(item, index) in list">
-				<workItem :item="item"/>
+				<workItem :item="keyName ? item[keyName] : item"/>
 			</view>
 		</view>
 	</scroll-view>
@@ -26,7 +26,8 @@
 			},
 			api : {
 				default : 'employeeQueryJobList'
-			}
+			},
+			keyName : {}
 		},
 		data() {
 			return {
@@ -46,8 +47,8 @@
 				
 				this.$api(this.api, this.queryParams, res => {
 					if(res.code == 200){
-						this.list = res.result.records || res.result
-						this.total = res.result.total || res.result.length
+						this.list = res.result.records
+						this.total = res.result.total
 					}
 				})
 			},

components/list/workList/workListSwipe.vue

@@ -8,7 +8,7 @@
 			<uv-swipe-action-item 
 			@click="e => clickSwipeAction(e, item)"
 			:options="options">
-				<workItem :item="item"/>
+				<workItem :item="keyName ? item[keyName] : item"/>
 			</uv-swipe-action-item>
 		</view>
 	</uv-swipe-action>
@@ -34,6 +34,7 @@
 			list : {
 				default : []
 			},
+			keyName : {}
 		},
 		data() {
 			return {

pages/index/center.vue

@@ -55,18 +55,18 @@
 						30000
 					</view>
 					<view class="">
-						正式积分
+						我的积分
 					</view>
 				</view>
 				
-				<view class="item">
+				<!-- <view class="item">
 					<view class="">
 						30000
 					</view>
 					<view class="">
 						临时积分
 					</view>
-				</view>
+				</view> -->
 				
 				<view class="item"
 				@click="$utils.navigateTo('/pages_order/mine/collect')">

pages_order/mine/collect.vue

@@ -11,13 +11,14 @@
 		:options="options" 
 		v-if="role"
 		@clickSwipeAction="clickSwipeAction"
-		:list="list2"/>
+		:list="list"/>
 		
 		<workListSwipe 
 		:options="options" 
 		v-else
+		keyName="employJob"
 		@clickSwipeAction="clickSwipeAction"
-		:list="list2"/>
+		:list="list"/>
 	</view>
 </template>
 
@@ -58,19 +59,19 @@
 			clickSwipeAction({e, item}){
 				console.log(e, item);
 			},
-			getDataThen(list, total, result){
-				let l = []
-				result.forEach(res => {
-					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
-			},
+			// getDataThen(list, total, result){
+			// 	let l = []
+			// 	result.forEach(res => {
+			// 		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
+			// },
 		}
 	}
 </script>

pages_order/mine/contactRecord.vue

@@ -17,11 +17,26 @@
 		</view>
 		
 		<!-- 工人看到的 -->
-		<workList :api="api" ref="list" v-if="!role && type == 0"/>
-		<bossList :api="api" ref="list" v-if="!role && type == 1"/>
+		<workList 
+		:api="api" 
+		ref="list" 
+		keyName="employJob"
+		v-if="!role && type == 0"
+		/>
+		
+		<bossList 
+		:api="api" 
+		ref="list" 
+		v-if="!role && type == 1"/>
+		
+		
 		
 		<!-- 老板看到的 -->
-		<userList :api="api" ref="list" v-if="role"/>
+		<userList 
+		:api="api" 
+		ref="list" 
+		keyName="employResume"
+		v-if="role"/>
 	</view>
 </template>
 

store/store.js

@@ -10,7 +10,7 @@ const store = new Vuex.Store({
 	state: {
 		configList: [], //配置列表
 		// 角色 true为老板 false为工人
-		role : true,
+		role : false,
 		userInfo : {}, //用户信息
 		banner : [],//轮播图
 		jobTypeList : [],//工种