| 
				
			 | 
			
			
				@@ -102,32 +102,32 @@ 
			 | 
		
	
		
			
			| 
				102
			 | 
			
				102
			 | 
			
			
				           </el-table-column> --> 
			 | 
		
	
		
			
			| 
				103
			 | 
			
				103
			 | 
			
			
				           <el-table-column label="莊家總投注量抽水" align="center"> 
			 | 
		
	
		
			
			| 
				104
			 | 
			
				104
			 | 
			
			
				             <template slot-scope="scope"> 
			 | 
		
	
		
			
			| 
				105
			 | 
			
				
			 | 
			
			
				-              <span>{{0}}</span> 
			 | 
		
	
		
			
			| 
				
			 | 
			
				105
			 | 
			
			
				+              <span>{{scope.row.bookieWagerFee}}</span> 
			 | 
		
	
		
			
			| 
				106
			 | 
			
				106
			 | 
			
			
				             </template> 
			 | 
		
	
		
			
			| 
				107
			 | 
			
				107
			 | 
			
			
				           </el-table-column> 
			 | 
		
	
		
			
			| 
				108
			 | 
			
				108
			 | 
			
			
				           <el-table-column label="莊家總投注量退水" align="center"> 
			 | 
		
	
		
			
			| 
				109
			 | 
			
				109
			 | 
			
			
				             <template slot-scope="scope"> 
			 | 
		
	
		
			
			| 
				110
			 | 
			
				
			 | 
			
			
				-              <span>{{scope.row.bookieWagerFee}}</span> 
			 | 
		
	
		
			
			| 
				
			 | 
			
				110
			 | 
			
			
				+              <span>{{scope.row.bookieWagerFee * this.data.secondLayer.feeRatio/100}}</span> 
			 | 
		
	
		
			
			| 
				111
			 | 
			
				111
			 | 
			
			
				             </template> 
			 | 
		
	
		
			
			| 
				112
			 | 
			
				112
			 | 
			
			
				           </el-table-column> 
			 | 
		
	
		
			
			| 
				113
			 | 
			
				113
			 | 
			
			
				           <el-table-column label="莊家總抽水" align="center"> 
			 | 
		
	
		
			
			| 
				114
			 | 
			
				114
			 | 
			
			
				             <template slot-scope="scope"> 
			 | 
		
	
		
			
			| 
				115
			 | 
			
				
			 | 
			
			
				-              <span>{{0}}</span> 
			 | 
		
	
		
			
			| 
				
			 | 
			
				115
			 | 
			
			
				+              <span>{{scope.row.bookieServiceFees}}</span> 
			 | 
		
	
		
			
			| 
				116
			 | 
			
				116
			 | 
			
			
				             </template> 
			 | 
		
	
		
			
			| 
				117
			 | 
			
				117
			 | 
			
			
				           </el-table-column> 
			 | 
		
	
		
			
			| 
				118
			 | 
			
				118
			 | 
			
			
				           <el-table-column label="莊家退水" align="center"> 
			 | 
		
	
		
			
			| 
				119
			 | 
			
				119
			 | 
			
			
				             <template slot-scope="scope"> 
			 | 
		
	
		
			
			| 
				120
			 | 
			
				
			 | 
			
			
				-              <span>{{scope.row.bookieServiceFees}}</span> 
			 | 
		
	
		
			
			| 
				
			 | 
			
				120
			 | 
			
			
				+              <span>{{scope.row.bookieServiceFees * this.data.secondLayer.feeRatio/100}}</span> 
			 | 
		
	
		
			
			| 
				121
			 | 
			
				121
			 | 
			
			
				             </template> 
			 | 
		
	
		
			
			| 
				122
			 | 
			
				122
			 | 
			
			
				           </el-table-column> 
			 | 
		
	
		
			
			| 
				123
			 | 
			
				123
			 | 
			
			
				           <el-table-column label="閒家總抽水" align="center"> 
			 | 
		
	
		
			
			| 
				124
			 | 
			
				124
			 | 
			
			
				             <template slot-scope="scope"> 
			 | 
		
	
		
			
			| 
				125
			 | 
			
				
			 | 
			
			
				-              <span>{{0}}</span> 
			 | 
		
	
		
			
			| 
				
			 | 
			
				125
			 | 
			
			
				+              <span>{{scope.row.memberServiceFees}}</span> 
			 | 
		
	
		
			
			| 
				126
			 | 
			
				126
			 | 
			
			
				             </template> 
			 | 
		
	
		
			
			| 
				127
			 | 
			
				127
			 | 
			
			
				           </el-table-column> 
			 | 
		
	
		
			
			| 
				128
			 | 
			
				128
			 | 
			
			
				           <el-table-column label="閒家退水" align="center"> 
			 | 
		
	
		
			
			| 
				129
			 | 
			
				129
			 | 
			
			
				             <template slot-scope="scope"> 
			 | 
		
	
		
			
			| 
				130
			 | 
			
				
			 | 
			
			
				-              <span>{{scope.row.memberServiceFees}}</span> 
			 | 
		
	
		
			
			| 
				
			 | 
			
				130
			 | 
			
			
				+              <span>{{scope.row.memberServiceFees * this.data.secondLayer.feeRatio/100}}</span> 
			 | 
		
	
		
			
			| 
				131
			 | 
			
				131
			 | 
			
			
				             </template> 
			 | 
		
	
		
			
			| 
				132
			 | 
			
				132
			 | 
			
			
				           </el-table-column> 
			 | 
		
	
		
			
			| 
				133
			 | 
			
				133
			 | 
			
			
				           <el-table-column label="總退水" align="center"> 
			 | 
		
	
	
		
			
			| 
				
			 | 
			
			
				@@ -253,18 +253,18 @@ export default { 
			 | 
		
	
		
			
			| 
				253
			 | 
			
				253
			 | 
			
			
				               return Math.abs(item.earned) 
			 | 
		
	
		
			
			| 
				254
			 | 
			
				254
			 | 
			
			
				             }); 
			 | 
		
	
		
			
			| 
				255
			 | 
			
				255
			 | 
			
			
				             console.log('membeEarned', row.memberEarned) 
			 | 
		
	
		
			
			| 
				256
			 | 
			
				
			 | 
			
			
				-            row.memberServiceFees = _.sumBy(bookie.false, 'serviceFees')*this.data.secondLayer.feeRatio/100; 
			 | 
		
	
		
			
			| 
				
			 | 
			
				256
			 | 
			
			
				+            row.memberServiceFees = _.sumBy(bookie.false, 'serviceFees'); 
			 | 
		
	
		
			
			| 
				257
			 | 
			
				257
			 | 
			
			
				           } 
			 | 
		
	
		
			
			| 
				258
			 | 
			
				258
			 | 
			
			
				           if (bookie.true) { 
			 | 
		
	
		
			
			| 
				259
			 | 
			
				259
			 | 
			
			
				             row.bookieWagerFee = _.sumBy(bookie.true, (item) => { 
			 | 
		
	
		
			
			| 
				260
			 | 
			
				260
			 | 
			
			
				               return item.wagerServiceFees 
			 | 
		
	
		
			
			| 
				261
			 | 
			
				
			 | 
			
			
				-            }) * this.data.secondLayer.feeRatio/100; 
			 | 
		
	
		
			
			| 
				
			 | 
			
				261
			 | 
			
			
				+            }); 
			 | 
		
	
		
			
			| 
				262
			 | 
			
				262
			 | 
			
			
				             console.log('eeee', bookie.true) 
			 | 
		
	
		
			
			| 
				263
			 | 
			
				263
			 | 
			
			
				             row.bookieEarned = _.sumBy(bookie.true, item => { 
			 | 
		
	
		
			
			| 
				264
			 | 
			
				264
			 | 
			
			
				               return Math.abs(item.earned) 
			 | 
		
	
		
			
			| 
				265
			 | 
			
				265
			 | 
			
			
				             }); 
			 | 
		
	
		
			
			| 
				266
			 | 
			
				266
			 | 
			
			
				             console.log('bookieEarned' , row.bookieEarned) 
			 | 
		
	
		
			
			| 
				267
			 | 
			
				
			 | 
			
			
				-            row.bookieServiceFees = _.sumBy(bookie.true, (item) => { return item.serviceFees})*this.data.secondLayer.feeRatio/100; 
			 | 
		
	
		
			
			| 
				
			 | 
			
				267
			 | 
			
			
				+            row.bookieServiceFees = _.sumBy(bookie.true, (item) => { return item.serviceFees}); 
			 | 
		
	
		
			
			| 
				268
			 | 
			
				268
			 | 
			
			
				           } 
			 | 
		
	
		
			
			| 
				269
			 | 
			
				269
			 | 
			
			
				           row.totalServiceFees = Number(new Decimal(row.bookieServiceFees).plus(row.memberServiceFees).plus(row.bookieWagerFee).valueOf()) 
			 | 
		
	
		
			
			| 
				270
			 | 
			
				270
			 | 
			
			
				           let chipsLog = _.groupBy(member.GambleMemberChipsLogs, 'type') 
			 |