Parcourir la Source

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

bucket il y a 6 ans
Parent
commit
c9a9935f77
1 fichiers modifiés avec 14 ajouts et 4 suppressions
  1. 14 4
      src/views/gambleGameBucket/detail/index.vue

+ 14 - 4
src/views/gambleGameBucket/detail/index.vue

@@ -25,7 +25,7 @@
25 25
           <el-table-column label="莊家" prop="MemberRecord.GambleMember.name"></el-table-column>
26 26
           <el-table-column label="點數">
27 27
             <template slot-scope="scope">
28
-              <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>
28
+              <span>{{`${scope.row.DealingRecord.point1 === -1 ? '' : scope.row.DealingRecord.point1 + ' | '} ${scope.row.DealingRecord.point2 === -1 ? '' : scope.row.DealingRecord.point2 + ' / '} ${point(scope.row.DealingRecord)}`}}</span>
29 29
             </template>
30 30
           </el-table-column>
31 31
           <el-table-column label="上莊分數">
@@ -61,6 +61,11 @@
61 61
               <div :style="moneyColor(scope.row.bookieResult)">{{scope.row.bookieResult}}</div>
62 62
             </template>
63 63
           </el-table-column>
64
+          <el-table-column label="檯面積分">
65
+            <template slot-scope="scope">
66
+              {{memberRecord[memberRecord.length-1][0].wager+scope.row.bookieResult}}
67
+              </template>    
68
+          </el-table-column> 
64 69
           <el-table-column label="最終積分">
65 70
             <template slot-scope="scope">
66 71
               <div>{{scope.row.currentChips}}</div>
@@ -157,6 +162,7 @@
157 162
             <div :style="moneyColor(scope.row.totalChips)">{{scope.row.totalChips}}</div>
158 163
           </template>
159 164
         </el-table-column>
165
+        <el-table-column label="檯面積分" prop="tablePoint"></el-table-column>         
160 166
         <el-table-column label="最終積分">
161 167
           <template slot-scope="scope">
162 168
             <div>{{scope.row.MemberRecord.currentChips}}</div>
@@ -251,6 +257,11 @@
251 257
               <div :style="moneyColor(scope.row.bookieResult)">{{scope.row.bookieResult}}</div>
252 258
             </template>
253 259
           </el-table-column>
260
+          <el-table-column label="檯面積分">
261
+            <template slot-scope="scope">
262
+              {{memberRecord[memberRecord.length-1][0].wager+scope.row.bookieResult}}
263
+            </template>    
264
+          </el-table-column> 
254 265
           <el-table-column label="最終積分">
255 266
             <template slot-scope="scope">
256 267
               <div>{{scope.row.currentChips}}</div>
@@ -527,6 +538,8 @@ export default {
527 538
         this.bookie[0].currentChips = Number(this.bookie[0].MemberRecord.currentChips) + Number(this.bookie[0].MemberRecord.chips)
528 539
         this.bookie[0].bookieResult = this.bookie[0].MemberRecord.earned - this.bookie[0].MemberRecord.serviceFees - this.bookie[0].MemberRecord.wagerServiceFees -this.bookie[0].MemberRecord.FixedServiceFees
529 540
         // console.log('bookie', this.bookie[0].effectiveWagger)
541
+        // console.log('weqweqwe', this.bookie[0].bookieResult ,this.memberRecord[memberRecord.length-1][0].wager)
542
+        // this.bookie[0].tablePoint = this.bookie[0].bookieResult + this.memberRecord[memberRecord.length-1][0].wager
530 543
         this.group.map((item, itemIndex) => {
531 544
           let totalChips = 0
532 545
           item.map((person, personIndex) => {
@@ -671,9 +684,6 @@ export default {
671 684
         screenfull.request(document.getElementById('full'));
672 685
       }
673 686
     },
674
-    pointColor(data) {
675
-      return data === -1 ? { color: '#FA5555' } : ''
676
-    }
677 687
   },
678 688
   destroyed() {
679 689
     this.SetVisible(1)