diff --git a/package.json b/package.json index 384a29f..2bb1325 100644 --- a/package.json +++ b/package.json @@ -18,6 +18,7 @@ "@riophae/vue-treeselect": "^0.4.0", "axios": "0.18.1", "core-js": "3.6.5", + "dayjs": "^1.11.18", "echarts": "^5.4.2", "element-ui": "2.13.2", "file-saver": "^2.0.5", diff --git a/src/router/index.js b/src/router/index.js index aef5151..4fb308a 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -2755,12 +2755,12 @@ export const constantRoutes = [ component: () => import('@/views/statistics/underBalance'), meta: { title: '伞下账户余额' } }, - { - path: 'underDirectPushBox', - name: 'UnderDirectPushBox', - component: () => import('@/views/statistics/underDirectPushBox'), - meta: { title: '伞下直推新增盒数' } - }, + // { + // path: 'underDirectPushBox', + // name: 'UnderDirectPushBox', + // component: () => import('@/views/statistics/underDirectPushBox'), + // meta: { title: '伞下直推新增盒数' } + // }, { path: 'realPerAddAwards', name: 'RealPerAddAwards', diff --git a/src/utils/date.js b/src/utils/date.js new file mode 100644 index 0000000..8c0331e --- /dev/null +++ b/src/utils/date.js @@ -0,0 +1,24 @@ +import dayjs from 'dayjs' + +export function getBeforeDays(n = 1) { + return dayjs().subtract(n, 'day').format('YYYY-MM-DD') +} + +// 获取本月第一天 +export function getMonthFirstDay() { + return dayjs().startOf('month').format('YYYY-MM-DD') +} + +// 获取本月最后一天 +export function getMonthLastDay() { + return dayjs().endOf('month').format('YYYY-MM-DD') +} + +// 获取本月第一天和当前天前一天的日期,如果当天为本月第一天,则返回上月第一天和上月最后一天 +export function getMonthFirstDayAndBeforeDay() { + const isFirstDate = new Date().getDate() === 1 + if (isFirstDate) { + return [dayjs().add(-1, 'month').startOf('month').format('YYYY-MM-DD'), dayjs().add(-1, 'month').endOf('month').format('YYYY-MM-DD')] + } + return [getMonthFirstDay(), getBeforeDays(1)] +} diff --git a/src/views/framework/architecture/index.vue b/src/views/framework/architecture/index.vue index 03404b4..c9a904b 100644 --- a/src/views/framework/architecture/index.vue +++ b/src/views/framework/architecture/index.vue @@ -318,8 +318,8 @@ export default { {data.memberCode}
会员名称: {data.memberName}
- {data.parentId !== '0' &&
会员点位: - { data.pointMember }
} +
会员点位: + { data.pointMember }
) : ( diff --git a/src/views/information/member/index.vue b/src/views/information/member/index.vue index cbffd16..099936c 100644 --- a/src/views/information/member/index.vue +++ b/src/views/information/member/index.vue @@ -45,6 +45,22 @@ /> + + + + + + + + { + this.gradeRangList = res.data + }) + }, // 查询会员信息 getMemberList() { diff --git a/src/views/settlementCenter/bonusDetail/index.vue b/src/views/settlementCenter/bonusDetail/index.vue index c89d00d..309ec75 100644 --- a/src/views/settlementCenter/bonusDetail/index.vue +++ b/src/views/settlementCenter/bonusDetail/index.vue @@ -181,12 +181,12 @@ width="130" :label="'结算日期'" /> - + + + + + + + + diff --git a/src/views/settlementCenter/performanceTotal/index.vue b/src/views/settlementCenter/performanceTotal/index.vue index f9074c6..943f965 100644 --- a/src/views/settlementCenter/performanceTotal/index.vue +++ b/src/views/settlementCenter/performanceTotal/index.vue @@ -172,14 +172,14 @@ prop="upgradeAmount" :formatter="stateFormat" width="160" - :label="'甄选金额'" + :label="'复购金额'" /> + + + - + + + + + + + @@ -175,74 +170,63 @@ prop="shortName" :label="'国家'" min-width="120px" - > - + /> - + /> - + /> - + /> - + /> - + /> - + /> - + /> - + /> - + /> - + />