优化

api/pda-loading.js

@@ -1,5 +1,6 @@
 import { session } from '@/stores/session.js'
 import { requireOnline } from '@/utils/network.js'
+import { apiDownload, apiRequest, apiUpload } from '@/api/http.js'
 
 const EVIDENCE_TYPES = Object.freeze([
   'PHOTO_STEP_1', 'PHOTO_STEP_2', 'PHOTO_STEP_3', 'PHOTO_STEP_4', 'SEAL'
@@ -23,41 +24,7 @@ function debugLog(event, payload = {}) {
   try { console.info(`[PDA] ${event}`, payload) } catch (_) { /* console may be unavailable on a device */ }
 }
 
-function request(options) {
-  requireOnline()
-  const baseUrl = session.apiBase || '/api/platform/v1'
-  const headers = { ...(options.header || {}) }
-  if (session.token) headers.Authorization = `Bearer ${session.token}`
-  if (session.requestId) headers['X-Request-Id'] = session.requestId
-
-  return new Promise((resolve, reject) => {
-    uni.request({
-      ...options,
-      url: `${baseUrl}${options.url}`,
-      header: headers,
-      success(response) {
-        const body = response.data || {}
-        const code = String(body.code ?? response.statusCode)
-
-        if (code !== '200') {
-          const error = new Error(body.message || '服务端请求失败')
-          error.code = body.code || response.statusCode
-          error.statusCode = response.statusCode
-          error.requestId = body.requestId || response.header?.['X-Request-Id'] || response.header?.['x-request-id']
-          error.traceId = body.traceId || response.header?.['X-Trace-Id'] || response.header?.['x-trace-id']
-          reject(error)
-          return
-        }
-        resolve(body.data)
-      },
-      fail(error) {
-        const next = new Error(error.errMsg || '网络连接失败')
-        next.network = true
-        reject(next)
-      }
-    })
-  })
-}
+const request = apiRequest
 
 function idempotencyKey(operation, inboundId) {
   return `pda-${operation}-${inboundId}-${Date.now()}-${Math.random().toString(36).slice(2, 8)}`
@@ -260,15 +227,8 @@ export function downloadEvidencePreview(previewUrl) {
     const origin = baseUrl.match(/^(https?:\/\/[^/]+)/i)?.[1] || ''
     url = `${origin}${url.startsWith('/') ? '' : '/'}${url}`
   }
-  const headers = {}
-  if (session.token) headers.Authorization = `Bearer ${session.token}`
-  if (session.requestId) headers['X-Request-Id'] = session.requestId
   debugLog('evidence.preview.start', { previewPath: String(previewUrl), resolvedUrl: url })
-  return new Promise((resolve, reject) => {
-    uni.downloadFile({
-      url,
-      header: headers,
-      success(response) {
+  return apiDownload({ url }).then((response) => {
         const responseHeaders = response.header || {}
         const contentType = responseHeaders['Content-Type'] || responseHeaders['content-type'] || ''
         const requestId = responseHeaders['X-Request-Id'] || responseHeaders['x-request-id'] || ''
@@ -279,8 +239,7 @@ export function downloadEvidencePreview(previewUrl) {
           error.statusCode = response.statusCode
           error.requestId = requestId
           error.traceId = traceId
-          reject(error)
-          return
+          throw error
         }
         if (contentType && !/^image\//i.test(contentType) && !/^application\/octet-stream/i.test(contentType)) {
           const error = new Error('服务端未返回有效照片')
@@ -288,18 +247,12 @@ export function downloadEvidencePreview(previewUrl) {
           error.contentType = contentType
           error.requestId = requestId
           error.traceId = traceId
-          reject(error)
-          return
+          throw error
         }
-        resolve(response.tempFilePath)
-      },
-      fail(error) {
-        debugLog('evidence.preview.error', { previewPath: String(previewUrl), message: error.errMsg || '' })
-        const next = new Error(error.errMsg || '装柜照片下载失败')
-        next.network = true
-        reject(next)
-      }
-    })
+        return response.tempFilePath
+  }).catch((error) => {
+    debugLog('evidence.preview.error', { previewPath: String(previewUrl), message: error.message || error.errMsg || '' })
+    throw error
   })
 }
 
@@ -331,28 +284,19 @@ export function uploadEvidenceFile(inboundId, evidenceType, localPath, tenantId,
   if (!localPath) throw new Error('缺少待上传的照片')
   const tenant = tenantQuery(tenantId)
   const baseUrl = session.apiBase || '/api/platform/v1'
-  const headers = {}
-  if (session.token) headers.Authorization = `Bearer ${session.token}`
-  if (session.requestId) headers['X-Request-Id'] = session.requestId
   debugLog('evidence.upload.start', { inboundId, evidenceType, tenantId: tenant, hasLocalPath: Boolean(localPath) })
-  return new Promise((resolve, reject) => {
-    const task = uni.uploadFile({
+  return apiUpload({
       url: `${baseUrl}/files/loading-evidence/${encodeURIComponent(tenant)}/${encodeURIComponent(inboundId)}?evidenceType=${encodeURIComponent(evidenceType)}`,
       filePath: localPath,
       name: 'file',
-      header: headers,
-      success(response) {
+  }, onProgress).then((response) => {
         let body = response.data
         try { body = typeof body === 'string' ? JSON.parse(body) : body } catch (_) { /* handled below */ }
         const code = String(body?.code ?? response.statusCode)
         debugLog('evidence.upload.response', { inboundId, evidenceType, statusCode: response.statusCode, code, message: body?.message || '', requestId: body?.requestId || response.header?.['X-Request-Id'] || response.header?.['x-request-id'] || '', traceId: body?.traceId || response.header?.['X-Trace-Id'] || response.header?.['x-trace-id'] || '', fileId: body?.data?.fileId || null })
-        if (code !== '200') { const error = new Error(body?.message || '文件上传失败'); error.code = body?.code || response.statusCode; reject(error); return }
-        resolve(body?.data || body)
-      },
-      fail(error) { debugLog('evidence.upload.error', { inboundId, evidenceType, message: error.errMsg || '' }); const next = new Error(error.errMsg || '网络连接失败'); next.network = true; reject(next) }
-    })
-    if (task && typeof task.onProgressUpdate === 'function' && typeof onProgress === 'function') task.onProgressUpdate(({ progress }) => onProgress(progress))
-  })
+        if (code !== '200') { const error = new Error(body?.message || '文件上传失败'); error.code = body?.code || response.statusCode; throw error }
+        return body?.data || body
+  }).catch((error) => { debugLog('evidence.upload.error', { inboundId, evidenceType, message: error.message || error.errMsg || '' }); throw error })
 }
 
 export function completeLoading(inboundId, payload, tenantId) {