From 811a72cf34ac2cc57d7168c8d456925da3130055 Mon Sep 17 00:00:00 2001
From: BAKEYi <16298417+bakeyi@user.noreply.gitee.com>
Date: Wed, 3 Jun 2026 16:37:31 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=B8=E9=94=80=E9=A1=B5=EF=BC=88=E6=89=AB?=
 =?UTF-8?q?=E7=A0=81+=E6=89=8B=E5=8A=A8=E8=BE=93=E5=85=A5=E7=A0=81?=
 =?UTF-8?q?=EF=BC=89=E7=BC=BA=E5=A4=B1=E5=8F=82=E6=95=B0bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/shop/verify/manual-verify.vue       | 1 +
 pages/shop/verify/verify-order-detail.vue | 8 +++++++-
 pages/shop/verify/verify-order.nvue       | 1 +
 3 files changed, 9 insertions(+), 1 deletion(-)

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({