From 4bc19453d6aae15537b8f3919e0e2e83d2e5880a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BA=8E=E8=82=96=E7=A3=8A?= <18851179580@163.com>
Date: Fri, 17 Jan 2025 18:48:40 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A1=B5=E9=9D=A2=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/common/upload/index.vue        |  2 +-
 src/components/common/upload/upload-model.vue |  2 +-
 .../model-tabs-carousel-styles.vue            |  2 +-
 src/utils/request.ts                          | 26 +++++++++++--------
 4 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/src/components/common/upload/index.vue b/src/components/common/upload/index.vue
index 9287eca2..15f941b0 100644
--- a/src/components/common/upload/index.vue
+++ b/src/components/common/upload/index.vue
@@ -220,7 +220,7 @@
     </template>
     <!-- 图片预览 -->
     <el-image-viewer v-if="preview_switch_img && upload_type == 'img'" class="123123" :z-index="999999" :url-list="[preview_url]" teleported :hide-on-click-modal="true" @close="preview_close"></el-image-viewer>
-    <upload-model v-model="upload_model_visible" :type="upload_type" :exts="props.type == 'img' ? ext_img_name_list : props.type == 'video' ? ext_video_name_list : ext_file_name_list" @close-all="close_all_upload_model" @close="close_upload_model"></upload-model>
+    <upload-model v-model="upload_model_visible" :type="upload_type" :exts="upload_type == 'img' ? ext_img_name_list : upload_type == 'video' ? ext_video_name_list : ext_file_name_list" @close-all="close_all_upload_model" @close="close_upload_model"></upload-model>
     <form-upload-category v-model="upload_category_model_visible" :value="upload_category_model" :type="upload_category_type" :category-id="upload_category_id" :category-pid="upload_category_pid" @confirm="upload_category_confirm"></form-upload-category>
 </template>
 <script lang="ts" setup>
diff --git a/src/components/common/upload/upload-model.vue b/src/components/common/upload/upload-model.vue
index 0a283c8e..3f70046d 100644
--- a/src/components/common/upload/upload-model.vue
+++ b/src/components/common/upload/upload-model.vue
@@ -202,7 +202,7 @@ const upload_type_name = computed(() => {
     return props.type === 'img' ? '图片' : props.type === 'video' ? '视频' : '文件';
 });
 // 格式限制
-const exts_text = ref(props.exts.join(','));
+const exts_text = computed(() => props.exts.join(','));
 const file_list = ref<UploadUserFile[]>([]);
 interface fileData {
     file: File;
diff --git a/src/components/model-tabs-carousel/model-tabs-carousel-styles.vue b/src/components/model-tabs-carousel/model-tabs-carousel-styles.vue
index c19fb905..ffec352b 100644
--- a/src/components/model-tabs-carousel/model-tabs-carousel-styles.vue
+++ b/src/components/model-tabs-carousel/model-tabs-carousel-styles.vue
@@ -2,7 +2,7 @@
     <div class="w">
         <el-tabs v-model="tabs_name" class="content-tabs" @tab-change="change_tab_event">
             <el-tab-pane label="选项卡" name="tabs">
-                <model-tabs-styles :value="form" :tabs-style="tabsStyle" :is-common="false"></model-tabs-styles>
+                <model-tabs-styles :value="form" :content="new_content" :tabs-style="tabsStyle" :is-common="false"></model-tabs-styles>
             </el-tab-pane>
             <el-tab-pane label="轮播" name="carousel">
                 <model-carousel-styles :value="form" :content="new_content" :is-common="false"></model-carousel-styles>
diff --git a/src/utils/request.ts b/src/utils/request.ts
index a4d7010f..0ad85337 100644
--- a/src/utils/request.ts
+++ b/src/utils/request.ts
@@ -22,7 +22,8 @@ const isLogoutModalShown = ref(true);
 
 // 用于存储每个请求的CancelToken
 const pendingRequests = new Map();
-
+// 不需要认证的接口
+const release_url = ['diyapi/attachmentupload'];
 // 创建 axios 实例
 const index = window.location.href.lastIndexOf('?s=');
 const pro_url = window.location.href.substring(0, index);
@@ -46,17 +47,20 @@ service.interceptors.request.use(
                 config.url = config.url + '&token=' + (JSON.parse(cookie) !== 'null' ? JSON.parse(cookie)?.token : '');
             }
         }
-        // 检查是否有相同请求正在进行，如果有则取消, 防止重复请求导致返回数据有误
-        if (pendingRequests.has(config.url)) {
-            const cancelToken = pendingRequests.get(config.url);
-            cancelToken.cancel('canceled');
-            pendingRequests.delete(config.url);
+        // 判断是否是包含不需要认证的接口
+        const release_list = release_url.filter(item => config.url?.includes(item));
+        if (release_list.length === 0) {
+            // 检查是否有相同请求正在进行，如果有则取消, 防止重复请求导致返回数据有误
+            if (pendingRequests.has(config.url)) {
+                const cancelToken = pendingRequests.get(config.url);
+                cancelToken.cancel('canceled');
+                pendingRequests.delete(config.url);
+            }
+            // 创建一个新的 CancelToken
+            const source = axios.CancelToken.source();
+            config.cancelToken = source.token;
+            pendingRequests.set(config.url, source);
         }
-        // 创建一个新的 CancelToken
-        const source = axios.CancelToken.source();
-        config.cancelToken = source.token;
-        pendingRequests.set(config.url, source);
-
         return config;
     },
     (error: any) => {