modify datePicker

src/views/agnetManagement/gambleMemberManagement/index.vue

@@ -89,43 +89,17 @@ export default {
       },
       pickerOptions: {
         shortcuts: [{
-          text: '最近一周',
+          text: '本週',
           onClick(picker) {
-            const end = new Date()
-            const start = new Date()
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+            const end = moment().day(7).hour(11).minute(59).second(59)
+            const start = moment().subtract(1, 'weeks').day(7).hour(16).minute(0).second(0)
             picker.$emit('pick', [start, end])
           }
         }, {
-          text: '最近一個月',
+          text: '上週',
           onClick(picker) {
-            const end = new Date()
-            const start = new Date()
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
-            picker.$emit('pick', [start, end])
-          }
-        }, {
-          text: '最近三個月',
-          onClick(picker) {
-            const end = new Date()
-            const start = new Date()
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
-            picker.$emit('pick', [start, end])
-          }
-        }, {
-          text: '最近半年',
-          onClick(picker) {
-            const end = new Date()
-            const start = new Date()
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 180)
-            picker.$emit('pick', [start, end])
-          }
-        }, {
-          text: '最近一年',
-          onClick(picker) {
-            const end = new Date()
-            const start = new Date()
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 365)
+            const end = moment().subtract(1, 'weeks').day(7).hour(11).minute(59).second(59)
+            const start = moment().subtract(2, 'weeks').day(7).hour(16).minute(0).second(0)
             picker.$emit('pick', [start, end])
           }
         }]

src/views/gambleGameBucket/index.vue

@@ -78,43 +78,17 @@ export default {
       temp: {},
       pickerOptions: {
         shortcuts: [{
-          text: '最近一周',
+          text: '本週',
           onClick(picker) {
-            const end = new Date()
-            const start = new Date()
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+            const end = moment().day(7).hour(11).minute(59).second(59)
+            const start = moment().subtract(1, 'weeks').day(7).hour(16).minute(0).second(0)
             picker.$emit('pick', [start, end])
           }
         }, {
-          text: '最近一個月',
+          text: '上週',
           onClick(picker) {
-            const end = new Date()
-            const start = new Date()
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
-            picker.$emit('pick', [start, end])
-          }
-        }, {
-          text: '最近三個月',
-          onClick(picker) {
-            const end = new Date()
-            const start = new Date()
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
-            picker.$emit('pick', [start, end])
-          }
-        }, {
-          text: '最近半年',
-          onClick(picker) {
-            const end = new Date()
-            const start = new Date()
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 180)
-            picker.$emit('pick', [start, end])
-          }
-        }, {
-          text: '最近一年',
-          onClick(picker) {
-            const end = new Date()
-            const start = new Date()
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 365)
+            const end = moment().subtract(1, 'weeks').day(7).hour(11).minute(59).second(59)
+            const start = moment().subtract(2, 'weeks').day(7).hour(16).minute(0).second(0)
             picker.$emit('pick', [start, end])
           }
         }]

src/views/room/chipsHistory/index.vue

@@ -81,43 +81,17 @@ export default {
       },
       pickerOptions: {
         shortcuts: [{
-          text: '最近一周',
+          text: '本週',
           onClick(picker) {
-            const end = new Date()
-            const start = new Date()
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+            const end = moment().day(7).hour(11).minute(59).second(59)
+            const start = moment().subtract(1, 'weeks').day(7).hour(16).minute(0).second(0)
             picker.$emit('pick', [start, end])
           }
         }, {
-          text: '最近一個月',
+          text: '上週',
           onClick(picker) {
-            const end = new Date()
-            const start = new Date()
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
-            picker.$emit('pick', [start, end])
-          }
-        }, {
-          text: '最近三個月',
-          onClick(picker) {
-            const end = new Date()
-            const start = new Date()
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
-            picker.$emit('pick', [start, end])
-          }
-        }, {
-          text: '最近半年',
-          onClick(picker) {
-            const end = new Date()
-            const start = new Date()
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 180)
-            picker.$emit('pick', [start, end])
-          }
-        }, {
-          text: '最近一年',
-          onClick(picker) {
-            const end = new Date()
-            const start = new Date()
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 365)
+            const end = moment().subtract(1, 'weeks').day(7).hour(11).minute(59).second(59)
+            const start = moment().subtract(2, 'weeks').day(7).hour(16).minute(0).second(0)
             picker.$emit('pick', [start, end])
           }
         }]

src/views/room/gameHistory/index.vue

@@ -126,40 +126,15 @@ export default {
         shortcuts: [{
           text: '本週',
           onClick(picker) {
-            const end = moment().day(0).hour(0).minute(0).second(0)
-            const start = moment().day(7).hour(0).minute(0).second(0)
+            const end = moment().day(7).hour(11).minute(59).second(59)
+            const start = moment().subtract(1, 'weeks').day(7).hour(16).minute(0).second(0)
             picker.$emit('pick', [start, end])
           }
         }, {
-          text: '最近一個月',
+          text: '上週',
           onClick(picker) {
-            const end = new Date()
-            const start = new Date()
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
-            picker.$emit('pick', [start, end])
-          }
-        }, {
-          text: '最近三個月',
-          onClick(picker) {
-            const end = new Date()
-            const start = new Date()
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
-            picker.$emit('pick', [start, end])
-          }
-        }, {
-          text: '最近半年',
-          onClick(picker) {
-            const end = new Date()
-            const start = new Date()
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 180)
-            picker.$emit('pick', [start, end])
-          }
-        }, {
-          text: '最近一年',
-          onClick(picker) {
-            const end = new Date()
-            const start = new Date()
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 365)
+            const end = moment().subtract(1, 'weeks').day(7).hour(11).minute(59).second(59)
+            const start = moment().subtract(2, 'weeks').day(7).hour(16).minute(0).second(0)
             picker.$emit('pick', [start, end])
           }
         }]