From 19865348c7499e36428154b0b70ba53580689ed7 Mon Sep 17 00:00:00 2001
From: "97694732@qq.com" <Long6166@@>
Date: Thu, 4 Jun 2026 16:21:41 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9B=9E=E9=80=80=E6=89=AB=E7=A0=81=E6=96=B9?=
 =?UTF-8?q?=E6=A1=88:=E5=88=A0=E9=99=A4=E8=87=AA=E5=AE=9A=E4=B9=89?=
 =?UTF-8?q?=E6=89=AB=E7=A0=81=E9=A1=B5,=E7=9B=B4=E6=8E=A5=E4=BD=BF?=
 =?UTF-8?q?=E7=94=A8uni.scanCode(=E5=AE=89=E5=8D=93=E5=8E=9F=E7=94=9F)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages.json                 |   7 ---
 pages/upload/scan-isbn.vue | 107 -------------------------------------
 pages/upload/upload.vue    |  27 ++++------
 3 files changed, 10 insertions(+), 131 deletions(-)
 delete mode 100644 pages/upload/scan-isbn.vue

diff --git a/pages.json b/pages.json
index b813f0b..3e23a64 100644
--- a/pages.json
+++ b/pages.json
@@ -53,13 +53,6 @@
 			"style": {
 				"navigationBarTitleText": "图书上传"
 			}
-		},
-		{
-			"path": "pages/upload/scan-isbn",
-			"style": {
-				"navigationBarTitleText": "",
-				"navigationStyle": "custom"
-			}
 		}
 	],
 	"globalStyle": {
diff --git a/pages/upload/scan-isbn.vue b/pages/upload/scan-isbn.vue
deleted file mode 100644
index ab1beeb..0000000
--- a/pages/upload/scan-isbn.vue
+++ /dev/null
@@ -1,107 +0,0 @@
-<template>
-	<view class="page">
-		<view id="barcodeContainer" class="barcode-container"></view>
-		<view class="close-btn" @click="goBack">
-			<text class="close-icon">✕</text>
-		</view>
-	</view>
-</template>
-
-<script>
-	export default {
-		data() {
-			return {
-				barcode: null,
-				scanned: false
-			}
-		},
-		mounted() {
-			this.$nextTick(() => {
-				this.initBarcode()
-			})
-		},
-		onUnload() {
-			this.destroyBarcode()
-		},
-		methods: {
-			initBarcode() {
-				if (typeof plus === 'undefined') {
-					uni.showToast({ title: '扫码初始化失败', icon: 'none' })
-					return
-				}
-				var options = {
-					top: '0px',
-					left: '0px',
-					width: '100%',
-					height: '100%',
-					frameColor: '#00000000',
-					scanbarColor: '#00000000',
-					background: '#00000000'
-				}
-				try {
-					this.barcode = new plus.barcode.Barcode('barcodeContainer', [plus.barcode.EAN13, plus.barcode.EAN8, plus.barcode.UPCA, plus.barcode.CODE128], options)
-					this.barcode.onmarked = (type, result) => {
-						if (this.scanned) return
-						this.scanned = true
-						if (result && result.length >= 10 && result.length <= 14) {
-							this.barcode.cancel()
-							uni.$emit('scan-isbn-result', result)
-							uni.navigateBack()
-						} else {
-							this.scanned = false
-						}
-					}
-					this.barcode.onerror = (e) => {
-						console.error('扫码错误:', e)
-						uni.showToast({ title: '扫码异常', icon: 'none' })
-					}
-					this.barcode.start()
-				} catch (e) {
-					console.error('Barcode init error:', e)
-					uni.showToast({ title: '扫码初始化失败', icon: 'none' })
-				}
-			},
-			destroyBarcode() {
-				if (this.barcode) {
-					try { this.barcode.cancel() } catch(e) {}
-					try { this.barcode.close() } catch(e) {}
-					this.barcode = null
-				}
-			},
-			goBack() {
-				this.destroyBarcode()
-				uni.navigateBack()
-			}
-		}
-	}
-</script>
-
-<style>
-	.page {
-		flex: 1;
-		background-color: #000;
-		position: relative;
-		overflow: hidden;
-	}
-	.barcode-container {
-		position: absolute;
-		top: 0; left: 0; right: 0; bottom: 0;
-	}
-	.close-btn {
-		position: fixed;
-		top: 60rpx;
-		left: 30rpx;
-		width: 60rpx;
-		height: 60rpx;
-		border-radius: 50%;
-		background: rgba(255,255,255,0.2);
-		display: flex;
-		align-items: center;
-		justify-content: center;
-		z-index: 9999;
-	}
-	.close-icon {
-		color: #fff;
-		font-size: 36rpx;
-	}
-</style>
diff --git a/pages/upload/upload.vue b/pages/upload/upload.vue
index eb21551..8f43fab 100644
--- a/pages/upload/upload.vue
+++ b/pages/upload/upload.vue
@@ -958,21 +958,6 @@ export default {
 		}
 	},
 
-	onShow() {
-		// 每次页面显示时注册扫码结果监听
-		uni.$off('scan-isbn-result')
-		uni.$on('scan-isbn-result', (code) => {
-			if (code) {
-				this.isbn = code.trim()
-				this.searchISBN()
-			}
-		})
-	},
-
-	onUnload() {
-		uni.$off('scan-isbn-result')
-	},
-
 	computed: {
 		conditionValue() {
 			const map = {
@@ -1162,8 +1147,16 @@ export default {
 				uni.showToast({ title: '请先登录孔网账号', icon: 'none' })
 				return
 			}
-			// 打开nvue扫码页面（全屏摄像头，无取景框，实时识别）
-			uni.navigateTo({ url: '/pages/upload/scan-isbn' })
+			// 手机系统原生扫码（实时识别，对准即出结果）
+			uni.scanCode({
+				onlyFromCamera: true,
+				scanType: ['barcode'],
+				success: (res) => {
+					this.isbn = (res.result || '').trim()
+					this.searchISBN()
+				},
+				fail: () => {}
+			})
 		},
 
 		// ISBN搜索 - 查询图书中心 + 孔网市场