From 0f5b59b1d057ea54a4c4e5216f73f2ec15c3b98d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BA=8E=E8=82=96=E7=A3=8A?= <18851179580@163.com> Date: Mon, 11 Aug 2025 11:15:50 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AF=B7=E6=B1=82=E5=9C=B0?= =?UTF-8?q?=E5=9D=80=E5=92=8C=E4=B8=8A=E4=BC=A0=E7=AE=A1=E7=90=86=E7=9A=84?= =?UTF-8?q?=E6=9D=83=E9=99=90=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/template-import/index.vue | 14 ++-- src/components/common/upload/index.vue | 24 ++++--- .../footer-nav/footer-nav-content.vue | 2 +- src/store/modules/common.ts | 18 +++--- src/utils/api-request.ts | 4 +- src/utils/index-request.ts | 4 +- src/utils/request.ts | 4 +- src/views/layout/index.vue | 64 ++++++++++++++----- src/views/tabbar/index.vue | 4 +- 9 files changed, 93 insertions(+), 45 deletions(-) diff --git a/src/components/common/template-import/index.vue b/src/components/common/template-import/index.vue index e0e13d5e..b8b4c29d 100644 --- a/src/components/common/template-import/index.vue +++ b/src/components/common/template-import/index.vue @@ -208,7 +208,7 @@ const get_import_list = (type?: string) => { ...form.value, is_already_buy: form.value.status ? '1' : '0', }; - CommonAPI.getDynamicApi(common_store.common.diy_market_url, new_data) + CommonAPI.getDynamicApi(common_store.common.config.diy_market_url, new_data) .then((res: any) => { const data = res.data; form.value.data_total = data.data_total; @@ -265,7 +265,7 @@ interface install_data { } const install = async (item: install_data) => { let new_data = item; - CommonAPI.getDynamicApi(common_store.common.diy_install_url ,item) + CommonAPI.getDynamicApi(common_store.common.config.diy_install_url ,item) .then((res: any) => { switch (item.opt) { case 'url': @@ -282,7 +282,9 @@ const install = async (item: install_data) => { break; case 'install': ElMessage.success(res.msg); - history.pushState({}, '', '?s=diy/saveinfo/id/' + res.data + '.html'); + if (import.meta.env.VITE_APP_BASE_API == '/dev-admin') { + history.pushState({}, '', '?s=diy/saveinfo/id/' + res.data + '.html'); + } Loading_text.value = ''; loading.value = false; // 解除禁用效果 @@ -318,10 +320,12 @@ const confirm_event = () => { if (file_list.value && file_list.value[0].raw) { form_data.append('file', file_list.value[0]?.raw); } - CommonAPI.getDynamicApi(common_store.common.diy_upload_url, form_data, true) + CommonAPI.getDynamicApi(common_store.common.config.diy_upload_url, form_data, true) .then((res: any) => { ElMessage.success(res.msg); - history.pushState({}, '', '?s=diy/saveinfo/id/' + res.data + '.html'); + if (import.meta.env.VITE_APP_BASE_API == '/dev-admin') { + history.pushState({}, '', '?s=diy/saveinfo/id/' + res.data + '.html'); + } close_event(); emit('confirm'); }) diff --git a/src/components/common/upload/index.vue b/src/components/common/upload/index.vue index 15f941b0..3bf080fd 100644 --- a/src/components/common/upload/index.vue +++ b/src/components/common/upload/index.vue @@ -21,14 +21,14 @@ - +