From eb836524b88f457bccecef85d09294c5f4fb523d Mon Sep 17 00:00:00 2001
From: sws <1141121512@qq.com>
Date: Mon, 21 Oct 2024 14:09:46 +0800
Subject: [PATCH] =?UTF-8?q?1.=E9=93=BE=E6=8E=A5=E6=96=B0=E5=A2=9Eloading?=
=?UTF-8?q?=202.axios=E6=8B=A6=E6=88=AA=E5=99=A8=E6=96=B0=E5=A2=9E'X-Reque?=
=?UTF-8?q?sted-With':=20'XMLHttpRequest'=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/components/common/url-value/link-articles.vue | 7 ++++++-
src/components/common/url-value/link-brand.vue | 12 ++++++------
src/components/common/url-value/link-coupon.vue | 7 ++++++-
src/components/common/url-value/link-goods.vue | 7 ++++++-
src/components/common/url-value/link-table.vue | 14 ++++++++++++--
src/utils/request.ts | 3 ++-
6 files changed, 38 insertions(+), 12 deletions(-)
diff --git a/src/components/common/url-value/link-articles.vue b/src/components/common/url-value/link-articles.vue
index a024d37b..ecb403a0 100644
--- a/src/components/common/url-value/link-articles.vue
+++ b/src/components/common/url-value/link-articles.vue
@@ -12,7 +12,7 @@
-
+
@@ -72,6 +72,7 @@ onMounted(() => {
const modelValue = defineModel({ type: Object, default: {} });
const tableData = ref([]);
const search_value = ref('');
+const loading = ref(false);
const init = () => {
template_selection.value = '';
category_ids.value = '';
@@ -105,10 +106,14 @@ const get_list = (new_page: number) => {
category_ids: category_ids.value,
page_size: page_size.value,
};
+ loading.value = true;
UrlValueAPI.getArticleList(new_data).then((res: any) => {
tableData.value = res.data.data_list;
data_total.value = res.data.data_total;
page.value = res.data.page;
+ setTimeout(() => {
+ loading.value = false;
+ }, 500);
});
};
//#region 分页 -----------------------------------------------end
diff --git a/src/components/common/url-value/link-brand.vue b/src/components/common/url-value/link-brand.vue
index fe07c748..6535af55 100644
--- a/src/components/common/url-value/link-brand.vue
+++ b/src/components/common/url-value/link-brand.vue
@@ -12,7 +12,7 @@
-
+
@@ -73,11 +73,7 @@ onMounted(() => {
const modelValue = defineModel({ type: Object, default: {} });
const tableData = ref([]);
const search_value = ref('');
-const cascader_config = {
- value: 'id',
- label: 'name',
- children: 'items',
-};
+const loading = ref(false);
const init = () => {
template_selection.value = '';
category_ids.value = [];
@@ -110,10 +106,14 @@ const get_list = (new_page: number) => {
page_size: page_size.value,
category_ids: brand_ids.value,
};
+ loading.value = true;
UrlValueAPI.getBrandList(new_data).then((res: any) => {
tableData.value = res.data.data_list;
data_total.value = res.data.data_total;
page.value = res.data.page;
+ setTimeout(() => {
+ loading.value = false;
+ }, 500);
});
};
//#region 分页 -----------------------------------------------end
diff --git a/src/components/common/url-value/link-coupon.vue b/src/components/common/url-value/link-coupon.vue
index 4c1eae16..47b20b72 100644
--- a/src/components/common/url-value/link-coupon.vue
+++ b/src/components/common/url-value/link-coupon.vue
@@ -12,7 +12,7 @@
-
+
@@ -71,6 +71,7 @@ onMounted(() => {
const modelValue = defineModel({ type: Object, default: {} });
const tableData = ref([]);
const search_value = ref('');
+const loading = ref(false);
const init = () => {
template_selection.value = '';
type.value = '';
@@ -106,10 +107,14 @@ const get_list = (new_page: number) => {
type: type.value,
page_size: page_size.value,
};
+ loading.value = true;
UrlValueAPI.getCouponList(new_data).then((res: any) => {
tableData.value = res.data.data_list;
data_total.value = res.data.data_total;
page.value = res.data.page;
+ setTimeout(() => {
+ loading.value = false;
+ }, 500);
});
};
//#region 分页 -----------------------------------------------end
diff --git a/src/components/common/url-value/link-goods.vue b/src/components/common/url-value/link-goods.vue
index 3d606546..d50330d5 100644
--- a/src/components/common/url-value/link-goods.vue
+++ b/src/components/common/url-value/link-goods.vue
@@ -13,7 +13,7 @@
-
+
@@ -75,6 +75,7 @@ onMounted(() => {
const modelValue = defineModel({ type: Object, default: {} });
const tableData = ref([]);
const search_value = ref('');
+const loading = ref(false);
const cascader_config = {
value: 'id',
label: 'name',
@@ -120,10 +121,14 @@ const get_list = (new_page: number) => {
page_size: page_size.value,
category_ids: category_ids.value.length > 0 ? category_ids.value[category_ids.value.length - 1] : '',
};
+ loading.value = true;
UrlValueAPI.getGoodsList(new_data).then((res: any) => {
tableData.value = res.data.data_list;
data_total.value = res.data.data_total;
page.value = res.data.page;
+ setTimeout(() => {
+ loading.value = false;
+ }, 500);
});
};
//#region 分页 -----------------------------------------------end
diff --git a/src/components/common/url-value/link-table.vue b/src/components/common/url-value/link-table.vue
index 80572188..d936a628 100644
--- a/src/components/common/url-value/link-table.vue
+++ b/src/components/common/url-value/link-table.vue
@@ -9,7 +9,7 @@
-
+
@@ -72,7 +72,7 @@ onMounted(() => {
const modelValue = defineModel({ type: Object, default: {} });
const tableData = ref([]);
const search_value = ref('');
-
+const loading = ref(false);
const init = () => {
template_selection.value = '';
search_value.value = '';
@@ -97,23 +97,33 @@ const get_list = (new_page: number) => {
page_size: page_size.value,
keywords: search_value.value,
};
+ loading.value = true;
if (props.type == 'diy') {
UrlValueAPI.getDiyList(new_data).then((res: any) => {
tableData.value = res.data.data_list;
data_total.value = res.data.data_total;
page.value = res.data.page;
+ setTimeout(() => {
+ loading.value = false;
+ }, 500);
});
} else if (props.type == 'design') {
UrlValueAPI.getDesignList(new_data).then((res: any) => {
tableData.value = res.data.data_list;
data_total.value = res.data.data_total;
page.value = res.data.page;
+ setTimeout(() => {
+ loading.value = false;
+ }, 500);
});
} else if (props.type == 'custom-view') {
UrlValueAPI.getCustomList(new_data).then((res: any) => {
tableData.value = res.data.data_list;
data_total.value = res.data.data_total;
page.value = res.data.page;
+ setTimeout(() => {
+ loading.value = false;
+ }, 500);
});
}
};
diff --git a/src/utils/request.ts b/src/utils/request.ts
index ff0ab873..660736db 100644
--- a/src/utils/request.ts
+++ b/src/utils/request.ts
@@ -26,7 +26,7 @@ const pro_url = window.location.href.substring(0, index);
const service = axios.create({
baseURL: import.meta.env.VITE_APP_BASE_API == '/dev-api' ? import.meta.env.VITE_APP_BASE_API : pro_url + '?s=',
timeout: 60000,
- headers: { 'Content-Type': 'application/json;charset=utf-8' },
+ headers: { 'Content-Type': 'application/json;charset=utf-8', 'X-Requested-With': 'XMLHttpRequest' },
});
/** @ts-ignore */
// 请求拦截器
@@ -43,6 +43,7 @@ service.interceptors.request.use(
config.url = config.url + '&token=' + JSON.parse(cookie).token;
}
}
+ console.log(config);
return config;
},
(error: any) => {