diff --git a/src/router/index.js b/src/router/index.js index 9429e72..fbb5d0b 100755 --- a/src/router/index.js +++ b/src/router/index.js @@ -10,7 +10,7 @@ const whiteSecondSider = [ const blackSliderList = [ '/franchise', '/agreement', '/customizeDoc', '/agent/siteAdd', '/agent/siteServiceList', '/agent/siteTemplate','/agent/siteAddFinally','/agent/siteServiceAdd', '/agent/supplyList', '/agent/domainList','/agent/siteAddChooseService' - , '/agent/noticeList' , '/agent/statisticalDetails', '/agent/siteRank', '/agent/serviceRank' + , '/agent/noticeList' , '/agent/expenseDetails', '/agent/siteRank', '/agent/serviceRank', '/agent/payoffDetails' ]; // 一级路由 let first_child_router = [] @@ -330,9 +330,9 @@ const routes = [{ } }, { - path: '/agent/statisticalDetails', + path: '/agent/expenseDetails', name: '站点月详情', - component: () => import( /* webpackChunkName: "statisticalDetails" */ '../views/agent/statisticalDetails.vue'), + component: () => import( /* webpackChunkName: "expenseDetails" */ '../views/agent/expenseDetails.vue'), meta: { breadcrumbParent: '收支统计' // 手动指定父级 } @@ -340,7 +340,7 @@ const routes = [{ { path: '/agent/siteRank', name: '站点排行', - component: () => import( /* webpackChunkName: "statisticalDetails" */ '../views/agent/statisticalDetails.vue'), + component: () => import( /* webpackChunkName: "expenseDetails" */ '../views/agent/expenseDetails.vue'), props: { rankFlag: 'site' }, @@ -351,7 +351,7 @@ const routes = [{ { path: '/agent/serviceRank', name: '服务排行', - component: () => import( /* webpackChunkName: "statisticalDetails" */ '../views/agent/statisticalDetails.vue'), + component: () => import( /* webpackChunkName: "expenseDetails" */ '../views/agent/expenseDetails.vue'), props: { rankFlag: 'chktype' }, @@ -362,7 +362,7 @@ const routes = [{ { path: '/agent/recharge', name: '账号充值', - component: () => import( /* webpackChunkName: "statisticalDetails" */ '../views/agent/recharge.vue'), + component: () => import( /* webpackChunkName: "recharge" */ '../views/agent/recharge.vue'), meta: { hideBreadcrumb: true // 一级页面不显示面包屑 } @@ -370,11 +370,19 @@ const routes = [{ { path: '/agent/payoff', name: '代收款结算', - component: () => import( /* webpackChunkName: "statisticalDetails" */ '../views/agent/payoff.vue'), + component: () => import( /* webpackChunkName: "payoff" */ '../views/agent/payoff.vue'), meta: { hideBreadcrumb: true // 一级页面不显示面包屑 } }, + { + path: '/agent/payoffDetails', + name: '核算订单记录', + component: () => import( /* webpackChunkName: "payoff" */ '../views/agent/payoffDetails.vue'), + meta: { + breadcrumbParent: '代收款结算' // 一级页面不显示面包屑 + } + }, // -----------------分隔符----------- diff --git a/src/views/agent/statisticalDetails.vue b/src/views/agent/expenseDetails.vue similarity index 100% rename from src/views/agent/statisticalDetails.vue rename to src/views/agent/expenseDetails.vue diff --git a/src/views/agent/expenseStatistics.vue b/src/views/agent/expenseStatistics.vue index 57e43fb..f771de9 100644 --- a/src/views/agent/expenseStatistics.vue +++ b/src/views/agent/expenseStatistics.vue @@ -227,12 +227,6 @@ export default { // GuipSelect, SvgIcon }, - props: { - total_type: { - type: String, - default: '1' - }, - }, data() { return { totalType:'1', @@ -250,7 +244,6 @@ export default { mounted() { const {total_type, date} = this.$route.query this.$nextTick(()=>{ - this.totalType = this.total_type; if(total_type)this.totalType = total_type; if(date) this.date = date; @@ -280,8 +273,8 @@ export default { this.handleClick() }, handleClickDetail(id){ - if(this.totalType == 2) this.$router.push(`/agent/statisticalDetails?uid=${id}&total_type=${this.totalType}&date=${this.date}`) - if(this.totalType == 3) this.$router.push(`/agent/statisticalDetails?chktype=${id}&total_type=${this.totalType}&date=${this.date}`) + if(this.totalType == 2) this.$router.push(`/agent/expenseDetails?uid=${id}&total_type=${this.totalType}&date=${this.date}`) + if(this.totalType == 3) this.$router.push(`/agent/expenseDetails?chktype=${id}&total_type=${this.totalType}&date=${this.date}`) }, handleClicksiteRank(id){ this.$router.push(`/agent/siteRank?id=${id}&total_type=${this.totalType}&date=`+this.date) diff --git a/src/views/agent/payoff.vue b/src/views/agent/payoff.vue index 169b0bb..d343901 100644 --- a/src/views/agent/payoff.vue +++ b/src/views/agent/payoff.vue @@ -11,15 +11,39 @@