point display

package.json

@@ -21,6 +21,7 @@
     "moment-timezone": "^0.5.14",
     "normalize.css": "7.0.0",
     "nprogress": "0.2.0",
+    "nzh": "^1.0.2",
     "vue": "2.5.9",
     "vue-multiselect": "^2.0.8",
     "vue-router": "3.0.1",

src/utils/point.js

@@ -0,0 +1,19 @@
+const nzhhk = require('nzh/hk')
+
+export function ponitTransform(dealingRecord) {
+  let { point1, point2, totalPoints } = dealingRecord
+  point1 = Number(point1)
+  point2 = Number(point2)
+  totalPoints = Number(totalPoints)
+  if (point1 === 0 && point2 === 0) {
+    return `白板對`
+  } else if (point1 === point2) {
+    return `對子`
+  } else if (point1 + point2 === 10) {
+    return `尻`
+  } else if (point1 === 0 || point2 === 0) {
+    return `${point1 === 0 ? nzhhk.encodeS(`${point2}`) : nzhhk.encodeS(`${point1}`)}點半`
+  } else {
+    return `${nzhhk.encodeS(`${totalPoints}`)}點`
+  }
+}

src/views/gambleGameBucket/detail/index.vue

@@ -62,7 +62,7 @@
         <el-table-column label="莊家" prop="MemberRecord.GambleMember.name"></el-table-column>
         <el-table-column label="點數">
           <template slot-scope="scope">
-            <span>{{`${scope.row.DealingRecord.point1} | ${scope.row.DealingRecord.point2} / ${scope.row.DealingRecord.totalPoints}`}}</span>
+            <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>      
@@ -90,7 +90,7 @@
         </el-table-column>
         <el-table-column prop="DealingRecord.totalPoints" label="點數">
           <template slot-scope="scope">
-            <span>{{`${scope.row.DealingRecord.point1} | ${scope.row.DealingRecord.point2} / ${scope.row.DealingRecord.totalPoints}`}}</span>
+            <span>{{`${scope.row.DealingRecord.point1} | ${scope.row.DealingRecord.point2} / ${point(scope.row.DealingRecord)}`}}</span>
           </template>
         </el-table-column>
         <el-table-column label="輸贏">
@@ -140,6 +140,7 @@
 import { mapGetters, mapActions } from 'vuex'
 import { fetchDetails, fetchRoundCount, fetchDealingRecords, fetchMemberRecords } from '@/api/gambleGameBucket'
 import { fetchGambleMemberList } from '@/api/gambleMember'
+import { ponitTransform } from '@/utils/point'
 import _ from 'lodash'
 import moment from 'moment-timezone'
 
@@ -323,6 +324,7 @@ export default {
       return sums
     },
     handleFilter() {
+      this.SetQuery({layer:2, query: {round: this.query.secondLayer.round}})      
       this.dealing = []
       this.getList()
     },
@@ -335,7 +337,7 @@ export default {
     // TODO refactor
     doorTableSwitch(rowIndex, colIndex) {
       if (rowIndex === 0) {
-        return `${this.dealing[0][`point1_${colIndex}`]} | ${this.dealing[0][`point2_${colIndex}`]} / ${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}`]}` : 'N/A'
@@ -347,6 +349,9 @@ export default {
         count += this.group[j].length
       }
       return count
+    },
+    point(dealingRecord) {
+      return ponitTransform(dealingRecord)
     }
   },
   destroyed() {

yarn.lock

@@ -3895,6 +3895,10 @@ number-is-nan@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d"
 
+nzh@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/nzh/-/nzh-1.0.2.tgz#f85e0595be28e088514abbceaba2b2bd4b4292eb"
+
 oauth-sign@~0.8.1, oauth-sign@~0.8.2:
   version "0.8.2"
   resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.8.2.tgz#46a6ab7f0aead8deae9ec0565780b7d4efeb9d43"