| 
				
			 | 
			
			
				@@ -243,7 +243,7 @@ export default { 
			 | 
		
	
		
			
			| 
				243
			 | 
			
				243
			 | 
			
			
				             row.bookieEarned = _.sumBy(bookie.true, 'earned'); 
			 | 
		
	
		
			
			| 
				244
			 | 
			
				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
			 | 
			
				247
			 | 
			
			
				           let chipsLog = _.groupBy(member.GambleMemberChipsLogs, 'type') 
			 | 
		
	
		
			
			| 
				248
			 | 
			
				248
			 | 
			
			
				           // console.log('type', chipsLog) 
			 | 
		
	
		
			
			| 
				249
			 | 
			
				249
			 | 
			
			
				           if (chipsLog['0'] || chipsLog['2']) { 
			 | 
		
	
	
		
			
			| 
				
			 | 
			
			
				@@ -271,15 +271,14 @@ export default { 
			 | 
		
	
		
			
			| 
				271
			 | 
			
				271
			 | 
			
			
				  
			 | 
		
	
		
			
			| 
				272
			 | 
			
				272
			 | 
			
			
				           this.combine.push(row) 
			 | 
		
	
		
			
			| 
				273
			 | 
			
				273
			 | 
			
			
				         }) 
			 | 
		
	
		
			
			| 
				274
			 | 
			
				
			 | 
			
			
				- 
			 | 
		
	
		
			
			| 
				
			 | 
			
				274
			 | 
			
			
				+        console.log('cimbine' , this.combine) 
			 | 
		
	
		
			
			| 
				275
			 | 
			
				275
			 | 
			
			
				         this.allCombine.push({ 
			 | 
		
	
		
			
			| 
				276
			 | 
			
				276
			 | 
			
			
				           name: this.data.secondLayer.GambleMember.name, 
			 | 
		
	
		
			
			| 
				277
			 | 
			
				277
			 | 
			
			
				           allUp: _.sumBy(this.combine, 'totalUp'), 
			 | 
		
	
		
			
			| 
				278
			 | 
			
				278
			 | 
			
			
				           allDown: _.sumBy(this.combine, 'totalDown'), 
			 | 
		
	
		
			
			| 
				279
			 | 
			
				279
			 | 
			
			
				           allChips: _.sumBy(this.combine, 'chips'), 
			 | 
		
	
		
			
			| 
				280
			 | 
			
				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
			 | 
			
				283
			 | 
			
			
				         this.listLoading = false 
			 | 
		
	
		
			
			| 
				285
			 | 
			
				284
			 | 
			
			
				       }) 
			 |