From 13039715d50c99f945c5e610a94b3929450a80d3 Mon Sep 17 00:00:00 2001
From: lijuncheng <juncheng.li@ccwin-in.com>
Date: Wed, 10 Apr 2024 19:00:41 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BA=93=E4=BD=8D=E6=89=AB?=
 =?UTF-8?q?=E6=8F=8F=E6=A0=87=E7=AD=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/common/label.js                           | 10 ++++++----
 src/mycomponents/location/locationCompare.vue |  2 +-
 src/mycomponents/scan/winScanLocation.vue     |  2 +-
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/common/label.js b/src/common/label.js
index 03e65b84..83308d4c 100644
--- a/src/common/label.js
+++ b/src/common/label.js
@@ -42,10 +42,12 @@ export function getLabelInfo(scanMsg,headerType, callBack) {
 		if (type == 'Q') //qrcode
 		{
 			getQRCodeInfo(header, version, scanMsg, callBack);
-		} else if (type == 'B') //barcode
-		{
-			getBarCodeInfo(header, version, items[2], callBack);
-		} else { //直接输入文本
+		} 
+		// else if (type == 'B') //barcode
+		// {
+		// 	getBarCodeInfo(header, version, items[2], callBack);
+		// }
+		 else { //直接输入文本
 			getBarCodeInfo('text', 'V1.0', scanMsg, callBack);
 		}
 	}else {
diff --git a/src/mycomponents/location/locationCompare.vue b/src/mycomponents/location/locationCompare.vue
index f0f1cad2..fe715ba7 100644
--- a/src/mycomponents/location/locationCompare.vue
+++ b/src/mycomponents/location/locationCompare.vue
@@ -83,7 +83,7 @@
 			},
 			copy() {
 				// HPQ;V1.0;ICE115F11161AG;PP20230427000026;B20230427002;Q100
-				var content = "HLB;V1.0;" + this.recommendLocationCode;
+				var content = this.recommendLocationCode;
 				// #ifdef H5
 				this.$copyText(content).then(
 					res => {
diff --git a/src/mycomponents/scan/winScanLocation.vue b/src/mycomponents/scan/winScanLocation.vue
index 3b4b460d..24f8dfc8 100644
--- a/src/mycomponents/scan/winScanLocation.vue
+++ b/src/mycomponents/scan/winScanLocation.vue
@@ -13,7 +13,7 @@
 			<view class="">
 				<view class="">
 					<win-com-scan ref="scan"  @getResult="getScanResult" :placeholder='title' :clearResult="false"
-						:boxFocus="true" :isShowHistory="isShowHistory" headerType="HLB">
+						:boxFocus="true" :isShowHistory="isShowHistory" headerType="">
 					</win-com-scan>
 				</view>
 			</view>