diff --git a/src/components/HeaderTop.vue b/src/components/HeaderTop.vue index 7c061ea..092627f 100644 --- a/src/components/HeaderTop.vue +++ b/src/components/HeaderTop.vue @@ -281,12 +281,6 @@ export default { path: "/marketDynamics", name: "incomeDetail", }, - { - text: "奖金来源", - id: 3, - path: "/marketDynamics", - name: "bonusSource", - }, { text: "考核明细", id: 4, diff --git a/src/components/investment.vue b/src/components/investment.vue index 5b526f3..321ebac 100644 --- a/src/components/investment.vue +++ b/src/components/investment.vue @@ -47,8 +47,8 @@ @@ -178,54 +178,6 @@ export default { return { navIndex: 1, changeTypeList: [], - navList: [ - { name: "直推列表", path: "/pushList?id=6" }, - { name: "三单循环", path: "/investment?id=6" }, - { name: "免费注册", path: "/fansList?id=6" }, - ], - marketList: [ - { - text: "月度业绩", - id: 0, - path: "/marketDynamics", - }, - { - text: "活动专区", - id: 7, - path: "/activeZone", - }, - { - text: "奖金明细", - id: 1, - path: "/incomeDetail", - }, - { - text: "奖金来源", - id: 3, - path: "/bonusSource", - }, - // { - // text: "云代奖金", - // id: 2, - // path: "/", - // }, - - { - text: "考核明细", - id: 4, - path: "/appraisal", - }, - { - text: "注册列表", - id: 5, - path: "/registration", - }, - { - text: "招商列表", - id: 6, - path: "/investment", - }, - ], specialArea: 0, thetime: "", tableData: [], @@ -269,7 +221,7 @@ export default { path: href, }); }, - chongzhi() { + resetHandle() { this.queryParams = { pageNum: 1, pageSize: 50, @@ -380,7 +332,7 @@ export default { cursor: pointer; } .actArea { - color: #00417C; + color: #00417c; } } .topbox { @@ -394,16 +346,6 @@ export default { display: flex; align-items: center; margin-left: 25px; - .btn1 { - background: #cccccc; - border-radius: 5px 5px 5px 5px; - color: #ffffff; - } - .btn2 { - border-radius: 5px 5px 5px 5px; - background: rgba(214, 24, 32, 1); - color: #ffffff; - } } } .tablebox { diff --git a/src/components/marketDynamics/bonusSource.vue b/src/components/marketDynamics/bonusSource.vue index b45b7a3..be19e03 100644 --- a/src/components/marketDynamics/bonusSource.vue +++ b/src/components/marketDynamics/bonusSource.vue @@ -1,13 +1,15 @@ - - - - \ No newline at end of file + diff --git a/src/components/marketDynamics/incomeDetail.vue b/src/components/marketDynamics/incomeDetail.vue index 6ef545a..059fb78 100644 --- a/src/components/marketDynamics/incomeDetail.vue +++ b/src/components/marketDynamics/incomeDetail.vue @@ -1,140 +1,139 @@ - - - - \ No newline at end of file + diff --git a/src/components/marketDynamics/investment.vue b/src/components/marketDynamics/investment.vue index 8fa2de5..28505a0 100644 --- a/src/components/marketDynamics/investment.vue +++ b/src/components/marketDynamics/investment.vue @@ -1,25 +1,25 @@ \ No newline at end of file + diff --git a/src/components/marketDynamics/marketDynamicss.vue b/src/components/marketDynamics/marketDynamicss.vue index dba1348..5aaac2c 100644 --- a/src/components/marketDynamics/marketDynamicss.vue +++ b/src/components/marketDynamics/marketDynamicss.vue @@ -72,7 +72,7 @@
-
{{ '最末节点' }}
+
{{ "最末节点" }}
@@ -97,27 +97,25 @@
-
{{ '新增业绩' }}
-
{{ '近30日' }}
+
{{ "新增业绩" }}
+
{{ "近30日" }}
- -
+ +
-
{{ '业绩分布' }}
+
{{ "业绩分布" }}
- -
- - + + - - + - - + - - +
-
{{ '月度新增业绩对比' }}
+
{{ "月度新增业绩对比" }}
-
-
{{ '活跃会员对比' }}
+
{{ "活跃会员对比" }}
-
{{ '直推业绩' }}
+
{{ "直推业绩" }}
@@ -326,7 +323,7 @@ border-radius: 10px 10px 0 0; " > - {{ '推荐列表' }} + {{ "推荐列表" }}
@@ -491,36 +488,36 @@ export default { disabledDate: "", navList: [ { - name: '月度业绩', + name: "月度业绩", menuKey: "", value: "ConsanguinityCheck", }, // { name: '最末节点', menuKey: "", value: "placementChart" }, // { name: '月度新增统计', menuKey: "", value: "monthlyChart" }, - { name: '数据查询', menuKey: "", value: "monthlyPerformance" }, + { name: "数据查询", menuKey: "", value: "monthlyPerformance" }, // { name: '推荐平均用时', menuKey: "", value: "recommendTime" }, - { name: '直推业绩', menuKey: "", value: "recommendPerformance" }, - { name: '推荐列表', menuKey: "", value: "recommendList" }, + { name: "直推业绩", menuKey: "", value: "recommendPerformance" }, + { name: "推荐列表", menuKey: "", value: "recommendList" }, ], marketList: [ { - text: '数据查询', + text: "数据查询", id: 0, path: "/marketDynamics", }, { - text: '活动专区', + text: "活动专区", id: 7, path: "/activeZone", }, { - text: '奖金明细', + text: "奖金明细", id: 1, path: "/incomeDetail", }, { - text: '奖金来源', + text: "奖金来源", id: 3, path: "/bonusSource", }, @@ -530,17 +527,17 @@ export default { // path: "/generation", // }, { - text: '考核明细', + text: "考核明细", id: 4, path: "/appraisal", }, { - text: '注册列表', + text: "注册列表", id: 5, path: "/registration", }, { - text: '招商列表', + text: "招商列表", id: 6, path: "/investment", }, @@ -561,51 +558,51 @@ export default { mounthList: [ { value: 1, - label: 1 + '月', + label: 1 + "月", }, { value: 2, - label: 2 + '月', + label: 2 + "月", }, { value: 3, - label: 3 + '月', + label: 3 + "月", }, { value: 4, - label: 4 + '月', + label: 4 + "月", }, { value: 5, - label: 5 + '月', + label: 5 + "月", }, { value: 6, - label: 6 + '月', + label: 6 + "月", }, { value: 7, - label: 7 + '月', + label: 7 + "月", }, { value: 8, - label: 8 + '月', + label: 8 + "月", }, { value: 9, - label: 9 + '月', + label: 9 + "月", }, { value: 10, - label: 10 + '月', + label: 10 + "月", }, { value: 11, - label: 11 + '月', + label: 11 + "月", }, { value: 12, - label: 12 + '月', + label: 12 + "月", }, ], fgkhDate: "", @@ -616,9 +613,12 @@ export default { themonth: null, pickerOptions: { disabledDate(time) { - return time.getFullYear() < new Date().getFullYear() - 1 || time.getFullYear() > new Date().getFullYear(); - } - } + return ( + time.getFullYear() < new Date().getFullYear() - 1 || + time.getFullYear() > new Date().getFullYear() + ); + }, + }, }; }, watch: { @@ -788,7 +788,6 @@ export default { return days; }, navTap(index) { - console.log("dianji", index); this.navIndex = index; if (index == 1) { this.getDayType(); @@ -1058,7 +1057,7 @@ export default { cursor: pointer; } .actArea { - color: #00417C; + color: #00417c; } } .topbox { diff --git a/src/components/marketDynamics/registration.vue b/src/components/marketDynamics/registration.vue index 7fb13b7..a8ffcbf 100644 --- a/src/components/marketDynamics/registration.vue +++ b/src/components/marketDynamics/registration.vue @@ -6,17 +6,18 @@ - + - + @@ -47,12 +48,10 @@ @@ -171,22 +170,22 @@ export default { return { marketList: [ { - text: '月度业绩', + text: "月度业绩", id: 0, path: "/marketDynamics", }, { - text: '活动专区', + text: "活动专区", id: 7, path: "/activeZone", }, { - text: '奖金明细', + text: "奖金明细", id: 1, path: "/incomeDetail", }, { - text: '奖金来源', + text: "奖金来源", id: 3, path: "/bonusSource", }, @@ -197,17 +196,17 @@ export default { // }, { - text: '考核明细', + text: "考核明细", id: 4, path: "/appraisal", }, { - text: '注册列表', + text: "注册列表", id: 5, path: "/registration", }, { - text: '招商列表', + text: "招商列表", id: 6, path: "/investment", }, @@ -323,7 +322,7 @@ export default { cursor: pointer; } .actArea { - color: #00417C; + color: #00417c; } } .topbox { @@ -336,16 +335,6 @@ export default { .searchbox { display: flex; align-items: center; - .btn1 { - background: #cccccc; - border-radius: 5px 5px 5px 5px; - color: #ffffff; - } - .btn2 { - border-radius: 5px 5px 5px 5px; - background: rgba(214, 24, 32, 1); - color: #ffffff; - } } } .tablebox { diff --git a/src/components/pushList.vue b/src/components/pushList.vue index c6e6896..03330ea 100644 --- a/src/components/pushList.vue +++ b/src/components/pushList.vue @@ -41,12 +41,8 @@ @@ -193,7 +189,7 @@ export default { path: href, }); }, - chongzhi() { + resetHandle() { this.queryParams = { pageNum: 1, pageSize: 50, @@ -307,7 +303,7 @@ export default { cursor: pointer; } .actArea { - color: #00417C; + color: #00417c; } } .topbox { @@ -321,16 +317,6 @@ export default { display: flex; align-items: center; margin-left: 40px; - .btn1 { - background: #cccccc; - border-radius: 5px 5px 5px 5px; - color: #ffffff; - } - .btn2 { - border-radius: 5px 5px 5px 5px; - background: rgba(214, 24, 32, 1); - color: #ffffff; - } } } .tablebox { diff --git a/src/router/index.js b/src/router/index.js index 986a152..051bb8c 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -178,14 +178,14 @@ const routes = [ }, }, //奖金来源 - { - path: "/bonusSource", - name: "BonusSource", - component: () => import("@/views/marketDynamics/bonusSource.vue"), - meta: { - keepAlive: true, - }, - }, + // { + // path: "/bonusSource", + // name: "BonusSource", + // component: () => import("@/views/marketDynamics/bonusSource.vue"), + // meta: { + // keepAlive: true, + // }, + // }, //考核明细 { path: "/appraisal", diff --git a/src/styles/index.scss b/src/styles/index.scss index 6259c55..abea79a 100644 --- a/src/styles/index.scss +++ b/src/styles/index.scss @@ -2,7 +2,8 @@ --primary-color: #005BAC; /* 主题色 */ --highlight-color: #1E90FF; /* 替换 #b42b2a 的高亮/强调色 */ --price-color: #FF8C00; /* 商品价格颜色 */ - --button-hover-color: #1A75C8; /* 按钮悬停颜色 */ - --disabled-color: #B8CDE0; /* 禁用状态颜色 (基于主题色) */ + --button-hover-color: #1A75C8; /* 按钮悬停背景颜色 */ + --button-hover-text-color: #FFFFFF; /* 按钮悬停文字颜色 */ + --button-active-border-color: #004C8C; /* 按钮激活边框颜色 */ } diff --git a/src/views/marketDynamics/bonusSource.vue b/src/views/marketDynamics/bonusSource.vue index 766d644..562914c 100644 --- a/src/views/marketDynamics/bonusSource.vue +++ b/src/views/marketDynamics/bonusSource.vue @@ -3,29 +3,34 @@
- -
- - {{'返回'}} - {{'奖金来源'}} - -
-
+ +
+ + 返回 + 奖金来源 + +
+
- + - + - - + + - - + + - - - - - \ No newline at end of file + diff --git a/src/views/marketDynamics/index.vue b/src/views/marketDynamics/index.vue index 0dd3f39..d0be5df 100644 --- a/src/views/marketDynamics/index.vue +++ b/src/views/marketDynamics/index.vue @@ -29,7 +29,7 @@ @@ -41,21 +41,21 @@ - + + -