diff --git a/src/api/trade/index.js b/src/api/trade/index.js new file mode 100644 index 0000000..e35ad43 --- /dev/null +++ b/src/api/trade/index.js @@ -0,0 +1,28 @@ +import request from '@/utils/request'; + +// 用户提现记录 +export function getUserWithdrawList(data) { + return request({ + url: `/trans/withdraw/list`, + method: 'post', + data: data + }); +} + +// 用户审核提现 +export function setWithdrawStatus(data) { + return request({ + url: `/trans/withdraw/update`, + method: 'post', + data: data + }); +} + +// 用户充值记录 +export function getUserChargeList(data) { + return request({ + url: `/trans/charge/list`, + method: 'post', + data: data + }); +} diff --git a/src/views/dashboard/LineChartnew.vue b/src/views/dashboard/LineChartnew.vue index 141535b..0373aa5 100644 --- a/src/views/dashboard/LineChartnew.vue +++ b/src/views/dashboard/LineChartnew.vue @@ -28,38 +28,51 @@ export default { required: true } }, - data() { - return { - chart: null - }; + defaultOption: { + title: { + text: null, + left: 'center' + }, + tooltip: { + show: true, + trigger: 'axis' + }, + legend: { + data: [] + }, + grid: { + left: '3%', + right: '4%', + bottom: '3%', + containLabel: true + }, + xAxis: { + type: 'category', + boundaryGap: false, + data: [] + }, + yAxis: { + type: 'value' + }, + series: [] }, - watch: { - chartData: { - deep: true, - handler(val) { - this.setOptions(val); - } - } + data() { + return {}; }, mounted() { - this.$nextTick(() => { - this.initChart(); - }); - }, - beforeUnmount() { - if (!this.chart) { - return; - } - this.chart.dispose(); - this.chart = null; + this.initChart(); }, methods: { initChart() { + Object.keys(this.chartData).forEach((key) => { + this.defaultOption[key] = this.chartData[key]; + }); const chartDom = document.getElementById('LineChartnew'); - this.chart = echarts.init(chartDom); - this.setOptions(this.chartData); - }, - setOptions(chartData) { + const myChart = echarts.init(chartDom); + myChart(this.defaultOption); + } + + /* setOptions(chartData) { console.log(chartData); let option = {}; const series = []; @@ -99,7 +112,7 @@ export default { series: series }; option && this.chart.setOption(option); - } + }*/ } }; diff --git a/src/views/index.vue b/src/views/index.vue index 469dac2..82f5926 100644 --- a/src/views/index.vue +++ b/src/views/index.vue @@ -58,7 +58,7 @@ - + @@ -84,9 +84,11 @@ const goTarget = (url: string) => { window.open(url, '__blank'); }; const indexObj = ref(); +const lineChartsShow = ref(false); const LinechartData = ref({ color: 'red', xAxisData: [], + legend: {}, series: [ { name: '用户量', data: [] }, { name: '在线用户', data: [] }, @@ -105,6 +107,7 @@ const getList = async () => { LinechartData.value.series[2].data.push(item.addCartMemberCount); LinechartData.value.series[3].data.push(item.dealMemberCount); }); + lineChartsShow.value = true; }; onMounted(() => { getList(); diff --git a/src/views/trade/withdrawManage/index.vue b/src/views/trade/withdrawManage/index.vue new file mode 100644 index 0000000..e79dd3b --- /dev/null +++ b/src/views/trade/withdrawManage/index.vue @@ -0,0 +1,265 @@ + + diff --git a/vite.config.ts b/vite.config.ts index 6b26aad..a697801 100644 --- a/vite.config.ts +++ b/vite.config.ts @@ -25,10 +25,10 @@ export default defineConfig(({ mode, command }) => { open: true, proxy: { [env.VITE_APP_BASE_API]: { - // target: 'http://192.168.1.13:8080', + // target: 'http://192.168.1.38:8080', // target: 'http://192.168.1.32:8080', //佳豪 - // target: 'http://192.168.1.13:8080', //祥哥 - target: 'http://111.62.22.190:8080', // 测试环境 + target: 'http://192.168.1.30:8080', //祥哥 + // target: 'http://111.62.22.190:8080', // 测试环境 changeOrigin: true, ws: true, rewrite: (path) => path.replace(new RegExp('^' + env.VITE_APP_BASE_API), ''),