Merge remote-tracking branch 'origin/dev' into dev

src/views/settlementCenter/bonusDetail/index.vue

@@ -185,30 +185,44 @@
               align="center"
               prop="directIncome"
               width="130"
-              :label="$t('直推收益') + `(${isLocalSymbol()})`"
+              :label="$t('直推收益')"
               :formatter="stateFormat"
             />
             <el-table-column
               align="center"
               prop="storeIncome"
               width="130"
-              :label="$t('阶段收益') + `(${isLocalSymbol()})`"
+              :label="$t('阶段收益')"
               :formatter="stateFormat"
             />
             <el-table-column
               align="center"
               prop="globalPoints"
               width="130"
-              :label="$t('见点收益') + `(${isLocalSymbol()})`"
+              :label="$t('见点收益')"
+              :formatter="stateFormat"
+            />
+            <el-table-column
+              align="center"
+              prop="retailRangeIncome"
+              width="130"
+              :label="$t('领导奖')"
+              :formatter="stateFormat"
+            />
+            <el-table-column
+              align="center"
+              prop="retailSameLevelIncome"
+              width="130"
+              :label="$t('平级奖')"
               :formatter="stateFormat"
             />
 
             <el-table-column
               align="center"
-              prop="realIncomeTotalOri"
+              prop="realIncomeTotal"
               width="130"
               :formatter="stateFormat"
-              :label="'实发收益总计' + `(${isLocalSymbol()})`"
+              :label="'实发收益总计'"
             />
           </el-table>
         </div>
@@ -612,10 +626,6 @@ export default {
           name: 'makerRealSubtotalOri',
           key: ''
         },
-        {
-          name: 'realIncomeTotalOri',
-          key: ''
-        },
         {
           name: 'realIncomeTotal',
           key: ''

src/views/settlementCenter/totalBonus/index.vue

@@ -165,19 +165,31 @@
             <el-table-column
               align="center"
               prop="directIncome"
-              :label="$t('直推收益') + `(${isLocalSymbol()})`"
+              :label="$t('直推收益')"
               :formatter="stateFormat"
             />
             <el-table-column
               align="center"
               prop="storeIncome"
-              :label="$t('阶段收益') + `(${isLocalSymbol()})`"
+              :label="$t('阶段收益')"
               :formatter="stateFormat"
             />
             <el-table-column
               align="center"
               prop="globalPoints"
-              :label="$t('见点收益') + `(${isLocalSymbol()})`"
+              :label="$t('见点收益')"
+              :formatter="stateFormat"
+            />
+            <el-table-column
+              align="center"
+              prop="retailRangeIncome"
+              :label="$t('领导奖')"
+              :formatter="stateFormat"
+            />
+            <el-table-column
+              align="center"
+              prop="retailSameLevelIncome"
+              :label="$t('平级奖')"
               :formatter="stateFormat"
             />
             <el-table-column
@@ -185,7 +197,7 @@
               align="center"
               prop="realIncomeTotal"
               width="130"
-              :label="'实发收益总计' + '(¥)'"
+              :label="'实发收益总计'"
               :formatter="stateFormat"
             />
             <el-table-column
@@ -498,10 +510,6 @@ export default {
           name: 'makerRealSubtotalOri',
           key: ''
         },
-        {
-          name: 'realIncomeTotalOri',
-          key: ''
-        },
         {
           name: 'realIncomeTotal',
           key: ''