Browse Source

modify datePicker

Unknown 7 years ago
parent
commit
457a4ea98f

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

89
       },
89
       },
90
       pickerOptions: {
90
       pickerOptions: {
91
         shortcuts: [{
91
         shortcuts: [{
92
-          text: '最近一周',
92
+          text: '本週',
93
           onClick(picker) {
93
           onClick(picker) {
94
-            const end = new Date()
95
-            const start = new Date()
96
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
94
+            const end = moment().day(7).hour(11).minute(59).second(59)
95
+            const start = moment().subtract(1, 'weeks').day(7).hour(16).minute(0).second(0)
97
             picker.$emit('pick', [start, end])
96
             picker.$emit('pick', [start, end])
98
           }
97
           }
99
         }, {
98
         }, {
100
-          text: '最近一個月',
99
+          text: '上週',
101
           onClick(picker) {
100
           onClick(picker) {
102
-            const end = new Date()
103
-            const start = new Date()
104
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
105
-            picker.$emit('pick', [start, end])
106
-          }
107
-        }, {
108
-          text: '最近三個月',
109
-          onClick(picker) {
110
-            const end = new Date()
111
-            const start = new Date()
112
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
113
-            picker.$emit('pick', [start, end])
114
-          }
115
-        }, {
116
-          text: '最近半年',
117
-          onClick(picker) {
118
-            const end = new Date()
119
-            const start = new Date()
120
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 180)
121
-            picker.$emit('pick', [start, end])
122
-          }
123
-        }, {
124
-          text: '最近一年',
125
-          onClick(picker) {
126
-            const end = new Date()
127
-            const start = new Date()
128
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 365)
101
+            const end = moment().subtract(1, 'weeks').day(7).hour(11).minute(59).second(59)
102
+            const start = moment().subtract(2, 'weeks').day(7).hour(16).minute(0).second(0)
129
             picker.$emit('pick', [start, end])
103
             picker.$emit('pick', [start, end])
130
           }
104
           }
131
         }]
105
         }]

+ 6 - 32
src/views/gambleGameBucket/index.vue

78
       temp: {},
78
       temp: {},
79
       pickerOptions: {
79
       pickerOptions: {
80
         shortcuts: [{
80
         shortcuts: [{
81
-          text: '最近一周',
81
+          text: '本週',
82
           onClick(picker) {
82
           onClick(picker) {
83
-            const end = new Date()
84
-            const start = new Date()
85
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
83
+            const end = moment().day(7).hour(11).minute(59).second(59)
84
+            const start = moment().subtract(1, 'weeks').day(7).hour(16).minute(0).second(0)
86
             picker.$emit('pick', [start, end])
85
             picker.$emit('pick', [start, end])
87
           }
86
           }
88
         }, {
87
         }, {
89
-          text: '最近一個月',
88
+          text: '上週',
90
           onClick(picker) {
89
           onClick(picker) {
91
-            const end = new Date()
92
-            const start = new Date()
93
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
94
-            picker.$emit('pick', [start, end])
95
-          }
96
-        }, {
97
-          text: '最近三個月',
98
-          onClick(picker) {
99
-            const end = new Date()
100
-            const start = new Date()
101
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
102
-            picker.$emit('pick', [start, end])
103
-          }
104
-        }, {
105
-          text: '最近半年',
106
-          onClick(picker) {
107
-            const end = new Date()
108
-            const start = new Date()
109
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 180)
110
-            picker.$emit('pick', [start, end])
111
-          }
112
-        }, {
113
-          text: '最近一年',
114
-          onClick(picker) {
115
-            const end = new Date()
116
-            const start = new Date()
117
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 365)
90
+            const end = moment().subtract(1, 'weeks').day(7).hour(11).minute(59).second(59)
91
+            const start = moment().subtract(2, 'weeks').day(7).hour(16).minute(0).second(0)
118
             picker.$emit('pick', [start, end])
92
             picker.$emit('pick', [start, end])
119
           }
93
           }
120
         }]
94
         }]

+ 6 - 32
src/views/room/chipsHistory/index.vue

81
       },
81
       },
82
       pickerOptions: {
82
       pickerOptions: {
83
         shortcuts: [{
83
         shortcuts: [{
84
-          text: '最近一周',
84
+          text: '本週',
85
           onClick(picker) {
85
           onClick(picker) {
86
-            const end = new Date()
87
-            const start = new Date()
88
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
86
+            const end = moment().day(7).hour(11).minute(59).second(59)
87
+            const start = moment().subtract(1, 'weeks').day(7).hour(16).minute(0).second(0)
89
             picker.$emit('pick', [start, end])
88
             picker.$emit('pick', [start, end])
90
           }
89
           }
91
         }, {
90
         }, {
92
-          text: '最近一個月',
91
+          text: '上週',
93
           onClick(picker) {
92
           onClick(picker) {
94
-            const end = new Date()
95
-            const start = new Date()
96
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
97
-            picker.$emit('pick', [start, end])
98
-          }
99
-        }, {
100
-          text: '最近三個月',
101
-          onClick(picker) {
102
-            const end = new Date()
103
-            const start = new Date()
104
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
105
-            picker.$emit('pick', [start, end])
106
-          }
107
-        }, {
108
-          text: '最近半年',
109
-          onClick(picker) {
110
-            const end = new Date()
111
-            const start = new Date()
112
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 180)
113
-            picker.$emit('pick', [start, end])
114
-          }
115
-        }, {
116
-          text: '最近一年',
117
-          onClick(picker) {
118
-            const end = new Date()
119
-            const start = new Date()
120
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 365)
93
+            const end = moment().subtract(1, 'weeks').day(7).hour(11).minute(59).second(59)
94
+            const start = moment().subtract(2, 'weeks').day(7).hour(16).minute(0).second(0)
121
             picker.$emit('pick', [start, end])
95
             picker.$emit('pick', [start, end])
122
           }
96
           }
123
         }]
97
         }]

+ 5 - 30
src/views/room/gameHistory/index.vue

126
         shortcuts: [{
126
         shortcuts: [{
127
           text: '本週',
127
           text: '本週',
128
           onClick(picker) {
128
           onClick(picker) {
129
-            const end = moment().day(0).hour(0).minute(0).second(0)
130
-            const start = moment().day(7).hour(0).minute(0).second(0)
129
+            const end = moment().day(7).hour(11).minute(59).second(59)
130
+            const start = moment().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 = new Date()
137
-            const start = new Date()
138
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
139
-            picker.$emit('pick', [start, end])
140
-          }
141
-        }, {
142
-          text: '最近三個月',
143
-          onClick(picker) {
144
-            const end = new Date()
145
-            const start = new Date()
146
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
147
-            picker.$emit('pick', [start, end])
148
-          }
149
-        }, {
150
-          text: '最近半年',
151
-          onClick(picker) {
152
-            const end = new Date()
153
-            const start = new Date()
154
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 180)
155
-            picker.$emit('pick', [start, end])
156
-          }
157
-        }, {
158
-          text: '最近一年',
159
-          onClick(picker) {
160
-            const end = new Date()
161
-            const start = new Date()
162
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 365)
136
+            const end = moment().subtract(1, 'weeks').day(7).hour(11).minute(59).second(59)
137
+            const start = moment().subtract(2, 'weeks').day(7).hour(16).minute(0).second(0)
163
             picker.$emit('pick', [start, end])
138
             picker.$emit('pick', [start, end])
164
           }
139
           }
165
         }]
140
         }]