chore: 版本升至 1.0.123,商品图片维护回滚逻辑优化,新增发布上传配置

商品图片编辑/维护(edit.vue、itemMaint.vue):
- 图片未变化时直接放行返回,不再每次返回都发 ReferenceFile 请求(修复需点两次返回)
- 返回键/返回按钮先拦截,回滚完成后再 navigateBack,避免页面提前销毁导致回滚中断、图片停留在删除后状态
- navigateBack 增加 success/fail 均未触发的静默失效重试兜底
- 保存成功后同步初始快照,避免保存后返回被误回滚到保存前图片
- itemMaint 图片查询支持多候选 id 兜底(查询页传入 id/stock_id 优先),修复按条码重查不到商品时图片不显示

商品查询页(query.vue):
- 跳转维护页时附带 id/stock_id 参数,供图片查询兜底
- 图片缩略图增加 :key 强制刷新

发布上传(config/deploy.json、deploy.example.json):
- 新增部署配置,打包结束后自动生成 latest.json 并用 scp 上传 APK + 版本清单
- config/README.md 补充 deploy.json 字段说明

测试包构建脚本(dev-adb.cjs):
- 不注入地址时(--prod-api / 未配置开发地址)显式删除继承的环境变量,避免终端残留 VUE_APP_API_BASE_OVERRIDE/URL 把开发地址带进包

文档(README.md):
- 更新测试包命令用法,说明 npm 10 下 -- 参数会被吞、需直接用 node 调用脚本

其他:
- package.json、manifest.json 版本号 1.0.122 → 1.0.123
- 新增 scripts/_argtest.cjs(打印 argv,调试用)
This commit is contained in:
zm2000 2026-10-06 19:30:29 +08:00
parent e8db7a2293
commit db90efa0cb
11 changed files with 351 additions and 85 deletions

View File

@ -112,12 +112,15 @@
| 场景 | 命令 | 接口地址来源 |
| --- | --- | --- |
| 发行包 | `npm run build:apk` | `src/env.js` 的 `PROD_API_BASE`(固定),构建后强制校验产物不含内网地址 |
| 测试包 | `npm run dev:adb` | 默认 `.env.development.local` 的 `VUE_APP_API_BASE_URL`;可用 `--api=http://x.x.x.x:6060` 指定 |
| 测试包(与发行一致) | `npm run dev:adb -- --prod-api` | 不注入,指向生产(用于排查线上问题) |
| 测试包 | `npm run dev:adb` | 默认 `.env.development.local` 的 `VUE_APP_API_BASE_URL` |
| 测试包(指定后端) | `node scripts/dev-adb.cjs --api=http://x.x.x.x:6060` | 显式注入指定地址(优先级最高) |
| 测试包(与发行一致) | `node scripts/dev-adb.cjs --prod-api` | 不注入,指向生产(用于排查线上问题) |
> ⚠️ 带参数时请直接用 `node scripts/dev-adb.cjs <参数>`:Windows + npm 10 下 `npm run dev:adb -- <参数>` 的 `--` 参数会被 npm 吞掉、不传给脚本(`--prod-api` 会因此失效并回落到开发地址)。不带参数的 `npm run dev:adb` 不受影响。
- 注入方式:编译期命令行环境变量 `VUE_APP_API_BASE_OVERRIDE`(**不写入任何 .env 文件、不落盘**),在 `src/env.js` 中优先级最高。与工作台项目的 `VITE_API_BASE_OVERRIDE` 是同一套思路。
- 测试包产物单独放 `release/android/dev/` 且文件名带 `_dev`,**不会覆盖发行包**,也不会触发发布上传(自动加 `-Dev -NoUpload`)。
- 设备选择:命令行 `--serial=` > 上次选择的设备(记在 `.dev-adb.local.json`,不提交)> 只有一台时自动选中 > 多台时交互选择。
- 设备选择:命令行 `--serial=` > 上次选择的设备(记在 `.dev-adb.local.json`,不提交)> 只有一台时自动选中 > 多台时交互选择。示例:`node scripts/dev-adb.cjs --prod-api --serial=4235737`。
- 若在 cmd / 默认代码页(936)的窗口里运行看到中文乱码:先执行 `chcp 65001`(VS Code 内置终端、Windows Terminal 默认无需处理)。
- 两道校验方向相反:发行包**反向**校验(产物中不得出现 `192.168.x.x`/`127.0.0.1`);测试包**正向**校验(产物中必须出现注入的地址,否则中止,避免装成生产包却以为在测开发环境)。
- 真机 JS 日志:**离线 release 包默认不会把 `console.log` 输出到 logcat**(HBuilderX「运行到手机」靠的是 debug 基座)。测试包由 `src/core/utils/dev-log.js` 用 `plus.android` 桥接 `android.util.Log`,把 console 转发到 logcat 的 `jsLog` tag(`dev:adb` 会自动注入开关并实时跟随打印):

View File

@ -6,6 +6,8 @@
|---|---|---|
| `android.json` | Android 离线打包本地配置(appKey、签名密码等) | ❌ |
| `android.example.json` | 上述配置的模板,首次使用复制为 `android.json` | ✅ |
| `deploy.json` | 发布上传配置(scp 目标、下载地址前缀等),存在时打包结束自动上传 APK + `latest.json` | ❌ |
| `deploy.example.json` | 上述配置的模板,首次使用复制为 `deploy.json` | ✅ |
## android.json 字段
@ -50,6 +52,20 @@
> 签名不同会导致**无法覆盖安装**已发布的云打包版本(需先卸载重装),这是切离线打包的必然代价。
## deploy.json 字段(发布上传)
打包结束后,`pack.ps1` 会检查 `config/deploy.json`:存在则生成 `latest.json`(版本、文件名、下载地址、SHA-256、发布时间)并用 `scp` 上传 APK 与 `latest.json`;不存在则跳过上传(仅打本地包)。加 `-NoUpload` 或 `-Dev` 也会跳过上传。
| 字段 | 必填 | 说明 |
|---|---|---|
| `host` | ✅ | scp 目标主机 IP/域名 |
| `user` | ✅ | SSH 用户名 |
| `remoteDir` | ✅ | 远程上传目录 |
| `downloadUrlPrefix` | ✅ | 下载 URL 前缀,与 APK 文件名拼接成完整下载地址写入 `latest.json` |
| `keyPath` | ⬜ | SSH 私钥路径,填写后会校验文件存在 |
| `port` | ⬜ | SSH 端口,默认 22 |
| `latestJsonName` | ⬜ | 版本清单文件名,默认 `latest.json` |
## 首次使用
1. 确认 `config/android.json` 已存在(本仓库已预填非敏感项),填写 `appKey`、`keyAlias`、`storePassword`、`keyPassword`;

View File

@ -0,0 +1,11 @@
{
"android": {
"host": "your-server.example.com",
"user": "deploy",
"keyPath": "C:/Users/you/.ssh/id_rsa",
"port": 22,
"remoteDir": "/var/www/wms-pda/download",
"downloadUrlPrefix": "https://your-server.example.com/wms-pda/download",
"latestJsonName": "latest.json"
}
}

11
config/deploy.json Normal file
View File

@ -0,0 +1,11 @@
{
"android": {
"host": "112.124.21.102",
"user": "pdadev",
"keyPath": "C:/Users/Administrator/.ssh/pdadev_112.124.21.102_id_ed25519",
"port": 22,
"remoteDir": "/www/wwwroot/dl/pda",
"downloadUrlPrefix": "http://dl.wms.gztbyc.com/pda",
"latestJsonName": "latest.json"
}
}

View File

@ -1,6 +1,6 @@
{
"name": "wms-pda",
"version": "1.0.122",
"version": "1.0.123",
"private": true,
"description": "天豹云仓 WMS_PDA(uni-app Vue2 + @vue/cli 4.5)",
"scripts": {

1
scripts/_argtest.cjs Normal file
View File

@ -0,0 +1 @@
console.log('ARGV=' + JSON.stringify(process.argv.slice(2)))

View File

@ -86,17 +86,26 @@ function resolveApiTarget() {
const API_TARGET = resolveApiTarget()
const BUILD_ENV = {
...(API_TARGET.base ? { VUE_APP_API_BASE_OVERRIDE: API_TARGET.base } : {}),
...(API_TARGET.base
? { VUE_APP_API_BASE_OVERRIDE: API_TARGET.base }
// 不注入地址时(--prod-api / 未配置开发地址),显式删除继承的环境变量(null=删除),
// 避免终端里残留的 VUE_APP_API_BASE_OVERRIDE / VUE_APP_API_BASE_URL 把开发地址带进包
: { VUE_APP_API_BASE_OVERRIDE: null, VUE_APP_API_BASE_URL: null }),
// 测试包始终开启 JS→logcat 转发(发行包不注入该变量,见 src/core/utils/dev-log.js)
VUE_APP_JS_LOG_TO_LOGCAT: '1',
}
// ---------- 工具 ----------
function run(cmd, args, env) {
const mergedEnv = { ...process.env, ...(env || {}) }
// 值为 null 的变量表示「显式删除」,避免终端里继承的旧值被带进子进程
for (const key of Object.keys(env || {})) {
if (env[key] === null) delete mergedEnv[key]
}
const res = spawnSync(cmd, args, {
cwd: ROOT,
stdio: 'inherit',
env: { ...process.env, ...(env || {}) },
env: mergedEnv,
shell: process.platform === 'win32',
})
if (res.error) {

View File

@ -2,8 +2,8 @@
"name" : "WMS_PDA",
"appid" : "__UNI__0B3DAD3",
"description" : "多平台快速开发的UI框架",
"versionName" : "1.0.122",
"versionCode" : 1000122,
"versionName" : "1.0.123",
"versionCode" : 1000123,
"transformPx" : false,
"app-plus" : {
"optimization" : {

View File

@ -199,6 +199,7 @@ export default {
canceling: false,
keepVoiceOnExit: false,
bypassBackIntercept: false,
rollbacking: false,
rawItem: null,
initialImageSnapshot: [],
initialImageFileIds: [],
@ -329,18 +330,41 @@ export default {
this.safeDispatchBroadcast('resume');
},
onBackPress() {
if (this.rollbacking) {
// 图片回滚进行中:继续拦截,等待回滚完成自动返回
return true;
}
if (this.bypassBackIntercept || this.saving) {
// 已经在回退流程中,放行系统返回
return false;
}
// 标记已拦截,防止多次触发
// 图片未发生变化时无需回滚,直接放行返回
if (!this.hasImageChanges()) {
return false;
}
// 拦截系统返回:先异步回滚图片引用,完成后再手动返回。
// 若直接 return false 放行,页面会立即销毁,回滚请求被中断,
// 后端图片关联停留在删除后的状态,再次进入页面会显示删除后的图片。
this.bypassBackIntercept = true;
// 只做图片回滚,不主动 navigateBack,交给系统返回
this.rollbackImageReferences().catch(err => {
console.warn('[ProductEdit] 返回时回滚商品图片失败:', err);
this.rollbacking = true;
uni.showLoading({
title: '正在恢复图片…',
mask: true
});
// 返回 false,让系统继续处理返回(页面会被销毁)
return false;
this.rollbackImageReferences()
.catch(err => {
console.warn('[ProductEdit] 返回时回滚商品图片失败:', err);
})
.finally(() => {
this.rollbacking = false;
uni.hideLoading();
// 延迟到下一轮事件循环再返回,避免 App 端 navigateBack 被系统忽略
setTimeout(() => {
this.navigateBackSafely();
}, 500);
});
// 返回 true 拦截本次系统返回
return true;
},
onUnload() {
if (!this.keepVoiceOnExit) {
@ -1187,6 +1211,16 @@ export default {
});
this.sessionUploadedFileIds = Array.from(mergedIds);
},
hasImageChanges() {
const currentFileIds = this.extractImageFileIds(this.formData.images);
const initialIds = Array.isArray(this.initialImageFileIds) ? this.initialImageFileIds : [];
const currentSet = new Set(currentFileIds.map(String));
const initialSet = new Set(initialIds.map(String));
if (currentSet.size !== initialSet.size) {
return true;
}
return [...currentSet].some(id => !initialSet.has(id));
},
async rollbackImageReferences() {
const businessId = this.productImageBusinessId;
if (!businessId) {
@ -1248,34 +1282,66 @@ export default {
},
navigateBackSafely() {
this.bypassBackIntercept = true;
uni.navigateBack({
delta: 1,
complete: () => {
setTimeout(() => {
this.bypassBackIntercept = false;
}, 300);
let settled = false;
let retried = false;
const doBack = (label) => {
uni.navigateBack({
delta: 1,
success: () => {
settled = true;
console.log(`[ProductEdit] navigateBack ${label}成功`);
},
fail: (err) => {
console.warn(`[ProductEdit] navigateBack ${label}失败:`, err);
if (!retried) {
retried = true;
setTimeout(() => doBack('重试'), 300);
}
}
});
};
doBack('首次');
// 兜底:success/fail 都未触发(静默失效)时,400ms 后重试一次
setTimeout(() => {
if (!settled) {
console.warn('[ProductEdit] navigateBack 静默失效,重试');
doBack('静默重试');
}
});
}, 400);
},
handleImagesChange(nextImages) {
this.trackSessionUploadedFileIds(nextImages);
this.formData.images = Array.isArray(nextImages) ? [...nextImages] : [];
},
async handleCancel() {
if (this.canceling || this.saving) {
if (this.canceling || this.saving || this.rollbacking) {
return;
}
this.keepVoiceOnExit = false;
// 防止多次触发
this.bypassBackIntercept = true;
// 图片未变化时无需回滚,直接返回
if (!this.hasImageChanges()) {
this.navigateBackSafely();
return;
}
this.canceling = true;
this.rollbacking = true;
uni.showLoading({
title: '正在恢复图片…',
mask: true
});
try {
await this.rollbackImageReferences();
} catch (error) {
console.warn('[ProductEdit] 取消时回滚商品图片失败:', error);
} finally {
this.canceling = false;
this.navigateBackSafely();
this.rollbacking = false;
uni.hideLoading();
// 延迟到下一轮事件循环再返回,避免 App 端 navigateBack 被系统忽略
setTimeout(() => {
this.navigateBackSafely();
}, 500);
}
},
async handleSave() {
@ -1469,6 +1535,10 @@ export default {
const normalizedImages = this.buildImageListForCache(this.formData.images);
const normalizedImageUrls = this.extractImageUrls(normalizedImages);
// 保存成功后同步初始快照为当前图片,避免保存成功后手动返回被误回滚
this.initialImageSnapshot = normalizedImages;
this.initialImageFileIds = this.extractImageFileIds(normalizedImages);
const nextItem = {
...(this.rawItem || {}),
...(latestItem || {}),

View File

@ -1,7 +1,7 @@
<template>
<view class="item-maint-page">
<view class="normar_container">
<page-nav title="商品信息维护">
<page-nav title="商品信息维护" @back="handlePageBack">
<template #right>
<u-button
class="nav-save-btn"
@ -131,12 +131,14 @@ export default {
loaded: false,
stockId: 0,
imageBusinessId: 0,
routeImageId: 0,
querySeq: 0,
initialImageSnapshot: [],
initialImageFileIds: [],
sessionUploadedFileIds: [],
latestImagesLoadPromise: null,
bypassBackIntercept: false,
rollbacking: false,
keepVoiceOnExit: false,
formData: {
NAME: '',
@ -167,6 +169,11 @@ export default {
this.barcode = routeBarcode;
this.queryByBarcode();
}
// 商品查询页跳转时带上的已确认商品主键 id,图片查询兜底使用
this.routeImageId = this.normalizePositiveId(
(options && (options.id || options.stock_id)) || ''
) || 0;
},
onShow() {
this.safeDispatchBroadcast('setCallbacks', {
@ -181,18 +188,22 @@ export default {
this.safeDispatchBroadcast('pause');
},
onBackPress() {
if (this.rollbacking) {
// 图片回滚进行中:继续拦截,等待回滚完成自动返回,避免中途放行中断回滚
return true;
}
if (this.bypassBackIntercept || this.saving) {
// 已经在回退流程中,放行系统返回
return false;
}
// 标记已拦截,防止多次触发
this.bypassBackIntercept = true;
// 只做图片回滚,不主动 navigateBack,交给系统返回
this.rollbackImageReferences().catch(err => {
console.warn('[ItemMaint] 返回时回滚商品图片失败:', err);
});
// 返回 false,让系统继续处理返回(页面会被销毁)
return false;
// 图片未发生变化时无需回滚,直接放行返回;
// 否则每次返回都发一次 ReferenceFile 请求阻塞返回,表现为需要点两次返回
if (!this.hasImageChanges()) {
return false;
}
this.startRollbackAndExit();
// 返回 true 拦截本次系统返回
return true;
},
onUnload() {
if (!this.keepVoiceOnExit) {
@ -278,6 +289,30 @@ export default {
// 与商品查询页 getImages 查询保持一致:优先商品主键 id,其次库存主键 stock_id
return this.normalizePositiveId(item.id) || this.normalizePositiveId(item.stock_id);
},
getImageBusinessIdCandidates() {
const candidates = [];
const push = (value) => {
const normalized = this.normalizePositiveId(value);
if (normalized !== null && !candidates.includes(normalized)) {
candidates.push(normalized);
}
};
// 查询页已确认的 id 优先;其次维护页自身解析的 imageBusinessId(id 优先);
// 再其次库存主键 stockId(stock_id 优先),作为 getImages 查询兜底
push(this.routeImageId);
push(this.imageBusinessId);
push(this.stockId);
const raw = this.rawItem && typeof this.rawItem === 'object' ? this.rawItem : null;
if (raw) {
push(raw.id);
push(raw.stock_id);
push(raw.warehouse_stock_id);
}
return candidates;
},
normalizeScanResult(scanResult) {
if (!scanResult) {
return '';
@ -510,7 +545,7 @@ export default {
applyProduct(item) {
this.rawItem = item && typeof item === 'object' ? item : {};
this.stockId = this.resolveWarehouseStockId(item) || 0;
this.imageBusinessId = this.resolveImageBusinessId(item) || 0;
this.imageBusinessId = this.routeImageId || this.resolveImageBusinessId(item) || 0;
this.formData.NAME = this.getItemName(item);
this.formData.WEIGHT = this.toInputValue(item.gross_weight !== undefined ? item.gross_weight : item.weight);
this.formData.NET_WEIGHT = this.toInputValue(item.net_weight);
@ -694,17 +729,32 @@ export default {
));
},
async fetchRemoteImageFileIds() {
const businessId = this.imageBusinessId;
if (!businessId) {
const candidates = this.getImageBusinessIdCandidates();
if (!candidates.length) {
return [];
}
const response = await this.$http('common.getImages', {
type: 'stock',
id: Number(businessId)
});
let lastResponse = null;
for (let i = 0; i < candidates.length; i++) {
const businessId = candidates[i];
try {
const response = await this.$http('common.getImages', {
type: 'stock',
id: Number(businessId)
});
const fileIds = this.extractImageFileIdsFromResponse(response);
if (fileIds.length) {
// 记录实际生效的 businessId,保证后续 ReferenceFile 与图片查询用同一 id
this.imageBusinessId = businessId;
return fileIds;
}
lastResponse = response;
} catch (error) {
console.warn('[ItemMaint] 获取远端图片ID失败:', { businessId, error });
}
}
return this.extractImageFileIdsFromResponse(response);
return lastResponse ? this.extractImageFileIdsFromResponse(lastResponse) : [];
},
normalizeImageRecord(image) {
if (!image) {
@ -738,51 +788,105 @@ export default {
};
},
async loadLatestImages() {
const businessId = this.imageBusinessId;
if (!businessId) {
const candidates = this.getImageBusinessIdCandidates();
if (!candidates.length) {
this.latestImagesLoadPromise = null;
return;
}
try {
const response = await this.$http('common.getImages', {
type: 'stock',
id: Number(businessId)
});
const remoteFileIds = this.extractImageFileIdsFromResponse(response);
if (remoteFileIds.length) {
this.initialImageFileIds = remoteFileIds;
}
let loaded = false;
for (let i = 0; i < candidates.length; i++) {
const businessId = candidates[i];
try {
const response = await this.$http('common.getImages', {
type: 'stock',
id: Number(businessId)
});
const list = this.extractImageListFromGetImagesResponse(response)
.map(image => this.normalizeImageRecord(image))
.filter(Boolean);
const list = this.extractImageListFromGetImagesResponse(response)
.map(image => this.normalizeImageRecord(image))
.filter(Boolean);
if (!list.length) {
if (process.env.NODE_ENV !== 'production') {
console.warn('[ItemMaint] getImages未返回有效图片,保留当前图片列表', {
businessId,
response
});
if (!list.length) {
if (process.env.NODE_ENV !== 'production') {
console.warn('[ItemMaint] getImages未返回图片,尝试下一个候选ID', {
businessId,
candidates
});
}
continue;
}
return;
}
this.formData.images = list;
this.initialImageSnapshot = this.buildImageListForCache(list);
this.initialImageFileIds = this.extractImageFileIds(this.initialImageSnapshot).length
? this.extractImageFileIds(this.initialImageSnapshot)
: this.initialImageFileIds;
this.rawItem = {
...(this.rawItem || {}),
images: list,
image: (list[0] && list[0].url) || ''
};
} catch (error) {
console.warn('[ItemMaint] 获取最新商品图片失败:', error);
} finally {
this.latestImagesLoadPromise = null;
// 记录实际生效的 businessId,后续 ReferenceFile/回滚保持一致
this.imageBusinessId = businessId;
const remoteFileIds = this.extractImageFileIdsFromResponse(response);
if (remoteFileIds.length) {
this.initialImageFileIds = remoteFileIds;
}
this.formData.images = list;
this.initialImageSnapshot = this.buildImageListForCache(list);
this.initialImageFileIds = this.extractImageFileIds(this.initialImageSnapshot).length
? this.extractImageFileIds(this.initialImageSnapshot)
: this.initialImageFileIds;
this.rawItem = {
...(this.rawItem || {}),
images: list,
image: (list[0] && list[0].url) || ''
};
loaded = true;
break;
} catch (error) {
console.warn('[ItemMaint] 获取最新商品图片失败:', { businessId, error });
}
}
if (!loaded && process.env.NODE_ENV !== 'production') {
console.warn('[ItemMaint] 所有候选ID均未获取到商品图片,保留当前图片列表', { candidates });
}
this.latestImagesLoadPromise = null;
},
hasImageChanges() {
const currentFileIds = this.extractImageFileIds(this.formData.images);
const initialIds = Array.isArray(this.initialImageFileIds) ? this.initialImageFileIds : [];
const currentSet = new Set(currentFileIds.map(String));
const initialSet = new Set(initialIds.map(String));
if (currentSet.size !== initialSet.size) {
return true;
}
return [...currentSet].some(id => !initialSet.has(id));
},
handlePageBack() {
if (this.rollbacking || this.saving || this.bypassBackIntercept) {
return;
}
if (!this.hasImageChanges()) {
this.navigateBackSafely();
return;
}
this.startRollbackAndExit();
},
startRollbackAndExit() {
this.bypassBackIntercept = true;
this.rollbacking = true;
uni.showLoading({
title: '正在恢复图片…',
mask: true
});
this.rollbackImageReferences()
.catch(err => {
console.warn('[ItemMaint] 返回时回滚商品图片失败:', err);
})
.finally(() => {
this.rollbacking = false;
uni.hideLoading();
// 延迟到下一轮事件循环再返回:App 端 onBackPress 拦截返回键后,
// 立即 navigateBack 可能被系统忽略,导致回滚完成后页面未自动返回
setTimeout(() => {
this.navigateBackSafely();
}, 500);
});
},
async rollbackImageReferences() {
const businessId = this.imageBusinessId;
@ -790,6 +894,10 @@ export default {
return;
}
if (!this.hasImageChanges()) {
return;
}
if (this.latestImagesLoadPromise) {
try {
await this.latestImagesLoadPromise;
@ -833,14 +941,32 @@ export default {
},
navigateBackSafely() {
this.bypassBackIntercept = true;
uni.navigateBack({
delta: 1,
complete: () => {
setTimeout(() => {
this.bypassBackIntercept = false;
}, 300);
let settled = false;
let retried = false;
const doBack = (label) => {
uni.navigateBack({
delta: 1,
success: () => {
settled = true;
console.log(`[ItemMaint] navigateBack ${label}成功`);
},
fail: (err) => {
console.warn(`[ItemMaint] navigateBack ${label}失败:`, err);
if (!retried) {
retried = true;
setTimeout(() => doBack('重试'), 300);
}
}
});
};
doBack('首次');
// 兜底:success/fail 都未触发(静默失效)时,400ms 后重试一次
setTimeout(() => {
if (!settled) {
console.warn('[ItemMaint] navigateBack 静默失效,重试');
doBack('静默重试');
}
});
}, 400);
},
normalizeSpeechText(message) {
const rawText = String(message || '').trim();
@ -1012,6 +1138,10 @@ export default {
.map(image => (image && image.url) || '')
.filter(Boolean);
// 保存成功后同步初始快照为当前图片,避免返回时误回滚到保存前的图片
this.initialImageSnapshot = normalizedImages;
this.initialImageFileIds = this.extractImageFileIds(normalizedImages);
const nextItem = {
...(this.rawItem || {}),
id: this.stockId,

View File

@ -85,6 +85,7 @@
<view class="item-thumb" @click.stop="previewProductImage(item)">
<u-image
class="goods-image"
:key="getImageUrl(item)"
:src="getImageUrl(item)"
mode="aspectFill"
width="140rpx"
@ -2256,7 +2257,21 @@
|| item.goods_code
|| ''
).trim();
const query = keyword ? `?barcode=${encodeURIComponent(keyword)}` : '';
// 带上商品主键 id/库存主键 stock_id:维护页按条码重查不到商品时,
// 图片查询可回退到查询页已确认的 id,避免 getImages 用错 id 导致图片不显示
const imageId = this.normalizePositiveId(item.id || item.stock_id);
const stockId = this.normalizePositiveId(item.stock_id);
const params = [];
if (keyword) {
params.push(`barcode=${encodeURIComponent(keyword)}`);
}
if (imageId) {
params.push(`id=${imageId}`);
}
if (stockId && stockId !== imageId) {
params.push(`stock_id=${stockId}`);
}
const query = params.length ? `?${params.join('&')}` : '';
uni.navigateTo({
url: `/pages/work/product/itemMaint${query}`
});