diff --git a/pages/shop/verify/manual-verify.vue b/pages/shop/verify/manual-verify.vue index 26f883d..5ccb819 100644 --- a/pages/shop/verify/manual-verify.vue +++ b/pages/shop/verify/manual-verify.vue @@ -76,6 +76,7 @@ export default { }).then(res => { uni.hideLoading(); if (res.code === 200 && res.data) { + res.data.server_code = this.code; // 查询成功,带上数据跳 detail 页 const orderDataStr = encodeURIComponent(JSON.stringify(res.data)); uni.navigateTo({ diff --git a/pages/shop/verify/verify-order-detail.vue b/pages/shop/verify/verify-order-detail.vue index 8d93cec..9a5e610 100644 --- a/pages/shop/verify/verify-order-detail.vue +++ b/pages/shop/verify/verify-order-detail.vue @@ -73,6 +73,8 @@ export default { statusBarHeight: 44, orderData: { orderId: '', + orderType: '', // 订单类型 + serverCode: '', // 核销码 customerName: '', customerPhone: '', goodsImg: '', @@ -111,6 +113,8 @@ export default { mapOrderData(data) { this.orderData = { orderId: data.order_id || '', + orderType: data.order_type || '', // 映射订单类型 + serverCode: data.server_code || '', // 映射核销码 customerName: data.user_name || '--', customerPhone: data.user_phone || '--', goodsImg: data.order_photo || 'https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/default_goods.png', @@ -154,7 +158,9 @@ export default { // 调用核销接口 request.post('/sj/poster/useOrderServerCode', { - id: this.orderData.orderId + id: this.orderData.orderId, + order_type: this.orderData.orderType, + server_code: this.orderData.serverCode }).then(res => { uni.hideLoading(); if (res.code === 200) { diff --git a/pages/shop/verify/verify-order.nvue b/pages/shop/verify/verify-order.nvue index 83e98c2..a21a35b 100644 --- a/pages/shop/verify/verify-order.nvue +++ b/pages/shop/verify/verify-order.nvue @@ -87,6 +87,7 @@ export default { uni.hideLoading(); if (result.code === 200 && result.data) { + result.data.server_code = code; uni.showToast({ title: '扫码成功!', icon: 'none' }); const orderDataStr = encodeURIComponent(JSON.stringify(result.data)); uni.navigateTo({