Merge remote-tracking branch 'refs/remotes/yudao/develop'

sheep/api/infra/file.js

@@ -1,4 +1,5 @@
 import { baseUrl, apiPath, tenantId } from '@/sheep/config';
+import request from '@/sheep/request';
 
 const FileApi = {
   // 上传文件
@@ -40,6 +41,26 @@ const FileApi = {
       });
     });
   },
+
+  // 获取文件预签名地址
+  getFilePresignedUrl: (path) => {
+    return request({
+      url: '/infra/file/presigned-url',
+      method: 'GET',
+      params: {
+        path,
+      },
+    });
+  },
+
+  // 创建文件
+  createFile: (data) => {
+    return request({
+      url: '/infra/file/create', // 请求的 URL
+      method: 'POST', // 请求方法
+      data: data, // 要发送的数据
+    });
+  },
 };
 
 export default FileApi;

sheep/api/trade/config.js

@@ -6,6 +6,9 @@ const TradeConfigApi = {
     return request({
       url: `/trade/config/get`,
       method: 'GET',
+      custom: {
+        showLoading: false,
+      },
     });
   },
 };

sheep/api/trade/order.js

@@ -35,6 +35,9 @@ const OrderApi = {
     if (!(data.pointActivityId > 0)) {
       delete data2.pointActivityId;
     }
+    if (!(data.deliveryType > 0)) {
+      delete data2.deliveryType;
+    }
     // 解决 SpringMVC 接受 List<Item> 参数的问题
     delete data2.items;
     for (let i = 0; i < data.items.length; i++) {