From ac93b8e73b8bdcf209c8c8f7e5d1318bec524854 Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Thu, 16 Jul 2026 07:56:43 +0800
Subject: [PATCH] =?UTF-8?q?feat:scScanner=E6=94=AF=E6=8C=81=E6=89=AB?=
 =?UTF-8?q?=E7=A0=81=E6=9E=AA(=E8=93=9D=E7=89=99/USB)=E8=BE=93=E5=85=A5,?=
 =?UTF-8?q?=E5=A5=97=E5=A3=B3=E7=8E=AF=E5=A2=83=E4=BF=9D=E7=95=99=E5=8E=9F?=
 =?UTF-8?q?=E7=94=9F=E6=89=AB=E7=A0=81=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

增强公共扫码组件:常驻扫码枪输入框(HID键盘,聚焦后扫码回车触发),
检测到window.Android时额外显示原生扫码按钮;统一emit scanResult事件,
28个引用页面向后兼容。含中文输入法检测提示。平板蓝牙枪、PC USB枪均可用。

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
---
 src/components/scScanner.vue | 62 +++++++++++++++++++++++++-----------
 1 file changed, 44 insertions(+), 18 deletions(-)

diff --git a/src/components/scScanner.vue b/src/components/scScanner.vue
index ada5fa4e..2f03bc60 100644
--- a/src/components/scScanner.vue
+++ b/src/components/scScanner.vue
@@ -1,39 +1,65 @@
 
 <template>
-  <div>
-    <el-button type="primary" @click="scanCode" style="margin-left:4px">{{labeltext}}</el-button>
-  </div>
+  <span class="sc-scanner" style="display:inline-flex;align-items:center;gap:4px;vertical-align:middle;">
+    <!-- 扫码枪(蓝牙/USB HID):聚焦后扫码即输入,回车触发。平板蓝牙枪、PC USB枪都走这里 -->
+    <el-input
+      ref="gunInput"
+      v-model="gunValue"
+      :placeholder="placeholder"
+      clearable
+      :style="{ width: gunWidth }"
+      @keydown.enter.prevent="onGunScan"
+    />
+    <!-- 套壳App原生扫码(摄像头/激光):仅在检测到 window.Android 时显示,保留 gx 现有能力 -->
+    <el-button v-if="hasAndroid" type="primary" @click="scanCode">{{ labeltext }}</el-button>
+  </span>
 </template>
 
 <script>
 export default {
   props: {
-    labeltext: {
-      type: String,
-      default: "扫码",
-    }
+    labeltext: { type: String, default: "扫码" },
+    placeholder: { type: String, default: "扫码枪扫描" },
+    gunWidth: { type: String, default: "180px" },
   },
   data() {
     return {
       scannedResult: null, // 存储扫描到的二维码数据
+      gunValue: "", // 扫码枪输入缓冲
+      hasAndroid: !!window.Android, // 是否套壳App环境(有原生扫码)
     };
   },
   mounted() {
     window.onScanResult = this.onScanResult;
   },
   methods: {
-    scanCode(){
-			if (window.Android) {
-				window.Android.openScanner();
-			} else {
-				alert("当前环境不支持扫码");
-			}
-		},
-		onScanResult(data) {
-			this.scannedResult = data;
-      this.$emit('scanResult', data);
+    // 套壳App原生扫码(摄像头/激光)
+    scanCode() {
+      if (window.Android) {
+        window.Android.openScanner();
+      } else {
+        alert("当前环境不支持原生扫码");
+      }
+    },
+    // 扫码枪(键盘输入)扫描完成:枪扫完通常自动回车
+    onGunScan() {
+      let v = (this.gunValue || "").trim();
+      this.gunValue = "";
+      if (!v) return;
+      if (/[一-龥]/.test(v)) {
+        this.$message
+          ? this.$message.error("扫码内容含中文,请切换英文输入法后重试")
+          : alert("扫码内容含中文,请切换英文输入法后重试");
+        return;
+      }
+      this.$emit("scanResult", v);
+    },
+    // 原生扫码回调(window.onScanResult)
+    onScanResult(data) {
+      this.scannedResult = data;
+      this.$emit("scanResult", data);
       return data;
-		}, 
+    },
   },
 };
 </script>