diff --git a/src/components/super/RankingLeftMenu.vue b/src/components/super/RankingLeftMenu.vue index 12018f6..8b872c3 100644 --- a/src/components/super/RankingLeftMenu.vue +++ b/src/components/super/RankingLeftMenu.vue @@ -2,14 +2,13 @@ @@ -51,7 +50,7 @@ export default { }, { name: '月排行', - path: '/super/ranking/yearProfit', + path: '/super/ranking/monthProfit', desc: 'siteMessage2' }, ] @@ -63,17 +62,17 @@ export default { list: [ { name: '毛利润排行', - path: '/super/ranking/yearProfit', + path: '/super/ranking/checkProfit', desc: 'siteMessage4' }, { name: '订单数排行', - path: '/super/ranking/yearProfit', + path: '/super/ranking/checkOrdernum', desc: 'siteMessage5' }, { name: '退单数排行', - path: '/super/ranking/yearProfit', + path: '/super/ranking/checkRefund', desc: 'siteMessage6' }, ] @@ -85,17 +84,17 @@ export default { list: [ { name: '毛利润排行', - path: '/super/ranking/yearProfit', + path: '/super/ranking/agentProfit', desc: 'siteMessage9' }, { name: '充值排行', - path: '/super/ranking/yearProfit', + path: '/super/ranking/agentRecharge', desc: 'siteMessage10' }, { name: '新加盟', - path: '/super/ranking/yearProfit', + path: '/super/ranking/agentNew', desc: 'siteMessage11' }, ] @@ -163,13 +162,12 @@ export default { this.handleScroll() // 重置页面滚动高度 const dom = document.getElementById('main-content') - dom.scrollTop = 0 + if (dom) { + dom.scrollTop = 0 + } this.$router.push(path) } }, - activeArea(type) { - console.log(type); - }, setHighActive(dom) { this.scrollLock = true; const ele = document.getElementById(dom) diff --git a/src/router/index.js b/src/router/index.js index 94d1dc1..8ee1c21 100755 --- a/src/router/index.js +++ b/src/router/index.js @@ -8,9 +8,14 @@ import HomeView from '../views/HomeView.vue'; Vue.use(VueRouter) const whiteSlideList = ['/', '/ui', '/siteList']; //侧边导航白名单 const whiteHeaderList = ['/', '/ui', '/register', '/configureServicePrices', '/siteList','/siteSetting/siteBaseSetting','/siteSetting/sitePersonalization' - ,'/siteSetting/siteH5','/siteSetting/siteSem','/pageTemplete','/demo', '/super/ranking/yearProfit' + ,'/siteSetting/siteH5','/siteSetting/siteSem','/pageTemplete','/demo', + '/super/ranking/yearProfit', '/super/ranking/monthProfit', '/super/ranking/checkProfit', '/super/ranking/checkOrdernum', + '/super/ranking/checkRefund', '/super/ranking/agentProfit', '/super/ranking/agentRecharge', '/super/ranking/agentNew' ]; //头部导航白名单 -const whiteFooterList = ['/', '/ui', '/configureServicePrices', '/super/ranking/yearProfit']; //底部白名单 +const whiteFooterList = ['/', '/ui', '/configureServicePrices', + '/super/ranking/yearProfit', '/super/ranking/monthProfit', '/super/ranking/checkProfit', '/super/ranking/checkOrdernum', + '/super/ranking/checkRefund', '/super/ranking/agentProfit', '/super/ranking/agentRecharge', '/super/ranking/agentNew' +]; //底部白名单 const routes = [{ path: '/', name: '首页', @@ -121,50 +126,71 @@ const routes = [{ children: [ { path: '', // 默认子路由 - redirect: () => import( /* webpackChunkName: "Ranking" */ '../views/super/Ranking/YearProfit.vue') // 重定向到第一个页面 + redirect: () => import( /* webpackChunkName: "Ranking" */ '../views/super/Ranking/RankDetail.vue'), + props: {pageTitle:'总利润 - 年排行', rank_type: 1, type: 'year', showDateSelect: false} }, { path: 'yearProfit', name: '年排行', - component: () => import( /* webpackChunkName: "Ranking" */ '../views/super/Ranking/YearProfit.vue'), + component: () => import( /* webpackChunkName: "Ranking" */ '../views/super/Ranking/RankDetail.vue'), + props: {pageTitle:'总利润 - 年排行', rank_type: 1, type: 'year', showDateSelect: false} }, { path: 'monthProfit', name: '月排行', - component: () => import( /* webpackChunkName: "Ranking" */ '../views/super/Ranking/YearProfit.vue') + component: () => import( /* webpackChunkName: "Ranking" */ '../views/super/Ranking/RankDetail.vue'), + props: {pageTitle:'总利润 - 月排行', rank_type: 1, type: 'month', showDateSelect: true} }, { path: 'checkProfit', name: '毛利润排行', - component: () => import( /* webpackChunkName: "Ranking" */ '../views/super/Ranking/YearProfit.vue') + component: () => import( /* webpackChunkName: "Ranking" */ '../views/super/Ranking/RankBatchList.vue'), + props: {pageTitle:'产品 - 毛利润排行', rank_type: 1, type: 'check_type'} }, { path: 'checkOrdernum', name: '订单数排行', - component: () => import( /* webpackChunkName: "Ranking" */ '../views/super/Ranking/YearProfit.vue') + component: () => import( /* webpackChunkName: "Ranking" */ '../views/super/Ranking/RankBatchList.vue'), + props: {pageTitle:'产品 - 订单数排行', rank_type: 2, type: 'check_type'} }, { path: 'checkRefund', name: '退单数排行', - redirect: () => import( /* webpackChunkName: "Ranking" */ '../views/super/Ranking/YearProfit.vue') + component: () => import( /* webpackChunkName: "Ranking" */ '../views/super/Ranking/RankList.vue'), + props: {pageTitle:'产品 - 退单数排行', rank_type: 3, type: 'check_type'} }, { path: 'agentProfit', name: '毛利润排行', - component: () => import( /* webpackChunkName: "Ranking" */ '../views/super/Ranking/YearProfit.vue') + component: () => import( /* webpackChunkName: "Ranking" */ '../views/super/Ranking/RankBatchList.vue'), + props: {pageTitle:'代理商 - 毛利润排行', rank_type: 1, type: 'agent'} }, { path: 'agentRecharge', name: '充值排行', - component: () => import( /* webpackChunkName: "Ranking" */ '../views/super/Ranking/YearProfit.vue') + component: () => import( /* webpackChunkName: "Ranking" */ '../views/super/Ranking/RankBatchList.vue'), + props: {pageTitle:'代理商 - 充值排行', rank_type: 4, type: 'agent'} }, { path: 'agentNew', name: '新加盟', - redirect: () => import( /* webpackChunkName: "Ranking" */ '../views/super/Ranking/YearProfit.vue') + component: () => import( /* webpackChunkName: "Ranking" */ '../views/super/Ranking/RankDetail.vue'), + props: {pageTitle:'代理商 - 新加盟', type: 'agentnew', showDateSelect: false} }, ] }, + { + path: '/super/ranking/detail', + name: '详情', + component: () => import( /* webpackChunkName: "Ranking" */ '../views/super/Ranking/RankDetail.vue'), + props: {rank_type: 1, type: 'day', showDateSelect: false} + }, + { + path: '/super/ranking/list', + name: '列表', + component: () => import( /* webpackChunkName: "Ranking" */ '../views/super/Ranking/RankList.vue'), + props: {} + }, ] const router = new VueRouter({ diff --git a/src/views/super/Ranking/RankBatchList.vue b/src/views/super/Ranking/RankBatchList.vue new file mode 100644 index 0000000..75cd8f9 --- /dev/null +++ b/src/views/super/Ranking/RankBatchList.vue @@ -0,0 +1,552 @@ + + + \ No newline at end of file diff --git a/src/views/super/Ranking/RankDetail.vue b/src/views/super/Ranking/RankDetail.vue new file mode 100644 index 0000000..0a7f463 --- /dev/null +++ b/src/views/super/Ranking/RankDetail.vue @@ -0,0 +1,479 @@ + + + \ No newline at end of file diff --git a/src/views/super/Ranking/YearProfit.vue b/src/views/super/Ranking/YearProfit.vue deleted file mode 100644 index 65f976f..0000000 --- a/src/views/super/Ranking/YearProfit.vue +++ /dev/null @@ -1,284 +0,0 @@ - - - \ No newline at end of file diff --git a/vue.config.js b/vue.config.js index 9950b59..f202172 100755 --- a/vue.config.js +++ b/vue.config.js @@ -1,5 +1,13 @@ const path = require('path'); module.exports = { + devServer: { + proxy: { + '/supernew': { + target: 'http://adminnew.pengda.checkcopy.com', + changeOrigin: true, + } + } + }, configureWebpack: { module: { rules: [