From ad54882da26c28fb389a00231bd172faa1c61114 Mon Sep 17 00:00:00 2001
From: gongfuxiang <fuxiang.gong@qq.com>
Date: Tue, 12 Aug 2025 19:50:00 +0800
Subject: [PATCH] =?UTF-8?q?=E8=87=AA=E6=8F=90=E8=AE=A2=E5=8D=95=E5=8F=96?=
 =?UTF-8?q?=E8=B4=A7=E7=A0=81=E6=94=BE=E5=88=B0=E6=9C=80=E4=B8=8A=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 locale/en.json                                |  3 +--
 locale/zh.json                                |  3 +--
 .../orderallot-detail/orderallot-detail.css   |  4 +--
 .../orderallot-detail/orderallot-detail.vue   | 26 +++++++++----------
 pages/user-order-detail/user-order-detail.css |  4 +--
 pages/user-order-detail/user-order-detail.vue | 26 +++++++++----------
 6 files changed, 32 insertions(+), 34 deletions(-)

diff --git a/locale/en.json b/locale/en.json
index 5fcf8f23..84f088f4 100644
--- a/locale/en.json
+++ b/locale/en.json
@@ -393,9 +393,8 @@
 			"41ty94": "Total pieces",
 			"xcj552": "element",
 			"7xtnjt": "Unconfigured data",
-			"7dikfm": "Pickup info",
             "0876xf": "Express delivery info",
-			"o38952": "Pickup code:",
+			"o38952": "Pickup code",
 			"0f26j2": "Order Information",
 			"ct34n5": "Extended Data",
 			"y9woor": "Key Information",
diff --git a/locale/zh.json b/locale/zh.json
index 9cd2a0b4..a92737ac 100644
--- a/locale/zh.json
+++ b/locale/zh.json
@@ -383,9 +383,8 @@
 			"423rmr": "共",
 			"41ty94": "件 合计",
 			"7xtnjt": "未配置数据",
-			"7dikfm": "取货信息",
             "0876xf": "快递信息",
-			"o38952": "取货码：",
+			"o38952": "取货码",
 			"0f26j2": "订单信息",
 			"ct34n5": "扩展数据",
 			"y9woor": "密钥信息",
diff --git a/pages/plugins/realstore/orderallot-detail/orderallot-detail.css b/pages/plugins/realstore/orderallot-detail/orderallot-detail.css
index 52848c0d..0fb7bb8f 100644
--- a/pages/plugins/realstore/orderallot-detail/orderallot-detail.css
+++ b/pages/plugins/realstore/orderallot-detail/orderallot-detail.css
@@ -68,6 +68,6 @@
 * 自提信息
 */
 .site-extraction .panel-content .qrcode {
-    width: 260rpx;
-    height: 260rpx;
+    width: 340rpx;
+    height: 340rpx;
 }
\ No newline at end of file
diff --git a/pages/plugins/realstore/orderallot-detail/orderallot-detail.vue b/pages/plugins/realstore/orderallot-detail/orderallot-detail.vue
index ad031604..ae75f951 100644
--- a/pages/plugins/realstore/orderallot-detail/orderallot-detail.vue
+++ b/pages/plugins/realstore/orderallot-detail/orderallot-detail.vue
@@ -1,7 +1,19 @@
 <template>
     <view :class="theme_view">
         <block v-if="detail != null">
-            <view class="padding-horizontal-main padding-top-main">
+            <view class="padding-horizontal-main padding-top-main">
+                <!-- 自提信息 -->
+                <view v-if="(detail.extraction_data || null) != null" class="site-extraction panel-item padding-main border-radius-main bg-white spacing-mb">
+                    <view class="br-b padding-bottom-main fw-b text-size">{{$t('user-order-detail.user-order-detail.o38952')}}</view>
+                    <view class="panel-content oh tc padding-top-main">
+                        <view :data-value="detail.extraction_data.code" @tap="text_copy_event">
+                            <text class="fw-b cr-black text-size-xxl va-m">{{ detail.extraction_data.code || $t("user-order-detail.user-order-detail.hpq62x") }}</text>
+                            <text class="bg-white br-green cr-green round padding-horizontal-sm text-size-xs va-m margin-left">{{$t('common.copy')}}</text>
+                        </view>
+                        <image v-if="(detail.extraction_data.images || null) != null" class="qrcode br radius margin-top-xs" :src="detail.extraction_data.images" mode="aspectFill"></image>
+                    </view>
+                </view>
+
                 <!-- 地址 -->
                 <view v-if="(detail.order_type == 0 || detail.order_type == 1 || detail.order_type == 2) && (detail.address_data || null) != null" class="address bg-white padding-horizontal-main padding-top-main border-radius-main spacing-mb">
                     <view class="address-base oh">
@@ -63,18 +75,6 @@
                     </view>
                 </view>
 
-                <!-- 自提信息 -->
-                <view v-if="(detail.extraction_data || null) != null" class="site-extraction panel-item padding-main border-radius-main bg-white spacing-mb">
-                    <view class="br-b padding-bottom-main fw-b text-size">{{$t('user-order-detail.user-order-detail.7dikfm')}}</view>
-                    <view class="panel-content oh padding-top-main">
-                        <view>
-                            <text>{{$t('user-order-detail.user-order-detail.o38952')}}</text>
-                            <text class="radius bg-green cr-white padding-left-sm padding-right-sm">{{ detail.extraction_data.code || $t("user-order-detail.user-order-detail.hpq62x") }}</text>
-                        </view>
-                        <image v-if="(detail.extraction_data.images || null) != null" class="qrcode br radius margin-top-lg" :src="detail.extraction_data.images" mode="aspectFill"></image>
-                    </view>
-                </view>
-
                 <!-- 订单基础数据 -->
                 <view v-if="detail_list.length > 0" class="panel-item padding-main border-radius-main bg-white spacing-mb">
                     <view class="br-b padding-bottom-main fw-b text-size">{{$t('user-order-detail.user-order-detail.0f26j2')}}</view>
diff --git a/pages/user-order-detail/user-order-detail.css b/pages/user-order-detail/user-order-detail.css
index 942fb9a4..8be2e516 100644
--- a/pages/user-order-detail/user-order-detail.css
+++ b/pages/user-order-detail/user-order-detail.css
@@ -61,6 +61,6 @@
 * 自提信息
 */
 .site-extraction .panel-content .qrcode {
-    width: 260rpx;
-    height: 260rpx;
+    width: 340rpx;
+    height: 340rpx;
 }
\ No newline at end of file
diff --git a/pages/user-order-detail/user-order-detail.vue b/pages/user-order-detail/user-order-detail.vue
index e85576b6..6dacfac9 100644
--- a/pages/user-order-detail/user-order-detail.vue
+++ b/pages/user-order-detail/user-order-detail.vue
@@ -1,7 +1,19 @@
 <template>
     <view :class="theme_view">
         <block v-if="detail != null">
-            <view class="padding-horizontal-main padding-top-main">
+            <view class="padding-horizontal-main padding-top-main">
+                <!-- 自提信息 -->
+                <view v-if="(detail.extraction_data || null) != null" class="site-extraction panel-item padding-main border-radius-main bg-white spacing-mb">
+                    <view class="br-b padding-bottom-main fw-b text-size">{{$t('user-order-detail.user-order-detail.o38952')}}</view>
+                    <view class="panel-content oh tc padding-top-main">
+                        <view :data-value="detail.extraction_data.code" @tap="text_copy_event">
+                            <text class="fw-b cr-black text-size-xxl va-m">{{ detail.extraction_data.code || $t("user-order-detail.user-order-detail.hpq62x") }}</text>
+                            <text class="bg-white br-green cr-green round padding-horizontal-sm text-size-xs va-m margin-left">{{$t('common.copy')}}</text>
+                        </view>
+                        <image v-if="(detail.extraction_data.images || null) != null" class="qrcode br radius margin-top-xs" :src="detail.extraction_data.images" mode="aspectFill"></image>
+                    </view>
+                </view>
+
                 <!-- 地址 -->
                 <view v-if="(detail.address_data || null) != null" class="address bg-white padding-horizontal-main padding-top-main border-radius-main spacing-mb">
                     <view class="address-base padding-top-xs padding-bottom oh">
@@ -100,18 +112,6 @@
                     </view>
                 </view>
 
-                <!-- 自提信息 -->
-                <view v-if="(detail.extraction_data || null) != null" class="site-extraction panel-item padding-main border-radius-main bg-white spacing-mb">
-                    <view class="br-b padding-bottom-main fw-b text-size">{{$t('user-order-detail.user-order-detail.7dikfm')}}</view>
-                    <view class="panel-content oh padding-top-main">
-                        <image v-if="(detail.extraction_data.images || null) != null" class="qrcode br radius margin-bottom-sm" :src="detail.extraction_data.images" mode="aspectFill"></image>
-                        <view>
-                            <text>{{$t('user-order-detail.user-order-detail.o38952')}}</text>
-                            <text class="radius bg-green cr-white padding-left-sm padding-right-sm">{{ detail.extraction_data.code || $t('user-order-detail.user-order-detail.hpq62x') }}</text>
-                        </view>
-                    </view>
-                </view>
-
                 <!-- 订单基础数据 -->
                 <view v-if="detail_list.length > 0" class="panel-item padding-main border-radius-main bg-white spacing-mb">
                     <view class="br-b padding-bottom-main fw-b text-size">{{$t('user-order-detail.user-order-detail.0f26j2')}}</view>