From b53bfd468c71371eb0c6f183e5de1f4e0ca8fff3 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Fri, 5 Jan 2024 22:26:01 +0800
Subject: [PATCH] =?UTF-8?q?=E2=9C=A8=20=E6=96=87=E4=BB=B6=E7=9A=84?=
 =?UTF-8?q?=E4=B8=8A=E4=BC=A0=EF=BC=9A100%?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sheep/api/infra/file.js                               | 2 --
 sheep/components/s-uploader/choose-and-upload-file.js | 6 +++---
 sheep/components/s-uploader/s-uploader.vue            | 1 +
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/sheep/api/infra/file.js b/sheep/api/infra/file.js
index 264f646..6789f5e 100644
--- a/sheep/api/infra/file.js
+++ b/sheep/api/infra/file.js
@@ -1,5 +1,3 @@
-import request2 from '@/sheep/request2';
-
 const FileApi = {
   // 上传文件
   uploadFile: (file) => {
diff --git a/sheep/components/s-uploader/choose-and-upload-file.js b/sheep/components/s-uploader/choose-and-upload-file.js
index 16db0b4..604ff9d 100644
--- a/sheep/components/s-uploader/choose-and-upload-file.js
+++ b/sheep/components/s-uploader/choose-and-upload-file.js
@@ -1,5 +1,5 @@
 'use strict';
-import sheep from '@/sheep';
+import FileApi from '@/sheep/api/infra/file';
 
 const ERR_MSG_OK = 'chooseAndUploadFile:ok';
 const ERR_MSG_FAIL = 'chooseAndUploadFile:fail';
@@ -190,8 +190,8 @@ function uploadFiles(choosePromise, { onChooseFile, onUploadProgress }) {
     })
     .then(async (files) => {
       for (let file of files.tempFiles) {
-        let { path } = await sheep.$api.app.upload(file.path, 'ugc');
-        file.url = path;
+        const { data } = await FileApi.uploadFile(file.path);
+        file.url = data;
       }
       return files;
     });
diff --git a/sheep/components/s-uploader/s-uploader.vue b/sheep/components/s-uploader/s-uploader.vue
index cd3b4f6..95cfb05 100644
--- a/sheep/components/s-uploader/s-uploader.vue
+++ b/sheep/components/s-uploader/s-uploader.vue
@@ -1,3 +1,4 @@
+<!-- 文件上传，基于 upload-file 和 upload-image 实现 -->
 <template>
   <view class="uni-file-picker">
     <view v-if="title" class="uni-file-picker__header">