Merge branch 'master' of http://18.167.157.193:1026/guanli/ngds into feature/1540-theo-auto-mesure-up

backendApi/config/menu.php

@@ -41,7 +41,7 @@ return [
             ['name'=>'删除商品', 'class'=>'', 'icon'=>'', 'controller'=>'shop', 'action'=>'goods-delete', 'routePath'=>'shop/goods-delete', 'show'=>0,],
             // 新添加的商品操作 ---stop
             ['name'=>'商品列表导出', 'class'=>'', 'icon'=>'', 'controller'=>'shop', 'action'=>'goods-list-export', 'routePath'=>'shop/goods-list-export', 'show'=>0,],
-            ['name'=>' Kitting products manage', 'class'=>'', 'icon'=>'', 'controller'=>'shop', 'action'=>'package', 'routePath'=>'shop/package', 'show'=>1,],//套餐管理
+//            ['name'=>' Kitting products manage', 'class'=>'', 'icon'=>'', 'controller'=>'shop', 'action'=>'package', 'routePath'=>'shop/package', 'show'=>1,],//套餐管理
 
             // ['name'=>'Welcome Pack Listing', 'class'=>'', 'icon'=>'', 'controller'=>'shop', 'action'=>'dec-order-list', 'routePath'=>'shop/dec-order-list', 'show'=>1,],//报单列表
             // ['name'=>'报单列表导出', 'class'=>'', 'icon'=>'', 'controller'=>'shop', 'action'=>'dec-order-list-export', 'routePath'=>'shop/dec-order-list-export', 'show'=>0,],
@@ -197,11 +197,11 @@ return [
 //            ['name'=>'年度奖金发放审核', 'class'=>'', 'icon'=>'', 'controller'=>'bonus', 'action'=>'cf-lx-audit-list', 'routePath'=>'bonus/cf-lx-audit-list', 'show'=>1,],
 //            ['name'=>'年度奖发放审核操作', 'class'=>'', 'icon'=>'', 'controller'=>'bonus', 'action'=>'cf-lx-audit', 'routePath'=>'bonus/cf-lx-audit', 'show'=>0,],
             //['name'=>'期奖金明细', 'class'=>'', 'icon'=>'', 'controller'=>'bonus', 'action'=>'period-detail', 'routePath'=>'bonus/period-detail', 'show'=>0,],
-            ['name'=>'最新奖金', 'class'=>'', 'icon'=>'', 'controller'=>'bonus', 'action'=>'new-period-bonus', 'routePath'=>'bonus/new-period-bonus', 'show'=>1,],
+            ['name'=>'Latest bonus', 'class'=>'', 'icon'=>'', 'controller'=>'bonus', 'action'=>'new-period-bonus', 'routePath'=>'bonus/new-period-bonus', 'show'=>1,],//最新奖金
             ['name'=>'最新奖金导出', 'class'=>'', 'icon'=>'', 'controller'=>'bonus', 'action'=>'new-period-bonus-export', 'routePath'=>'bonus/new-period-bonus-export', 'show'=>0,],
-            ['name'=>'往期奖金', 'class'=>'', 'icon'=>'', 'controller'=>'bonus', 'action'=>'other-period-bonus', 'routePath'=>'bonus/other-period-bonus', 'show'=>1,],
+            ['name'=>'Previous bonuses', 'class'=>'', 'icon'=>'', 'controller'=>'bonus', 'action'=>'other-period-bonus', 'routePath'=>'bonus/other-period-bonus', 'show'=>1,],//往期奖金
             ['name'=>'往期奖金导出', 'class'=>'', 'icon'=>'', 'controller'=>'bonus', 'action'=>'other-period-bonus-export', 'routePath'=>'bonus/other-period-bonus-export', 'show'=>0,],
-            ['name'=>'奖金流水', 'class'=>'', 'icon'=>'', 'controller'=>'bonus', 'action'=>'flow-bonus', 'routePath'=>'bonus/flow-bonus', 'show'=>1,],
+            ['name'=>'Bonus flow', 'class'=>'', 'icon'=>'', 'controller'=>'bonus', 'action'=>'flow-bonus', 'routePath'=>'bonus/flow-bonus', 'show'=>1,],//奖金流水
             ['name'=>'奖金流水导出', 'class'=>'', 'icon'=>'', 'controller'=>'bonus', 'action'=>'flow-bonus-export', 'routePath'=>'bonus/flow-bonus-export', 'show'=>0,],
 //            ['name'=>'车房养老奖流水', 'class'=>'', 'icon'=>'', 'controller'=>'bonus', 'action'=>'flow-cf', 'routePath'=>'bonus/flow-cf', 'show'=>1,],
 //            ['name'=>'车房养老奖流水导出', 'class'=>'', 'icon'=>'', 'controller'=>'bonus', 'action'=>'flow-cf-export', 'routePath'=>'bonus/flow-cf-export', 'show'=>0,],
@@ -298,7 +298,7 @@ return [
         'routePath'=>'finance',
         'show'=>1,
         'child'=>[
-            ['name'=>'会员余额调整列表', 'class'=>'', 'icon'=>'', 'controller'=>'finance', 'action'=>'balance-audit-list', 'routePath'=>'finance/balance-audit-list', 'show'=>1,],
+            ['name'=>'Member balance adjustment list', 'class'=>'', 'icon'=>'', 'controller'=>'finance', 'action'=>'balance-audit-list', 'routePath'=>'finance/balance-audit-list', 'show'=>1,],//会员余额调整列表
             ['name'=>'会员余额调整列表导出', 'class'=>'', 'icon'=>'', 'controller'=>'finance', 'action'=>'balance-audit-list-export', 'routePath'=>'finance/balance-audit-list-export', 'show'=>0,],
             ['name'=>'修改并通过审核余额调整', 'class'=>'', 'icon'=>'', 'controller'=>'finance', 'action'=>'balance-audit-pass', 'routePath'=>'finance/balance-audit-pass', 'show'=>0,],
             ['name'=>'审核会员余额调整', 'class'=>'', 'icon'=>'', 'controller'=>'finance', 'action'=>'balance-audit', 'routePath'=>'finance/balance-audit', 'show'=>0,],
@@ -313,7 +313,7 @@ return [
             ['name'=>'审核会员业绩调整', 'class'=>'', 'icon'=>'', 'controller'=>'finance', 'action'=>'perf-audit', 'routePath'=>'finance/perf-audit', 'show'=>0,],
             ['name'=>'删除审核调整会员业绩', 'class'=>'', 'icon'=>'', 'controller'=>'finance', 'action'=>'perf-audit-delete', 'routePath'=>'finance/perf-audit-delete', 'show'=>0,],
             ['name'=>'申请调整会员业绩', 'class'=>'', 'icon'=>'', 'controller'=>'finance', 'action'=>'perf-apply', 'routePath'=>'finance/perf-apply', 'show'=>0,],
-            ['name'=>'转账记录列表', 'class'=>'', 'icon'=>'', 'controller'=>'finance', 'action'=>'transfer-list', 'routePath'=>'finance/transfer-list', 'show'=>1,],
+            ['name'=>'Transfer record list', 'class'=>'', 'icon'=>'', 'controller'=>'finance', 'action'=>'transfer-list', 'routePath'=>'finance/transfer-list', 'show'=>1,],//转账记录列表
             ['name'=>'转账记录列表导出', 'class'=>'', 'icon'=>'', 'controller'=>'finance', 'action'=>'transfer-list-export', 'routePath'=>'finance/transfer-list-export', 'show'=>0,],
             ['name'=>'提现管理', 'class'=>'', 'icon'=>'', 'controller'=>'finance', 'action'=>'withdraw', 'routePath'=>'finance/withdraw', 'show'=>1,],
 //            ['name'=>'提现管理-待传发票', 'class'=>'', 'icon'=>'', 'controller'=>'finance', 'action'=>'withdraw-0', 'routePath'=>'finance/withdraw-0', 'show'=>0,],

backendApi/modules/v1/models/lists/bonus/FlowBonusList.php

@@ -56,7 +56,7 @@ class FlowBonusList extends \common\libs\dataList\DataList implements DataListIn
             $this->columns = [
                 'ID' => null,
                 'CREATED_AT' => [
-                    'header' => '创建时间',
+                    'header' => 'Creation time',//创建时间
                     'value' => function ($row) {
                         return (new DateTime([
                             'value' => $row['CREATED_AT'],
@@ -64,16 +64,16 @@ class FlowBonusList extends \common\libs\dataList\DataList implements DataListIn
                     },
                     'headerOther' => ['width' => '170'],
                 ],
-                'PERIOD_NUM' => '期数',
-                'CALC_MONTH' => '结算月',
+                'PERIOD_NUM' => 'Number of periods',//期数
+                'CALC_MONTH' => 'Settlement month',//结算月
                 'DEAL_TYPE_NAME' => [
-                    'header' => '交易类型',
+                    'header' => 'Transaction type',//交易类型
                     'headerOther' => [
                         'width' => '150',
                     ],
                 ],
                 'USER_NAME' => [
-                    'header' => '会员编号',
+                    'header' => 'Member code',//会员编号
                     'headerOther' => [
                         'width' => '150',
                     ],
@@ -82,7 +82,7 @@ class FlowBonusList extends \common\libs\dataList\DataList implements DataListIn
                     ],
                 ],
                 'REAL_NAME' => [
-                    'header' => '会员姓名',
+                    'header' => 'Member name',//会员姓名
                     'headerOther' => [
                         'width' => '120',
                     ],
@@ -91,7 +91,7 @@ class FlowBonusList extends \common\libs\dataList\DataList implements DataListIn
                     ],
                 ],
                 'LAST_DEC_LV_NAME' => [
-                    'header' => '会员级别',
+                    'header' => 'Member level',//会员级别
                     'headerOther' => [
                         'width' => '110',
                     ],
@@ -100,7 +100,7 @@ class FlowBonusList extends \common\libs\dataList\DataList implements DataListIn
                     ],
                 ],
                 'LAST_EMP_LV_NAME' => [
-                    'header' => '聘级',
+                    'header' => 'Rank',//聘级
                     'headerOther' => [
                         'width' => '130',
                     ],
@@ -117,7 +117,7 @@ class FlowBonusList extends \common\libs\dataList\DataList implements DataListIn
 //                    'headerOther' => ['width' => '200'],
 //                ],
                 'IS_DEC' => [
-                    'header' => '是否报单中心',
+                    'header' => 'Declaration center or not',//是否报单中心
                     'value' => function ($row) {
                         return (new YesNo([
                             'value' => $row['IS_DEC'],
@@ -157,7 +157,7 @@ class FlowBonusList extends \common\libs\dataList\DataList implements DataListIn
 //                    },
 //                ],
                 'BEFORE_BALANCE' => [
-                    'header' => '交易前余额',
+                    'header' => 'Balance before transaction',//交易前余额
                     'value' => function ($row) {
                         return (new Price([
                             'value' => $row['TOTAL'] - $row['AMOUNT'],
@@ -168,7 +168,7 @@ class FlowBonusList extends \common\libs\dataList\DataList implements DataListIn
                     ],
                 ],
                 'AMOUNT' => [
-                    'header' => '交易额',
+                    'header' => 'A turnover',//交易额
                     'value' => function ($row) {
                         $result = (new Price([
                             'value' => $row['AMOUNT'],
@@ -193,7 +193,7 @@ class FlowBonusList extends \common\libs\dataList\DataList implements DataListIn
                     },
                 ],
                 'TOTAL' => [
-                    'header' => '交易后余额',
+                    'header' => 'Post transaction balance',//交易后余额
                     'value' => function ($row) {
                         return (new Price([
                             'value' => $row['TOTAL'],
@@ -204,15 +204,15 @@ class FlowBonusList extends \common\libs\dataList\DataList implements DataListIn
                     ],
                 ],
                 'ADMIN_NAME' => [
-                    'header' => '操作人',
+                    'header' => 'Operator',//操作人
                     'headerOther' => ['width' => '110'],
                 ],
                 'REMARK' => [
-                    'header' => '备注',
+                    'header' => 'Note',//备注
                     'headerOther' => ['width' => '250'],
                 ],
                 'TRANSFER_SN' => [
-                    'header' => '流水号',
+                    'header' => 'Serial number',//流水号
                     'headerOther' => ['width' => '250'],
                 ],
             ];
@@ -227,24 +227,24 @@ class FlowBonusList extends \common\libs\dataList\DataList implements DataListIn
     public function getFilterTypes() {
         if (!$this->filterTypes) {
             $this->filterTypes = [
-                'CREATED_AT' => ['isUserTable' => false, 'name' => '创建时间', 'other' => 'date'],
-                'PERIOD_NUM' => ['isUserTable' => false, 'name' => '期数'],
-                'CALC_MONTH' => ['isUserTable' => false, 'name' => '结算月', 'other' => 'month'],
-                'DEAL_TYPE_NAME' => ['isUserTable' => false, 'name' => '交易类型', 'other' => 'dealTypes'],
-                'USER_NAME' => ['isUserTable' => false, 'name' => '会员编号'],
-                'REAL_NAME' => ['isUserTable' => false, 'name' => '会员姓名'],
-                'LAST_DEC_LV_NAME' => ['isUserTable' => false, 'name' => '会员级别', 'other' => 'decLevel'],
-                'LAST_EMP_LV_NAME' => ['isUserTable' => false, 'name' => '聘级', 'other' => 'empLevel'],
+                'CREATED_AT' => ['isUserTable' => false, 'name' => 'Creation time', 'other' => 'date'],//创建时间
+                'PERIOD_NUM' => ['isUserTable' => false, 'name' => 'Number of periods'],//期数
+                'CALC_MONTH' => ['isUserTable' => false, 'name' => 'Settlement month', 'other' => 'month'],//结算月
+                'DEAL_TYPE_NAME' => ['isUserTable' => false, 'name' => 'Transaction type', 'other' => 'dealTypes'],//交易类型
+                'USER_NAME' => ['isUserTable' => false, 'name' => 'Member code'],//会员编号
+                'REAL_NAME' => ['isUserTable' => false, 'name' => 'Member name'],//会员姓名
+                'LAST_DEC_LV_NAME' => ['isUserTable' => false, 'name' => 'Member level', 'other' => 'decLevel'],//会员等级
+                'LAST_EMP_LV_NAME' => ['isUserTable' => false, 'name' => 'Rank', 'other' => 'empLevel'],//聘级
 //                'LAST_STATUS_NAME' => ['isUserTable' => false, 'name' => '会员状态', 'other' => 'status'],
 //                'SYSTEM_NAME' => ['isUserTable' => true, 'name' => '体系', 'other' => 'systems'],
-                'IS_DEC' => ['isUserTable' => false, 'name' => '是否报单中心', 'other' => 'yesOrNo'],
+                'IS_DEC' => ['isUserTable' => false, 'name' => 'Declaration center or not', 'other' => 'yesOrNo'],//是否报单中心
 //                'DEC_ROLE_NAME' => ['isUserTable' => true, 'name' => '报单中心级别', 'other' => 'decRole'],
 //                'IS_DIRECT_SELLER' => ['isUserTable' => true, 'name' => '是否直销员', 'other' => 'yesOrNo'],
-                'AMOUNT' => ['isUserTable' => false, 'name' => '交易额'],
-                'TOTAL' => ['isUserTable' => false, 'name' => '交易后余额'],
-                'ADMIN_NAME' => ['isUserTable' => false, 'name' => '操作人'],
-                'REMARK' => ['isUserTable' => false, 'name' => '备注'],
-                'TRANSFER_SN' => ['isUserTable' => false, 'name' => '流水号'],
+                'AMOUNT' => ['isUserTable' => false, 'name' => 'A turnover'],//交易额
+                'TOTAL' => ['isUserTable' => false, 'name' => 'Post transaction balance'],//交易后余额
+                'ADMIN_NAME' => ['isUserTable' => false, 'name' => 'Operator'],//操作人
+                'REMARK' => ['isUserTable' => false, 'name' => 'Note'],//备注
+                'TRANSFER_SN' => ['isUserTable' => false, 'name' => 'Serial number'],//流水号
             ];
         }
         return $this->filterTypes;

backendApi/modules/v1/models/lists/bonus/PeriodBonusList.php

@@ -75,7 +75,7 @@ class PeriodBonusList extends \common\libs\dataList\DataList implements DataList
             $this->columns = [
                 'ID' => null,
                 'PERIOD_NUM' => [
-                    'header' => '结算期数',
+                    'header' => 'Number of settlement periods',//结算期数
                     'headerOther' => [
                         'width' => '150',
                     ],
@@ -84,7 +84,7 @@ class PeriodBonusList extends \common\libs\dataList\DataList implements DataList
                     ],
                 ],
                 'CALCULATED_AT' => [
-                    'header' => '结算时间',
+                    'header' => 'Settlement time',//结算时间
                     'value' => function($row) {
                         return (new DateTime([
                             'value' => $row['CALCULATED_AT'],
@@ -93,7 +93,7 @@ class PeriodBonusList extends \common\libs\dataList\DataList implements DataList
                     'headerOther' => ['width' => '170'],
                 ],
                 'LAST_USER_NAME' => [
-                    'header' => '会员编号',
+                    'header' => 'Member code',//会员编号
                     'headerOther' => [
                         'width' => '150',
                     ],
@@ -102,7 +102,7 @@ class PeriodBonusList extends \common\libs\dataList\DataList implements DataList
                     ],
                 ],
                 'LAST_REAL_NAME' => [
-                    'header' => '会员姓名',
+                    'header' => 'Member name',//会员姓名
                     'headerOther' => [
                         'width' => '120',
                     ],
@@ -111,31 +111,31 @@ class PeriodBonusList extends \common\libs\dataList\DataList implements DataList
                     ],
                 ],
                 'LAST_DEC_LV_NAME' => [
-                    'header' => '结算时会员级别',
+                    'header' => 'Member level at settlement',//结算时会员级别
                     'headerOther' => [
                         'width' => '120',
                     ],
                 ],
                 'LAST_EMP_LV_NAME' => [
-                    'header' => '结算时会员聘级',
+                    'header' => 'Member rank at settlement',//结算时会员聘级
                     'headerOther' => [
                         'width' => '140',
                     ],
                 ],
                 'LAST_MOBILE' => [
-                    'header' => '手机号码',
+                    'header' => 'phone number',//手机号码
                     'headerOther' => [
                         'width' => '120',
                     ],
                 ],
                 'LAST_PERIOD_AT' => [
-                    'header' => '加入期数',
+                    'header' => 'Number of joining periods',//加入期数
                     'headerOther' => [
                         'width' => '100',
                     ],
                 ],
                 'LAST_CREATED_AT' => [
-                    'header' => '加入时间',
+                    'header' => 'Join time',//加入时间
                     'value' => function($row) {
                         return (new DateTime([
                             'value' => $row['LAST_CREATED_AT'],
@@ -144,25 +144,25 @@ class PeriodBonusList extends \common\libs\dataList\DataList implements DataList
                     'headerOther' => ['width' => '170'],
                 ],
                 'LAST_REC_USER_NAME' => [
-                    'header' => '开拓者编号',
+                    'header' => 'Pioneer No',//开拓者编号
                     'headerOther' => [
                         'width' => '150',
                     ],
                 ],
                 'LAST_REC_REAL_NAME' => [
-                    'header' => '开拓者姓名',
+                    'header' => 'Pioneer name',//开拓者姓名
                     'headerOther' => [
                         'width' => '100',
                     ],
                 ],
                 'LAST_CON_USER_NAME' => [
-                    'header' => '上级编号',
+                    'header' => 'Superior code',//上级编号
                     'headerOther' => [
                         'width' => '150',
                     ],
                 ],
                 'LAST_CON_REAL_NAME' => [
-                    'header' => '上级姓名',
+                    'header' => 'Superior name',//上级姓名
                     'headerOther' => [
                         'width' => '100',
                     ],
@@ -276,7 +276,7 @@ class PeriodBonusList extends \common\libs\dataList\DataList implements DataList
 //                    ],
 //                ],
                 'BONUS_TG' => [
-                    'header' => '销售奖金',
+                    'header' => 'Sales bonus',//销售奖金
                     'value' => function($row) {
                         return (new Price([
                             'value' => $row['BONUS_TG'],
@@ -288,7 +288,7 @@ class PeriodBonusList extends \common\libs\dataList\DataList implements DataList
                     ],
                 ],
                 'ORI_BONUS_TG' => [
-                    'header' => '销售奖金原金额',
+                    'header' => 'Original amount of sales bonus',//销售奖金原金额
                     'value' => function($row) {
                         return (new Price([
                             'value' => $row['ORI_BONUS_TG'],
@@ -300,7 +300,7 @@ class PeriodBonusList extends \common\libs\dataList\DataList implements DataList
                     ],
                 ],
                 'BONUS_QY' => [
-                    'header' => '绩效奖金',
+                    'header' => 'achievement bonus',//绩效奖金
                     'value' => function($row) {
                         return (new Price([
                             'value' => $row['BONUS_QY'],
@@ -312,7 +312,7 @@ class PeriodBonusList extends \common\libs\dataList\DataList implements DataList
                     ],
                 ],
                 'ORI_BONUS_QY' => [
-                    'header' => '绩效奖金原金额',
+                    'header' => 'Original amount of performance bonus',//绩效奖金原金额
                     'value' => function($row) {
                         return (new Price([
                             'value' => $row['ORI_BONUS_QY'],
@@ -324,7 +324,7 @@ class PeriodBonusList extends \common\libs\dataList\DataList implements DataList
                     ],
                 ],
                 'ORI_CAPPED_BONUS_QY' => [
-                    'header' => '绩效奖未封顶金额',
+                    'header' => 'Uncapped amount of Performance Award',//绩效奖未封顶金额
                     'value' => function($row) {
                         return (new Price([
                             'value' => $row['ORI_CAPPED_BONUS_QY'],
@@ -336,7 +336,7 @@ class PeriodBonusList extends \common\libs\dataList\DataList implements DataList
                     ],
                 ],
                 'ORI_BONUS_QY_BD' => [
-                    'header' => '报单团队奖原金额',
+                    'header' => 'Original amount of declaration Team Award',//报单团队奖原金额
                     'value' => function($row) {
                         return (new Price([
                             'value' => $row['ORI_BONUS_QY_BD'],
@@ -384,7 +384,7 @@ class PeriodBonusList extends \common\libs\dataList\DataList implements DataList
                 //     ],
                 // ],
                 'BONUS_BS_MNT' => [
-                    'header' => '蓝星管理奖',
+                    'header' => 'Bluestar Management Award',//蓝星管理奖
                     'value' => function($row) {
                         return (new Price([
                             'value' => $row['BONUS_BS_MNT'],
@@ -396,7 +396,7 @@ class PeriodBonusList extends \common\libs\dataList\DataList implements DataList
                     ],
                 ],
                 'ORI_BONUS_BS_MNT' => [
-                    'header' => '蓝星管理奖原金额',
+                    'header' => 'Original amount of Bluestar Management Award',//蓝星管理奖原金额
                     'value' => function($row) {
                         return (new Price([
                             'value' => $row['ORI_BONUS_BS_MNT'],
@@ -408,7 +408,7 @@ class PeriodBonusList extends \common\libs\dataList\DataList implements DataList
                     ],
                 ],
                 'BONUS_BS_ABBR' => [
-                    'header' => '蓝星业绩奖',
+                    'header' => 'Blue star performance award',//蓝星业绩奖
                     'value' => function($row) {
                         return (new Price([
                             'value' => $row['BONUS_BS_ABBR'],
@@ -420,7 +420,7 @@ class PeriodBonusList extends \common\libs\dataList\DataList implements DataList
                     ],
                 ],
                 'ORI_BONUS_BS_ABBR' => [
-                    'header' => '蓝星业绩奖原金额',
+                    'header' => 'Original amount of blue star performance award',//蓝星业绩奖原金额
                     'value' => function($row) {
                         return (new Price([
                             'value' => $row['ORI_BONUS_BS_ABBR'],
@@ -492,7 +492,7 @@ class PeriodBonusList extends \common\libs\dataList\DataList implements DataList
 //                    ],
 //                ],
                 'BONUS_REAL' => [
-                    'header' => '实发奖金',
+                    'header' => 'Actual bonus',//实发奖金
                     'value' => function($row) {
                         return (new Price([
                             'value' => $row['BONUS_REAL'],
@@ -504,7 +504,7 @@ class PeriodBonusList extends \common\libs\dataList\DataList implements DataList
                     ],
                 ],
                 'BONUS_TOTAL' => [
-                    'header' => '总奖金',
+                    'header' => 'Total bonus',//总奖金
                     'value' => function($row) {
                         return (new Price([
                             'value' => $row['BONUS_TOTAL'],
@@ -516,7 +516,7 @@ class PeriodBonusList extends \common\libs\dataList\DataList implements DataList
                     ],
                 ],
                 'MANAGE_TAX' => [
-                    'header' => '管理费',
+                    'header' => 'Management Expense',//管理费
                     'value' => function($row) {
                         return (new Price([
                             'value' => $row['MANAGE_TAX'],
@@ -540,7 +540,7 @@ class PeriodBonusList extends \common\libs\dataList\DataList implements DataList
 //                    ],
 //                ],
                 'BONUS_INCOME' => [
-                    'header' => '总收入',
+                    'header' => 'Total revenue',//总收入
                     'value' => function($row) {
                         return (new Price([
                             'value' => $row['BONUS_INCOME'],
@@ -564,7 +564,7 @@ class PeriodBonusList extends \common\libs\dataList\DataList implements DataList
 //                    ],
 //                ],
                 'CALC_MONTH' => [
-                    'header' => '结算月',
+                    'header' => 'Settlement month',//结算月
                     'headerOther' => [
                         'width' => '100',
                     ],
@@ -740,33 +740,33 @@ class PeriodBonusList extends \common\libs\dataList\DataList implements DataList
     {
         if(!$this->filterTypes){
             $this->filterTypes = [
-                'LAST_USER_NAME'=> ['isUserTable'=> false, 'name'=> '会员编号'],
-                'LAST_REAL_NAME'=> ['isUserTable'=> false, 'name'=> '会员姓名'],
-                'LAST_DEC_LV_NAME'=> ['isUserTable'=> false, 'name'=> '结算时会员级别', 'other'=> 'decLevel'],
-                'LAST_EMP_LV_NAME'=> ['isUserTable'=> false, 'name'=> '结算时会员聘级', 'other'=> 'empLevel'],
-                'LAST_MOBILE'=> ['isUserTable'=> false, 'name'=> '手机号'],
-                'LAST_PERIOD_AT'=> ['isUserTable'=> false, 'name'=> '加入期数'],
-                'LAST_CREATED_AT'=> ['isUserTable'=> false, 'name'=> '加入时间', 'other'=> 'date'],
-                'LAST_REC_USER_NAME'=> ['isUserTable'=> false, 'name'=> '开拓者编号'],
-                'LAST_REC_REAL_NAME'=> ['isUserTable'=> false, 'name'=> '开拓者姓名'],
-                'LAST_CON_USER_NAME'=> ['isUserTable'=> false, 'name'=> '上级编号'],
-                'LAST_CON_REAL_NAME'=> ['isUserTable'=> false, 'name'=> '上级姓名'],
-                'PV_1L'=> ['isUserTable'=> false, 'name'=> '一市场新增业绩'],
-                'SURPLUS_1L'=> ['isUserTable'=> false, 'name'=> '一市场结余业绩'],
-                'PV_2L'=> ['isUserTable'=> false, 'name'=> '二市场新增业绩'],
-                'SURPLUS_2L'=> ['isUserTable'=> false, 'name'=> '二市场结余业绩'],
-                'PV_3L'=> ['isUserTable'=> false, 'name'=> '三市场新增业绩'],
-                'SURPLUS_3L'=> ['isUserTable'=> false, 'name'=> '三市场结余业绩'],
-                'BONUS_BD'=> ['isUserTable'=> false, 'name'=> '服务奖'],
-                'BONUS_TG'=> ['isUserTable'=> false, 'name'=> '推广奖'],
-                'BONUS_XF'=> ['isUserTable'=> false, 'name'=> '消费奖'],
-                'BONUS_YJ'=> ['isUserTable'=> false, 'name'=> '业绩奖'],
-                'BONUS_GX'=> ['isUserTable'=> false, 'name'=> '共享奖'],
-                'BONUS_GL'=> ['isUserTable'=> false, 'name'=> '管理奖'],
-                'BONUS_QY'=> ['isUserTable'=> false, 'name'=> '团队奖'],
-                'BONUS_YC'=> ['isUserTable'=> false, 'name'=> '荣衔奖'],
-                'ORI_BONUS_STANDARD'=> ['isUserTable'=> false, 'name'=> '团队成长奖'],
-                'CALC_MONTH'=> ['isUserTable'=> false, 'name'=> '结算月'],
+                'LAST_USER_NAME'=> ['isUserTable'=> false, 'name'=> 'Member code'],//会员编号
+                'LAST_REAL_NAME'=> ['isUserTable'=> false, 'name'=> 'Member name'],//会员姓名
+                'LAST_DEC_LV_NAME'=> ['isUserTable'=> false, 'name'=> 'Member level at settlement', 'other'=> 'decLevel'],//结算时会员级别
+                'LAST_EMP_LV_NAME'=> ['isUserTable'=> false, 'name'=> 'Member rank at settlement', 'other'=> 'empLevel'],//结算时会员聘级
+                'LAST_MOBILE'=> ['isUserTable'=> false, 'name'=> 'phone number'],//手机号
+                'LAST_PERIOD_AT'=> ['isUserTable'=> false, 'name'=> 'Number of joining periods'],//加入期数
+                'LAST_CREATED_AT'=> ['isUserTable'=> false, 'name'=> 'Join time', 'other'=> 'date'],//加入时间
+                'LAST_REC_USER_NAME'=> ['isUserTable'=> false, 'name'=> 'Pioneer No'],//开拓者编号
+                'LAST_REC_REAL_NAME'=> ['isUserTable'=> false, 'name'=> 'Pioneer name'],//开拓者姓名
+                'LAST_CON_USER_NAME'=> ['isUserTable'=> false, 'name'=> 'Superior number'],//上级编号
+                'LAST_CON_REAL_NAME'=> ['isUserTable'=> false, 'name'=> 'Name of superior'],//上级姓名
+                'PV_1L'=> ['isUserTable'=> false, 'name'=> 'I. new market performance'],//一市场新增业绩
+                'SURPLUS_1L'=> ['isUserTable'=> false, 'name'=> 'I. market balance performance'],//一市场结余业绩
+                'PV_2L'=> ['isUserTable'=> false, 'name'=> 'II. new market performance'],//二市场新增业绩
+                'SURPLUS_2L'=> ['isUserTable'=> false, 'name'=> 'II. market balance performance'],//二市场结余业绩
+                'PV_3L'=> ['isUserTable'=> false, 'name'=> 'III. new market performance'],//三市场新增业绩
+                'SURPLUS_3L'=> ['isUserTable'=> false, 'name'=> 'III. market balance performance'],//三市场结余业绩
+                'BONUS_BD'=> ['isUserTable'=> false, 'name'=> 'Service Award'],//服务奖
+                'BONUS_TG'=> ['isUserTable'=> false, 'name'=> 'Promotion Award'],//推广奖
+                'BONUS_XF'=> ['isUserTable'=> false, 'name'=> 'Consumption Award'],//消费奖
+                'BONUS_YJ'=> ['isUserTable'=> false, 'name'=> 'Performance Award'],//业绩奖
+                'BONUS_GX'=> ['isUserTable'=> false, 'name'=> 'Sharing Award'],//共享奖
+                'BONUS_GL'=> ['isUserTable'=> false, 'name'=> 'Management Award'],//管理奖
+                'BONUS_QY'=> ['isUserTable'=> false, 'name'=> 'Team award'],//团队奖
+                'BONUS_YC'=> ['isUserTable'=> false, 'name'=> 'Honor Award'],//荣衔奖
+                'ORI_BONUS_STANDARD'=> ['isUserTable'=> false, 'name'=> 'Team growth Award'],//团队成长奖
+                'CALC_MONTH'=> ['isUserTable'=> false, 'name'=> 'Settlement month'],//结算月
             ];
         }
         return $this->filterTypes;

backendApi/modules/v1/models/lists/finance/BalanceAuditList.php

@@ -74,35 +74,35 @@ class BalanceAuditList extends \common\libs\dataList\DataList implements DataLis
                 'ID' => null, // 这种传输方式主要是用于索引，因为过滤后的字段可能没有这种ID，但是一些功能的操作还需要用这种ID去关联，例如前台会员列表中的勾选批量状态管理，这里需要的就是USER_ID
                 'AUDIT_STATUS' => null,
                 'USER_NAME' => [
-                    'header' => '会员编号',
+                    'header' => 'Member code',//会员编号
                     'headerOther' => ['width' => '150'],
                 ],
                 'REAL_NAME' => [
-                    'header' => '会员姓名',
+                    'header' => 'Member name',//会员姓名
                     'headerOther' => [
                         'width' => '120',
                     ],
                 ],
                 'LAST_DEC_LV_NAME' => [
-                    'header' => '会员级别',
+                    'header' => 'Member level',//会员级别
                     'headerOther' => [
                         'width' => '110',
                     ],
                 ],
                 'LAST_DEC_ROLE_NAME' => [
-                    'header' => '报单中心级别',
+                    'header' => 'Declaration center level',//报单中心级别
                     'headerOther' => [
                         'width' => '110',
                     ],
                 ],
                 'LAST_EMP_LV_NAME' => [
-                    'header' => '聘级',
+                    'header' => 'Rank',//聘级
                     'headerOther' => [
                         'width' => '130',
                     ],
                 ],
                 'TYPE_NAME' => [
-                    'header' => '账户类型',
+                    'header' => 'Account type',//账户类型
                     'headerOther' => [
                         'width' => '140',
                     ],
@@ -113,7 +113,7 @@ class BalanceAuditList extends \common\libs\dataList\DataList implements DataLis
                     },
                 ],
                 'DEAL_TYPE_NAME' => [
-                    'header' => '交易类型',
+                    'header' => 'Transaction type',//交易类型
                     'headerOther' => [
                         'width' => '200',
                     ],
@@ -124,7 +124,7 @@ class BalanceAuditList extends \common\libs\dataList\DataList implements DataLis
                     },
                 ],
                 'AMOUNT' => [
-                    'header' => '调整金额',
+                    'header' => 'Adjustment amount',//调整金额
                     'headerOther' => [
                         'width' => '150',
                     ],
@@ -138,13 +138,13 @@ class BalanceAuditList extends \common\libs\dataList\DataList implements DataLis
                     },
                 ],
                 'CREATE_REMARK' => [
-                    'header' => '备注',
+                    'header' => 'Note',//备注
                     'headerOther' => [
                         'width' => '180',
                     ],
                 ],
                 'REMARK_IS_SHOW' => [
-                    'header' => '前台是否显示备注',
+                    'header' => 'Whether the front desk displays comments',//前台是否显示备注
                     'value' => function ($row) {
                         return (new YesNo([
                             'value' => $row['REMARK_IS_SHOW'],
@@ -155,7 +155,7 @@ class BalanceAuditList extends \common\libs\dataList\DataList implements DataLis
                     ],
                 ],
                 'AUDIT_STATUS_NAME' => [
-                    'header' => '审核状态',
+                    'header' => 'Audit status',//审核状态
                     'headerOther' => [
                         'width' => '100',
                     ],
@@ -166,13 +166,13 @@ class BalanceAuditList extends \common\libs\dataList\DataList implements DataLis
                     },
                 ],
                 'CREATE_ADMIN_NAME' => [
-                    'header' => '申请人',
+                    'header' => 'applicant',//申请人
                     'headerOther' => [
                         'width' => '150',
                     ],
                 ],
                 'CREATED_AT' => [
-                    'header' => '申请时间',
+                    'header' => 'Application time',//申请时间
                     'value' => function ($row) {
                         return (new DateTime([
                             'value' => $row['CREATED_AT'],
@@ -181,13 +181,13 @@ class BalanceAuditList extends \common\libs\dataList\DataList implements DataLis
                     'headerOther' => ['width' => '190'],
                 ],
                 'AUDIT_ADMIN_NAME' => [
-                    'header' => '审核人',
+                    'header' => 'Reviewed by',//审核人
                     'headerOther' => [
                         'width' => '150',
                     ],
                 ],
                 'AUDITED_AT' => [
-                    'header' => '审核时间',
+                    'header' => 'Audit time',//审核时间
                     'value' => function ($row) {
                         return (new DateTime([
                             'value' => $row['AUDITED_AT'],
@@ -207,20 +207,20 @@ class BalanceAuditList extends \common\libs\dataList\DataList implements DataLis
     public function getFilterTypes() {
         if (!$this->filterTypes) {
             $this->filterTypes = [
-                'USER_NAME' => ['isUserTable' => false, 'name' => '会员编号'],
-                'REAL_NAME' => ['isUserTable' => false, 'name' => '会员姓名'],
-                'LAST_DEC_LV_NAME' => ['isUserTable' => false, 'name' => '会员级别', 'other' => 'decLevel'],
-                'LAST_DEC_ROLE_NAME' => ['isUserTable' => false, 'name' => '报单中心级别', 'other' => 'decRole'],
-                'LAST_EMP_LV_NAME' => ['isUserTable' => false, 'name' => '聘级', 'other' => 'empLevel'],
-                'TYPE_NAME' => ['isUserTable' => false, 'name' => '账户类型', 'other' => 'select', 'selectData' => Tool::formatFilter(BalanceAudit::TYPE, 'name', 'label')],
-                'DEAL_TYPE_NAME' => ['isUserTable' => false, 'name' => '交易类型', 'other' => 'select', 'selectData' => Tool::formatFilter(DealType::getAllTypesForShow(), 'ID', 'TYPE_NAME')],
-                'AMOUNT' => ['isUserTable' => false, 'name' => '调整金额'],
-                'CREATE_REMARK' => ['isUserTable' => false, 'name' => '备注'],
-                'REMARK_IS_SHOW' => ['isUserTable' => false, 'name' => '前台是否显示备注', 'other' => 'yesOrNo'],
-                'CREATE_ADMIN_NAME' => ['isUserTable' => false, 'name' => '申请人'],
-                'CREATED_AT' => ['isUserTable' => false, 'name' => '申请时间', 'other' => 'date'],
-                'AUDIT_ADMIN_NAME' => ['isUserTable' => false, 'name' => '审核人'],
-                'AUDITED_AT' => ['isUserTable' => false, 'name' => '审核时间', 'other' => 'date'],
+                'USER_NAME' => ['isUserTable' => false, 'name' => 'Member code'],//会员编号
+                'REAL_NAME' => ['isUserTable' => false, 'name' => 'Member name'],//会员姓名
+                'LAST_DEC_LV_NAME' => ['isUserTable' => false, 'name' => 'Member level', 'other' => 'decLevel'],//会员级别
+                'LAST_DEC_ROLE_NAME' => ['isUserTable' => false, 'name' => 'Declaration center level', 'other' => 'decRole'],//报单中心级别
+                'LAST_EMP_LV_NAME' => ['isUserTable' => false, 'name' => 'rank', 'other' => 'empLevel'],//聘级
+                'TYPE_NAME' => ['isUserTable' => false, 'name' => 'Account type', 'other' => 'select', 'selectData' => Tool::formatFilter(BalanceAudit::TYPE, 'name', 'label')],//账户类型
+                'DEAL_TYPE_NAME' => ['isUserTable' => false, 'name' => 'Transaction type', 'other' => 'select', 'selectData' => Tool::formatFilter(DealType::getAllTypesForShow(), 'ID', 'TYPE_NAME')],//交易类型
+                'AMOUNT' => ['isUserTable' => false, 'name' => 'Adjustment amount'],//调整金额
+                'CREATE_REMARK' => ['isUserTable' => false, 'name' => 'Note'],//备注
+                'REMARK_IS_SHOW' => ['isUserTable' => false, 'name' => 'Whether the front desk displays comments', 'other' => 'yesOrNo'],//前台是否显示备注
+                'CREATE_ADMIN_NAME' => ['isUserTable' => false, 'name' => 'applicant'],//申请人
+                'CREATED_AT' => ['isUserTable' => false, 'name' => 'Application time', 'other' => 'date'],//申请时间
+                'AUDIT_ADMIN_NAME' => ['isUserTable' => false, 'name' => 'Reviewed by'],//审核人
+                'AUDITED_AT' => ['isUserTable' => false, 'name' => 'Audit time', 'other' => 'date'],//审核时间
             ];
         }
         return $this->filterTypes;

backendApi/modules/v1/models/lists/finance/TransferList.php

@@ -62,7 +62,7 @@ class TransferList extends \common\libs\dataList\DataList implements DataListInt
             $this->columns = [
                 'ID' => null, // 这种传输方式主要是用于索引，因为过滤后的字段可能没有这种ID，但是一些功能的操作还需要用这种ID去关联，例如前台会员列表中的勾选批量状态管理，这里需要的就是USER_ID
                 'TRANSFER_SN' => [
-                    'header' => '转账记录流水号',
+                    'header' => 'Transfer record serial number',//转账记录流水号
                     'headerOther' => [
                         'width' => '250',
                     ],
@@ -73,11 +73,11 @@ class TransferList extends \common\libs\dataList\DataList implements DataListInt
                     },
                 ],
                 'LAST_OUT_USER_NAME' => [
-                    'header' => '转出会员编号',
+                    'header' => 'Transfer out Member No',//转出会员编号
                     'headerOther' => ['width' => '150'],
                 ],
                 'LAST_OUT_REAL_NAME' => [
-                    'header' => '转出会员姓名',
+                    'header' => 'Name of transfer out member',//转出会员姓名
                     'headerOther' => [
                         'width' => '120',
                     ],

backendApi/modules/v1/models/lists/shop/GoodsList.php

@@ -159,6 +159,20 @@ class GoodsList extends \common\libs\dataList\DataList implements DataListInterf
                         ];
                     },
                 ],
+                'TAX' => [
+                    'header' => 'Tax(₦)',//税额
+                    'headerOther' => [
+                        'width' => '150',
+                    ],
+                    'value' => function ($row) {
+                        return Tool::formatPrice($row['SELL_PRICE'] - $row['SELL_PRICE'] / (1 + $row['TAX_RATE'] / 100));
+                    },
+                    'valueOther' => function ($row) {
+                        return [
+                            'tag' => ['type' => 'danger', 'size' => 'small', 'class' => 'no-border']
+                        ];
+                    },
+                ],
                 'STORE_NUMS' => [
                     'header' => 'Inventory',//库存
                     'headerOther' => [

backendApi/modules/v1/models/lists/shop/OrderDecList.php

@@ -51,7 +51,7 @@ class OrderDecList extends \common\libs\dataList\DataList implements DataListInt
                     'headerOther' => ['width' => '120'],
                 ],
                 'SN' => [
-                    'header' => 'SN',//订单号
+                    'header' => 'Order code',//订单号
                     'headerOther' => ['width' => '200'],
                 ],
                 'CONSIGNEE' => [

backendApi/modules/v1/models/lists/shop/OrderList.php

@@ -69,7 +69,7 @@ class OrderList extends \common\libs\dataList\DataList implements DataListInterf
                     'headerOther' => ['width' => '120'],
                 ],
                 'SN' => [
-                    'header' => 'SN',//订单号
+                    'header' => 'Order code',//订单号
                     'headerOther' => ['width' => '200'],
                 ],
                 'STATUS' => null,

backendApi/modules/v1/models/lists/shop/OrderShopList.php

@@ -54,7 +54,7 @@ class OrderShopList extends \common\libs\dataList\DataList implements DataListIn
                     'headerOther' => ['width' => '120'],
                 ],
                 'SN' => [
-                    'header' => 'SN',//订单号
+                    'header' => 'Order code',//订单号
                     'headerOther' => ['width' => '200'],
                 ],
                 'PAY_TYPE' => [

backendApi/modules/v1/models/lists/shop/OrderStandardList.php

@@ -55,7 +55,7 @@ class OrderStandardList extends \common\libs\dataList\DataList implements DataLi
                     'headerOther' => ['width' => '120'],
                 ],
                 'SN' => [
-                    'header' => 'SN',//订单号
+                    'header' => 'Order code',//订单号
                     'headerOther' => ['width' => '200'],
                 ],
                 'PAY_TYPE' => [

backendEle/src/router/index.js

@@ -105,32 +105,32 @@ export const constantRouterMap = [
         },
 
       },
-        {
-            path: '/shop/package',
-            component: _import('shop/package'),
-            name: 'shop_package',
-            meta: {
-                title: 'Kitting products list',//报单套餐列表
-                breadcrumb: [
-                    {title: 'Dashboard', path: '/dashboard/index'},//首页
-                    {title: 'Shopping Mall', path: '/shop/dec-order-list'},//商城管理
-                ],
-            },
-
-        },
-        {
-            path: '/shop/package-add',
-            component: _import('shop/package-add'),
-            name: 'shop_package-add',
-            meta: {
-                title: 'Add Kitting products',//报单套餐添加
-                breadcrumb: [
-                    {title: 'Dashboard', path: '/dashboard/index'},//首页
-                    {title: 'Shopping Mall', path: '/shop/dec-order-list'},//商城管理
-                ],
-            },
-
-        },
+        // {
+        //     path: '/shop/package',
+        //     component: _import('shop/package'),
+        //     name: 'shop_package',
+        //     meta: {
+        //         title: 'Kitting products list',//报单套餐列表
+        //         breadcrumb: [
+        //             {title: 'Dashboard', path: '/dashboard/index'},//首页
+        //             {title: 'Shopping Mall', path: '/shop/dec-order-list'},//商城管理
+        //         ],
+        //     },
+        //
+        // },
+        // {
+        //     path: '/shop/package-add',
+        //     component: _import('shop/package-add'),
+        //     name: 'shop_package-add',
+        //     meta: {
+        //         title: 'Add Kitting products',//报单套餐添加
+        //         breadcrumb: [
+        //             {title: 'Dashboard', path: '/dashboard/index'},//首页
+        //             {title: 'Shopping Mall', path: '/shop/dec-order-list'},//商城管理
+        //         ],
+        //     },
+        //
+        // },
         {
             path: '/shop/index',
             component: _import('shop/index'),
@@ -711,10 +711,10 @@ export const constantRouterMap = [
         component: _import('bonus/new-period-bonus'),
         name: 'bonus_new-period-bonus',
         meta: {
-          title: '最新奖金',
+          title: 'Latest bonus',//最新奖金
           breadcrumb: [
-            {title: '首页', path: '/dashboard/index'},
-            {title: '奖金管理', path: '/bonus/period'},
+            {title: 'Dashboard', path: '/dashboard/index'},//首页
+            {title: 'Bonus management', path: '/bonus/period'},//奖金管理
           ],
         },
       },
@@ -723,10 +723,10 @@ export const constantRouterMap = [
         component: _import('bonus/other-period-bonus'),
         name: 'bonus_other-period-bonus',
         meta: {
-          title: '往期奖金',
+          title: 'Previous bonuses',//往期奖金
           breadcrumb: [
-            {title: '首页', path: '/dashboard/index'},
-            {title: '奖金管理', path: '/bonus/period'},
+            {title: 'Dashboard', path: '/dashboard/index'},//首页
+            {title: 'Bonus management', path: '/bonus/period'},//奖金管理
           ],
         },
       },
@@ -735,10 +735,10 @@ export const constantRouterMap = [
         component: _import('bonus/flow-bonus'),
         name: 'bonus_flow-bonus',
         meta: {
-          title: '奖金流水',
+          title: 'Bonus flow',//奖金流水
           breadcrumb: [
-            {title: '首页', path: '/dashboard/index'},
-            {title: '奖金管理', path: '/bonus/period'},
+            {title: 'Dashboard', path: '/dashboard/index'},//首页
+            {title: 'Bonus management', path: '/bonus/period'},//奖金管理
           ],
         },
       },
@@ -1219,10 +1219,10 @@ export const constantRouterMap = [
         component: _import('finance/balance-audit-list'),
         name: 'finance_balance-audit-list',
         meta: {
-          title: '会员余额调整列表',
+          title: 'Member balance adjustment list',//会员余额调整列表
           breadcrumb: [
-            {title: '首页', path: '/dashboard/index'},
-            {title: '财务管理', path: '/finance/balance-audit-list'},
+            {title: 'Dashboard', path: '/dashboard/index'},//首页
+            {title: 'Financial management', path: '/finance/balance-audit-list'},//财务管理
           ],
         },
       },
@@ -1258,10 +1258,10 @@ export const constantRouterMap = [
         component: _import('finance/transfer-list'),
         name: 'finance_transfer-list',
         meta: {
-          title: '转账记录列表',
+          title: 'Transfer record list',//转账记录列表
           breadcrumb: [
-            {title: '首页', path: '/dashboard/index'},
-            {title: '财务管理', path: '/finance/balance-audit-list'},
+            {title: 'Dashboard', path: '/dashboard/index'},//首页
+            {title: 'Financial management', path: '/finance/balance-audit-list'},//财务管理
           ],
         },
       },

backendEle/src/views/admin/role.vue

@@ -111,10 +111,10 @@
         this.multipleSelection = val
       },
       handleCurrentChange (page) {
-        this.getData(this, page, this.pageSize)
+        this.getData(page, this.pageSize)
       },
       handleSizeChange (pageSize) {
-        this.getData(this, this.currentPage, pageSize)
+        this.getData(this.currentPage, pageSize)
       },
       handleRow (command) {
         let re = command.split('|')

backendEle/src/views/bonus/balance-list.vue

@@ -25,31 +25,31 @@
         <!--<el-button type="primary" size="small" @click="handleSendShow" icon="el-icon-plus"-->
                    <!--v-show="permission.hasPermission(`bonus/cf-lx-apply`)">年度奖申请发放-->
         <!--</el-button>-->
-        <el-button type="success" size="small" @click="handleExport" v-show="permission.hasPermission(`bonus/balance-export`)">导出Excel</el-button>
+        <el-button type="success" size="small" @click="handleExport" v-show="permission.hasPermission(`bonus/balance-export`)"><!-- 导出Excel -->Export Excel</el-button>
         <pagination :total="totalCount" :page_size="pageSize" @size-change="handleSizeChange"
                     @current-change="handleCurrentChange"></pagination>
       </div>
     </div>
-    <el-dialog title="年度奖发放" :visible.sync="dialogVisible" v-loading="dialogLoading">
+    <el-dialog title="Annual award distribution" :visible.sync="dialogVisible" v-loading="dialogLoading"><!-- 年度奖发放 -->
       <el-form :model="form" label-width="250px" class="form-dialog">
-        <el-form-item label="发放类型">
-          <el-select v-model="form.sendType" placeholder="请选择发放类型">
+        <el-form-item label="Distribution type"><!-- 发放类型 -->
+          <el-select v-model="form.sendType" placeholder="Please select the distribution type"><!-- 请选择发放类型 -->
             <el-option v-for="(item,index) in applyTypes" :key="index" :label="item.NAME"
                        :value="item.ID"></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="包含会员状态">
-          <el-select v-model="form.statusValue" placeholder="请选择状态" multiple>
+        <el-form-item label="Include member status"><!-- 包含会员状态 -->
+          <el-select v-model="form.statusValue" placeholder="Please select a status" multiple><!-- 请选择状态 -->
             <el-option v-for="(item,key) in statuses" :label="item.label" :value="item.value" :key="key"></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="备注">
-          <el-input type="textarea" :row="2" placeholder="请输入内容" v-model="form.remark"></el-input>
+        <el-form-item label="Note"><!-- 备注 -->
+          <el-input type="textarea" :row="2" placeholder="Please enter the content" v-model="form.remark"><!-- 请输入内容 --></el-input>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button @click="dialogVisible = false">取消</el-button>
-        <el-button type="primary" @click.native="handleSend">发放</el-button>
+        <el-button @click="dialogVisible = false"><!-- 取消 -->cancel</el-button>
+        <el-button type="primary" @click.native="handleSend"><!-- 发放 -->grant</el-button>
       </div>
     </el-dialog>
   </div>
@@ -94,9 +94,9 @@
         dialogLoading: false,
         statuses: null,
         applyTypes: [
-          {'ID': 'all', 'NAME': '全部'},
-          {'ID': 'cf', 'NAME': '车房养老'},
-          {'ID': 'lx', 'NAME': '领袖分红'}
+          {'ID': 'all', 'NAME': 'All'},//全部
+          {'ID': 'cf', 'NAME': 'Garage endowment'},//车房养老
+          {'ID': 'lx', 'NAME': 'Leader bonus'}//领袖分红
         ],
         form: {
           selectedIds: [],
@@ -130,7 +130,7 @@
       handleSendShow() {
         if (this.multipleSelection.length < 1) {
           this.$message({
-            message: '请勾选要申请发放的会员',
+            message: 'Please check the member to apply for distribution',//请勾选要申请发放的会员
             type: 'warning'
           })
           return false
@@ -140,7 +140,7 @@
       handleSend() {
         this.dialogLoading = true
         this.$message({
-          message: '正在申请发放请稍后',
+          message: 'Applying for distribution, please wait',//正在申请发放请稍后
           type: 'info'
         })
         for (let val of this.multipleSelection) {
@@ -172,7 +172,7 @@
         if (columns && data && columns.length > 0 && data.length > 0) {
           columns.forEach((column, index) => {
             if (index === 0) {
-              sums[index] = '小计' + "\n" + '合计'
+              sums[index] = 'sub-total' + "\n" + 'Total' // '小计' + "\n" + '合计'
               return
             }
             const values = data.map(item => {
@@ -205,9 +205,9 @@
         return sums
       },
       handleExport(){
-        this.$confirm(`确定要导出当前数据吗？`, '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
+        this.$confirm(`Are you sure you want to export the current data？`, 'Hint', {//`确定要导出当前数据吗？`, '提示',
+          confirmButtonText: 'confirm',//确定
+          cancelButtonText: 'cancel',//取消
           type: 'warning'
         }).then(() => {
           return network.getData(`bonus/balance-export`, this.filterModel)

backendEle/src/views/bonus/flow-bonus.vue

@@ -17,7 +17,7 @@
         </el-table-column>
       </el-table>
       <div class="white-box-footer">
-        <el-button type="success" size="small" @click="handleExport" v-show="permission.hasPermission(`bonus/flow-bonus-export`)">导出Excel</el-button>
+        <el-button type="success" size="small" @click="handleExport" v-show="permission.hasPermission(`bonus/flow-bonus-export`)">Export Excel<!-- 导出Excel --></el-button>
         <pagination :total="totalCount" :page_size="pageSize" @size-change="handleSizeChange" @current-change="handleCurrentChange"></pagination>
       </div>
     </div>
@@ -73,9 +73,9 @@ export default {
       })
     },
     handleExport(){
-      this.$confirm(`确定要导出当前数据吗？`, '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
+      this.$confirm(`Are you sure you want to export the current data？`, 'Hint', {//`确定要导出当前数据吗？`, '提示'
+        confirmButtonText: 'confirm',//确定
+        cancelButtonText:  'cancel',//取消
         type: 'warning'
       }).then(() => {
         return network.getData(`bonus/flow-bonus-export`, this.filterModel)

backendEle/src/views/bonus/new-period-bonus.vue

@@ -17,7 +17,7 @@
         </el-table-column>
       </el-table>
       <div class="white-box-footer">
-        <el-button type="success" size="small" @click="handleExport" v-show="permission.hasPermission(`bonus/new-period-bonus-export`)">导出Excel</el-button>
+        <el-button type="success" size="small" @click="handleExport" v-show="permission.hasPermission(`bonus/new-period-bonus-export`)">Export Excel<!-- 导出Excel --></el-button>
         <pagination :total="totalCount" :page_size="pageSize" @size-change="handleSizeChange" @current-change="handleCurrentChange"></pagination>
       </div>
     </div>
@@ -89,7 +89,7 @@ export default {
       if(columns && data && columns.length>0 && data.length>0) {
         columns.forEach((column, index) => {
           if (index === 0) {
-            sums[index] = '小计' + "\n" + '合计'
+            sums[index] = 'sub-total' + "\n" + 'Total' //'小计' + "\n" + '合计'
             return
           }
           const values = data.map(item => {
@@ -122,9 +122,9 @@ export default {
       return sums
     },
     handleExport(){
-      this.$confirm(`确定要导出当前数据吗？`, '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
+      this.$confirm(`Are you sure you want to export the current data？`, 'Hint', {//`确定要导出当前数据吗？`, '提示'
+        confirmButtonText: 'confirm',//确定
+        cancelButtonText: 'cancel',//取消
         type: 'warning'
       }).then(() => {
         return network.getData(`bonus/new-period-bonus-export`, this.filterModel)

backendEle/src/views/bonus/other-period-bonus.vue

@@ -17,7 +17,7 @@
         </el-table-column>
       </el-table>
       <div class="white-box-footer">
-        <el-button type="success" size="small" @click="handleExport" v-show="permission.hasPermission(`bonus/new-period-bonus-export`)">导出Excel</el-button>
+        <el-button type="success" size="small" @click="handleExport" v-show="permission.hasPermission(`bonus/new-period-bonus-export`)">Export Excel<!-- 导出Excel --></el-button>
         <pagination :total="totalCount" :page_size="pageSize" @size-change="handleSizeChange" @current-change="handleCurrentChange"></pagination>
       </div>
     </div>
@@ -99,7 +99,7 @@
         if(columns && data && columns.length>0 && data.length>0) {
           columns.forEach((column, index) => {
             if (index === 0) {
-              sums[index] = '小计' + "\n" + '合计'
+              sums[index] = 'sub-total' + "\n" + 'Total' //'小计' + "\n" + '合计'
               return
             }
             const values = data.map(item => {
@@ -132,9 +132,9 @@
         return sums
       },
       handleExport(){
-        this.$confirm(`确定要导出当前数据吗？`, '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
+        this.$confirm(`Are you sure you want to export the current data？`, 'Hint', {//`确定要导出当前数据吗？`, '提示'
+          confirmButtonText: 'confirm',//确定
+          cancelButtonText: 'cancel',//取消
           type: 'warning'
         }).then(() => {
           return network.getData(`bonus/other-period-bonus-export`, this.filterModel)

backendEle/src/views/finance/balance-audit-list.vue

@@ -2,10 +2,10 @@
   <div v-loading="loading">
     <div class="white-box">
       <el-tabs v-model="filterStatus" @tab-click="handleFilterStatusClick">
-        <el-tab-pane label="全部" name="-1" :lazy="true"></el-tab-pane>
-        <el-tab-pane label="待审核" name="0" :lazy="true"></el-tab-pane>
-        <el-tab-pane label="审核通过" name="1" :lazy="true"></el-tab-pane>
-        <el-tab-pane label="审核拒绝" name="3" :lazy="true"></el-tab-pane>
+        <el-tab-pane label="All" name="-1" :lazy="true"></el-tab-pane><!-- 全部 -->
+        <el-tab-pane label="To be reviewed" name="0" :lazy="true"></el-tab-pane><!-- 待审核 -->
+        <el-tab-pane label="Approved" name="1" :lazy="true"></el-tab-pane><!-- 审核通过 -->
+        <el-tab-pane label="Audit reject" name="3" :lazy="true"></el-tab-pane><!-- 审核拒绝 -->
       </el-tabs>
       <div class="filter-box">
         <filter-user ref="filterUser" :filter-types="filterTypes" @select-value="handleFilterUser"></filter-user>
@@ -28,22 +28,22 @@
             </template>
           </template>
         </el-table-column>
-        <el-table-column fixed="right" label="操作" width="180" v-if="tableHeaders">
+        <el-table-column fixed="right" label="operation" width="180" v-if="tableHeaders"><!-- 操作 -->
           <template slot-scope="scope"
                     v-if="scope.row.AUDIT_STATUS==='0' && (permission.hasPermission(`finance/balance-audit-pass`) || permission.hasPermission(`finance/balance-audit`) || permission.hasPermission(`finance/balance-audit-delete`))">
             <el-dropdown size="small" trigger="click">
               <el-button type="primary" size="small" @click.stop="">
-                操作该数据<i class="el-icon-arrow-down el-icon--right"></i>
+                <!-- 操作该数据 -->Operate on this data<i class="el-icon-arrow-down el-icon--right"></i>
               </el-button>
               <el-dropdown-menu slot="dropdown">
                 <el-dropdown-item command="pass" @click.native="handleAuditShow(scope.row)"
-                                  v-show="permission.hasPermission(`finance/balance-audit-pass`)">审核通过
+                                  v-show="permission.hasPermission(`finance/balance-audit-pass`)">Approved<!-- 审核通过 -->
                 </el-dropdown-item>
                 <el-dropdown-item command="refuse" @click.native="handleAudit(scope.row, 'reject')"
-                                  v-show="permission.hasPermission(`finance/balance-audit`)">审核拒绝
+                                  v-show="permission.hasPermission(`finance/balance-audit`)">Audit reject<!-- 审核拒绝 -->
                 </el-dropdown-item>
                 <el-dropdown-item command="del" @click.native="handleDel(scope.row.ID)"
-                                  v-show="permission.hasPermission(`finance/balance-audit-delete`)">删除数据
+                                  v-show="permission.hasPermission(`finance/balance-audit-delete`)">Delete data<!-- 删除数据 -->
                 </el-dropdown-item>
               </el-dropdown-menu>
             </el-dropdown>
@@ -54,68 +54,68 @@
         <el-dropdown size="small" trigger="click" @command="handleMuli"
                      v-if="filterStatus==='0' && (permission.hasPermission(`finance/balance-audit`)||permission.hasPermission(`finance/balance-audit-delete`))">
           <el-button type="primary" size="small">
-            所选数据<i class="el-icon-arrow-down el-icon--right"></i>
+            <!-- 所选数据 -->Selected data<i class="el-icon-arrow-down el-icon--right"></i>
           </el-button>
           <el-dropdown-menu slot="dropdown">
-            <el-dropdown-item command="passMinus" v-if="permission.hasPermission(`finance/balance-audit`)">批量审核允许为负数</el-dropdown-item>
-            <el-dropdown-item command="pass" v-if="permission.hasPermission(`finance/balance-audit`)">批量审核不允许为负数</el-dropdown-item>
-            <el-dropdown-item command="reject" v-if="permission.hasPermission(`finance/balance-audit`)">批量拒审</el-dropdown-item>
-            <el-dropdown-item command="del" @click.native="handleDel()" v-if="permission.hasPermission(`finance/balance-audit-delete`)">批量删除</el-dropdown-item>
+            <el-dropdown-item command="passMinus" v-if="permission.hasPermission(`finance/balance-audit`)">Negative number allowed for batch approval<!-- 批量审核允许为负数 --></el-dropdown-item>
+            <el-dropdown-item command="pass" v-if="permission.hasPermission(`finance/balance-audit`)">Batch approval cannot be negative<!-- 批量审核不允许为负数 --></el-dropdown-item>
+            <el-dropdown-item command="reject" v-if="permission.hasPermission(`finance/balance-audit`)">Batch rejection<!-- 批量拒审 --></el-dropdown-item>
+            <el-dropdown-item command="del" @click.native="handleDel()" v-if="permission.hasPermission(`finance/balance-audit-delete`)">Batch delete<!-- 批量删除 --></el-dropdown-item>
           </el-dropdown-menu>
         </el-dropdown>
         <el-button type="primary" size="small" @click="handleAdd" icon="el-icon-plus"
-                   v-show="permission.hasPermission(`finance/change-balance-opt`)">申请变动会员余额
+                   v-show="permission.hasPermission(`finance/change-balance-opt`)">Apply for change of member balance<!-- 申请变动会员余额 -->
         </el-button>
         <el-button type="success" size="small" @click="handleExport"
-                   v-show="permission.hasPermission(`finance/balance-audit-list-export`)">导出Excel
+                   v-show="permission.hasPermission(`finance/balance-audit-list-export`)">Export Excel<!-- 导出Excel -->
         </el-button>
         <pagination :total="totalCount" :page_size="pageSize" @size-change="handleSizeChange" @current-change="handleCurrentChange"></pagination>
       </div>
-      <el-dialog title="修改会员余额变动信息" :visible.sync="dialogEditFormVisible">
+      <el-dialog title="Modify member balance change information" :visible.sync="dialogEditFormVisible"><!-- 修改会员余额变动信息 -->
         <el-form :model="form" label-width="150px" class="form-dialog" v-loading="dialogEditLoading">
-          <el-form-item label="会员编号">
+          <el-form-item label="Member code"><!-- 会员编号 -->
             <el-input v-model="form.baseInfo.USER_NAME" :disabled="true"></el-input>
           </el-form-item>
-          <el-form-item label="会员姓名">
+          <el-form-item label="Member name"><!-- 会员姓名 -->
             <el-input v-model="form.baseInfo.REAL_NAME" :disabled="true"></el-input>
           </el-form-item>
-          <el-form-item label="账户类型">
-            <el-select v-model="form.type" placeholder="请选择账户类型">
+          <el-form-item label="Account type"><!-- 账户类型 -->
+            <el-select v-model="form.type" placeholder="Please select account type"><!-- 请选择账户类型 -->
               <el-option v-for="(item,key) in type" :label="item.label" :value="key" :key="key"></el-option>
             </el-select>
           </el-form-item>
-          <el-form-item label="调整金额">
+          <el-form-item label="Adjustment amount"><!-- 调整金额 -->
             <el-input v-model="form.amount"></el-input>
           </el-form-item>
-          <el-form-item label="交易类型">
-            <el-select v-model="form.dealType" placeholder="请选择交易类型">
+          <el-form-item label="Transaction type"><!-- 交易类型 -->
+            <el-select v-model="form.dealType" placeholder="Please select transaction type"><!-- 请选择交易类型 -->
               <el-option v-for="(item,key) in dealTypes" :label="item.TYPE_NAME" :value="item.ID"
                          :key="item.ID"></el-option>
             </el-select>
           </el-form-item>
-          <el-form-item label="备注">
+          <el-form-item label="Note"><!-- 备注 -->
             <el-input v-model="form.remark"></el-input>
           </el-form-item>
-          <el-form-item label="备注前台显示">
+          <el-form-item label="Remarks foreground display"><!-- 备注前台显示 -->
             <el-switch v-model="form.isShow" active-value="1" inactive-value="0">
             </el-switch>
           </el-form-item>
         </el-form>
         <div slot="footer" class="dialog-footer">
-          <el-button @click="dialogEditFormVisible = false">取 消</el-button>
-          <el-button type="primary" @click.native="handleEdit">修 改</el-button>
+          <el-button @click="dialogEditFormVisible = false">Cancel<!-- 取 消 --></el-button>
+          <el-button type="primary" @click.native="handleEdit">Edit<!-- 修 改 --></el-button>
         </div>
       </el-dialog>
-      <el-dialog title="审核会员余额变动信息" :visible.sync="dialogAuditFormVisible">
+      <el-dialog title="Review member balance change information" :visible.sync="dialogAuditFormVisible"><!-- 审核会员余额变动信息 -->
         <el-form :model="form" label-width="250px" class="form-dialog" v-loading="dialogAuditLoading">
-          <el-form-item label="会员编号">
+          <el-form-item label="Member code"><!-- 会员编号 -->
             <el-input v-model="form.baseInfo.USER_NAME" :disabled="true"></el-input>
           </el-form-item>
-          <el-form-item label="会员姓名">
+          <el-form-item label="Member name"><!-- 会员姓名 -->
             <el-input v-model="form.baseInfo.REAL_NAME" :disabled="true"></el-input>
           </el-form-item>
-          <el-form-item label="账户类型">
-            <el-select v-model="form.type" placeholder="请选择账户类型">
+          <el-form-item label="Account type"><!-- 账户类型 -->
+            <el-select v-model="form.type" placeholder="Please select account type"><!-- 请选择账户类型 -->
               <el-option v-for="(item,key) in type" :label="item.label" :value="key" :key="key"></el-option>
             </el-select>
           </el-form-item>
@@ -123,26 +123,26 @@
                         v-for="(item,key) in type" :key="key">
             <el-input :value="form.baseInfo[item.name.toUpperCase()]" :disabled="true"></el-input>
           </el-form-item>
-          <el-form-item label="调整金额">
+          <el-form-item label="Adjustment amount"><!-- 调整金额 -->
             <el-input v-model="form.amount"></el-input>
           </el-form-item>
-          <el-form-item label="交易类型">
-            <el-select v-model="form.dealType" placeholder="请选择交易类型">
+          <el-form-item label="Transaction type"><!-- 交易类型 -->
+            <el-select v-model="form.dealType" placeholder="Please select transaction type"><!-- 请选择交易类型 -->
               <el-option v-for="(item,key) in dealTypes" :label="item.TYPE_NAME" :value="item.ID"
                          :key="item.ID"></el-option>
             </el-select>
           </el-form-item>
-          <el-form-item label="备注前台显示">
+          <el-form-item label="Remarks foreground display"><!-- 备注前台显示 -->
             <el-switch v-model="form.isShow" active-value="1" inactive-value="0">
             </el-switch>
           </el-form-item>
-          <el-form-item label="备注">
+          <el-form-item label="Note"><!-- 备注 -->
             <el-input v-model="form.remark"></el-input>
           </el-form-item>
         </el-form>
         <div slot="footer" class="dialog-footer">
-          <el-button @click="dialogAuditFormVisible = false">取 消</el-button>
-          <el-button type="primary" @click.native="handleAuditPass" :disabled="auditPassButtonStat">通 过</el-button>
+          <el-button @click="dialogAuditFormVisible = false">Cancel<!-- 取 消 --></el-button>
+          <el-button type="primary" @click.native="handleAuditPass" :disabled="auditPassButtonStat">Adopted<!-- 通 过 --></el-button>
         </div>
       </el-dialog>
     </div>
@@ -209,7 +209,7 @@
       handleMuli(command) {
         if (this.multipleSelection.length < 1) {
           this.$message({
-            message: '请选择要操作的记录',
+            message: 'Please select the record to operate',//请选择要操作的记录
             type: 'warning'
           })
           return;
@@ -240,7 +240,7 @@
       handleEdit() {
         this.dialogEditFormVisible = false
         this.$message({
-          message: '正在修改数据',
+          message: 'Modifying data',//正在修改数据
           type: 'info'
         })
         let path = 'finance/balance-audit-edit'
@@ -278,9 +278,9 @@
       handleAuditPass() {
           if (this.form.type === 'bonus') {
             if ((Number.parseFloat(this.form.baseInfo['BONUS']) + Number.parseFloat(this.form.amount)) < 0) {
-              this.$confirm(`会员账户余额不足，是否继续提交`, '提示', {
-                confirmButtonText: '确定',
-                cancelButtonText: '取消',
+              this.$confirm(`The member account balance is insufficient, continue to submit`, 'Hint', {//`会员账户余额不足，是否继续提交`, '提示'
+                confirmButtonText: 'confirm',//确定
+                cancelButtonText: 'cancel',//取消
                 type: 'warning'
               }).then(() => {
                 this._handleAuditPass()
@@ -298,7 +298,7 @@
       _handleAuditPass() {
         this.dialogAuditFormVisible = false
         this.$message({
-          message: '正在通过审核',
+          message: 'Passing the audit',//正在通过审核
           type: 'info'
         })
         this.form.auditStatus = 'true'
@@ -314,17 +314,17 @@
       },
       handleAudit(row = null, status, minus = false) {
         let obj = this
-        let title = '确定要通过审核（会员账户不允许为负数）？备注：'
+        let title = 'Are you sure to pass the approval (negative number is not allowed for member account)？Note：'  //确定要通过审核（会员账户不允许为负数）？备注：
         if (status === 'reject') {
-          title = '确定要拒绝审核？备注：'
+          title = 'Are you sure you want to reject the approval？Note：' //确定要拒绝审核？备注
         }else if(minus){
-          title = '确定要通过审核（会员账户允许为负数）？备注：'
+          title = 'Are you sure to pass the approval (negative number is allowed for member account)？Note：' //确定要通过审核（会员账户允许为负数）？备注
         }
           network.postData('finance/mult-point', {opType: 1}).then(response => {
               this.form.balanceCode = response.balanceCode
-              this.$prompt(title, '提示', {
-                confirmButtonText: '确定',
-                cancelButtonText: '取消',
+              this.$prompt(title, 'Hint', {//提示
+                confirmButtonText: 'confirm',//确定
+                cancelButtonText: 'cancel',//取消
                 inputValue: row ? row.REMARK : '',
                 //type: 'warning',
               }).then(({value}) => {
@@ -356,9 +356,9 @@
       },
       handleDel(id = null) {
         let obj = this
-        this.$confirm('确定删除选定的数据？', '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
+        this.$confirm('OK to delete the selected data？', 'Hint', {//'确定删除选定的数据？', '提示'
+          confirmButtonText: 'confirm',//确定
+          cancelButtonText: 'cancel',//取消
           type: 'warning'
         }).then(() => {
           let selectedIds = []
@@ -408,9 +408,9 @@
         })
       },
       handleExport(){
-        this.$confirm(`确定要导出当前数据吗？`, '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
+        this.$confirm(`Are you sure you want to export the current data？`, 'Hint', {//`确定要导出当前数据吗？`, '提示',
+          confirmButtonText: 'confirm',//确定
+          cancelButtonText: 'cancel',//取消
           type: 'warning'
         }).then(() => {
           return network.getData(`finance/balance-audit-list-export`, this.filterModel)
@@ -429,4 +429,4 @@
 
 <style scoped>
 
-</style>
+</style>

backendEle/src/views/finance/transfer-list.vue

@@ -23,7 +23,7 @@
       </el-table>
       <div class="white-box-footer">
         <el-button type="success" size="small" @click="handleExport"
-                   v-show="permission.hasPermission(`finance/transfer-list-export`)">导出Excel
+                   v-show="permission.hasPermission(`finance/transfer-list-export`)">Export Excel<!-- 导出Excel -->
         </el-button>
         <pagination :total="totalCount" :page_size="pageSize" @size-change="handleSizeChange"
                     @current-change="handleCurrentChange"></pagination>
@@ -85,9 +85,9 @@
         })
       },
       handleExport(){
-        this.$confirm(`确定要导出当前数据吗？`, '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
+        this.$confirm(`Are you sure you want to export the current data？`, 'Hint', {//`确定要导出当前数据吗？`, '提示'
+          confirmButtonText: 'confirm',//确定
+          cancelButtonText: 'cancel',//取消
           type: 'warning'
         }).then(() => {
           return network.getData(`finance/transfer-list-export`, this.filterModel)

common/config/main.php

@@ -64,7 +64,7 @@ return [
             'environment'   => YII_ENV,
             'testPublicKey' => 'pk_test_2eed10135c4a958c5073795b22854ded9d1a6c55',
             'testSecretKey' => 'sk_test_5ece72377432376f5cf6bb5c468395a650220309',
-            'livePublicKey' => 'sk_live_b93c6bbee2cc0e9c594547bf4779ec9852b9d055',
+            'livePublicKey' => 'pk_live_fae524f9d073d877beeb661fd825a37a9bc91f0a',
             'liveSecretKey' => 'sk_live_b93c6bbee2cc0e9c594547bf4779ec9852b9d055',
         ],
         // 配置SQL语句输出

common/helpers/Constant.php

@@ -1,5 +0,0 @@
-<?php
-
-/* ********************【服务通用状态码】************************* */
-const SUCCESS_CODE = 200;   // 成功
-const FAILED_CODE = 500;    // 失败

common/helpers/Tool.php

@@ -72,6 +72,19 @@ class Tool {
         }
     }
 
+    /**
+     * 计算商品税额
+     * @param $amount
+     * @param $taxRate
+     * @param int $buyNo
+     * @return float
+     */
+    public static function calculateTax($amount, $taxRate, int $buyNo = 1): float
+    {
+        $taxAmount = $amount - $amount / (1 + $taxRate / 100) * $buyNo;
+        return floatval(self::formatPrice($taxAmount));
+    }
+
     /**
      * 前台业绩格式化
      * @param $perf

common/helpers/bonus/BonusCalc.php

@@ -347,7 +347,7 @@ class BonusCalc extends BaseObject {
             echo('结算全部完成，共耗时：' . round($t35 - $t34, 3) . ',内存使用：' . (round(memory_get_usage() / 1024 / 1024, 3)) . 'MB' . PHP_EOL . PHP_EOL);
         } catch (\Exception $e) {
             $this->errorCalcTask();
-            $this->addError('calc', $e->getMessage());
+            $this->addError('calc', $e->getFile() . '  ' . $e->getLine() . '  ' . $e->getMessage());
             return false;
         }
         return true;

common/helpers/bonus/BonusSend.php

@@ -498,7 +498,7 @@ class BonusSend extends BaseObject {
     public function updateEmpLevel(int $offset = 0) {
         if ($this->_isCalcMonth) {
             $empLv = EmployLevel::getIdConvertLevelSortCache();
-            $allData = CalcBonusBS::findUseDbCalc()
+            $allData = CalcBonus::findUseDbCalc()
             ->yearMonth($this->_calcYearMonth)
             ->where(
                 'CALC_MONTH=:CALC_MONTH AND PERIOD_NUM=:PERIOD_NUM', 
@@ -508,7 +508,6 @@ class BonusSend extends BaseObject {
                 ]
             )
             ->orderBy('CREATED_AT DESC')
-            ->groupBy('USER_ID')
             ->offset($offset)
             ->limit($this->_limit)
             ->all();
@@ -519,15 +518,15 @@ class BonusSend extends BaseObject {
                 try {
                     foreach ($allData as $data) {
                         //@todo 用户级别不变则不更新
-                        if( $data['LEVEL_ID'] === $defaultEmpLv ) continue;
-                        $nowBsEmpLv = $data['LEVEL_ID']; // 当前蓝星奖计算(即管理奖) 的等级
+                        if( $data['LAST_EMP_LV'] === $defaultEmpLv ) continue;
+                        $nowBsEmpLv = $data['LAST_EMP_LV']; // 当前蓝星奖计算(即管理奖) 的等级
                         $user = CalcCache::getUserInfo($data['USER_ID'], $this->_periodNum);
                         $userEmpLv = $user['EMP_LV']; // 用户的历史最高聘级
                         $userEmpLvSort = $empLv[$userEmpLv]; // 历史最高聘级的 级别值
                         $nowBsEmpLvSort = $empLv[$nowBsEmpLv]; // 当前蓝星计算的聘级 级别值
                         if ($nowBsEmpLvSort > $userEmpLvSort) {
                             // 如果当前期的级别值大于历史最高级别,则更新用户表里的最高聘级
-                            User::updateAll(['EMP_LV' => $data['LEVEL_ID']], 'ID=:USER_ID', [':USER_ID' => $data['USER_ID']]);
+                            User::updateAll(['EMP_LV' => $nowBsEmpLv], 'ID=:USER_ID', [':USER_ID' => $data['USER_ID']]);
                             User::deleteBaseInfoFromRedis($data['USER_ID']);
                             unset($data);
                         } else {

common/libs/export/BaseExport.php

@@ -458,6 +458,8 @@ class BaseExport extends Component {
             $orderSn = '';
             $orderAmount = 0;  // 合计总额
             $orderNums = 0; // 合计总数
+            $totalTaxAmount = 0; // 合计税额
+            $totalAmount = 0;
             foreach ($oderList as $key => $value) {
                 $provinceName = $value['PROVINCE'] ? Region::getCnName($value['PROVINCE']) : '';
                 $cityName = $value['CITY'] ? Region::getCnName($value['CITY']) : '';
@@ -473,14 +475,19 @@ class BaseExport extends Component {
                 $totalAmount = $value['BUY_NUMS'] * $value['REAL_PRICE'];
                 $orderAmount += $totalAmount;
                 $orderNums += $value['BUY_NUMS'];
+                // 税额
+                $taxAmount = floatval(Tool::formatPrice(($value['REAL_PRICE'] - ($value['REAL_PRICE'] / (1 + $value['TAX_RATE'] / 100))) * $value['BUY_NUMS']));
+                $totalTaxAmount += $taxAmount;
                 // 订单详情
                 $orderDetails .= <<<EOT
                     <tr>
                         <td>{$value['SKU_CODE']}</td>
                         <td>{$value['GOODS_TITLE']}</td>
-                        <td>{$value['BUY_NUMS']}</td>
                         <td>{$value['REAL_PRICE']}</td>
-                        <td>{$totalAmount}</td> 
+                        <td>{$value['BUY_NUMS']}</td>
+                        <td>{$value['TAX_RATE']}</td>
+                        <td>{$taxAmount}</td>
+                        <td>{$totalAmount}</td>
                     </tr>
 EOT;
             }
@@ -489,31 +496,31 @@ EOT;
             $orderBase = <<<ORDER
                 <table border="1" style="table-layout: fixed; padding: 10px 20px;" width="100%">
                     <tr>
-                        <td width="30%" style="font-weight: bold; text-align: center; font-size: 14px;">会员编号</td>
+                        <td width="30%" style="font-weight: bold; text-align: center; font-size: 14px;">Member code</td>
                         <td width="70%">{$userId}</td>
                     </tr>
                     <tr>
-                        <td width="30%" style="font-weight: bold; text-align: center; font-size: 14px;">会员名字</td>
+                        <td width="30%" style="font-weight: bold; text-align: center; font-size: 14px;">Member name</td>
                         <td width="70%">{$userName}</td>
                     </tr>
                     <tr>
-                        <td width="30%" style="font-weight: bold; text-align: center; font-size: 14px;">会员地址</td>
+                        <td width="30%" style="font-weight: bold; text-align: center; font-size: 14px;">Member address</td>
                         <td width="70%">{$address}</td>
                     </tr>
                     <tr>
-                        <td width="30%" style="font-weight: bold; text-align: center; font-size: 14px;">会员电话</td>
+                        <td width="30%" style="font-weight: bold; text-align: center; font-size: 14px;">Member phone</td>
                         <td width="70%">{$mobile}</td>
                     </tr>
                     <tr>
-                        <td width="30%" style="font-weight: bold; text-align: center; font-size: 14px;">订单编号</td>
+                        <td width="30%" style="font-weight: bold; text-align: center; font-size: 14px;">Order code</td>
                         <td width="70%">{$orderSn}</td>
                     </tr>
                     <tr>
-                        <td width="30%" style="font-weight: bold; text-align: center; font-size: 14px;">订单日期</td>
+                        <td width="30%" style="font-weight: bold; text-align: center; font-size: 14px;">Creation time</td>
                         <td width="70%">{$orderAt}</td>
                     </tr>
                     <tr>
-                        <td class="bg" style="font-weight: bold; font-size: 14px; text-align: center;">订单明细</td>
+                        <td class="bg" style="font-weight: bold; font-size: 14px; text-align: center;">Order detail</td>
                         <td class="bg"></td>
                     </tr>
                 </table>
@@ -529,7 +536,7 @@ ORDER;
                 <html lang="en">
                 <head>
                     <meta charset="UTF-8" />
-                    <title>订单详情</title>
+                    <title>Order detail</title>
                     <style>
                         table {
                             border-collapse: collapse;
@@ -556,17 +563,20 @@ ORDER;
                                 
                                 <table border="1" width="100%" style="padding: 10px 20px; text-align: center;">
                                     <tr>
-                                        <th width="20%" style="font-size: 14px; font-weight: bold; text-align: center;">商品编号</th>
-                                        <th width="30%" style="font-size: 14px; font-weight: bold; text-align: center;">商品名称</th>
-                                        <th width="15%" style="font-size: 14px; font-weight: bold; text-align: center;">数量</th>
-                                        <th width="15%" style="font-size: 14px; font-weight: bold; text-align: center;">单价</th>
-                                        <th width="20%" style="font-size: 14px; font-weight: bold; text-align: center;">总价</th>
+                                        <th width="15%" style="font-size: 14px; font-weight: bold; text-align: center;">Product code</th>
+                                        <th width="20%" style="font-size: 14px; font-weight: bold; text-align: center;">Product name</th>
+                                        <th width="13%" style="font-size: 14px; font-weight: bold; text-align: center;">Product price</th>
+                                        <th width="15%" style="font-size: 14px; font-weight: bold; text-align: center;">Quantity</th>
+                                        <th width="10%" style="font-size: 14px; font-weight: bold; text-align: center;">Tax rate</th>
+                                        <th width="12%" style="font-size: 14px; font-weight: bold; text-align: center;">Tax</th>
+                                        <th width="15%" style="font-size: 14px; font-weight: bold; text-align: center;">Total amount</th>
                                     </tr>
                                     {$orderDetails}
                                     <tr>
-                                        <td colspan="2">合计</td>
+                                        <td colspan="3">Total</td>
                                         <td>{$orderNums}</td>
                                         <td></td>
+                                        <td>{$totalTaxAmount}</td>
                                         <td>{$orderAmount}</td>
                                     </tr>
                                 </table>
@@ -576,11 +586,11 @@ ORDER;
                                 <table width="100%" style="border: none; padding: 10px 20px; text-align: center;">
                                     <tr style="border: none;">
                                         <td width="70%" style="border: none;"></td>
-                                        <td width="30%" style="font-weight: bold; text-align: left; font-size: 14px; border: none;">签名：</td>
+                                        <td width="30%" style="font-weight: bold; text-align: left; font-size: 14px; border: none;">Signature：</td>
                                     </tr>
                                     <tr style="border: none;">
                                         <td width="70%" style="border: none;"></td>
-                                        <td width="30%" style="font-weight: bold; text-align: left; font-size: 14px; border: none;">日期：</td>
+                                        <td width="30%" style="font-weight: bold; text-align: left; font-size: 14px; border: none;">Date：</td>
                                     </tr>
                                 </table>
                             </div>

common/models/ShopGoods.php

@@ -55,7 +55,7 @@ class ShopGoods extends \common\components\ActiveRecord
         ],
         5 => [
             'id' => 5,
-            'name' => 'Car/Villa Bonus',
+            'name' => 'Car/Villa Fund',
             'label' => 'garage_points',
         ],
         7 => [
@@ -112,7 +112,7 @@ class ShopGoods extends \common\components\ActiveRecord
 //        ],
         [
             'id' => 5,
-            'name' => 'Car/Villa bonus products',
+            'name' => 'Car/Villa Fund Products',
             'sell_type' => [
                 self::SALE_TYPE[5]
             ]
@@ -226,7 +226,7 @@ class ShopGoods extends \common\components\ActiveRecord
 //                'name'=>'Travel Bonus'
 //            ],
             'garage_points' => [
-                'name' => 'Car/Villa Bonus'
+                'name' => 'Car/Villa Fund'
             ],
             'pay_stack' => [
                 'name' => 'PayStack'

common/models/forms/ApproachOrderForm.php

@@ -91,7 +91,7 @@ class ApproachOrderForm extends Model
     public function attributeLabels()
     {
         return [
-            'sn' => 'SN',//订单号
+            'sn' => 'Order code',//订单号
             'expressCompany' => 'ExpressCompany',//快递公司
             'orderTrackNo' => 'courier number',//快递单号
             'status' => 'status',//状态
@@ -287,12 +287,12 @@ class ApproachOrderForm extends Model
         LoggerTool::info([$this->note['reference'], $this->note]);
         $payload = PayStack::transactionVerify($this->note['reference']);
         LoggerTool::info($payload);
-//        if ($payload['status'] !== true) {
-//            throw new Exception(Form::formatErrorsForApi($payload['message']));
-//        }
-//        if ($payload['data']['amount'] != $this->_model->PAY_AMOUNT * 100) {
-//            throw new Exception(Form::formatErrorsForApi('支付金额与订单金额不符'));
-//        }
+        if ($payload['status'] !== true) {
+            throw new Exception(Form::formatErrorsForApi($payload['message']));
+        }
+        if ($payload['data']['amount'] != $this->_model->PAY_AMOUNT * 100) {
+            throw new Exception(Form::formatErrorsForApi('支付金额与订单金额不符'));
+        }
 
         $db = \Yii::$app->db;
         $transaction = $db->beginTransaction();

common/models/forms/DeclarationForm.php

@@ -668,7 +668,8 @@ class DeclarationForm extends Model
                                 'BUY_NUMS' => intval($v),
                                 'SKU_CODE' => $goods['GOODS_NO'],
                                 'GOODS_TITLE' => $goods['GOODS_NAME'],
-                                'EMAIL' => $this->email
+                                'EMAIL' => $this->email,
+                                'TAX_RATE' => $goods['TAX_RATE'],
                             ];
                         }
                     }

composer.json

@@ -49,8 +49,7 @@
     },
     "autoload": {
         "files": [
-            "common/helpers/LoggerTool.php",
-            "common/helpers/Constant.php"
+            "common/helpers/LoggerTool.php"
         ]
     },
     "repositories": {

frontendApi/config/menu.php

@@ -33,7 +33,7 @@ return [
 
             ['name'=>'Welcome Pack Listing', 'class'=>'', 'icon'=>'', 'controller'=>'shop', 'action'=>'dec-order-list', 'routePath'=>'shop/dec-order-list', 'show'=>1,],//报单列表
             ['name'=>'Order List', 'class'=>'', 'icon'=>'', 'controller'=>'shop', 'action'=>'order-list', 'routePath'=>'shop/order-list', 'show'=>1,],//订单列表
-            ['name'=>'申请退货', 'class'=>'', 'icon'=>'', 'controller'=>'shop', 'action'=>'order-backing-out', 'routePath'=>'shop/order-backing-out', 'show'=>1,],//申请退货
+//            ['name'=>'申请退货', 'class'=>'', 'icon'=>'', 'controller'=>'shop', 'action'=>'order-backing-out', 'routePath'=>'shop/order-backing-out', 'show'=>1,],//申请退货
         ]
     ],
     'user'=>[

frontendApi/modules/v1/controllers/ShopController.php

@@ -257,6 +257,12 @@ class ShopController extends BaseController {
                 ['LEFT JOIN', OrderGoods::tableName() . ' AS OG', 'OG.ORDER_SN=DO.ORDER_SN'],
             ],
         ]);
+
+        foreach ($data['list'] as &$value) {
+            $taxRate = $value['TAX_RATE'] ?? 0;
+            $value['TAX_AMOUNT'] = Tool::formatPrice(($value['REAL_PRICE'] - $value['REAL_PRICE'] / (1 + $taxRate / 100)) * $value['BUY_NUMS']);
+        }
+
         return static::notice($data);
     }
 
@@ -301,7 +307,7 @@ class ShopController extends BaseController {
 //            if($value['COUNTY']){
 //                $data['list'][$key]['FULL_ADDRESS'] .= Region::getCnName($value['COUNTY']);
 //            }
-            $data['list'][$key]['TAX_AMOUNT'] = Tool::formatPrice($value['REAL_PRICE'] - $value['REAL_PRICE'] / (1 + $value['TAX_RATE'] / 100));
+            $data['list'][$key]['TAX_AMOUNT'] = Tool::formatPrice(($value['REAL_PRICE'] - $value['REAL_PRICE'] / (1 + $value['TAX_RATE'] / 100)) * $value['BUY_NUMS']);
         }
         return static::notice($data);
     }
@@ -382,11 +388,11 @@ class ShopController extends BaseController {
             ],
 //            [
 //                'name' => '4',
-//                'label' => 'Travel Bonus Products',//旅游积分商品
+//                'label' => 'Travel Fund Products',//旅游积分商品
 //            ],
             [
                 'name' => '5',
-                'label' => 'Car/Villa Bonus Products',//车房积分商品
+                'label' => 'Car/Villa Fund Products',//车房积分商品
             ],
         ];
         return static::notice($data);
@@ -427,6 +433,8 @@ class ShopController extends BaseController {
         $orderDetails = '';
         $orderAmount = 0;  // 合计总额
         $orderNums = 0; // 合计总数
+        $totalTaxAmount = 0; // 合计税额
+        $totalAmount = 0;
         foreach ($data['list'] as $key => $value) {
             $provinceName = $value['PROVINCE'] ? Region::getCnName($value['PROVINCE']) : '';
             $cityName = $value['CITY'] ? Region::getCnName($value['CITY']) : '';
@@ -439,16 +447,21 @@ class ShopController extends BaseController {
             $orderAt = Date::convert($value['PAY_AT'],'Y-m-d H:i:s');
 
             // 总价
-            $totalAmount = $value['BUY_NUMS'] * $value['ORDER_AMOUNT'];
+            $totalAmount = $value['BUY_NUMS'] * $value['REAL_PRICE'];
             $orderAmount += $totalAmount;
             $orderNums += $value['BUY_NUMS'];
+            // 税额
+            $taxAmount = floatval(Tool::formatPrice(($value['REAL_PRICE'] - ($value['REAL_PRICE'] / (1 + $value['TAX_RATE'] / 100))) * $value['BUY_NUMS']));
+            $totalTaxAmount += $taxAmount;
             // 订单详情
             $orderDetails .= <<<EOT
                 <tr>
                     <td>{$value['SKU_CODE']}</td>
                     <td>{$value['GOODS_TITLE']}</td>
+                    <td>{$value['REAL_PRICE']}</td>
                     <td>{$value['BUY_NUMS']}</td>
-                    <td>{$value['ORDER_AMOUNT']}</td>
+                    <td>{$value['TAX_RATE']}</td>
+                    <td>{$taxAmount}</td>
                     <td>{$totalAmount}</td> 
                 </tr>
 EOT;
@@ -458,31 +471,31 @@ EOT;
         $orderBase = <<<ORDER
             <table border="1" style="table-layout: fixed; padding: 10px 20px;" width="100%">
                 <tr>
-                    <td width="30%" style="font-weight: bold; text-align: center; font-size: 14px;">会员编号</td>
+                    <td width="30%" style="font-weight: bold; text-align: center; font-size: 14px;">Member code</td>
                     <td width="70%">{$userId}</td>
                 </tr>
                 <tr>
-                    <td width="30%" style="font-weight: bold; text-align: center; font-size: 14px;">会员名字</td>
+                    <td width="30%" style="font-weight: bold; text-align: center; font-size: 14px;">Member name</td>
                     <td width="70%">{$userName}</td>
                 </tr>
                 <tr>
-                    <td width="30%" style="font-weight: bold; text-align: center; font-size: 14px;">会员地址</td>
+                    <td width="30%" style="font-weight: bold; text-align: center; font-size: 14px;">Member address</td>
                     <td width="70%">{$address}</td>
                 </tr>
                 <tr>
-                    <td width="30%" style="font-weight: bold; text-align: center; font-size: 14px;">会员电话</td>
+                    <td width="30%" style="font-weight: bold; text-align: center; font-size: 14px;">Member phone</td>
                     <td width="70%">{$mobile}</td>
                 </tr>
                 <tr>
-                    <td width="30%" style="font-weight: bold; text-align: center; font-size: 14px;">订单编号</td>
+                    <td width="30%" style="font-weight: bold; text-align: center; font-size: 14px;">Order code</td>
                     <td width="70%">{$orderSn}</td>
                 </tr>
                 <tr>
-                    <td width="30%" style="font-weight: bold; text-align: center; font-size: 14px;">订单日期</td>
+                    <td width="30%" style="font-weight: bold; text-align: center; font-size: 14px;">Creation time</td>
                     <td width="70%">{$orderAt}</td>
                 </tr>
                 <tr>
-                    <td class="bg" style="font-weight: bold; font-size: 14px; text-align: center;">订单明细</td>
+                    <td class="bg" style="font-weight: bold; font-size: 14px; text-align: center;">Order detail</td>
                     <td class="bg"></td>
                 </tr>
             </table>
@@ -498,7 +511,7 @@ ORDER;
             <html lang="en">
             <head>
                 <meta charset="UTF-8" />
-                <title>订单详情</title>
+                <title>Order detail</title>
                 <style>
                     table {
                         border-collapse: collapse;
@@ -518,24 +531,27 @@ ORDER;
             </head>
             <body>
                 <div class="content">
-                    <p style="text-align: center; font-weight: bold; font-size: 22px;"><b>订单详情</b><br></p>
+                    <p style="text-align: center; font-weight: bold; font-size: 22px;"><b>Order detail</b><br></p>
                     <div>
                         <div style="display: block; width: 100%;">
                             {$orderBase}
                             
-                            <table border="1" width="100%" style="padding: 10px 20px; text-align: center;">
+                            <table border="1" width="100%" style="padding: 10px 5px; text-align: center;">
                                 <tr>
-                                    <th width="20%" style="font-size: 14px; font-weight: bold; text-align: center;">商品编号</th>
-                                    <th width="30%" style="font-size: 14px; font-weight: bold; text-align: center;">商品名称</th>
-                                    <th width="15%" style="font-size: 14px; font-weight: bold; text-align: center;">数量</th>
-                                    <th width="15%" style="font-size: 14px; font-weight: bold; text-align: center;">单价</th>
-                                    <th width="20%" style="font-size: 14px; font-weight: bold; text-align: center;">总价</th>
+                                    <th width="15%" style="font-size: 14px; font-weight: bold; text-align: center;">Product code</th>
+                                    <th width="20%" style="font-size: 14px; font-weight: bold; text-align: center;">Product name</th>
+                                    <th width="15%" style="font-size: 14px; font-weight: bold; text-align: center;">Product price</th>
+                                    <th width="15%" style="font-size: 14px; font-weight: bold; text-align: center;">Quantity</th>
+                                    <th width="10%" style="font-size: 14px; font-weight: bold; text-align: center;">Tax rate</th>
+                                    <th width="10%" style="font-size: 14px; font-weight: bold; text-align: center;">Tax</th>
+                                    <th width="15%" style="font-size: 14px; font-weight: bold; text-align: center;">Total amount</th>
                                 </tr>
                                 {$orderDetails}
                                 <tr>
-                                    <td colspan="2">合计</td>
+                                    <td colspan="3">Total</td>
                                     <td>{$orderNums}</td>
                                     <td></td>
+                                    <td>{$totalTaxAmount}</td>
                                     <td>{$orderAmount}</td>
                                 </tr>
                             </table>
@@ -545,11 +561,11 @@ ORDER;
                             <table width="100%" style="border: none; padding: 10px 20px; text-align: center;">
                                 <tr style="border: none;">
                                     <td width="70%" style="border: none;"></td>
-                                    <td width="30%" style="font-weight: bold; text-align: left; font-size: 14px; border: none;">签名：</td>
+                                    <td width="30%" style="font-weight: bold; text-align: left; font-size: 14px; border: none;">Signature：</td>
                                 </tr>
                                 <tr style="border: none;">
                                     <td width="70%" style="border: none;"></td>
-                                    <td width="30%" style="font-weight: bold; text-align: left; font-size: 14px; border: none;">日期：</td>
+                                    <td width="30%" style="font-weight: bold; text-align: left; font-size: 14px; border: none;">Date：</td>
                                 </tr>
                             </table>
                         </div>
@@ -610,7 +626,6 @@ ORDER;
      * 导出订单.
      * @return mixed
      * @throws \yii\web\HttpException
-     * @throws \Mpdf\MpdfException
      */
     public function actionDecOrderExport()
     {
@@ -642,6 +657,8 @@ ORDER;
         $orderDetails = '';
         $orderAmount = 0;  // 合计总额
         $orderNums = 0; // 合计总数
+        $totalTaxAmount = 0; // 合计税额
+        $totalAmount = 0;
         foreach ($data['list'] as $key => $value) {
             $provinceName = $value['PROVINCE'] ? Region::getCnName($value['PROVINCE']) : '';
             $cityName = $value['CITY'] ? Region::getCnName($value['CITY']) : '';
@@ -651,20 +668,24 @@ ORDER;
             $userName = $value['REAL_NAME'];
             $address = $provinceName . $cityName . $countyName . $value['ADDRESS'];
             $mobile = $value['MOBILE'];
-            $orderAt = Date::convert($value['PAY_AT'],'Y-m-d H:i:s');
+            $orderAt = Date::convert($value['PAY_AT'] ?? $value['CREATED_AT'],'Y-m-d H:i:s');
 
             // 总价
             $totalAmount = $value['BUY_NUMS'] * $value['REAL_PRICE'];
             $orderAmount += $totalAmount;
             $orderNums += $value['BUY_NUMS'];
-
+            // 税额
+            $taxAmount = floatval(Tool::formatPrice(($value['REAL_PRICE'] - ($value['REAL_PRICE'] / (1 + $value['TAX_RATE'] / 100))) * $value['BUY_NUMS']));
+            $totalTaxAmount += $taxAmount;
             // 订单详情
             $orderDetails .= <<<EOT
                 <tr>
                     <td>{$value['SKU_CODE']}</td>
                     <td>{$value['GOODS_TITLE']}</td>
-                    <td>{$value['BUY_NUMS']}</td>
                     <td>{$value['REAL_PRICE']}</td>
+                    <td>{$value['BUY_NUMS']}</td>
+                    <td>{$value['TAX_RATE']}</td>
+                    <td>{$taxAmount}</td>
                     <td>{$totalAmount}</td> 
                 </tr>
 EOT;
@@ -674,31 +695,31 @@ EOT;
         $orderBase = <<<ORDER
             <table border="1" style="table-layout: fixed; padding: 10px 20px;" width="100%">
                 <tr>
-                    <td width="30%" style="font-weight: bold; text-align: center; font-size: 14px;">会员编号</td>
+                    <td width="30%" style="font-weight: bold; text-align: center; font-size: 14px;">Member code</td>
                     <td width="70%">{$userId}</td>
                 </tr>
                 <tr>
-                    <td width="30%" style="font-weight: bold; text-align: center; font-size: 14px;">会员名字</td>
+                    <td width="30%" style="font-weight: bold; text-align: center; font-size: 14px;">Member name</td>
                     <td width="70%">{$userName}</td>
                 </tr>
                 <tr>
-                    <td width="30%" style="font-weight: bold; text-align: center; font-size: 14px;">会员地址</td>
+                    <td width="30%" style="font-weight: bold; text-align: center; font-size: 14px;">Member address</td>
                     <td width="70%">{$address}</td>
                 </tr>
                 <tr>
-                    <td width="30%" style="font-weight: bold; text-align: center; font-size: 14px;">会员电话</td>
+                    <td width="30%" style="font-weight: bold; text-align: center; font-size: 14px;">Member phone</td>
                     <td width="70%">{$mobile}</td>
                 </tr>
                 <tr>
-                    <td width="30%" style="font-weight: bold; text-align: center; font-size: 14px;">订单编号</td>
+                    <td width="30%" style="font-weight: bold; text-align: center; font-size: 14px;">Order code</td>
                     <td width="70%">{$orderSn}</td>
                 </tr>
                 <tr>
-                    <td width="30%" style="font-weight: bold; text-align: center; font-size: 14px;">订单日期</td>
+                    <td width="30%" style="font-weight: bold; text-align: center; font-size: 14px;">Creation time</td>
                     <td width="70%">{$orderAt}</td>
                 </tr>
                 <tr>
-                    <td class="bg" style="font-weight: bold; font-size: 14px; text-align: center;">订单明细</td>
+                    <td class="bg" style="font-weight: bold; font-size: 14px; text-align: center;">Order detail</td>
                     <td class="bg"></td>
                 </tr>
             </table>
@@ -714,19 +735,19 @@ ORDER;
             <html lang="en">
             <head>
                 <meta charset="UTF-8" />
-                <title>订单详情</title>
+                <title>Order detail</title>
                 <style>
                     table {
                         border-collapse: collapse;
                     }
                     table td, table th {
                         border: 1px solid #ccc;
-                        padding: 10px 30px;
+                        padding: 5px 5px;
                         border-collapse: collapse;
                     }
-                    td {
-                        padding: 120px;
-                    }
+                    /*td {*/
+                    /*    padding: 120px;*/
+                    /*}*/
                     .bg {
                         background-color: #ccc;
                     }
@@ -734,24 +755,27 @@ ORDER;
             </head>
             <body>
                 <div class="content">
-                    <p style="text-align: center; font-weight: bold; font-size: 22px;"><b>订单详情</b><br></p>
+                    <p style="text-align: center; font-weight: bold; font-size: 22px;"><b>Order detail</b><br></p>
                     <div>
                         <div style="display: block; width: 100%;">
                             {$orderBase}
                             
                             <table border="1" width="100%" style="padding: 10px 20px; text-align: center;">
                                 <tr>
-                                    <th width="20%" style="font-size: 14px; font-weight: bold; text-align: center;">商品编号</th>
-                                    <th width="30%" style="font-size: 14px; font-weight: bold; text-align: center;">商品名称</th>
-                                    <th width="15%" style="font-size: 14px; font-weight: bold; text-align: center;">数量</th>
-                                    <th width="15%" style="font-size: 14px; font-weight: bold; text-align: center;">单价</th>
-                                    <th width="20%" style="font-size: 14px; font-weight: bold; text-align: center;">总价</th>
+                                    <th width="15%" style="font-size: 14px; font-weight: bold; text-align: center;">Product code</th>
+                                    <th width="20%" style="font-size: 14px; font-weight: bold; text-align: center;">Product name</th>
+                                    <th width="15%" style="font-size: 14px; font-weight: bold; text-align: center;">Product price</th>
+                                    <th width="15%" style="font-size: 14px; font-weight: bold; text-align: center;">Quantity</th>
+                                    <th width="10%" style="font-size: 14px; font-weight: bold; text-align: center;">Tax rate</th>
+                                    <th width="10%" style="font-size: 14px; font-weight: bold; text-align: center;">Tax</th>
+                                    <th width="15%" style="font-size: 14px; font-weight: bold; text-align: center;">Total amount</th>
                                 </tr>
                                 {$orderDetails}
                                 <tr>
-                                    <td colspan="2">合计</td>
+                                    <td colspan="3">Total</td>
                                     <td>{$orderNums}</td>
                                     <td></td>
+                                    <td>{$totalTaxAmount}</td>
                                     <td>{$orderAmount}</td>
                                 </tr>
                             </table>
@@ -761,11 +785,11 @@ ORDER;
                             <table width="100%" style="border: none; padding: 10px 20px; text-align: center;">
                                 <tr style="border: none;">
                                     <td width="70%" style="border: none;"></td>
-                                    <td width="30%" style="font-weight: bold; text-align: left; font-size: 14px; border: none;">签名：</td>
+                                    <td width="30%" style="font-weight: bold; text-align: left; font-size: 14px; border: none;">Signature：</td>
                                 </tr>
                                 <tr style="border: none;">
                                     <td width="70%" style="border: none;"></td>
-                                    <td width="30%" style="font-weight: bold; text-align: left; font-size: 14px; border: none;">日期：</td>
+                                    <td width="30%" style="font-weight: bold; text-align: left; font-size: 14px; border: none;">Date：</td>
                                 </tr>
                             </table>
                         </div>

frontendApi/modules/v1/controllers/UserController.php

@@ -428,7 +428,7 @@ class UserController extends BaseController {
         if($user){
             $userInfo['REAL_NAME'] = $user['REAL_NAME'];
             $allChildUser = UserNetwork::getFirstFloorChildren($userId);
-            $isLocation = [1 => '左-', 2 => '中-', 3 => '右-'];
+            $isLocation = [1 => '左-', 2 => '右-'];
             if($allChildUser) {
                 foreach ($allChildUser as $child) {
                     $isLocation[$child['RELATIVE_LOCATION']].= '满';

frontendEle/src/views/bonus/other.vue

@@ -12,7 +12,7 @@
         </el-table-column>
         <el-table-column label="Team Bonus" prop="ORI_BONUS_BS_ABBR.value" width="120"><!-- 绩效奖金 -->
         </el-table-column>
-        <el-table-column label="Quarter Pool Bank(GPB)" prop="ORI_BONUS_QUARTER.value" width="190px"><!-- 季度分红 -->
+        <el-table-column label="quarterly bonus" prop="ORI_BONUS_QUARTER.value" width="190px"><!-- 季度分红 -->
         </el-table-column>
 <!--        <el-table-column label="Travel" prop="BONUS_TOURISM.value">&lt;!&ndash; 旅游奖 &ndash;&gt;-->
 <!--        </el-table-column>-->
@@ -39,7 +39,7 @@
 <!--          <el-descriptions-item class="bonus-item" label="业绩奖金">{{newData.ORI_BONUS_QY.value}}</el-descriptions-item>&lt;!&ndash; 业绩奖金 &ndash;&gt;-->
           <el-descriptions-item class="bonus-item" label="Director Bonus">{{newData.ORI_BONUS_BS_MNT.value}}</el-descriptions-item><!-- 管理奖金 -->
           <el-descriptions-item class="bonus-item" label="Team Bonus">{{newData.ORI_BONUS_BS_ABBR.value}}</el-descriptions-item><!-- 绩效奖金 -->
-          <el-descriptions-item class="bonus-item" label="Quarter Pool Bank(GPB)">{{newData.ORI_BONUS_QUARTER.value}}</el-descriptions-item><!-- 季度分红 -->
+          <el-descriptions-item class="bonus-item" label="quarterly bonus">{{newData.ORI_BONUS_QUARTER.value}}</el-descriptions-item><!-- 季度分红 -->
 <!--          <el-descriptions-item class="bonus-item" label="Travel">{{newData.BONUS_TRAVEL.value}}</el-descriptions-item>&lt;!&ndash; 旅游奖 &ndash;&gt;-->
 <!--          <el-descriptions-item class="bonus-item" label="Car House">{{newData.BONUS_GARAGE.value}}</el-descriptions-item>&lt;!&ndash; 车房奖 &ndash;&gt;-->
           <el-descriptions-item class="bonus-item" label="Total bonus">{{newData.BONUS_TOTAL.value}}</el-descriptions-item><!-- 合计 -->

frontendEle/src/views/shop/dec-order-list.vue

@@ -2,15 +2,17 @@
     <div v-loading="loading">
         <div class="white-box">
             <el-table class="withdraw-table" :data="tableData" style="width: 100%;" :span-method="objectSpanMethod">
-				    <el-table-column width="120" label="Product code" prop="SKU_CODE"></el-table-column><!--商品编号-->
+				        <el-table-column width="120" label="Product code" prop="SKU_CODE"></el-table-column><!--商品编号-->
                 <el-table-column width="120" label="Product Name" prop="GOODS_TITLE"></el-table-column><!--商品名称-->
                 <el-table-column width="120" label="Quantity" prop="BUY_NUMS"></el-table-column><!--数量-->
                 <el-table-column width="120" label="Entry Price" prop="REAL_PRICE"></el-table-column><!--报单金额-->
-                <el-table-column label="Entry BV" prop="REAL_PV"></el-table-column><!--报单BV-->
+                <el-table-column width="120" label="Entry BV" prop="REAL_PV"></el-table-column><!--报单BV-->
+                <el-table-column width="120" label="Tax rate" prop="TAX_RATE"></el-table-column><!--税率-->
+                <el-table-column width="120" label="Tax" prop="TAX_AMOUNT"></el-table-column><!--税额-->
                 <el-table-column width="120" label="Entry code" prop="DEC_SN"></el-table-column><!--报单编号-->
                 <el-table-column width="120" label="Order code" prop="ORDER_SN"></el-table-column><!--订单编号-->
                 <el-table-column width="120" label="Member code" prop="USER_NAME"></el-table-column><!--会员编号-->
-                <el-table-column width="120" label="Menber name" prop="REAL_NAME"></el-table-column><!--会员姓名-->
+                <el-table-column width="120" label="Member name" prop="REAL_NAME"></el-table-column><!--会员姓名-->
                 <el-table-column width="150" label="Shipping Address" prop="ADDRESS"></el-table-column><!--收货地址-->
                 <el-table-column width="120" label="Sponsor code" prop="CON_USER_NAME"></el-table-column><!--接点人编号-->
                 <el-table-column width="150" label="Created time"><!--创建时间-->
@@ -67,13 +69,14 @@
       objectSpanMethod(obj) {
 
         if (
-          obj.columnIndex === 5 ||
-          obj.columnIndex === 6 ||
           obj.columnIndex === 7 ||
           obj.columnIndex === 8 ||
           obj.columnIndex === 9 ||
           obj.columnIndex === 10||
-          obj.columnIndex === 11
+          obj.columnIndex === 11||
+          obj.columnIndex === 12||
+          obj.columnIndex === 13||
+          obj.columnIndex === 14
         ) {
           // ⼆维数组存储的数据取出
           var _row = this.spanArr[obj.rowIndex];

frontendEle/src/views/shop/index.vue

@@ -34,13 +34,13 @@
                           </template>
                       </el-table-column>
 
-                      <el-table-column label="税率" prop="TAX_RATE"><!--税率-->
+                      <el-table-column label="Tax rate" prop="TAX_RATE"><!--税率-->
                           <template slot-scope="scope">
                               <span>{{ Math.round(scope.row.TAX_RATE * 100) / 100 }}</span>
                           </template>
                       </el-table-column>
 
-                      <el-table-column label="税额"><!--税额-->
+                      <el-table-column label="Tax"><!--税额-->
                           <template slot-scope="scope">
                               <span>{{ Math.round((scope.row.SELL_PRICE - scope.row.SELL_PRICE / (1 + scope.row.TAX_RATE / 100)) * 100) / 100 }}</span>
                           </template>

frontendEle/src/views/shop/order-list.vue

@@ -16,8 +16,8 @@
                         <span v-else>0</span>
                     </template>
                 </el-table-column>
-                <el-table-column width="120" label="税率" prop="TAX_RATE"></el-table-column><!--税率-->
-                <el-table-column width="120" label="税额" prop="TAX_AMOUNT"></el-table-column><!--税额-->
+                <el-table-column width="120" label="Tax rate" prop="TAX_RATE"></el-table-column><!--税率-->
+                <el-table-column width="120" label="Tax" prop="TAX_AMOUNT"></el-table-column><!--税额-->
                 <el-table-column width="150" label="Product category" prop="CATEGORY"></el-table-column><!--商品分类-->
                 <el-table-column width="120" label="Order Code" prop="SN"></el-table-column><!--订单编号-->
                 <el-table-column width="120" label="Member Code" prop="USER_NAME"></el-table-column><!--会员编号-->
@@ -25,7 +25,7 @@
                 <el-table-column width="130" label="Recipient name" prop="CONSIGNEE"></el-table-column><!--收货人-->
                 <el-table-column width="120" label="Phone number" prop="MOBILE"></el-table-column><!--收货电话-->
                 <el-table-column width="150" label="Shipping Address" prop="FULL_ADDRESS"></el-table-column><!--收货地址-->
-                <el-table-column label="支付方式" prop="PAY_TYPE"></el-table-column>
+                <el-table-column label="Payment" prop="PAY_TYPE"></el-table-column>
                 <el-table-column width="120" label="Created time" prop="PAY_AT"></el-table-column><!--支付时间-->
 <!--                <el-table-column label="订单状态" prop="STATUS"></el-table-column>-->
                 <el-table-column width="120" label="Action"><!--操作-->

frontendEle/src/views/shop/order.vue

@@ -27,13 +27,13 @@
                             <span>{{ Math.round(scope.row.member_pv * 100) / 100 }}</span>
                         </template>
                     </el-table-column>
-                    <el-table-column label="税率" prop="TAX_RATE"><!--税率-->
+                    <el-table-column label="Tax rate" prop="TAX_RATE"><!--税率-->
                         <template slot-scope="scope">
                             <span>{{ Math.round(scope.row.TAX_RATE * 100) / 100 }}</span>
                         </template>
                     </el-table-column>
 
-                    <el-table-column label="税额" prop="tax_amount_plus"><!--税额-->
+                    <el-table-column label="Tax" prop="tax_amount_plus"><!--税额-->
                       <template slot-scope="scope">
                         <span>{{ Math.round(scope.row.tax_amount_plus * 100) / 100 }}</span>
                       </template>
@@ -139,9 +139,9 @@
               </div>
           </div>
 
-        <el-dialog title="订单支付" v-if="visible" :visible.sync="visible" width="30%" v-loading="payStackLoading" :before-close="handleClose">
+        <el-dialog title="Pay" v-if="visible" :visible.sync="visible" width="30%" v-loading="payStackLoading" :before-close="handleClose">
             <section>
-                <h1>Lorem Ipsum Dolor Sit Amet</h1>
+<!--                <h1>Lorem Ipsum Dolor Sit Amet</h1>-->
                 <div class="formcontainer">
                     <el-divider></el-divider>
                     <div class="container">
@@ -169,14 +169,14 @@
                 :callback="processPayment"
                 :close="processClose"
             >
-                <el-button type="primary" size="small">支 付</el-button>
+                <el-button type="primary" size="small">Pay</el-button>
 
             </paystack>
-            <el-button type="danger" size="small" class="cancelButton" @click="handleClose">取 消</el-button>
+            <el-button type="danger" size="small" class="cancelButton" @click="handleClose">Cancel</el-button>
         </el-dialog>
 
-        <el-dialog title="提示" :visible.sync="payDialog" :show-close="false" width="350px" :close="handleOrderList">
-          <el-result icon="success" title="支付成功">
+        <el-dialog title="Tips" :visible.sync="payDialog" :show-close="false" width="350px" :close="handleOrderList">
+          <el-result icon="success" title="Successful">
             <template slot="extra">
               <span style="color: #008efa; font-size: 30px;">{{ countdown }}</span>
             </template>
@@ -473,7 +473,7 @@
             // 关闭支付回调
             handleClose() {
                 let _this = this
-                _this.$confirm('确认关闭？').then(() => {
+                _this.$confirm('Confirm to close?').then(() => {
                     return network.postData('shop/delete-approach-order', {orderSn: this.form.orderSn}).then(() => {
                         // 关闭支付模态框
                         _this.visible = false

frontendEle/src/views/user/dec.vue

@@ -26,52 +26,52 @@
                       Select Welcome Pack<!--报单方式二选一-->
                     </template>
                     <el-tabs type="border-card" v-model="decWay" style="position: relative;width: 1200px;">
-                        <el-tab-pane name="1">
-                            <span slot="label">Welcome Pack</span><!--报单级别套餐-->
-                            <el-table class="table-box" :data="_tableData" stripe style="width: 100%;" highlight-current-row @current-change="handleCurrentChange">
-                                <el-table-column
-                                        type="index"
-                                        width="50">
-                                </el-table-column>
-                                <el-table-column label=" " width="50">
-                                    <template slot-scope="scope">
-                                      <span class="el-checkbox__input" :class="{'is-checked':scope && scope.row && currentRow && scope.row.ID==currentRow.ID}">
-                                        <span class="el-checkbox__inner">
-                                          </span>
-                                        <input type="checkbox" aria-hidden="false" class="el-checkbox__original" value="">
-                                      </span>
-                                    </template>
-                                </el-table-column>
-                                <el-table-column label="Package Name" prop="PACKAGE_NAME" width="300"><!-- 套餐名称 -->
-
-                                </el-table-column>
-                                <el-table-column label="Price" prop="AMOUNT" width="100"><!-- 套餐金额 -->
-
-                                </el-table-column>
-
-                                <el-table-column label="BV" prop="PV" width="100"><!-- 套餐PV -->
-
-                                    <template>
-
-                                    </template>
-                                </el-table-column>
-
-                                <el-table-column label="Entry level" prop="LEVEL_NAME" width="100"><!-- 所属报单级别 -->
-                                    <template>
-
-                                    </template>
-                                </el-table-column>
-                                <el-table-column label="Details" prop="PACKAGE_CONTENT" width=""><!-- 套餐内容 -->
-                                    <template >
-
-                                    </template>
-                                </el-table-column>
-
-                            </el-table>
-                            <!-- <el-form-item>
-                               <el-button type="primary" @click="onclock" :loading="submitButton">保存</el-button>
-                             </el-form-item>-->
-                        </el-tab-pane>
+<!--                        <el-tab-pane name="1">-->
+<!--                            <span slot="label">Welcome Pack</span>&lt;!&ndash;报单级别套餐&ndash;&gt;-->
+<!--                            <el-table class="table-box" :data="_tableData" stripe style="width: 100%;" highlight-current-row @current-change="handleCurrentChange">-->
+<!--                                <el-table-column-->
+<!--                                        type="index"-->
+<!--                                        width="50">-->
+<!--                                </el-table-column>-->
+<!--                                <el-table-column label=" " width="50">-->
+<!--                                    <template slot-scope="scope">-->
+<!--                                      <span class="el-checkbox__input" :class="{'is-checked':scope && scope.row && currentRow && scope.row.ID==currentRow.ID}">-->
+<!--                                        <span class="el-checkbox__inner">-->
+<!--                                          </span>-->
+<!--                                        <input type="checkbox" aria-hidden="false" class="el-checkbox__original" value="">-->
+<!--                                      </span>-->
+<!--                                    </template>-->
+<!--                                </el-table-column>-->
+<!--                                <el-table-column label="Package Name" prop="PACKAGE_NAME" width="300">&lt;!&ndash; 套餐名称 &ndash;&gt;-->
+
+<!--                                </el-table-column>-->
+<!--                                <el-table-column label="Price" prop="AMOUNT" width="100">&lt;!&ndash; 套餐金额 &ndash;&gt;-->
+
+<!--                                </el-table-column>-->
+
+<!--                                <el-table-column label="BV" prop="PV" width="100">&lt;!&ndash; 套餐PV &ndash;&gt;-->
+
+<!--                                    <template>-->
+
+<!--                                    </template>-->
+<!--                                </el-table-column>-->
+
+<!--                                <el-table-column label="Entry level" prop="LEVEL_NAME" width="100">&lt;!&ndash; 所属报单级别 &ndash;&gt;-->
+<!--                                    <template>-->
+
+<!--                                    </template>-->
+<!--                                </el-table-column>-->
+<!--                                <el-table-column label="Details" prop="PACKAGE_CONTENT" width="">&lt;!&ndash; 套餐内容 &ndash;&gt;-->
+<!--                                    <template >-->
+
+<!--                                    </template>-->
+<!--                                </el-table-column>-->
+
+<!--                            </el-table>-->
+<!--                            &lt;!&ndash; <el-form-item>-->
+<!--                               <el-button type="primary" @click="onclock" :loading="submitButton">保存</el-button>-->
+<!--                             </el-form-item>&ndash;&gt;-->
+<!--                        </el-tab-pane>-->
                         <el-tab-pane label="Product" name="2"><!-- 商品报单 -->
                             <el-table class="table-box" v-if="numList.length > 0" :data="tableDatas" stripe style="width: 100%;" highlight-current-row  @selection-change="handleSelectionChange">
                                 <el-table-column
@@ -91,6 +91,16 @@
 
                                 <el-table-column label="Product BV" prop="PRICE_PV" width="100"><!-- BV价格 -->
 
+                                </el-table-column>
+                                <el-table-column label="TAX_RATE" prop="TAX_RATE" width="100">
+                                    <template slot-scope="scope">
+                                      {{ Math.round(scope.row.TAX_RATE * 100) / 100 }}
+                                    </template>
+                                </el-table-column>
+                                <el-table-column label="TAX" width="100">
+                                    <template slot-scope="scope">
+                                      {{ Math.round((scope.row.SELL_PRICE - scope.row.SELL_PRICE / (1 + scope.row.TAX_RATE / 100)) * 100) / 100 }}
+                                    </template>
                                 </el-table-column>
                                 <el-table-column label="Quantity" width="150"><!-- 数量 -->
                                     <template slot-scope="scope">
@@ -105,8 +115,9 @@
                             <div class="white-box-footer flex">
                                 <el-button @click="getSum()">Total Calculation</el-button><!--计算合计-->
                                 <div class='flex data' style="flex:1;justify-content: flex-end;">
-                                    <div style="margin-right:2rem">Product price：${{sell_price_sum}}</div><!--商品价格-->
-                                    <div>Product BV：${{price_pv_sum}}</div><!--商品BV-->
+                                    <div style="margin-right:2rem">Product price：₦{{sell_price_sum}}</div><!--商品价格-->
+                                    <div style="margin-right:2rem">Product BV：{{price_pv_sum}}</div><!--商品BV-->
+                                    <div>Product Tax：₦{{tax_sum}}</div><!--商品BV-->
                                 </div>
                             </div>
 
@@ -286,7 +297,7 @@
         data() {
             return {
                 currentRow:null,
-                decWay:'1',
+                decWay:'2',
                 regionData: store.state.regionInfo.regionData,
                 form: {
 
@@ -337,6 +348,7 @@
                 numList: [],
                 sell_price_sum:0.00,
                 price_pv_sum:0.00,
+                tax_sum:0.00,
                 areaDisabled: false,
                 addressDisabled: false
             }
@@ -352,15 +364,15 @@
               }
             },
             getSum(){
-                let sell_price_sum=0,price_pv_sum=0;
+                let sell_price_sum=0,price_pv_sum=0,tax_sum=0;
                 this.multipleSelection.map((item,index)=>{
-                    console.log(item)
                     sell_price_sum+=Number(item.SELL_PRICE)*item.goodsNum;
                     price_pv_sum+=Number(item.PRICE_PV)*item.goodsNum;
+                    tax_sum += Number(item.SELL_PRICE - item.SELL_PRICE / (1 + item.TAX_RATE / 100)) * item.goodsNum;
                 })
                 this.sell_price_sum=tool.formatPrice(sell_price_sum);
                 this.price_pv_sum=tool.formatPrice(price_pv_sum);
-                console.log(this.sell_price_sum,this.price_pv_sum)
+                this.tax_sum = tool.formatPrice(tax_sum);
             },
             getData () {