From 73a0d5d98ea3f1fcdb83b62762869d5b07b3ecf1 Mon Sep 17 00:00:00 2001 From: gong Date: Sat, 11 Oct 2025 13:24:18 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8A=A5=E9=94=99=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../JeepayInfoModal/JeepayModelMchList.vue | 9 ++++----- jeepay-ui-manager/src/http/HttpRequest.js | 4 ++++ jeepay-ui-manager/vite.config.ts | 2 +- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/jeepay-ui-manager/src/components/JeepayUIComponents/JeepayInfoModal/JeepayModelMchList.vue b/jeepay-ui-manager/src/components/JeepayUIComponents/JeepayInfoModal/JeepayModelMchList.vue index ed61171..11e92e0 100644 --- a/jeepay-ui-manager/src/components/JeepayUIComponents/JeepayInfoModal/JeepayModelMchList.vue +++ b/jeepay-ui-manager/src/components/JeepayUIComponents/JeepayInfoModal/JeepayModelMchList.vue @@ -192,11 +192,10 @@ function okFunc() { // [用户号， 应用， 门店] emit('selectFinishFunc', [ - vdata.selectedRowKeys.mch.length > 0 ? vdata.selectedRowKeys.mch[0] : null, - vdata.selectedRowKeys.app.length > 0 ? vdata.selectedRowKeys.app[0] : null, - vdata.selectedRowKeys.store.length > 0 ? vdata.selectedRowKeys.store[0] : null, - vdata.selectedRowKeys.userInfo.length > 0 ? vdata.selectedRowKeys.userInfo[0] : null, - vdata.selectedRowKeys.mchApplyId.length > 0 ? vdata.selectedRowKeys.mchApplyId[0] : null + vdata.selectedRowKeys.mch ? (vdata.selectedRowKeys.mch.length > 0 ? vdata.selectedRowKeys.mch[0] : null) : null, + vdata.selectedRowKeys.app ? (vdata.selectedRowKeys.app.length > 0 ? vdata.selectedRowKeys.app[0] : null) : null, + vdata.selectedRowKeys.store ? (vdata.selectedRowKeys.store.length > 0 ? vdata.selectedRowKeys.store[0] : null) : null, + vdata.selectedRowKeys.mchApplyId ? (vdata.selectedRowKeys.mchApplyId.length > 0 ? vdata.selectedRowKeys.mchApplyId[0] : null) : null ]) } diff --git a/jeepay-ui-manager/src/http/HttpRequest.js b/jeepay-ui-manager/src/http/HttpRequest.js index 1da3416..611d2d7 100644 --- a/jeepay-ui-manager/src/http/HttpRequest.js +++ b/jeepay-ui-manager/src/http/HttpRequest.js @@ -18,6 +18,10 @@ import { useRouter } from '@/utils/routerUtils.js' class HttpRequest { constructor (baseUrl = process.env.VITE_API_BASE_URL) { + if (!baseUrl) { + baseUrl = 'https://manager.sxczgkj.cn' + } + console.log('this.baseUrl', baseUrl) this.baseUrl = baseUrl this.queue = {} // 发送队列, 格式为: {请求url: true}, 可以做一些验证之类 } diff --git a/jeepay-ui-manager/vite.config.ts b/jeepay-ui-manager/vite.config.ts index bbd529a..a266186 100644 --- a/jeepay-ui-manager/vite.config.ts +++ b/jeepay-ui-manager/vite.config.ts @@ -28,7 +28,7 @@ export default ({ mode }) => { // target: 'http://192.168.1.12:9217/', // 代理的目标地址 // target: 'http://192.168.2.171:9217', // 代理的目标地址 // target: 'https://mgruxxkwhmz.rscygroup.com/', // 代理的目标地址 - target: "http://manager.sxczgkj.cn", + target: "https://manager.sxczgkj.cn", changeOrigin: true, // 开启跨域 }, },