bucket 6 years ago
parent
commit
1df41d48e5

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

131
       listQuery: {
131
       listQuery: {
132
         // page: 1,
132
         // page: 1,
133
         // limit: 20,
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
       pickerOptions: {
137
       pickerOptions: {
138
         shortcuts: [{
138
         shortcuts: [{
139
           text: '本週',
139
           text: '本週',
140
           onClick(picker) {
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
             picker.$emit('pick', [start, end])
143
             picker.$emit('pick', [start, end])
144
           }
144
           }
145
         }, {
145
         }, {
146
           text: '上週',
146
           text: '上週',
147
           onClick(picker) {
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
             picker.$emit('pick', [start, end])
150
             picker.$emit('pick', [start, end])
151
           }
151
           }
152
         }]
152
         }]

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

84
       listQuery: {
84
       listQuery: {
85
         page: 1,
85
         page: 1,
86
         limit: 20,
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
       dialogCreateFormVisible: false,
90
       dialogCreateFormVisible: false,
91
       dialogStatus: '',
91
       dialogStatus: '',

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

80
         shortcuts: [{
80
         shortcuts: [{
81
           text: '本週',
81
           text: '本週',
82
           onClick(picker) {
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
             picker.$emit('pick', [start, end])
85
             picker.$emit('pick', [start, end])
86
           }
86
           }
87
         }, {
87
         }, {
88
           text: '上週',
88
           text: '上週',
89
           onClick(picker) {
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
             picker.$emit('pick', [start, end])
92
             picker.$emit('pick', [start, end])
93
           }
93
           }
94
         }]
94
         }]

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

83
         shortcuts: [{
83
         shortcuts: [{
84
           text: '本週',
84
           text: '本週',
85
           onClick(picker) {
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
             picker.$emit('pick', [start, end])
88
             picker.$emit('pick', [start, end])
89
           }
89
           }
90
         }, {
90
         }, {
91
           text: '上週',
91
           text: '上週',
92
           onClick(picker) {
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
             picker.$emit('pick', [start, end])
95
             picker.$emit('pick', [start, end])
96
           }
96
           }
97
         }]
97
         }]

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

126
         shortcuts: [{
126
         shortcuts: [{
127
           text: '本週',
127
           text: '本週',
128
           onClick(picker) {
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
             picker.$emit('pick', [start, end])
131
             picker.$emit('pick', [start, end])
132
           }
132
           }
133
         }, {
133
         }, {
134
           text: '上週',
134
           text: '上週',
135
           onClick(picker) {
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
             picker.$emit('pick', [start, end])
138
             picker.$emit('pick', [start, end])
139
           }
139
           }
140
         }]
140
         }]

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

50
       listLoading: true,
50
       listLoading: true,
51
       bucket: '',
51
       bucket: '',
52
       listQuery: {
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
       temp: {},
56
       temp: {},
57
       pickerOptions: {
57
       pickerOptions: {
58
         shortcuts: [{
58
         shortcuts: [{
59
           text: '本週',
59
           text: '本週',
60
           onClick(picker) {
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
             picker.$emit('pick', [start, end])
63
             picker.$emit('pick', [start, end])
64
           }
64
           }
65
         }, {
65
         }, {
66
           text: '上週',
66
           text: '上週',
67
           onClick(picker) {
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
             picker.$emit('pick', [start, end])
70
             picker.$emit('pick', [start, end])
71
           }
71
           }
72
         }]
72
         }]