diff --git a/pages/order/detail.vue b/pages/order/detail.vue index 95d97dc..7aae80a 100755 --- a/pages/order/detail.vue +++ b/pages/order/detail.vue @@ -826,7 +826,7 @@ // app.getOrderDetail(true) // }, 1500) // }) - this.$navTo('pages/order/delivery', { + app.$navTo('pages/order/delivery', { orderId }) } diff --git a/pages/order/index.vue b/pages/order/index.vue index 7ff3ebf..bac515d 100755 --- a/pages/order/index.vue +++ b/pages/order/index.vue @@ -113,7 +113,7 @@ 绑定设备 - 确认收货 + 确认收货 @@ -468,13 +468,16 @@ content: '确认收到商品了吗?', success(o) { if (o.confirm) { - OrderApi.receipt(orderId) - .then(result => { - // 显示成功信息 - app.$success(result.message) - // 刷新订单列表 - app.onRefreshList() - }) + // OrderApi.receipt(orderId) + // .then(result => { + // // 显示成功信息 + // app.$success(result.message) + // // 刷新订单列表 + // app.onRefreshList() + // }) + app.$navTo('pages/order/delivery', { + orderId + }) } } }); diff --git a/websoft/api/equipment.js b/websoft/api/equipment.js index 6b03286..94f85fa 100644 --- a/websoft/api/equipment.js +++ b/websoft/api/equipment.js @@ -9,7 +9,7 @@ export const getEquipment = (equipmentId) => http.get('/apps/equipment/' + equip // 绑定设备 export const bindEquipment = (data) => http.post('/open/equipment/bind', data) -// 绑定设备 +// 换电 export const changeEquipment = (data) => http.post('/open/equipment/change', data) // 退租