diff --git a/components/order-status/index.vue b/components/order-status/index.vue
index 45face0..1d8b135 100644
--- a/components/order-status/index.vue
+++ b/components/order-status/index.vue
@@ -73,7 +73,7 @@
},
'1' : {//试用以后支付
'job-order': {
- 0: '等待企业确认',
+ 0: '待待师傅确认',
1: '订单进行中',
2: '试工完成',
3: '企业待支付',
diff --git a/pages/home/index.vue b/pages/home/index.vue
index d91702f..35932a5 100644
--- a/pages/home/index.vue
+++ b/pages/home/index.vue
@@ -119,6 +119,10 @@
},
onShow() {
+ this.rpageNo = 1
+ this.rlist = []
+ this.tpageNo = 1
+ this.tList = []
this.onBannerList()
this.onTaskList()
this.onRolelist()
@@ -138,7 +142,6 @@
that.tList = []
that.onTaskList()
}
-
},
onReachBottom() {
let that = this
diff --git a/pages_subpack/job-order-detail/index.vue b/pages_subpack/job-order-detail/index.vue
index e4a453e..7527680 100644
--- a/pages_subpack/job-order-detail/index.vue
+++ b/pages_subpack/job-order-detail/index.vue
@@ -285,27 +285,17 @@
this.type = options.type || ''
},
onShow(){
- this.checkOrderStatus()
+ this.onOrderDetail()
},
- methods: {
- // 检查订单状态并获取订单详情
- checkOrderStatus() {
+ methods: {
+ checkStatus(){
let that = this
- let params = {
- orderId: that.orderId
- }
- orderDetail(params).then(response => {
- that.obj = response.result
- // 如果是求职者且orderStatusSeek没有值,跳转到保险页面
- if (that.type && that.obj && !that.obj.orderStatusSeek && that.obj.status > 0) {
- uni.navigateTo({
- url: "/pages_subpack/payment/index?id=" + that.orderId
- })
- }
- }).catch(error => {
-
- })
- },
+ if (that.type && that.obj && !that.obj.orderStatusSeek && that.obj.status > 0 && that.obj.status < 4) {
+ uni.navigateTo({
+ url: "/pages_subpack/payment/index?id=" + that.orderId
+ })
+ }
+ },
onOrderDetail() {
let that = this
let params = {
@@ -313,6 +303,7 @@
}
orderDetail(params).then(response => {
that.obj = response.result
+ this.checkStatus()
}).catch(error => {
})
diff --git a/pages_subpack/order-detail/index.vue b/pages_subpack/order-detail/index.vue
index 15708bc..df6d116 100644
--- a/pages_subpack/order-detail/index.vue
+++ b/pages_subpack/order-detail/index.vue
@@ -201,27 +201,18 @@
this.orderId = options.orderId
},
onShow() {
- this.checkOrderStatus()
- },
- // 检查订单状态并获取订单详情
- checkOrderStatus() {
- let that = this
- let params = {
- orderId: that.orderId
- }
- orderDetail(params).then(response => {
- that.obj = response.result
- // 如果是求职者且orderStatusSeek没有值,跳转到保险页面
- if (that.obj && !that.obj.orderStatusSeek && that.obj.status > 0) {
- uni.navigateTo({
- url: "/pages_subpack/payment/index?id=" + that.orderId
- })
- }
- }).catch(error => {
-
- })
+ this.onOrderDetail()
},
methods: {
+ checkStatus(){
+ let that = this
+ // 如果是求职者且orderStatusSeek没有值,跳转到保险页面
+ if (that.obj && !that.obj.orderStatusSeek && that.obj.status > 0 && that.obj.status < 4) {
+ uni.navigateTo({
+ url: "/pages_subpack/payment/index?id=" + that.orderId
+ })
+ }
+ },
onOrderDetail() {
let that = this
let params = {
@@ -229,6 +220,7 @@
}
orderDetail(params).then(response => {
that.obj = response.result
+ this.checkStatus()
}).catch(error => {
})
diff --git a/pages_subpack/pay/index.vue b/pages_subpack/pay/index.vue
index 692751b..9cef422 100644
--- a/pages_subpack/pay/index.vue
+++ b/pages_subpack/pay/index.vue
@@ -16,14 +16,14 @@
- {{ detail.workUser }}
- {{ detail.workPhone }}
+ {{ detail.employResume ? detail.employResume.name : detail.workUser }}
+ {{ detail.employResume ? detail.employResume.phone : detail.workPhone }}
- {{ detail.workUser }}
+ {{ detail.employResume ? detail.employResume.name : detail.workUser }}
$ {{ detail.payMoney }}
@@ -163,7 +163,7 @@
if (this.detail.type == 1) {
// 个人发布求职,企业承担保险费、交通费用
- return basePrice + premiumFee + trafficFee;
+ return basePrice + premiumFee
} else {
// 企业发布招聘,企业不需要支付保险、交通费,由个人承担
return basePrice;
diff --git a/pages_subpack/release/component/enterprise.vue b/pages_subpack/release/component/enterprise.vue
index 56d3c83..187875f 100644
--- a/pages_subpack/release/component/enterprise.vue
+++ b/pages_subpack/release/component/enterprise.vue
@@ -108,6 +108,7 @@
{
// if(error.result.orderStatusSeek == 'Y'){
uni.navigateTo({
@@ -188,13 +188,13 @@
// })
// }
}, 800);
- } else {
- // 显示错误信息
- uni.showToast({
- title: error.message || '操作失败',
- icon: 'none'
- })
- }
+ // } else {
+ // // 显示错误信息
+ // uni.showToast({
+ // title: error.message || '操作失败',
+ // icon: 'none'
+ // })
+ // }
} else {
uni.showToast({
title: error.message || '操作失败',