From 52947ed869ed1091a858cf899523fc635b30fe5f Mon Sep 17 00:00:00 2001
From: gongfuxiang <fuxiang.gong@qq.com>
Date: Wed, 25 Feb 2026 18:19:19 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=86=E9=94=80=E8=87=AA=E6=8F=90=E7=82=B9?=
 =?UTF-8?q?=E5=8F=96=E8=B4=A7=E6=94=AF=E6=8C=81=E6=89=AB=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 locale/en.json                                |  4 +-
 locale/zh.json                                |  4 +-
 .../extraction-apply/extraction-apply.vue     |  2 +-
 .../extraction-order/extraction-order.vue     | 49 ++++++++++++++++---
 4 files changed, 45 insertions(+), 14 deletions(-)

diff --git a/locale/en.json b/locale/en.json
index 8559f580..01773ed3 100644
--- a/locale/en.json
+++ b/locale/en.json
@@ -1022,7 +1022,7 @@
 	"extraction-apply": {
 		"extraction-apply": {
 			"u439pg": "Logo image",
-			"bflosr": "Suggest 300x300px",
+			"bflosr": "Suggest 300*300px",
 			"9t81k8": "alias",
 			"cy87k6": "Provinces cities and districts",
 			"liqbru": "Please select a province first",
@@ -1055,8 +1055,6 @@
 	"extraction-order": {
 		"extraction-order": {
 			"2y7lq1": "Picking up goods",
-			"3m038g": "Pickup code",
-			"xb4044": "search criteria",
 			"suo4oz": "Please enter the pickup code",
 			"kuqvlv": "Order number/pickup code",
 			"znufs8": "Please enter the pickup code",
diff --git a/locale/zh.json b/locale/zh.json
index a4c83fa2..3cb11e20 100644
--- a/locale/zh.json
+++ b/locale/zh.json
@@ -1012,7 +1012,7 @@
 	"extraction-apply": {
 		"extraction-apply": {
 			"u439pg": "logo图片",
-			"bflosr": "建议300x300px",
+			"bflosr": "建议300*300px",
 			"9t81k8": "别名",
 			"cy87k6": "省市区",
 			"liqbru": "请先选择省份",
@@ -1045,8 +1045,6 @@
 	"extraction-order": {
 		"extraction-order": {
 			"2y7lq1": "取货",
-			"3m038g": "取货码",
-			"xb4044": "搜索条件",
 			"suo4oz": "请输入取货码",
 			"kuqvlv": "订单号/取货码",
 			"znufs8": "请输入取件码",
diff --git a/pages/plugins/distribution/extraction-apply/extraction-apply.vue b/pages/plugins/distribution/extraction-apply/extraction-apply.vue
index 3445bfb6..59395605 100644
--- a/pages/plugins/distribution/extraction-apply/extraction-apply.vue
+++ b/pages/plugins/distribution/extraction-apply/extraction-apply.vue
@@ -2,7 +2,7 @@
     <view :class="theme_view">
         <view class="page-bottom-fixed">
             <form @submit="form_submit" class="form-container">
-                <view class="padding-main oh border-radius-main">
+                <view class="margin-main oh border-radius-main">
                     <view class="form-gorup bg-white form-container-upload oh">
                         <view class="form-gorup-title">{{$t('extraction-apply.extraction-apply.u439pg')}}<text class="form-group-tips">{{$t('extraction-apply.extraction-apply.bflosr')}}</text></view>
                         <view class="form-upload-data oh">
diff --git a/pages/plugins/distribution/extraction-order/extraction-order.vue b/pages/plugins/distribution/extraction-order/extraction-order.vue
index 27669411..6ed602c7 100644
--- a/pages/plugins/distribution/extraction-order/extraction-order.vue
+++ b/pages/plugins/distribution/extraction-order/extraction-order.vue
@@ -48,9 +48,15 @@
         <!-- 取货 popup -->
         <component-popup :propShow="is_show_take_popup" propPosition="bottom" @onclose="take_popup_event_close">
             <view class="form-container bg-base padding-horizontal-main padding-top-main padding-bottom-xs">
-                <view class="form-gorup tc bg-white margin-top-lg">
-                    <view class="form-gorup-title">{{$t('extraction-order.extraction-order.3m038g')}}</view>
-                    <input type="number" :value="extraction_code" placeholder-class="cr-grey" class="cr-base" :placeholder="$t('extraction-order.extraction-order.suo4oz')" maxlength="4" @input="extraction_code_input_event" />
+                <view class="form-gorup tc bg-white border-radius-main margin-top-lg">
+                    <view class="flex-row align-c">
+                        <!-- #ifndef H5 -->
+                        <view class="margin-right" @tap="scan_event" data-type="take">
+                            <uni-icons type="scan" size="56rpx" color="#666"></uni-icons>
+                        </view>
+                        <!-- #endif -->
+                        <input type="number" class="wh-auto" :placeholder="$t('extraction-order.extraction-order.suo4oz')" placeholder-class="cr-grey-c" :value="extraction_code" @input="extraction_code_input_event" />
+                    </view>
                 </view>
                 <view class="form-gorup form-gorup-submit">
                     <button class="bg-main br-main cr-white round text-size" type="default" hover-class="none" :disabled="form_submit_disabled_status" @tap="form_submit_take_event">{{$t('common.confirm')}}</button>
@@ -61,9 +67,15 @@
         <!-- 搜索 popup -->
         <component-popup :propShow="is_show_search_popup" propPosition="bottom" @onclose="search_popup_event_close">
             <view class="form-container bg-base padding-horizontal-main padding-top-main padding-bottom-xs">
-                <view class="form-gorup tc bg-white margin-top-lg">
-                    <view class="form-gorup-title">{{$t('extraction-order.extraction-order.xb4044')}}</view>
-                    <input type="number" :value="search_keywords_value" placeholder-class="cr-grey" class="cr-base" :placeholder="$t('extraction-order.extraction-order.kuqvlv')" @input="search_input_keywords_event" />
+                <view class="form-gorup tc bg-white border-radius-main margin-top-lg">
+                    <view class="flex-row align-c">
+                        <!-- #ifndef H5 -->
+                        <view class="margin-right" @tap="scan_event" data-type="search">
+                            <uni-icons type="scan" size="56rpx" color="#666"></uni-icons>
+                        </view>
+                        <!-- #endif -->
+                        <input type="number" class="wh-auto" :placeholder="$t('extraction-order.extraction-order.suo4oz')" placeholder-class="cr-grey-c" :value="search_keywords_value" @input="search_input_keywords_event" />
+                    </view>
                 </view>
                 <view class="form-gorup form-gorup-submit">
                     <button class="bg-main-pair br-main-pair cr-white round text-size" type="default" hover-class="none" :disabled="form_submit_disabled_status" @tap="search_submit_event">{{$t('common.search')}}</button>
@@ -410,7 +422,30 @@ const app = getApp();
                     data_page: 1,
                 });
                 this.get_data_list(1);
-            },
+            },
+
+            // 扫码事件
+            scan_event(e) {
+                var self = this;
+                var type = e.currentTarget.dataset.type
+                uni.scanCode({
+                	success: function (res) {
+                        if((res.result || null) != null) {
+                            if(type == 'search') {
+                                self.setData({
+                                    search_keywords_value: res.result,
+                                });
+                                self.search_submit_event();
+                            } else {
+                                self.setData({
+                                    extraction_code: res.result,
+                                });
+                                self.form_submit_take_event();
+                            }
+                        }
+                	}
+                });
+            }
         },
     };
 </script>