fix bug

src/views/agnetManagement/gambleMemberManagement/index.vue

@@ -85,12 +85,12 @@
               <span :style="moneyColor(scope.row.totalPunishment)">{{scope.row.totalDown}}</span>
             </template>
           </el-table-column>
-          <el-table-column label="有效投注量(莊家)" align="center">
+          <el-table-column label="莊家贏錢" align="center">
             <template slot-scope="scope">
               <span :style="moneyColor(scope.row.bookieEarned)">{{scope.row.bookieEarned}}</span>
             </template>
           </el-table-column>
-          <el-table-column label="有效投注量(閒家)" align="center">
+          <el-table-column label="閒家贏錢" align="center">
             <template slot-scope="scope">
               <span :style="moneyColor(scope.row.memberEarned)">{{scope.row.memberEarned}}</span>
             </template>
@@ -107,12 +107,12 @@
           </el-table-column>
           <el-table-column label="總退水" align="center">
             <template slot-scope="scope">
-              <span :style="moneyColor(scope.row.wallet)">{{scope.row.totalServiceFees}}</span>
+              <span :style="moneyColor(scope.row.totalServiceFees)">{{scope.row.totalServiceFees}}</span>
             </template>
           </el-table-column>
           <el-table-column label="會員結帳" align="center">
             <template slot-scope="scope">
-              <span :style="moneyColor(scope.row.memberCheckOut)">{{scope.row.memberCheckOut}}</span>
+              <span :style="moneyColor((scope.row.memberCheckOut)*(-1))">{{(scope.row.memberCheckOut)*(-1)}}</span>
             </template>
           </el-table-column>
           <el-table-column align="center" label="操作" width="100">
@@ -319,7 +319,7 @@ export default {
       return money >= 0 ? { color: '#67C23A' } : { color: '#FA5555' }
     },
     all(scope) {
-      return scope.row.allUp+scope.row.allDown-scope.row.allChips-scope.row.allServiceFees
+      return (scope.row.allUp+scope.row.allDown-scope.row.allChips-scope.row.allServiceFees)*(-1)
     }
   },
   destroyed() {

src/views/agnetManagement/index.vue

@@ -176,7 +176,7 @@ export default {
             let allEarned = _.sumBy(combine, (item) => {return item.bookieEarned + item.memberEarned})
             let allServiceFees = _.sumBy(combine, (item) => {return item.bookieServiceFees + item.
             memberServiceFees})
-            agent.all = allUp+allDown-allChips-allServiceFees
+            agent.all = (allUp+allDown-allChips-allServiceFees)*(-1)
             this.list.push(agent)
             
             this.listLoading = false

src/views/gambleGameBucket/detail/index.vue

@@ -27,7 +27,11 @@
               <span>{{`${scope.row.DealingRecord.point1} | ${scope.row.DealingRecord.point2} / ${point(scope.row.DealingRecord)}`}}</span>
             </template>
           </el-table-column>
-          <el-table-column label="上莊分數" prop="bidChips"></el-table-column>  
+          <el-table-column label="上莊分數">
+            <template slot-scope="scope">
+              <span>{{memberRecord[memberRecord.length-1][0].wager}}</span>
+            </template>
+          </el-table-column>  
           <el-table-column label="有效下注量">
             <template slot-scope="scope">
               <div :style="moneyColor(scope.row.effectiveWagger)">{{scope.row.effectiveWagger}}</div>
@@ -44,7 +48,7 @@
               <div :style="moneyColor(scope.row.bookieResult)">{{scope.row.bookieResult}}</div>
             </template>
           </el-table-column>  
-          <el-table-column prop="ass" label="服務費">
+          <el-table-column prop="MemberRecord.FixedServiceFees" label="服務費">
           </el-table-column>     
         </el-table-column>             
       </el-table-column>                   
@@ -176,20 +180,17 @@ export default {
       bookie: [],
       memberRecord: [],
       door: 0,
-      bidChips: 0,
+      // bidChips: 0,
       wagerRecord: [],
     }
   },
   created() {
-    fetchWagerRecord(this.data.secondLayer, this.query.secondLayer).then(response => {
-      this.wagerRecord = response.data
-    })
     fetchRoundRecord(this.data.secondLayer, this.query.secondLayer).then(response => {
       this.door = response.data.initialDoor
     })
-    fetchGameBid(this.data.secondLayer).then(response => {
-      this.bidChips = response.data
-    })
+    // fetchGameBid(this.data.secondLayer).then(response => {
+    //   this.bidChips = response.data
+    // })
     fetchRoundCount(this.data.secondLayer).then((response) => {
       for (let i = 1; i <= response.data; i++) {
         this.roundOptions.push({ label: `第 ${i} 關`, key: i })
@@ -197,31 +198,6 @@ export default {
     })
     this.SetVisible(2)
     this.getList()
-    fetchGambleMemberList({ page: 1, limit: 9999999999, chipsSort: 'DESC' }).then(response => {
-      const { rows } = response.data
-      let members = {}
-      // TODO refactor
-      rows.map((person, index) => {
-        if (index % 4 === 0) {
-          members.name_0 = person.name
-          members.chips_0 = person.chips
-          index === response.data.count - 1 ? this.members.push(members) : false
-        } else if (index % 4 === 1) {
-          members.name_1 = person.name
-          members.chips_1 = person.chips
-          index === response.data.count - 1 ? this.members.push(members) : false
-        } else if (index % 4 === 2) {
-          members.name_2 = person.name
-          members.chips_2 = person.chips
-          index === response.data.count - 1 ? this.members.push(members) : false
-        } else if (index % 4 === 3) {
-          members.name_3 = person.name
-          members.chips_3 = person.chips
-          this.members.push(members)
-          members = {}
-        }
-      })
-    })
   },
   computed: {
     ...mapGetters([
@@ -240,6 +216,9 @@ export default {
       this.listLoading = true
       let detailTemp, dealingTemp, memberRecordTemp
       this.detail = []
+      fetchWagerRecord(this.data.secondLayer, this.query.secondLayer).then(response => {
+        this.wagerRecord = response.data
+      })
       fetchDealingRecords(this.data.secondLayer, this.query.secondLayer).then(response => {
         dealingTemp = response.data.rows.filter(record => {
           return record.door !== -1
@@ -277,8 +256,8 @@ export default {
             record.MemberRecord.door === -1 &&
             record.MemberRecord.door === record.DealingRecord.door
         })
-        console.log('this', this.bookie)
-        this.bidChips ? this.bookie[0].bidChips = this.bidChips : false        
+        // console.log('this', this.memberRecord)
+        // this.bidChips ? this.bookie[0].bidChips = this.bidChips : false        
         this.group = _.groupBy(detailTemp, record => {
           return record.MemberRecord.GambleMember.name
         })
@@ -287,7 +266,6 @@ export default {
         this.detail = this.group.reduce((arr, element) => {
           return arr.concat(element)
         }, [])
-
         this.bookie[0].effectiveWagger = _.sumBy(this.detail, item => {
           return Math.abs(item.MemberRecord.earned) ;
         })
@@ -327,6 +305,34 @@ export default {
         this.func = eval(`(function() {${this.statement}})`)
       })
 
+      fetchGambleMemberList({ page: 1, limit: 9999999999, chipsSort: 'DESC' }).then(response => {
+        const { rows } = response.data
+        console.log('sss', this.detail)
+
+        let members = {}
+        // TODO refactor
+        rows.map((person, index) => {
+          if (index % 4 === 0) {
+            members.name_0 = person.name
+            members.chips_0 = person.chips
+            index === response.data.count - 1 ? this.members.push(members) : false
+          } else if (index % 4 === 1) {
+            members.name_1 = person.name
+            members.chips_1 = person.chips
+            index === response.data.count - 1 ? this.members.push(members) : false
+          } else if (index % 4 === 2) {
+            members.name_2 = person.name
+            members.chips_2 = person.chips
+            index === response.data.count - 1 ? this.members.push(members) : false
+          } else if (index % 4 === 3) {
+            members.name_3 = person.name
+            members.chips_3 = person.chips
+            this.members.push(members)
+            members = {}
+          }
+        })
+      })
+
       this.listLoading = false
     },
     objectSpanMethod({ row, column, rowIndex, columnIndex }) {