From 497b53317b0dc7883b15fcec33cb26a684fd5138 Mon Sep 17 00:00:00 2001 From: kola-web Date: Thu, 21 May 2026 16:47:35 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=96=B0=E5=A2=9E=E5=9B=BE=E7=89=87?= =?UTF-8?q?=E9=A2=84=E8=A7=88=E7=BB=84=E4=BB=B6=E4=B8=8E=E7=AC=94=E8=AE=B0?= =?UTF-8?q?=E5=9B=BE=E7=89=87=E6=9F=A5=E7=9C=8B=E5=8A=9F=E8=83=BD=EF=BC=8C?= =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=A4=9A=E4=B8=AA=E9=A1=B5=E9=9D=A2=E6=A0=B7?= =?UTF-8?q?=E5=BC=8F=E4=B8=8E=E4=BA=A4=E4=BA=92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1. 新增noteImagePreview图片预览组件，支持分组标注与操作栏控制 2. 在笔记详情、历史记录页面集成图片预览组件，替换原生预览实现 3. 优化拍照裁切比例为4:3，修复前置摄像头镜像翻转问题 4. 调整新增记录页面样式，优化表单布局与按钮样式 5. 为首页新增首次使用笔记引导弹窗 6. 优化图片合并组件的文字绘制逻辑，适配不同像素密度 7. 修复toast组件位置与安全区适配问题 --- src/components/image-merge/index.ts | 35 ++++++++++------- src/components/noteImagePreview/index.scss | 25 ++++++++++++ src/components/noteImagePreview/index.ts | 8 ++++ src/components/noteImagePreview/index.wxml | 7 +++- src/components/patient-tab-bar/index.scss | 9 +++++ src/components/toast/index.scss | 11 ++++++ src/components/toast/index.wxml | 7 ++++ src/pages/d_noteDetail/index.json | 3 +- src/pages/d_noteDetail/index.ts | 56 ++++++++++++++++++++++++-- src/pages/d_noteDetail/index.wxml | 12 ++++++ src/patient/components/camera/index.ts | 7 +++- src/patient/components/image-merge/index.ts | 37 +++++++++-------- src/patient/pages/index/index.ts | 13 ++++++ src/patient/pages/note/index.scss | 12 +----- src/patient/pages/note/index.wxml | 3 +- src/patient/pages/noteAdd/index.scss | 23 ++++++----- src/patient/pages/noteAdd/index.ts | 61 +++++++++++++++++++++-------- src/patient/pages/noteAdd/index.wxml | 3 +- src/patient/pages/noteHistory/index.json | 3 +- src/patient/pages/noteHistory/index.ts | 56 ++++++++++++++++++++++++-- src/patient/pages/noteHistory/index.wxml | 12 ++++++ 21 files changed, 319 insertions(+), 84 deletions(-) diff --git a/src/components/image-merge/index.ts b/src/components/image-merge/index.ts index aa0fe2c..06fd52a 100644 --- a/src/components/image-merge/index.ts +++ b/src/components/image-merge/index.ts @@ -96,11 +96,12 @@ Component({ const canvas = res[0].node const ctx = canvas.getContext('2d') - Promise.all(imageList.map((item) => this.getImageInfo(item.src))) + Promise.all(imageList.map(item => this.getImageInfo(item.src))) .then((imageInfos) => { const targetWidth = 750 const pixelRatio = wx.getWindowInfo().pixelRatio const canvasWidth = Math.floor((targetWidth * pixelRatio) / 2) + const fontScale = pixelRatio / 2 let totalHeight = 0 const scaledHeights: number[] = [] @@ -135,29 +136,33 @@ Component({ ctx.drawImage(img, 0, yPositions[index], canvasWidth, scaledHeights[index]) const timeText = imageList[index].time || this.formatTime(new Date()) - const padding = 20 - const textY = yPositions[index] + 40 + const padding = 20 * fontScale + const fontSize = Math.round(28 * fontScale) + const textY = yPositions[index] + 40 * fontScale + + ctx.font = `bold ${fontSize}px sans-serif` + ctx.textBaseline = 'middle' + const textMetrics = ctx.measureText(timeText) + const bgPaddingH = 16 * fontScale + const bgPaddingV = 10 * fontScale + const bgH = fontSize + bgPaddingV * 2 + const bgX = padding - bgPaddingH + const bgY = textY - bgH / 2 + const bgW = textMetrics.width + bgPaddingH * 2 + + ctx.fillStyle = 'rgba(0, 0, 0, 0.45)' + ctx.fillRect(bgX, bgY, bgW, bgH) ctx.fillStyle = '#ffffff' - ctx.font = 'bold 38px sans-serif' ctx.textAlign = 'left' - ctx.shadowColor = 'rgba(0, 0, 0, 0.5)' - ctx.shadowBlur = 4 - ctx.shadowOffsetX = 1 - ctx.shadowOffsetY = 1 ctx.fillText(timeText, padding, textY) - ctx.shadowColor = 'transparent' - ctx.shadowBlur = 0 - ctx.shadowOffsetX = 0 - ctx.shadowOffsetY = 0 - if (index === imageInfos.length - 1) { const lastImageBottom = yPositions[index] + scaledHeights[index] ctx.fillStyle = 'rgba(255, 255, 255, 0.8)' - ctx.font = '32px sans-serif' + ctx.font = `${Math.round(24 * fontScale)}px sans-serif` ctx.textAlign = 'right' - ctx.fillText('由-TED关爱小助手-小程序生成', canvasWidth - 20, lastImageBottom - 20) + ctx.fillText('由-TED关爱小助手-小程序生成', canvasWidth - 20 * fontScale, lastImageBottom - 20 * fontScale) } loadedCount++ diff --git a/src/components/noteImagePreview/index.scss b/src/components/noteImagePreview/index.scss index bce7c81..ad51d9f 100644 --- a/src/components/noteImagePreview/index.scss +++ b/src/components/noteImagePreview/index.scss @@ -29,6 +29,31 @@ overflow: hidden; position: relative; + .order { + position: absolute; + left: 50%; + transform: translate(-50%, 0 ); + padding: 18rpx 32rpx; + font-size: 40rpx; + font-weight: bold; + text-align: center; + color: #211d2e; + border-radius: 94rpx; + display: inline-flex; + align-items: baseline; + background-color: #fff; + z-index: 10; + white-space: nowrap; + + .num { + margin-left: 20rpx; + } + + .m-num { + font-size: 28rpx; + } + } + .preview-image { display: block; width: 100%; diff --git a/src/components/noteImagePreview/index.ts b/src/components/noteImagePreview/index.ts index ff4db82..6035e26 100644 --- a/src/components/noteImagePreview/index.ts +++ b/src/components/noteImagePreview/index.ts @@ -19,6 +19,14 @@ Component({ type: Number, value: 0, }, + photoLabels: { + type: Array, + value: [] as { name: string; index: number; total: number }[], + }, + showActions: { + type: Boolean, + value: true, + }, }, data: { diff --git a/src/components/noteImagePreview/index.wxml b/src/components/noteImagePreview/index.wxml index 4af199f..23a5af2 100644 --- a/src/components/noteImagePreview/index.wxml +++ b/src/components/noteImagePreview/index.wxml @@ -4,6 +4,11 @@ + + {{photoLabels[currentIndex].name}} + + + @@ -19,7 +24,7 @@ {{images.length}} - + 删除 重拍 diff --git a/src/components/patient-tab-bar/index.scss b/src/components/patient-tab-bar/index.scss index 68a50e2..38e558b 100644 --- a/src/components/patient-tab-bar/index.scss +++ b/src/components/patient-tab-bar/index.scss @@ -1,6 +1,7 @@ /* custom-tab-bar/index.wxss */ .tab-custom-item { + position: relative; flex: 1; z-index: 1; .circle { @@ -28,6 +29,14 @@ color: rgba(33, 29, 46, 1); } } + .tip-card { + position: absolute; + top: -30rpx; + left: 50%; + width: 390rpx; + height: 230rpx; + transform: translate(-50%, -100%); + } } .tab-item { diff --git a/src/components/toast/index.scss b/src/components/toast/index.scss index a177d1d..50cf6b1 100644 --- a/src/components/toast/index.scss +++ b/src/components/toast/index.scss @@ -2761,3 +2761,14 @@ } } } + +.popup-note-guide { + .popup-container { + .guide { + margin: 0 auto 62rpx; + display: block; + width: 660rpx; + height: 673rpx; + } + } +} diff --git a/src/components/toast/index.wxml b/src/components/toast/index.wxml index 33ed6be..a99a3ce 100644 --- a/src/components/toast/index.wxml +++ b/src/components/toast/index.wxml @@ -4,6 +4,8 @@ round z-index="{{100000}}" show="{{ show }}" + position="{{params.position || 'center'}}" + safe-area-inset-bottom="{{false}}" > @@ -846,6 +848,11 @@ + + + + + diff --git a/src/pages/d_noteDetail/index.json b/src/pages/d_noteDetail/index.json index 62bf175..2bf620a 100644 --- a/src/pages/d_noteDetail/index.json +++ b/src/pages/d_noteDetail/index.json @@ -1,7 +1,8 @@ { "usingComponents": { "navbar": "/components/navbar/index", - "van-icon": "@vant/weapp/icon/index" + "van-icon": "@vant/weapp/icon/index", + "noteImagePreview": "/components/noteImagePreview/index" }, "navigationBarTitleText": "记录" } diff --git a/src/pages/d_noteDetail/index.ts b/src/pages/d_noteDetail/index.ts index f6d5bbb..137b835 100644 --- a/src/pages/d_noteDetail/index.ts +++ b/src/pages/d_noteDetail/index.ts @@ -35,6 +35,12 @@ Page({ hasBackend: false, hasOther: false, + imagePreview: false, + previewImageSrc: '', + previewImages: [] as string[], + previewCurrentIndex: 0, + previewPhotoLabels: [] as { name: string; index: number; total: number }[], + // 角度分组 angleGroups: { frontend: ['front_open', 'front_closed', 'front_looking_up'], @@ -138,13 +144,57 @@ Page({ const { angle } = e.currentTarget.dataset const photo = this.data.photoMap[angle] if (photo) { - wx.previewImage({ - urls: [photo.photoUrl], - current: photo.photoUrl, + const { frontend, backend, other } = this.data.angleGroups + const allAngles = [ + ...frontend.map((a: string) => ({ angle: a, group: 'frontend' })), + ...backend.map((a: string) => ({ angle: a, group: 'backend' })), + ...other.map((a: string) => ({ angle: a, group: 'other' })), + ] + const groupCounts: Record = {} + const groupOffsets: Record = {} + allAngles.forEach((item) => { + if (!groupCounts[item.group]) groupCounts[item.group] = 0 + groupCounts[item.group]++ + }) + + const previewAngles: string[] = [] + const previewImages: string[] = [] + const previewPhotoLabels: { name: string; index: number; total: number }[] = [] + allAngles.forEach((item) => { + const p = this.data.photoMap[item.angle] + if (p) { + previewAngles.push(item.angle) + previewImages.push(p.photoUrl) + if (!groupOffsets[item.group]) groupOffsets[item.group] = 0 + groupOffsets[item.group]++ + previewPhotoLabels.push({ + name: this.data.angleNameMap[item.angle], + index: groupOffsets[item.group], + total: groupCounts[item.group], + }) + } + }) + const currentIndex = previewAngles.indexOf(angle) + + this.setData({ + imagePreview: true, + previewImageSrc: photo.photoUrl, + previewImages, + previewCurrentIndex: currentIndex >= 0 ? currentIndex : 0, + previewPhotoLabels, }) } }, + handleImagePreviewClose() { + this.setData({ imagePreview: false }) + }, + + handleImageChange(e: any) { + const { index } = e.detail + this.setData({ previewCurrentIndex: index }) + }, + // 眼突度对比 handleDiffData() { wx.navigateTo({ diff --git a/src/pages/d_noteDetail/index.wxml b/src/pages/d_noteDetail/index.wxml index 296da3b..5512b8b 100644 --- a/src/pages/d_noteDetail/index.wxml +++ b/src/pages/d_noteDetail/index.wxml @@ -72,3 +72,15 @@ 照片 对比 + + diff --git a/src/patient/components/camera/index.ts b/src/patient/components/camera/index.ts index 8e5be4f..c3e9227 100644 --- a/src/patient/components/camera/index.ts +++ b/src/patient/components/camera/index.ts @@ -313,8 +313,11 @@ Component({ switchCamera() { const newPosition = this.data.devicePosition === 'back' ? 'front' : 'back' - // 前置摄像头镜像，左侧45度和右侧45度需要互换 frame 图片 + // 前置摄像头镜像，左侧和右侧需要互换 frame 图片 const frame = { ...this.data.frame } + const temp4 = { ...frame[4] } + frame[4] = { ...frame[5] } + frame[5] = temp4 const temp6 = { ...frame[6] } frame[6] = { ...frame[7] } frame[7] = temp6 @@ -346,7 +349,7 @@ Component({ }) wx.cropImage({ src: res.tempImagePath, - cropScale: '16:9', + cropScale: '4:3', success: (cropRes) => { // 裁剪成功后上传图片 this.uploadImage(cropRes.tempFilePath || res.tempImagePath) diff --git a/src/patient/components/image-merge/index.ts b/src/patient/components/image-merge/index.ts index c554434..6f95aca 100644 --- a/src/patient/components/image-merge/index.ts +++ b/src/patient/components/image-merge/index.ts @@ -96,11 +96,12 @@ Component({ const canvas = res[0].node const ctx = canvas.getContext('2d') - Promise.all(imageList.map((item) => this.getImageInfo(item.src))) + Promise.all(imageList.map(item => this.getImageInfo(item.src))) .then((imageInfos) => { const targetWidth = 750 const pixelRatio = wx.getWindowInfo().pixelRatio const canvasWidth = Math.floor((targetWidth * pixelRatio) / 2) + const fontScale = pixelRatio / 2 let totalHeight = 0 const scaledHeights: number[] = [] @@ -135,32 +136,34 @@ Component({ // 在每张图片左上角绘制时间，白色字体 const timeText = imageList[index].time || this.formatTime(new Date()) - const padding = 20 - const textY = yPositions[index] + 40 + const padding = 20 * fontScale + const fontSize = Math.round(28 * fontScale) + const textY = yPositions[index] + 40 * fontScale + + ctx.font = `bold ${fontSize}px sans-serif` + ctx.textBaseline = 'middle' + const textMetrics = ctx.measureText(timeText) + const bgPaddingH = 16 * fontScale + const bgPaddingV = 10 * fontScale + const bgH = fontSize + bgPaddingV * 2 + const bgX = padding - bgPaddingH + const bgY = textY - bgH / 2 + const bgW = textMetrics.width + bgPaddingH * 2 + + ctx.fillStyle = 'rgba(0, 0, 0, 0.45)' + ctx.fillRect(bgX, bgY, bgW, bgH) - // 设置白色字体和阴影以增强可读性 ctx.fillStyle = '#ffffff' - ctx.font = 'bold 28px sans-serif' ctx.textAlign = 'left' - ctx.shadowColor = 'rgba(0, 0, 0, 0.5)' - ctx.shadowBlur = 4 - ctx.shadowOffsetX = 1 - ctx.shadowOffsetY = 1 ctx.fillText(timeText, padding, textY) - // 重置阴影 - ctx.shadowColor = 'transparent' - ctx.shadowBlur = 0 - ctx.shadowOffsetX = 0 - ctx.shadowOffsetY = 0 - // 如果是最后一张图片，在其右下角绘制水印 if (index === imageInfos.length - 1) { const lastImageBottom = yPositions[index] + scaledHeights[index] ctx.fillStyle = 'rgba(255, 255, 255, 0.8)' - ctx.font = '24px sans-serif' + ctx.font = `${Math.round(24 * fontScale)}px sans-serif` ctx.textAlign = 'right' - ctx.fillText('由-TED关爱小助手-小程序生成', canvasWidth - 20, lastImageBottom - 20) + ctx.fillText('由-TED关爱小助手-小程序生成', canvasWidth - 20 * fontScale, lastImageBottom - 20 * fontScale) } loadedCount++ diff --git a/src/patient/pages/index/index.ts b/src/patient/pages/index/index.ts index 04d235a..20f64ff 100644 --- a/src/patient/pages/index/index.ts +++ b/src/patient/pages/index/index.ts @@ -43,6 +43,7 @@ Page({ // toastType: 'question-toast', // toastType: 'guideEnterInfo', // toastType: 'guideEnterInfoJump', + // toastType: 'noteGuide', toastShow: false, toastType: '', @@ -116,6 +117,18 @@ Page({ async getPopup() { if (this.data.toastShow) return + + const noteGuideShown = wx.getStorageSync('noteGuideShown') + if (!noteGuideShown) { + this.setData({ + toastShow: true, + toastType: 'noteGuide', + toastParams: { position: 'bottom', close: false }, + }) + wx.setStorageSync('noteGuideShown', true) + return + } + const data1 = await wx.ajax({ method: 'GET', url: '?r=zd/popup/info', diff --git a/src/patient/pages/note/index.scss b/src/patient/pages/note/index.scss index da731f5..0dbe83b 100644 --- a/src/patient/pages/note/index.scss +++ b/src/patient/pages/note/index.scss @@ -117,7 +117,7 @@ page { .action-btn { flex: 1; height: 320rpx; - border-radius: 20rpx; + border-radius: 32rpx; display: flex; flex-direction: column; align-items: center; @@ -127,21 +127,11 @@ page { overflow: hidden; &.primary { - background: linear-gradient(180deg, #e98ff8 0%, #b073ff 100%); .btn-text { color: #fff; } - .corner-fold { - position: absolute; - top: 0; - right: 0; - width: 60rpx; - height: 60rpx; - background: linear-gradient(45deg, #f6edff 0%, #f6edff 50%, #f6f8f9 50%, #f6f8f9 100%); - border-radius: 0 0 0 18rpx; - } } &.secondary { diff --git a/src/patient/pages/note/index.wxml b/src/patient/pages/note/index.wxml index 8f38fe6..b0e0ed2 100644 --- a/src/patient/pages/note/index.wxml +++ b/src/patient/pages/note/index.wxml @@ -35,8 +35,7 @@ - - + 新增记录 diff --git a/src/patient/pages/noteAdd/index.scss b/src/patient/pages/noteAdd/index.scss index 97c107a..c712b0b 100644 --- a/src/patient/pages/noteAdd/index.scss +++ b/src/patient/pages/noteAdd/index.scss @@ -26,7 +26,7 @@ page { } .form { margin: 0 40rpx 24rpx; - padding: 32rpx; + padding: 24rpx 32rpx; background: #ffffff; border-radius: 32rpx 32rpx 32rpx 32rpx; .form-title { @@ -45,10 +45,10 @@ page { } } .form-title-gap { - margin-top: 48rpx; + margin-top: 28rpx; } .select { - margin-top: 24rpx; + margin-top: 12rpx; display: flex; justify-content: space-between; padding: 26rpx 32rpx; @@ -64,7 +64,7 @@ page { } } .dobule { - margin-top: 44rpx; + margin-top: 24rpx; border-radius: 24rpx 24rpx 24rpx 24rpx; display: flex; gap: 26rpx; @@ -74,13 +74,13 @@ page { color: #211d2e; } .i-content { - margin-top: 24rpx; - padding: 26rpx 14rpx; + margin-top: 12rpx; + padding: 26rpx 18rpx; display: flex; align-items: center; background: #f6f8f9; border-radius: 24rpx 24rpx 24rpx 24rpx; - font-size: 32rpx; + font-size: 24rpx; color: #211d2e; .num { font-size: 32rpx; @@ -91,7 +91,7 @@ page { } } .container { - margin-top: 32rpx; + // margin-top: 24rpx; padding: 32rpx 40rpx 0; background-color: #fff; border-radius: 32rpx 32rpx 0 0; @@ -120,15 +120,16 @@ page { flex: 1; display: flex; align-items: center; + justify-content: center; gap: 16rpx; - padding: 26rpx; + padding: 12rpx 26rpx; border-radius: 18rpx; .icon { flex-shrink: 0; width: 36rpx; height: 36rpx; } - font-size: 32rpx; + font-size: 28rpx; &.btn1 { color: #b982ff; background: rgba(185, 130, 255, 0.12); @@ -136,6 +137,8 @@ page { &.btn2 { color: #ffffff; background: linear-gradient(180deg, #e98ff8 0%, #b073ff 100%); + // color: #b982ff; + // background: rgba(185, 130, 255, 0.12); } } } diff --git a/src/patient/pages/noteAdd/index.ts b/src/patient/pages/noteAdd/index.ts index 5ac733d..28e353d 100644 --- a/src/patient/pages/noteAdd/index.ts +++ b/src/patient/pages/noteAdd/index.ts @@ -44,6 +44,7 @@ Page({ previewImages: [] as string[], previewAngles: [] as string[], previewCurrentIndex: 0, + previewPhotoLabels: [] as { name: string, index: number, total: number }[], recordId: '', // 表单数据 @@ -59,7 +60,7 @@ Page({ // 顺序拍摄模式 sequentialShootMode: false, - sequentialShootList: [] as { name: string; type: string; angle: string }[], + sequentialShootList: [] as { name: string, type: string, angle: string }[], sequentialShootIndex: 0, // 替妥尤单抗使用次数选项 (0-9, 9表示大于8) @@ -210,7 +211,8 @@ Page({ // 左眼度数输入 onLeftEyeInput(e: any) { let val = e.detail.value - if (Number(val) > 999.9) val = '999.9' + if (Number(val) > 999.9) + val = '999.9' this.setData({ leftEye: val, }) @@ -218,7 +220,8 @@ Page({ onRightEyeInput(e: any) { let val = e.detail.value - if (Number(val) > 999.9) val = '999.9' + if (Number(val) > 999.9) + val = '999.9' this.setData({ rightEye: val, }) @@ -226,7 +229,8 @@ Page({ onInterorbitalDistanceInput(e: any) { let val = e.detail.value - if (Number(val) > 999.9) val = '999.9' + if (Number(val) > 999.9) + val = '999.9' this.setData({ interorbitalDistance: val, }) @@ -382,17 +386,33 @@ Page({ if (photo) { // 构建已上传图片列表（按 cameraList 顺序） const allAngles = [ - ...this.data.cameraList.frontend, - ...this.data.cameraList.backend, - ...this.data.cameraList.other, + ...this.data.cameraList.frontend.map(item => ({ ...item, group: 'frontend' })), + ...this.data.cameraList.backend.map(item => ({ ...item, group: 'backend' })), + ...this.data.cameraList.other.map(item => ({ ...item, group: 'other' })), ] const previewAngles: string[] = [] const previewImages: string[] = [] + const previewPhotoLabels: { name: string, index: number, total: number }[] = [] + const groupCounts: Record = {} + const groupOffsets: Record = {} + allAngles.forEach((item) => { + if (!groupCounts[item.group]) + groupCounts[item.group] = 0 + groupCounts[item.group]++ + }) allAngles.forEach((item) => { const p = this.data.photoMap[item.angle] if (p) { previewAngles.push(item.angle) previewImages.push(p.photoUrl) + if (!groupOffsets[item.group]) + groupOffsets[item.group] = 0 + groupOffsets[item.group]++ + previewPhotoLabels.push({ + name: item.name, + index: groupOffsets[item.group], + total: groupCounts[item.group], + }) } }) const currentIndex = previewAngles.indexOf(angle) @@ -404,6 +424,7 @@ Page({ previewImages, previewAngles, previewCurrentIndex: currentIndex >= 0 ? currentIndex : 0, + previewPhotoLabels, }) } }, @@ -448,8 +469,8 @@ Page({ // 保存记录 handleSave() { - const { recordId, recordDate, treatmentCount, isBaseline, leftEye, rightEye, interorbitalDistance, photoMap } = - this.data + const { recordId, recordDate, treatmentCount, isBaseline, leftEye, rightEye, interorbitalDistance, photoMap } + = this.data // 表单验证 if (!recordDate) { @@ -465,13 +486,13 @@ Page({ } // 所有照片全不合规才不允许保存 - const hasCompliantPhoto = photos.some((photo) => photo.checkStatus === 1) + const hasCompliantPhoto = photos.some(photo => photo.checkStatus === 1) if (!hasCompliantPhoto) { wx.showToast({ title: '所有照片不合规，请重新上传', icon: 'none' }) return } - const photoIds = photos.map((photo) => photo.photoId).join(',') + const photoIds = photos.map(photo => photo.photoId).join(',') const data: any = { ...(recordId ? { recordId } : {}), @@ -482,9 +503,12 @@ Page({ } // 可选字段 - if (leftEye) data.leftEye = leftEye - if (rightEye) data.rightEye = rightEye - if (interorbitalDistance) data.interorbitalDistance = interorbitalDistance + if (leftEye) + data.leftEye = leftEye + if (rightEye) + data.rightEye = rightEye + if (interorbitalDistance) + data.interorbitalDistance = interorbitalDistance wx.showLoading({ title: '保存中...' }) @@ -524,7 +548,8 @@ Page({ }) if (popupType === 'popup18') { this.setData({ isBaseline: 1 }) - } else { + } + else { this.handleSave() } }, @@ -536,7 +561,8 @@ Page({ }) if (popupType === 'popup18') { this.setData({ isBaseline: 0 }) - } else { + } + else { wx.navigateBack() } }, @@ -547,7 +573,8 @@ Page({ popupShow: true, popupType: 'popup16', }) - } else { + } + else { wx.navigateBack() } }, diff --git a/src/patient/pages/noteAdd/index.wxml b/src/patient/pages/noteAdd/index.wxml index 36bcbb0..6529eb9 100644 --- a/src/patient/pages/noteAdd/index.wxml +++ b/src/patient/pages/noteAdd/index.wxml @@ -4,7 +4,7 @@ - + 设置为基准记录，用于对比 @@ -145,6 +145,7 @@ src="{{previewImageSrc}}" images="{{previewImages}}" currentIndex="{{previewCurrentIndex}}" + photoLabels="{{previewPhotoLabels}}" bind:close="handleImagePreviewClose" bind:delete="handleImageDel" bind:retake="handleImageRetake" diff --git a/src/patient/pages/noteHistory/index.json b/src/patient/pages/noteHistory/index.json index 0a0db2b..2c78d77 100644 --- a/src/patient/pages/noteHistory/index.json +++ b/src/patient/pages/noteHistory/index.json @@ -2,7 +2,8 @@ "usingComponents": { "navbar": "/components/navbar/index", "van-icon": "@vant/weapp/icon/index", - "popup": "/components/popup/index" + "popup": "/components/popup/index", + "noteImagePreview": "/components/noteImagePreview/index" }, "navigationBarTitleText": "记录" } diff --git a/src/patient/pages/noteHistory/index.ts b/src/patient/pages/noteHistory/index.ts index 20c63e1..515d94c 100644 --- a/src/patient/pages/noteHistory/index.ts +++ b/src/patient/pages/noteHistory/index.ts @@ -46,6 +46,12 @@ Page({ // 已上传照片数量 uploadedCount: 0, + imagePreview: false, + previewImageSrc: '', + previewImages: [] as string[], + previewCurrentIndex: 0, + previewPhotoLabels: [] as { name: string; index: number; total: number }[], + // 角度分组 angleGroups: { frontend: ['front_open', 'front_closed', 'front_looking_up'], @@ -215,13 +221,57 @@ Page({ const { angle } = e.currentTarget.dataset const photo = this.data.photoMap[angle] if (photo) { - wx.previewImage({ - urls: [photo.photoUrl], - current: photo.photoUrl, + const { frontend, backend, other } = this.data.angleGroups + const allAngles = [ + ...frontend.map((a: string) => ({ angle: a, group: 'frontend' })), + ...backend.map((a: string) => ({ angle: a, group: 'backend' })), + ...other.map((a: string) => ({ angle: a, group: 'other' })), + ] + const groupCounts: Record = {} + const groupOffsets: Record = {} + allAngles.forEach((item) => { + if (!groupCounts[item.group]) groupCounts[item.group] = 0 + groupCounts[item.group]++ + }) + + const previewAngles: string[] = [] + const previewImages: string[] = [] + const previewPhotoLabels: { name: string; index: number; total: number }[] = [] + allAngles.forEach((item) => { + const p = this.data.photoMap[item.angle] + if (p) { + previewAngles.push(item.angle) + previewImages.push(p.photoUrl) + if (!groupOffsets[item.group]) groupOffsets[item.group] = 0 + groupOffsets[item.group]++ + previewPhotoLabels.push({ + name: this.data.angleNameMap[item.angle], + index: groupOffsets[item.group], + total: groupCounts[item.group], + }) + } + }) + const currentIndex = previewAngles.indexOf(angle) + + this.setData({ + imagePreview: true, + previewImageSrc: photo.photoUrl, + previewImages, + previewCurrentIndex: currentIndex >= 0 ? currentIndex : 0, + previewPhotoLabels, }) } }, + handleImagePreviewClose() { + this.setData({ imagePreview: false }) + }, + + handleImageChange(e: any) { + const { index } = e.detail + this.setData({ previewCurrentIndex: index }) + }, + // 去补充照片 handleSupplement() { wx.navigateTo({ diff --git a/src/patient/pages/noteHistory/index.wxml b/src/patient/pages/noteHistory/index.wxml index c7fa519..c2b9d01 100644 --- a/src/patient/pages/noteHistory/index.wxml +++ b/src/patient/pages/noteHistory/index.wxml @@ -105,3 +105,15 @@ bind:ok="handlePopupOk" bind:cancel="handlePopupCancel" > + +