From b9582697cde01a94b83896a56a676a7c10d7e6b7 Mon Sep 17 00:00:00 2001 From: liufumingren Date: Sun, 27 Sep 2026 03:15:04 +0800 Subject: [PATCH] =?UTF-8?q?feat(login):=20=E4=BA=8C=E7=BB=B4=E7=A0=81?= =?UTF-8?q?=E6=94=B9=E4=B8=BA=E6=9C=AC=E5=9C=B0=E7=9F=A2=E9=87=8F=E6=B8=B2?= =?UTF-8?q?=E6=9F=93=20+=20=E8=BE=93=E5=85=A5=E6=A1=86=E5=86=85=E5=B5=8C?= =?UTF-8?q?=E5=9B=BE=E6=A0=87=E5=B0=BA=E5=AF=B8=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 新增 render-common/qr-render.js:qrcode-generator 生成矩阵后按行合并深色模块输出 ,shape-rendering=crispEdges 不模糊 - 二维码内容存 data-qr-text,watchQrIn 监听属性/子节点变化重绘,data-qr-drawn 避免重复绘制 - 移除远端二维码图片服务与 onerror 兜底(离线/内网不再依赖外部接口);页面渲染改 paintQrIn/watchQrIn - 清除按钮可见图标 0.22rem(透明热区仍 0.36rem)、密码可见图标 0.2rem;renderjs 统一为 #ifndef APP-PLUS 包裹 --- src/pages/login/login.vue | 577 +++++++++++++++------------------ src/render-common/qr-render.js | 134 ++++++++ 2 files changed, 388 insertions(+), 323 deletions(-) create mode 100644 src/render-common/qr-render.js diff --git a/src/pages/login/login.vue b/src/pages/login/login.vue index 1210314..cbd68e7 100644 --- a/src/pages/login/login.vue +++ b/src/pages/login/login.vue @@ -32,13 +32,8 @@ 打开微信,扫描二维码登录 - + + {{ scanCode || '二维码区域' }} {{ scanStatus }} @@ -98,14 +93,9 @@ 工作台尚未绑定,请在PDA使用绑定工作台界面扫码绑定 - - {{ workbenchBindCode || '绑定码生成中...' }} + + + 绑定码生成中... @@ -182,8 +172,8 @@ import { } from '@/core/scan' import { diagBegin, diagDrop, diagNote, diagPersistNow } from '@/core/scan-diag' -const qrBaseUrl = 'https://ye4s.wms.gztbyc.com/grcode/build?text=' -const qrFallbackBaseUrl = 'https://api.qrserver.com/v1/create-qr-code/?size=280x280&data=' +// 二维码内容(不是图片地址):登录码 = 小程序页面链接,工作台码 = 绑定码。 +// 图片改由视图层本地绘制(src/render-common/qr-render.js),不再依赖远程出图服务。 const loginLinkTemplate = 'https://ye4s.wms.gztbyc.com/mini/?spm=0.4.${code}.1.4' // Android KeyEvent 符号键映射(KEYCODE_* → 字符)。 // 这些 keyCode 与 ASCII 字母/数字区间重叠,必须优先于 ASCII 分支判断, @@ -245,7 +235,7 @@ export default { scanHiddenFocused: false, pageActive: true, scanCode: '', - scanQrImage: '', + scanQrText: '', scanMiniProgramUrl: '', scanStatus: '等待扫码...', scanPollTimer: null, @@ -261,7 +251,7 @@ export default { hasStoredWorkbench: false, workbenchClientCode: '', workbenchBindCode: '', - workbenchQrImage: '', + workbenchQrText: '', workbenchStatus: '等待绑定...', workbenchPollTimer: null, workbenchPollInterval: 1500, @@ -486,7 +476,7 @@ export default { // 切到扫码登录:清空旧码,直接强制加载一次二维码 this.scanClientCode = '' this.scanCode = '' - this.scanQrImage = '' + this.scanQrText = '' this.scanMiniProgramUrl = '' this.handleScanLogin(false) } else if (mode === 'workbench') { @@ -1231,32 +1221,6 @@ export default { return loginLinkTemplate.replace('${code}', code) }, - buildQrImageUrlByPageUrl(pageUrl) { - if (!pageUrl) { - return '' - } - - return `${qrBaseUrl}${encodeURIComponent(pageUrl)}` - }, - buildFallbackQrImageUrlByPageUrl(pageUrl) { - if (!pageUrl) { - return '' - } - - return `${qrFallbackBaseUrl}${encodeURIComponent(pageUrl)}` - }, - handleScanImageError() { - if (!this.isPageActive()) { - return - } - const fallbackUrl = this.buildFallbackQrImageUrlByPageUrl(this.scanMiniProgramUrl) - if (fallbackUrl && this.scanQrImage !== fallbackUrl) { - this.scanQrImage = fallbackUrl - return - } - - this.scanStatus = '二维码加载失败,请重试' - }, startScanLongPolling() { if (!this.isPageActive()) { return @@ -1346,30 +1310,6 @@ export default { this.handleWorkbenchBind(false) } }, - buildWorkbenchQrImageUrl(code) { - if (!code) { - return '' - } - return `${qrBaseUrl}${encodeURIComponent(code)}` - }, - buildFallbackWorkbenchQrImageUrl(code) { - if (!code) { - return '' - } - return `${qrFallbackBaseUrl}${encodeURIComponent(code)}` - }, - handleWorkbenchQrError() { - if (!this.isPageActive()) { - return - } - const fallbackUrl = this.buildFallbackWorkbenchQrImageUrl(this.workbenchBindCode) - if (fallbackUrl && this.workbenchQrImage !== fallbackUrl) { - this.workbenchQrImage = fallbackUrl - return - } - this.workbenchQrImage = '' - this.workbenchStatus = '二维码加载失败,请使用下方绑定码' - }, handleWorkbenchRefresh() { if (!this.isPageActive()) { return @@ -1380,7 +1320,7 @@ export default { // 不传 clientCode:由服务端分配新客户端并立即返回新的绑定码(旧绑定码随即失效) this.workbenchClientCode = '' this.workbenchBindCode = '' - this.workbenchQrImage = '' + this.workbenchQrText = '' this.workbenchStatus = '正在刷新绑定码...' this.stopWorkbenchLongPolling() this.handleWorkbenchBind(false) @@ -1424,7 +1364,7 @@ export default { } if (bindCode) { this.workbenchBindCode = bindCode - this.workbenchQrImage = this.buildWorkbenchQrImageUrl(bindCode) + this.workbenchQrText = bindCode } if (status === 'bound' && token) { @@ -1586,7 +1526,7 @@ export default { this.hasStoredWorkbench = false this.stopWorkbenchLongPolling() this.workbenchBindCode = '' - this.workbenchQrImage = '' + this.workbenchQrText = '' this.workbenchClientCode = '' this.workbenchStatus = '正在获取绑定码...' this.handleWorkbenchBind(false) @@ -1628,20 +1568,19 @@ export default { body?.clientCode || body?.client_code || '' - const qrImageFromApi = payload?.qrCodeUrl || payload?.qrcodeUrl || payload?.codeUrl || payload?.wechatCodeUrl || payload?.image || '' const loginCode = payload?.loginWechatCode || payload?.wechatCode || payload?.qrCode || payload?.code || '' const miniProgramPageUrl = this.buildMiniProgramUrlByCode(loginCode) - const qrImageFromTemplate = this.buildQrImageUrlByPageUrl(miniProgramPageUrl) if (clientCode) { this.scanClientCode = clientCode } this.scanMiniProgramUrl = miniProgramPageUrl || '' - this.scanQrImage = qrImageFromTemplate || qrImageFromApi || '' + // 二维码内容:视图层据此本地绘制(不再是远程图片地址) + this.scanQrText = miniProgramPageUrl || '' this.scanCode = loginCode || '' - if (this.scanQrImage || this.scanCode) { + if (this.scanQrText || this.scanCode) { this.scanStatus = '等待扫码...' } else { this.scanStatus = body?.message || body?.msg || '二维码获取失败' @@ -1874,32 +1813,58 @@ export default { @@ -1918,11 +1883,11 @@ export default { } .update-dialog { - width: 15.36rem; + width: 4.92rem; max-width: 90%; - background-color: #ffffff; - border-radius: 0.307rem; - padding: 0.819rem; + background-color: var(--wms-card-bg); + border-radius: 0.13rem; + padding: 0.25rem; box-sizing: border-box; display: flex; flex-direction: column; @@ -1934,96 +1899,97 @@ export default { display: flex; align-items: center; justify-content: space-between; - margin-bottom: 0.512rem; + margin-bottom: 0.15rem; } .update-dialog__title { - font-size: 0.768rem; + font-size: 0.21rem; font-weight: 600; - color: #333; + color: var(--wms-text); } .update-dialog__close { - font-size: 1.024rem; - color: #999; + font-size: 0.3rem; + color: var(--wms-text-placeholder); line-height: 1; - padding: 0 0.205rem; + padding: 0 0.05rem; } .update-dialog__desc { - font-size: 0.563rem; - color: #666; + font-size: 0.15rem; + color: var(--wms-text-secondary); text-align: center; - margin-bottom: 0.512rem; + margin-bottom: 0.15rem; } .update-progress-track { width: 100%; - height: 0.307rem; + height: 0.1rem; background-color: #eef1f6; - border-radius: 0.154rem; + border-radius: 0.07rem; overflow: hidden; - margin-bottom: 0.256rem; + margin-bottom: 0.1rem; } .update-progress-fill { height: 100%; - background-color: #2f7dff; - border-radius: 0.154rem; + background-color: var(--wms-primary); + border-radius: 0.07rem; transition: width 0.2s ease; } .update-progress-text { - font-size: 0.512rem; + font-size: 0.15rem; color: #888; - margin-bottom: 0.256rem; + margin-bottom: 0.1rem; } .update-dialog__actions { width: 100%; display: flex; justify-content: center; - gap: 0.512rem; - margin-top: 0.256rem; + gap: 0.15rem; + margin-top: 0.1rem; } .update-dialog__btn { - width: 5.5rem; + width: 1.76rem; margin: 0; - font-size: 0.563rem; + font-size: 0.15rem; } .update-dialog__btn--skip { background-color: #f2f4f8; - color: #666; + color: var(--wms-text-secondary); } .update-dialog__btn--skip::after { - border: 0.026rem solid #dcdfe6; + border: 0.01rem solid var(--wms-border); } .update-dialog__btn--disabled { opacity: 0.45; } +/* 基准(src/styles/base.css 的 .page):box-sizing / display: flex / flex-direction: column / + flex: 1 / min-height: 0 / 页面底色(--wms-page-bg,全站统一),本页只写差异项 */ .page { + /* 本页是「横向两栏卡片 + 整体居中」,基准的 column 方向会把居中轴转 90°,显式改回 row */ + flex-direction: row; min-height: 100vh; - min-width: 19.2rem; - display: flex; + min-width: 6.14rem; align-items: center; justify-content: center; - box-sizing: border-box; - padding: 0.819rem; - background-color: #f2f2f2; + padding: 0.25rem; } .login-card { width: 100%; - max-width: 25.6rem; - min-width: 15.36rem; - background-color: #fff; - border-radius: 0.41rem; - box-shadow: 0 0.307rem 0.819rem rgba(0, 0, 0, 0.10), 0 0.077rem 0.205rem rgba(0, 0, 0, 0.05); + max-width: 8.19rem; + min-width: 4.92rem; + background-color: var(--wms-card-bg); + border-radius: 0.13rem; + box-shadow: 0 0.1rem 0.26rem rgba(0, 0, 0, 0.10), 0 0.02rem 0.07rem rgba(0, 0, 0, 0.05); display: flex; overflow: hidden; } @@ -2035,56 +2001,56 @@ export default { align-items: center; justify-content: center; box-sizing: border-box; - padding: 1.229rem 1.024rem; - background: linear-gradient(135deg, #2f7dff, #4d97ff); + padding: 0.4rem 0.35rem; + background: linear-gradient(135deg, var(--wms-primary), #4d97ff); text-align: center; } .visual-logo { display: block; - width: 6.144rem; + width: 1.97rem; max-width: 100%; - margin: 0 auto 0.41rem; + margin: 0 auto 0.15rem; } .visual-desc { - font-size: 0.922rem; + font-size: 0.25rem; font-weight: 800; line-height: 1.3; - letter-spacing: 0.026rem; - color: #fff; + letter-spacing: 0.01rem; + color: var(--wms-white); } .form-side { width: 55%; box-sizing: border-box; - padding: 1.024rem 1.024rem; + padding: 0.35rem 0.35rem; display: flex; flex-direction: column; } .header { - margin-bottom: 0.512rem; + margin-bottom: 0.15rem; } .title { display: block; - font-size: 0.922rem; + font-size: 0.25rem; font-weight: 600; - color: #333; - margin-bottom: 0.205rem; + color: var(--wms-text); + margin-bottom: 0.05rem; } .subtitle { - font-size: 0.614rem; - color: #666; + font-size: 0.17rem; + color: var(--wms-text-secondary); } .scan-hint { display: block; - font-size: 0.614rem; - color: #2fbf71; - margin-bottom: 0.102rem; + font-size: 0.17rem; + color: var(--wms-success-alt); + margin-bottom: 0.04rem; } .scan-hint--hidden { @@ -2094,45 +2060,51 @@ export default { .switch-tabs { display: flex; background-color: #f5f7fb; - border-radius: 0.205rem; - margin-bottom: 0.41rem; + border-radius: 0.07rem; + margin-bottom: 0.15rem; overflow: hidden; } .tab-item { flex: 1; text-align: center; - padding: 0.307rem 0; - font-size: 0.666rem; - color: #666; + padding: 0.1rem 0; + font-size: 0.18rem; + color: var(--wms-text-secondary); } .tab-item--active { color: #007aff; font-weight: 600; - background-color: #eef5ff; + background-color: var(--wms-bg-tint); } .panel { background-color: #fdfdfd; - border: 0.026rem solid #f0f0f0; - border-radius: 0.205rem; - padding: 0.41rem; + border: 0.01rem solid #f0f0f0; + border-radius: 0.07rem; + padding: 0.15rem; } .panel-stage { position: relative; - height: 8.448rem; + /* 原来是写死 height: 2.7rem:工作台面板内容(提示 + 二维码框 + 绑定码 + 状态 + 刷新)比它高, + flex 会把虚线框压扁,而框里的二维码图片尺寸不变 → 图片顶出虚线框、盖住绑定码(真机字体行高更高,溢出更明显)。 + 改成最小高度 + 内容撑高:短面板仍撑满 2.7rem(面板高度稳定),长面板自适应长高 */ + display: flex; + flex-direction: column; + min-height: 2.7rem; } .panel--mode { position: static; - height: 100%; + /* flex: 1 0 auto —— 可拉伸填满 stage(短面板保持 2.7rem),但绝不压缩(避免内容被挤爆) */ + flex: 1 0 auto; box-sizing: border-box; } .panel--scan { - padding: 0.41rem; + padding: 0.15rem; display: flex; flex-direction: column; justify-content: center; @@ -2146,7 +2118,7 @@ export default { } .panel--account .primary-btn { - margin-top: 0.614rem; + margin-top: 0.2rem; } .panel--workbench { @@ -2154,97 +2126,67 @@ export default { flex-direction: column; justify-content: center; align-items: center; - padding: 0.41rem; + padding: 0.15rem; +} + +/* 工作台面板的子项一律不参与压缩:虚线框/绑定码被压扁就会出现"二维码顶出框外盖住绑定码" */ +.panel--workbench > * { + flex-shrink: 0; } .wb-tip-top { display: block; text-align: center; - font-size: 0.614rem; + font-size: 0.17rem; line-height: 1.5; - color: #666; - margin-bottom: 0.205rem; + color: var(--wms-text-secondary); + margin-bottom: 0.05rem; } .wb-code-box { width: 100%; - max-width: 7.168rem; + max-width: 2.29rem; box-sizing: border-box; - border: 0.051rem dashed #bcd7ff; - border-radius: 0.307rem; - background: linear-gradient(135deg, #eef5ff, #f8fbff); + border: 0.02rem dashed #bcd7ff; + border-radius: 0.13rem; + background: linear-gradient(135deg, var(--wms-bg-tint), #f8fbff); display: flex; align-items: center; justify-content: center; - padding: 0.307rem; - margin-bottom: 0.205rem; -} - -.wb-qr-image { - width: 4.608rem; - height: 4.608rem; -} - -.wb-code-text { - display: block; - text-align: center; - font-size: 0.666rem; - font-weight: 700; - letter-spacing: 0.102rem; - text-indent: 0.102rem; - color: #1f5fd6; - font-family: 'Courier New', Consolas, monospace; - margin-bottom: 0.205rem; -} - -.wb-code { - font-size: 1.28rem; - font-weight: 800; - letter-spacing: 0.307rem; - text-indent: 0.307rem; - color: #1f5fd6; - font-family: 'Courier New', Consolas, monospace; -} - -.wb-code-placeholder { - font-size: 0.614rem; - color: #9aa7bd; + padding: 0.1rem; + margin-bottom: 0.05rem; } .wb-tip-bottom { display: block; text-align: center; - font-size: 0.614rem; - color: #2fbf71; - margin-bottom: 0.102rem; + font-size: 0.17rem; + color: var(--wms-success-alt); + margin-bottom: 0.04rem; } .wb-client-hint { display: block; text-align: center; - font-size: 0.512rem; + font-size: 0.15rem; color: #b0b8c6; - margin-bottom: 0.205rem; + margin-bottom: 0.05rem; } .wb-refresh-btn { - width: 5.12rem; - height: 1.434rem; - line-height: 1.434rem; + width: 1.64rem; + height: 0.36rem; /* 控件 36px */ + line-height: 0.36rem; box-sizing: border-box; - font-size: 0.614rem; + font-size: 0.17rem; color: #007aff; - background-color: #eef5ff; - border: 0.026rem solid #bcd7ff; - border-radius: 0.205rem; + background-color: var(--wms-bg-tint); + border: 0.01rem solid #bcd7ff; + border-radius: 0.07rem; padding: 0; margin: 0; } -.wb-refresh-btn::after { - border: none; -} - .wb-refresh-btn[disabled] { color: #a9b4c6; background-color: #f2f3f5; @@ -2254,30 +2196,30 @@ export default { .wb-quick-box { width: 100%; box-sizing: border-box; - border: 0.026rem solid #e5e5e5; - border-radius: 0.205rem; + border: 0.01rem solid #e5e5e5; + border-radius: 0.07rem; background-color: #fafbfc; - padding: 0.256rem; - margin-bottom: 0.205rem; + padding: 0.1rem; + margin-bottom: 0.05rem; } .wb-quick-title { display: block; - font-size: 0.666rem; - color: #333; + font-size: 0.18rem; + color: var(--wms-text); font-weight: 600; - margin-bottom: 0.102rem; + margin-bottom: 0.04rem; } .wb-quick-desc { display: block; - font-size: 0.512rem; - color: #999; + font-size: 0.15rem; + color: var(--wms-text-placeholder); line-height: 1.5; } .wb-enter-btn { - margin-top: 0.102rem; + margin-top: 0.04rem; } .wb-rebind-link { @@ -2285,40 +2227,54 @@ export default { align-items: center; justify-content: center; text-align: center; - padding: 0.205rem 0 0; - font-size: 0.563rem; - color: #2f7dff; + padding: 0.05rem 0 0; + font-size: 0.15rem; + color: var(--wms-primary); } .scan-box { - width: 5.12rem; - height: 5.12rem; - border: 0.051rem dashed #d9d9d9; - border-radius: 0.205rem; + width: 1.64rem; + height: 1.64rem; + border: 0.02rem dashed #d9d9d9; + border-radius: 0.07rem; display: flex; align-items: center; justify-content: center; - margin: 0 auto 0.205rem; + margin: 0 auto 0.05rem; } .scan-image { - width: 4.608rem; - height: 4.608rem; + /* 二维码由视图层本地画成 SVG(qr-render.js)后挂到这里 */ + /* 固定正方形,始终不超出虚线框(quiet zone 由渲染器自己留白) */ + flex-shrink: 0; + max-width: 100%; + max-height: 100%; + width: 1.47rem; + height: 1.47rem; + display: flex; + align-items: center; + justify-content: center; +} + +.scan-image svg { + display: block; + width: 100%; + height: 100%; } .scan-tip-top { display: block; text-align: center; - font-size: 0.614rem; - color: #666; - margin-bottom: 0.205rem; + font-size: 0.17rem; + color: var(--wms-text-secondary); + margin-bottom: 0.05rem; } .scan-tip-bottom { display: block; text-align: center; - font-size: 0.563rem; - color: #999; + font-size: 0.15rem; + color: var(--wms-text-placeholder); margin-bottom: 0; } @@ -2327,22 +2283,22 @@ export default { display: flex; align-items: center; justify-content: center; - margin-bottom: 0.205rem; + margin-bottom: 0.05rem; } .wb-code-label { - font-size: 0.563rem; - color: #666; - margin-right: 0.205rem; + font-size: 0.15rem; + color: var(--wms-text-secondary); + margin-right: 0.05rem; } .wb-code-value { - font-size: 0.717rem; + font-size: 0.2rem; font-weight: bold; - color: #2f7dff; - letter-spacing: 0.051rem; + color: var(--wms-primary); + letter-spacing: 0.02rem; font-family: Consolas, Menlo, monospace; - max-width: 5.6rem; + max-width: 1.79rem; word-break: break-all; text-align: center; user-select: text; @@ -2353,32 +2309,25 @@ export default { align-items: center; justify-content: center; text-align: center; - padding: 0.205rem 0 0; - font-size: 0.563rem; - color: #2f7dff; + padding: 0.05rem 0 0; + font-size: 0.15rem; + color: var(--wms-primary); } -.scan-hidden-input { - position: absolute; - width: 0.02rem; - height: 0.02rem; - opacity: 0; - left: -199.98rem; - top: -199.98rem; -} +/* 隐藏扫码输入框:样式在全局基准 src/styles/base.css(登录/订单/打包/退件共用同一份) */ .scan-placeholder { - color: #999; - font-size: 0.563rem; + color: var(--wms-text-placeholder); + font-size: 0.15rem; } .input { - height: 1.638rem; - border: 0.026rem solid #e5e5e5; - border-radius: 0.205rem; - padding: 0 0.41rem; - margin-bottom: 0.307rem; - font-size: 0.666rem; + height: 0.36rem; + border: 0.01rem solid #e5e5e5; + border-radius: 0.07rem; + padding: 0 0.15rem; + margin-bottom: 0.1rem; + font-size: 0.18rem; } .input:focus { @@ -2388,25 +2337,25 @@ export default { .input-wrap, .password-wrap { position: relative; - border: 0.026rem solid #e5e5e5; - border-radius: 0.205rem; - background-color: #fff; + border: 0.01rem solid #e5e5e5; + border-radius: 0.07rem; + background-color: var(--wms-card-bg); transition: border-color 0.2s ease, box-shadow 0.2s ease; - margin-bottom: 0.307rem; + margin-bottom: 0.1rem; } .input-wrap--focused { border-color: #007aff; - box-shadow: 0 0 0 0.102rem rgba(0, 122, 255, 0.08); + box-shadow: 0 0 0 0.03rem rgba(0, 122, 255, 0.08); } .password-wrap { - margin-top: 0.307rem; + margin-top: 0.1rem; } .password-input { margin-bottom: 0; - padding-right: 3.994rem; + padding-right: 1.3rem; font-family: system-ui; } @@ -2416,7 +2365,7 @@ export default { } .input--with-clear { - padding-right: 2.15rem; + padding-right: 0.7rem; } .input-wrap .input, @@ -2428,13 +2377,13 @@ export default { .clear-trigger { position: absolute; - right: 0.563rem; + right: 0.05rem; top: 50%; transform: translateY(-50%); - width: 1.024rem; - height: 1.024rem; - border-radius: 50%; - border: 0.026rem solid #cfd6e4; + /* 点击热区 36px(与输入框等高,透明不参与视觉);可见的圆标在 __icon 上 */ + box-sizing: border-box; + width: 0.36rem; + height: 0.36rem; background-color: transparent; display: flex; align-items: center; @@ -2442,30 +2391,41 @@ export default { } .clear-trigger--password { - right: 2.253rem; + right: 0.44rem; } .clear-trigger__icon { - font-size: 0.614rem; - line-height: 1; + /* 可见圆标 22px:在 36px 输入框内上下各留 7px + (原来圆标就写在 .clear-trigger 上 = 和输入框同高 36px,加上 1px 边框还会溢出输入框) */ + box-sizing: border-box; + display: inline-block; + width: 0.22rem; + height: 0.22rem; + border: 0.01rem solid #cfd6e4; + border-radius: 50%; + font-size: 0.15rem; + line-height: 0.2rem; + text-align: center; color: #a9b4c6; } .toggle-password { position: absolute; - right: 0.563rem; + right: 0.05rem; top: 50%; transform: translateY(-50%); - width: 1.434rem; - height: 1.434rem; + /* 控件 36px(与 36px 输入框等高) */ + width: 0.36rem; + height: 0.36rem; display: flex; align-items: center; justify-content: center; } .pwd-eye { - width: 0.922rem; - height: 0.922rem; + /* 可见眼睛图标 20px(原来 0.3rem=30px,几乎顶满 36px 输入框,比清除圆标还大) */ + width: 0.2rem; + height: 0.2rem; display: block; line-height: 0; } @@ -2478,41 +2438,12 @@ export default { .primary-btn { width: 100%; - margin-top: 0.41rem; - font-size: 0.8rem; + margin-top: 0.15rem; + font-size: 0.22rem; } .scan-login-btn { - background-color: #2fbf71; - color: #fff; -} - -.scan-login-btn::after { - border: none; -} - -@media screen and (max-width: 16rem) { - .page { - min-width: 14.4rem; - } - - .login-card { - max-width: 22.528rem; - min-width: 13.824rem; - } - - .visual-side { - width: 45%; - padding: 1.024rem 0.819rem; - } - - .form-side { - width: 55%; - padding: 0.819rem 0.819rem; - } - - .panel-stage { - height: 8.448rem; - } + background-color: var(--wms-success-alt); + color: var(--wms-white); } \ No newline at end of file diff --git a/src/render-common/qr-render.js b/src/render-common/qr-render.js new file mode 100644 index 0000000..bc0ccbd --- /dev/null +++ b/src/render-common/qr-render.js @@ -0,0 +1,134 @@ +/** + * 本地二维码渲染(视图层,供各页 renderjs 调用) + * + * 为什么要本地生成:登录页扫码登录的二维码、工作台绑定码原先都是**远程服务出图** + * (`https://ye4s.wms.gztbyc.com/grcode/build?text=`,兜底 `api.qrserver.com`)—— + * 断网、内网隔离、或那两个服务不可用时二维码就出不来,而且真机每次都要走网络。 + * 现在改为在视图层本地绘制,与"扫码指令条形码"(jsbarcode 画进 ``,见 returns 页)同一套思路: + * 直接用 DOM 画 SVG,H5 / Electron / 真机 WebView 表现一致。 + * + * 依赖 `qrcode-generator`:纯 ES5、零运行时依赖、约 15KB,只给模块矩阵, + * 不依赖 canvas / 网络,老 WebView 也能跑。 + * + * 用法(约定用属性传内容,避免逻辑层/视图层来回传对象): + * + * 视图层 renderjs 里调用 paintQrIn()(首次 + 若干次延时兜底;属性变化时重新绘制) + */ + +import qrcode from 'qrcode-generator' + +// 静区(模块数):二维码规范要求四周留 ≥4 个模块的空白,少了真机扫不出来 +const QUIET_MODULES = 4 +const SVG_NS = 'http://www.w3.org/2000/svg' + +/** + * 把二维码画进指定容器(会先清掉容器里已有的 svg) + * @param {Element} el 容器元素 + * @param {string} text 二维码内容 + * @param {{ errorCorrectionLevel?: string, dark?: string, light?: string }} [options] + * @returns {boolean} 是否绘制成功 + */ +export function drawQrInto (el, text, options) { + const opts = options || {} + const value = text === null || text === undefined ? '' : String(text).trim() + if (!el || !value) return false + + const qr = qrcode(0, opts.errorCorrectionLevel || 'M') // 版本 0 = 自动选能装下的最小版本 + qr.addData(value) // 默认 Byte 模式,链接/中文都按 UTF-8 编码 + qr.make() + const count = qr.getModuleCount() + const size = count + QUIET_MODULES * 2 + + const svg = document.createElementNS(SVG_NS, 'svg') + svg.setAttribute('xmlns', SVG_NS) + svg.setAttribute('viewBox', '0 0 ' + size + ' ' + size) + svg.setAttribute('width', '100%') + svg.setAttribute('height', '100%') + // 模块是整数方块:缩放时不要抗锯齿模糊,否则老 WebView 上可能扫不出 + svg.setAttribute('shape-rendering', 'crispEdges') + + // 白底:避免透明底叠在深色背景/阴影上后对比度不足 + const bg = document.createElementNS(SVG_NS, 'rect') + bg.setAttribute('x', '0') + bg.setAttribute('y', '0') + bg.setAttribute('width', String(size)) + bg.setAttribute('height', String(size)) + bg.setAttribute('fill', opts.light || '#ffffff') + svg.appendChild(bg) + + // 逐行把连续暗模块合并成一个 rect,节点数比逐格少一半以上 + const dark = opts.dark || '#000000' + for (let row = 0; row < count; row++) { + let col = 0 + while (col < count) { + if (!qr.isDark(row, col)) { + col++ + continue + } + let end = col + while (end + 1 < count && qr.isDark(row, end + 1)) end++ + const rect = document.createElementNS(SVG_NS, 'rect') + rect.setAttribute('x', String(col + QUIET_MODULES)) + rect.setAttribute('y', String(row + QUIET_MODULES)) + rect.setAttribute('width', String(end - col + 1)) + rect.setAttribute('height', '1') + rect.setAttribute('fill', dark) + svg.appendChild(rect) + col = end + 1 + } + } + + // 清空容器(不用 innerHTML:老 WebView 下自定义元素上更稳) + while (el.firstChild) el.removeChild(el.firstChild) + el.appendChild(svg) + return true +} + +/** + * 扫描带 data-qr-text 的容器并绘制(内容没变则跳过) + * @param {Document|Element} [root] 查询范围,默认当前文档 + * @returns {number} 本次实际绘制的个数 + */ +export function paintQrIn (root) { + const scope = root || (typeof document !== 'undefined' ? document : null) + if (!scope || !scope.querySelectorAll) return 0 + const nodes = scope.querySelectorAll('[data-qr-text]') + let painted = 0 + for (let i = 0; i < nodes.length; i++) { + const el = nodes[i] + const text = el.getAttribute('data-qr-text') || '' + if (!text) continue + if (el.getAttribute('data-qr-drawn') === text) continue // 内容未变,不重画 + try { + if (drawQrInto(el, text)) { + el.setAttribute('data-qr-drawn', text) + painted++ + } + } catch (e) { + // 单个二维码绘制失败不影响其他;内容过长(超出二维码容量)时也会走到这里 + } + } + return painted +} + +/** + * 观察 data-qr-text 变化并自动重绘(Vue 更新属性 → 这里重画) + * @param {Document|Element} [root] + * @returns {Function} 取消观察的函数 + */ +export function watchQrIn (root) { + const scope = root || (typeof document !== 'undefined' ? document : null) + if (!scope || typeof MutationObserver === 'undefined') return function () {} + const observer = new MutationObserver(function () { + paintQrIn(scope) + }) + observer.observe(scope === document ? document.body : scope, { + subtree: true, + childList: true, // 容器是 v-if 新插入的:新增节点也要触发一次绘制 + attributes: true, + attributeFilter: ['data-qr-text'] + }) + return function () { + observer.disconnect() + } +}