Browse Source

fix display number

ethan 6 years ago
parent
commit
5ac2825ec0
1 changed files with 3 additions and 4 deletions
  1. 3 4
      src/views/agnetManagement/gambleMemberManagement/index.vue

+ 3 - 4
src/views/agnetManagement/gambleMemberManagement/index.vue

243
             row.bookieEarned = _.sumBy(bookie.true, 'earned');
243
             row.bookieEarned = _.sumBy(bookie.true, 'earned');
244
             row.bookieServiceFees = _.sumBy(bookie.true, (item) => { return item.serviceFees})*this.data.secondLayer.feeRatio/100;
244
             row.bookieServiceFees = _.sumBy(bookie.true, (item) => { return item.serviceFees})*this.data.secondLayer.feeRatio/100;
245
           }
245
           }
246
-          row.totalServiceFees = new Decimal(row.bookieServiceFees).plus(row.memberServiceFees).plus(row.bookieWagerFee).valueOf()
246
+          row.totalServiceFees = Number(new Decimal(row.bookieServiceFees).plus(row.memberServiceFees).plus(row.bookieWagerFee).valueOf())
247
           let chipsLog = _.groupBy(member.GambleMemberChipsLogs, 'type')
247
           let chipsLog = _.groupBy(member.GambleMemberChipsLogs, 'type')
248
           // console.log('type', chipsLog)
248
           // console.log('type', chipsLog)
249
           if (chipsLog['0'] || chipsLog['2']) {
249
           if (chipsLog['0'] || chipsLog['2']) {
271
 
271
 
272
           this.combine.push(row)
272
           this.combine.push(row)
273
         })
273
         })
274
-
274
+        console.log('cimbine' , this.combine)
275
         this.allCombine.push({
275
         this.allCombine.push({
276
           name: this.data.secondLayer.GambleMember.name,
276
           name: this.data.secondLayer.GambleMember.name,
277
           allUp: _.sumBy(this.combine, 'totalUp'),
277
           allUp: _.sumBy(this.combine, 'totalUp'),
278
           allDown: _.sumBy(this.combine, 'totalDown'),
278
           allDown: _.sumBy(this.combine, 'totalDown'),
279
           allChips: _.sumBy(this.combine, 'chips'),
279
           allChips: _.sumBy(this.combine, 'chips'),
280
           allEarned: _.sumBy(this.combine, (item) => {return item.bookieEarned + item.memberEarned}),
280
           allEarned: _.sumBy(this.combine, (item) => {return item.bookieEarned + item.memberEarned}),
281
-          allServiceFees: _.sumBy(this.combine, (item) => {return item.bookieServiceFees + item.
282
-          memberServiceFees}),
281
+          allServiceFees: _.sumBy(this.combine, (item) => {return item.totalServiceFees }),
283
         })
282
         })
284
         this.listLoading = false
283
         this.listLoading = false
285
       })
284
       })