Przeglądaj źródła

TODO fix door table

EthnaYeh 7 lat temu
rodzic
commit
b3d231c09b
1 zmienionych plików z 16 dodań i 3 usunięć
  1. 16 3
      src/views/gambleGameBucket/detail/index.vue

+ 16 - 3
src/views/gambleGameBucket/detail/index.vue

21
       <el-table-column label="本期開獎" align="center"> 
21
       <el-table-column label="本期開獎" align="center"> 
22
         <el-table-column label="名稱">
22
         <el-table-column label="名稱">
23
           <template slot-scope="scope">
23
           <template slot-scope="scope">
24
-            <span>點數</span>
24
+            <span>{{scope.$index=== 0 ?"點數":"ddd"}}</span>
25
           </template>
25
           </template>
26
         </el-table-column>   
26
         </el-table-column>   
27
         <el-table-column label="第一門">
27
         <el-table-column label="第一門">
28
           <template slot-scope="scope">
28
           <template slot-scope="scope">
29
-            <span>{{`${scope.row.point1_0} | ${scope.row.point2_0} / ${scope.row.totalPoints_0}`}}</span>
29
+            <span>{{doorTableSwitch(scope.$index, 1)}}</span>
30
           </template>
30
           </template>
31
         </el-table-column>
31
         </el-table-column>
32
         <el-table-column label="第二門">
32
         <el-table-column label="第二門">
75
     <el-table :data="detail" :span-method="objectSpanMethod"  v-loading.body="listLoading" element-loading-text="Loading" border fit highlight-current-row
75
     <el-table :data="detail" :span-method="objectSpanMethod"  v-loading.body="listLoading" element-loading-text="Loading" border fit highlight-current-row
76
       style="width: 100%">
76
       style="width: 100%">
77
       <el-table-column label="此輪結果" align="center">
77
       <el-table-column label="此輪結果" align="center">
78
-        <el-table-column prop="MemberRecord.GambleMember.name" label="玩家" width="180">
78
+        <el-table-column prop="MemberRecord.GambleMember.name" label="玩家">
79
         </el-table-column>
79
         </el-table-column>
80
+        <!-- <el-table-column prop="MemberRecord.GambleMember.name" label="門主">
81
+        </el-table-column> -->
80
         <el-table-column  label="押">
82
         <el-table-column  label="押">
81
           <template slot-scope="scope">
83
           <template slot-scope="scope">
82
             <span>{{`${scope.row.MemberRecord.door} / ${scope.row.MemberRecord.wager}`}}</span>
84
             <span>{{`${scope.row.MemberRecord.door} / ${scope.row.MemberRecord.wager}`}}</span>
219
           deal[`point1_${index % 6}`] = record.point1
221
           deal[`point1_${index % 6}`] = record.point1
220
           deal[`point2_${index % 6}`] = record.point2
222
           deal[`point2_${index % 6}`] = record.point2
221
           deal[`totalPoints_${index % 6}`] = record.totalPoints
223
           deal[`totalPoints_${index % 6}`] = record.totalPoints
224
+          record.GambleMember ? deal[`member_${index % 6}`] = record.GambleMember.name : false
222
           index % 6 === 5 ? this.dealing.push(deal) : false
225
           index % 6 === 5 ? this.dealing.push(deal) : false
223
         })
226
         })
224
       })
227
       })
323
     moneyColor(money) {
326
     moneyColor(money) {
324
       return money >= 0 ? { color: '#67C23A' } : { color: '#FA5555' }
327
       return money >= 0 ? { color: '#67C23A' } : { color: '#FA5555' }
325
     },
328
     },
329
+    doorTableSwitch(rowIndex, colIndex) {
330
+      console.log('sss',this.dealing)
331
+      console.log(this.dealing[0][`point1_${colIndex}`])
332
+      if(rowIndex === 0){
333
+        return this.dealing[`point1_${colIndex}`] + '|' + this.dealing[`point2_${colIndex}`] + '/' + this.dealing[`totalPoints_${colIndex}`]
334
+      }
335
+      if(rowIndex === 1){
336
+        return 
337
+      }
338
+    },
326
     _sum(i) {
339
     _sum(i) {
327
       let count = 0
340
       let count = 0
328
       for (let j = 0; j < i; j++) {
341
       for (let j = 0; j < i; j++) {