修改上传配置

zdxt-web-client/zdxt-efcode-enterprise-app/src/util/w6sMedia.js

@@ -94,8 +94,8 @@ export const takePhotoWithWaterMark = async ({
       fontSize,
       color,
       markDisable: false,
-      timeEnable,
-      locationEnable,
+      timeEnable: true,
+      locationEnable: true,
       success: (res) => {
         console.log('[w6sMedia] takePhotoAndAddWaterMark success 原始返回:', res)
         console.log('[w6sMedia] 返回字段 imageURL:', res?.result.imageURL, 'key:', res?.result.key, 'imageInfo:', res?.result.imageInfo)
@@ -174,7 +174,6 @@ export const uploadLocalFileToBackend = async ({
   console.log('[w6sMedia] 上传前鉴权完成')
   return new Promise((resolve, reject) => {
     const token = $globalStore.useCommon?.token || ''
-    // w6s.file.upload 需要完整 URL
     const api = `${baseUrl}/app-enf/common/file/upload`
     const server = /^https?:/.test(api) ? api : `${window.location.origin}${api}`
     console.log('[w6sMedia] 上传目标 server:', server, 'token 存在:', !!token)
@@ -187,36 +186,33 @@ export const uploadLocalFileToBackend = async ({
       Authorization: token ? `Bearer ${token}` : '',
       clientid: '9e6eb24cd4e169a98b0d2cd8034d877b',
     }
-    console.log('[w6sMedia] FileUploadOptions 构造完成:', { fileKey: opts.fileKey, fileName: opts.fileName, mimeType: opts.mimeType, headers: opts.headers })
+    console.log('[w6sMedia] FileUploadOptions 构造完成:', { fileKey: opts.fileKey, fileName: opts.fileName, mimeType: opts.mimeType })
 
-    let fileIns
-    try {
-      fileIns = new w6s.file.upload(opts)
-    } catch (e) {
-      console.error('[w6sMedia] new w6s.file.upload 抛错:', e)
-      reject(e)
-      return
-    }
-    fileIns.upload({
-      fileURL,
-      server,
-      trustAllHosts: false,
-      success: (res) => {
-        console.log('[w6sMedia] file.upload success 原始返回:', res)
-        // Cordova FileTransfer 返回 res.response 为字符串
-        try {
-          const parsed = typeof res.response === 'string' ? JSON.parse(res.response) : res.response
-          console.log('[w6sMedia] 解析后的上传响应:', parsed)
-          resolve(parsed)
-        } catch (e) {
-          console.warn('[w6sMedia] 响应 JSON 解析失败, 返回原始 response:', res.response)
-          resolve(res.response)
-        }
-      },
-      fail: (err) => {
-        console.error('[w6sMedia] file.upload fail:', err)
-        reject(err)
+    w6s.file.upload(
+      {
+        fileURL,
+        server,
+        trustAllHosts: false,
+        success: (res) => {
+          console.log('[w6sMedia] file.upload success 原始返回:', res)
+          try {
+            const parsed = typeof res.response === 'string' ? JSON.parse(res.response) : res.response
+            console.log('[w6sMedia] 解析后的上传响应:', parsed)
+            resolve(parsed)
+          } catch (e) {
+            console.warn('[w6sMedia] 响应 JSON 解析失败, 返回原始 response:', res.response)
+            resolve(res.response)
+          }
+        },
+        fail: (err) => {
+          console.error('[w6sMedia] file.upload fail:', err)
+          reject(err)
+        },
       },
+      opts
+    ).catch((err) => {
+      console.error('[w6sMedia] w6s.file.upload 异常:', err)
+      reject(err)
     })
   })
 }