wallet

src/views/room/gameHistory/index.vue

     </div>
     <el-table :data="list" v-loading.body="listLoading" element-loading-text="Loading" border fit highlight-current-row>
       <el-table-column :label="member.name" align="center">
-        <el-table-column label="場次" align="center">
+        <el-table-column label="時間" align="center">
           <template slot-scope="scope">
-            {{scope.row.game}}
+            <span>{{moment(scope.row.createdAt)}}</span>
           </template>
         </el-table-column>
-        <el-table-column label="總押注" align="center">
+        <el-table-column label="事件" align="center">
           <template slot-scope="scope">
-            <span>{{scope.row.wager}}</span>
+            {{scope.row.type}}
           </template>
         </el-table-column>
-        <el-table-column label="總輸贏" align="center">
+        <el-table-column label="金額" align="center">
           <template slot-scope="scope">
-            <span :style="moneyColor(scope.row.earned)">{{scope.row.earned}}</span>
+            <span :style="moneyColor(scope.row.amount)">{{scope.row.amount}}</span>
           </template>
         </el-table-column>
-        <el-table-column label="時間" align="center">
+        <el-table-column label="錢包" align="center">
+          <template slot-scope="scope">
+            <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>{{moment(scope.row['GambleGame-Bucket'].createdAt)}}</span>
+            <span>{{scope.row.id}}</span>
           </template>
         </el-table-column>
         <el-table-column align="center" label="操作" width="250">
           <template slot-scope="scope">
-              <el-button type="primary" size="mini" icon="el-icon-tickets" @click="handlePersonDetail(scope.row)">個人明細</el-button>  
-              <el-button type="primary" size="mini" icon="el-icon-tickets" @click="handleGameDetail(scope.row)">此場明細</el-button>                
+              <el-button v-show="scope.row.type==='遊戲'" type="primary" size="mini" icon="el-icon-tickets" @click="handlePersonDetail(scope.row)">個人明細</el-button>  
+              <el-button v-show="scope.row.type==='遊戲'" type="primary" size="mini" icon="el-icon-tickets" @click="handleGameDetail(scope.row)">此場明細</el-button>                
           </template>
         </el-table-column>
       </el-table-column>      
 <script>
 
 import { mapActions, mapGetters } from 'vuex'
-import { fetchGameHistory, fetchPersonGameDetail } from '@/api/gambleMember'
+import { fetchGameHistory, fetchChipsHistory, fetchPersonGameDetail } from '@/api/gambleMember'
 import waves from '@/directive/waves' // 水波纹指令
 import moment from 'moment-timezone'
+import config from '../../../../config' 
+import _ from 'lodash'
 
 export default {
   directives: {
   },
   data() {
     return {
-      list: null,
+      chipLogList: [],
+      gameRecordList: [],   
+      list: [],   
       dialogList: null,
       total: null,
       listLoading: true,
     getList() {
       this.listLoading = true
       fetchGameHistory(this.member, this.listQuery).then(response => {
-        this.list = response.data
-        this.total = response.data.length
+        this.chipLogList = response.data
+        this.chipLogList.map((item) => {
+          this.list.push({
+            id: item.game,
+            createdAt: item['GambleGame-Bucket'].createdAt,
+            type: '遊戲',
+            amount: item.earned,
+            wallet: 'N/A'
+          })
+        })
+        this.listLoading = false
+      })
+      fetchChipsHistory(this.member, this.listQuery).then(response => {
+        this.gameRecordList = response.data
+        this.gameRecordList.map((item) => {
+          this.list.push({
+            id: item.id,
+            createdAt: item.createdAt,
+            type: item.type === config.const.GambleMemberChipsLog.type.deposit ? '上 / 下 分':'獎勵 / 懲罰',
+            amount: item.chips,
+            wallet: item.totalChips
+          })
+        })
+        this.list.sort(function compare(a, b) {
+          const dateA = new Date(a.createdAt);
+          const dateB = new Date(b.createdAt);
+          return  dateB - dateA;
+        });
+
         this.listLoading = false
       })
+      
     },
     handlePersonDetail(row) {
       this.listLoading = true
       this.dialogFormVisible = true
-      fetchPersonGameDetail(this.member.id, row['GambleGame-Bucket'].id).then(response => {
+      fetchPersonGameDetail(this.member.id, row.id).then(response => {
         this.dialogList = response.data.rows
         this.listLoading = false
       })