Game door table add door master

src/views/gambleGameBucket/detail/index.vue

@@ -21,37 +21,37 @@
       <el-table-column label="本期開獎" align="center"> 
         <el-table-column label="名稱">
           <template slot-scope="scope">
-            <span>{{scope.$index=== 0 ?"點數":"ddd"}}</span>
+            <span>{{scope.$index === 0 ?"點數":"門主"}}</span>
           </template>
         </el-table-column>   
         <el-table-column label="第一門">
           <template slot-scope="scope">
-            <span>{{doorTableSwitch(scope.$index, 1)}}</span>
+            <span>{{doorTableSwitch(scope.$index, 0)}}</span>
           </template>
         </el-table-column>
         <el-table-column label="第二門">
           <template slot-scope="scope">
-            <span>{{`${scope.row.point1_1} | ${scope.row.point2_1} / ${scope.row.totalPoints_1}`}}</span>
+            <span>{{doorTableSwitch(scope.$index, 1)}}</span>
           </template>
         </el-table-column>
         <el-table-column label="第三門">
           <template slot-scope="scope">
-            <span>{{`${scope.row.point1_2} | ${scope.row.point2_2} / ${scope.row.totalPoints_2}`}}</span>
+            <span>{{doorTableSwitch(scope.$index, 2)}}</span>
           </template>
         </el-table-column>
         <el-table-column label="第四門">
           <template slot-scope="scope">
-            <span>{{`${scope.row.point1_3} | ${scope.row.point2_3} / ${scope.row.totalPoints_3}`}}</span>
+            <span>{{doorTableSwitch(scope.$index, 3)}}</span>
           </template>
         </el-table-column>
         <el-table-column label="第五門">
           <template slot-scope="scope">
-            <span>{{`${scope.row.point1_4} | ${scope.row.point2_4} / ${scope.row.totalPoints_4}`}}</span>
+            <span>{{doorTableSwitch(scope.$index, 4)}}</span>
           </template>
         </el-table-column>
         <el-table-column label="第六門">
           <template slot-scope="scope">
-            <span>{{`${scope.row.point1_5} | ${scope.row.point2_5} / ${scope.row.totalPoints_5}`}}</span>
+            <span>{{doorTableSwitch(scope.$index, 5)}}</span>
           </template>
         </el-table-column>
       </el-table-column>      
@@ -216,13 +216,17 @@ export default {
         })
 
         const deal = {}
+        const member = {}        
         dealingTemp.map((record, index) => {
           deal[`door_${index % 6}`] = record.door
           deal[`point1_${index % 6}`] = record.point1
           deal[`point2_${index % 6}`] = record.point2
           deal[`totalPoints_${index % 6}`] = record.totalPoints
-          record.GambleMember ? deal[`member_${index % 6}`] = record.GambleMember.name : false
-          index % 6 === 5 ? this.dealing.push(deal) : false
+          record.GambleMember ? member[`member_${index % 6}`] = record.GambleMember.name : false
+          if( index % 6 === 5) {
+            this.dealing.push(deal)
+            this.dealing.push(member)
+          }
         })
       })
       fetchMemberRecords(this.bucket, this.listQuery).then(response => {
@@ -307,7 +311,7 @@ export default {
     getSummaries() {
       const sums = []
       this.memberRecord.map((group, index) => {
-        if (index === 0) sums[index] = '每門總押注'
+        if (index === 0) sums[index] = '總押注'
         let doorTotal = 0
         group.map((door) => {
           doorTotal += door.wager
@@ -326,14 +330,15 @@ export default {
     moneyColor(money) {
       return money >= 0 ? { color: '#67C23A' } : { color: '#FA5555' }
     },
+    // TODO refactor
     doorTableSwitch(rowIndex, colIndex) {
       console.log('sss',this.dealing)
       console.log(this.dealing[0][`point1_${colIndex}`])
       if(rowIndex === 0){
-        return this.dealing[`point1_${colIndex}`] + '|' + this.dealing[`point2_${colIndex}`] + '/' + this.dealing[`totalPoints_${colIndex}`]
+        return `${this.dealing[0][`point1_${colIndex}`]} | ${this.dealing[0][`point2_${colIndex}`]} / ${this.dealing[0][`totalPoints_${colIndex}`]}`
       }
       if(rowIndex === 1){
-        return 
+        return this.dealing[1][`member_${colIndex}`] ? `${this.dealing[1][`member_${colIndex}`]}` : 'N/A' 
       }
     },
     _sum(i) {