diff --git a/.env.development b/.env.development index ed3017e..c57bc09 100644 --- a/.env.development +++ b/.env.development @@ -6,4 +6,4 @@ VITE_APP_TITLE = 超管系统 VITE_APP_ENV = 'development' # 代理管理系统/开发环境 -VITE_APP_BASE_API = '/dev-api' +VITE_APP_BASE_API = '/ff-api' diff --git a/dist.rar b/dist.rar index 1a1aa8f..07e7b7f 100644 Binary files a/dist.rar and b/dist.rar differ diff --git a/src/views/components/EChartExample.vue b/src/views/components/EChartExample.vue index 6697849..221687f 100644 --- a/src/views/components/EChartExample.vue +++ b/src/views/components/EChartExample.vue @@ -67,6 +67,7 @@ data: seriesArr.length == 0 ?[0]:seriesArr, type: 'line', symbol: 'circle', + connectNulls: true, symbolSize: 10, lineStyle: { width: 2 diff --git a/src/views/index.vue b/src/views/index.vue index 9fb7fe5..3b539cd 100644 --- a/src/views/index.vue +++ b/src/views/index.vue @@ -11,9 +11,9 @@ - + diff --git a/src/views/operations/apiBill/index.vue b/src/views/operations/apiBill/index.vue index ca9d5b3..966abbe 100644 --- a/src/views/operations/apiBill/index.vue +++ b/src/views/operations/apiBill/index.vue @@ -72,6 +72,7 @@ {{ t('未结算') }} {{ t('待确认') }} {{ t('已结算') }} + {{ t('已取消') }} diff --git a/src/views/operations/apiMember/index.vue b/src/views/operations/apiMember/index.vue index 21ac970..677b100 100644 --- a/src/views/operations/apiMember/index.vue +++ b/src/views/operations/apiMember/index.vue @@ -239,13 +239,14 @@ const queryParamsList2 = ref([{ } ]); -const dateRange = ref([]),operateTimeType = ref("month"); +const dateRange = ref([]),operateTimeType = ref("day"); const data = reactive({ form: {}, queryParams: { pageNum: 1, pageSize: 10, timeType:1, + currencyType:'VND', orderByColumn:'createTime', isAsc:'desc', searchType:'account', diff --git a/vite.config.js b/vite.config.js index 7e0a809..5450d15 100644 --- a/vite.config.js +++ b/vite.config.js @@ -24,25 +24,25 @@ export default defineConfig(({ mode, command }) => { port: 80, host: true, open: true, - proxy: { - '/dev-api': { - // target: 'http://192.168.50.139:9080', - // target: 'http://192.168.50.233:8081', - // target: 'http://192.168.50.178:8080', - target: 'http://192.168.50.11:8081', - changeOrigin: true, - rewrite: (p) => p.replace(/^\/dev-api/, '') - } - }, // proxy: { - // '/ff-api': { - // target: 'https://superapi.pgbet188.net', // 线上接口地址 - // changeOrigin: true, // 是否允许跨域 - // pathRewrite: { - // '^/ff-api': '' // 如果你需要去掉前缀,例如将 /api/xxx 替换为 /xxx - // } + // '/dev-api': { + // // target: 'http://192.168.50.139:9080', + // // target: 'http://192.168.50.233:8081', + // // target: 'http://192.168.50.178:8080', + // target: 'http://192.168.50.11:8081', + // changeOrigin: true, + // rewrite: (p) => p.replace(/^\/dev-api/, '') // } - // } + // }, + proxy: { + '/ff-api': { + target: 'https://superapi.pgbet188.net', // 线上接口地址 + changeOrigin: true, // 是否允许跨域 + pathRewrite: { + '^/ff-api': '' // 如果你需要去掉前缀,例如将 /api/xxx 替换为 /xxx + } + } + } }, css: { postcss: {