diff --git a/common/api.js b/common/api.js
index 36bec20..cf620e4 100644
--- a/common/api.js
+++ b/common/api.js
@@ -63,3 +63,5 @@ export const getSysText = (params) => http.post('/employ-api/index/getSysText',
 export const bindPhone = (params) => http.post('/employ-api/user/bindPhone', params)
 // 修改头像和昵称，传nickName和headimgurl
 export const updateUserInfo = (params) => http.post('/employ-api/user/updateUserInfo', params)
+// 公告详情
+export const getNotice = (params) => http.get('/employ-api/index/getNotice', {params:params})
\ No newline at end of file
diff --git a/pages.json b/pages.json
index 15d658a..c4458d4 100644
--- a/pages.json
+++ b/pages.json
@@ -211,6 +211,15 @@
 						"navigationBarBackgroundColor": "#FF7A31",
 						"navigationBarTextStyle": "white"
 					}
+				},
+				{
+					"path": "category/index",
+					"style": {
+						"navigationBarTitleText": "分类",
+						"navigationStyle":"default",
+						"navigationBarBackgroundColor": "#FF7A31",
+						"navigationBarTextStyle": "white"
+					}
 				}
 			]
 		}
diff --git a/pages/home/index.vue b/pages/home/index.vue
index 8adcb11..5e2e35b 100644
--- a/pages/home/index.vue
+++ b/pages/home/index.vue
@@ -25,7 +25,7 @@
 			</view>
 		</view>
 		<view class="se-my-20 se-bgc-white se-grid">
-			<navigator :url="`/pages_subpack/category/index`+item.id" v-for="(item, index) in tabList" :key="index" class="se-flex-v-c se-pt-30 se-mb-20">
+			<navigator :url="`/pages_subpack/category/index?id=`+item.id" v-for="(item, index) in tabList" :key="index" class="se-flex-v-c se-pt-30 se-mb-20">
 				<image class="se-a-100 se-br-20 se-bgc-f5" :src="item.icon" mode=""></image>
 				<text class="se-w-150 se-h-60 se-lh-30 se-c-black se-fs-22 se-ta-c se-mt-10 se-toe-2">{{item.name}}</text>
 			</navigator>
@@ -71,7 +71,8 @@
 		taskList,
 		rolelist,
 		industryList,
-		getSysText
+		getSysText,
+		getNotice
 	} from "@/common/api.js"
 	import enterpriseBox from "./component/enterprise.vue"
 	import masterBox from "./component/master.vue"
@@ -116,6 +117,7 @@
 			this.onIndustryList()
 			this.getLocation()
 			this.onSysText()
+			this.onNotice()
 		},
 		onPullDownRefresh() {
 			let that = this
@@ -129,6 +131,15 @@
 			that.onRolelist()
 		},
 		methods:{
+			onNotice(){
+				// let that = this
+				// let params={}
+				// getNotice(params).then(response=>{
+				// 	console.info(response)
+				// }).catch(error=>{
+					
+				// })
+			},
 			onSysText(){
 				let that = this
 				let params={}
@@ -147,6 +158,8 @@
 						console.log('位置',res);
 						console.log('当前位置的经度：' + res.longitude);
 						console.log('当前位置的纬度：' + res.latitude);
+						uni.setStorageSync("longitude",res.longitude)
+						uni.setStorageSync("latitude",res.latitude)
 						const qqmapsdk = new QQMapWX({
 						    key: 'TT7BZ-Z3LW4-KOAUB-KWHOA-SBJJ6-Y5B6R' // 必填
 						});
diff --git a/pages/order/component/enterprise.vue b/pages/order/component/enterprise.vue
index 6734c2a..c030e23 100644
--- a/pages/order/component/enterprise.vue
+++ b/pages/order/component/enterprise.vue
@@ -19,34 +19,35 @@
 		<view class="se-p-40">
 			<view class="se-px-40 se-mb-30 se-py-30 se-bgc-white se-br-40 se-bs-b" v-for="(items,indexs) in list" :key="indexs">
 				<view class="se-flex se-flex-h-sb se-fw-6 se-fs-32 se-pb-20">
-					<view class="se-flex">
-						<text>工装石膏板搬运</text>
+					<view class="se-flex" @click="onOrderDetail(items)">
+						<text>{{items.companyName}}</text>
 						<u-icon name="arrow-right"></u-icon>
 					</view>
 					<view class="se-c-red">
 						已完成
 					</view>
 				</view>
-				<view class="se-flex">
+				<view class="se-flex" @click="onOrderDetail(items)">
 					<view class="se-w-160 se-h-160">
-						<image class="se-w-160 se-h-160 se-br-10" src="https://cdn.uviewui.com/uview/album/1.jpg" mode=""></image>
+						<image class="se-w-160 se-h-160 se-br-10" :src="items.workPic" mode=""></image>
 					</view>
 					<view class="se-ml-20 se-flex se-flex-v-sa se-flex-ai-fs">
-						<view class="se-fw-6 se-c-black se-fs-30 se-display-ib">泰山工装石膏板搬运</view>
-						<view class="se-fs-24 se-c-text-third se-display-ib">所属行业:水泥搬运</view>
-						<view class="se-fs-24 se-c-text-third se-display-ib">所属工种:中午搬运</view>
+						<view class="se-fw-6 se-c-black se-fs-30 se-display-ib">{{items.title}}</view>
+						<view class="se-fs-24 se-c-text-third se-display-ib">所属行业:{{items.industryName}}</view>
+						<view class="se-fs-24 se-c-text-third se-display-ib">工作时间:{{items.workTime}}</view>
 					</view>
 				</view>
 				<view class="se-flex se-flex-h-sb se-w-p-100 se-pt-20">
 					<view class="se-fs-24 se-display-ib">
 						<text class="se-c-black">总价格：</text>
-						<text class="se-c-orange se-fs-30 se-fw-6"><text class="se-fs-24">￥</text>6000</text>
+						<text class="se-c-orange se-fs-30 se-fw-6"><text class="se-fs-24">￥</text>{{items.amount}}</text>
 					</view>
-					<view class="se-display-ib se-px-20 se-br-40 se-flex-h-c se-h-50 se-lh-50 se-ta-c se-fs-24 se-fs-24 se-c-66 se-b">
+					<view class="se-display-ib se-px-20 se-br-40 se-flex-h-c se-h-50 se-lh-50 se-ta-c se-fs-24 se-fs-24 se-c-66 se-b" @click="callPhone(items)">
 						<text>联系客服</text>
 					</view>
 				</view>
 			</view>
+			<u-empty v-if="list && list.length==0" mode="list"></u-empty>
 		</view>
 	</view>
 </template>
@@ -122,6 +123,7 @@
 					pageSize:that.pageSize
 				}
 				bossOrderList(params).then(response=>{
+					console.info("bossOrder",response.result.records,that.pageNo)
 					if(that.pageNo==1){
 						that.list = response.result.records
 					}else{
@@ -136,6 +138,22 @@
 				this.current = event.index
 				this.orderStatus = this.nav[event.index].index
 				this.onOrder()
+			},
+			onOrderDetail(event){
+				uni.navigateTo({
+					url:"/pages_subpack/order-detail/index?orderId="+event.id
+				})
+			},
+			callPhone(event){
+				uni.makePhoneCall({
+				    phoneNumber: event.phone,
+				    success: () => {
+				      console.log("拨打成功");
+				    },
+				    fail: (err) => {
+				      console.error("拨打失败", err);
+				    },
+				  })
 			}
 		}
 	}
diff --git a/pages/order/component/master.vue b/pages/order/component/master.vue
index 7c6b637..553d7f1 100644
--- a/pages/order/component/master.vue
+++ b/pages/order/component/master.vue
@@ -17,7 +17,7 @@
 			@click="tabClick"></u-tabs>
 		</u-sticky>
 		<view class="se-p-40">
-			<view class="se-px-40 se-mb-30 se-py-30 se-bgc-white se-br-40 se-bs-b" v-for="(items,indexs) in 20" :key="indexs">
+			<view class="se-px-40 se-mb-30 se-py-30 se-bgc-white se-br-40 se-bs-b" v-for="(items,indexs) in list" :key="indexs">
 				<view class="se-flex se-flex-h-sb se-fw-6 se-fs-32 se-pb-20">
 					<view class="se-flex">
 						<text>工装石膏板搬运</text>
@@ -47,6 +47,7 @@
 					</view>
 				</view>
 			</view>
+			<u-empty v-if="list && list.length==0" mode="list"></u-empty>
 		</view>
 	</view>
 </template>
@@ -132,10 +133,25 @@
 				})
 			},
 			tabClick(event){
-				console.info(event)
 				this.current = event.index
 				this.orderStatus = this.nav[event.index].index
 				this.onOrder()
+			},
+			onOrderDetail(event){
+				uni.navigateTo({
+					url:"/pages_subpack/order-detail/index?orderId="+event.id
+				})
+			},
+			callPhone(event){
+				uni.makePhoneCall({
+				    phoneNumber: event.phone,
+				    success: () => {
+				      console.log("拨打成功");
+				    },
+				    fail: (err) => {
+				      console.error("拨打失败", err);
+				    },
+				  })
 			}
 		}
 	}
diff --git a/pages/user/index.vue b/pages/user/index.vue
index ec33b8f..ad7685a 100644
--- a/pages/user/index.vue
+++ b/pages/user/index.vue
@@ -222,17 +222,15 @@
 				})
 			},
 			onCustomerService(){
-				uni.showModal({
-					title: '联系客服',
-					content: '确定拨打客服电话？',
-					success: function (res) {
-						if (res.confirm) {
-							console.log('用户点击确定');
-						} else if (res.cancel) {
-							console.log('用户点击取消');
-						}
-					}
-				});
+				uni.makePhoneCall({
+				    phoneNumber: '13185644852',
+				    success: () => {
+				      console.log("拨打成功");
+				    },
+				    fail: (err) => {
+				      console.error("拨打失败", err);
+				    },
+				})
 			}
 		}
 	}
diff --git a/pages_subpack/category/index.vue b/pages_subpack/category/index.vue
new file mode 100644
index 0000000..a594275
--- /dev/null
+++ b/pages_subpack/category/index.vue
@@ -0,0 +1,90 @@
+<template>
+	<view class="se-mt-10">
+		<view class="se-m-20 se-br-20 se-bs-b se-bgc-white se-py-20 se-px-30" v-for="(items,indexs) in tList" :key="indexs" @click="onMasterDetail(items)">
+			<view class="se-flex se-flex-h-sb">
+				<view class="se-flex">
+					<text class="se-fw-6 se-c-black se-fs-30">{{items.title}}</text>
+				</view>
+				<view class="se-c-orange se-fs-32 se-fw-6">
+					{{items.moneymin}}-{{items.moneymin}}k
+				</view>
+			</view>
+			<view class="se-py-10">
+				<text class="se-c-text-sub se-fs-22 se-mr-10 se-py-5 se-px-20 se-br-5 se-bgc-f5" v-if="items.payType_dictText">{{items.payType_dictText}}</text>
+				<text class="se-c-text-sub se-fs-22 se-mr-10 se-py-5 se-px-20 se-br-5 se-bgc-f5" v-if="items.industryName">{{items.industryName}}</text>
+				<text class="se-c-text-sub se-fs-22 se-mr-10 se-py-5 se-px-20 se-br-5 se-bgc-f5" v-if="items.companyName">{{items.companyName}}</text>
+				<!-- 	<text class="se-c-text-sub se-fs-22 se-mr-10 se-py-5 se-px-20 se-br-5 se-bgc-f5">水泥搬运</text> -->
+			</view>
+			<view class="se-flex se-flex-h-sb">
+				<view class="se-flex">
+					<u-icon class="se-ml-10" name="map"></u-icon>
+					<text class="se-c-text-sub se-fs-24 se-pr-10">{{items.distances}}km</text>
+					<text class="se-c-text-sub se-fs-24 se-pl-10 se-b-l">{{items.workAddress}}</text>
+				</view>
+				<!-- <view class="se-c-text se-c-text-sub se-fs-24">
+					09月23日 16:20
+				</view> -->
+				<view class="se-flex se-flex-h-c se-py-10 se-px-20 se-br-12 se-fs-22 se-c-orange se-bgc-ffd se-fw-6">
+					<text class="se-ml-5">立即接单</text>
+				</view>
+			</view>
+		</view>
+		<u-empty v-if="tList && tList.length==0" mode="list"></u-empty>
+	</view>
+</template>
+
+<script>
+	import {
+		bannerList,
+		taskList,
+		rolelist,
+		industryList,
+		getSysText
+	} from "@/common/api.js"
+	export default{
+		data(){
+			return{
+				tpageNo:1,
+				tpageSize:20,
+				tList:[],
+				id:null,
+			}
+		},
+		onLoad(options) {
+			this.id=options.id
+			this.onTaskList()
+		},
+		onReachBottom() {
+			let that = this
+			that.rpageNo = that.rpageNo + 1
+			that.onTaskList()
+		},
+		methods:{
+			onTaskList(){
+				taskList({
+					latitude:uni.getStorageSync("latitude"),
+					longitude:uni.getStorageSync("longitude"),
+					pageNo:this.tpageNo,
+					pageSize:this.tpageSize
+				}).then(response=>{
+					if(this.tpageNo==1){
+						this.tList = response.result.records
+					}else{
+						this.tList = this.tList.concat(response.result.records)
+					}
+				}).catch(error=>{
+					
+				})
+			},
+			onMasterDetail(event){
+				console.info(event)
+				uni.navigateTo({
+					url:"/pages_subpack/work-detail/index?id="+event.id
+				})
+			}
+		}
+	}
+</script>
+
+<style>
+</style>
\ No newline at end of file
diff --git a/pages_subpack/order-detail/index.vue b/pages_subpack/order-detail/index.vue
index 7cc99b8..a6969c2 100644
--- a/pages_subpack/order-detail/index.vue
+++ b/pages_subpack/order-detail/index.vue
@@ -175,7 +175,7 @@
 	export default{
 		data(){
 			return{
-				stepsIndex:4,
+				stepsIndex:1,
 				stepsList:[
 					{
 						title:"接单",
@@ -249,6 +249,15 @@
 			},
 			onService(){
 				console.info(`联系客服`)
+				uni.makePhoneCall({
+				    phoneNumber: this.obj.phone,
+				    success: () => {
+				      console.log("拨打成功");
+				    },
+				    fail: (err) => {
+				      console.error("拨打失败", err);
+				    },
+				})
 			},
 			onsubmit(){
 				console.info(`确认`)