Browse Source

punishment display

bucket 6 years ago
parent
commit
591ebfc4d6

+ 2 - 2
src/views/agnetManagement/gambleMemberManagement/index.vue

54
           </el-table-column>
54
           </el-table-column>
55
       </el-table>
55
       </el-table>
56
       <el-table show-summary :summary-method="getSummaries" :data="combine" v-loading.body="listLoading" element-loading-text="Loading" border fit highlight-current-row>
56
       <el-table show-summary :summary-method="getSummaries" :data="combine" v-loading.body="listLoading" element-loading-text="Loading" border fit highlight-current-row>
57
-        <el-table-column :label="`${this.data.secondLayer.GambleMember.name}的會員`" align="center">
57
+        <el-table-column :label="`${(this.data.secondLayer.GambleMember.name).slice(19)}的會員`" align="center">
58
           <el-table-column label="名稱" align="center">
58
           <el-table-column label="名稱" align="center">
59
             <template slot-scope="scope">
59
             <template slot-scope="scope">
60
               <span>{{scope.row.name}}</span>
60
               <span>{{scope.row.name}}</span>
231
 
231
 
232
           row.totalServiceFees = Number(new Decimal(row.bookieServiceFees).plus(row.memberServiceFees).plus(row.bookieWagerFee).times(row.feeRatio).valueOf())
232
           row.totalServiceFees = Number(new Decimal(row.bookieServiceFees).plus(row.memberServiceFees).plus(row.bookieWagerFee).times(row.feeRatio).valueOf())
233
           let chipsLog = _.groupBy(member.GambleMemberChipsLogs, 'type')
233
           let chipsLog = _.groupBy(member.GambleMemberChipsLogs, 'type')
234
-          // console.log('type', chipsLog)
234
+          console.log('type', chipsLog)
235
           if (chipsLog['0'] || chipsLog['2']) {
235
           if (chipsLog['0'] || chipsLog['2']) {
236
             row.totalUp = _.sumBy(chipsLog['0'], (item) => { 
236
             row.totalUp = _.sumBy(chipsLog['0'], (item) => { 
237
               return item.chips > 0 ? item.chips : 0
237
               return item.chips > 0 ? item.chips : 0

+ 1 - 1
src/views/room/gameHistory/index.vue

211
               id: item.id,
211
               id: item.id,
212
               createdAt: item.createdAt,
212
               createdAt: item.createdAt,
213
               type: item.rule,
213
               type: item.rule,
214
-              amount: item.chips,
214
+              amount: (item.chips)*(-1),
215
               wallet: ` `
215
               wallet: ` `
216
             })
216
             })
217
           })
217
           })