Merge branch 'feature/mockApi' of http://face3d.4dage.com:7005/zhangyupeng/zfb_mp into feature/mockApi

src/api/scene/list.ts

@@ -30,7 +30,7 @@ export const ListApi = (params: PageParams) =>
   });
 
 export const downloadSceneDataAPi = (params: SceneDownloadParam) =>
-  defHttp.get<RentListGetResultModel>({
+  defHttp.get<Result>({
     url: Api.downloadSceneData,
     params,
     headers: {

src/views/scenes/list.vue

@@ -207,17 +207,29 @@
       }
 
       async function handleDownloadScene(record: Recordable) {
-        const downloadUrl = await downloadSceneDataAPi({
+        const res = await downloadSceneDataAPi({
           sceneNum: record.num,
         });
-        console.log('downloadUrl', downloadUrl);
-        if (downloadUrl) {
-          downloadByUrl({
-            url: downloadUrl as any as string,
-            target: '_self',
-          });
-        } else {
-          await openDownloadModal(true, record);
+        const downloadUrl = res as any as string;
+        console.log('downloadUrl', downloadUrl, res);
+        /**
+         * mark 2022-03-22 message return success 是要进入openDownloadModal轮询，非表面「成功」字意思。
+         * message return url 指已下载，转mimeType download
+         *
+         * notice: 过往 downloadUrl 是 boolean / string
+         *  现在 downloadUrl 是 string[success] / string[url]
+         *
+         * */
+
+        if (downloadUrl?.length > 0) {
+          if (downloadUrl === 'success') {
+            await openDownloadModal(true, record);
+          } else {
+            downloadByUrl({
+              url: downloadUrl as any as string,
+              target: '_self',
+            });
+          }
         }
       }
       return {