fix studio display logic

src/views/studio/index.vue

@@ -22,7 +22,7 @@
       </el-table-column>
       <el-table-column align="center" label="工作室實收維護費" >
         <template slot-scope="scope">
-          <span>{{scope.row.maintenanceFee}}</span>
+          <span>{{scope.row.FixedServiceFees}}</span>
         </template>
       </el-table-column>
     </el-table>
@@ -50,8 +50,8 @@ export default {
       listLoading: true,
       bucket: '',
       listQuery: {
-        // startAt: moment().subtract(1, 'weeks').day(7).hour(16).minute(0).second(0),
-        // endAt: moment().day(7).hour(11).minute(59).second(59)
+        startAt: moment.utc(moment().startOf('isoweek').subtract(1, 'weeks').day(7).hour(16).minute(0).second(0)).format(),
+        endAt: moment.utc(moment().startOf('isoweek').day(7).hour(11).minute(59).second(59)).format()
       },
       temp: {},
       pickerOptions: {
@@ -102,6 +102,8 @@ export default {
               if(item.isBookie){
                   data.bookies.serviceFees = new Decimal(item.serviceFees)
                   data.bookies.count = new Decimal(item.count)
+                  data.bookies.FixedServiceFees = item.FixedServiceFees
+                  data.bookies.wagerServiceFees = new Decimal(item.wagerServiceFees)
               }else{
                   data.members.serviceFees = new Decimal(item.serviceFees)
                   data.members.count = new Decimal(item.count)
@@ -109,8 +111,9 @@ export default {
           })
           this.list.push({
           all: data.bookies.serviceFees.plus(data.members.serviceFees).minus(data.bookies.count.times(500)).times(0.2).valueOf(),
+          all: data.bookies.serviceFees.plus(data.members.serviceFees).plus(data.bookies.wagerServiceFees).times(0.2).valueOf(),
           // all: (data.bookies.serviceFees - (data.bookies.count * 500) + data.members.serviceFees) * 0.2,
-          maintenanceFee: data.bookies.count.times(500).valueOf()
+          FixedServiceFees: data.bookies.FixedServiceFees
           })
         }else{
           this.list = [];