diff --git a/common/enum.js b/common/enum.js index 73230e3..7f54d4f 100644 --- a/common/enum.js +++ b/common/enum.js @@ -10,25 +10,31 @@ if(curMYush == 0) { } const dateRangeList = [ - { title: '本周', val: 1, + { title: '今天', val: 1, + range: [ + dayjs().format(formatStr), + dayjs().format(formatStr) + ], + }, + { title: '本周', val: 2, range: [ dayjs().startOf('week').add(-6, 'day').format(formatStr), dayjs().endOf('week').add(-6, 'day').format(formatStr) ], }, - { title: '当月', val: 2, + { title: '当月', val: 3, range: [ dayjs().startOf('month').format(formatStr), dayjs().endOf('month').format(formatStr) ], }, - { title: '本季度', val: 3, + { title: '本季度', val: 4, range: [ dayjs().month((curMonth - curMYush)).startOf('month').format(formatStr), dayjs().month(curMonth + (3 - curMYush) - 1).endOf('month').format(formatStr) ], }, - { title: '本年度', val: 4, + { title: '本年度', val: 5, range: [ dayjs().startOf('year').format(formatStr), dayjs().endOf('year').format(formatStr) diff --git a/manifest.json b/manifest.json index dfe57dc..931624a 100644 --- a/manifest.json +++ b/manifest.json @@ -3,7 +3,7 @@ "appid" : "__UNI__BCB0FB5", "description" : "探路国际速运", "versionName" : "1.0.1", - "versionCode" : "1056", + "versionCode" : "1057", "transformPx" : false, /* 5+App特有相关 */ "app-plus" : { diff --git a/pages/user/bunsStatic.vue b/pages/user/bunsStatic.vue index 8c24be1..147ac9b 100644 --- a/pages/user/bunsStatic.vue +++ b/pages/user/bunsStatic.vue @@ -83,6 +83,7 @@