diff --git a/src/layout/components/header-tools.vue b/src/layout/components/header-tools.vue index 2dfe6d5..3e58727 100644 --- a/src/layout/components/header-tools.vue +++ b/src/layout/components/header-tools.vue @@ -153,7 +153,6 @@ import { useSiteStore } from '@/store/modules/site'; import Qrcode from "@/components/QrCode/index.vue"; import {AppInfo} from "@/api/cms/cmsWebsite/model"; import {getCmsWebsiteFieldByCode} from "@/api/cms/cmsWebsiteField"; -import {API_BASE_URL} from "@/config/setting"; // 是否开启响应式布局 const themeStore = useThemeStore(); @@ -247,8 +246,7 @@ const reload = () => { }); } // 检查是否启动自定义接口 - if(!localStorage.getItem('ApiUrl')){ - localStorage.setItem('ApiUrl', `${API_BASE_URL}`) + if(import.meta.env.PROD){ getCmsWebsiteFieldByCode('ApiUrl').then(res => { if(res){ localStorage.setItem('ApiUrl', `${res.value}`); diff --git a/src/utils/request.ts b/src/utils/request.ts index 1285742..bca94d7 100644 --- a/src/utils/request.ts +++ b/src/utils/request.ts @@ -19,7 +19,7 @@ const getBaseUrl = (): string => { try { // 如果store中没有,则尝试从localStorage获取 const ApiUrl = localStorage.getItem('ApiUrl'); - if (ApiUrl && import.meta.env.PROD) { + if (ApiUrl) { return ApiUrl; } } catch (error) { diff --git a/src/views/sdy/shopDealerOrder/index.vue b/src/views/sdy/shopDealerOrder/index.vue index 66bb726..ff2d5a8 100644 --- a/src/views/sdy/shopDealerOrder/index.vue +++ b/src/views/sdy/shopDealerOrder/index.vue @@ -262,35 +262,6 @@ const reload = (where?: ShopDealerOrderParam) => { tableRef?.value?.reload({where: where}); }; -/* 结算单个订单 */ -// const settleOrder = (row: ShopDealerOrder) => { -// const totalCommission = (parseFloat(row.firstMoney || '0') + -// parseFloat(row.secondMoney || '0') + -// parseFloat(row.thirdMoney || '0')).toFixed(2); -// -// Modal.confirm({ -// title: '确认结算', -// content: `确定要结算此订单吗?总佣金金额:¥${totalCommission}`, -// icon: createVNode(DollarOutlined), -// okText: '确认结算', -// okType: 'primary', -// cancelText: '取消', -// onOk: () => { -// const hide = message.loading('正在结算...', 0); -// // 这里调用结算API -// updateSdyDealerOrder({ -// ...row, -// isSettled: 1 -// }) -// setTimeout(() => { -// hide(); -// message.success('结算成功'); -// reload(); -// }, 1000); -// } -// }); -// }; - /* 批量结算 */ const batchSettle = () => { if (!selection.value.length) {