diff --git a/common/js/request.js b/common/js/request.js
index bc68785..3f78cbc 100644
--- a/common/js/request.js
+++ b/common/js/request.js
@@ -13,8 +13,8 @@ export default {
})
let userInfo = _this.getCurUserInfo();
// request 触发前拼接 url
- // args.url = 'https://www.opsoul.com' + args.url;
- args.url = 'http://127.0.0.1:80' + args.url;
+ args.url = 'https://www.opsoul.com' + args.url;
+ // args.url = 'http://127.0.0.1:80' + args.url;
// args.url = 'http://192.168.2.42:80' + args.url;
if (!args.data) {
@@ -598,5 +598,13 @@ export default {
data: params
})
return res[1].data;
+ },
+ async rejectDetailOrder(params = {}) {
+ let res = await uni.request({
+ url: '/order/detail/app/order/reject',
+ method: 'POST',
+ data: params
+ })
+ return res[1].data;
}
}
diff --git a/pages/order-manage/order-manage.vue b/pages/order-manage/order-manage.vue
index df41d35..71ac496 100644
--- a/pages/order-manage/order-manage.vue
+++ b/pages/order-manage/order-manage.vue
@@ -136,7 +136,8 @@
-
+
+
@@ -832,6 +833,43 @@
isAll: 1
}
return await this.assignWork(params);
+ },
+ async rejectMasterOrder(order) {
+ let res = await this.$request.updateOrder({
+ id: order.orderMasterId,
+ workerId: -1
+ });
+ if (res && res.code === 0) {
+ this.reloadMasterOrderPage();
+ uni.showToast({
+ icon: 'none',
+ title: '拒绝接单成功',
+ duration: 1000
+ })
+ } else {
+ uni.showToast({
+ icon: 'none',
+ title: '拒绝接单失败'
+ })
+ }
+ },
+ async rejectDetailOrder(order) {
+ let res = await this.$request.rejectDetailOrder({
+ id: order.orderDetailId
+ });
+ if (res && res.code === 0) {
+ this.reloadMasterOrderPage();
+ uni.showToast({
+ icon: 'none',
+ title: '拒绝接单成功',
+ duration: 1000
+ })
+ } else {
+ uni.showToast({
+ icon: 'none',
+ title: '拒绝接单失败'
+ })
+ }
}
}
}