fix(复核页/白屏): 退出登录改 restart 修白屏 + 四页页边距统一收窄 + 商品图多图预览
- 白屏根治(2026-10-25 定稿): - top-nav.finishLogout:APP 端退出登录改用 plus.runtime.restart(),H5 维持 reLaunch - login.onShow:读 storage 的 __logout_msg__ 回显「已退出登录」 - 布局壳(index)/订单页(order) lockLandscape 只保留 lockOrientation 横屏兜底,删除 webview.setStyle(reLaunch 未就绪时 setStyle 触发 NPE 白屏) - 布局壳 onLoad、订单页 mounted(+300/800ms) 补 lockLandscape 兜底 - 删除订单页残留 remInject renderjs 块(rem 已由 App.vue 统一承担) - UI 排版统一(页边距 25px → 12.5px): - 订单/称重/退件/打包四页 .page-main 左右下内边距收窄至 0.125rem - 布局壳新增 .layout-page--compact-top 收窄顶栏下边距(20→7.5px);订单/称重/退件独立访问态同收窄 - 订单页卡片间距/圆角微调(0.15→0.1rem 等),与全局排版规范对齐 - 订单复核页商品图片多图预览: - normalizeOrderRow 新增 imageList,图片单元格带多图角标并拦截点击/长按/右键冒泡 - 点击图片打开全屏预览,支持多图翻页(上一张/下一张/计数) - docs: README 补充「布局壳与退出登录白屏」注意事项与回退自查清单
This commit is contained in:
parent
4a515d7f6a
commit
fb87c56f3d
10
README.md
10
README.md
@ -302,6 +302,16 @@ export default {
|
||||
3. 若新增页面在真机出现同样白屏,按上面的示例接入 `installZeroViewportFix` 即可;
|
||||
4. 排查白屏类问题先看**视口尺寸**(renderjs 里打 Log),而不是猜字体/样式——0×0 视口下 CSS 的 vw/vh 全部失效是这类白屏的典型特征。
|
||||
|
||||
### 订单复核页(布局壳)与退出登录白屏(2026-10-25 补充)
|
||||
|
||||
同一套 reLaunch 视口问题,还波及两个场景:
|
||||
|
||||
1. **登录 → 布局壳 → 订单复核页白屏(偶发)**:订单复核页是布局壳 `pages/index` 里 `:embedded="true"` 的动态组件,没有独立的 onLoad/onShow 生命周期,完全依赖布局壳的 lockLandscape。布局壳(`pages/index`)与订单页(`pages/order`)的 lockLandscape **只保留 `plus.screen.lockOrientation('landscape')` 横屏兜底,禁止调用 `webview.setStyle`**——setStyle 在 WebView 未就绪时触发 `ViewOptions.updateViewData` NPE → 白屏(与上文第 2 条同源)。
|
||||
|
||||
2. **退出登录必须用 `plus.runtime.restart()`,禁止 reLaunch**:`top-nav.finishLogout` 若用 reLaunch 回登录页,退出后再登录 reLaunch 到布局壳会白屏;restart 重启进程恢复干净渲染才可靠(代价是闪一下启动图,`manifest.splashscreen.waiting=true` 让启动图持续到登录页渲染完成)。配套:登录页 `onShow` 读取 storage 的 `__logout_msg__` 回显「已退出登录」。
|
||||
|
||||
⚠️ 上述修复曾被 HBuilderX / 外部编辑器**整体回退**(finishLogout 改回 reLaunch、`__logout_msg__` 逻辑丢失、页面 lockLandscape 重新加了 setStyle)。改动后务必 grep 确认:`plus.runtime.restart`、`__logout_msg__` 仍在,且各页 lockLandscape 内**没有** `setStyle`。
|
||||
|
||||
## ⚠️ 机型注意:X9R 工控机的供电 / USB 口 / 固件差异(2026-09-25 实测)
|
||||
|
||||
> 结论先说:这台机器的「扫码突然没反应」**多数不是软件问题**,而是供电不足或 USB 口上挂了耗电外设。
|
||||
|
||||
@ -406,6 +406,16 @@ export default {
|
||||
},
|
||||
finishLogout() {
|
||||
uni.removeStorageSync('token')
|
||||
uni.removeStorageSync('workbench_token')
|
||||
uni.removeStorageSync('workbench_id')
|
||||
// 真机 APP:退出登录改用 plus.runtime.restart() 恢复首次启动的干净渲染,
|
||||
// 避免 reLaunch 回 login 后再次登录进入订单复核页时 WebView 竖屏/白屏
|
||||
// (reLaunch 重建 WebView 视口不可靠,restart 是唯一稳定解,2026-09-19 已定稿)
|
||||
// #ifdef APP-PLUS
|
||||
uni.setStorageSync('__logout_msg__', '已退出登录')
|
||||
plus.runtime.restart()
|
||||
// #endif
|
||||
// #ifndef APP-PLUS
|
||||
uni.showToast({
|
||||
title: '已退出登录',
|
||||
icon: 'none',
|
||||
@ -415,6 +425,7 @@ export default {
|
||||
url: '/pages/login/login',
|
||||
})
|
||||
}, 200)
|
||||
// #endif
|
||||
},
|
||||
handleLogout() {
|
||||
const token = uni.getStorageSync('token')
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
<template>
|
||||
<view class="layout-page">
|
||||
<view :class="['layout-page', isCompactTopView ? 'layout-page--compact-top' : '']">
|
||||
<top-nav
|
||||
:menus="topMenus"
|
||||
:active-path="activeMenuPath"
|
||||
@ -59,6 +59,10 @@ export default {
|
||||
})
|
||||
},
|
||||
onLoad(options) {
|
||||
// reLaunch 重建 WebView 后立即锁定横屏+全屏:登录进入布局壳(订单复核页)时
|
||||
// WebView 可能以竖屏/错误视口创建导致白屏,对照打包页白屏修复在 onLoad 也兜底一次
|
||||
this.lockLandscape()
|
||||
|
||||
const token = uni.getStorageSync('token')
|
||||
if (!token) {
|
||||
uni.reLaunch({
|
||||
@ -95,9 +99,24 @@ export default {
|
||||
activeViewComponent() {
|
||||
return resolveMenuView(this.activeMenuPath)
|
||||
},
|
||||
// 当前激活的页面是否采用「紧凑页边距」布局(订单复核/称重/退件三页),
|
||||
// 用于收窄布局壳顶栏下边距(与各页 12.5px 页边距对齐)
|
||||
isCompactTopView() {
|
||||
return (
|
||||
this.activeMenuPath === '/order' ||
|
||||
this.activeMenuPath === '/pages/order/index' ||
|
||||
this.activeMenuPath === '/catchWeight' ||
|
||||
this.activeMenuPath === '/pages/weighing/index' ||
|
||||
this.activeMenuPath === '/returns' ||
|
||||
this.activeMenuPath === '/pages/returns/index'
|
||||
)
|
||||
},
|
||||
},
|
||||
methods: {
|
||||
// 强制锁定横屏 + 全屏重排:真机 reLaunch 后新 WebView 可能以竖屏尺寸创建,需 setStyle 强制全屏
|
||||
// 强制锁定横屏:真机 reLaunch 后横屏锁可能丢失,这里只做 lockOrientation 兜底。
|
||||
// setStyle 已禁用:reLaunch/热恢复时 WebView 视图未就绪,setStyle 触发原生层
|
||||
// ViewOptions.updateViewData NPE 导致白屏(打包页实验对照验证);横屏尺寸由
|
||||
// manifest screenOrientation 承担,无需运行时 setStyle 全屏
|
||||
lockLandscape() {
|
||||
// #ifdef APP-PLUS
|
||||
try {
|
||||
@ -106,13 +125,6 @@ export default {
|
||||
screen.lockOrientation('landscape')
|
||||
console.log('[index] lockOrientation=landscape done')
|
||||
}
|
||||
if (typeof plus !== 'undefined' && plus.webview) {
|
||||
const wv = plus.webview.currentWebview()
|
||||
if (wv && typeof wv.setStyle === 'function') {
|
||||
wv.setStyle({ top: '0px', bottom: '0px', left: '0px', right: '0px' })
|
||||
console.log('[index] webview setStyle fullscreen done')
|
||||
}
|
||||
}
|
||||
return true
|
||||
} catch (e) {
|
||||
console.error('[index] lockOrientation 异常:', e)
|
||||
@ -286,6 +298,13 @@ export default {
|
||||
flex-direction: column;
|
||||
}
|
||||
|
||||
/* 订单复核/称重/退件三页:顶栏下边距减半(20px→7.5px),与各页 page-main 顶部内边距 5px 合计 12.5px。
|
||||
顶栏是布局壳自己的 top-nav(三页 embedded 时不渲染顶栏),故在此按激活页面收窄。
|
||||
注意:uni-app H5 强制 scoped,跨组件覆盖子组件 .top-nav 须用 :deep() */
|
||||
.layout-page--compact-top :deep(.top-nav) {
|
||||
margin-bottom: 0.075rem !important;
|
||||
}
|
||||
|
||||
.module-placeholder {
|
||||
background-color: var(--wms-card-bg);
|
||||
border-radius: 0.13rem;
|
||||
|
||||
@ -304,6 +304,14 @@ export default {
|
||||
onShow() {
|
||||
this.pageActive = true
|
||||
diagNote('lifecycle', { hook: 'onShow' })
|
||||
// 退出登录(APP restart)后回显提示:restart 会清内存,提示文案经 storage 传递
|
||||
const logoutMsg = uni.getStorageSync('__logout_msg__')
|
||||
if (logoutMsg) {
|
||||
uni.removeStorageSync('__logout_msg__')
|
||||
setTimeout(() => {
|
||||
uni.showToast({ title: logoutMsg, icon: 'none' })
|
||||
}, 300)
|
||||
}
|
||||
this.setupScanCaptureMode()
|
||||
this.registerScanCapture()
|
||||
// reLaunch 从订单复核页切回时,旧页面(复核页)的 beforeUnmount 在 onShow 之后才执行,
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
<template>
|
||||
<view class="page">
|
||||
<view class="page order-review-page">
|
||||
<top-nav v-if="!embedded" />
|
||||
<view class="page-main order-review-one">
|
||||
<view class="container">
|
||||
@ -178,8 +178,17 @@
|
||||
<text class="table-cell cell-total" :style="getColStyle('total')">{{ order.quantity }}</text>
|
||||
<text class="table-cell cell-scanned" :style="getColStyle('scanned')">{{ order.scannedQty }}</text>
|
||||
<text class="table-cell cell-name" :style="getColStyle('name')">{{ order.productName }}</text>
|
||||
<view class="table-cell cell-image" :style="getColStyle('image')">
|
||||
<image v-if="order.image" class="item-image" :src="order.image" mode="aspectFit" />
|
||||
<view
|
||||
class="table-cell cell-image"
|
||||
:style="getColStyle('image')"
|
||||
@click.stop="handleImageCellClick(order, $event)"
|
||||
@longtap.stop="handleImageCellLongtap(order, $event)"
|
||||
@contextmenu.stop="handleImageCellContextmenu(order, $event)"
|
||||
>
|
||||
<view v-if="order.image" class="cell-image-wrap">
|
||||
<image class="item-image" :src="order.image" mode="aspectFit" />
|
||||
<view v-if="order.imageList && order.imageList.length > 1" class="cell-image-badge">{{ order.imageList.length }}</view>
|
||||
</view>
|
||||
<text v-else class="cell-image-empty">-</text>
|
||||
</view>
|
||||
<text class="table-cell cell-barcode" :style="getColStyle('barcode')">
|
||||
@ -397,6 +406,9 @@
|
||||
:style="sharedImageStyle"
|
||||
/>
|
||||
</view>
|
||||
<text v-if="sharedImagePreviewList.length > 1" class="shared-img-preview-prev" @click.stop="prevPreviewImage">‹</text>
|
||||
<text v-if="sharedImagePreviewList.length > 1" class="shared-img-preview-next" @click.stop="nextPreviewImage">›</text>
|
||||
<text v-if="sharedImagePreviewList.length > 1" class="shared-img-preview-count">{{ sharedImagePreviewIndex + 1 }}/{{ sharedImagePreviewList.length }}</text>
|
||||
<text class="shared-img-preview-hint">双击或双指缩放查看</text>
|
||||
</view>
|
||||
|
||||
@ -750,6 +762,8 @@ export default {
|
||||
// 共享条码弹窗商品图片预览(自绘全屏预览,避免 uni.previewImage 图片被放大)
|
||||
sharedImagePreviewVisible: false,
|
||||
sharedImagePreviewUrl: '',
|
||||
sharedImagePreviewList: [],
|
||||
sharedImagePreviewIndex: 0,
|
||||
// 图片预览缩放状态(1~5 倍)与拖动偏移
|
||||
sharedImageScale: 1,
|
||||
sharedImageOffsetX: 0,
|
||||
@ -1121,7 +1135,10 @@ export default {
|
||||
const barcode = barcodeList.length > 5 ? barcodeList.slice(0, 5).join('、') : barcodeList.join('、')
|
||||
const barcodeExtra = barcodeList.length > 5 ? `+${barcodeList.length - 5}` : ''
|
||||
const rawImage = this.getRowValue(row, ['images', 'image', 'image_url', 'imageUrl'])
|
||||
const image = Array.isArray(rawImage) ? (rawImage[0] || '') : rawImage
|
||||
const imageList = Array.isArray(rawImage)
|
||||
? rawImage.map((v) => String(v == null ? '' : v).trim()).filter((v) => v !== '')
|
||||
: (rawImage ? [String(rawImage).trim()] : [])
|
||||
const image = imageList[0] || ''
|
||||
// 免复核判定:need_recheck 去空白转大写后为 'N'(缺失按需复核处理)
|
||||
const needRecheck = this.getRowValue(row, ['need_recheck', 'needRecheck']) || ''
|
||||
const exemptRecheck = String(needRecheck).trim().toUpperCase() === 'N'
|
||||
@ -1141,6 +1158,7 @@ export default {
|
||||
spec: this.getRowValue(row, ['sku_property', 'spec', 'spec_name', 'size', 'sku_spec']),
|
||||
location: this.getRowValue(row, ['location', 'location_code', 'loc_code', 'stock_location', 'storage_location', '库位']),
|
||||
image,
|
||||
imageList,
|
||||
packingRequirements: this.getRowValue(row, ['recheck_requirements', 'recheckRequirements']),
|
||||
// 免验标记:need_recheck=N 表示无需复核(对齐 WMS_PDA,缺失按需复核处理)
|
||||
needRecheck,
|
||||
@ -1708,6 +1726,23 @@ export default {
|
||||
this.weighFocusTimer = null
|
||||
}
|
||||
},
|
||||
// 强制锁定横屏兜底(setStyle 已禁用:见布局壳 lockLandscape 说明,
|
||||
// reLaunch/热恢复时 setStyle 触发原生层 ViewOptions.updateViewData NPE 导致白屏)
|
||||
lockLandscape() {
|
||||
// #ifdef APP-PLUS
|
||||
try {
|
||||
const screen = plus && plus.screen
|
||||
if (screen && typeof screen.lockOrientation === 'function') {
|
||||
screen.lockOrientation('landscape')
|
||||
console.log('[order] lockOrientation=landscape done')
|
||||
}
|
||||
return true
|
||||
} catch (e) {
|
||||
console.log('[order] lockOrientation 异常:', e && e.message)
|
||||
}
|
||||
// #endif
|
||||
return false
|
||||
},
|
||||
// 恢复窗口软键盘模式:登录/打包页会把窗口设为 ALWAYS_HIDDEN(3)(窗口级、跨页持续),
|
||||
// 导致订单复核页称重/包材输入框聚焦后软键盘弹出又被系统立刻隐藏。
|
||||
// 这里重置为 ADJUST_NOTHING(0x30=48) | STATE_UNSPECIFIED(0):键盘可正常弹出,且不调整窗口避免旧 WebView 失焦
|
||||
@ -1972,10 +2007,84 @@ export default {
|
||||
if (!src) {
|
||||
return
|
||||
}
|
||||
this.sharedImagePreviewList = [src]
|
||||
this.sharedImagePreviewIndex = 0
|
||||
this.sharedImagePreviewUrl = src
|
||||
this.resetPreviewZoom()
|
||||
this.sharedImagePreviewVisible = true
|
||||
},
|
||||
// 打开商品图片全屏预览(支持多图翻页):imageList 为图片地址列表,index 为初始下标
|
||||
previewProductImages(imageList, index) {
|
||||
const list = (imageList || [])
|
||||
.map((v) => String(v == null ? '' : v).trim())
|
||||
.filter((v) => v !== '')
|
||||
if (!list.length) {
|
||||
return
|
||||
}
|
||||
const idx = Math.max(0, Math.min(Number(index) || 0, list.length - 1))
|
||||
this.sharedImagePreviewList = list
|
||||
this.sharedImagePreviewIndex = idx
|
||||
this.sharedImagePreviewUrl = list[idx]
|
||||
this.resetPreviewZoom()
|
||||
this.sharedImagePreviewVisible = true
|
||||
},
|
||||
// 预览内切换图片(翻页后复位缩放与拖动)
|
||||
showPreviewImageAt(index) {
|
||||
const list = this.sharedImagePreviewList || []
|
||||
if (!list.length) {
|
||||
return
|
||||
}
|
||||
const idx = Math.max(0, Math.min(Number(index), list.length - 1))
|
||||
this.sharedImagePreviewIndex = idx
|
||||
this.sharedImagePreviewUrl = list[idx]
|
||||
this.resetPreviewZoom()
|
||||
},
|
||||
nextPreviewImage() {
|
||||
if ((this.sharedImagePreviewList || []).length <= 1) {
|
||||
return
|
||||
}
|
||||
this.showPreviewImageAt(this.sharedImagePreviewIndex + 1)
|
||||
},
|
||||
prevPreviewImage() {
|
||||
if ((this.sharedImagePreviewList || []).length <= 1) {
|
||||
return
|
||||
}
|
||||
this.showPreviewImageAt(this.sharedImagePreviewIndex - 1)
|
||||
},
|
||||
// 点击商品明细图片单元格:有图时拦截冒泡并放大预览,无图时不拦截以保持行点击(无条码复核等)
|
||||
handleImageCellClick(order, event) {
|
||||
if (!order || !order.image) {
|
||||
return
|
||||
}
|
||||
this.stopImageCellEvent(event)
|
||||
this.previewProductImages(order.imageList || [order.image], 0)
|
||||
},
|
||||
// 图片单元格长按:有图时拦截冒泡,避免触发行长按(无条码复核)
|
||||
handleImageCellLongtap(order, event) {
|
||||
if (!order || !order.image) {
|
||||
return
|
||||
}
|
||||
this.stopImageCellEvent(event)
|
||||
},
|
||||
// 图片单元格右键:有图时拦截冒泡,避免触发行右键(无条码复核直接执行)
|
||||
handleImageCellContextmenu(order, event) {
|
||||
if (!order || !order.image) {
|
||||
return
|
||||
}
|
||||
this.stopImageCellEvent(event)
|
||||
},
|
||||
// 阻止图片单元格事件冒泡(真机 WebView 上原生 stopPropagation 更可靠)
|
||||
stopImageCellEvent(event) {
|
||||
if (!event) {
|
||||
return
|
||||
}
|
||||
if (typeof event.stopPropagation === 'function') {
|
||||
event.stopPropagation()
|
||||
}
|
||||
if (typeof event.preventDefault === 'function') {
|
||||
event.preventDefault()
|
||||
}
|
||||
},
|
||||
// 关闭商品图片预览
|
||||
closeSharedImagePreview() {
|
||||
if (this.previewCloseTimer) {
|
||||
@ -4668,6 +4777,11 @@ export default {
|
||||
this.loadPrinters()
|
||||
this.loadSettings()
|
||||
this.restoreSoftInputMode()
|
||||
// 登录进入布局壳后订单页白屏兜底:订单页组件渲染晚于布局壳 onShow 的 lockLandscape,
|
||||
// 这里补 setStyle 纠正 WebView 视口(立即 + 延迟重试)
|
||||
this.lockLandscape()
|
||||
setTimeout(() => { this.lockLandscape() }, 300)
|
||||
setTimeout(() => { this.lockLandscape() }, 800)
|
||||
// 扫码枪识别:真机/H5 双链路(隐藏 input + plus.key + DOM 全局监听)
|
||||
this.setupScanCaptureMode()
|
||||
this.attachPlusKeyboardListener()
|
||||
@ -4727,31 +4841,6 @@ export default {
|
||||
}
|
||||
</script>
|
||||
|
||||
<script module="remInject" lang="renderjs">
|
||||
import { applyRemBase } from '../../render-common/rem-base.js'
|
||||
|
||||
export default {
|
||||
mounted() {
|
||||
// #ifndef APP-PLUS
|
||||
// rem 基准统一走 render-common/rem-base.js(满格 1rem = 100px,>1280 宽不再放大字体),
|
||||
// 字号偏大靠改 CSS 的 font-size 值(已全局 ×0.85),不动基准
|
||||
// 各页面不再各算一份,避免系数漂移
|
||||
// 真机(APP-PLUS)rem 由 App.vue 全局纯 CSS(html { font-size: 7.8125vw !important }=100/1280)承担。
|
||||
// ⚠️ 这里用 #ifndef,不要写成 `#ifdef APP-PLUS + return`:后者会让 esbuild 报
|
||||
// “semicolon-after-return”,且以后往 mounted 里补的视图层代码会变成真机永不执行。
|
||||
this._remResizeHandler = applyRemBase
|
||||
applyRemBase()
|
||||
window.addEventListener('resize', this._remResizeHandler)
|
||||
// #endif
|
||||
},
|
||||
beforeDestroy() {
|
||||
if (this._remResizeHandler) {
|
||||
window.removeEventListener('resize', this._remResizeHandler)
|
||||
this._remResizeHandler = null
|
||||
}
|
||||
}
|
||||
}
|
||||
</script>
|
||||
<style>
|
||||
/* 基准(src/styles/base.css 的 .page):box-sizing / flex: 1 / min-height: 0 / display: flex /
|
||||
flex-direction: column / 底色,本页只写差异项 */
|
||||
@ -4771,6 +4860,19 @@ export default {
|
||||
/* 订单复核页:锁定高度链,仅列表区内部滚动,页面不整体滚动 */
|
||||
.page-main.order-review-one {
|
||||
overflow: hidden;
|
||||
/* 四周页边距由 25px 收窄到一半(12.5px),让面板更贴近屏幕边缘 */
|
||||
padding-left: 0.125rem;
|
||||
padding-right: 0.125rem;
|
||||
padding-bottom: 0.125rem;
|
||||
}
|
||||
|
||||
/* 顶栏下边距减半:20px → 7.5px,与 page-main 顶部内边距 5px 合计 12.5px,
|
||||
顶部留白与左右页边距(12.5px)保持一致。
|
||||
注意:uni-app H5 会把本页 <style> 强制按 scoped 处理(所有选择器补 data-v),
|
||||
而 .top-nav 是 top-nav 子组件的元素(带的是子组件的 data-v),
|
||||
必须用 :deep() 穿透,否则 .top-nav 会被补上本页 data-v 导致匹配不到 */
|
||||
.order-review-page :deep(.top-nav) {
|
||||
margin-bottom: 0.075rem !important;
|
||||
}
|
||||
|
||||
.page-main.order-review-one > .container {
|
||||
@ -4786,7 +4888,7 @@ export default {
|
||||
|
||||
.container {
|
||||
background: var(--wms-page-bg);
|
||||
border-radius: 0.13rem;
|
||||
border-radius: 0.07rem;
|
||||
margin: 0;
|
||||
/* 内间距归零:到页边的留白由 .page-main 的 --wms-page-pad 统一负责,避免叠加成 35px */
|
||||
padding: 0;
|
||||
@ -4850,11 +4952,11 @@ export default {
|
||||
align-items: center;
|
||||
gap: 0.15rem;
|
||||
/* 白卡片(与退件页左栏同风格);卡片间距用 margin-bottom,与 .scan-qty-bar 一致 */
|
||||
padding: 0.15rem;
|
||||
padding: 0.1rem 0.15rem;
|
||||
box-sizing: border-box;
|
||||
background-color: var(--wms-card-bg);
|
||||
border-radius: 0.07rem;
|
||||
margin-bottom: 0.15rem;
|
||||
margin-bottom: 0.1rem;
|
||||
}
|
||||
|
||||
.scan-qty-bar {
|
||||
@ -4864,7 +4966,7 @@ export default {
|
||||
/* 左栏 380px 下这一行放不下:允许换行(必要时步进器掉到第二行),避免横向溢出 */
|
||||
flex-wrap: wrap;
|
||||
gap: 0.1rem;
|
||||
margin-bottom: 0.15rem;
|
||||
margin-bottom: 0.1rem;
|
||||
padding: 0.1rem 0.15rem;
|
||||
background-color: var(--wms-card-bg);
|
||||
border-radius: 0.07rem;
|
||||
@ -4982,6 +5084,7 @@ export default {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
overflow-x: auto;
|
||||
border-radius: 0.07rem;
|
||||
}
|
||||
|
||||
.empty-panel {
|
||||
@ -5012,7 +5115,7 @@ export default {
|
||||
flex-wrap: wrap;
|
||||
gap: 0.1rem;
|
||||
/* 左栏改灰底后,底部信息栏独立成一张白卡片(不再贴分栏线,故无负边距与上下分隔线) */
|
||||
margin-top: 0.15rem;
|
||||
margin-top: 0.1rem;
|
||||
padding: 0.1rem 0.15rem;
|
||||
box-sizing: border-box;
|
||||
background-color: var(--wms-card-bg);
|
||||
@ -5259,9 +5362,35 @@ export default {
|
||||
height: 0.59rem;
|
||||
border-radius: 0.07rem;
|
||||
background-color: #f2f4f8;
|
||||
cursor: pointer;
|
||||
}
|
||||
|
||||
.cell-image-wrap {
|
||||
position: relative;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
margin: 0.05rem 0;
|
||||
}
|
||||
|
||||
.cell-image-badge {
|
||||
position: absolute;
|
||||
top: -0.07rem;
|
||||
right: -0.07rem;
|
||||
min-width: 0.24rem;
|
||||
height: 0.24rem;
|
||||
line-height: 0.24rem;
|
||||
padding: 0 0.05rem;
|
||||
box-sizing: border-box;
|
||||
font-size: 0.15rem;
|
||||
color: #ffffff;
|
||||
background-color: var(--wms-danger-strong);
|
||||
border-radius: 0.12rem;
|
||||
text-align: center;
|
||||
pointer-events: none;
|
||||
user-select: none;
|
||||
}
|
||||
|
||||
.cell-image-empty {
|
||||
color: var(--wms-text-placeholder);
|
||||
}
|
||||
@ -5676,6 +5805,47 @@ export default {
|
||||
white-space: nowrap;
|
||||
}
|
||||
|
||||
.shared-img-preview-prev,
|
||||
.shared-img-preview-next {
|
||||
position: absolute;
|
||||
top: 50%;
|
||||
transform: translateY(-50%);
|
||||
width: 0.6rem;
|
||||
height: 0.6rem;
|
||||
line-height: 0.6rem;
|
||||
text-align: center;
|
||||
font-size: 0.4rem;
|
||||
color: #ffffff;
|
||||
background-color: rgba(0, 0, 0, 0.5);
|
||||
border-radius: 50%;
|
||||
z-index: 2;
|
||||
user-select: none;
|
||||
cursor: pointer;
|
||||
}
|
||||
|
||||
.shared-img-preview-prev {
|
||||
left: 0.3rem;
|
||||
}
|
||||
|
||||
.shared-img-preview-next {
|
||||
right: 0.3rem;
|
||||
}
|
||||
|
||||
.shared-img-preview-count {
|
||||
position: absolute;
|
||||
top: 0.3rem;
|
||||
left: 50%;
|
||||
transform: translateX(-50%);
|
||||
padding: 0.04rem 0.16rem;
|
||||
font-size: 0.22rem;
|
||||
color: rgba(255, 255, 255, 0.9);
|
||||
background-color: rgba(0, 0, 0, 0.4);
|
||||
border-radius: 0.3rem;
|
||||
z-index: 2;
|
||||
pointer-events: none;
|
||||
white-space: nowrap;
|
||||
}
|
||||
|
||||
.shared-img-preview-close {
|
||||
position: absolute;
|
||||
top: 0.3rem;
|
||||
@ -6215,8 +6385,9 @@ export default {
|
||||
align-items: center;
|
||||
max-width: 100%;
|
||||
margin-bottom: 0.1rem;
|
||||
padding: 0.1rem 0.15rem;
|
||||
padding: 0.15rem 0.15rem 0.05rem;
|
||||
background-color: var(--wms-card-bg);
|
||||
border-radius: 0.07rem;
|
||||
/* 不能用 overflow:hidden:自绘打印台下拉框要向下展开,会被裁掉 */
|
||||
}
|
||||
|
||||
@ -6542,11 +6713,11 @@ export default {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: flex-start;
|
||||
margin-top: 0.2rem;
|
||||
padding: 0.15rem 0.2rem;
|
||||
margin-top: 0.1rem;
|
||||
padding: 0.1rem 0.2rem;
|
||||
background-color: #f6f8fc;
|
||||
border: 0.01rem solid #e6ebf5;
|
||||
border-radius: 0;
|
||||
border-radius: 0.07rem;
|
||||
}
|
||||
|
||||
.detail-total-text {
|
||||
@ -6568,6 +6739,7 @@ export default {
|
||||
color: var(--wms-text-placeholder);
|
||||
font-size: 0.18rem;
|
||||
background-color: var(--wms-card-bg);
|
||||
border-radius: 0.07rem;
|
||||
}
|
||||
|
||||
.empty {
|
||||
|
||||
@ -3787,8 +3787,8 @@ export default {
|
||||
box-sizing: border-box;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
/* 与全站主体内间距统一(顶栏无 margin-bottom,上 0.25 就是顶栏到内容的 25px) */
|
||||
padding: var(--wms-page-pad);
|
||||
/* 页边距收窄到一半(12.5px),与订单复核/称重/退件页一致(顶栏无 margin-bottom,四周均由此 padding 决定) */
|
||||
padding: 0.125rem;
|
||||
overflow: hidden;
|
||||
}
|
||||
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
<template>
|
||||
<view class="page">
|
||||
<view class="page returns-page">
|
||||
<top-nav v-if="!embedded" />
|
||||
<view class="page-main">
|
||||
<view class="rp-layout">
|
||||
@ -2381,11 +2381,20 @@ export default {
|
||||
overflow: hidden;
|
||||
}
|
||||
|
||||
/* 独立访问(URL 直达,非布局壳 embedded)时收窄顶栏下边距,与布局壳 .layout-page--compact-top 对齐 */
|
||||
.returns-page :deep(.top-nav) {
|
||||
margin-bottom: 0.075rem !important;
|
||||
}
|
||||
|
||||
/* 基准(src/styles/base.css 的 .page-main):box-sizing / flex: 1 / min-height: 0 /
|
||||
display: flex / flex-direction: column / 四周内间距(上 0.05、左右下 0.25),
|
||||
本页只写差异项 —— 不整页滚,滚动交给内部左右面板 */
|
||||
.page-main {
|
||||
overflow: hidden;
|
||||
/* 页边距收窄到一半(12.5px),与订单复核页一致 */
|
||||
padding-left: 0.125rem;
|
||||
padding-right: 0.125rem;
|
||||
padding-bottom: 0.125rem;
|
||||
}
|
||||
|
||||
.rp-layout {
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
<template>
|
||||
<view class="page">
|
||||
<view class="page weighing-page">
|
||||
<top-nav v-if="!embedded" />
|
||||
<view class="page-main">
|
||||
<view class="dynamic-view dynamic-view--catch-weight">
|
||||
@ -63,8 +63,17 @@ export default {
|
||||
overflow: hidden;
|
||||
}
|
||||
|
||||
/* 独立访问(URL 直达,非布局壳 embedded)时收窄顶栏下边距,与布局壳 .layout-page--compact-top 对齐 */
|
||||
.weighing-page :deep(.top-nav) {
|
||||
margin-bottom: 0.075rem !important;
|
||||
}
|
||||
|
||||
.page-main {
|
||||
overflow-y: auto;
|
||||
/* 页边距收窄到一半(12.5px),与订单复核页一致 */
|
||||
padding-left: 0.125rem;
|
||||
padding-right: 0.125rem;
|
||||
padding-bottom: 0.125rem;
|
||||
}
|
||||
|
||||
.dynamic-view--catch-weight {
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user