Merge branch 'feature/EK-4375' of guanli/ngfrontend into master

src/views/bonus/bonus-list.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <div v-if="!loading" v-loading="loading" >
+    <div v-if="!loading" v-loading="loading">
       <el-table
         :data="tableData"
         border
@@ -20,6 +20,7 @@
         <el-table-column align="center" min-width="100px" :label="$t('bonus.welcomeBonus')" prop="welcomeBonus" />
         <el-table-column align="center" min-width="100px" :label="$t('bonus.carBonus')" prop="carBonus" />
         <el-table-column align="center" min-width="100px" :label="$t('bonus.userPerformanceBonus')" prop="userPerformanceBonus" />
+        <el-table-column align="center" min-width="100px" :label="$t('bonus.userBuilderBonus')" prop="userBuilderBonus" />
 
         <el-table-column align="center" min-width="100px" :label="$t('common.action')">
           <template slot-scope="{row}">
@@ -31,7 +32,7 @@
       </el-table>
     </div>
     <div v-else>
-      <el-empty :description="$t('common.noData')"></el-empty>
+      <el-empty :description="$t('common.noData')" />
     </div>
 
     <el-dialog v-if="bonusData" :title="bonusPayCycle" :visible.sync="dialog" :width="screenWidth" style="margin-top: -80px">
@@ -47,9 +48,10 @@
         <el-descriptions-item label-class-name="labelClass" :label="$t('bonus.leaderShipBonus')"><span style="white-space: nowrap;">{{ bonusData.leaderShipBonus }}</span></el-descriptions-item>
         <el-descriptions-item label-class-name="labelClass" :label="$t('bonus.welcomeBonus')"><span style="white-space: nowrap;">{{ bonusData.welcomeBonus }}</span></el-descriptions-item>
         <el-descriptions-item label-class-name="labelClass" :label="$t('bonus.carBonus')"><span style="white-space: nowrap;">{{ bonusData.carBonus }}</span></el-descriptions-item>
-        <el-descriptions-item label-class-name="labelClass" :label="$t('bonus.totalBonus')"><span style="white-space: nowrap;">{{ bonusData.totalBonus }}</span></el-descriptions-item>
         <el-descriptions-item label-class-name="labelClass" :label="$t('bonus.userPerformanceBonus')"><span style="white-space: nowrap;">{{ bonusData.userPerformanceBonus }}</span></el-descriptions-item>
-     </el-descriptions>
+        <el-descriptions-item label-class-name="labelClass" :label="$t('bonus.userBuilderBonus')"><span style="white-space: nowrap;">{{ bonusData.userBuilderBonus }}</span></el-descriptions-item>
+        <el-descriptions-item label-class-name="labelClass" :label="$t('bonus.totalBonus')"><span style="white-space: nowrap;">{{ bonusData.totalBonus }}</span></el-descriptions-item>
+      </el-descriptions>
     </el-dialog>
   </div>
 </template>
@@ -88,7 +90,7 @@ export default {
         this.flowBonusSwitch = parseInt(flowBonusSwitch)
         // this.teamBonusSwitch = parseInt(bonusSwitch.teamBonusSwitch)
         // this.stockistCommissionSwitch = parseInt(bonusSwitch.stockistCommissionSwitch)
-        if(tableData.length > 0){
+        if (tableData.length > 0) {
           this.loading = false
         }
       })