TODO finish table

package.json

@@ -15,6 +15,7 @@
     "axios": "0.17.1",
     "element-ui": "2.0.5",
     "js-cookie": "2.2.0",
+    "lodash": "^4.17.4",
     "normalize.css": "7.0.0",
     "nprogress": "0.2.0",
     "vue": "2.5.9",

src/views/gambleGameBucket/detail/index.vue

@@ -2,21 +2,21 @@
 <div class="app-container calendar-list-container">
   <div class="app-container">
     <el-table :data="memberRecords" :span-method="objectSpanMethod" border style="width: 100% margin-top: 20px">
-      <el-table-column prop="id" label="玩家" width="180">
+      <el-table-column prop="GambleMember.name" label="玩家" width="180">
       </el-table-column>
-      <el-table-column prop="name" label="押">
+      <el-table-column prop="door" label="押">
       </el-table-column>
-      <el-table-column prop="amount1" label="點數">
+      <el-table-column prop="totalPoints" label="點數">
       </el-table-column>
-      <el-table-column prop="amount2" label="輸贏">
+      <el-table-column prop="earned" label="輸贏">
       </el-table-column>
       <el-table-column prop="amount3" label="抽水">
       </el-table-column>
-      <el-table-column prop="amount3" label="輸贏合計">
+      <el-table-column prop="sss" label="輸贏合計">
       </el-table-column>
       <el-table-column prop="amount3" label="福利">
       </el-table-column>
-      <el-table-column prop="amount3" label="最終積分">
+      <el-table-column prop="GambleMember.chips" label="最終積分">
       </el-table-column>
     </el-table>
   </div>
@@ -25,6 +25,7 @@
 
 <script>
 import { fetchList, fetchMemberRecords, fetchDealingRecords } from '@/api/gambleGameBucket'
+import _ from 'lodash'
 
 export default {
   data() {
@@ -32,8 +33,10 @@ export default {
       list: null,
       listLoading: true,
       total: null,
-      memberRecords: '',
-      dealingRecords: ''
+      memberRecords: [],
+      dealingRecords: [],
+      groupMember: [],
+      // Marray: [],
     }
   },
   props: [ 'bucket' ],
@@ -43,26 +46,39 @@ export default {
   methods: {
     getList() {
       this.listLoading = true
+      let memberTemp ,dealingTemp ,group 
       fetchMemberRecords(this.bucket).then(response => {
-        this.memberRecords = response.data.rows
-        // console.log(response.data.rows)
+        memberTemp = response.data.rows.filter(record => {
+          return record.door !== -1
+        })
+        group = _.groupBy(memberTemp, record => {
+          return record.GambleMember.name;
+        });
+        this.groupMember = _.values(group)
+        console.log('temp', this.groupMember)
+        memberTemp.map(record => {
+          this.memberRecords.push(record)
+        })
       })
       fetchDealingRecords(this.bucket).then(response => {
-        this.dealingRecords = response.data.rows
-        // console.log(response.data.rows)
-      })
-      console.log('wss', this.dealingRecords )
-      
-      this.dealingRecords.map(record => {
-          console.log('w',record)
+        dealingTemp = response.data.rows.filter(record => {
+          return record.door !== -1
+        })
+        response.data.rows.map(record => {
+          this.dealingRecords.push(record)
+        })
       })
+      console.log('memberRecords', this.memberRecords )
+      console.log('dealingRecords', this.dealingRecords)
+
       this.listLoading = false
     },
     objectSpanMethod({ row, column, rowIndex, columnIndex }) {
-      if (columnIndex === 0) {
-        if (rowIndex % 3 === 0) {
+      if (columnIndex === 0 || columnIndex === 4|| columnIndex === 5|| columnIndex === 6|| columnIndex === 7) {
+        this.groupMember
+        if (rowIndex % 6 === 0) {
           return {
-            rowspan: 3,
+            rowspan: 6,
             colspan: 1
           }
         } else {