Procházet zdrojové kódy

add dateTime search

EthnaYeh %!s(int64=7) %!d(string=před) roky
rodič
revize
8f1fd812c2

+ 7 - 2
src/api/gambleMember.js

@@ -38,7 +38,12 @@ export function createGambleMember(data) {
38 38
 export function fetchHistory(data, query) {
39 39
   return request({
40 40
     url: `/gambleMembers/${data.id}/history`,
41
-    method: 'get'
42
-    // params: {}
41
+    method: 'get',
42
+    params: {
43
+      limit: query.limit,
44
+      offset: (query.page - 1) * query.limit,
45
+      startAt: query.startAt,
46
+      endAt: query.endAt
47
+    }
43 48
   })
44 49
 }

+ 1 - 1
src/views/gambleGameBucket/detail/index.vue

@@ -342,7 +342,7 @@ export default {
342 342
       this.getList()
343 343
     },
344 344
     moment(time) {
345
-      return moment(time).tz("Asia/Taipei").format('YYYY-MM-DD HH:mm:ss')
345
+      return moment(time).tz('Asia/Taipei').format('YYYY-MM-DD HH:mm:ss')
346 346
     },
347 347
     moneyColor(money) {
348 348
       return money >= 0 ? { color: '#67C23A' } : { color: '#FA5555' }

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

@@ -116,7 +116,7 @@ export default {
116 116
       this.getList()
117 117
     },
118 118
     moment(time) {
119
-      return moment(time).tz("Asia/Taipei").format('YYYY-MM-DD HH:mm:ss')
119
+      return moment(time).tz('Asia/Taipei').format('YYYY-MM-DD HH:mm:ss')
120 120
       // return time
121 121
     }
122 122
   }

+ 21 - 6
src/views/gambleMember/history/index.vue

@@ -33,7 +33,7 @@
33 33
       </el-table-column>
34 34
       <el-table-column label="時間" align="center">
35 35
         <template slot-scope="scope">
36
-          <span>{{scope.row['GambleGame-Bucket'].createdAt}}</span>
36
+          <span>{{moment(scope.row['GambleGame-Bucket'].createdAt)}}</span>
37 37
         </template>
38 38
       </el-table-column>
39 39
       <el-table-column align="center" label="操作">
@@ -60,6 +60,12 @@ export default {
60 60
     return {
61 61
       list: null,
62 62
       listLoading: true,
63
+      listQuery: {
64
+        page: 1,
65
+        limit: 20,
66
+        startAt: null,
67
+        endAt: null,
68
+      },
63 69
       pickerOptions: {
64 70
           shortcuts: [{
65 71
             text: '最近一周',
@@ -87,7 +93,7 @@ export default {
87 93
             }
88 94
           }]
89 95
         },
90
-      date: ''
96
+      date: null
91 97
     }
92 98
   },
93 99
   created() {
@@ -101,18 +107,27 @@ export default {
101 107
     ]),
102 108
     fetchData() {
103 109
       this.listLoading = true
104
-      fetchHistory(this.member).then(response => {
110
+      fetchHistory(this.member, this.listQuery).then(response => {
105 111
         this.list = response.data
106 112
         this.listLoading = false
107 113
       })
108 114
     },
109 115
     handleFilter() {
110
-      console.log(moment.utc(this.date[0]).format())
111
-      console.log(moment.utc(this.date[1]).format())      
116
+      if(this.date) {
117
+        this.listQuery.startAt = moment.utc(this.date[0]).format()
118
+        this.listQuery.endAt = moment.utc(this.date[1]).format()
119
+      }else {
120
+        this.listQuery.startAt = null
121
+        this.listQuery.endAt = null
122
+      }
123
+      this.fetchData()      
112 124
     },
113 125
     handleDetail() {
114 126
       
115
-    }
127
+    },
128
+    moment(time) {
129
+      return moment(time).tz("Asia/Taipei").format('YYYY-MM-DD HH:mm:ss')
130
+    },
116 131
   },
117 132
   destroyed() {
118 133
     this.SetVisible(true)