week fix

src/views/agnetManagement/gambleMemberManagement/index.vue

@@ -131,22 +131,22 @@ export default {
       listQuery: {
         // page: 1,
         // limit: 20,
-        startAt: moment.utc(moment().startOf('isoweek').subtract(1, 'weeks').day(7).hour(16).minute(0).second(0)).format(),
-        endAt: moment.utc(moment().startOf('isoweek').day(7).hour(11).minute(59).second(59)).format()
+        startAt: moment.utc(moment().day('sunday').hour(12).minute(0).second(0).subtract(1, 'weeks').day(7).hour(16).minute(0).second(0)).format(),
+        endAt: moment.utc(moment().day('sunday').hour(12).day(7).hour(11).minute(59).second(59)).format()
       },
       pickerOptions: {
         shortcuts: [{
           text: '本週',
           onClick(picker) {
-            const end = moment().startOf('isoweek').day(7).hour(11).minute(59).second(59)
-            const start = moment().startOf('isoweek').subtract(1, 'weeks').day(7).hour(16).minute(0).second(0)
+            const end = moment().day('sunday').hour(12).day(7).hour(11).minute(59).second(59)
+            const start = moment().day('sunday').hour(12).subtract(1, 'weeks').day(7).hour(16).minute(0).second(0)
             picker.$emit('pick', [start, end])
           }
         }, {
           text: '上週',
           onClick(picker) {
-            const end = moment().startOf('isoweek').subtract(1, 'weeks').day(7).hour(11).minute(59).second(59)
-            const start = moment().startOf('isoweek').subtract(2, 'weeks').day(7).hour(16).minute(0).second(0)
+            const end = moment().day('sunday').hour(12).subtract(1, 'weeks').day(7).hour(11).minute(59).second(59)
+            const start = moment().day('sunday').hour(12).subtract(2, 'weeks').day(7).hour(16).minute(0).second(0)
             picker.$emit('pick', [start, end])
           }
         }]

src/views/agnetManagement/index.vue

@@ -84,8 +84,8 @@ export default {
       listQuery: {
         page: 1,
         limit: 20,
-        startAt: moment.utc(moment().startOf('isoweek').subtract(1, 'weeks').day(7).hour(16).minute(0).second(0)).format(),
-        endAt: moment.utc(moment().startOf('isoweek').day(7).hour(11).minute(59).second(59)).format()
+        startAt: moment.utc(moment().day('sunday').hour(12).minute(0).second(0).subtract(1, 'weeks').day(7).hour(16).minute(0).second(0)).format(),
+        endAt: moment.utc(moment().day('sunday').hour(12).minute(0).second(0).day(7).hour(11).minute(59).second(59)).format()
       },
       dialogCreateFormVisible: false,
       dialogStatus: '',

src/views/gambleGameBucket/index.vue

@@ -80,15 +80,15 @@ export default {
         shortcuts: [{
           text: '本週',
           onClick(picker) {
-            const end = moment().startOf('isoweek').day(7).hour(11).minute(59).second(59)
-            const start = moment().startOf('isoweek').subtract(1, 'weeks').day(7).hour(16).minute(0).second(0)
+            const end = moment().day('sunday').hour(12).minute(0).second(0).day(7).hour(11).minute(59).second(59)
+            const start = moment().day('sunday').hour(12).minute(0).second(0).subtract(1, 'weeks').day(7).hour(16).minute(0).second(0)
             picker.$emit('pick', [start, end])
           }
         }, {
           text: '上週',
           onClick(picker) {
-            const end = moment().startOf('isoweek').subtract(1, 'weeks').day(7).hour(11).minute(59).second(59)
-            const start = moment().startOf('isoweek').subtract(2, 'weeks').day(7).hour(16).minute(0).second(0)
+            const end = moment().day('sunday').hour(12).minute(0).second(0).subtract(1, 'weeks').day(7).hour(11).minute(59).second(59)
+            const start = moment().day('sunday').hour(12).minute(0).second(0).subtract(2, 'weeks').day(7).hour(16).minute(0).second(0)
             picker.$emit('pick', [start, end])
           }
         }]

src/views/room/chipsHistory/index.vue

@@ -83,15 +83,15 @@ export default {
         shortcuts: [{
           text: '本週',
           onClick(picker) {
-            const end = moment().startOf('isoweek').day(7).hour(11).minute(59).second(59)
-            const start = moment().startOf('isoweek').subtract(1, 'weeks').day(7).hour(16).minute(0).second(0)
+            const end = moment().day('sunday').hour(12).minute(0).second(0).day(7).hour(11).minute(59).second(59)
+            const start = moment().day('sunday').hour(12).minute(0).second(0).subtract(1, 'weeks').day(7).hour(16).minute(0).second(0)
             picker.$emit('pick', [start, end])
           }
         }, {
           text: '上週',
           onClick(picker) {
-            const end = moment().startOf('isoweek').subtract(1, 'weeks').day(7).hour(11).minute(59).second(59)
-            const start = moment().startOf('isoweek').subtract(2, 'weeks').day(7).hour(16).minute(0).second(0)
+            const end = moment().day('sunday').hour(12).minute(0).second(0).subtract(1, 'weeks').day(7).hour(11).minute(59).second(59)
+            const start = moment().day('sunday').hour(12).minute(0).second(0).subtract(2, 'weeks').day(7).hour(16).minute(0).second(0)
             picker.$emit('pick', [start, end])
           }
         }]

src/views/room/gameHistory/index.vue

@@ -126,15 +126,15 @@ export default {
         shortcuts: [{
           text: '本週',
           onClick(picker) {
-            const end = moment().startOf('isoweek').day(7).hour(11).minute(59).second(59)
-            const start = moment().startOf('isoweek').subtract(1, 'weeks').day(7).hour(16).minute(0).second(0)
+            const end = moment().day('sunday').hour(12).minute(0).second(0).day(7).hour(11).minute(59).second(59)
+            const start = moment().day('sunday').hour(12).minute(0).second(0).subtract(1, 'weeks').day(7).hour(16).minute(0).second(0)
             picker.$emit('pick', [start, end])
           }
         }, {
           text: '上週',
           onClick(picker) {
-            const end = moment().startOf('isoweek').subtract(1, 'weeks').day(7).hour(11).minute(59).second(59)
-            const startAt = moment().startOf('isoweek').subtract(2, 'weeks').day(7).hour(16).minute(0).second(0)
+            const end = moment().day('sunday').hour(12).minute(0).second(0).subtract(1, 'weeks').day(7).hour(11).minute(59).second(59)
+            const startAt = moment().day('sunday').hour(12).minute(0).second(0).subtract(2, 'weeks').day(7).hour(16).minute(0).second(0)
             picker.$emit('pick', [start, end])
           }
         }]

src/views/studio/index.vue

@@ -50,23 +50,23 @@ export default {
       listLoading: true,
       bucket: '',
       listQuery: {
-        startAt: moment.utc(moment().startOf('isoweek').subtract(1, 'weeks').day(7).hour(16).minute(0).second(0)).format(),
-        endAt: moment.utc(moment().startOf('isoweek').day(7).hour(11).minute(59).second(59)).format()
+        startAt: moment.utc(moment().day('sunday').hour(12).minute(0).second(0).subtract(1, 'weeks').day(7).hour(16).minute(0).second(0)).format(),
+        endAt: moment.utc(moment().day('sunday').hour(12).minute(0).second(0).day(7).hour(11).minute(59).second(59)).format()
       },
       temp: {},
       pickerOptions: {
         shortcuts: [{
           text: '本週',
           onClick(picker) {
-            const end = moment().startOf('isoweek').day(7).hour(11).minute(59).second(59)
-            const start = moment().startOf('isoweek').subtract(1, 'weeks').day(7).hour(16).minute(0).second(0)
+            const end = moment().day('sunday').hour(12).minute(0).second(0).day(7).hour(11).minute(59).second(59)
+            const start = moment().day('sunday').hour(12).minute(0).second(0).subtract(1, 'weeks').day(7).hour(16).minute(0).second(0)
             picker.$emit('pick', [start, end])
           }
         }, {
           text: '上週',
           onClick(picker) {
-            const end = moment().startOf('isoweek').subtract(1, 'weeks').day(7).hour(11).minute(59).second(59)
-            const start = moment().startOf('isoweek').subtract(2, 'weeks').day(7).hour(16).minute(0).second(0)
+            const end = moment().day('sunday').hour(12).minute(0).second(0).subtract(1, 'weeks').day(7).hour(11).minute(59).second(59)
+            const start = moment().day('sunday').hour(12).minute(0).second(0).subtract(2, 'weeks').day(7).hour(16).minute(0).second(0)
             picker.$emit('pick', [start, end])
           }
         }]