Merge branch 'zengjun/退货/20260123退货拍照优化' into testing

# Conflicts:
#	src/views/returned/register/index.vue

src/utils/imageFormat.ts

@@ -59,3 +59,4 @@ export async function convertHeicHeifToWebp(file: File): Promise<File> {
     throw err instanceof Error ? err : new Error('HEIC/HEIF 转换失败')
   }
 }
+

src/views/returned/register/index.vue

@@ -23,7 +23,9 @@
         <p class="info-line">
           工作台：<span class="info-value">{{ workbench.workStation }}</span>
         </p>
-        <p class="info-line hint-text">支持png/jpeg/jpg/webp/heic/heif（heic/heif自动转webp）</p>
+        <p class="info-line hint-text">
+          支持png/jpeg/jpg/webp/heic/heif（heic/heif自动转webp）
+        </p>
         <van-button
           size="mini"
           type="primary"
@@ -125,16 +127,31 @@
         </div>
 
         <div class="button-group">
-          <van-button class="action-btn" type="warning" plain @click="previewAll">预览全部</van-button>
-          <van-button class="action-btn action-btn--danger" type="danger" plain @click="onReset">重置图片</van-button>
+          <van-button
+            class="action-btn"
+            type="warning"
+            plain
+            @click="previewAll"
+            >预览全部</van-button
+          >
+          <van-button
+            class="action-btn action-btn--danger"
+            type="danger"
+            plain
+            @click="onReset"
+            >重置图片</van-button
+          >
           <van-button
             class="action-btn"
             type="primary"
             plain
             @click="retryAllFailedImages"
             :disabled="!hasFailedImages()"
-          >重传失败图片</van-button>
-          <van-button class="action-btn" type="primary" @click="onSubmit">提交</van-button>
+            >重传失败图片
+          </van-button>
+          <van-button class="action-btn" type="primary" @click="onSubmit"
+            >提交</van-button
+          >
         </div>
       </div>
     </div>
@@ -153,9 +170,7 @@
             type="primary"
             size="small"
             @click="onEditImage(previewCurrentIndex)"
-            :disabled="
-              !canEditImage(getPreviewImage(previewCurrentIndex))
-            "
+            :disabled="!canEditImage(getPreviewImage(previewCurrentIndex))"
           >
             编辑
           </van-button>
@@ -168,6 +183,7 @@
 
 <script setup lang="ts">
 import { ref, onMounted } from 'vue'
+
 // Type declarations for image upload handling
 enum UPLOAD_STATUS {
   PENDING = 'pending',
@@ -196,6 +212,7 @@ interface Workbench {
 interface EditImageExposed {
   editImage: (image: UploadImage, type: 'outer' | 'inner') => void
 }
+
 import {
   showFailToast,
   showNotify,
@@ -248,8 +265,6 @@ const handlePreviewChange = (index: number): void => {
   previewCurrentIndex.value = index
 }
 
-
-
 function getWorkbench(): void {
   returnedWorkbench()
     .then((res) => {
@@ -262,7 +277,9 @@ function getWorkbench(): void {
     })
 }
 
-const beforeReadImage = async (file: File | File[]): Promise<File[] | false> => {
+const beforeReadImage = async (
+  file: File | File[],
+): Promise<File[] | false> => {
   const files = Array.isArray(file) ? file : [file]
   const normalizedFiles: File[] = []
 
@@ -315,6 +332,7 @@ function toUploadImage(item: any): UploadImage {
 
 // 监听 van-uploader 绑定的数组，自动将新加入的原始文件项转换为 UploadImage
 import { watch } from 'vue'
+
 watch(
   outerImages,
   (newVal, oldVal) => {
@@ -387,7 +405,7 @@ const uploadCategoryWithStatus = async (
       results.push({ success: true, item })
       continue
     }
-    console.log(item,categoryName)
+    console.log(item, categoryName)
     const success = await uploadSingleImage(item, categoryName)
     results.push({ success, item })
   }
@@ -738,6 +756,8 @@ function getFileNameByMime(fileName: string, dataUrl: string): string {
 }
 </script>
 
+
+
 <style scoped lang="sass">
 .van-nav-bar
   .left-btn
@@ -877,3 +897,4 @@ function getFileNameByMime(fileName: string, dataUrl: string): string {
 .upload-status.pending
   background-color: #969799
 </style>
+