diff --git a/src/App.vue b/src/App.vue index 2c4bd27..528ffa9 100644 --- a/src/App.vue +++ b/src/App.vue @@ -27,6 +27,15 @@ export default { } \ No newline at end of file diff --git a/src/views/index_v1.vue b/src/views/index_v1.vue index 3501ecc..4b4b05e 100644 --- a/src/views/index_v1.vue +++ b/src/views/index_v1.vue @@ -5,28 +5,21 @@ OTC当日数据统计
- 时间 - 时间 + 搜索
- - - - +
Payment当日数据统计
- - - - - + @@ -37,7 +30,7 @@ import RaddarChart from './dashboard/RaddarChart' import PieChart from './dashboard/PieChart' import PieChartCreate from './dashboard/PieChartCreate' import BarChart from './dashboard/BarChart' -import { payGetMerchantTotalInfo } from "@/api/form"; +import { payGetMerchantTotalInfo,orderStatistics } from "@/api/form"; const lineChartData = { newVisitis: { @@ -74,6 +67,7 @@ export default { dateRange: [], queryParams: {}, info: {}, + statisticsData:{}, } }, created() { @@ -100,12 +94,16 @@ export default { getData() { payGetMerchantTotalInfo.getMerchantTotalInfo(this.addSESDateRange(this.queryParams, this.dateRange)).then(response => { this.info = response.data - this.info.beginTime=this.dateRange[0] - this.info.endTime=this.dateRange[1] + }); + payGetMerchantTotalInfo.orderStatistics(this.addSESDateRange(this.queryParams, this.dateRange)).then(response => { + this.statisticsData = response.data + this.statisticsData.beginTime=this.dateRange[0] + this.statisticsData.endTime=this.dateRange[1] }); }, /** 搜索按钮操作 */ handleQuery() { + this.getData() }, handleSetLineChartData(type) { this.lineChartData = lineChartData[type] @@ -119,6 +117,7 @@ export default { font-size: 16px; color: #333; font-weight: 500; + margin: initial !important; } .dashboard-editor-container { diff --git a/src/views/login.vue b/src/views/login.vue index f2a4f3a..9528261 100644 --- a/src/views/login.vue +++ b/src/views/login.vue @@ -128,7 +128,7 @@ export default { } }; - - + + + \ No newline at end of file diff --git a/src/views/otc/otcAppealOrder/index.vue b/src/views/otc/otcAppealOrder/index.vue index 66b81ef..e6db0c4 100644 --- a/src/views/otc/otcAppealOrder/index.vue +++ b/src/views/otc/otcAppealOrder/index.vue @@ -2,208 +2,175 @@
- + - - - - - - - - + + + + + + + + - - - + + + - - 搜索 - 重置 - - -
+ + 搜索 + 重置 + + +
-
+
- - - 新增 - - - 修改 - - - - - - - - - - - - - - 导出 - - - + + + + + + + + + + + + + + + 导出 + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
- - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -215,13 +182,9 @@ - - + + @@ -233,10 +196,11 @@ - - + + + 申诉成功 @@ -256,7 +220,7 @@ + + + + + \ No newline at end of file diff --git a/src/views/user/ad/index.vue b/src/views/user/ad/index.vue index 9746877..aed2f27 100644 --- a/src/views/user/ad/index.vue +++ b/src/views/user/ad/index.vue @@ -1,8 +1,9 @@