bucket преди 6 години
родител
ревизия
1df41d48e5

+ 6 - 6
src/views/agnetManagement/gambleMemberManagement/index.vue

@@ -131,22 +131,22 @@ export default {
131 131
       listQuery: {
132 132
         // page: 1,
133 133
         // limit: 20,
134
-        startAt: moment.utc(moment().startOf('isoweek').subtract(1, 'weeks').day(7).hour(16).minute(0).second(0)).format(),
135
-        endAt: moment.utc(moment().startOf('isoweek').day(7).hour(11).minute(59).second(59)).format()
134
+        startAt: moment.utc(moment().day('sunday').hour(12).minute(0).second(0).subtract(1, 'weeks').day(7).hour(16).minute(0).second(0)).format(),
135
+        endAt: moment.utc(moment().day('sunday').hour(12).day(7).hour(11).minute(59).second(59)).format()
136 136
       },
137 137
       pickerOptions: {
138 138
         shortcuts: [{
139 139
           text: '本週',
140 140
           onClick(picker) {
141
-            const end = moment().startOf('isoweek').day(7).hour(11).minute(59).second(59)
142
-            const start = moment().startOf('isoweek').subtract(1, 'weeks').day(7).hour(16).minute(0).second(0)
141
+            const end = moment().day('sunday').hour(12).day(7).hour(11).minute(59).second(59)
142
+            const start = moment().day('sunday').hour(12).subtract(1, 'weeks').day(7).hour(16).minute(0).second(0)
143 143
             picker.$emit('pick', [start, end])
144 144
           }
145 145
         }, {
146 146
           text: '上週',
147 147
           onClick(picker) {
148
-            const end = moment().startOf('isoweek').subtract(1, 'weeks').day(7).hour(11).minute(59).second(59)
149
-            const start = moment().startOf('isoweek').subtract(2, 'weeks').day(7).hour(16).minute(0).second(0)
148
+            const end = moment().day('sunday').hour(12).subtract(1, 'weeks').day(7).hour(11).minute(59).second(59)
149
+            const start = moment().day('sunday').hour(12).subtract(2, 'weeks').day(7).hour(16).minute(0).second(0)
150 150
             picker.$emit('pick', [start, end])
151 151
           }
152 152
         }]

+ 2 - 2
src/views/agnetManagement/index.vue

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

+ 4 - 4
src/views/gambleGameBucket/index.vue

@@ -80,15 +80,15 @@ export default {
80 80
         shortcuts: [{
81 81
           text: '本週',
82 82
           onClick(picker) {
83
-            const end = moment().startOf('isoweek').day(7).hour(11).minute(59).second(59)
84
-            const start = moment().startOf('isoweek').subtract(1, 'weeks').day(7).hour(16).minute(0).second(0)
83
+            const end = moment().day('sunday').hour(12).minute(0).second(0).day(7).hour(11).minute(59).second(59)
84
+            const start = moment().day('sunday').hour(12).minute(0).second(0).subtract(1, 'weeks').day(7).hour(16).minute(0).second(0)
85 85
             picker.$emit('pick', [start, end])
86 86
           }
87 87
         }, {
88 88
           text: '上週',
89 89
           onClick(picker) {
90
-            const end = moment().startOf('isoweek').subtract(1, 'weeks').day(7).hour(11).minute(59).second(59)
91
-            const start = moment().startOf('isoweek').subtract(2, 'weeks').day(7).hour(16).minute(0).second(0)
90
+            const end = moment().day('sunday').hour(12).minute(0).second(0).subtract(1, 'weeks').day(7).hour(11).minute(59).second(59)
91
+            const start = moment().day('sunday').hour(12).minute(0).second(0).subtract(2, 'weeks').day(7).hour(16).minute(0).second(0)
92 92
             picker.$emit('pick', [start, end])
93 93
           }
94 94
         }]

+ 4 - 4
src/views/room/chipsHistory/index.vue

@@ -83,15 +83,15 @@ export default {
83 83
         shortcuts: [{
84 84
           text: '本週',
85 85
           onClick(picker) {
86
-            const end = moment().startOf('isoweek').day(7).hour(11).minute(59).second(59)
87
-            const start = moment().startOf('isoweek').subtract(1, 'weeks').day(7).hour(16).minute(0).second(0)
86
+            const end = moment().day('sunday').hour(12).minute(0).second(0).day(7).hour(11).minute(59).second(59)
87
+            const start = moment().day('sunday').hour(12).minute(0).second(0).subtract(1, 'weeks').day(7).hour(16).minute(0).second(0)
88 88
             picker.$emit('pick', [start, end])
89 89
           }
90 90
         }, {
91 91
           text: '上週',
92 92
           onClick(picker) {
93
-            const end = moment().startOf('isoweek').subtract(1, 'weeks').day(7).hour(11).minute(59).second(59)
94
-            const start = moment().startOf('isoweek').subtract(2, 'weeks').day(7).hour(16).minute(0).second(0)
93
+            const end = moment().day('sunday').hour(12).minute(0).second(0).subtract(1, 'weeks').day(7).hour(11).minute(59).second(59)
94
+            const start = moment().day('sunday').hour(12).minute(0).second(0).subtract(2, 'weeks').day(7).hour(16).minute(0).second(0)
95 95
             picker.$emit('pick', [start, end])
96 96
           }
97 97
         }]

+ 4 - 4
src/views/room/gameHistory/index.vue

@@ -126,15 +126,15 @@ export default {
126 126
         shortcuts: [{
127 127
           text: '本週',
128 128
           onClick(picker) {
129
-            const end = moment().startOf('isoweek').day(7).hour(11).minute(59).second(59)
130
-            const start = moment().startOf('isoweek').subtract(1, 'weeks').day(7).hour(16).minute(0).second(0)
129
+            const end = moment().day('sunday').hour(12).minute(0).second(0).day(7).hour(11).minute(59).second(59)
130
+            const start = moment().day('sunday').hour(12).minute(0).second(0).subtract(1, 'weeks').day(7).hour(16).minute(0).second(0)
131 131
             picker.$emit('pick', [start, end])
132 132
           }
133 133
         }, {
134 134
           text: '上週',
135 135
           onClick(picker) {
136
-            const end = moment().startOf('isoweek').subtract(1, 'weeks').day(7).hour(11).minute(59).second(59)
137
-            const startAt = moment().startOf('isoweek').subtract(2, 'weeks').day(7).hour(16).minute(0).second(0)
136
+            const end = moment().day('sunday').hour(12).minute(0).second(0).subtract(1, 'weeks').day(7).hour(11).minute(59).second(59)
137
+            const startAt = moment().day('sunday').hour(12).minute(0).second(0).subtract(2, 'weeks').day(7).hour(16).minute(0).second(0)
138 138
             picker.$emit('pick', [start, end])
139 139
           }
140 140
         }]

+ 6 - 6
src/views/studio/index.vue

@@ -50,23 +50,23 @@ export default {
50 50
       listLoading: true,
51 51
       bucket: '',
52 52
       listQuery: {
53
-        startAt: moment.utc(moment().startOf('isoweek').subtract(1, 'weeks').day(7).hour(16).minute(0).second(0)).format(),
54
-        endAt: moment.utc(moment().startOf('isoweek').day(7).hour(11).minute(59).second(59)).format()
53
+        startAt: moment.utc(moment().day('sunday').hour(12).minute(0).second(0).subtract(1, 'weeks').day(7).hour(16).minute(0).second(0)).format(),
54
+        endAt: moment.utc(moment().day('sunday').hour(12).minute(0).second(0).day(7).hour(11).minute(59).second(59)).format()
55 55
       },
56 56
       temp: {},
57 57
       pickerOptions: {
58 58
         shortcuts: [{
59 59
           text: '本週',
60 60
           onClick(picker) {
61
-            const end = moment().startOf('isoweek').day(7).hour(11).minute(59).second(59)
62
-            const start = moment().startOf('isoweek').subtract(1, 'weeks').day(7).hour(16).minute(0).second(0)
61
+            const end = moment().day('sunday').hour(12).minute(0).second(0).day(7).hour(11).minute(59).second(59)
62
+            const start = moment().day('sunday').hour(12).minute(0).second(0).subtract(1, 'weeks').day(7).hour(16).minute(0).second(0)
63 63
             picker.$emit('pick', [start, end])
64 64
           }
65 65
         }, {
66 66
           text: '上週',
67 67
           onClick(picker) {
68
-            const end = moment().startOf('isoweek').subtract(1, 'weeks').day(7).hour(11).minute(59).second(59)
69
-            const start = moment().startOf('isoweek').subtract(2, 'weeks').day(7).hour(16).minute(0).second(0)
68
+            const end = moment().day('sunday').hour(12).minute(0).second(0).subtract(1, 'weeks').day(7).hour(11).minute(59).second(59)
69
+            const start = moment().day('sunday').hour(12).minute(0).second(0).subtract(2, 'weeks').day(7).hour(16).minute(0).second(0)
70 70
             picker.$emit('pick', [start, end])
71 71
           }
72 72
         }]