bug fix

src/pages/d_noteDetail/index.scss

@@ -75,7 +75,7 @@
             align-items: baseline;
             gap: 8rpx;
             .num {
-              font-size: 56rpx;
+              font-size: 32rpx;
               color: #b073ff;
               font-weight: bold;
             }

src/pages/d_noteDetail/index.wxml

@@ -7,11 +7,11 @@
   style="background: url('{{imageUrl}}bg10.png?t={{Timestamp}}') no-repeat top center/100% 610rpx;padding-top:{{pageTop+16}}px;"
 >
   <view class="container">
-    <view wx:if="{{recordDetail.isBaseline === 1}}" class="benchmark" style="background: url('/images/bg56.png') no-repeat top center/100%">基准照</view>
+    <view wx:if="{{recordDetail.isBaseline === 1}}" class="benchmark" style="background: url('{{imageUrl}}bg56.png?t={{Timestamp}}') no-repeat top center/100%">基准照</view>
     <view class="date">{{recordDetail.recordDate}}</view>
     <view class="total">
       当前记录对应的替妥尤单抗使用次数:
-      <text class="num">{{recordDetail.treatmentCount}}</text>
+      <text class="num">{{recordDetail.treatmentCount >= 9 ? '>8' : recordDetail.treatmentCount}}</text>
     </view>
     <view class="banner" wx:if="{{recordDetail.leftEye != null || recordDetail.rightEye != null || recordDetail.interorbitalDistance != null}}">
       <view class="title">眼球突出度测量记录</view>

src/pages/d_noteDiff/index.scss

@@ -208,6 +208,7 @@ page {
 
         .photo-card {
           margin-top: 24rpx;
+          width: 100%;
 
           .photo {
             border-radius: 32rpx 32rpx 0 0;
@@ -241,7 +242,7 @@ page {
                 gap: 8rpx;
 
                 .num {
-                  font-size: 56rpx;
+                  font-size: 32rpx;
                   color: #b073ff;
                   font-weight: bold;
                 }

src/pages/d_noteDiff/index.ts

@@ -43,13 +43,12 @@ Page({
     this.setData({
       patientId: option.patientId || '',
     })
+    app.waitLogin({ type: [2] }).then(() => {
       this.getCompareAngle()
+    })
   },
 
   onShow() {
-    app.waitLogin({ type: [2] }).then(() => {
-      this.getCompareDates()
-    })
   },
 
   // 获取对比角度列表

src/pages/d_noteDiffData/index.wxml

@@ -32,7 +32,7 @@
           <view class="td-eye-item">{{item.interorbitalDistance != null ? item.interorbitalDistance : '--'}}</view>
           <view class="td-eye-item">{{item.rightEye != null ? item.rightEye : '--'}}</view>
         </view>
-        <view class="td td-count">{{item.treatmentCount}}</view>
+        <view class="td td-count">{{item.treatmentCount >= 9 ? '>8' : item.treatmentCount}}</view>
       </view>
     </view>
   </view>

src/pages/d_noteDiffEdit/index.ts

@@ -129,7 +129,7 @@ Page({
         wx.hideLoading()
         wx.cropImage({
           src: imgRes.path,
-          cropScale: '9:16',
+          cropScale: '16:9',
           success: (cropRes) => {
             photos[index].isCropped = true
             photos[index].croppedUrl = cropRes.tempFilePath

src/pages/d_noteList/index.scss

@@ -27,7 +27,7 @@ page {
         width: 124rpx;
         height: 64rpx;
         font-size: 28rpx;
-        color: #ffa300;
+        color: #fff;
         line-height: 32rpx;
       }
       .photo {

src/pages/d_noteList/index.wxml

@@ -6,7 +6,7 @@
   <view class="total" wx:if="{{recordList.length > 0}}">共{{total}}条日记记录</view>
   <view class="history-list">
     <view class="list-item" wx:for="{{recordList}}" wx:key="recordId" data-record-id="{{item.recordId}}" bind:tap="handleHistory">
-      <view wx:if="{{item.isBaseline === 1}}" class="benchmark" style="background: url('{{imageUrl}}bg50.png?t={{Timestamp}}') no-repeat top center/100%">
+      <view wx:if="{{item.isBaseline === 1}}" class="benchmark" style="background: url('{{imageUrl}}bg56.png?t={{Timestamp}}') no-repeat top center/100%">
         基准照
       </view>
       <image class="photo" mode="aspectFill" src="{{item.firstPhotoUrl || imageUrl + 'icon143.png?t=' + Timestamp}}"></image>

src/pages/d_patientDetail/index.wxml

@@ -82,7 +82,7 @@
         <view
           class="benchmark"
           wx:if="{{proptosisDetail.isBaseline === 1}}"
-          style="background: url('/images/bg56.png') no-repeat top center/100%"
+          style="background: url('{{imageUrl}}bg56.png?t={{Timestamp}}') no-repeat top center/100%"
         >
           基准照
         </view>
@@ -92,7 +92,7 @@
           <view class="tag" wx:if="{{proptosisDetail.treatmentCount > 0}}">替妥尤单抗:{{proptosisDetail.treatmentCount >= 9 ? '>8' : proptosisDetail.treatmentCount}}</view>
           <view class="rotate">已上传{{proptosisDetail.photoCount}}个角度</view>
         </view>
-        <image class="more" src="/images/icon168.png"></image>
+        <image class="more" src="{{imageUrl}}icon168.png?t={{Timestamp}}"></image>
       </view>
       <view class="btn" bind:tap="handleNoteList">共{{proptosisDetail.totalRecords || 0}}条日记记录，点击查看全部</view>
     </view>

src/patient/components/camera/index.scss

@@ -22,6 +22,7 @@
     text-align: center;
     .example {
       position: relative;
+      z-index: 2;
       margin: 20rpx 32rpx 0;
       width: 202rpx;
       height: 56rpx;

src/patient/components/camera/index.ts

@@ -37,13 +37,13 @@ Component({
     type: 1,
     // 拍摄位置名称映射
     typeNameMap: {
-      1: { name: '正面睁眼', group: '正面', index: 1, total: 3 },
+      1: { name: '正面睁眼', group: '正面', index: 1, total: 3, tip: '平视，目光看向镜头方向，自然睁眼，不眯眼、不瞪眼。' },
-      2: { name: '正面闭眼', group: '正面', index: 2, total: 3 },
+      2: { name: '正面闭眼', group: '正面', index: 2, total: 3, tip: '正对镜头，面部居中，自然放松，双眼轻轻闭合，不皱眉、不挤眼。' },
-      3: { name: '正面仰头', group: '正面', index: 3, total: 3 },
+      3: { name: '正面仰头', group: '正面', index: 3, total: 3, tip: '拍摄时，正对镜头，面部居中，头部自然向上仰至约45°，双眼同步平视，保持自然睁眼、不眯眼。' },
-      4: { name: '左侧-90°', group: '侧面', index: 1, total: 4 },
+      4: { name: '左侧-90°', group: '侧面', index: 1, total: 4, tip: '身体与头部完全转向右侧，呈标准90°侧面，仅可见左侧眼睛。' },
-      5: { name: '右侧-90°', group: '侧面', index: 2, total: 4 },
+      5: { name: '右侧-90°', group: '侧面', index: 2, total: 4, tip: '身体与头部完全转向左侧，呈标准90°侧面，仅可见右侧眼睛。' },
-      6: { name: '左侧-45°', group: '侧面', index: 3, total: 4 },
+      6: { name: '左侧-45°', group: '侧面', index: 3, total: 4, tip: '身体与头部转向右前方45°。' },
-      7: { name: '右侧-45°', group: '侧面', index: 4, total: 4 },
+      7: { name: '右侧-45°', group: '侧面', index: 4, total: 4, tip: '身体与头部转向左前方45°' },
       8: { name: '左上', group: '眼球运动', index: 1, total: 8 },
       9: { name: '向上', group: '眼球运动', index: 2, total: 8 },
       10: { name: '右上', group: '眼球运动', index: 3, total: 8 },
@@ -84,31 +84,31 @@ Component({
       },
       8: {
         src: 'note-camera1',
-        exampleSrc: 'note-demo8',
+        exampleSrc: 'note-demo12',
       },
       9: {
         src: 'note-camera1',
-        exampleSrc: 'note-demo9',
+        exampleSrc: 'note-demo8',
       },
       10: {
         src: 'note-camera1',
-        exampleSrc: 'note-demo10',
+        exampleSrc: 'note-demo13',
       },
       11: {
         src: 'note-camera1',
-        exampleSrc: 'note-demo11',
+        exampleSrc: 'note-demo10',
       },
       12: {
         src: 'note-camera1',
-        exampleSrc: 'note-demo12',
+        exampleSrc: 'note-demo11',
       },
       13: {
         src: 'note-camera1',
-        exampleSrc: 'note-demo13',
+        exampleSrc: 'note-demo14',
       },
       14: {
         src: 'note-camera1',
-        exampleSrc: 'note-demo14',
+        exampleSrc: 'note-demo9',
       },
       15: {
         src: 'note-camera1',
@@ -155,9 +155,17 @@ Component({
       })
     },
     handleHideCamera() {
+      if (this.properties.onlyCamera) {
+        this.setData({
+          visible: false,
+        })
+      }
+      else {
         this.setData({
           visible: false,
+          selectShow: true,
         })
+      }
     },
     handlePicture() {
       this.handleCancel()
@@ -168,7 +176,7 @@ Component({
         success: (res) => {
           if (res.tempFiles && res.tempFiles.length > 0) {
             const tempFile = res.tempFiles[0]
-            const maxSize = 10 * 1024 * 1024 // 10M
+            const maxSize = 10 * 1024 * 1024
             if (tempFile.size > maxSize) {
               wx.showToast({
                 title: '图片大小不能超过10M',
@@ -182,6 +190,9 @@ Component({
         },
         fail: (err) => {
           console.error('选择图片失败:', err)
+          if (err.errMsg?.includes('cancel')) {
+            this.setData({ selectShow: true })
+          }
         },
       })
     },
@@ -221,7 +232,7 @@ Component({
           })
           wx.cropImage({
             src: res.tempImagePath,
-            cropScale: '9:16',
+            cropScale: '16:9',
             success: (cropRes) => {
               // 裁剪成功后上传图片
               this.uploadImage(cropRes.tempFilePath || res.tempImagePath)

src/patient/components/camera/index.wxml

@@ -11,7 +11,7 @@
         <image class="icon" src="{{imageUrl}}icon159.png?t={{Timestamp}}"></image>
         查看示范
         <view class="example-popup" hidden="{{!exampleShow}}">
-          <view class="content">平视，目光看向镜头方向，自然睁眼，不眯眼、不瞪眼。</view>
+          <view class="content">{{typeNameMap[type].tip}}</view>
           <view class="photo-wrap">
             <image class="photo" src="{{imageUrl}}{{frame[type].exampleSrc}}.png?t={{Timestamp}}"></image>
             <image class="label" src="{{imageUrl}}icon162.png?t={{Timestamp}}"></image>
@@ -22,20 +22,20 @@
         class="camera-frame"
         style="background: url('{{imageUrl}}{{frame[type].src}}.png?t={{Timestamp}}') no-repeat top center/100%"
       >
-        <image wx:if="{{type==8}}" class="icon8" src="{{imageUrl}}icon163.png?t={{Timestamp}}"></image>
+        <image wx:if="{{type==8}}" class="{{devicePosition == 'back' ? 'icon13' : 'icon8'}}" src="{{imageUrl}}icon163.png?t={{Timestamp}}"></image>
         <block wx:elif="{{type==9}}">
           <image class="icon9-1" src="{{imageUrl}}icon163.png?t={{Timestamp}}"></image>
           <image class="icon9-2" src="{{imageUrl}}icon163.png?t={{Timestamp}}"></image>
         </block>
-        <image wx:elif="{{type==10}}" class="icon13" src="{{imageUrl}}icon163.png?t={{Timestamp}}"></image>
+        <image wx:elif="{{type==10}}" class="{{devicePosition == 'back' ? 'icon8' : 'icon13'}}" src="{{imageUrl}}icon163.png?t={{Timestamp}}"></image>
-        <image wx:elif="{{type==11}}" class="icon11" src="{{imageUrl}}icon163.png?t={{Timestamp}}"></image>
+        <image wx:elif="{{type==11}}" class="{{devicePosition == 'back' ? 'icon12' : 'icon11'}}" src="{{imageUrl}}icon163.png?t={{Timestamp}}"></image>
-        <image wx:elif="{{type==12}}" class="icon12" src="{{imageUrl}}icon163.png?t={{Timestamp}}"></image>
+        <image wx:elif="{{type==12}}" class="{{devicePosition == 'back' ? 'icon11' : 'icon12'}}" src="{{imageUrl}}icon163.png?t={{Timestamp}}"></image>
-        <image wx:elif="{{type==13}}" class="icon10" src="{{imageUrl}}icon163.png?t={{Timestamp}}"></image>
+        <image wx:elif="{{type==13}}" class="{{devicePosition == 'back' ? 'icon15' : 'icon10'}}" src="{{imageUrl}}icon163.png?t={{Timestamp}}"></image>
         <block wx:elif="{{type==14}}">
           <image class="icon14-1" src="{{imageUrl}}icon163.png?t={{Timestamp}}"></image>
           <image class="icon14-2" src="{{imageUrl}}icon163.png?t={{Timestamp}}"></image>
         </block>
-        <image wx:elif="{{type==15}}" class="icon15" src="{{imageUrl}}icon163.png?t={{Timestamp}}"></image>
+        <image wx:elif="{{type==15}}" class="{{devicePosition == 'back' ? 'icon10' : 'icon15'}}" src="{{imageUrl}}icon163.png?t={{Timestamp}}"></image>
       </view>
       <view>
         <view class="tip">请将眼睛置于虚线框中心位置</view>
@@ -89,7 +89,7 @@
   <view class="popup-container">
     <view class="title">
       选择上传方式
-      <van-icon name="cross" />
+      <van-icon name="cross" bind:tap="handleCancel" />
     </view>
     <view class="select">
       <view class="item" bind:tap="handleCamera">

src/patient/pages/noteAdd/index.scss

@@ -71,7 +71,7 @@ page {
         }
         .i-content {
           margin-top: 24rpx;
-          padding: 26rpx 32rpx;
+          padding: 26rpx 14rpx;
           display: flex;
           align-items: center;
           background: #f6f8f9;

src/patient/pages/noteAdd/index.ts

@@ -202,22 +202,29 @@ Page({
 
   // 左眼度数输入
   onLeftEyeInput(e: any) {
+    let val = e.detail.value
+    if (Number(val) > 999.9)
+      val = '999.9'
     this.setData({
-      leftEye: e.detail.value,
+      leftEye: val,
     })
   },
 
-  // 右眼度数输入
   onRightEyeInput(e: any) {
+    let val = e.detail.value
+    if (Number(val) > 999.9)
+      val = '999.9'
     this.setData({
-      rightEye: e.detail.value,
+      rightEye: val,
     })
   },
 
-  // 眶间距输入
   onInterorbitalDistanceInput(e: any) {
+    let val = e.detail.value
+    if (Number(val) > 999.9)
+      val = '999.9'
     this.setData({
-      interorbitalDistance: e.detail.value,
+      interorbitalDistance: val,
     })
   },
 
@@ -228,11 +235,10 @@ Page({
       currentPhotoAngle: angle,
       isCapturing: true,
     })
-    // 调用 camera 组件的 handleSelect 方法，传入类型
     const cameraComponent = this.selectComponent('#camera-component')
     if (cameraComponent) {
-      // 根据 angle 映射到对应的 type
       const type = this.getCameraType(angle)
+      cameraComponent.setData({ onlyCamera: false })
       cameraComponent.handleSelect(type)
     }
   },

src/patient/pages/noteAdd/index.wxml

@@ -74,7 +74,7 @@
           <view class="upload-preview" wx:if="{{photoMap[item.angle]}}" bind:tap="handlePreview" data-angle="{{item.angle}}">
             <image class="photo" mode="aspectFill" src="{{photoMap[item.angle].photoUrl}}"></image>
             <view class="status" wx:if="{{photoMap[item.angle].checkStatus === 2}}">
-              <image class="icon" src="/images/icon164.png"></image>
+              <image class="icon" src="{{imageUrl}}icon164.png?t={{Timestamp}}"></image>
               <view class="content">不符合规范</view>
               <view class="guide" catchtap="handleCamera" data-angle="{{item.angle}}">重新上传</view>
             </view>
@@ -96,7 +96,7 @@
           <view class="upload-preview" wx:if="{{photoMap[item.angle]}}" bind:tap="handlePreview" data-angle="{{item.angle}}">
             <image class="photo" mode="aspectFill" src="{{photoMap[item.angle].photoUrl}}"></image>
             <view class="status" wx:if="{{photoMap[item.angle].checkStatus === 2}}">
-              <image class="icon" src="/images/icon164.png"></image>
+              <image class="icon" src="{{imageUrl}}icon164.png?t={{Timestamp}}"></image>
               <view class="content">不符合规范</view>
               <view class="guide" catchtap="handleCamera" data-angle="{{item.angle}}">重新上传</view>
             </view>
@@ -118,7 +118,7 @@
           <view class="upload-preview" wx:if="{{photoMap[item.angle]}}" bind:tap="handlePreview" data-angle="{{item.angle}}">
             <image class="photo" mode="aspectFill" src="{{photoMap[item.angle].photoUrl}}"></image>
             <view class="status" wx:if="{{photoMap[item.angle].checkStatus === 2}}">
-              <image class="icon" src="/images/icon164.png"></image>
+              <image class="icon" src="{{imageUrl}}icon164.png?t={{Timestamp}}"></image>
               <view class="content">不符合规范</view>
               <view class="guide" catchtap="handleCamera" data-angle="{{item.angle}}">重新上传</view>
             </view>
@@ -126,7 +126,7 @@
           <view class="upload-place" wx:else bind:tap="handleCamera" data-angle="{{item.angle}}">
             <image class="icon" src="{{imageUrl}}icon151.png?t={{Timestamp}}"></image>
             <view class="name">
-              <image class="arrow" src="/images/icon167.png"></image>
+              <image class="arrow" src="{{imageUrl}}icon167.png?t={{Timestamp}}"></image>
               {{item.name}}
             </view>
           </view>

src/patient/pages/noteDiffEdit/index.ts

@@ -111,7 +111,7 @@ Page({
         wx.hideLoading()
         wx.cropImage({
           src: imgRes.path,
-          cropScale: '9:16',
+          cropScale: '16:9',
           success: (cropRes) => {
             photos[index].isCropped = true
             photos[index].croppedUrl = cropRes.tempFilePath

src/patient/pages/noteHistory/index.scss

@@ -128,7 +128,7 @@
             align-items: baseline;
             gap: 8rpx;
             .num {
-              font-size: 56rpx;
+              font-size: 32rpx;
               color: #b073ff;
               font-weight: bold;
             }