From 7498ed12c39c8f7d2f25c1c7d6507b6e8b40412e Mon Sep 17 00:00:00 2001
From: johnsonwong666 <64689255+johnsonwong666@users.noreply.github.com>
Date: Mon, 10 Jul 2023 19:17:54 +0800
Subject: [PATCH] fix(uploader): fix chooseImage error in PC (#5477)

---
 packages/common/utils.ts   |  8 +++++++-
 packages/uploader/utils.ts | 40 +++++++++++++++++++++++++-------------
 2 files changed, 33 insertions(+), 15 deletions(-)

diff --git a/packages/common/utils.ts b/packages/common/utils.ts
index 1f735511..4b5f14c8 100644
--- a/packages/common/utils.ts
+++ b/packages/common/utils.ts
@@ -1,5 +1,9 @@
 import { isDef, isNumber, isPlainObject, isPromise } from './validator';
-import { canIUseGroupSetData, canIUseNextTick } from './version';
+import {
+  canIUseGroupSetData,
+  canIUseNextTick,
+  getSystemInfoSync,
+} from './version';
 
 export { isDef } from './validator';
 export { getSystemInfoSync } from './version';
@@ -109,3 +113,5 @@ export function getCurrentPage<T>() {
   const pages = getCurrentPages();
   return pages[pages.length - 1] as T & WechatMiniprogram.Page.TrivialInstance;
 }
+
+export const isPC = ['mac', 'windows'].includes(getSystemInfoSync().platform);
diff --git a/packages/uploader/utils.ts b/packages/uploader/utils.ts
index 2eef8269..eec56a5a 100644
--- a/packages/uploader/utils.ts
+++ b/packages/uploader/utils.ts
@@ -1,4 +1,4 @@
-import { pickExclude } from '../common/utils';
+import { pickExclude, isPC } from '../common/utils';
 import { isImageUrl, isVideoUrl } from '../common/validator';
 
 export interface File {
@@ -45,13 +45,15 @@ export function isVideoFile(item: File): boolean {
 }
 
 function formatImage(
-  res: WechatMiniprogram.ChooseMediaSuccessCallbackResult
+  res:
+    | WechatMiniprogram.ChooseMediaSuccessCallbackResult
+    | WechatMiniprogram.ChooseImageSuccessCallbackResult
 ): File[] {
   return res.tempFiles.map((item) => ({
     ...pickExclude(item, ['path']),
     type: 'image',
-    url: item.tempFilePath,
-    thumb: item.tempFilePath,
+    url: item.tempFilePath || item.path,
+    thumb: item.tempFilePath || item.path,
   }));
 }
 
@@ -101,16 +103,26 @@ export function chooseFile({
   return new Promise<File | File[]>((resolve, reject) => {
     switch (accept) {
       case 'image':
-        wx.chooseMedia({
-          count: multiple ? Math.min(maxCount, 9) : 1,
-          mediaType: ['image'],
-          sourceType: capture,
-          maxDuration,
-          sizeType,
-          camera,
-          success: (res) => resolve(formatImage(res)),
-          fail: reject,
-        });
+        if (isPC) {
+          wx.chooseImage({
+            count: multiple ? Math.min(maxCount, 9) : 1,
+            sourceType: capture,
+            sizeType,
+            success: (res) => resolve(formatImage(res)),
+            fail: reject,
+          });
+        } else {
+          wx.chooseMedia({
+            count: multiple ? Math.min(maxCount, 9) : 1,
+            mediaType: ['image'],
+            sourceType: capture,
+            maxDuration,
+            sizeType,
+            camera,
+            success: (res) => resolve(formatImage(res)),
+            fail: reject,
+          });
+        }
         break;
       case 'media':
         wx.chooseMedia({