Merge branch 'master' of https://bitbucket.org/EthanYeh/gambleadmin

src/views/gambleGameBucket/detail/index.vue

@@ -25,7 +25,7 @@
           <el-table-column label="莊家" prop="MemberRecord.GambleMember.name"></el-table-column>
           <el-table-column label="點數">
             <template slot-scope="scope">
-              <span :style="pointColor(scope.row.DealingRecord.point1)">{{`${scope.row.DealingRecord.point1 === -1 ? '' : scope.row.DealingRecord.point1 + ' | '} ${scope.row.DealingRecord.point2 === -1 ? '' : scope.row.DealingRecord.point2 + ' / '} ${point(scope.row.DealingRecord)}`}}</span>
+              <span>{{`${scope.row.DealingRecord.point1 === -1 ? '' : scope.row.DealingRecord.point1 + ' | '} ${scope.row.DealingRecord.point2 === -1 ? '' : scope.row.DealingRecord.point2 + ' / '} ${point(scope.row.DealingRecord)}`}}</span>
             </template>
           </el-table-column>
           <el-table-column label="上莊分數">
@@ -61,6 +61,11 @@
               <div :style="moneyColor(scope.row.bookieResult)">{{scope.row.bookieResult}}</div>
             </template>
           </el-table-column>
+          <el-table-column label="檯面積分">
+            <template slot-scope="scope">
+              {{memberRecord[memberRecord.length-1][0].wager+scope.row.bookieResult}}
+              </template>    
+          </el-table-column> 
           <el-table-column label="最終積分">
             <template slot-scope="scope">
               <div>{{scope.row.currentChips}}</div>
@@ -157,6 +162,7 @@
             <div :style="moneyColor(scope.row.totalChips)">{{scope.row.totalChips}}</div>
           </template>
         </el-table-column>
+        <el-table-column label="檯面積分" prop="tablePoint"></el-table-column>         
         <el-table-column label="最終積分">
           <template slot-scope="scope">
             <div>{{scope.row.MemberRecord.currentChips}}</div>
@@ -251,6 +257,11 @@
               <div :style="moneyColor(scope.row.bookieResult)">{{scope.row.bookieResult}}</div>
             </template>
           </el-table-column>
+          <el-table-column label="檯面積分">
+            <template slot-scope="scope">
+              {{memberRecord[memberRecord.length-1][0].wager+scope.row.bookieResult}}
+            </template>    
+          </el-table-column> 
           <el-table-column label="最終積分">
             <template slot-scope="scope">
               <div>{{scope.row.currentChips}}</div>
@@ -527,6 +538,8 @@ export default {
         this.bookie[0].currentChips = Number(this.bookie[0].MemberRecord.currentChips) + Number(this.bookie[0].MemberRecord.chips)
         this.bookie[0].bookieResult = this.bookie[0].MemberRecord.earned - this.bookie[0].MemberRecord.serviceFees - this.bookie[0].MemberRecord.wagerServiceFees -this.bookie[0].MemberRecord.FixedServiceFees
         // console.log('bookie', this.bookie[0].effectiveWagger)
+        // console.log('weqweqwe', this.bookie[0].bookieResult ,this.memberRecord[memberRecord.length-1][0].wager)
+        // this.bookie[0].tablePoint = this.bookie[0].bookieResult + this.memberRecord[memberRecord.length-1][0].wager
         this.group.map((item, itemIndex) => {
           let totalChips = 0
           item.map((person, personIndex) => {
@@ -671,9 +684,6 @@ export default {
         screenfull.request(document.getElementById('full'));
       }
     },
-    pointColor(data) {
-      return data === -1 ? { color: '#FA5555' } : ''
-    }
   },
   destroyed() {
     this.SetVisible(1)