feat

src/components/Uploader/index.jsx

@@ -3,6 +3,7 @@ import Taro from "@tarojs/taro";
 import { View, Image, Video } from "@tarojs/components";
 import { Loading } from "@antmjs/vantui";
 import { uploadFileBase64, uploadFiles } from "@/utils/request";
+import { promise } from "@/utils/promise";
 import icon from "@/assets/icons/uploader.png";
 import closeIcon from "@/assets/icons/close.png";
 import style from "./style.modules.less";
@@ -22,23 +23,32 @@ export default (props) => {
     setLoading(true);
 
     // eslint-disable-next-line no-undef
-    if (IS_APP_CLIENT) {  
-      // eslint-disable-next-line no-undef
-      SmartCity.chooseImage({
-        count : 1 // 图片张数
-      },function(res){
-          console.log("--------上传图片---------", res);
-          const base64 = res[0].imageData;
-          const fileName = res[0].name;
-          const fileType = res[0].type;
-  
-          uploadFileBase64(base64, fileName, fileType).then(resp => {
-            setLoading(false);
-            onChange((value || []).concat(resp));
-          }).catch((err) => {
-            console.error(err);
-            setLoading(false);
-          });
+    if (IS_APP_CLIENT) {
+      const p = promise((resolve, reject) => {
+        // eslint-disable-next-line no-undef
+        SmartCity.chooseImage({
+          count : 1 // 图片张数
+        },function(res){
+            console.log("--------上传图片---------", res);
+            const base64 = res[0].imageData;
+            const fileName = res[0].name;
+            const fileType = res[0].type;
+    
+            uploadFileBase64(base64, fileName, fileType).then(resp => {
+              resolve(resp);
+              // onChange((value || []).concat(resp));
+            }).catch((err) => {
+              console.error(err);
+              reject(err);
+            });
+        });
+      }, 60 * 1000);
+
+      p.then((resp) => {
+        setLoading(false);
+        onChange((value || []).concat(resp));
+      }).catch(() => {
+        setLoading(false);
       });
     } else {
       Taro.chooseMedia({

src/utils/authorize.js

@@ -1,4 +1,5 @@
 import Taro from "@tarojs/taro";
+import { promise } from "./promise";
 import { translate } from "./map";
 
 export default function getAuthorize(scope) {
@@ -39,7 +40,7 @@ export const getLocation = () => {
       },
     }
 
-    return new Promise((resolve, reject) => {
+    return promise((resolve, reject) => {
       // eslint-disable-next-line no-undef
       new TMap.service.IPLocation().locate().then(res => {
         if (res.status == 0) {
@@ -58,7 +59,7 @@ export const getLocation = () => {
     
   }
 
-  return new Promise((resolve, reject) => {
+  return promise((resolve, reject) => {
     // eslint-disable-next-line no-undef
     SmartCity.getLocation(function(res){
       // 百度坐标

src/utils/promise.js

@@ -0,0 +1,17 @@
+
+/**
+ * 创建一个带有超时功能的Promise
+ * @param {*} fn 
+ * @param {*} timeout 
+ * @returns 
+ */
+export function promise(fn, timeout = 3000) {
+  return new Promise((resolve, reject) => {
+    const timer = setTimeout(() => {
+      clearTimeout(timer);
+      reject(new Error('Promise timeout'));
+    }, timeout);
+
+    fn(resolve, reject);
+  });
+}