diff --git a/common/api.js b/common/api.js
index 9ee5591..d51f1b9 100644
--- a/common/api.js
+++ b/common/api.js
@@ -25,7 +25,23 @@ export const taskList = (params) => http.get('/employ-api/employ/job/queryJobLis
 // 求职大厅列表查询
 export const rolelist = (params) => http.get('/employ-api/employ/resume/queryResumeList', {params:params})
 // 公司发布任务
-export const addTask = (params) => http.post('/employ-api/employ/job/addJob', params)
+export const addTask = (params) => http.post('/employ-api/employ/order/addOrder', params)
+
+
+
+
+//订单信息-简历信息-立即聘用
+export const addOrderWork = (params) => http.post('/employ-api/employ/order/addOrderWork', params)
+//订单信息-求职信息-立即接单
+export const addOrderJob = (params) => http.post('/employ-api/employ/order/addOrderJob', params)
+//订单信息-查询订单详情
+export const orderDetail = (params) => http.get('/employ-api/employ/order/queryOrderById', {params:params})
+// 订单支付
+export const payOrder = (params) => http.post('/employ-api/employ/order/payOrder', params)
+//订单列表
+export const bossOrderList = (params) => http.get('/employ-api/employ/order/queryOrderList', {params:params})
+
+
 // 根据行业id查询工种
 export const industryById = (params) => http.get('/employ-api/employ/category/queryCategoryList', {params:params})
 // tb_user_role-通过id查询
@@ -67,13 +83,11 @@ export const withdrawal = (params) => http.get('/employ-api/employ/amount/CashOu
 export const orderTask = (params) => http.post('/employ-api/order/addTask', params)
 
 
-export const orderDetail = (params) => http.get('/employ-api/order/queryById', {params:params})
 
-// 订单支付
-export const payOrder = (params) => http.post('/employ-api/pay/order', params)
+
 
 // 招聘方订单分页列表查询
-export const bossOrderList = (params) => http.get('/employ-api/order/bossOrderList', {params:params})
+// export const bossOrderList = (params) => http.get('/employ-api/order/bossOrderList', {params:params})
 
 // 求职方订单分页列表查询
 export const workOrderList = (params) => http.get('/employ-api/order/workOrderList', {params:params})
diff --git a/common/config.js b/common/config.js
index 71d657f..d02195f 100644
--- a/common/config.js
+++ b/common/config.js
@@ -1,7 +1,8 @@
 module.exports = {
 	// baseUrl: 'http://3fl8266127.qicp.vip'
-	baseUrl:"https://employadmin.hhlm1688.com"
-	// baseUrl:"http://h5.xzaiyp.top", //测试环境
+	// baseUrl:"https://employadmin.hhlm1688.com"
+	baseUrl:"http://h5.xzaiyp.top", //测试环境
 	
 	// https://employadmin.hhlm1688.com/employ-api
 }
+
diff --git a/node_modules/.bin/acorn b/node_modules/.bin/acorn
index cf76760..558ebb9 120000
--- a/node_modules/.bin/acorn
+++ b/node_modules/.bin/acorn
@@ -1 +1,15 @@
-../acorn/bin/acorn
\ No newline at end of file
+#!/bin/sh
+basedir=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')")
+
+case `uname` in
+    *CYGWIN*) basedir=`cygpath -w "$basedir"`;;
+esac
+
+if [ -x "$basedir/node" ]; then
+  "$basedir/node"  "$basedir/../acorn/bin/acorn" "$@"
+  ret=$?
+else 
+  node  "$basedir/../acorn/bin/acorn" "$@"
+  ret=$?
+fi
+exit $ret
diff --git a/node_modules/.bin/eslint b/node_modules/.bin/eslint
index 810e4bc..9f3ac31 120000
--- a/node_modules/.bin/eslint
+++ b/node_modules/.bin/eslint
@@ -1 +1,15 @@
-../eslint/bin/eslint.js
\ No newline at end of file
+#!/bin/sh
+basedir=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')")
+
+case `uname` in
+    *CYGWIN*) basedir=`cygpath -w "$basedir"`;;
+esac
+
+if [ -x "$basedir/node" ]; then
+  "$basedir/node"  "$basedir/../eslint/bin/eslint.js" "$@"
+  ret=$?
+else 
+  node  "$basedir/../eslint/bin/eslint.js" "$@"
+  ret=$?
+fi
+exit $ret
diff --git a/node_modules/.bin/js-yaml b/node_modules/.bin/js-yaml
index 9dbd010..460d9df 120000
--- a/node_modules/.bin/js-yaml
+++ b/node_modules/.bin/js-yaml
@@ -1 +1,15 @@
-../js-yaml/bin/js-yaml.js
\ No newline at end of file
+#!/bin/sh
+basedir=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')")
+
+case `uname` in
+    *CYGWIN*) basedir=`cygpath -w "$basedir"`;;
+esac
+
+if [ -x "$basedir/node" ]; then
+  "$basedir/node"  "$basedir/../js-yaml/bin/js-yaml.js" "$@"
+  ret=$?
+else 
+  node  "$basedir/../js-yaml/bin/js-yaml.js" "$@"
+  ret=$?
+fi
+exit $ret
diff --git a/node_modules/.bin/mime b/node_modules/.bin/mime
index fbb7ee0..0dbddf0 120000
--- a/node_modules/.bin/mime
+++ b/node_modules/.bin/mime
@@ -1 +1,15 @@
-../mime/cli.js
\ No newline at end of file
+#!/bin/sh
+basedir=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')")
+
+case `uname` in
+    *CYGWIN*) basedir=`cygpath -w "$basedir"`;;
+esac
+
+if [ -x "$basedir/node" ]; then
+  "$basedir/node"  "$basedir/../mime/cli.js" "$@"
+  ret=$?
+else 
+  node  "$basedir/../mime/cli.js" "$@"
+  ret=$?
+fi
+exit $ret
diff --git a/node_modules/.bin/mkdirp b/node_modules/.bin/mkdirp
index 017896c..4b00467 120000
--- a/node_modules/.bin/mkdirp
+++ b/node_modules/.bin/mkdirp
@@ -1 +1,15 @@
-../mkdirp/bin/cmd.js
\ No newline at end of file
+#!/bin/sh
+basedir=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')")
+
+case `uname` in
+    *CYGWIN*) basedir=`cygpath -w "$basedir"`;;
+esac
+
+if [ -x "$basedir/node" ]; then
+  "$basedir/node"  "$basedir/../mkdirp/bin/cmd.js" "$@"
+  ret=$?
+else 
+  node  "$basedir/../mkdirp/bin/cmd.js" "$@"
+  ret=$?
+fi
+exit $ret
diff --git a/node_modules/.bin/node-which b/node_modules/.bin/node-which
index 6f8415e..645ab6c 120000
--- a/node_modules/.bin/node-which
+++ b/node_modules/.bin/node-which
@@ -1 +1,15 @@
-../which/bin/node-which
\ No newline at end of file
+#!/bin/sh
+basedir=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')")
+
+case `uname` in
+    *CYGWIN*) basedir=`cygpath -w "$basedir"`;;
+esac
+
+if [ -x "$basedir/node" ]; then
+  "$basedir/node"  "$basedir/../which/bin/node-which" "$@"
+  ret=$?
+else 
+  node  "$basedir/../which/bin/node-which" "$@"
+  ret=$?
+fi
+exit $ret
diff --git a/node_modules/.bin/os-name b/node_modules/.bin/os-name
index c675c27..19d70b4 120000
--- a/node_modules/.bin/os-name
+++ b/node_modules/.bin/os-name
@@ -1 +1,15 @@
-../os-name/cli.js
\ No newline at end of file
+#!/bin/sh
+basedir=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')")
+
+case `uname` in
+    *CYGWIN*) basedir=`cygpath -w "$basedir"`;;
+esac
+
+if [ -x "$basedir/node" ]; then
+  "$basedir/node"  "$basedir/../os-name/cli.js" "$@"
+  ret=$?
+else 
+  node  "$basedir/../os-name/cli.js" "$@"
+  ret=$?
+fi
+exit $ret
diff --git a/node_modules/.bin/osx-release b/node_modules/.bin/osx-release
index 6842b7e..cd54230 120000
--- a/node_modules/.bin/osx-release
+++ b/node_modules/.bin/osx-release
@@ -1 +1,15 @@
-../osx-release/cli.js
\ No newline at end of file
+#!/bin/sh
+basedir=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')")
+
+case `uname` in
+    *CYGWIN*) basedir=`cygpath -w "$basedir"`;;
+esac
+
+if [ -x "$basedir/node" ]; then
+  "$basedir/node"  "$basedir/../osx-release/cli.js" "$@"
+  ret=$?
+else 
+  node  "$basedir/../osx-release/cli.js" "$@"
+  ret=$?
+fi
+exit $ret
diff --git a/node_modules/.bin/rimraf b/node_modules/.bin/rimraf
index 4cd49a4..3cebd6e 120000
--- a/node_modules/.bin/rimraf
+++ b/node_modules/.bin/rimraf
@@ -1 +1,15 @@
-../rimraf/bin.js
\ No newline at end of file
+#!/bin/sh
+basedir=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')")
+
+case `uname` in
+    *CYGWIN*) basedir=`cygpath -w "$basedir"`;;
+esac
+
+if [ -x "$basedir/node" ]; then
+  "$basedir/node"  "$basedir/../rimraf/bin.js" "$@"
+  ret=$?
+else 
+  node  "$basedir/../rimraf/bin.js" "$@"
+  ret=$?
+fi
+exit $ret
diff --git a/node_modules/.bin/semver b/node_modules/.bin/semver
index 5aaadf4..6f6e6c7 120000
--- a/node_modules/.bin/semver
+++ b/node_modules/.bin/semver
@@ -1 +1,15 @@
-../semver/bin/semver.js
\ No newline at end of file
+#!/bin/sh
+basedir=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')")
+
+case `uname` in
+    *CYGWIN*) basedir=`cygpath -w "$basedir"`;;
+esac
+
+if [ -x "$basedir/node" ]; then
+  "$basedir/node"  "$basedir/../semver/bin/semver.js" "$@"
+  ret=$?
+else 
+  node  "$basedir/../semver/bin/semver.js" "$@"
+  ret=$?
+fi
+exit $ret
diff --git a/node_modules/eslint-config-airbnb-base/node_modules/.bin/semver b/node_modules/eslint-config-airbnb-base/node_modules/.bin/semver
index c3277a7..62e2968 120000
--- a/node_modules/eslint-config-airbnb-base/node_modules/.bin/semver
+++ b/node_modules/eslint-config-airbnb-base/node_modules/.bin/semver
@@ -1 +1,15 @@
-../../../semver/bin/semver.js
\ No newline at end of file
+#!/bin/sh
+basedir=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')")
+
+case `uname` in
+    *CYGWIN*) basedir=`cygpath -w "$basedir"`;;
+esac
+
+if [ -x "$basedir/node" ]; then
+  "$basedir/node"  "$basedir/../../../semver/bin/semver.js" "$@"
+  ret=$?
+else 
+  node  "$basedir/../../../semver/bin/semver.js" "$@"
+  ret=$?
+fi
+exit $ret
diff --git a/pages.json b/pages.json
index 3d1b7d2..865c4c6 100644
--- a/pages.json
+++ b/pages.json
@@ -158,6 +158,15 @@
 						"navigationBarTextStyle": "white"
 					}
 				},
+				{
+					"path": "job-order-detail/index",
+					"style": {
+						"navigationBarTitleText": "聘用订单详情",
+						"navigationStyle":"default",
+						"navigationBarBackgroundColor": "#FF7A31",
+						"navigationBarTextStyle": "white"
+					}
+				},
 				{
 					"path": "record/index",
 					"style": {
@@ -188,7 +197,7 @@
 				{
 					"path": "order-detail/index",
 					"style": {
-						"navigationBarTitleText": "订单详情",
+						"navigationBarTitleText": "招聘订单详情",
 						"navigationStyle":"default",
 						"navigationBarBackgroundColor": "#FF7A31",
 						"navigationBarTextStyle": "white"
diff --git a/pages/order/component/enterprise.vue b/pages/order/component/enterprise.vue
index c030e23..dc5fc0a 100644
--- a/pages/order/component/enterprise.vue
+++ b/pages/order/component/enterprise.vue
@@ -20,27 +20,27 @@
 			<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" @click="onOrderDetail(items)">
-						<text>{{items.companyName}}</text>
+						<text>{{items.workName}}</text>
 						<u-icon name="arrow-right"></u-icon>
 					</view>
 					<view class="se-c-red">
-						已完成
+						{{items.status_dictText}}
 					</view>
 				</view>
 				<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="items.workPic" mode=""></image>
+						<image class="se-w-160 se-h-160 se-br-10" :src="items.workHeadImg" 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">{{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 class="se-fs-24 se-c-text-third se-display-ib">所属行业:{{items.categoryOne}}</view>
+						<view class="se-fs-24 se-c-text-third se-display-ib">所属工总:{{items.categoryTwo}}</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>{{items.amount}}</text>
+						<text class="se-c-orange se-fs-30 se-fw-6"><text class="se-fs-24">￥</text>{{items.payMoney}}</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" @click="callPhone(items)">
 						<text>联系客服</text>
@@ -118,7 +118,8 @@
 			onOrder(){
 				let that = this;
 				let params={
-					orderStatus:that.orderStatus,
+					role:0,
+					status:that.orderStatus,
 					pageNo:that.pageNo,
 					pageSize:that.pageSize
 				}
diff --git a/pages/order/component/master.vue b/pages/order/component/master.vue
index 553d7f1..a447dc8 100644
--- a/pages/order/component/master.vue
+++ b/pages/order/component/master.vue
@@ -54,7 +54,7 @@
 
 <script>
 	import {
-		workOrderList
+		bossOrderList
 	} from "@/common/api.js"
 	export default{
 		components:{
@@ -118,11 +118,12 @@
 			onOrder(){
 				let that = this;
 				let params={
-					orderStatus:that.orderStatus,
+					role:1,
+					status:that.orderStatus,
 					pageNo:that.pageNo,
 					pageSize:that.pageSize
 				}
-				workOrderList(params).then(response=>{
+				bossOrderList(params).then(response=>{
 					if(this.pageNo==1){
 						this.list = response.result.records
 					}else{
diff --git a/pages_subpack/employ-progress/index.vue b/pages_subpack/employ-progress/index.vue
index 288ad82..f23a0ba 100644
--- a/pages_subpack/employ-progress/index.vue
+++ b/pages_subpack/employ-progress/index.vue
@@ -28,13 +28,18 @@
 	export default{
 		data(){
 			return{
-				
+				id:null
 			}
 		},
+		onLoad(options) {
+			console.info("求职者订单详情："+options.id)
+			this.id = options.id
+		},
 		methods:{
 			onOrderDetail(){
+				let that = this;
 				uni.navigateTo({
-					url:"/pages_subpack/order-detail/index"
+					url:"/pages_subpack/job-order-detail/index?orderId="+that.id
 				})
 			},
 			onCancel(){
diff --git a/pages_subpack/job-order-detail/index.vue b/pages_subpack/job-order-detail/index.vue
new file mode 100644
index 0000000..8412413
--- /dev/null
+++ b/pages_subpack/job-order-detail/index.vue
@@ -0,0 +1,292 @@
+<template>
+	<view class="u-page">
+		<view class="se-px-20 se-pt-40 se-flex-v-c">
+			<template v-if="stepsIndex==0">
+				<view class="se-flex se-flex-h-c">
+					<image class="se-a-50" src="@/static/image/46524.png" mode=""></image>
+					<text class="se-c-orange se-fs-30 se-ml-10">聘用师傅-师傅求职-等待师傅确认</text>
+				</view>
+				<text class="se-c-orange se-mt-20 se-fs-24">12：45：30有效</text>
+			</template>
+			<template v-if="stepsIndex==1">
+				<view class="se-flex se-flex-h-c">
+					<image class="se-a-50" src="@/static/image/46524.png" mode=""></image>
+					<text class="se-c-orange se-fs-30 se-ml-10">订单进行中</text>
+				</view>
+				<text class="se-c-orange se-mt-20 se-fs-24">12：45：30有效</text>
+			</template>
+			<template v-if="stepsIndex==2">
+				<view class="se-flex se-flex-h-c">
+					<image class="se-a-50" src="@/static/image/46525.png" mode=""></image>
+					<text class="se-c-orange se-fs-30 se-ml-10">试工完成</text>
+				</view>
+				<text class="se-c-orange se-mt-20 se-fs-24">12：45：30有效</text>
+			</template>
+			<template v-if="stepsIndex==3">
+				<view class="se-flex se-flex-h-c">
+					<image class="se-a-50" src="@/static/image/46525.png" mode=""></image>
+					<text class="se-c-orange se-fs-30 se-ml-10">企业待确认</text>
+				</view>
+				<text class="se-c-orange se-mt-20 se-fs-24">12：45：30有效</text>
+			</template>
+			<template v-if="stepsIndex==4">
+				<view class="se-flex se-flex-h-c">
+					<image class="se-a-50" src="@/static/image/46525.png" mode=""></image>
+					<text class="se-c-orange se-fs-30 se-ml-10">企业待支付</text>
+				</view>
+				<text class="se-c-orange se-mt-20 se-fs-24">12：45：30有效</text>
+			</template>
+			<template v-if="stepsIndex==5">
+				<view class="se-flex se-flex-h-c">
+					<image class="se-a-50" src="@/static/image/46525.png" mode=""></image>
+					<text class="se-c-orange se-fs-30 se-ml-10">订单已完成</text>
+				</view>
+				<text class="se-c-orange se-mt-20 se-fs-24">12：45：30有效</text>
+			</template>
+		</view>
+		<view class="se-px-20 se-py-40">
+			<u-steps activeColor="#FF7A31" :current="stepsIndex" dot>
+				<u-steps-item class="se-fs-22" v-for="(items,indexs) in stepsList" :key="indexs" :title="items.title">
+					<!-- <text class="se-fs-22" slot="title">{{items.title}}</text> -->
+				</u-steps-item>
+			</u-steps>
+		</view>
+		<view class="se-px-20">
+			<view class="se-px-220 se-pb-30 se-fs-20 se-flex se-flex-h-c">
+				<template v-if="stepsIndex==0">
+					<view @click="onCancel()"
+						class="se-mx-10 se-w-200 se-b se-br-40 se-flex-h-c se-h-50 se-lh-50 se-ta-c se-fs-24 se-c-66 se-bgc-f5">
+						<text>取消</text>
+					</view>
+				</template>
+				<template v-if="stepsIndex==1">
+					<view @click="onSubmit()"
+						class="se-mx-10 se-w-200 se-br-40 se-flex-h-c se-h-50 se-lh-50 se-ta-c se-fs-24 se-c-white se-bgc-orange">
+						<text>确认</text>
+					</view>
+					<view @click="onCancel()"
+						class="se-mx-10 se-w-200 se-b se-br-40 se-flex-h-c se-h-50 se-lh-50 se-ta-c se-fs-24 se-c-66 se-bgc-f5">
+						<text>取消</text>
+					</view>
+				</template>
+				<template v-if="stepsIndex==2">
+					<view @click="onService()"
+						class="se-mx-10 se-w-200 se-br-40 se-flex-h-c se-h-50 se-lh-50 se-ta-c se-fs-24 se-c-white se-bgc-orange">
+						<text>联系客服</text>
+					</view>
+				</template>
+				<template v-if="stepsIndex==3">
+					<view @click="onSubmit()"
+						class="se-mx-10 se-w-200 se-br-40 se-flex-h-c se-h-50 se-lh-50 se-ta-c se-fs-24 se-c-white se-bgc-orange">
+						<text>确认</text>
+					</view>
+				</template>
+				<template v-if="stepsIndex==4">
+					<view @click="onPay()"
+						class="se-mx-10 se-w-200 se-br-40 se-flex-h-c se-h-50 se-lh-50 se-ta-c se-fs-24 se-c-white se-bgc-orange">
+						<text>去支付</text>
+					</view>
+				</template>
+				<template v-if="stepsIndex==5">
+					<view @click="onDel()"
+						class="se-mx-10 se-w-200 se-br-40 se-flex-h-c se-h-50 se-lh-50 se-ta-c se-fs-24 se-c-white se-bgc-orange">
+						<text>删除</text>
+					</view>
+				</template>
+			</view>
+		</view>
+		<view class="se-px-40 se-py-20">
+			<view class="se-flex se-flex-ai-c se-pb-10">
+				<view class="line-orange"></view>
+				<view class="se-ml-10 se-fs-32 se-c-black se-fw-6">
+					师傅求职详情
+				</view>
+			</view>
+			<view class="se-flex se-flex-v-sa se-flex-ai-fs se-py-20">
+				<view class="se-flex">
+					<view class="se-w-160 se-h-160">
+						<image class="se-w-160 se-h-160 se-br-10" :src="obj.employResume.headImage" 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">期望工作地址:{{obj.employSeek.address}}</view>
+						<view class="se-fs-24 se-c-text-third se-display-ib">所属行业:{{obj.employSeek.categoryOne}}</view>
+						<view class="se-fs-24 se-c-text-third se-display-ib">所属工种:{{obj.employSeek.categoryTwo}}</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">薪资</view>
+					<view class="se-c-orange se-fs-32 se-fw-6 se-display-ib">{{obj.employSeek.dayMoney}}元/天</view>
+				</view>
+			</view>
+			<u-line dashed></u-line>
+			<view class="se-py-10 se-pb-30">
+				<view class="se-mt-30">
+					<text class="se-fs-28 se-c-black se-fw5">师傅姓名:{{obj.employResume.name}}</text>
+					<text class="se-fs-28 se-c-black se-fw5">民族:{{obj.employResume.nation}}</text>
+					<text class="se-fs-28 se-c-black se-fw5">性别:{{obj.employResume.sex}}</text>
+					<text class="se-fs-28 se-c-black se-fw5">年龄:{{obj.employResume.age}}</text>
+					<text class="se-fs-28 se-c-black se-fw5">简介:{{obj.employResume.brief}}</text>
+					<text class="se-fs-28 se-c-black se-fw5">地区:{{obj.employResume.address}}</text
+					<text class="se-fs-24 se-c-text-third se-ml-40">师傅电话:{{obj.employResume.phone}}</text>
+					<view class="se-bgc-orange se-c-white se-fs-20 se-display-ib se-px-10 se-py-5 se-br-10 se-ml-10" @click="copyText(obj.employResume.phone)">
+						复制
+					</view>
+				</view>
+				<view class="se-mt-10">
+					<text class="se-fs-24 se-c-33">简历地址:{{obj.workAddress}}</text>
+					<view class="se-bgc-orange se-c-white se-fs-20 se-display-ib se-px-10 se-py-5 se-br-10 se-ml-10" @click="copyText(obj.workAddress)">
+						复制
+					</view>
+				</view>
+			</view>
+			<u-line dashed></u-line>
+			<view class="se-mt-20 se-pt-20 se-pb-30">
+				<view class="se-fw-6 se-fs-32 se-c-black">
+					师傅简历
+				</view>
+				<view class="se-flex se-pt-30 se-flex-h-sb">
+					<view class="se-fs-24 se-display-ib">简介</view>
+					<view class="se-fs-24 se-display-ib">{{obj.employResume.brief}}</view>
+				</view>
+				<view class="se-flex se-pt-30 se-flex-h-sb">
+					<view class="se-fs-24 se-display-ib">出行方式</view>
+					<view class="se-fs-24 se-display-ib">{{obj.employSeek.selectGo}}</view>
+				</view>
+				<view class="se-flex se-pt-30 se-flex-h-sb">
+					<view class="se-fs-24 se-display-ib">支付方式</view>
+					<view class="se-fs-24 se-display-ib" v-if="obj.employSeek.payType==0">提前支付</view>
+					<view class="se-fs-24 se-display-ib" v-if="obj.employSeek.payType==1">试用后支付</view>
+				</view>
+				<!-- <view class="se-flex se-pt-30 se-flex-h-sb">
+					<view class="se-fs-24 se-display-ib">工作时间</view>
+					<view class="se-fs-24 se-display-ib">{{obj.workTime}}</view>
+				</view> -->
+			</view>
+			<u-line dashed></u-line>
+			<view class="se-mt-20 se-pt-20 se-pb-30">
+				<view class="se-fw-6 se-fs-32 se-c-black">
+					师傅技能
+				</view>
+				<view class="se-fs-24 se-pt-20 se-pb-20 se-lh-40">
+					<u-parse :content="obj.employSeek.workDetail"></u-parse>
+				</view>
+			</view>
+			<view class="se-px-220 se-pb-30 se-fs-20 se-flex se-flex-h-c">
+				<view @click="onService()"
+					class="se-mx-10 se-w-200 se-br-40 se-flex-h-c se-h-50 se-lh-50 se-ta-c se-fs-24 se-c-white se-bgc-orange">
+					<text>联系师傅</text>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import {
+		orderDetail
+	} from "@/common/api.js"
+	export default{
+		data(){
+			return{
+				stepsIndex:1,
+				stepsList:[
+					{
+						title:"接单",
+						date:"10:21"
+					},
+					{
+						title:"进行",
+						date:"10:22"
+					},
+					{
+						title:"试工完成",
+						date:"10:23"
+					},
+					{
+						title:"企业确认",
+						date:"10:24"
+					},
+					{
+						title:"企业支付",
+						date:"10:25"
+					},
+					{
+						title:"企业完成",
+						date:"10:26"
+					}
+				],
+				detail:`<p>
+						1、全日制大专以上学历，艺术设计类相关专业;<br/>
+						2、两年以上平面、品牌、视觉设计等相关工作经验，能独立完成项目的设计工作，有 3C数码/个护健 康 类产品服务经验优先，有乙方工作经验佳;<br/>
+						3、具备一定的设计提案能力，能完整的呈现设计思路与创意，能清晰的表达设计逻辑与思考;<br/>
+						4、热爱设计，平面基本功扎实，拥有优良的审美与创意想法，对版式、色彩把控能力强;对工作富有责任心，具备团队沟通与协作能力;<br/>
+						5、精通 PS、AI、CDR 等平面设计软件，能独立完成日常平面设计工作内容，熟练使用 PPT/Keynote，能完成提案内容的材料美化工作。<br/>
+						</p>`,
+				obj:{}
+			}
+		},
+		onLoad(options) {
+			this.orderId=options.orderId
+			this.onOrderDetail()
+		},
+		methods:{
+			onOrderDetail(){
+				let that = this
+				let params = {
+					orderId:that.orderId
+				}
+				orderDetail(params).then(response=>{
+					that.obj = response.result
+					that.stepsIndex = response.result.status;
+				}).catch(error=>{
+					
+				})
+			},
+			copyText(event){
+				uni.setClipboardData({
+					data: event,
+					success: () => {
+					  uni.showToast({
+						title: "复制成功",
+						icon: "none",
+					  });
+					},
+					fail: (err) => {
+					  console.error("复制失败", err);
+					},
+				})
+			},
+			onCancel(){
+				uni.navigateBack({
+					delta:1
+				})
+			},
+			onService(){
+				console.info(`联系客服`)
+				uni.makePhoneCall({
+				    phoneNumber: this.obj.jobPhone,
+				    success: () => {
+				      console.log("拨打成功");
+				    },
+				    fail: (err) => {
+				      console.error("拨打失败", err);
+				    },
+				})
+			},
+			onsubmit(){
+				console.info(`确认`)
+			},
+			onPay(){
+				uni.navigateTo({
+					url:"/pages_subpack/pay/index"
+				})
+			},
+			onDel(){
+				console.info(`删除`)
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+</style>
\ No newline at end of file
diff --git a/pages_subpack/master-detail/index.vue b/pages_subpack/master-detail/index.vue
index 869ae4e..d7632bc 100644
--- a/pages_subpack/master-detail/index.vue
+++ b/pages_subpack/master-detail/index.vue
@@ -83,7 +83,7 @@
 
 <script>
 	import {
-		querySeekById
+		querySeekById,addOrderJob
 	} from "@/common/api.js"
 	export default{
 		data(){
@@ -115,9 +115,29 @@
 			},
 			onEmploy(){
 				console.info(`立即聘用`)
-				uni.navigateTo({
-					url:"/pages_subpack/employ-progress/index"
+				addOrderJob({id:this.id}).then(response=>{
+					
+					console.log("聘用成功");
+					// uni.navigateTo({
+					// 	url:"/pages_subpack/payment/index?id="+response.result.id
+					// })
+					
+					uni.navigateTo({
+						url:"/pages_subpack/employ-progress/index?id="+response.result.id
+					})
+				}).catch(error=>{
+					
 				})
+				
+				
+				
+				
+				
+				
+				
+				
+				
+				
 			}
 		}
 	}
diff --git a/pages_subpack/order-detail/index.vue b/pages_subpack/order-detail/index.vue
index 83dbb95..c97c259 100644
--- a/pages_subpack/order-detail/index.vue
+++ b/pages_subpack/order-detail/index.vue
@@ -4,7 +4,7 @@
 			<template v-if="stepsIndex==0">
 				<view class="se-flex se-flex-h-c">
 					<image class="se-a-50" src="@/static/image/46524.png" mode=""></image>
-					<text class="se-c-orange se-fs-30 se-ml-10">订单待接单</text>
+					<text class="se-c-orange se-fs-30 se-ml-10">招聘发布-师傅接单-等待企业确认</text>
 				</view>
 				<text class="se-c-orange se-mt-20 se-fs-24">12：45：30有效</text>
 			</template>
@@ -95,42 +95,44 @@
 				</template>
 			</view>
 		</view>
+		
 		<view class="se-px-40 se-py-20">
 			<view class="se-flex se-flex-ai-c se-pb-10">
 				<view class="line-orange"></view>
 				<view class="se-ml-10 se-fs-32 se-c-black se-fw-6">
-					工作详情
+					招聘工作详情
 				</view>
 			</view>
 			<view class="se-flex se-flex-v-sa se-flex-ai-fs se-py-20">
 				<view class="se-flex">
 					<view class="se-w-160 se-h-160">
-						<image class="se-w-160 se-h-160 se-br-10" :src="obj.workPic" mode=""></image>
+						<image class="se-w-160 se-h-160 se-br-10" :src="obj.workHeadImg" 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">{{obj.title}}</view>
-						<view class="se-fs-24 se-c-text-third se-display-ib">所属行业:{{obj.industryName}}</view>
+						<view class="se-fw-6 se-c-black se-fs-30 se-display-ib">工作职位:{{obj.title}}</view>
+						<view class="se-fs-24 se-c-text-third se-display-ib">所属行业:{{obj.categoryOne}}</view>
 						<!-- <view class="se-fs-24 se-c-text-third se-display-ib">所属工种:{{obj.title}}</view> -->
-						<view class="se-fs-24 se-c-text-third se-display-ib">工作时间:{{obj.workTime}}</view>
+						<view class="se-fs-24 se-c-text-third se-display-ib">所属工种:{{obj.categoryTwo}}</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">薪资</view>
-					<view class="se-c-orange se-fs-32 se-fw-6 se-display-ib">{{obj.rateMoney}}元</view>
+					<view class="se-c-orange se-fs-32 se-fw-6 se-display-ib">{{obj.jobMoney}}元</view>
 				</view>
 			</view>
 			<u-line dashed></u-line>
 			<view class="se-py-10 se-pb-30">
 				<view class="se-mt-30">
-					<text class="se-fs-28 se-c-black se-fw5">姓名:{{obj.userName}}</text>
-					<text class="se-fs-24 se-c-text-third se-ml-40">联系方式:{{obj.phone}}</text>
+					<text class="se-fs-28 se-c-black se-fw5">招聘公司名称:{{obj.workName}}</text>
+					<text class="se-fs-28 se-c-black se-fw5">招聘联系人:{{obj.employAuthenticationPerson.workName}}</text>
+					<text class="se-fs-24 se-c-text-third se-ml-40">联系方式:{{obj.employAuthenticationPerson.phone}}</text>
 					<view class="se-bgc-orange se-c-white se-fs-20 se-display-ib se-px-10 se-py-5 se-br-10 se-ml-10" @click="copyText(obj.phone)">
 						复制
 					</view>
 				</view>
 				<view class="se-mt-10">
-					<text class="se-fs-24 se-c-33">工作地址:{{obj.workerAddress}}</text>
-					<view class="se-bgc-orange se-c-white se-fs-20 se-display-ib se-px-10 se-py-5 se-br-10 se-ml-10" @click="copyText(obj.workerAddress)">
+					<text class="se-fs-24 se-c-33">工作地址:{{obj.workAddress}}</text>
+					<view class="se-bgc-orange se-c-white se-fs-20 se-display-ib se-px-10 se-py-5 se-br-10 se-ml-10" @click="copyText(obj.workAddress)">
 						复制
 					</view>
 				</view>
@@ -147,7 +149,7 @@
 				</view>
 				<view class="se-flex se-pt-30 se-flex-h-sb">
 					<view class="se-fs-24 se-display-ib">工作时间</view>
-					<view class="se-fs-24 se-display-ib">{{obj.workTime}}</view>
+					<view class="se-fs-24 se-display-ib">{{obj.startTime}} - {{obj.endTime}}</view>
 				</view>
 			</view>
 			<u-line dashed></u-line>
@@ -156,7 +158,7 @@
 					工作内容
 				</view>
 				<view class="se-fs-24 se-pt-20 se-pb-20 se-lh-40">
-					<u-parse :content="obj.detail"></u-parse>
+					<u-parse :content="obj.details"></u-parse>
 				</view>
 			</view>
 			<view class="se-px-220 se-pb-30 se-fs-20 se-flex se-flex-h-c">
@@ -225,6 +227,7 @@
 				}
 				orderDetail(params).then(response=>{
 					that.obj = response.result
+					that.stepsIndex = response.result.status;
 				}).catch(error=>{
 					
 				})
@@ -251,7 +254,7 @@
 			onService(){
 				console.info(`联系客服`)
 				uni.makePhoneCall({
-				    phoneNumber: this.obj.phone,
+				    phoneNumber: this.obj.workPhone,
 				    success: () => {
 				      console.log("拨打成功");
 				    },
diff --git a/pages_subpack/payment/index.vue b/pages_subpack/payment/index.vue
index 53765b3..e9a13af 100644
--- a/pages_subpack/payment/index.vue
+++ b/pages_subpack/payment/index.vue
@@ -3,20 +3,20 @@
 		<view class="se-flex se-flex-v-sa se-flex-ai-fs se-py-20 se-px-30 se-bs se-bgc-white se-br-20">
 			<view class="se-flex">
 				<view class="se-w-160 se-h-160">
-					<image class="se-w-160 se-h-160 se-br-10" :src="items.workPic" mode=""></image>
+					<image class="se-w-160 se-h-160 se-br-10" :src="items.workHeadImg" 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">{{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.categoryOne}}</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">工作时间:{{items.workTime}}</view>
+					<view class="se-fs-24 se-c-text-third se-display-ib">所属工种:{{items.categoryTwo}}</view>
 				</view>
 			</view>
 		</view>
 		<view class="se-flex se-flex-h-fs se-mt-30 se-py-20 se-px-30 se-bs se-bgc-white se-br-20">
 			<image class="se-a-30" src="@/static/image/46502.png" mode=""></image>
-			<text class="se-c-black se-fs-32 se-ml-20">{{items.userName}}</text>
-			<text class="se-c-black se-fs-32 se-ml-20">{{items.bossPhone}}</text>
+			<text class="se-c-black se-fs-32 se-ml-20">{{items.workName}}</text>
+			<text class="se-c-black se-fs-32 se-ml-20">{{items.workPhone}}</text>
 		</view>
 		<view class="se-flex se-flex-h-fs se-mt-30 se-py-20 se-px-30 se-bs se-bgc-white se-br-20">
 			<text class="se-c-black se-fs-28">联系地址：{{items.workAddress}}</text>
@@ -106,7 +106,7 @@
 			}
 		},
 		onLoad(options) {
-			this.sysList = uni.getStorageSync('sysList')
+			// this.sysList = uni.getStorageSync('sysList')
 			console.info(options)
 			this.id = options.id
 			this.getOrderDetail()
@@ -147,8 +147,32 @@
 					})
 				}
 				console.info(that.payRadio)
+				
 				if(that.payRadio==1){
-					
+					payOrder({orderId:that.id}).then(res=>{
+						uni.requestPayment({
+							provider: 'wxpay', // 服务提提供商
+							timeStamp: res.result.timeStamp, // 时间戳
+							nonceStr: res.result.nonceStr, // 随机字符串
+							package: res.result.packageValue,
+							signType: res.result.signType, // 签名算法
+							paySign: res.result.paySign, // 签名
+							success: function (res) {
+								console.log('支付成功',res);
+								that.onDetail();
+							},
+							fail: function (err) {
+								console.log('支付失败',err);
+								error(err)
+								uni.showToast({
+									icon:'none',
+									title:"支付失败"
+								})
+							}
+						});
+					}).catch(error=>{
+						
+					})
 				}else if(that.payRadio==2){
 					payOrder({orderId:that.id}).then(response=>{
 						uni.requestPayment({
diff --git a/pages_subpack/work-detail/index.vue b/pages_subpack/work-detail/index.vue
index ce83291..803a51e 100644
--- a/pages_subpack/work-detail/index.vue
+++ b/pages_subpack/work-detail/index.vue
@@ -62,7 +62,7 @@
 </template>
 <script>
 	import {
-		getTaskById,orderTask
+		getTaskById,orderTask,addOrderWork
 	} from "@/common/api.js"
 	export default{
 		data(){
@@ -87,9 +87,11 @@
 				})
 			},
 			onPayment(){
-				orderTask({taskId:this.id}).then(response=>{
+				addOrderWork({id:this.id}).then(response=>{
+					
+					console.log("下单成功");
 					uni.navigateTo({
-						url:"/pages_subpack/payment/index?id="+response.result.orderId
+						url:"/pages_subpack/payment/index?id="+response.result.id
 					})
 				}).catch(error=>{