add punishment

src/api/gambleMember.js

@@ -114,3 +114,10 @@ export function updateBelongAgent(member, agent) {
     }
   })
 }
+
+export function fetchPunishment(data) {
+  return request({
+    url: `/gambleMembers/${data.id}/punishment`,
+    method: 'get',
+  })
+}

src/views/room/gameHistory/index.vue

@@ -49,11 +49,11 @@
         </el-table-column>      
       </el-table>
 
-      <div v-show="!listLoading" class="pagination-container">
+      <!-- <div v-show="!listLoading" class="pagination-container">
         <el-pagination background @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page.sync="listQuery.page"
           :page-sizes="[10,20,30, 50]" :page-size="listQuery.limit" layout="total, sizes, prev, pager, next, jumper" :total="total">
         </el-pagination>
-      </div>
+      </div> -->
 
       <el-dialog title="個人詳細資料" :visible.sync="dialogFormVisible" width="75%" center>
         <el-table :data="dialogList" v-loading.body="listLoading" element-loading-text="Loading" border fit highlight-current-row
@@ -96,7 +96,7 @@
 <script>
 
 import { mapActions, mapGetters } from 'vuex'
-import { fetchGameHistory, fetchChipsHistory, fetchPersonGameDetail } from '@/api/gambleMember'
+import { fetchGameHistory, fetchChipsHistory, fetchPersonGameDetail, fetchPunishment } from '@/api/gambleMember'
 import { fetchCurrentChips } from '@/api/gambleGameBucket'
 import waves from '@/directive/waves' // 水波纹指令
 import moment from 'moment-timezone'
@@ -117,7 +117,7 @@ export default {
       listLoading: true,
       listQuery: { 
         page: 1, 
-        limit: 20, 
+        limit: 9999999999, 
         startAt: null, 
         endAt: null 
       }, 
@@ -168,6 +168,7 @@ export default {
       this.listLoading = true
       //this.list = []
       await fetchGameHistory(this.data.thirdLayer, this.listQuery).then(response => {
+        this.list = []
         this.chipLogList = response.data
         this.tempCurrentChips = []
         this.chipLogList.map((item) => {
@@ -204,6 +205,17 @@ export default {
           })
         })
       })
+      await fetchPunishment(this.data.thirdLayer).then(response => {
+          response.data.map(item => {
+            this.list.unshift({
+              id: item.id,
+              createdAt: item.createdAt,
+              type: item.rule,
+              amount: item.chips,
+              wallet: ` `
+            })
+          })
+      })
       this.list.sort(function compare(a, b) {
         const dateA = new Date(a.createdAt);
         const dateB = new Date(b.createdAt);
@@ -216,6 +228,8 @@ export default {
       this.listLoading = true
       this.dialogFormVisible = true
       fetchPersonGameDetail(this.data.thirdLayer.id, row.id).then(response => {
+        console.log('params', this.data.thirdLayer.id, row.id)
+        console.log('rows', response.data.rows)
         this.dialogList = response.data.rows
         this.listLoading = false
       })
@@ -227,7 +241,7 @@ export default {
       this.SetData({layer:4, data: temp})
     },
     handleFilter() {
-      this.listQuery.page = 1 
+      // this.listQuery.page = 1 
       if (this.date) { 
         this.listQuery.startAt = moment.utc(this.date[0]).format() 
         this.listQuery.endAt = moment.utc(this.date[1]).format()  
@@ -237,14 +251,14 @@ export default {
       }
       this.getList()
     },
-    handleSizeChange(val) {
-      this.listQuery.limit = val
-      this.getList()
-    },
-    handleCurrentChange(val) {
-      this.listQuery.page = val
-      this.getList()
-    },
+    // handleSizeChange(val) {
+    //   this.listQuery.limit = val
+    //   this.getList()
+    // },
+    // handleCurrentChange(val) {
+    //   this.listQuery.page = val
+    //   this.getList()
+    // },
     moment(time) {
       return moment(time).tz('Asia/Taipei').format('YYYY-MM-DD HH:mm:ss')
     },