/gambleGameBuckets/:gambleGameBucketId/currentChips

src/api/gambleGameBucket.js

@@ -84,6 +84,16 @@ export function fetchPunishmentRecord(data, query = { round: 1 }) {
     method: 'get'
   })
 }
+
+export function fetchCurrentChips(data, query) {
+  return request({
+    url: `/gambleGameBuckets/${data.id}/currentChips`,
+    method: 'get',
+    params: {
+      gambleMemberId: query.id
+    }
+  })
+}
 // export function fetchRoundRecord(data) {
 //   return request({
 //     url: `/gambleGameBuckets/${data.id}/initDoor`,

src/views/room/gameHistory/index.vue

@@ -38,11 +38,6 @@
               <span :style="moneyColor(scope.row.wallet)">{{scope.row.wallet}}</span>
             </template>
           </el-table-column>
-          <el-table-column label="ID" align="center">
-            <template slot-scope="scope">
-              <span>{{scope.row.id}}</span>
-            </template>
-          </el-table-column>
           <el-table-column align="center" label="操作" width="250">
             <template slot-scope="scope">
                 <el-button v-show="scope.row.type==='遊戲'" type="primary" size="mini" icon="el-icon-tickets" @click="handlePersonDetail(scope.row)">個人明細</el-button>  
@@ -99,6 +94,7 @@
 
 import { mapActions, mapGetters } from 'vuex'
 import { fetchGameHistory, fetchChipsHistory, fetchPersonGameDetail } from '@/api/gambleMember'
+import { fetchCurrentChips } from '@/api/gambleGameBucket'
 import waves from '@/directive/waves' // 水波纹指令
 import moment from 'moment-timezone'
 import config from '../../../../config' 
@@ -122,6 +118,7 @@ export default {
         startAt: null, 
         endAt: null 
       }, 
+      tempCurrentChips: [],
       pickerOptions: {
         shortcuts: [{
           text: '本週',
@@ -169,13 +166,17 @@ export default {
       this.list = []
       fetchGameHistory(this.data.thirdLayer, this.listQuery).then(response => {
         this.chipLogList = response.data
+        console.log('wallet', this.chipLogList,this.data.thirdLayer)
+        this.tempCurrentChips = []
         this.chipLogList.map((item) => {
-          this.list.push({
-            id: item.game,
-            createdAt: item['GambleGame-Bucket'].createdAt,
-            type: '遊戲',
-            amount: item.earned,
-            wallet: 'N/A'
+          fetchCurrentChips(item['GambleGame-Bucket'], this.data.thirdLayer).then(response => {
+            this.list.push({
+              id: item.game,
+              createdAt: item['GambleGame-Bucket'].createdAt,
+              type: '遊戲',
+              amount: item.earned,
+              wallet: response.data.currentChips
+            })
           })
         })
         this.listLoading = false
@@ -195,6 +196,9 @@ export default {
             wallet: item.totalChips
           })
         })
+
+      })
+      console.log('eeeesdsad',this.list)
         this.list.sort(function compare(a, b) {
           const dateA = new Date(a.createdAt);
           const dateB = new Date(b.createdAt);
@@ -202,7 +206,6 @@ export default {
         });
         this.total = this.list.length
         this.listLoading = false
-      })
       
     },
     handlePersonDetail(row) {