From f8082bd587ccd433449dca24f075a150bb4c0eb9 Mon Sep 17 00:00:00 2001 From: hwj Date: Thu, 26 Mar 2026 17:46:05 +0800 Subject: [PATCH] =?UTF-8?q?style=EF=BC=9A=E4=BF=AE=E6=94=B9=E8=AE=BE?= =?UTF-8?q?=E5=A4=87=E3=80=81=E5=85=B3=E9=94=AE=E4=BB=B6=E3=80=81=E5=A4=87?= =?UTF-8?q?=E4=BB=B6=E3=80=81=E4=BA=A7=E5=93=81=E7=89=A9=E6=96=99=E4=BC=A0?= =?UTF-8?q?=E5=8F=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/common/AppTitleHeader.vue | 4 ++-- src/pages_function/pages/equipment/index.vue | 6 +++--- src/pages_function/pages/keypart/index.vue | 6 +++--- src/pages_function/pages/product/index.vue | 12 +++--------- src/pages_function/pages/spare/index.vue | 12 +++--------- 5 files changed, 14 insertions(+), 26 deletions(-) diff --git a/src/components/common/AppTitleHeader.vue b/src/components/common/AppTitleHeader.vue index 456c045..ea38f63 100644 --- a/src/components/common/AppTitleHeader.vue +++ b/src/components/common/AppTitleHeader.vue @@ -45,7 +45,7 @@ function handleBack() { .header-section { --status-top: var(--status-bar-height, 0px); background: linear-gradient(135deg, #1a3a5c 0%, #2d5a87 100%); - padding: calc(20rpx + var(--status-top)) 24rpx 28rpx; + padding: calc(14rpx + var(--status-top)) 24rpx 20rpx; position: relative; } @@ -78,7 +78,7 @@ function handleBack() { } .header-title { - font-size: 36rpx; + font-size: 34rpx; font-weight: 700; color: #ffffff; } diff --git a/src/pages_function/pages/equipment/index.vue b/src/pages_function/pages/equipment/index.vue index 04cc5c8..070cf3b 100644 --- a/src/pages_function/pages/equipment/index.vue +++ b/src/pages_function/pages/equipment/index.vue @@ -71,12 +71,12 @@ function startScan() { onlyFromCamera: true, scanType: ['qrCode', 'barCode'], success: (res) => { - const code = String(res?.result || res?.code || res?.qrCode || res?.barCode || '').trim() - if (!code) { + const info = JSON.parse(res.result) + if (!info || !info.id) { uni.showToast({ title: '未获取到扫码结果', icon: 'none' }) return } - navigateToDetail(code) + navigateToDetail(info.id) }, fail: (err) => { const msg = String(err?.errMsg || '') diff --git a/src/pages_function/pages/keypart/index.vue b/src/pages_function/pages/keypart/index.vue index f168407..4afa0f5 100644 --- a/src/pages_function/pages/keypart/index.vue +++ b/src/pages_function/pages/keypart/index.vue @@ -71,12 +71,12 @@ function startScan() { onlyFromCamera: true, scanType: ['qrCode', 'barCode'], success: (res) => { - const id = String(res?.result || res?.code || res?.qrCode || res?.barCode || '').trim() - if (!id) { + const info = JSON.parse(res.result) + if (!info || !info.id) { uni.showToast({ title: '未获取到扫码结果', icon: 'none' }) return } - navigateToDetail(id) + navigateToDetail(info.id) }, fail: (err) => { const msg = String(err?.errMsg || '') diff --git a/src/pages_function/pages/product/index.vue b/src/pages_function/pages/product/index.vue index 3c72b2e..13992de 100644 --- a/src/pages_function/pages/product/index.vue +++ b/src/pages_function/pages/product/index.vue @@ -68,18 +68,12 @@ function startScan() { onlyFromCamera: true, scanType: ['qrCode', 'barCode'], success: (res) => { - let parsed - try { - parsed = res && res.result ? JSON.parse(res.result) : undefined - } catch (e) { - parsed = undefined - } - const id = parsed && parsed.id !== undefined ? parsed.id : (res ? res.result : undefined) - if (!id) { + const info = JSON.parse(res.result) + if (!info || !info.id) { uni.showToast({ title: '未获取到扫码结果', icon: 'none' }) return } - navigateToDetail(id) + navigateToDetail(info.id) }, fail: (err) => { const msg = String(err?.errMsg || '') diff --git a/src/pages_function/pages/spare/index.vue b/src/pages_function/pages/spare/index.vue index b48ebd8..3ac40d0 100644 --- a/src/pages_function/pages/spare/index.vue +++ b/src/pages_function/pages/spare/index.vue @@ -71,18 +71,12 @@ function startScan() { onlyFromCamera: true, scanType: ['qrCode', 'barCode'], success: (res) => { - let info; - try { - info = res && res.result ? JSON.parse(res.result) : undefined; - } catch (e) { - info = undefined; - } - const id = info && info.id !== undefined ? info.id : (res ? res.result : undefined); - if (!id) { + const info = JSON.parse(res.result) + if (!info || !info.id) { uni.showToast({ title: '未获取到扫码结果', icon: 'none' }) return } - navigateToDetail(id); + navigateToDetail(info.id); }, fail: (err) => { const msg = String(err?.errMsg || '')