add gameHistory detail index

src/router/index.js

@@ -82,7 +82,7 @@ export const constantRouterMap = [
                 },
                 children: [
                   {
-                    path: '/room/index/gambleMember/index/gameHistory/detail/index',
+                    path: '/room/index/gambleMember/index/gameHistory/index/detail/index',
                     name: 'bucketHistory',
                     component: _import('room/detail/index'),
                     hidden: true,
@@ -181,7 +181,6 @@ export const constantRouterMap = [
                   title: '歷史紀錄'
                   // role: ['dd']
                 }
-                
               }
             ]
           }

src/views/room/detail/index.vue

@@ -42,12 +42,14 @@
             <template slot-scope="scope">
                 <div>{{scope.row.MemberRecord.wagerServiceFees}}</div>
             </template>
-          </el-table-column>      
+          </el-table-column> 
+          <!-- 
           <el-table-column label="莊輸贏">
             <template slot-scope="scope">
               <div :style="moneyColor(scope.row.MemberRecord.earned)">{{scope.row.MemberRecord.earned}}</div>
             </template>
-          </el-table-column>     
+          </el-table-column>
+          -->
           <el-table-column label="莊贏抽水">
               <template slot-scope="scope">
                 <div>{{scope.row.MemberRecord.serviceFees}}</div>
@@ -57,7 +59,12 @@
             <template slot-scope="scope">
               <div :style="moneyColor(scope.row.bookieResult)">{{scope.row.bookieResult}}</div>
             </template>
-          </el-table-column>    
+          </el-table-column>
+          <el-table-column label="最終積分">
+            <template slot-scope="scope">
+              <div>{{scope.row.currentChips}}</div>
+            </template>
+          </el-table-column>  
         </el-table-column>             
       </el-table-column>                   
     </el-table>
@@ -177,37 +184,28 @@
 </template>
 
 <script>
-import { mapGetters, mapActions } from "vuex";
-import {
-  fetchDetails,
-  fetchRoundCount,
-  fetchDealingRecords,
-  fetchMemberRecords,
-  fetchRoundRecord,
-  fetchGameBid,
-  fetchWagerRecord,
-  fetchMemberInfo,
-  fetchPunishmentRecord
-} from "@/api/gambleGameBucket";
-import { fetchGambleMemberList } from "@/api/gambleMember";
-import { ponitTransform } from "@/utils/point";
-import _ from "lodash";
-import moment from "moment-timezone";
+
+import { mapGetters, mapActions } from 'vuex'
+import { fetchDetails, fetchRoundCount, fetchDealingRecords, fetchMemberRecords, fetchRoundRecord, fetchGameBid, fetchWagerRecord, fetchMemberInfo, fetchPunishmentRecord } from '@/api/gambleGameBucket'
+import { fetchGambleMemberList } from '@/api/gambleMember'
+import { ponitTransform } from '@/utils/point'
+import _ from 'lodash'
+import moment from 'moment-timezone'
 
 export default {
   data() {
     return {
       list: null,
       listLoading: true,
-      listQuery: {
-        round: 1
-      },
+      listQuery: { 
+        round: 1 
+      }, 
       detail: [],
       group: [],
-      statement: "",
+      statement: '',
       rowspan: 0,
       colspan: 0,
-      func: "",
+      func: '',
       rowIndex: 0,
       colIndex: 0,
       roundOptions: [],
@@ -220,290 +218,260 @@ export default {
       punishmentRecord: [],
       memberRecordTemp: [],
       wagerRecord: [],
-      roundTime: 0
-    };
+      roundTime: 0,
+    }
   },
-  created() {
+  async created() {
+    console.log('eqweqw')
+    await fetchRoundCount(this.data.fourLayer).then((response) => {
+      this.listQuery.round = response.data
+      for (let i = 1; i <= response.data; i++) {
+        this.roundOptions.push({ label: `第 ${i} 關`, key: i })
+      }
+    })
     fetchRoundRecord(this.data.fourLayer, this.listQuery).then(response => {
-      this.roundTime = response.data.createdAt;
-      this.door = response.data.initialDoor;
-    });
-    // fetchGameBid(this.data.secondLayer).then(response => {
+      this.roundTime = response.data.createdAt
+      this.door = response.data.initialDoor
+    })
+    // fetchGameBid(this.data.fourLayer).then(response => {
     //   this.bidChips = response.data
     // })
-    fetchRoundCount(this.data.fourLayer).then(response => {
-      this.listQuery.round = response.data;
-      for (let i = 1; i <= response.data; i++) {
-        this.roundOptions.push({ label: `第 ${i} 關`, key: i });
-      }
-    });
-    this.SetVisible(4);
-    this.getList();
+    this.SetVisible(4)
+    this.getList()
   },
   computed: {
     ...mapGetters([
-      "visible",
-      "data"
+      'visible',
+      'data',
       // 'query'
     ])
   },
   methods: {
     ...mapActions([
-      "SetVisible",
-      "SetData"
+      'SetVisible',
+      'SetData',
       // 'SetQuery'
     ]),
     getList() {
-      this.listLoading = true;
-      let detailTemp, dealingTemp, memberRecordTemp;
-      this.detail = [];
+      this.listLoading = true
+      let detailTemp, dealingTemp, memberRecordTemp
+      this.detail = []
       fetchWagerRecord(this.data.fourLayer, this.listQuery).then(response => {
-        this.wagerRecord = response.data;
-      });
-      fetchDealingRecords(this.data.fourLayer, this.listQuery).then(
-        response => {
-          dealingTemp = response.data.rows.filter(record => {
-            return record.door !== -1;
-          });
+        this.wagerRecord = response.data
+      })
+      fetchDealingRecords(this.data.fourLayer, this.listQuery).then(response => {
+        dealingTemp = response.data.rows.filter(record => {
+          return record.door !== -1
+        })
 
-          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
-              ? (member[`member_${index % 6}`] = record.GambleMember.name)
-              : false;
-            if (index % 6 === 5) {
-              this.dealing.push(deal);
-              this.dealing.push(member);
-            }
-          });
-        }
-      );
-      fetchMemberRecords(this.data.fourLayer, this.listQuery).then(
-        response => {
-          this.memberRecordTemp = response.data.rows;
-          let memberRecordTemp = _.groupBy(response.data.rows, record => {
-            return record.door;
-          });
-          this.memberRecord = Object.values(memberRecordTemp);
-        }
-      );
+        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 ? member[`member_${index % 6}`] = record.GambleMember.name : false
+          if (index % 6 === 5) {
+            this.dealing.push(deal)
+            this.dealing.push(member)
+          }
+        })
+      })
+      fetchMemberRecords(this.data.fourLayer, this.listQuery).then(response => {
+        this.memberRecordTemp = response.data.rows
+        let memberRecordTemp = _.groupBy(response.data.rows, record => {
+          return record.door
+        })
+        this.memberRecord = Object.values(memberRecordTemp )
+      })
       fetchDetails(this.data.fourLayer, this.listQuery).then(response => {
         detailTemp = response.data.rows.filter(record => {
-          return (
-            record.DealingRecord.door !== -1 &&
+          return record.DealingRecord.door !== -1 &&
             record.MemberRecord.door !== -1 &&
             record.MemberRecord.door === record.DealingRecord.door
-          );
-        });
+        })
 
         this.bookie = response.data.rows.filter(record => {
-          return (
-            record.DealingRecord.door === -1 &&
+          return record.DealingRecord.door === -1 &&
             record.MemberRecord.door === -1 &&
             record.MemberRecord.door === record.DealingRecord.door
-          );
-        });
+        })
         // console.log('this', this.memberRecord)
-        // this.bidChips ? this.bookie[0].bidChips = this.bidChips : false
+        // this.bidChips ? this.bookie[0].bidChips = this.bidChips : false        
         this.group = _.groupBy(detailTemp, record => {
-          return record.MemberRecord.GambleMember.name;
-        });
-        this.group = Object.values(this.group);
-        console.log("wwww", this.group);
-
+          return record.MemberRecord.GambleMember.name
+        })
+        this.group = Object.values(this.group)
+        console.log('wwww', this.group)
+        
         this.group.map(member => {
           // console.log('aaaaa', member)
-          let currentChips =
-            _.sumBy(member, record => {
-              return record.MemberRecord.chips;
-            }) + member[0].MemberRecord.currentChips;
-          for (const item of member) {
-            item.MemberRecord.currentChips = currentChips;
+          let currentChips = _.sumBy(member, record => {
+            return record.MemberRecord.chips
+          }) + member[0].MemberRecord.currentChips
+          for(const item of member) {
+            item.MemberRecord.currentChips = currentChips
           }
-        });
+        })
         this.detail = this.group.reduce((arr, element) => {
-          return arr.concat(element);
-        }, []);
-        console.log("eee", this.detail);
+          return arr.concat(element)
+        }, [])
+        console.log('eee', this.detail)
         this.bookie[0].effectiveWagger = _.sumBy(this.detail, item => {
-          return Math.abs(item.MemberRecord.earned);
-        });
-        console.log("ssss", this.detail);
-        this.bookie[0].bookieResult =
-          this.bookie[0].MemberRecord.earned -
-          this.bookie[0].MemberRecord.serviceFees;
+          return Math.abs(item.MemberRecord.earned) ;
+        })
+        console.log('ssss', this.detail)
+        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)
         this.group.map((item, itemIndex) => {
-          let totalChips = 0;
+          let totalChips = 0
           item.map((person, personIndex) => {
-            totalChips =
-              totalChips +
-              person.MemberRecord.earned -
-              person.MemberRecord.serviceFees;
-            item.length - 1 === personIndex
-              ? (this.detail[this._sum(itemIndex)].totalChips = totalChips)
-              : false;
-          });
-        });
+            totalChips = totalChips + person.MemberRecord.earned - person.MemberRecord.serviceFees
+            item.length - 1 === personIndex ? this.detail[this._sum(itemIndex)].totalChips = totalChips : false
+          })
+        })
 
         for (let i = 0; i < this.group.length; i++) {
           if (i === 0) {
-            this.statement = `if(this.rowIndex === ${i}){
+            this.statement =
+            `if(this.rowIndex === ${i}){
               this.rowspan = ${this.group[i].length},
               this.colspan = 1
-            }`;
+            }`
           } else {
-            this.statement += `else if(this.rowIndex === ${this._sum(i)}){
+            this.statement +=
+            `else if(this.rowIndex === ${this._sum(i)}){
               this.rowspan = ${this.group[i].length},
               this.colspan = 1 
-            }`;
+            }`
           }
           if (i === this.group.length - 1) {
-            this.statement += `else {
+            this.statement +=
+            `else {
               this.rowspan = 0,
               this.colspan = 0
-            }`;
+            }`
           }
         }
 
-        this.func = eval(`(function() {${this.statement}})`);
-      });
-      fetchPunishmentRecord(this.data.fourLayer, this.listQuery).then(
-        response => {
-          this.punishmentRecord = response.data;
-        }
-      );
+        this.func = eval(`(function() {${this.statement}})`)
+      })
+      fetchPunishmentRecord(this.data.fourLayer, this.listQuery).then(response => {
+        this.punishmentRecord = response.data
+      })
       fetchMemberInfo(this.data.fourLayer, this.listQuery).then(response => {
-        let { data } = response;
-        let members = {};
-        this.members = [];
+        let { data } = response
+        let members = {}
+        this.members = []
         data.map((person, index) => {
           if (index % 4 === 0) {
-            members.name_0 = person.GambleMember.name;
-            members.chips_0 = person.chips;
-            index === data.length - 1 ? this.members.push(members) : false;
+            members.name_0 = person.GambleMember.name
+            members.chips_0 = person.chips
+            index === data.length - 1 ? this.members.push(members) : false
           } else if (index % 4 === 1) {
-            members.name_1 = person.GambleMember.name;
-            members.chips_1 = person.chips;
-            index === data.length - 1 ? this.members.push(members) : false;
+            members.name_1 = person.GambleMember.name
+            members.chips_1 = person.chips
+            index === data.length - 1 ? this.members.push(members) : false
           } else if (index % 4 === 2) {
-            members.name_2 = person.GambleMember.name;
-            members.chips_2 = person.chips;
-            index === data.length - 1 ? this.members.push(members) : false;
+            members.name_2 = person.GambleMember.name
+            members.chips_2 = person.chips
+            index === data.length - 1 ? this.members.push(members) : false
           } else if (index % 4 === 3) {
-            members.name_3 = person.GambleMember.name;
-            members.chips_3 = person.chips;
-            this.members.push(members);
-            members = {};
+            members.name_3 = person.GambleMember.name
+            members.chips_3 = person.chips
+            this.members.push(members)
+            members = {}
           }
-        });
-      });
+        })
+      })
 
-      this.listLoading = false;
+      this.listLoading = false
     },
     objectSpanMethod({ row, column, rowIndex, columnIndex }) {
-      if (
-        columnIndex === 0 ||
-        columnIndex === 5 ||
-        columnIndex === 6 ||
-        columnIndex === 7 ||
-        columnIndex === 8
-      ) {
-        this.rowIndex = rowIndex;
-        this.columnIndex = columnIndex;
-        const that = this;
+      if (columnIndex === 0 || columnIndex === 5 || columnIndex === 6 || columnIndex === 7 || columnIndex === 8) {
+        this.rowIndex = rowIndex
+        this.columnIndex = columnIndex
+        const that = this
 
-        this.func();
+        this.func()
         return {
           rowspan: this.rowspan,
           colspan: this.colspan
-        };
+        }
       }
     },
     getSummaries() {
-      const sums = [];
-      this.wagerRecord.map((door, index) => {
-        if (index === 0) sums[index] = "總押注";
-        sums[index + 1] = door.chips;
-      });
-      return sums;
+      const sums = []
+        this.wagerRecord.map((door, index) => {
+          if (index === 0) sums[index] = '總押注'
+          sums[index+1] = door.chips
+        })
+      return sums
     },
     handleFilter() {
       fetchRoundRecord(this.data.fourLayer, this.listQuery).then(response => {
-        this.roundTime = response.data.createdAt;
-        this.door = response.data.initialDoor;
-      });
-      // this.SetQuery({layer:2, query: {round: this.query.secondLayer.round}})
-      this.dealing = [];
-      this.getList();
+        this.roundTime = response.data.createdAt        
+        this.door = response.data.initialDoor
+      })
+      console.log('door', this.door)
+      // this.SetQuery({layer:2, query: {round: this.query.fourLayer.round}})      
+      this.dealing = []
+      this.getList()
     },
     moment(time) {
-      return moment(time)
-        .tz("Asia/Taipei")
-        .format("YYYY-MM-DD HH:mm:ss");
+      return moment(time).tz('Asia/Taipei').format('YYYY-MM-DD HH:mm:ss')
     },
     moneyColor(money) {
-      return money >= 0 ? { color: "#67C23A" } : { color: "#FA5555" };
+      return money >= 0 ? { color: '#67C23A' } : { color: '#FA5555' }
     },
     // TODO refactor
     doorTableSwitch(rowIndex, colIndex) {
       if (rowIndex === 0) {
-        return `${this.dealing[0][`point1_${colIndex}`]} | ${
-          this.dealing[0][`point2_${colIndex}`]
-        } / ${this.point({
-          point1: this.dealing[0][`point1_${colIndex}`],
-          point2: this.dealing[0][`point2_${colIndex}`],
-          totalPoints: this.dealing[0][`totalPoints_${colIndex}`]
-        })}`;
+        return `${this.dealing[0][`point1_${colIndex}`]} | ${this.dealing[0][`point2_${colIndex}`]} / ${this.point({point1: this.dealing[0][`point1_${colIndex}`] ,point2: this.dealing[0][`point2_${colIndex}`] ,totalPoints: this.dealing[0][`totalPoints_${colIndex}`]})}`
       }
       if (rowIndex === 1) {
-        return this.dealing[1][`member_${colIndex}`]
-          ? `${this.dealing[1][`member_${colIndex}`]}`
-          : "從缺";
+        return this.dealing[1][`member_${colIndex}`] ? `${this.dealing[1][`member_${colIndex}`]}` : '從缺'
       }
     },
     _sum(i) {
-      let count = 0;
+      let count = 0
       for (let j = 0; j < i; j++) {
-        count += this.group[j].length;
+        count += this.group[j].length
       }
-      return count;
+      return count
     },
     point(dealingRecord) {
-      return ponitTransform(dealingRecord);
+      return ponitTransform(dealingRecord)
     },
-    initDoor({ row, column, rowIndex, columnIndex }) {
-      return columnIndex === this.door ? { color: "#F56C6C" } : ``;
+    initDoor({row, column, rowIndex, columnIndex}) {
+      return  columnIndex === this.door ? { color: '#F56C6C' } : ``
     },
-    reason(reason) {
-      switch (reason) {
-        case "NO_DRAW_RIGHTS":
-          return "亂抽紅包";
-          break;
-        case "NO_RESPONSE":
-          return "門主未抽紅包";
-          break;
+    reason(reason ){
+      switch(reason) {
+        case 'NO_DRAW_RIGHTS':
+          return '亂抽紅包'
+        break;
+        case 'NO_RESPONSE':
+          return '門主未抽紅包'
+        break;
         default:
-          return "請找客服";
+          return '請找客服'
       }
     },
     hasPunishment(data) {
-      return data.length !== 0 ? true : false;
+      return data.length !== 0 ? true : false
     }
   },
   destroyed() {
-    this.SetVisible(3);
+    this.SetVisible(3)
   }
-};
+}
 </script>
 <style>
-div {
+div{
   font-weight: bold;
-  font-size: 25px;
+  font-size: 25px
 }
 </style>

src/views/room/gameHistory/index.vue

@@ -41,7 +41,9 @@
           <el-table-column align="center" label="操作" width="250">
             <template slot-scope="scope">
                 <el-button v-show="scope.row.type==='遊戲'" type="primary" size="mini" icon="el-icon-tickets" @click="handlePersonDetail(scope.row)">個人明細</el-button>  
-                <el-button v-show="scope.row.type==='遊戲'" type="primary" size="mini" icon="el-icon-tickets" @click="handleGameDetail(scope.row)">此場明細</el-button>                
+                <router-link to="/room/index/gambleMember/index/gameHistory/index/detail/index">
+                  <el-button v-show="scope.row.type==='遊戲'" type="primary" size="mini" icon="el-icon-tickets" @click="handleGameDetail(scope.row)">此場明細</el-button>                
+                </router-link>
             </template>
           </el-table-column>
         </el-table-column>