diff --git a/view/admin/src/api/statistic.js b/view/admin/src/api/statistic.js new file mode 100644 index 0000000..8513fbe --- /dev/null +++ b/view/admin/src/api/statistic.js @@ -0,0 +1,11 @@ +import request from './request' +/** + * @description 数据统计 + */ +export function getStatisticList(data) { + return request.get('statistics/all_data', data) +} +// 惠通宝转让记录 +export function getHuitongbao(data) { + return request.get('user/huitong_list', data) + } diff --git a/view/admin/src/router/index.js b/view/admin/src/router/index.js index 3a2cd34..c003a3f 100644 --- a/view/admin/src/router/index.js +++ b/view/admin/src/router/index.js @@ -39,6 +39,7 @@ import stationRouter from './modules/station' import serviceRouter from './modules/service' import communityRouter from './modules/community' import deliveryRouter from './modules/delivery' +import statisticRoute from './modules/statistic' export const constantRoutes = [ configRouter, @@ -64,6 +65,7 @@ export const constantRoutes = [ serviceRouter, communityRouter, deliveryRouter, + statisticRoute, { path: roterPre, component: Layout, diff --git a/view/admin/src/router/modules/statistic.js b/view/admin/src/router/modules/statistic.js new file mode 100644 index 0000000..1ca8515 --- /dev/null +++ b/view/admin/src/router/modules/statistic.js @@ -0,0 +1,26 @@ +import Layout from '@/layout' +import { roterPre } from '@/settings' +const statisticRoute = + { + path: `${roterPre}/dataStatistic`, + name: 'data_statistic', + meta: { + icon: 'dashboard', + title: '数据统计' + }, + alwaysShow: true, + component: Layout, + children: [ + { + path: 'statistic', + name: 'statistic', + meta: { + title: '数据统计', + noCache: true + }, + component: () => import('@/views/dataStatistic/statistic') + }, + + ] + } +export default statisticRoute diff --git a/view/admin/src/views/dataStatistic/statistic.vue b/view/admin/src/views/dataStatistic/statistic.vue new file mode 100644 index 0000000..3073dad --- /dev/null +++ b/view/admin/src/views/dataStatistic/statistic.vue @@ -0,0 +1,159 @@ + + + 导出数据统计 + + + {{item.title}} + + + {{p.name}} + {{huitong[p.countText]}} + {{welfare[p.countText]}} + {{consume[p.countText]}} + {{contribution[p.countText]}} + {{share_point[p.countText]}} + + + + + + + + \ No newline at end of file diff --git a/view/admin/src/views/marketing/platformCoupon/couponList/index.vue b/view/admin/src/views/marketing/platformCoupon/couponList/index.vue index b2aeec2..1a8d3b3 100644 --- a/view/admin/src/views/marketing/platformCoupon/couponList/index.vue +++ b/view/admin/src/views/marketing/platformCoupon/couponList/index.vue @@ -469,9 +469,9 @@ /> - - - + + + @@ -590,6 +590,12 @@ export default { this.getList(1); }, methods: { + openHandle(){ + this.$nextTick(()=>{ + + this.$refs.tableShop.clearSelection() + }) + }, handleSelectionChange(val){ this.multipleSelection = val.map(item=>{ diff --git a/view/admin/src/views/user/huitongbao/index.vue b/view/admin/src/views/user/huitongbao/index.vue index e8a2a8f..aa53bb8 100644 --- a/view/admin/src/views/user/huitongbao/index.vue +++ b/view/admin/src/views/user/huitongbao/index.vue @@ -3,26 +3,38 @@ - 转让记录/收款记录 + 赠送方手机号 查询 重置 - 惠通宝当前市值:10 + 惠通宝当前市值:{{huitong}} - - - - + + + + + + + +