diff --git a/components/order-status/index.vue b/components/order-status/index.vue
index 3cb80cc..45face0 100644
--- a/components/order-status/index.vue
+++ b/components/order-status/index.vue
@@ -10,16 +10,17 @@
- {{ statusText }}
+ {{ statusText() }}
-
+
-
+
@@ -40,17 +41,19 @@
pageType: {
type: String,
default: 'job-order' // 'job-order' 或 'order'
- }
+ },
},
computed: {
- stepsIndex() {
+ },
+ methods: {
+ getStepsIndex() {
return this.orderData.status || 0;
},
statusText() {
const statusTextMap = {
'0' : {//先付后用
'job-order': {
- 0: '等待师傅确认',//师傅操作
+ 0: '待待师傅确认',//师傅操作
1: '企业待支付',//企业操作
2: '订单进行中',//师傅操作
3: '试工完成',//企业操作
@@ -59,8 +62,8 @@
6: '订单已取消'
},
default: {
- 0: '等待企业确认并支付',//企业操作
- 1: '',//暂无
+ 0: '等待企业确认',//企业操作
+ 1: '企业待支付',//暂无
2: '订单进行中',//师傅操作
3: '试工完成',//企业操作
4: '',//暂无
@@ -92,7 +95,7 @@
let i = this.orderData ? this.orderData.payType : '1';
let statusTextMapItem = statusTextMap[i] || statusTextMap[1];
const pageTypeMap = statusTextMapItem[this.pageType] || statusTextMapItem.default;
- return pageTypeMap[this.stepsIndex] || '未知状态';
+ return pageTypeMap[this.getStepsIndex()] || '未知状态';
},
statusImage() {
const statusImageMap = {
@@ -104,25 +107,26 @@
5: '/static/images/order/46525.png',
6: '/static/images/order/46525.png'
};
- return statusImageMap[this.stepsIndex] || '/static/images/order/46524.png';
+ return statusImageMap[this.getStepsIndex()] || '/static/images/order/46524.png';
},
stepsList() {
const stepsListMap = {
0 : {//先付后用
'job-order': [
{ title: "师傅确认", date: "" },
+ { title: "企业支付", date: "" },
{ title: "进行", date: "" },
{ title: "试工完成", date: "" },
- { title: "企业支付", date: "" },
+ // { title: "企业确认", date: "" },
{ title: "订单完成", date: "" }
],
default: [
{ title: "接单", date: "" },
+ { title: "企业支付", date: "" },
{ title: "进行", date: "" },
{ title: "试工完成", date: "" },
- { title: "企业确认", date: "" },
- { title: "企业支付", date: "" },
- { title: "企业完成", date: "" }
+ // { title: "企业确认", date: "" },
+ { title: "订单完成", date: "" }
]
},
1 : {//试用以后支付
@@ -130,6 +134,7 @@
{ title: "师傅确认", date: "" },
{ title: "进行", date: "" },
{ title: "试工完成", date: "" },
+ { title: "企业确认", date: "" },
{ title: "企业支付", date: "" },
{ title: "订单完成", date: "" }
],
@@ -139,15 +144,15 @@
{ title: "试工完成", date: "" },
{ title: "企业确认", date: "" },
{ title: "企业支付", date: "" },
- { title: "企业完成", date: "" }
+ { title: "订单完成", date: "" }
]
},
};
let i = this.orderData ? this.orderData.payType : '1';
let stepsListMapItem = stepsListMap[i] || stepsListMap[1];
return stepsListMapItem[this.pageType] || stepsListMapItem.default;
- }
- }
+ },
+ }
}
diff --git a/pages/order/component/enterprise.vue b/pages/order/component/enterprise.vue
index 535c0c4..3348464 100644
--- a/pages/order/component/enterprise.vue
+++ b/pages/order/component/enterprise.vue
@@ -19,7 +19,7 @@
- {{items.status_dictText}}
+ {{ getStatusText(items) }}
@@ -57,6 +57,10 @@
import {
bossOrderList
} from "@/common/api.js"
+ import {
+ getStatusText
+ } from "@/utils/statusText.js"
+
export default {
components: {
@@ -107,6 +111,8 @@
this.onOrder();
},
methods: {
+ getStatusText,
+
onReach() {
this.pageNo = this.pageNo + 1
this.onOrder()
diff --git a/pages/order/component/master.vue b/pages/order/component/master.vue
index 9cfa7bd..3ac4171 100644
--- a/pages/order/component/master.vue
+++ b/pages/order/component/master.vue
@@ -21,7 +21,7 @@
- {{ item.status_dictText }}
+ {{ getStatusText(item) }}
@@ -59,6 +59,10 @@
import {
bossOrderList
} from "@/common/api.js"
+ import {
+ getStatusText
+ } from "@/utils/statusText.js"
+
export default {
components: {
@@ -110,6 +114,7 @@
this.onOrder()
},
methods: {
+ getStatusText,
onReach() {
this.pageNo = this.pageNo + 1
this.onOrder()
diff --git a/pages_subpack/hire/order-list.vue b/pages_subpack/hire/order-list.vue
index f5b946c..224051e 100644
--- a/pages_subpack/hire/order-list.vue
+++ b/pages_subpack/hire/order-list.vue
@@ -41,7 +41,7 @@
- {{getStatusText(item.status)}}
+ {{ getStatusText(item) }}
@@ -67,7 +67,10 @@
import {
getTaskById
} from "@/common/api.js"
-
+ import {
+ getStatusText
+ } from "@/utils/statusText.js"
+
export default {
data() {
return {
@@ -128,6 +131,8 @@
this.getJobDetail();
},
methods: {
+ getStatusText,
+
getJobDetail() {
getTaskById({ id: this.jobId }).then(response => {
if (response.success) {
@@ -151,18 +156,6 @@
});
});
},
- getStatusText(status) {
- const statusMap = {
- 0: '待聘用',
- 1: '进行中',
- 2: '试工完成',
- 3: '企业确认',
- 4: '已支付',
- 5: '已完成',
- 6: '已取消'
- };
- return statusMap[status] || '未知状态';
- },
onOrderDetail(order) {
uni.navigateTo({
url: `/pages_subpack/order-detail/boss?orderId=${order.id}&type=true`
diff --git a/pages_subpack/job-hunt/order-list.vue b/pages_subpack/job-hunt/order-list.vue
index 9f03289..a62a7c1 100644
--- a/pages_subpack/job-hunt/order-list.vue
+++ b/pages_subpack/job-hunt/order-list.vue
@@ -47,7 +47,8 @@
- {{getStatusText(item.status)}}
+ {{ getStatusText(item) }}
+
@@ -84,7 +85,10 @@
import {
querySeekById
} from "@/common/api.js"
-
+ import {
+ getStatusText
+ } from "@/utils/statusText.js"
+
export default {
data() {
return {
@@ -145,6 +149,8 @@
this.getSeekDetail();
},
methods: {
+ getStatusText,
+
getSeekDetail() {
querySeekById({ id: this.seekId }).then(response => {
if (response.success) {
@@ -168,18 +174,6 @@
});
});
},
- getStatusText(status) {
- const statusMap = {
- 0: '待确认',
- 1: '进行中',
- 2: '试工完成',
- 3: '企业确认',
- 4: '已支付',
- 5: '已完成',
- 6: '已取消'
- };
- return statusMap[status] || '未知状态';
- },
onOrderDetail(order) {
uni.navigateTo({
url: `/pages_subpack/job-order-detail/index?orderId=${order.id}&type=true`
diff --git a/pages_subpack/job-order-detail/index.vue b/pages_subpack/job-order-detail/index.vue
index e300cb6..baabad6 100644
--- a/pages_subpack/job-order-detail/index.vue
+++ b/pages_subpack/job-order-detail/index.vue
@@ -1,11 +1,74 @@
-
+
-
+
+
+
+
+
+
+
+
+ 取消
+
+
+
+
+
+ 企业确认
+
+
+
+
+ 去支付
+
+
+
+
+
+
+
+
+
+
+ 接受工作
+
+
+ 取消
+
+
+
+
+ 确认试工完成
+
+
+
+
+
+
+
@@ -160,8 +223,8 @@
支付方式
- 提前支付
- 试用后支付
+ 先付后试用
+ 先试用后支付
暂未
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+ 接收该员工
+
+
+ 取消
+
+
+
+
+
+ 企业确认
+
+
+
+
+ 去支付
+
+
+
+
+
+
+
+
+
+
+
+ 取消
+
+
+
+
+
+ 确认试工完成
+
+
+
+
+
+
+
+
+
支付方式
- 提前支付
- 试用后支付
+ 先付后试用
+ 先试用后支付
暂未
@@ -224,8 +294,8 @@
支付方式偏好
- 提前支付
- 试用后支付
+ 先付后试用
+ 先试用后支付
暂未
diff --git a/pages_subpack/order-detail/index.vue b/pages_subpack/order-detail/index.vue
index 59f0201..36b28b2 100644
--- a/pages_subpack/order-detail/index.vue
+++ b/pages_subpack/order-detail/index.vue
@@ -1,10 +1,40 @@
-
+
-
+
+
+
+
+
+
+
+
+
+ 取消
+
+
+
+
+
+ 确认试工完成
+
+
+
+
+
+
+
+
支付方式
- 提前支付
- 试用后支付
+ 先付后试用
+ 先试用后支付
暂未
diff --git a/pages_subpack/work-detail/index.vue b/pages_subpack/work-detail/index.vue
index 0fb0630..0cdcd79 100644
--- a/pages_subpack/work-detail/index.vue
+++ b/pages_subpack/work-detail/index.vue
@@ -51,7 +51,10 @@
职位详情
- {{items.payType}}
+
+ 提前支付
+ 先试用后支付
+
{{items.categoryOne}}
{{items.categoryTwo}}
diff --git a/utils/statusText.js b/utils/statusText.js
new file mode 100644
index 0000000..6d61f2c
--- /dev/null
+++ b/utils/statusText.js
@@ -0,0 +1,122 @@
+/**
+ * 全局状态文字获取方法
+ * @param {Object} params - 参数对象
+ * @param {number} params.type - 页面类型 0: default, 1: job-order
+ * @param {number} params.payType - 支付类型 0: 先付后用, 1: 先试用后支付
+ * @param {number} params.status - 订单状态
+ * @returns {string} 状态文字
+ */
+export function getStatusText(params) {
+ const { type = 0, payType = 1, status = 0 } = params;
+
+ // 根据type确定pageType
+ const pageType = type == 1 ? 'job-order' : 'default';
+
+ const statusTextMap = {
+ '0': { // 先付后用
+ 'job-order': {
+ 0: '等待师傅确认', // 师傅操作
+ 1: '企业待支付', // 企业操作
+ 2: '订单进行中', // 师傅操作
+ 3: '试工完成', // 企业操作
+ 4: '', // 暂无
+ 5: '订单已完成',
+ 6: '订单已取消'
+ },
+ default: {
+ 0: '等待企业确认', // 企业操作
+ 1: '企业待支付', // 暂无
+ 2: '订单进行中', // 师傅操作
+ 3: '试工完成', // 企业操作
+ 4: '', // 暂无
+ 5: '订单已完成',
+ 6: '订单已取消'
+ }
+ },
+ '1': { // 试用后支付
+ 'job-order': {
+ 0: '等待企业确认',
+ 1: '订单进行中',
+ 2: '试工完成',
+ 3: '企业待支付',
+ 4: '订单待完成',
+ 5: '订单已完成',
+ 6: '订单已取消'
+ },
+ default: {
+ 0: '等待企业确认',
+ 1: '订单进行中',
+ 2: '试工完成',
+ 3: '企业待支付',
+ 4: '订单待完成',
+ 5: '订单已完成',
+ 6: '订单已取消'
+ }
+ }
+ };
+
+ const payTypeKey = String(payType);
+ const statusTextMapItem = statusTextMap[payTypeKey] || statusTextMap['1'];
+ const pageTypeMap = statusTextMapItem[pageType] || statusTextMapItem.default;
+
+ return pageTypeMap[status] || '未知状态';
+}
+
+/**
+ * 获取步骤列表
+ * @param {Object} params - 参数对象
+ * @param {number} params.type - 页面类型 0: default, 1: job-order
+ * @param {number} params.payType - 支付类型 0: 先付后用, 1: 先试用后支付
+ * @returns {Array} 步骤列表
+ */
+export function getStepsList(params) {
+ const { type = 0, payType = 1 } = params;
+
+ // 根据type确定pageType
+ const pageType = type == 1 ? 'job-order' : 'default';
+
+ const stepsListMap = {
+ 0: { // 先付后用
+ 'job-order': [
+ { title: "师傅确认", date: "" },
+ { title: "企业支付", date: "" },
+ { title: "进行", date: "" },
+ { title: "试工完成", date: "" },
+ { title: "订单完成", date: "" }
+ ],
+ default: [
+ { title: "接单", date: "" },
+ { title: "企业支付", date: "" },
+ { title: "进行", date: "" },
+ { title: "试工完成", date: "" },
+ { title: "订单完成", date: "" }
+ ]
+ },
+ 1: { // 试用后支付
+ 'job-order': [
+ { title: "师傅确认", date: "" },
+ { title: "进行", date: "" },
+ { title: "试工完成", date: "" },
+ { title: "企业确认", date: "" },
+ { title: "企业支付", date: "" },
+ { title: "订单完成", date: "" }
+ ],
+ default: [
+ { title: "接单", date: "" },
+ { title: "进行", date: "" },
+ { title: "试工完成", date: "" },
+ { title: "企业确认", date: "" },
+ { title: "企业支付", date: "" },
+ { title: "订单完成", date: "" }
+ ]
+ }
+ };
+
+ const stepsListMapItem = stepsListMap[payType] || stepsListMap[1];
+ return stepsListMapItem[pageType] || stepsListMapItem.default;
+}
+
+export default {
+ getStatusText,
+ getStepsList
+};
\ No newline at end of file