diff --git a/api/api.js b/api/api.js
index 0e496fe..02a5510 100644
--- a/api/api.js
+++ b/api/api.js
@@ -58,6 +58,16 @@ const config = {
 	 */
 	
 	
+	//获取工作信息列表
+	employeeQueryJobList: {
+		url: '/api/employee/queryJobList',
+		method: 'GET',
+	},
+	//根据Id查看工作详情
+	employeeQueryJobById: {
+		url: '/api/employee/queryJobById',
+		method: 'GET',
+	},
 	
 	/**
 	 * boss的接口
diff --git a/components/base/tabbar.vue b/components/base/tabbar.vue
index 417a4e7..27176a9 100644
--- a/components/base/tabbar.vue
+++ b/components/base/tabbar.vue
@@ -64,7 +64,7 @@
 				if(index == this.select){
 					return
 				}
-				uni.redirectTo({
+				uni.reLaunch({
 					url: item.pagePath
 				})
 			},
diff --git a/components/list/workList/index.vue b/components/list/workList/index.vue
index c23211b..f8b9311 100644
--- a/components/list/workList/index.vue
+++ b/components/list/workList/index.vue
@@ -5,7 +5,7 @@
 	@scrolltolower="loadMoreData">
 		<view class="workList">
 			<view
-				@click="$utils.navigateTo('/pages_order/work/workDetail?id=' + 123)"
+				@click="$utils.navigateTo('/pages_order/work/workDetail?id=' + item.id)"
 				:key="index"
 				v-for="(item, index) in list">
 				<workItem :item="item"/>
@@ -25,7 +25,7 @@
 				default : 'auto'
 			},
 			api : {
-				default : ''
+				default : 'employeeQueryJobList'
 			}
 		},
 		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()
 				}
 			},
 		}
diff --git a/components/list/workList/workItem.vue b/components/list/workList/workItem.vue
index 7024b1a..1a556cb 100644
--- a/components/list/workList/workItem.vue
+++ b/components/list/workList/workItem.vue
@@ -2,25 +2,40 @@
 	<view class="work-item">
 		<view class="top">
 			<view class="title">
-				产品经理
+				{{ item.title }}
 			</view>
-			<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 class="tag-list">
 			<view 
-			v-for="(item, index) in 5"
-			:key="index">
-				包吃
+			v-for="(t, i) in item.tab.split('、')"
+			:key="i">
+				{{ t }}
 			</view>
 		</view>
 		<view class="bottom">
 			<view class="address">
-				2.5km | 楚河汉区
+				<!-- <text>2.5km | 楚河汉区</text> -->
+				{{ item.workAddress }}
 			</view>
 			<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>
@@ -32,6 +47,11 @@
 
 <script>
 	export default {
+		props : {
+			item : {
+				default : {}
+			}
+		},
 		data() {
 			return {
 				
diff --git a/config.js b/config.js
index bc0bb92..87741f8 100644
--- a/config.js
+++ b/config.js
@@ -13,10 +13,10 @@ const type = 'dev'
 // 环境配置
 const config = {
 	dev : {
-		baseUrl : 'http://www.gcosc.fun:82',
+		baseUrl : 'https://employadmin.augcl.com/employ-api',
 	},
 	prod : {
-		baseUrl : 'http://xxx.xxx.xxx/xxx',
+		baseUrl : 'https://employadmin.augcl.com/employ-api',
 	}
 }
 
diff --git a/pages/index/index.vue b/pages/index/index.vue
index b575bd0..f35c5f3 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -117,17 +117,20 @@
 		// 	this.$refs.videoList.queryVideoList()
 		// 	this.queryBannerList()
 		// },
-		// onShow() {
-		// 	this.$refs.videoList.queryVideoList()
-		// 	this.queryBannerList()
-		// },
-		// //滚动到屏幕底部
-		// onReachBottom() {
-		// 	this.$refs.videoList.loadMoreData()
-		// },
+		onShow() {
+			this.$refs.workList.getData()()
+			this.queryBannerList()
+		},
+		//滚动到屏幕底部
+		onReachBottom() {
+			this.$refs.workList.loadMoreData()
+		},
 		methods: {
 			clickItem(){
 				
+			},
+			queryBannerList(){
+				
 			},
 		}
 	}
diff --git a/pages_order/work/workDetail.vue b/pages_order/work/workDetail.vue
index be5d7c9..823d441 100644
--- a/pages_order/work/workDetail.vue
+++ b/pages_order/work/workDetail.vue
@@ -4,30 +4,30 @@
 		
 		<view class="box">
 			<view class="title">
-				平面设计
+				{{ detail.title }}
 			</view>
 			
 			<view class="price">
-				6000-11000元
+				{{ detail.salaryLow }}-{{ detail.salaryUp }}元
 			</view>
 		
 			<view class="line">
-				<view>
+				<!-- <view>
 					<image src="../static/work/address.png" mode=""></image>
-					深圳·罗湖区·东门
-				</view>
+					{{ detail.workAge }}
+				</view> -->
 				<view>
 					<image src="../static/work/g.png" mode=""></image>
-					1-3年
+					{{ detail.workAge }}
 				</view>
 				<view>
 					<image src="../static/work/x.png" mode=""></image>
-					大专
+					{{ detail.qulification }}
 				</view>
 			</view>
 			
 			<view class="line">
-				该职位位于昨日新发布
+				该职位位于{{ $dayjs(detail.createTime).format('YYYY-MM-DD') }}
 			</view>
 			
 			<view class="userHead">
@@ -38,8 +38,12 @@
 				<view class="title2">
 					工作地址
 				</view>
-				<view class="line">
+				<!-- 
 					深圳罗湖区深圳市百货广场大厦罗湖区百货广场大厦东深圳罗湖区深圳市百货广场大厦罗湖区百货广场大厦东
+					-->
+				<view class="line"
+				style="justify-content: space-between;">
+					{{ detail.workAddress }}
 					<uv-icon 
 					size="30rpx"
 					color="666"
@@ -62,27 +66,25 @@
 						<uv-icon
 						size="30rpx"
 						color="666"
-						name="arrow-right"
+						name="star"
 						></uv-icon>
 						收藏
 					</view>
 				</view>
 				
 				<view class="tag-list">
-					<view>
-						不接受居家办公
-					</view>
-					<view>
-						不接受居家办公
-					</view>
-					<view>
-						不接受居家办公
+					<view v-for="(t, i) in detail.tab.split('、')">
+						{{ t }}
 					</view>
 				</view>
 				
-				<view 
+				<!-- <view 
 				class="text" 
 				v-html="text">
+				</view> -->
+				<view 
+				class="text">
+					<uv-parse :content="detail.workDetail"></uv-parse>
 				</view>
 			</view>
 			
@@ -106,13 +108,27 @@
 		data() {
 			return {
 				text : '',
+				id : 0,
+				detail : {},
 			}
 		},
+		onLoad({id}) {
+			this.id = id
+		},
 		onShow() {
 			this.text = this.$utils.stringFormatHtml(text)
+			this.getData()
 		},
 		methods: {
-			
+			getData(){
+				this.$api('employeeQueryJobById', {
+					jobId : this.id
+				}, res => {
+					if(res.code == 200){
+						this.detail = res.result
+					}
+				})
+			},
 		}
 	}
 </script>