From 4071acca9e1ec5b3d88aa3c6206976a8762c72a9 Mon Sep 17 00:00:00 2001 From: zm2000 <18386612143@163.com> Date: Sun, 20 Sep 2026 22:57:22 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A1=B5=E9=9D=A2=E5=A4=A7?= =?UTF-8?q?=E5=B0=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 +- android-offline/pack.ps1 | 66 +- package.json | 2 +- src/App.vue | 27 +- src/config/env.js | 17 +- src/pages/index/index.vue | 6 +- src/pages/login/login.vue | 6 +- src/pages/order/index.vue | 6 +- src/pages/packaging/index.vue | 29 +- src/pages/returns/index.vue | 3469 +-------------------------------- src/pages/weighing/index.vue | 6 +- 11 files changed, 141 insertions(+), 3495 deletions(-) diff --git a/README.md b/README.md index ebd44bd..61897f2 100644 --- a/README.md +++ b/README.md @@ -28,7 +28,7 @@ console 转发原理(release 包 console 默认不进 logcat): ### 根因 - reLaunch 创建的新页面 WebView 初始**视口为 0×0**(`window.innerWidth/innerHeight` 都是 0,`document.body` 尺寸 0×0); -- 全局 CSS 的 `html { font-size: min(3.515625vw, 5.2734375vh) }` 依赖视口,视口为 0 时 fontSize 计算为 **0px**; +- 全局 CSS 的 `html { font-size: min(5.2734375vw, 7.91015625vh) }` 依赖视口,视口为 0 时 fontSize 计算为 **0px**; - 本项目全站用 rem 布局,fontSize=0 → 所有 rem 尺寸归零 → 白屏; - 切后台回前台时 Activity resume 触发原生重排,视口恢复(961×640 CSS 像素,dpr=2 对应物理 1920×1280),页面随即正常。 diff --git a/android-offline/pack.ps1 b/android-offline/pack.ps1 index 057dfc6..2a5b803 100644 --- a/android-offline/pack.ps1 +++ b/android-offline/pack.ps1 @@ -37,29 +37,57 @@ $apkSource = Join-Path $asDir "$module\build\outputs\apk\release\$module-relea $buildGradle = Join-Path $asDir "$module\build.gradle" $configPath = Join-Path $projRoot 'config\android.json' -# ============ JDK detect ============ -if (-not $JavaHome -and $env:JAVA_HOME) { $JavaHome = $env:JAVA_HOME } -if (-not $JavaHome) { - $javaCandidates = @( - "$env:LOCALAPPDATA\Programs\EclipseAdoptium", - "$env:LOCALAPPDATA\Programs\Android Studio\jbr", - "C:\Program Files\Android\Android Studio\jbr", - "D:\Program Files\Android\Android Studio\jbr", - "$env:USERPROFILE\.jdks", - "C:\Program Files\Java", - "C:\Program Files\Eclipse Adoptium" - ) - foreach ($c in $javaCandidates) { - $javaExe = Get-ChildItem $c -Recurse -Filter java.exe -ErrorAction SilentlyContinue | Select-Object -First 1 - if ($javaExe) { $JavaHome = $javaExe.Directory.Parent.FullName; break } +# ============ JDK detect (JDK 17+ required) ============ +function Get-JavaMajorVersion([string]$javaExe) { + $prev = $ErrorActionPreference + $ErrorActionPreference = 'Continue' + try { + $out = (cmd /c "`"$javaExe`" -version 2>&1" | Out-String) + } finally { + $ErrorActionPreference = $prev + } + if ($out -match 'version\s+"1\.(\d+)') { return [int]$Matches[1] } + if ($out -match 'version\s+"(\d+)') { return [int]$Matches[1] } + return 0 +} + +$jdkCandidates = @() +if ($JavaHome) { $jdkCandidates += $JavaHome } +if ($env:JAVA_HOME) { $jdkCandidates += $env:JAVA_HOME } +$jdkCandidates += @( + "$env:LOCALAPPDATA\Programs\EclipseAdoptium", + "$env:LOCALAPPDATA\Programs\Android Studio\jbr", + "C:\Program Files\Android\Android Studio\jbr", + "D:\Program Files\Android\Android Studio\jbr", + "$env:USERPROFILE\.jdks", + "C:\Program Files\Java", + "C:\Program Files\Eclipse Adoptium" +) + +$selectedJava = "" +foreach ($c in $jdkCandidates) { + if (-not $c) { continue } + $javaExe = Join-Path $c 'bin\java.exe' + if (-not (Test-Path $javaExe)) { + $found = Get-ChildItem $c -Recurse -Filter java.exe -ErrorAction SilentlyContinue | Select-Object -First 1 + if ($found) { $javaExe = $found.FullName } + } + if (Test-Path $javaExe) { + $major = Get-JavaMajorVersion $javaExe + if ($major -ge 17) { + $selectedJava = Split-Path -Parent (Split-Path -Parent $javaExe) + break + } } } -if ($JavaHome -and (Test-Path (Join-Path $JavaHome 'bin\java.exe'))) { + +if ($selectedJava -and (Test-Path (Join-Path $selectedJava 'bin\java.exe'))) { + $JavaHome = $selectedJava $env:JAVA_HOME = $JavaHome $env:Path = "$JavaHome\bin;$env:Path" } else { Write-Host "" - Write-Host "[error] JDK not found. JDK 17+ required. Set JAVA_HOME or use -JavaHome." -ForegroundColor Red + Write-Host "[error] JDK 17+ not found. Install JDK 17+ (or Android Studio JBR) or use -JavaHome '...'." -ForegroundColor Red exit 1 } @@ -69,7 +97,7 @@ if (-not $AndroidSdk) { $AndroidSdk = $env:ANDROID_SDK_ROOT } $localProps = Join-Path $asDir 'local.properties' if (-not $AndroidSdk -and (Test-Path $localProps)) { $line = Select-String -Path $localProps -Pattern '^sdk\.dir=(.+)$' - if ($line) { $AndroidSdk = $line.Matches[0].Groups[1].Value -replace '\:', ':' -replace '\\\\', '\' } + if ($line) { $AndroidSdk = [regex]::Replace($line.Matches[0].Groups[1].Value, '\\([\\:])', '$1') } } if (-not $AndroidSdk -or -not (Test-Path (Join-Path $AndroidSdk 'platform-tools'))) { $sdkCandidates = @( @@ -85,7 +113,7 @@ if (-not $AndroidSdk -or -not (Test-Path (Join-Path $AndroidSdk 'platform-tools' if ($AndroidSdk -and (Test-Path (Join-Path $AndroidSdk 'platform-tools'))) { $env:ANDROID_HOME = $AndroidSdk $env:ANDROID_SDK_ROOT = $AndroidSdk - $escaped = ($AndroidSdk -replace '\\', '\\' -replace ':', '\:') + $escaped = $AndroidSdk -replace '\\', '\\' $sdkLine = "sdk.dir=$escaped" if (Test-Path $localProps) { $props = Get-Content $localProps -Raw diff --git a/package.json b/package.json index 5767ae8..d91a4a6 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "wms-worker-station", - "version": "1.0.20", + "version": "1.0.24", "description": "WMS仓库工作台桌面端", "author": "tianbao", "main": "electron/main.js", diff --git a/src/App.vue b/src/App.vue index 1cbd618..0f19ddd 100644 --- a/src/App.vue +++ b/src/App.vue @@ -5,9 +5,9 @@ const DESIGN_WIDTH = 1920 const DESIGN_HEIGHT = 1280 const BASE_FONT_SIZE = 100 // 整体缩放系数:<1 整体缩小,>1 整体放大(布局偏大就调小这个值) -// 0.45 平板触摸尺寸基准偏大;桌面 H5/Electron(1920×1080)统一调整为 0.28 -// 真机 APP-PLUS 的 rem 由下方全局纯 CSS 承担(0.675 系数,修复真机退出登录后白屏),JS 仅 H5 参与计算 -const REM_SCALE = 0.28 +// 0.45 平板触摸尺寸基准偏大;桌面 H5/Electron(1920×1080)统一调整为 0.42(0.28 基础上整体放大 50%) +// 真机 APP-PLUS 的 rem 由下方全局纯 CSS 承担(2.5vw,框架锁死 16px 基础上整体放大 50% → 24px),JS 仅 H5 参与计算 +const REM_SCALE = 0.42 // #ifdef APP-PLUS // 打开应用后将系统音量调至最大(仓库环境语音播报需要;setStreamVolume 无需额外权限) @@ -113,13 +113,26 @@ export default { diff --git a/src/pages/weighing/index.vue b/src/pages/weighing/index.vue index a6f0cbe..e20cf40 100644 --- a/src/pages/weighing/index.vue +++ b/src/pages/weighing/index.vue @@ -34,12 +34,12 @@ export default { export default { mounted() { // #ifdef APP-PLUS - // 真机 rem 由 App.vue 全局纯 CSS(html { font-size: min(3.515625vw, 5.2734375vh) },0.675 系数)承担, + // 真机 rem 由 App.vue 全局纯 CSS(html { font-size: min(5.2734375vw, 7.91015625vh) },1.0125 系数)承担, // renderjs 不再覆盖,避免与 CSS 方案互相覆盖导致白屏/抖动 return // #endif - // 整体缩放系数:<1 缩小,>1 放大(布局偏大就调小);0.45 平板基准偏大,H5/Electron 桌面统一 0.28 - const REM_SCALE = 0.28 + // 整体缩放系数:<1 缩小,>1 放大(布局偏大就调小);0.45 平板基准偏大,H5/Electron 桌面统一 0.42(0.28 基础上整体放大 50%) + const REM_SCALE = 0.42 const setFontSize = () => { const docEl = document.documentElement const width = docEl.clientWidth || window.innerWidth || 1920