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

# Conflicts:
#	backendApi/modules/v1/controllers/ShopController.php
#	backendApi/modules/v1/models/lists/shop/OrderList.php
#	common/models/forms/OrderForm.php

.gitignore

@@ -19,10 +19,8 @@ Desktop.ini
 
 #App
 common/config/config.php
+common/config/config-product.php
 vendor
 frontendApi/web/pdfs/
 #composer.json
 composer.lock
-
-frontendApi/web/index.php
-backendApi/web/index.php

backend/views/site/addDecTest.php

@@ -36,6 +36,6 @@ $this->title = 'My Yii Application';
             <label for="LOCATION">位置</label>
             <input type="text" class="form-control" id="LOCATION" name="LOCATION">
         </div>
-        <button type="submit" class="btn btn-default">提交</button>
+        <button type="submit" class="btn btn-default">Submit<!-- 提交 --></button>
     </form>
 </div>

backendApi/config/menu.php

@@ -38,6 +38,7 @@ return [
             // 新添加的商品操作  --- stat
             ['name'=>'添加商品', 'class'=>'', 'icon'=>'', 'controller'=>'shop', 'action'=>'goods-add', 'routePath'=>'shop/goods-add', 'show'=>0,],
             ['name'=>'编辑商品', 'class'=>'', 'icon'=>'', 'controller'=>'shop', 'action'=>'goods-edit', 'routePath'=>'shop/goods-edit', 'show'=>0,],
+            ['name'=>'商品上下架', 'class'=>'', 'icon'=>'', 'controller'=>'shop', 'action'=>'goods-status', 'routePath'=>'shop/goods-status', 'show'=>0],
             ['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,],
@@ -48,7 +49,7 @@ return [
             ['name'=>'Order list', 'class'=>'', 'icon'=>'', 'controller'=>'shop', 'action'=>'order-list', 'routePath'=>'shop/order-list', 'show'=>1,],//订单列表
             ['name'=>'订单列表导出', 'class'=>'', 'icon'=>'', 'controller'=>'shop', 'action'=>'order-list-export', 'routePath'=>'shop/order-list-export', 'show'=>0,],
             ['name'=>'订单发货', 'class'=>'', 'icon'=>'', 'controller'=>'shop', 'action'=>'order-delivery', 'routePath'=>'shop/order-delivery', 'show'=>0,],
-            ['name'=>'External mall order list', 'class'=>'', 'icon'=>'', 'controller'=>'shop', 'action'=>'order-shop-list', 'routePath'=>'shop/order-shop-list', 'show'=>1,],//外部商城订单列表
+//            ['name'=>'External mall order list', 'class'=>'', 'icon'=>'', 'controller'=>'shop', 'action'=>'order-shop-list', 'routePath'=>'shop/order-shop-list', 'show'=>1,],//外部商城订单列表
             // ['name'=>'External mall entry list', 'class'=>'', 'icon'=>'', 'controller'=>'shop', 'action'=>'order-dec-list', 'routePath'=>'shop/order-dec-list', 'show'=>1,],//外部商城报单列表
             // ['name'=>'List of qualified orders of external mall', 'class'=>'', 'icon'=>'', 'controller'=>'shop', 'action'=>'order-standard-list', 'routePath'=>'shop/order-standard-list', 'show'=>1,],//外部商城达标订单列表
 
@@ -127,7 +128,7 @@ return [
             //['name'=>'申请修改会员状态', 'class'=>'', 'icon'=>'', 'controller'=>'user', 'action'=>'status-audit-add', 'routePath'=>'user/status-audit-add', 'show'=>0,],
             //['name'=>'审核会员状态', 'class'=>'', 'icon'=>'', 'controller'=>'user', 'action'=>'status-audit', 'routePath'=>'user/status-audit', 'show'=>0,],
             //['name'=>'删除审核会员状态', 'class'=>'', 'icon'=>'', 'controller'=>'user', 'action'=>'status-audit-delete', 'routePath'=>'user/status-audit-delete', 'show'=>0,],
-            ['name'=>'Member level adjustment list', 'class'=>'', 'icon'=>'', 'controller'=>'user', 'action'=>'change-user-dec-level', 'routePath'=>'user/dec-level-list', 'show'=>1,],//会员级别调整列表
+            ['name'=>'Member level adjustment list', 'class'=>'', 'icon'=>'', 'controller'=>'user', 'action'=>'dec-level-list', 'routePath'=>'user/dec-level-list', 'show'=>1,],//会员级别调整列表
             ['name'=>'修改会员级别', 'class'=>'', 'icon'=>'', 'controller'=>'user', 'action'=>'change-user-dec-level', 'routePath'=>'user/change-user-dec-level', 'show'=>0,],
             ['name'=>'Modify entry center level', 'class'=>'', 'icon'=>'', 'controller'=>'user', 'action'=>'change-user-dec-role', 'routePath'=>'user/change-user-dec-role', 'show'=>1,],//修改报单中心级别
             //['name'=>'清空关停会员钱包', 'class'=>'', 'icon'=>'', 'controller'=>'user', 'action'=>'clear-wallet', 'routePath'=>'user/clear-wallet', 'show'=>0,],
@@ -145,11 +146,11 @@ return [
         'routePath'=>'atlas',
         'show'=>1,
         'child'=>[
-            ['name'=>'Expand network', 'class'=>'', 'icon'=>'', 'controller'=>'atlas', 'action'=>'relation-opt', 'routePath'=>'atlas/relation-opt', 'show'=>1,],//开拓网络
+            ['name'=>'Sponor network', 'class'=>'', 'icon'=>'', 'controller'=>'atlas', 'action'=>'relation-opt', 'routePath'=>'atlas/relation-opt', 'show'=>1,],//开拓网络
             ['name'=>'开拓网络图', 'class'=>'', 'icon'=>'', 'controller'=>'atlas', 'action'=>'relation', 'routePath'=>'atlas/relation', 'show'=>0,],
             ['name'=>'开拓网络列表', 'class'=>'', 'icon'=>'', 'controller'=>'atlas', 'action'=>'relation-list', 'routePath'=>'atlas/relation-list', 'show'=>0,],
             ['name'=>'开拓网络列表导出', 'class'=>'', 'icon'=>'', 'controller'=>'atlas', 'action'=>'relation-list-export', 'routePath'=>'atlas/relation-list-export', 'show'=>0,],
-            ['name'=>'Resettlement network', 'class'=>'', 'icon'=>'', 'controller'=>'atlas', 'action'=>'network-opt', 'routePath'=>'atlas/network-opt', 'show'=>1,],//安置网络
+            ['name'=>'Placement network', 'class'=>'', 'icon'=>'', 'controller'=>'atlas', 'action'=>'network-opt', 'routePath'=>'atlas/network-opt', 'show'=>1,],//安置网络
             ['name'=>'安置网络图', 'class'=>'', 'icon'=>'', 'controller'=>'atlas', 'action'=>'network', 'routePath'=>'atlas/network', 'show'=>0,],
             ['name'=>'安置网络列表', 'class'=>'', 'icon'=>'', 'controller'=>'atlas', 'action'=>'network-list', 'routePath'=>'atlas/network-list', 'show'=>0,],
             ['name'=>'安置网络列表导出', 'class'=>'', 'icon'=>'', 'controller'=>'atlas', 'action'=>'network-list-export', 'routePath'=>'atlas/network-list-export', 'show'=>0,],
@@ -197,9 +198,9 @@ 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'=>'Latest bonus', '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'=>'Previous bonuses', 'class'=>'', 'icon'=>'', 'controller'=>'bonus', 'action'=>'other-period-bonus', 'routePath'=>'bonus/other-period-bonus', 'show'=>1,],//往期奖金
+            ['name'=>'Member bonus', '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'=>'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,],
@@ -209,9 +210,9 @@ return [
 //            ['name'=>'领袖分红奖流水导出', 'class'=>'', 'icon'=>'', 'controller'=>'bonus', 'action'=>'flow-lx-export', 'routePath'=>'bonus/flow-lx-export', 'show'=>0,],
 //            ['name'=>'复消积分流水', 'class'=>'', 'icon'=>'', 'controller'=>'bonus', 'action'=>'flow-rp', 'routePath'=>'bonus/flow-rp', 'show'=>1,],
 //            ['name'=>'复消积分流水导出', 'class'=>'', 'icon'=>'', 'controller'=>'bonus', 'action'=>'flow-rp-export', 'routePath'=>'bonus/flow-rp-export', 'show'=>0,],
-            ['name'=>'兑换积分流水', 'class'=>'', 'icon'=>'', 'controller'=>'bonus', 'action'=>'flow-exchange', 'routePath'=>'bonus/flow-exchange', 'show'=>1,],
+//            ['name'=>'兑换积分流水', 'class'=>'', 'icon'=>'', 'controller'=>'bonus', 'action'=>'flow-exchange', 'routePath'=>'bonus/flow-exchange', 'show'=>1,],
             ['name'=>'兑换积分流水导出', 'class'=>'', 'icon'=>'', 'controller'=>'bonus', 'action'=>'flow-exchange-export', 'routePath'=>'bonus/flow-exchange-export', 'show'=>0,],
-            ['name'=>'会员余额流水', 'class'=>'', 'icon'=>'', 'controller'=>'bonus', 'action'=>'flow-balance', 'routePath'=>'bonus/flow-balance', 'show'=>1,],
+//            ['name'=>'会员余额流水', 'class'=>'', 'icon'=>'', 'controller'=>'bonus', 'action'=>'flow-balance', 'routePath'=>'bonus/flow-balance', 'show'=>1,],
             ['name'=>'会员余额流水导出', 'class'=>'', 'icon'=>'', 'controller'=>'bonus', 'action'=>'flow-balance-export', 'routePath'=>'bonus/flow-balance-export', 'show'=>0,],
 //            ['name'=>'区域津贴核算', 'class'=>'', 'icon'=>'', 'controller'=>'bonus', 'action'=>'calc-qy', 'routePath'=>'bonus/calc-qy', 'show'=>1,],
 //            ['name'=>'区域津贴补发列表', 'class'=>'', 'icon'=>'', 'controller'=>'bonus', 'action'=>'resend-qy-list', 'routePath'=>'bonus/resend-qy-list', 'show'=>1,],
@@ -253,7 +254,7 @@ return [
 //            ['name'=>'管理奖向下追溯导出', 'class'=>'', 'icon'=>'', 'controller'=>'bonus', 'action'=>'trace-down-gl-export', 'routePath'=>'bonus/trace-down-gl-export', 'show'=>0,],
 //            ['name'=>'管理奖贴向上追溯', 'class'=>'', 'icon'=>'', 'controller'=>'bonus', 'action'=>'trace-up-gl', 'routePath'=>'bonus/trace-up-gl', 'show'=>1,],
 //            ['name'=>'管理奖向上追溯导出', 'class'=>'', 'icon'=>'', 'controller'=>'bonus', 'action'=>'trace-up-gl-export', 'routePath'=>'bonus/trace-up-gl-export', 'show'=>0,],
-            ['name'=>'User performance', 'class'=>'', 'icon'=>'', 'controller'=>'bonus', 'action'=>'user-perf', 'routePath'=>'bonus/user-perf', 'show'=>1,],//用户业绩
+            ['name'=>'Member performance', 'class'=>'', 'icon'=>'', 'controller'=>'bonus', 'action'=>'user-perf', 'routePath'=>'bonus/user-perf', 'show'=>1,],//用户业绩
 //            ['name'=>'荣衔业绩', 'class'=>'', 'icon'=>'', 'controller'=>'bonus', 'action'=>'yc-perf', 'routePath'=>'bonus/yc-perf', 'show'=>1,],
 //            ['name'=>'达标业绩', 'class'=>'', 'icon'=>'', 'controller'=>'bonus', 'action'=>'perf-standard', 'routePath'=>'bonus/perf-standard', 'show'=>1,],
 //            ['name'=>'达标业绩导出', 'class'=>'', 'icon'=>'', 'controller'=>'bonus', 'action'=>'perf-standard-export', 'routePath'=>'bonus/perf-standard-export', 'show'=>0,],
@@ -270,11 +271,11 @@ return [
             ['name'=>'Performance sheet', 'class'=>'', 'icon'=>'', 'controller'=>'bonus', 'action'=>'perf-order', 'routePath'=>'bonus/perf-order', 'show'=>1,],//业绩单
             ['name'=>'业绩单导出', 'class'=>'', 'icon'=>'', 'controller'=>'bonus', 'action'=>'perf-order-export', 'routePath'=>'bonus/perf-order-export', 'show'=>0,],
 //            ['name'=>'会员实时业绩', 'class'=>'', 'icon'=>'', 'controller'=>'bonus', 'action'=>'real-time-perf', 'routePath'=>'bonus/real-time-perf', 'show'=>1,],
-            ['name'=>'Interim performance', 'class'=>'', 'icon'=>'', 'controller'=>'bonus', 'action'=>'perf-period-list', 'routePath'=>'bonus/perf-period-list', 'show'=>1,],//期业绩
+            ['name'=>'Period performance', 'class'=>'', 'icon'=>'', 'controller'=>'bonus', 'action'=>'perf-period-list', 'routePath'=>'bonus/perf-period-list', 'show'=>1,],//期业绩
             ['name'=>'期业绩导出', 'class'=>'', 'icon'=>'', 'controller'=>'bonus', 'action'=>'perf-period-list-export', 'routePath'=>'bonus/perf-period-list-export', 'show'=>0,],
             ['name'=>'Monthly performance', 'class'=>'', 'icon'=>'', 'controller'=>'bonus', 'action'=>'perf-month', 'routePath'=>'bonus/perf-month', 'show'=>1,],//月业绩
             ['name'=>'月业绩导出', 'class'=>'', 'icon'=>'', 'controller'=>'bonus', 'action'=>'perf-month-export', 'routePath'=>'bonus/perf-month-export', 'show'=>0,],
-            ['name'=>'score-month', 'class'=>'', 'icon'=>'', 'controller'=>'bonus', 'action'=>'score-month', 'routePath'=>'bonus/score-month', 'show'=>1,],//月积分
+//            ['name'=>'Score-month', 'class'=>'', 'icon'=>'', 'controller'=>'bonus', 'action'=>'score-month', 'routePath'=>'bonus/score-month', 'show'=>1,],//月积分
             ['name'=>'月积分导出', 'class'=>'', 'icon'=>'', 'controller'=>'bonus', 'action'=>'score-month-export', 'routePath'=>'bonus/score-month-export', 'show'=>0,],
         ]
     ],
@@ -298,7 +299,7 @@ return [
         'routePath'=>'finance',
         'show'=>1,
         'child'=>[
-            ['name'=>'Member balance adjustment list', 'class'=>'', 'icon'=>'', 'controller'=>'finance', 'action'=>'balance-audit-list', 'routePath'=>'finance/balance-audit-list', 'show'=>1,],//会员余额调整列表
+            ['name'=>'Member Ecoin 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,],
@@ -315,7 +316,7 @@ return [
             ['name'=>'申请调整会员业绩', 'class'=>'', 'icon'=>'', 'controller'=>'finance', 'action'=>'perf-apply', 'routePath'=>'finance/perf-apply', 'show'=>0,],
             ['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'=>'Withdrawal management', '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,],
 //            ['name'=>'提现管理-提现待审核', 'class'=>'', 'icon'=>'', 'controller'=>'finance', 'action'=>'withdraw-0', 'routePath'=>'finance/withdraw-0', 'show'=>0,],
 //            ['name'=>'提现管理-提现已审核', 'class'=>'', 'icon'=>'', 'controller'=>'finance', 'action'=>'withdraw-2', 'routePath'=>'finance/withdraw-2', 'show'=>0,],
@@ -323,7 +324,7 @@ return [
 //            ['name'=>'提现管理-提现已付款', 'class'=>'', 'icon'=>'', 'controller'=>'finance', 'action'=>'withdraw-6', 'routePath'=>'finance/withdraw-6', 'show'=>0,],
 //            ['name'=>'提现管理-付款失败', 'class'=>'', 'icon'=>'', 'controller'=>'finance', 'action'=>'withdraw-4', 'routePath'=>'finance/withdraw-4', 'show'=>0,],
 //            ['name'=>'提现管理-提现退回', 'class'=>'', 'icon'=>'', 'controller'=>'finance', 'action'=>'withdraw-7', 'routePath'=>'finance/withdraw-7', 'show'=>0,],
-            ['name'=>'审核提现信息', 'class'=>'', 'icon'=>'', 'controller'=>'finance', 'action'=>'withdraw-status', 'routePath'=>'finance/withdraw-status', 'show'=>0,],
+            ['name'=>'Review withdrawal info', 'class'=>'', 'icon'=>'', 'controller'=>'finance', 'action'=>'withdraw-status', 'routePath'=>'finance/withdraw-status', 'show'=>0,], // 审核提现信息
             //['name'=>'发票信息添加', 'class'=>'', 'icon'=>'', 'controller'=>'finance', 'action'=>'invoice-audit-add', 'routePath'=>'finance/invoice-audit-add', 'show'=>0,],
             //['name'=>'发票信息编辑', 'class'=>'', 'icon'=>'', 'controller'=>'finance', 'action'=>'invoice-audit-edit', 'routePath'=>'finance/invoice-audit-edit', 'show'=>0,],
             //['name'=>'标记付款失败批量1导入', 'class'=>'', 'icon'=>'', 'controller'=>'finance', 'action'=>'import-withdraws-to-excel-table', 'routePath'=>'finance/import-withdraws-to-excel-table', 'show'=>0,],
@@ -339,9 +340,9 @@ return [
             ['name'=>'交易类型管理', 'class'=>'', 'icon'=>'', 'controller'=>'finance', 'action'=>'deal-type', 'routePath'=>'finance/deal-type', 'show'=>1,],
             ['name'=>'交易类型添加', 'class'=>'', 'icon'=>'', 'controller'=>'finance', 'action'=>'deal-type-add', 'routePath'=>'finance/deal-type-add', 'show'=>0,],
             ['name'=>'交易类型修改', 'class'=>'', 'icon'=>'', 'controller'=>'finance', 'action'=>'deal-type-edit', 'routePath'=>'finance/deal-type-edit', 'show'=>0,],
-            ['name'=>'历史奖金余额', 'class'=>'', 'icon'=>'', 'controller'=>'finance', 'action'=>'history-bonus', 'routePath'=>'finance/history-bonus', 'show'=>1,],
+            ['name'=>'Historical bonus balance', 'class'=>'', 'icon'=>'', 'controller'=>'finance', 'action'=>'history-bonus', 'routePath'=>'finance/history-bonus', 'show'=>1,],// 历史奖金余额
             ['name'=>'历史奖金余额导出', 'class'=>'', 'icon'=>'', 'controller'=>'finance', 'action'=>'history-bonus-export', 'routePath'=>'finance/history-bonus-export', 'show'=>0,],
-            ['name'=>'充值管理', 'class'=>'', 'icon'=>'', 'controller'=>'finance', 'action'=>'recharge', 'routePath'=>'finance/recharge', 'show'=>1,],
+            ['name'=>'Recharge management', 'class'=>'', 'icon'=>'', 'controller'=>'finance', 'action'=>'recharge', 'routePath'=>'finance/recharge', 'show'=>1,], // 充值管理
             ['name'=>'充值导出', 'class'=>'', 'icon'=>'', 'controller'=>'finance', 'action'=>'recharge-export', 'routePath'=>'finance/recharge-export', 'show'=>0,],
             //['name'=>'充值管理-充值待审核', 'class'=>'', 'icon'=>'', 'controller'=>'finance', 'action'=>'recharge-0', 'routePath'=>'finance/recharge-0', 'show'=>0,],
             //['name'=>'充值管理-充值已审核', 'class'=>'', 'icon'=>'', 'controller'=>'finance', 'action'=>'recharge-1', 'routePath'=>'finance/recharge-1', 'show'=>0,],
@@ -358,11 +359,11 @@ return [
         'routePath'=>'article',
         'show'=>1,
         'child'=>[
-            ['name'=>'分类管理', 'class'=>'', 'icon'=>'', 'controller'=>'article', 'action'=>'category', 'routePath'=>'article/category', 'show'=>1,],
+            ['name'=>'Category Management', 'class'=>'', 'icon'=>'', 'controller'=>'article', 'action'=>'category', 'routePath'=>'article/category', 'show'=>1,],//分类管理
             ['name'=>'添加分类', 'class'=>'', 'icon'=>'', 'controller'=>'article', 'action'=>'category-add', 'routePath'=>'article/category-add', 'show'=>0,],
             ['name'=>'删除分类', 'class'=>'', 'icon'=>'', 'controller'=>'article', 'action'=>'category-delete', 'routePath'=>'article/category-delete', 'show'=>0,],
             ['name'=>'分类排序', 'class'=>'', 'icon'=>'', 'controller'=>'article', 'action'=>'category-sort', 'routePath'=>'article/category-sort', 'show'=>0,],
-            ['name'=>'文章列表', 'class'=>'', 'icon'=>'', 'controller'=>'article', 'action'=>'index', 'routePath'=>'article/index', 'show'=>1,],
+            ['name'=>'Article Management', 'class'=>'', 'icon'=>'', 'controller'=>'article', 'action'=>'index', 'routePath'=>'article/index', 'show'=>1,],//文章列表
             ['name'=>'添加文章', 'class'=>'', 'icon'=>'', 'controller'=>'article', 'action'=>'add', 'routePath'=>'article/add', 'show'=>0,],
             ['name'=>'编辑文章', 'class'=>'', 'icon'=>'', 'controller'=>'article', 'action'=>'edit', 'routePath'=>'article/edit', 'show'=>0,],
             ['name'=>'删除文章', 'class'=>'', 'icon'=>'', 'controller'=>'article', 'action'=>'article-delete', 'routePath'=>'article/article-delete', 'show'=>0,],
@@ -384,7 +385,7 @@ return [
 //        ]
 //    ],
     'file'=>[
-        'name'=>'file management',//文件管理
+        'name'=>'File management',//文件管理
         'class' => '',
         'icon'=>'el-icon-files',
         'controller'=>'file',
@@ -420,11 +421,11 @@ return [
             ['name'=>'添加管理员', 'class'=>'', 'icon'=>'', 'controller'=>'admin', 'action'=>'add', 'routePath'=>'admin/add', 'show'=>0,],
             ['name'=>'编辑管理员', 'class'=>'', 'icon'=>'', 'controller'=>'admin', 'action'=>'edit', 'routePath'=>'admin/edit', 'show'=>0,],
             ['name'=>'删除管理员', 'class'=>'', 'icon'=>'', 'controller'=>'admin', 'action'=>'admin-delete', 'routePath'=>'admin/admin-delete', 'show'=>0,],
-            ['name'=>'reset password', 'class'=>'', 'icon'=>'', 'controller'=>'admin', 'action'=>'change-password', 'routePath'=>'admin/change-password', 'show'=>1,],//重置密码
+            ['name'=>'Reset password', 'class'=>'', 'icon'=>'', 'controller'=>'admin', 'action'=>'change-password', 'routePath'=>'admin/change-password', 'show'=>1,],//重置密码
         ]
     ],
     'ad'=>[
-        'name'=>'广告管理',
+        'name'=>'Ad Management',
         'class' => '',
         'icon'=>'el-icon-picture-outline',
         'controller'=>'ad',
@@ -432,11 +433,11 @@ return [
         'routePath'=>'ad',
         'show'=>1,
         'child'=>[
-            ['name'=>'广告位', 'class'=>'', 'icon'=>'', 'controller'=>'ad', 'action'=>'location', 'routePath'=>'ad/location', 'show'=>1,],
-            ['name'=>'广告列表', 'class'=>'', 'icon'=>'', 'controller'=>'ad', 'action'=>'list', 'routePath'=>'ad/list', 'show'=>0,],
-            ['name'=>'添加广告', 'class'=>'', 'icon'=>'', 'controller'=>'ad', 'action'=>'add', 'routePath'=>'ad/add', 'show'=>0,],
-            ['name'=>'编辑广告', 'class'=>'', 'icon'=>'', 'controller'=>'ad', 'action'=>'edit', 'routePath'=>'ad/edit', 'show'=>0,],
-            ['name'=>'删除广告', 'class'=>'', 'icon'=>'', 'controller'=>'ad', 'action'=>'ad-delete', 'routePath'=>'ad/ad-delete', 'show'=>0,],
+            ['name'=>'Ad', 'class'=>'', 'icon'=>'', 'controller'=>'ad', 'action'=>'location', 'routePath'=>'ad/location', 'show'=>1,],
+            ['name'=>'Ad list', 'class'=>'', 'icon'=>'', 'controller'=>'ad', 'action'=>'list', 'routePath'=>'ad/list', 'show'=>0,],
+            ['name'=>'Add', 'class'=>'', 'icon'=>'', 'controller'=>'ad', 'action'=>'add', 'routePath'=>'ad/add', 'show'=>0,],
+            ['name'=>'Edit', 'class'=>'', 'icon'=>'', 'controller'=>'ad', 'action'=>'edit', 'routePath'=>'ad/edit', 'show'=>0,],
+            ['name'=>'Delete', 'class'=>'', 'icon'=>'', 'controller'=>'ad', 'action'=>'ad-delete', 'routePath'=>'ad/ad-delete', 'show'=>0,],
         ]
     ],
     'log'=>[

backendApi/config/urlManagerRules.php

@@ -50,6 +50,7 @@ return [
             'GET,POST upload' => 'upload',
             'GET dec-order-list' => 'dec-order-list',
             'GET dec-order-list-export' => 'dec-order-list-export',
+            'POST delete-order' => 'delete-order',
             'GET order-list' => 'order-list',
             'GET order-list-export' => 'order-list-export',
             'POST order-delivery' => 'order-delivery',

backendApi/modules/v1/components/UserAuth.php

@@ -314,7 +314,7 @@ class UserAuth extends User
             return true;
         }
         $userInfo = $this->_userInfo;
-        if($userInfo && isset($userInfo) && $userInfo['roleId'] === Yii::$app->params['superAdminRoleId']){
+        if($userInfo && $userInfo['roleId'] === Yii::$app->params['superAdminRoleId']){
             return true;
         }
         // 获取管理员权限

backendApi/modules/v1/controllers/AdController.php

@@ -130,9 +130,9 @@ class AdController extends BaseController
             $formModel = new AdForm();
             $formModel->scenario = 'sort';
             if($formModel->load(Yii::$app->request->get(), '') && $formModel->sortTo()){
-                return static::notice('排序成功');
+                return static::notice('Success');
             } else {
-                return static::notice('排序失败', 400);
+                return static::notice('Fail', 400);
             }
         }
     }
@@ -147,9 +147,9 @@ class AdController extends BaseController
             $formModel = new AdForm();
             $formModel->scenario = 'status';
             if($formModel->load(Yii::$app->request->get(), '') && $formModel->statusTo()){
-                return static::notice('排序成功');
+                return static::notice('Success');
             } else {
-                return static::notice('排序失败', 400);
+                return static::notice('Fail', 400);
             }
         }
     }

backendApi/modules/v1/controllers/ArticleController.php

@@ -41,7 +41,7 @@ class ArticleController extends BaseController
      */
     public function actionCategoryAdd(){
         if(Yii::$app->request->isPost) {
-            return parent::edit(ArticleCategoryForm::class, '文章分类添加成功');
+            return parent::edit(ArticleCategoryForm::class, 'Successful');
         }
     }
 
@@ -66,9 +66,9 @@ class ArticleController extends BaseController
             $formModel = new ArticleCategoryForm();
             $formModel->scenario = 'sort';
             if($formModel->load(Yii::$app->request->get(), '') && $formModel->sortTo()){
-                return static::notice('排序成功');
+                return static::notice('Successful');
             } else {
-                return static::notice('排序失败', 400);
+                return static::notice('Fail', 400);
             }
         }
     }
@@ -95,7 +95,7 @@ class ArticleController extends BaseController
      */
     public function actionAdd(){
         if(Yii::$app->request->isPost) {
-            return parent::edit(ArticleForm::class, '文章添加成功');
+            return parent::edit(ArticleForm::class, 'Successful');
         }
         // 获取全部分类
         $allCategory = ArticleCategory::find()->where('STATUS=1')->asArray()->all();
@@ -111,7 +111,7 @@ class ArticleController extends BaseController
     public function actionEdit(){
         $id = Yii::$app->request->get('id');
         if(Yii::$app->request->isPost){
-            return parent::edit(ArticleForm::class, '编辑成功');
+            return parent::edit(ArticleForm::class, 'Successful');
         }
         $oneData = Article::findOneAsArray(['ID'=>$id]);
         $oneData['CONTENT'] = is_resource($oneData['CONTENT']) ? stream_get_contents($oneData['CONTENT']) : '';

backendApi/modules/v1/controllers/AtlasController.php

@@ -78,8 +78,10 @@ class AtlasController extends BaseController {
             $userId = Yii::$app->params['mainUserId'];
         }
         $baseInfo = Info::baseInfo($userId, $periodNum);
+//        print_r($baseInfo);exit;
         $decLevelConfig = Cache::getDecLevelConfig();
         $empLevelConfig = Cache::getEmpLevelConfig();
+        $starLevelConfig = Cache::getStarCrownLevelConfig();
         return static::notice([
             [
                 'TOP_RELATION_DEEP' => $baseInfo['RELATION_DEEP'],
@@ -90,6 +92,7 @@ class AtlasController extends BaseController {
                 'PERIOD_AT' => $baseInfo['PERIOD_AT'],
                 'DEC_LV_NAME' => $decLevelConfig[$baseInfo['DEC_LV']]['LEVEL_NAME'],
                 'EMP_LV_NAME' => isset($empLevelConfig[$baseInfo['EMP_LV']])?$empLevelConfig[$baseInfo['EMP_LV']]['LEVEL_NAME']:'',
+                'STAR_LV_NAME' => isset($starLevelConfig[$baseInfo['STAR_LV']])?$starLevelConfig[$baseInfo['STAR_LV']]['LEVEL_NAME']:'',
                 'leaf' => false,
                 'icon' => 'el-icon-user-solid',
                 'children' => null,

backendApi/modules/v1/controllers/BaseController.php

@@ -142,7 +142,7 @@ class BaseController extends \yii\rest\ActiveController {
             $selected = \Yii::$app->request->post('selected');
         }
         if (!$selected) {
-            return self::notice('必须选择一条删除数据', 500);
+            return self::notice('must select one item to delete', 500);// 必须选择一条删除数据
         }
 
         // 是否存在 DONT_DEL 字段
@@ -178,7 +178,7 @@ class BaseController extends \yii\rest\ActiveController {
             if ($isDelData) {
                 // 真实删除数据
                 if (!$modelClass::deleteAll($condition, $params)) {
-                    throw new Exception('删除失败');
+                    throw new Exception('failed to delete');//删除失败
                 }
             } else {
                 // 设置IS_DEL字段为1
@@ -186,7 +186,7 @@ class BaseController extends \yii\rest\ActiveController {
             }
             if ($afterFun) $afterFun($selected);
             $transaction->commit();
-            return self::notice('删除成功');
+            return self::notice('delete successfully');//删除成功
         } catch (Exception $e) {
             $transaction->rollBack();
             return self::notice($e->getMessage(), 500);
@@ -272,7 +272,7 @@ class BaseController extends \yii\rest\ActiveController {
                 reset($getValueArr);
                 if($filterModel == 'date'){
                     if( $getSymbol !== '>=' && $getSymbol !== '<=' && $getSymbol !== '>' && $getSymbol !== '<' ) {
-                        throw new \Exception("日期筛选格式不对");
+                        throw new \Exception("Incorrect date format");//日期筛选格式不对
                     }
                     $bindValue = strtotime($getValueArr[1]);
                     $isDate = true;

backendApi/modules/v1/controllers/BonusController.php

@@ -41,6 +41,7 @@ use backendApi\modules\v1\models\lists\bonus\TraceUpYjList;
 use backendApi\modules\v1\models\lists\bonus\UserPerfList;
 use common\helpers\Cache;
 use common\helpers\Date;
+use common\helpers\LoggerTool;
 use common\helpers\Tool;
 use common\helpers\user\Info;
 use common\helpers\user\Perf;
@@ -747,7 +748,7 @@ class BonusController extends BaseController {
         $condition .= ' AND C.PERIOD_NUM=:PERIOD_NUM';
         $params[':PERIOD_NUM'] = $periodNum;
         if (!$period->isClosed($periodNum)) {
-            return static::notice('该期不能查看');
+            return static::notice('Cannot view this period'); // 该期不能查看
         }
         $data = CalcBonus::lists($condition, $params, [
             'yearMonth' => $yearMonth,
@@ -841,7 +842,7 @@ class BonusController extends BaseController {
         }
         $data = $this->_periodBonus($periodNum,false);
         if( isset($data['filterTypes']) && is_array($data['filterTypes']) ) {
-            $data['filterTypes'] = array_merge(['periodNum'=>['isUserTable'=> false, 'name'=> '结算期数']], $data['filterTypes']);
+            $data['filterTypes'] = array_merge(['periodNum'=>['isUserTable'=> false, 'name'=> 'Number of settlement periods']], $data['filterTypes']);
         }
 
         return static::notice($data);
@@ -943,20 +944,20 @@ class BonusController extends BaseController {
             'LAST_CON_REAL_NAME' => 'CB.LAST_CON_REAL_NAME',
             'BONUS_BD' => 'CB.BONUS_BD',
             'BONUS_TG' => 'CB.BONUS_TG',
-            'BONUS_XF' => 'CB.BONUS_XF',
-            'BONUS_YJ' => 'CB.BONUS_YJ',
-            'BONUS_GX' => 'CB.BONUS_GX',
-            'BONUS_GL' => 'CB.BONUS_GL',
+//            'BONUS_XF' => 'CB.BONUS_XF',
+//            'BONUS_YJ' => 'CB.BONUS_YJ',
+//            'BONUS_GX' => 'CB.BONUS_GX',
+//            'BONUS_GL' => 'CB.BONUS_GL',
             // 'BONUS_GL' => 'CB.BONUS_BS',
             'BONUS_QY' => 'CB.BONUS_QY',
-            'BONUS_YC' => 'CB.BONUS_YC',
-            'ORI_BONUS_STANDARD' => 'CB.ORI_BONUS_STANDARD',
+//            'BONUS_YC' => 'CB.BONUS_YC',
+//            'ORI_BONUS_STANDARD' => 'CB.ORI_BONUS_STANDARD',
             'PV_1L' => 'CB.PV_1L',
             'SURPLUS_1L' => 'CB.SURPLUS_1L',
             'PV_2L' => 'CB.PV_2L',
             'SURPLUS_2L' => 'CB.SURPLUS_2L',
-            'PV_3L' => 'CB.PV_3L',
-            'SURPLUS_3L' => 'CB.SURPLUS_3L',
+//            'PV_3L' => 'CB.PV_3L',
+//            'SURPLUS_3L' => 'CB.SURPLUS_3L',
             'CALCULATED_AT' => 'CB.CALCULATED_AT',
             'CALC_MONTH' => 'CB.CALC_MONTH',
             'BONUS_QY_MONTH' => 'CB.BONUS_QY_MONTH',
@@ -969,8 +970,15 @@ class BonusController extends BaseController {
             $condition .= ' AND CB.PERIOD_NUM=:PERIOD_NUM';
             $params[':PERIOD_NUM'] = $periodNum;
         }
-        $listObj = new PeriodBonusList();
-        $data = $listObj->getList(['condition'=>$condition, 'params'=>$params, 'others'=>['yearMonth'=>$yearMonth]]);
+
+        try {
+            $listObj = new PeriodBonusList();
+            $data = $listObj->getList(['condition'=>$condition, 'params'=>$params, 'others'=>['yearMonth'=>$yearMonth]]);
+        } catch (Exception $e) {
+            LoggerTool::info([$e->getFile(), $e->getLine(), $e->getMessage()]);
+            return null;
+        }
+
         return $data;
     }
 

backendApi/modules/v1/controllers/ConfigController.php

@@ -855,8 +855,11 @@ class ConfigController extends BaseController {
      * @throws \yii\web\HttpException
      */
     public function actionExchangeRate() {
+        $post = Yii::$app->request->post();
+        unset($post['synchronize']);
+
         $form = new ConfigForm();
-        if (Yii::$app->request->post() && $form->load(Yii::$app->request->post(), '')) {
+        if (\Yii::$app->request->isPost && $form->load($post, '')) {
             if ($form->updateExchangeRate()) {
                 Config::updateToCache();
                 return static::notice('更新汇率配置成功');

backendApi/modules/v1/controllers/FinanceController.php

@@ -431,7 +431,7 @@ class FinanceController extends BaseController {
                     $userName = Info::getUserNameByUserId($k);
                     // Log::adminHandle('为会员' . $userName . '的提现流水号为' . $value . '改变提现状态至' . Withdraw::STATUS_NAME[$result['status']], 1, $k, $userName);
                 }
-                return static::notice('状态设置成功');
+                return static::notice('Status setting succeeded'); // 状态设置成功
             } else {
                 return static::notice(Form::formatErrorsForApi($formModel->getErrors()), 400);
             }
@@ -451,7 +451,27 @@ class FinanceController extends BaseController {
             'CREATED_AT' => 'W.CREATED_AT',
             'AUDIT_STATUS_NAME' => 'W.AUDIT_STATUS',
             'USER_NAME' => 'U.USER_NAME',
+            'WITHDRAW_PERIOD_NUM' => 'W.WITHDRAW_PERIOD_NUM',
         ]);
+//        $selectedIds = \Yii::$app->request->get('selectedIds', []);
+//        if ($selectedIds) {
+//            $filter['condition'] .= " AND W.ID IN (" . implode(',', $selectedIds) . ")";
+//        }
+        if (isset($filter['request']['filterStatus'])) {
+            $status = explode(',',$filter['request']['filterStatus']);
+            $status = end($status);
+            if (is_numeric($status)) {
+                $filter['condition'] .= " AND W.AUDIT_STATUS = $status";
+            }
+        }
+        if (isset($filter['request']['WITHDRAW_PERIOD_NUM'])) {
+            
+            $period = explode(',',$filter['request']['WITHDRAW_PERIOD_NUM']);
+            $periodNum = isset($period[1]) ? $period[1] : '';
+            if (is_numeric($periodNum)) {
+                 $filter['condition'] .= " AND W.WITHDRAW_PERIOD_NUM = $periodNum";
+            }
+        }
         $form = new FinanceExportForm();
         $result = $form->run($filter, '提现申请');
         if (!$result) {
@@ -1126,13 +1146,13 @@ class FinanceController extends BaseController {
                     $userName = Info::getUserNameByUserId($k);
                     // Log::adminHandle('为会员' . $userName . '的充值流水号为' . $value . '改变充值状态至' . Recharge::STATUS_NAME[$result['status']], 1, $k, $userName);
                 }
-                return static::notice('状态设置成功');
+                return static::notice('Status setting succeeded'); // 状态设置成功
             } else {
                 return static::notice(Form::formatErrorsForApi($formModel->getErrors()), 400);
             }
         }
         // 所有开户行
-        $statusArray = [2=>'审核通过',3=>'审核拒绝'];
+        $statusArray = [2=>'Approve',3=>'Reject']; // 2=>'审核通过',3=>'审核拒绝'
         return static::notice(['statusArray' => $statusArray]);
     }
 

backendApi/modules/v1/controllers/ShopController.php

@@ -30,6 +30,7 @@ use common\models\forms\DecPackageForm;
 use common\models\forms\ExcelOrderDecForm;
 use common\models\forms\ExcelOrderShopForm;
 use common\models\forms\ExcelOrderStandardForm;
+use common\models\forms\OrderDeleteForm;
 use common\models\forms\OrderForm;
 use common\models\forms\ShopGoodsForm;
 use common\models\forms\UploadForm;
@@ -110,7 +111,7 @@ class ShopController extends BaseController {
             $formModel = new ShopGoodsForm();
             $formModel->scenario = 'add';
             if ($formModel->load(\Yii::$app->request->post(), '') && $result = $formModel->add()) {
-                return static::notice('商品添加成功');
+                return static::notice('Product add succeeded.');
             } else {
                 return static::notice(Form::formatErrorsForApi($formModel->getErrors()),400);
             }
@@ -136,7 +137,7 @@ class ShopController extends BaseController {
             $formModel->scenario = 'edit';
             $formModel->id = $id;
             if ($formModel->load(\Yii::$app->request->post(), '') && $result = $formModel->edit()) {
-                return static::notice('商品编辑成功');
+                return static::notice('Product editing succeeded.');
             } else {
                 return static::notice(Form::formatErrorsForApi($formModel->getErrors()),400);
             }
@@ -196,7 +197,7 @@ class ShopController extends BaseController {
 //                foreach ($result['logs'] as $k => $value) {
 //                     Log::adminHandle('改变商品状态至' . ShopGoods::STATUS_NAME[$result['status']], 1, $k);
 //                }
-                return static::notice('状态设置成功');
+                return static::notice('Status setting succeeded'); // 状态设置成功
             } else {
                 return static::notice(Form::formatErrorsForApi($formModel->getErrors()), 400);
             }
@@ -279,7 +280,7 @@ class ShopController extends BaseController {
             $formModel->scenario = 'changeStatus';
             if ($formModel->load(\Yii::$app->request->post(), '') && $result = $formModel->changeStatus()) {
 
-                return static::notice('状态设置成功');
+                return static::notice('Status setting succeeded'); // 状态设置成功
             } else {
                 return static::notice(Form::formatErrorsForApi($formModel->getErrors()), 400);
             }
@@ -358,6 +359,19 @@ class ShopController extends BaseController {
         return static::notice('导出开始，请到文件管理-导出文件查看');
     }
 
+    // 删除订单
+    public function actionDeleteOrder() {
+        if (\Yii::$app->request->isPost) {
+            $formModel = new OrderDeleteForm();
+            if ($formModel->load(\Yii::$app->request->post(), '') && $result = $formModel->returnOrder()) {
+
+                return static::notice('删除订单成功，请重新生成业绩单，计算奖金');
+            } else {
+                return static::notice(Form::formatErrorsForApi($formModel->getErrors()), 400);
+            }
+        }
+    }
+
     /**
      * 订单表
      * @return mixed
@@ -372,10 +386,11 @@ class ShopController extends BaseController {
             'PERIOD_NUM'=> 'O.PERIOD_NUM',
             'CREATED_AT'=> 'O.CREATED_AT',
             'ORDER_TYPE'=> 'O.ORDER_TYPE',
+            'STATUS' => 'O.STATUS',
         ]);
-        $condition = $filter['condition'];
+        $condition = ' 1=1 ' . $filter['condition'];
         $params = $filter['params'];
-        $condition .= ' AND O.IS_DELETE=0';
+        $condition .= $condition ? ' AND O.IS_DELETE=0' : ' O.IS_DELETE=0';
         $listObj = new OrderList();
         $data = $listObj->getList(['condition'=>$condition, 'params'=>$params]);
         return static::notice($data);
@@ -396,7 +411,7 @@ class ShopController extends BaseController {
             'PERIOD_NUM'=> 'O.PERIOD_NUM',
             'CREATED_AT'=> 'O.CREATED_AT',
         ]);
-        $filter['condition'] .= ' AND O.IS_DELETE=0';
+        $filter['condition'] .= ' 1=1 AND O.IS_DELETE=0';
         $form = new ShopExportForm();
         $result = $form->run($filter, '订单列表');
         if (!$result) {
@@ -441,7 +456,7 @@ class ShopController extends BaseController {
         ]);
         $condition = $filter['condition'];
         $params = $filter['params'];
-        $condition .= ' AND O.IS_DELETE=0';
+        $condition .= ' 1=1 AND O.IS_DELETE=0';
         $listObj = new OrderDecList();
         $data = $listObj->getList(['condition'=>$condition, 'params'=>$params]);
         return static::notice($data);
@@ -667,7 +682,7 @@ class ShopController extends BaseController {
             'CREATED_AT'=> 'O.CREATED_AT',
         ]);
 
-        $filter['condition'] = ' AND O.IS_DELETE=0 AND O.SN=:SN';
+        $filter['condition'] = ' 1=1 AND O.IS_DELETE=0 AND O.SN=:SN';
         $filter['params'] = [':SN' => $orderSn];
 
         $form = new ShopExportForm();
@@ -696,7 +711,7 @@ class ShopController extends BaseController {
             'CREATED_AT'=> 'O.CREATED_AT',
         ]);
 
-        $filter['condition'] = ' AND O.IS_DELETE=0 AND O.SN=:SN';
+        $filter['condition'] = ' 1=1 AND O.IS_DELETE=0 AND O.SN=:SN';
         $filter['params'] = [':SN' => $orderSn];
 
         $form = new ShopExportForm();

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

@@ -133,7 +133,7 @@ class BalanceList extends \common\libs\dataList\DataList implements DataListInte
 //                    'headerOther' => ['width' => '150'],
 //                ],
                 'BONUS' => [
-                    'header' => 'Member bonus balance',//会员奖金余额
+                    'header' => 'Member bonus',//会员奖金余额
                     'value' => function($row) {
                         return (new Price([
                             'value' => $row['BONUS'],
@@ -163,7 +163,7 @@ class BalanceList extends \common\libs\dataList\DataList implements DataListInte
 //                    ],
 //                ],
                 'CASH' => [
-                    'header' => 'Member balance',//会员余额
+                    'header' => 'Member Ecoin',//会员余额
                     'value' => function($row) {
                         return (new Price([
                             'value' => $row['CASH'],
@@ -177,21 +177,21 @@ class BalanceList extends \common\libs\dataList\DataList implements DataListInte
                         'tag'=>['type'=>'danger', 'size' => 'small', 'class'=>'no-border'],
                     ],
                 ],
-                'EXCHANGE_POINTS' => [
-                    'header' => 'Redeem points',//兑换积分
-                    'value' => function($row) {
-                        return (new Price([
-                            'value' => $row['EXCHANGE_POINTS'],
-                        ]))->result();
-                    },
-                    'headerOther' => [
-                        'width' => '150',
-                        'prop'=>'BONUS',
-                    ],
-                    'valueOther' => [
-                        'tag'=>['type'=>'danger', 'size' => 'small', 'class'=>'no-border'],
-                    ],
-                ],
+                // 'EXCHANGE_POINTS' => [
+                //     'header' => 'Redeem points',//兑换积分
+                //     'value' => function($row) {
+                //         return (new Price([
+                //             'value' => $row['EXCHANGE_POINTS'],
+                //         ]))->result();
+                //     },
+                //     'headerOther' => [
+                //         'width' => '150',
+                //         'prop'=>'BONUS',
+                //     ],
+                //     'valueOther' => [
+                //         'tag'=>['type'=>'danger', 'size' => 'small', 'class'=>'no-border'],
+                //     ],
+                // ],
 //                'CF' => [
 //                    'header' => '车房养老余额',
 //                    'value' => function($row) {
@@ -318,7 +318,7 @@ class BalanceList extends \common\libs\dataList\DataList implements DataListInte
 //                    'headerOther' => ['width' => '130'],
 //                ],
                 'TOURISM_POINTS' => [
-                    'header' => 'Travel points',//旅游积分
+                    'header' => 'Travel incentive',//旅游积分
                     'value' => function($row) {
                         return (new Price([
                             'value' => $row['TOURISM_POINTS'],
@@ -333,7 +333,7 @@ class BalanceList extends \common\libs\dataList\DataList implements DataListInte
                     ],
                 ],
                 'GARAGE_POINTS' => [
-                    'header' => 'Garage points',//车房积分
+                    'header' => 'CarVilla incentive',//车房积分
                     'value' => function($row) {
                         return (new Price([
                             'value' => $row['GARAGE_POINTS'],
@@ -361,7 +361,7 @@ class BalanceList extends \common\libs\dataList\DataList implements DataListInte
 //                    'headerOther' => ['width' => '150'],
 //                ],
                 'MOBILE' => [
-                    'header' => 'phone number',//手机号码
+                    'header' => 'Phone number',//手机号码
                     'value' => function($row) {
                         return "\t".$row['MOBILE'];
                     },
@@ -428,9 +428,9 @@ class BalanceList extends \common\libs\dataList\DataList implements DataListInte
                 'IS_DEC'=> ['isUserTable'=> false, 'name'=> 'Declaration center or not', 'other'=> 'yesOrNo'],//是否报单中心
 //                'DEC_ROLE_NAME'=> ['isUserTable'=> true, 'name'=> '报单中心级别', 'other'=> 'decRole'],
 //                'SYSTEM_NAME'=> ['isUserTable'=> false, 'name'=> '体系名称', 'other'=> 'systems'],
-                'BONUS'=> ['isUserTable'=> false, 'name'=> 'Member bonus balance'],//会员奖金余额
+                'BONUS'=> ['isUserTable'=> false, 'name'=> 'Member bonus'],//会员奖金余额
 //                'RECONSUME_POINTS'=> ['isUserTable'=> false, 'name'=> '会员复消积分'],
-                'CASH'=> ['isUserTable'=> false, 'name'=> 'Member balance'],//会员余额
+                'CASH'=> ['isUserTable'=> false, 'name'=> 'Member Ecoin'],//会员余额
 //                'CF'=> ['isUserTable'=> false, 'name'=> '车房养老余额'],
 //                'LX'=> ['isUserTable'=> false, 'name'=> '领袖分红余额'],
 //                'STATUS'=> ['isUserTable'=> true, 'name'=> '会员状态', 'other'=> 'status'],
@@ -440,7 +440,7 @@ class BalanceList extends \common\libs\dataList\DataList implements DataListInte
 //                'DEC_DEC_ROLE_NAME'=> ['isUserTable'=> true, 'name'=> '所属报单中心级别', 'other'=> 'decRole'],
 //                'DEC_USER_NAME'=> ['isUserTable'=> true, 'name'=> '所属报单中心编号'],
 //                'DEC_REAL_NAME'=> ['isUserTable'=> true, 'name'=> '所属报单中心姓名'],
-                'MOBILE'=> ['isUserTable'=> false, 'name'=> 'phone number'],//手机号码
+                'MOBILE'=> ['isUserTable'=> false, 'name'=> 'Phone number'],//手机号码
                 'TEL'=> ['isUserTable'=> false, 'name'=> 'Alternate phone number'],//备用手机号码
 //                'AREA'=> ['isUserTable'=> true, 'name'=> '常用地址', 'other'=> 'area'],
 //                'SUB_COM_NAME'=> ['isUserTable'=> true, 'name'=> '所属分公司', 'other'=> 'subCompany'],

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

@@ -78,7 +78,7 @@ class PerfOrderList extends \common\libs\dataList\DataList implements DataListIn
                 'DEC_TYPE' => [
                     'header' => 'Performance sheet type',//业绩单类型
                     'headerOther' => [
-                        'width' => '110',
+                        'width' => '130',
                     ],
                     'value' => function($row){
                         $decTypes = [

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

@@ -56,6 +56,7 @@ class PeriodBonusList extends \common\libs\dataList\DataList implements DataList
             foreach ($this->listData['list'] as $key => $value) {
                 $this->listData['list'][$key]['LAST_DEC_LV_NAME'] = Cache::getDecLevelConfig()[$value['LAST_DEC_LV']]['LEVEL_NAME'];
                 $this->listData['list'][$key]['LAST_EMP_LV_NAME'] = Cache::getEmpLevelConfig()[$value['LAST_EMP_LV']]['LEVEL_NAME'];
+                $this->listData['list'][$key]['LAST_STAR_LV_NAME'] = Cache::getStarCrownLevelConfig()[$value['LAST_STAR_LV']]['LEVEL_NAME'] ?? $value['LAST_STAR_LV'];
                 $this->listData['list'][$key]['LAST_STATUS_NAME'] = \Yii::$app->params['userStatus'][$value['LAST_STATUS']]['label'];
 
                 $this->listData['list'][$key]['LAST_REC_USER_NAME'] = Info::getUserNameByUserId($value['REC_UID']);
@@ -122,6 +123,12 @@ class PeriodBonusList extends \common\libs\dataList\DataList implements DataList
                         'width' => '140',
                     ],
                 ],
+                'LAST_STAR_LV_NAME' => [
+                    'header' => 'Member star at settlement',//结算时会员聘级
+                    'headerOther' => [
+                        'width' => '140',
+                    ],
+                ],
                 'LAST_MOBILE' => [
                     'header' => 'phone number',//手机号码
                     'headerOther' => [
@@ -152,7 +159,7 @@ class PeriodBonusList extends \common\libs\dataList\DataList implements DataList
                 'LAST_REC_REAL_NAME' => [
                     'header' => 'Pioneer name',//开拓者姓名
                     'headerOther' => [
-                        'width' => '100',
+                        'width' => '120',
                     ],
                 ],
                 'LAST_CON_USER_NAME' => [
@@ -164,7 +171,7 @@ class PeriodBonusList extends \common\libs\dataList\DataList implements DataList
                 'LAST_CON_REAL_NAME' => [
                     'header' => 'Superior name',//上级姓名
                     'headerOther' => [
-                        'width' => '100',
+                        'width' => '120',
                     ],
                 ],
 //                'PV_1L' => [
@@ -276,19 +283,19 @@ class PeriodBonusList extends \common\libs\dataList\DataList implements DataList
 //                    ],
 //                ],
                 'BONUS_TG' => [
-                    'header' => 'Sales bonus',//销售奖金
+                    'header' => 'Welcome Bonus',//销售奖金
                     'value' => function($row) {
                         return (new Price([
                             'value' => $row['BONUS_TG'],
                         ]))->result();
                     },
                     'headerOther' => [
-                        'width' => '120',
+                        'width' => '130',
                         'prop'=>'BONUS_TG',
                     ],
                 ],
                 'ORI_BONUS_TG' => [
-                    'header' => 'Original amount of sales bonus',//销售奖金原金额
+                    'header' => 'Original amount of Welcome Bonus',//销售奖金原金额
                     'value' => function($row) {
                         return (new Price([
                             'value' => $row['ORI_BONUS_TG'],
@@ -300,7 +307,7 @@ class PeriodBonusList extends \common\libs\dataList\DataList implements DataList
                     ],
                 ],
                 'BONUS_QY' => [
-                    'header' => 'achievement bonus',//绩效奖金
+                    'header' => 'Team Bonus',//绩效奖金
                     'value' => function($row) {
                         return (new Price([
                             'value' => $row['BONUS_QY'],
@@ -312,7 +319,7 @@ class PeriodBonusList extends \common\libs\dataList\DataList implements DataList
                     ],
                 ],
                 'ORI_BONUS_QY' => [
-                    'header' => 'Original amount of performance bonus',//绩效奖金原金额
+                    'header' => 'Original amount of Team Bonus',//绩效奖金原金额
                     'value' => function($row) {
                         return (new Price([
                             'value' => $row['ORI_BONUS_QY'],
@@ -324,7 +331,7 @@ class PeriodBonusList extends \common\libs\dataList\DataList implements DataList
                     ],
                 ],
                 'ORI_CAPPED_BONUS_QY' => [
-                    'header' => 'Uncapped amount of Performance Award',//绩效奖未封顶金额
+                    'header' => 'Uncapped amount of Team Award',//绩效奖未封顶金额
                     'value' => function($row) {
                         return (new Price([
                             'value' => $row['ORI_CAPPED_BONUS_QY'],
@@ -335,198 +342,222 @@ class PeriodBonusList extends \common\libs\dataList\DataList implements DataList
                         'prop'=>'ORI_CAPPED_BONUS_QY',
                     ],
                 ],
-                'ORI_BONUS_QY_BD' => [
-                    'header' => 'Original amount of declaration Team Award',//报单团队奖原金额
-                    'value' => function($row) {
-                        return (new Price([
-                            'value' => $row['ORI_BONUS_QY_BD'],
-                        ]))->result();
-                    },
-                    'headerOther' => [
-                        'width' => '120',
-                        'prop'=>'ORI_BONUS_QY_BD',
-                    ],
-                ],
-//                'BONUS_BS' => [
-//                    'header' => '蓝星管理奖',
-//                    'value' => function($row) {
-//                        return (new Price([
-//                            'value' => $row['BONUS_BS'],
-//                        ]))->result();
-//                    },
-//                    'headerOther' => [
-//                        'width' => '120',
-//                        'prop'=>'BONUS_BS',
-//                    ],
-//                ],
-//                'ORI_BONUS_BS' => [
-//                    'header' => '蓝星管理奖原金额',
+//                'ORI_BONUS_QY_BD' => [
+//                    'header' => 'Original amount of declaration Team Award',//报单团队奖原金额
 //                    'value' => function($row) {
 //                        return (new Price([
-//                            'value' => $row['ORI_BONUS_BS'],
+//                            'value' => $row['ORI_BONUS_QY_BD'],
 //                        ]))->result();
 //                    },
 //                    'headerOther' => [
 //                        'width' => '120',
-//                        'prop'=>'ORI_BONUS_BS',
+//                        'prop'=>'ORI_BONUS_QY_BD',
 //                    ],
 //                ],
-                // 'REAL_BONUS_BS' => [
-                //     'header' => '实发蓝星管理奖',
-                //     'value' => function($row) {
-                //         return (new Price([
-                //             'value' => $row['REAL_BONUS_BS'],
-                //         ]))->result();
-                //     },
-                //     'headerOther' => [
-                //         'width' => '120',
-                //         'prop'=>'REAL_BONUS_BS',
-                //     ],
-                // ],
-                'BONUS_BS_MNT' => [
-                    'header' => 'Bluestar Management Award',//蓝星管理奖
-                    'value' => function($row) {
-                        return (new Price([
-                            'value' => $row['BONUS_BS_MNT'],
-                        ]))->result();
-                    },
-                    'headerOther' => [
-                        'width' => '120',
-                        'prop' => 'BONUS_BS_MNT',
-                    ],
-                ],
-                'ORI_BONUS_BS_MNT' => [
-                    'header' => 'Original amount of Bluestar Management Award',//蓝星管理奖原金额
+                'BONUS_BS' => [
+                    'header' => 'Director Bonus',// 管理奖/蓝星奖
                     'value' => function($row) {
                         return (new Price([
-                            'value' => $row['ORI_BONUS_BS_MNT'],
+                            'value' => $row['BONUS_BS'],
                         ]))->result();
                     },
                     'headerOther' => [
                         'width' => '120',
-                        'prop' => 'ORI_BONUS_BS_MNT',
+                        'prop'=>'BONUS_BS',
                     ],
                 ],
-                'BONUS_BS_ABBR' => [
-                    'header' => 'Blue star performance award',//蓝星业绩奖
+                'ORI_BONUS_BS' => [
+                    'header' => 'Original amount of Director Bonus',
                     'value' => function($row) {
                         return (new Price([
-                            'value' => $row['BONUS_BS_ABBR'],
+                            'value' => $row['ORI_BONUS_BS'],
                         ]))->result();
                     },
                     'headerOther' => [
                         'width' => '120',
-                        'prop' => 'BONUS_BS_ABBR',
+                        'prop'=>'ORI_BONUS_BS',
                     ],
                 ],
-                'ORI_BONUS_BS_ABBR' => [
-                    'header' => 'Original amount of blue star performance award',//蓝星业绩奖原金额
-                    'value' => function($row) {
-                        return (new Price([
-                            'value' => $row['ORI_BONUS_BS_ABBR'],
-                        ]))->result();
-                    },
-                    'headerOther' => [
-                        'width' => '120',
-                        'prop' => 'ORI_BONUS_BS_ABBR',
-                    ],
-                ],
-//                'BONUS_GX' => [
-//                    'header' => '共享奖',
+                // 'REAL_BONUS_BS' => [
+                //     'header' => '实发蓝星管理奖',
+                //     'value' => function($row) {
+                //         return (new Price([
+                //             'value' => $row['REAL_BONUS_BS'],
+                //         ]))->result();
+                //     },
+                //     'headerOther' => [
+                //         'width' => '120',
+                //         'prop'=>'REAL_BONUS_BS',
+                //     ],
+                // ],
+//                'BONUS_BS_MNT' => [
+//                    'header' => 'Bluestar Management Award',//蓝星管理奖
 //                    'value' => function($row) {
 //                        return (new Price([
-//                            'value' => $row['BONUS_GX'],
+//                            'value' => $row['BONUS_BS_MNT'],
 //                        ]))->result();
 //                    },
 //                    'headerOther' => [
 //                        'width' => '120',
-//                        'prop'=>'BONUS_GX',
+//                        'prop' => 'BONUS_BS_MNT',
 //                    ],
 //                ],
-//                'ORI_BONUS_GX' => [
-//                    'header' => '共享奖原金额',
+//                'ORI_BONUS_BS_MNT' => [
+//                    'header' => 'Original amount of Bluestar Management Award',//蓝星管理奖原金额
 //                    'value' => function($row) {
 //                        return (new Price([
-//                            'value' => $row['ORI_BONUS_GX'],
+//                            'value' => $row['ORI_BONUS_BS_MNT'],
 //                        ]))->result();
 //                    },
 //                    'headerOther' => [
 //                        'width' => '120',
-//                        'prop'=>'ORI_BONUS_GX',
+//                        'prop' => 'ORI_BONUS_BS_MNT',
 //                    ],
 //                ],
-//                'REAL_BONUS_GX' => [
-//                    'header' => '实发共享奖',
+//                'BONUS_BS_ABBR' => [
+//                    'header' => 'Blue star performance award',//蓝星业绩奖
 //                    'value' => function($row) {
 //                        return (new Price([
-//                            'value' => $row['REAL_BONUS_GX'],
+//                            'value' => $row['BONUS_BS_ABBR'],
 //                        ]))->result();
 //                    },
 //                    'headerOther' => [
 //                        'width' => '120',
-//                        'prop'=>'REAL_BONUS_GX',
+//                        'prop' => 'BONUS_BS_ABBR',
 //                    ],
 //                ],
-//                'BONUS_BD' => [
-//                    'header' => '服务奖',
+//                'ORI_BONUS_BS_ABBR' => [
+//                    'header' => 'Original amount of blue star performance award',//蓝星业绩奖原金额
 //                    'value' => function($row) {
 //                        return (new Price([
-//                            'value' => $row['BONUS_BD'],
+//                            'value' => $row['ORI_BONUS_BS_ABBR'],
 //                        ]))->result();
 //                    },
 //                    'headerOther' => [
 //                        'width' => '120',
-//                        'prop'=>'BONUS_BD',
+//                        'prop' => 'ORI_BONUS_BS_ABBR',
 //                    ],
 //                ],
-//                'ORI_BONUS_BD' => [
-//                    'header' => '服务奖原金额',
+//                'BONUS_GX' => [
+//                    'header' => '共享奖',
 //                    'value' => function($row) {
 //                        return (new Price([
-//                            'value' => $row['ORI_BONUS_BD'],
+//                            'value' => $row['BONUS_GX'],
 //                        ]))->result();
 //                    },
 //                    'headerOther' => [
 //                        'width' => '120',
-//                        'prop'=>'ORI_BONUS_BD',
+//                        'prop'=>'BONUS_GX',
 //                    ],
 //                ],
-                'BONUS_REAL' => [
-                    'header' => 'Actual bonus',//实发奖金
+//                'ORI_BONUS_GX' => [
+//                    'header' => '共享奖原金额',
+//                    'value' => function($row) {
+//                        return (new Price([
+//                            'value' => $row['ORI_BONUS_GX'],
+//                        ]))->result();
+//                    },
+//                    'headerOther' => [
+//                        'width' => '120',
+//                        'prop'=>'ORI_BONUS_GX',
+//                    ],
+//                ],
+//                'REAL_BONUS_GX' => [
+//                    'header' => '实发共享奖',
+//                    'value' => function($row) {
+//                        return (new Price([
+//                            'value' => $row['REAL_BONUS_GX'],
+//                        ]))->result();
+//                    },
+//                    'headerOther' => [
+//                        'width' => '120',
+//                        'prop'=>'REAL_BONUS_GX',
+//                    ],
+//                ],
+                'BONUS_BD' => [
+                    'header' => 'Stockist Commission',// 服务奖
                     'value' => function($row) {
                         return (new Price([
-                            'value' => $row['BONUS_REAL'],
+                            'value' => $row['BONUS_BD'],
                         ]))->result();
                     },
                     'headerOther' => [
                         'width' => '120',
-                        'prop'=>'BONUS_REAL',
+                        'prop'=>'BONUS_BD',
                     ],
                 ],
-                'BONUS_TOTAL' => [
-                    'header' => 'Total bonus',//总奖金
+                'ORI_BONUS_BD' => [
+                    'header' => 'Original amount of Stockist Commission',//服务奖原金额
                     'value' => function($row) {
                         return (new Price([
-                            'value' => $row['BONUS_TOTAL'],
+                            'value' => $row['ORI_BONUS_BD'],
                         ]))->result();
                     },
                     'headerOther' => [
                         'width' => '120',
-                        'prop'=>'BONUS_TOTAL',
+                        'prop'=>'ORI_BONUS_BD',
                     ],
                 ],
-                'MANAGE_TAX' => [
-                    'header' => 'Management Expense',//管理费
+                'REAL_BONUS_QUARTER' => [
+                    'header' => 'Quarterly Bonus',// 季度分红
                     'value' => function($row) {
                         return (new Price([
-                            'value' => $row['MANAGE_TAX'],
+                            'value' => $row['REAL_BONUS_QUARTER'],
                         ]))->result();
                     },
                     'headerOther' => [
                         'width' => '120',
-                        'prop'=>'MANAGE_TAX',
+                        'prop'=>'REAL_BONUS_QUARTER',
                     ],
                 ],
+                'ORI_BONUS_QUARTER' => [
+                    'header' => 'Original amount of Quarterly Bonus',//季度分红原金额
+                    'value' => function($row) {
+                        return (new Price([
+                            'value' => $row['ORI_BONUS_QUARTER'],
+                        ]))->result();
+                    },
+                    'headerOther' => [
+                        'width' => '120',
+                        'prop'=>'ORI_BONUS_QUARTER',
+                    ],
+                ],
+                'BONUS_REAL' => [
+                    'header' => 'Actual Bonus',//实发奖金
+                    'value' => function($row) {
+                        return (new Price([
+                            'value' => $row['BONUS_REAL'],
+                        ]))->result();
+                    },
+                    'headerOther' => [
+                        'width' => '120',
+                        'prop'=>'BONUS_REAL',
+                    ],
+                ],
+                'BONUS_TOTAL' => [
+                    'header' => 'Total Bonus',//总奖金
+                    'value' => function($row) {
+                        return (new Price([
+                            'value' => $row['BONUS_TOTAL'],
+                        ]))->result();
+                    },
+                    'headerOther' => [
+                        'width' => '120',
+                        'prop'=>'BONUS_TOTAL',
+                    ],
+                ],
+//                'MANAGE_TAX' => [
+//                    'header' => 'Management Expense',//管理费
+//                    'value' => function($row) {
+//                        return (new Price([
+//                            'value' => $row['MANAGE_TAX'],
+//                        ]))->result();
+//                    },
+//                    'headerOther' => [
+//                        'width' => '120',
+//                        'prop'=>'MANAGE_TAX',
+//                    ],
+//                ],
 //                'RECONSUME_POINTS' => [
 //                    'header' => '复销积分',
 //                    'value' => function($row) {
@@ -747,6 +778,7 @@ class PeriodBonusList extends \common\libs\dataList\DataList implements DataList
                 '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'],//加入时间
+                'CALCULATED_AT'=> ['isUserTable'=> false, 'name'=> 'Settlement 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'],//上级编号
@@ -755,17 +787,17 @@ class PeriodBonusList extends \common\libs\dataList\DataList implements DataList
                 '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'],//共享奖
+//                'PV_3L'=> ['isUserTable'=> false, 'name'=> 'III. new market performance'],//三市场新增业绩
+//                'SURPLUS_3L'=> ['isUserTable'=> false, 'name'=> 'III. market balance performance'],//三市场结余业绩
+                'BONUS_BD'=> ['isUserTable'=> false, 'name'=> 'Stockist Commission'],//服务奖
+//                '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'],//团队成长奖
+//                'BONUS_YC'=> ['isUserTable'=> false, 'name'=> 'Honor Award'],//荣衔奖
+//                'ORI_BONUS_STANDARD'=> ['isUserTable'=> false, 'name'=> 'Team growth Award'],//团队成长奖
                 'CALC_MONTH'=> ['isUserTable'=> false, 'name'=> 'Settlement month'],//结算月
             ];
         }

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

@@ -51,19 +51,19 @@ class UserPerfList extends \common\libs\dataList\DataList implements DataListInt
                 'USER_NAME' => [
                     'header' => 'Member code',//会员编号
                     'headerOther' => [
-                        'width' => '110',
+                        'width' => '200',
                     ],
                 ],
                 'REAL_NAME' => [
                     'header' => 'Member name',//会员姓名
                     'headerOther' => [
-                        'width' => '150',
+                        'width' => '200',
                     ],
                 ],
                 'PV_PCS' => [
                     'header' => 'Personal performance',//个人业绩
                     'headerOther' => [
-                        'width' => '150',
+                        'width' => '180',
                     ],
                     'value' => function($row) {
                         return (new Price([
@@ -72,9 +72,9 @@ class UserPerfList extends \common\libs\dataList\DataList implements DataListInt
                     },
                 ],
                 'SURPLUS_1L' => [
-                    'header' => 'I. remaining market performance',//一市场剩余业绩
+                    'header' => 'Left market residual performance',//一市场剩余业绩
                     'headerOther' => [
-                        'width' => '150',
+                        'width' => '240',
                     ],
                     'value' => function($row) {
                         return (new Price([
@@ -83,9 +83,9 @@ class UserPerfList extends \common\libs\dataList\DataList implements DataListInt
                     },
                 ],
                 'SURPLUS_2L' => [
-                    'header' => 'II. remaining market performance',//二市场剩余业绩
+                    'header' => 'Right market residual performance',//二市场剩余业绩
                     'headerOther' => [
-                        'width' => '150',
+                        'width' => '240',
                     ],
                     'value' => function($row) {
                         return (new Price([
@@ -104,28 +104,28 @@ class UserPerfList extends \common\libs\dataList\DataList implements DataListInt
 //                        ]))->result();
 //                    },
 //                ],
-                'SURPLUS_1L_ZC' => [
-                    'header' => 'I. remaining performance of market declaration',//一市场报单剩余业绩
-                    'headerOther' => [
-                        'width' => '150',
-                    ],
-                    'value' => function($row) {
-                        return (new Price([
-                            'value' => $row['SURPLUS_1L_ZC'],
-                        ]))->result();
-                    },
-                ],
-                'SURPLUS_2L_ZC' => [
-                    'header' => 'II. remaining performance of market declaration',//二市场报单剩余业绩
-                    'headerOther' => [
-                        'width' => '150',
-                    ],
-                    'value' => function($row) {
-                        return (new Price([
-                            'value' => $row['SURPLUS_2L_ZC'],
-                        ]))->result();
-                    },
-                ],
+//                'SURPLUS_1L_ZC' => [
+//                    'header' => 'I. remaining performance of market declaration',//一市场报单剩余业绩
+//                    'headerOther' => [
+//                        'width' => '150',
+//                    ],
+//                    'value' => function($row) {
+//                        return (new Price([
+//                            'value' => $row['SURPLUS_1L_ZC'],
+//                        ]))->result();
+//                    },
+//                ],
+//                'SURPLUS_2L_ZC' => [
+//                    'header' => 'II. remaining performance of market declaration',//二市场报单剩余业绩
+//                    'headerOther' => [
+//                        'width' => '150',
+//                    ],
+//                    'value' => function($row) {
+//                        return (new Price([
+//                            'value' => $row['SURPLUS_2L_ZC'],
+//                        ]))->result();
+//                    },
+//                ],
 //                'SURPLUS_3L_ZC' => [
 //                    'header' => '三市场报单剩余业绩',
 //                    'headerOther' => [
@@ -137,28 +137,28 @@ class UserPerfList extends \common\libs\dataList\DataList implements DataListInt
 //                        ]))->result();
 //                    },
 //                ],
-                'VIP_SURPLUS_1L_ZC' => [
-                    'header' => 'I. remaining performance of VIP declaration in the market',//一市场VIP报单剩余业绩
-                    'headerOther' => [
-                        'width' => '150',
-                    ],
-                    'value' => function($row) {
-                        return (new Price([
-                            'value' => $row['VIP_SURPLUS_1L_ZC'],
-                        ]))->result();
-                    },
-                ],
-                'VIP_SURPLUS_2L_ZC' => [
-                    'header' => 'II. remaining performance of VIP declaration in the market',//二市场VIP报单剩余业绩
-                    'headerOther' => [
-                        'width' => '150',
-                    ],
-                    'value' => function($row) {
-                        return (new Price([
-                            'value' => $row['VIP_SURPLUS_2L_ZC'],
-                        ]))->result();
-                    },
-                ],
+//                'VIP_SURPLUS_1L_ZC' => [
+//                    'header' => 'I. remaining performance of VIP declaration in the market',//一市场VIP报单剩余业绩
+//                    'headerOther' => [
+//                        'width' => '150',
+//                    ],
+//                    'value' => function($row) {
+//                        return (new Price([
+//                            'value' => $row['VIP_SURPLUS_1L_ZC'],
+//                        ]))->result();
+//                    },
+//                ],
+//                'VIP_SURPLUS_2L_ZC' => [
+//                    'header' => 'II. remaining performance of VIP declaration in the market',//二市场VIP报单剩余业绩
+//                    'headerOther' => [
+//                        'width' => '150',
+//                    ],
+//                    'value' => function($row) {
+//                        return (new Price([
+//                            'value' => $row['VIP_SURPLUS_2L_ZC'],
+//                        ]))->result();
+//                    },
+//                ],
 //                'VIP_SURPLUS_3L_ZC' => [
 //                    'header' => '三市场VIP报单剩余业绩',
 //                    'headerOther' => [
@@ -173,7 +173,7 @@ class UserPerfList extends \common\libs\dataList\DataList implements DataListInt
                 'PV_PSS_TOTAL' => [
                     'header' => 'Cumulative team performance',//累计团队业绩
                     'headerOther' => [
-                        'width' => '150',
+                        'width' => '250',
                     ],
                     'value' => function($row) {
                         return (new Price([

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

@@ -32,7 +32,7 @@ class HistoryBonusList extends \common\libs\dataList\DataList implements DataLis
      * @return string
      */
     public function getListName() {
-        return '历史奖金余额';
+        return 'Historical bonus balance';//历史奖金余额
     }
 
     /**
@@ -69,29 +69,29 @@ class HistoryBonusList extends \common\libs\dataList\DataList implements DataLis
             $this->columns = [
                 'ID' => null, // 这种传输方式主要是用于索引，因为过滤后的字段可能没有这种ID，但是一些功能的操作还需要用这种ID去关联，例如前台会员列表中的勾选批量状态管理，这里需要的就是USER_ID
                 'USER_NAME' => [
-                    'header' => '会员编号',
+                    'header' => 'Member code',//会员编号
                     'headerOther' => ['width' => '150'],
                 ],
                 'REAL_NAME' => [
-                    'header' => '会员姓名',
+                    'header' => 'Member name',//会员姓名
                     'headerOther' => [
                         'width' => '120',
                     ],
                 ],
                 'DEC_LV_NAME' => [
-                    'header' => '会员级别',
+                    'header' => 'Member level',//会员级别
                     'headerOther' => [
                         'width' => '150',
                     ],
                 ],
                 'EMP_LV_NAME' => [
-                    'header' => '聘级',
+                    'header' => 'Rank',//聘级
                     'headerOther' => [
                         'width' => '150',
                     ],
                 ],
                 'IS_DEC' => [
-                    'header' => '是否报单中心',
+                    'header' => 'Whether distributor',//是否报单中心
                     'value' => function ($row) {
                         return (new YesNo([
                             'value' => $row['IS_DEC'],
@@ -121,7 +121,7 @@ class HistoryBonusList extends \common\libs\dataList\DataList implements DataLis
 //                    ],
 //                ],
                 'BONUS' => [
-                    'header' => '会员账户余额',
+                    'header' => 'Member bonus',//会员账户余额
                     'value' => function ($row) {
                         return Tool::formatPrice($row['BONUS']);
                     },
@@ -169,7 +169,7 @@ class HistoryBonusList extends \common\libs\dataList\DataList implements DataLis
 //                    },
 //                ],
                 'WITHDRAW' => [
-                    'header' => '提现金额',
+                    'header' => 'Withdrawal amount',//提现金额
                     'value' => function ($row) {
                         return Tool::formatPrice($row['WITHDRAW']);
                     },
@@ -217,7 +217,7 @@ class HistoryBonusList extends \common\libs\dataList\DataList implements DataLis
 //                    },
 //                ],
                 'WITHDRAW_REAL' => [
-                    'header' => '实付金额',
+                    'header' => 'Real amount',//实付金额
                     'value' => function ($row) {
                         return Tool::formatPrice($row['WITHDRAW_REAL']);
                     },
@@ -233,7 +233,7 @@ class HistoryBonusList extends \common\libs\dataList\DataList implements DataLis
                     },
                 ],
                 'WITHDRAW_FAIL' => [
-                    'header' => '实付失败金额',
+                    'header' => 'Actual payment of failed amount',//实付失败金额
                     'value' => function ($row) {
                         return Tool::formatPrice($row['WITHDRAW_FAIL']);
                     },
@@ -249,11 +249,11 @@ class HistoryBonusList extends \common\libs\dataList\DataList implements DataLis
                     },
                 ],
                 'USER_STATUS_NAME' => [
-                    'header' => '会员状态',
+                    'header' => 'Member status',//会员状态
                     'headerOther' => ['width' => '150'],
                 ],
                 'USER_STATUS_AT' => [
-                    'header' => '会员状态变更时间',
+                    'header' => 'Member status change time',//会员状态变更时间
                     'value' => function ($row) {
                         return (new DateTime([
                             'value' => $row['USER_STATUS_AT'],
@@ -266,7 +266,7 @@ class HistoryBonusList extends \common\libs\dataList\DataList implements DataLis
 //                    'headerOther' => ['width' => '150'],
 //                ],
                 'PERIOD_AT' => [
-                    'header' => '加入期数',
+                    'header' => 'Join periods',//加入期数
                     'headerOther' => ['width' => '150'],
                 ],
 //                'DEC_DEC_ROLE_NAME' => [
@@ -274,29 +274,29 @@ class HistoryBonusList extends \common\libs\dataList\DataList implements DataLis
 //                    'headerOther' => ['width' => '150'],
 //                ],
                 'DEC_USER_NAME' => [
-                    'header' => '所属报单中心编号',
+                    'header' => 'Code of distributor',//所属报单中心编号
                     'headerOther' => ['width' => '150'],
                 ],
                 'DEC_REAL_NAME' => [
-                    'header' => '所属报单中心姓名',
+                    'header' => 'Name of distributor',//所属报单中心姓名
                     'headerOther' => ['width' => '150'],
                 ],
                 'MOBILE' => [
-                    'header' => '手机号码',
+                    'header' => 'Phone number',//手机号码
                     'value' => function($row) {
                         return "\t".$row['MOBILE'];
                     },
                     'headerOther' => ['width' => '150'],
                 ],
                 'TEL' => [
-                    'header' => '备用手机号码',
+                    'header' => 'Alternate phone number',//备用手机号码
                     'value' => function($row) {
                         return "\t".$row['TEL'];
                     },
                     'headerOther' => ['width' => '150'],
                 ],
                 'AREA' => [
-                    'header' => '常用地址',
+                    'header' => 'Commonly used address',//常用地址
                     'value' => function ($row) {
                         return $row['PROVINCE_NAME'] . $row['CITY_NAME'] . $row['COUNTY_NAME'];
                     },
@@ -330,7 +330,7 @@ class HistoryBonusList extends \common\libs\dataList\DataList implements DataLis
 //                    },
 //                ],
                 'BACKUP_AT' => [
-                    'header' => '备份时间',
+                    'header' => 'Backup time',//备份时间
                     'value' => function ($row) {
                         return (new DateTime([
                             'value' => $row['BACKUP_AT'],
@@ -350,34 +350,34 @@ class HistoryBonusList 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' => '会员姓名'],
-                'DEC_LV_NAME' => ['isUserTable' => false, 'name' => '会员级别', 'other' => 'decLevel'],
-                'EMP_LV_NAME' => ['isUserTable' => false, 'name' => '聘级', 'other' => 'empLevel'],
-                'IS_DEC' => ['isUserTable' => false, 'name' => '是否报单中心', 'other' => 'yesOrNo'],
+                'USER_NAME' => ['isUserTable' => false, 'name' => 'Member code'],//会员编号
+                'REAL_NAME' => ['isUserTable' => false, 'name' => 'Member name'],//会员姓名
+                'DEC_LV_NAME' => ['isUserTable' => false, 'name' => 'Member level', 'other' => 'decLevel'],//会员级别
+                'EMP_LV_NAME' => ['isUserTable' => false, 'name' => 'Rank', 'other' => 'empLevel'],//聘级
+                'IS_DEC' => ['isUserTable' => false, 'name' => 'Whether distributor', 'other' => 'yesOrNo'],//是否报单中心
 //                'DEC_ROLE_NAME' => ['isUserTable' => false, 'name' => '报单中心级别', 'other' => 'decRole'],
 //                'SYSTEM_NAME' => ['isUserTable' => false, 'name' => '体系名称'],
-                'BONUS' => ['isUserTable' => false, 'name' => '会员账户余额'],
+                'BONUS' => ['isUserTable' => false, 'name' => 'Member Bonus'],// 会员账户余额
 //                'CF' => ['isUserTable' => false, 'name' => '车房养老余额'],
 //                'LX' => ['isUserTable' => false, 'name' => '领袖分红余额'],
-                'WITHDRAW' => ['isUserTable' => false, 'name' => '提现金额'],
+                'WITHDRAW' => ['isUserTable' => false, 'name' => 'Withdrawal amount'],//提现金额
 //                'WITHDRAW_TAX' => ['isUserTable' => false, 'name' => '个税'],
 //                'WITHDRAW_DEDUCT' => ['isUserTable' => false, 'name' => '扣款'],
-                'WITHDRAW_REAL' => ['isUserTable' => false, 'name' => '实付金额'],
-                'WITHDRAW_FAIL' => ['isUserTable' => false, 'name' => '实付失败金额'],
-                'USER_STATUS_NAME' => ['isUserTable' => false, 'name' => '会员状态', 'other' => 'status'],
-                'USER_STATUS_AT' => ['isUserTable' => false, 'name' => '会员状态变更时间', 'other' => 'date'],
+                'WITHDRAW_REAL' => ['isUserTable' => false, 'name' => 'Real amount'],//实付金额
+                'WITHDRAW_FAIL' => ['isUserTable' => false, 'name' => 'Actual payment of failed amount'],//实付失败金额
+                'USER_STATUS_NAME' => ['isUserTable' => false, 'name' => 'Member status', 'other' => 'status'],//会员状态
+                'USER_STATUS_AT' => ['isUserTable' => false, 'name' => 'Member status change time', 'other' => 'date'],//会员状态变更时间
 //                'HIGHEST_EMP_LV_NAME' => ['isUserTable' => false, 'name' => '历史最高聘级', 'other' => 'empLevel'],
-                'PERIOD_AT' => ['isUserTable' => false, 'name' => '加入期数'],
+                'PERIOD_AT' => ['isUserTable' => false, 'name' => 'Join periods'],//加入期数
 //                'DEC_DEC_ROLE_NAME' => ['isUserTable' => false, 'name' => '所属报单中心级别', 'other' => 'decRole'],
-                'DEC_USER_NAME' => ['isUserTable' => false, 'name' => '所属报单中心编号'],
-                'DEC_REAL_NAME' => ['isUserTable' => false, 'name' => '所属报单中心姓名'],
-                'MOBILE' => ['isUserTable' => false, 'name' => '手机号码'],
-                'TEL' => ['isUserTable' => false, 'name' => '备用手机号码'],
-                'AREA' => ['isUserTable' => false, 'name' => '常用地址', 'other' => 'area'],
+                'DEC_USER_NAME' => ['isUserTable' => false, 'name' => 'Code of distributor'],//所属报单中心编号
+                'DEC_REAL_NAME' => ['isUserTable' => false, 'name' => 'Name of distributor'],//所属报单中心姓名
+                'MOBILE' => ['isUserTable' => false, 'name' => 'Phone number'],//手机号码
+                'TEL' => ['isUserTable' => false, 'name' => 'Alternate phone number'],//备用手机号码
+                'AREA' => ['isUserTable' => false, 'name' => 'Commonly used address', 'other' => 'area'],//常用地址
 //                'SUB_COM_NAME' => ['isUserTable' => false, 'name' => '所属分公司', 'other' => 'subCompany'],
 //                'IS_DIRECT_SELLER' => ['isUserTable' => false, 'name' => '是否直销员', 'other' => 'yesOrNo'],
-                'BACKUP_AT' => ['isUserTable' => false, 'name' => '备份时间', 'other' => 'date'],
+                'BACKUP_AT' => ['isUserTable' => false, 'name' => 'Backup time', 'other' => 'date'],//备份时间
             ];
         }
         return $this->filterTypes;

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

@@ -47,7 +47,7 @@ class RechargeList extends \common\libs\dataList\DataList implements DataListInt
             $this->columns = [
                 'ID' => null, // 这种传输方式主要是用于索引，因为过滤后的字段可能没有这种ID，但是一些功能的操作还需要用这种ID去关联，例如前台会员列表中的勾选批量状态管理，这里需要的就是USER_ID
                 'SN' => [
-                    'header' => '充值申请流水号',
+                    'header' => 'SN', // 充值申请流水号
                     'headerOther' => [
                         'width' => '250',
                     ],
@@ -58,20 +58,20 @@ class RechargeList extends \common\libs\dataList\DataList implements DataListInt
                     },
                 ],
                 'USER_NAME' => [
-                    'header' => '会员编号',
+                    'header' => 'Member code', // 会员编号
                     'headerOther' => ['width' => '150'],
                 ],
                 'OPEN_BANK_NAME' => [
-                    'header' => '汇款银行',
+                    'header' => 'Bank', // 汇款银行
                     'headerOther' => ['width' => '150'],
                 ],
                 'BANK_NO' => [
-                    'header' => '汇款账号',
+                    'header' => 'Bank account', // 汇款账号
                     'headerOther' => ['width' => '150'],
                 ],
                 'BANK_PROVE' => null,
                 'AUDIT_STATUS' => [
-                    'header' => '审核状态',
+                    'header' => 'Audit Status', // 审核状态
                     'value' => function ($row) {
                         return Recharge::STATUS_NAME[$row['AUDIT_STATUS']];
                     },
@@ -80,7 +80,7 @@ class RechargeList extends \common\libs\dataList\DataList implements DataListInt
                     ],
                 ],
                 'AMOUNT' => [
-                    'header' => '充值金额',
+                    'header' => 'Recharge amount', // 充值金额
                     'value' => function ($row) {
                         return Tool::formatPrice($row['AMOUNT']);
                     },
@@ -94,7 +94,7 @@ class RechargeList extends \common\libs\dataList\DataList implements DataListInt
                     },
                 ],
                 'CREATED_AT' => [
-                    'header' => '申请时间',
+                    'header' => 'Apply time', // 申请时间
                     'value' => function ($row) {
                         return (new DateTime([
                             'value' => $row['CREATED_AT'],
@@ -103,7 +103,7 @@ class RechargeList extends \common\libs\dataList\DataList implements DataListInt
                     'headerOther' => ['width' => '190'],
                 ],
                 'REMARK' => [
-                    'header' => '备注',
+                    'header' => 'Note', // 备注
                     'headerOther' => [
                         'width' => '200',
                     ],

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

@@ -49,7 +49,7 @@ class WithdrawList extends \common\libs\dataList\DataList implements DataListInt
             $this->columns = [
                 'ID' => null,
                 'SN' => [
-                    'header' => '提现流水号',
+                    'header' => 'Withdrawal serial number', // 提现流水号
                     'headerOther' => [
                         'width' => '250',
                     ],
@@ -60,11 +60,11 @@ class WithdrawList extends \common\libs\dataList\DataList implements DataListInt
                     },
                 ],
                 'WITHDRAW_PERIOD_NUM' => [
-                    'header' => '提现期数',
+                    'header' => 'Period', // 提现期数
                     'headerOther' => ['width' => '150'],
                 ],
                 'CREATED_AT' => [
-                    'header' => '提现时间',
+                    'header' => 'Withdrawal time', // 提现时间
                     'value' => function ($row) {
                         return (new DateTime([
                             'value' => $row['CREATED_AT'],
@@ -74,29 +74,29 @@ class WithdrawList extends \common\libs\dataList\DataList implements DataListInt
                 ],
                 'AUDIT_STATUS' => null,
                 'AUDIT_STATUS_NAME' => [
-                    'header' => '提现状态',
+                    'header' => 'State', // 提现状态
                     'headerOther' => ['width' => '150'],
                     'value' => function ($row) {
                         return Withdraw::STATUS_NAME[$row['AUDIT_STATUS']];
                     },
                 ],
                 'USER_NAME' => [
-                    'header' => '会员编号',
+                    'header' => 'Member code', // 会员编号
                     'headerOther' => ['width' => '150'],
                 ],
                 'USER_REAL_NAME' => [
-                    'header' => '会员姓名',
+                    'header' => 'Member name', // 会员姓名
                     'headerOther' => ['width' => '150'],
                 ],
-                'ID_CARD' => [
-                    'header' => '身份证号',
-                    'headerOther' => ['width' => '150'],
-                    'value' => function ($row) {
-                        return $row['ID_CARD'].' /';
-                    },
-                ],
+//                'ID_CARD' => [
+//                    'header' => '身份证号',
+//                    'headerOther' => ['width' => '150'],
+//                    'value' => function ($row) {
+//                        return $row['ID_CARD'].' /';
+//                    },
+//                ],
                 'AMOUNT' => [
-                    'header' => '提现金额',
+                    'header' => 'Withdrawal amount', // 提现金额
                     'value' => function ($row) {
                         return Tool::formatPrice($row['AMOUNT']);
                     },
@@ -110,68 +110,68 @@ class WithdrawList extends \common\libs\dataList\DataList implements DataListInt
                     },
                 ],
                 'FEES' => [
-                    'header' => '手续费',
+                    'header' => 'Bank charge', // 手续费
                     'headerOther' => ['width' => '150'],
                 ],
                 'REAL_AMOUNT' => [
-                    'header' => '实际到账金额',
+                    'header' => 'Actual amount', // 实际到账金额
                     'headerOther' => ['width' => '150'],
                 ],
                 'OPEN_BANK' => [
-                    'header' => '提现银行',
+                    'header' => 'Bank info',
                     'headerOther' => ['width' => '150'],
                     'value' => function ($row) {
                         return $row['OPEN_BANK'] ? OpenBank::getCnName($row['OPEN_BANK']) : '';
                     },
                 ],
-                'BANK_AREA' => [
-                    'header' => '银行地区',
-                    'value' => function($row) use($regionConfig) {
-                        $province = $regionConfig[$row['BANK_PROVINCE']]['REGION_NAME'] ?? '';
-                        $city = $regionConfig[$row['BANK_CITY']]['REGION_NAME'] ?? '';
-                        $county = $regionConfig[$row['BANK_COUNTY']]['REGION_NAME'] ?? '';
-                        return $province.$city.$county;
-                    },
-                    'showValue' => function($row) use($regionConfig) {
-                        $province = $regionConfig[$row['BANK_PROVINCE']]['REGION_NAME'] ?? '';
-                        $city = $regionConfig[$row['BANK_CITY']]['REGION_NAME'] ?? '';
-                        $county = $regionConfig[$row['BANK_COUNTY']]['REGION_NAME'] ?? '';
-                        return '<div class="addr" title='.$province.$city.$county.'>'.$province.$city.$county.'</div>';
-                    },
-                    'headerOther' => [
-                        'width' => '200'
-                    ],
-                ],
-                'BANK_ADDRESS' => [
-                    'header' => '开户地址',
-                    'headerOther' => ['width' => '250'],
-                    'showValue' => function($row) {
-                        return '<div class="addr" title='.$row['BANK_ADDRESS'].'>'.$row['BANK_ADDRESS'].'</div>';
-                    },
-                ],
+//                'BANK_AREA' => [
+//                    'header' => '银行地区',
+//                    'value' => function($row) use($regionConfig) {
+//                        $province = $regionConfig[$row['BANK_PROVINCE']]['REGION_NAME'] ?? '';
+//                        $city = $regionConfig[$row['BANK_CITY']]['REGION_NAME'] ?? '';
+//                        $county = $regionConfig[$row['BANK_COUNTY']]['REGION_NAME'] ?? '';
+//                        return $province.$city.$county;
+//                    },
+//                    'showValue' => function($row) use($regionConfig) {
+//                        $province = $regionConfig[$row['BANK_PROVINCE']]['REGION_NAME'] ?? '';
+//                        $city = $regionConfig[$row['BANK_CITY']]['REGION_NAME'] ?? '';
+//                        $county = $regionConfig[$row['BANK_COUNTY']]['REGION_NAME'] ?? '';
+//                        return '<div class="addr" title='.$province.$city.$county.'>'.$province.$city.$county.'</div>';
+//                    },
+//                    'headerOther' => [
+//                        'width' => '200'
+//                    ],
+//                ],
+//                'BANK_ADDRESS' => [
+//                    'header' => '开户地址',
+//                    'headerOther' => ['width' => '250'],
+//                    'showValue' => function($row) {
+//                        return '<div class="addr" title='.$row['BANK_ADDRESS'].'>'.$row['BANK_ADDRESS'].'</div>';
+//                    },
+//                ],
                 'BANK_NO' => [
-                    'header' => '提现银行账号',
+                    'header' => 'Bank account',
                     'headerOther' => ['width' => '150'],
                     'value' => function ($row) {
                         return $row['BANK_NO'].' /';
                     },
                 ],
                 'MOBILE' => [
-                    'header' => '手机号',
+                    'header' => 'Phone number', // 手机号
                     'headerOther' => ['width' => '150'],
                 ],
                 'UPDATE_ADMIN_NAME' => [
-                    'header' => '操作管理员',
+                    'header' => 'Operations administrator', // 操作管理员
                     'headerOther' => ['width' => '150'],
                 ],
                 'REMARK' => [
-                    'header' => '备注',
+                    'header' => 'Note', // 备注
                     'headerOther' => [
                         'width' => '200',
                     ],
                 ],
                 'BACK_REMARK' => [
-                    'header' => '退回备注',
+                    'header' => 'Return note', // 退回备注
                     'headerOther' => [
                         'width' => '200',
                     ],
@@ -188,12 +188,12 @@ class WithdrawList extends \common\libs\dataList\DataList implements DataListInt
     public function getFilterTypes() {
         if (!$this->filterTypes) {
             $this->filterTypes = [
-                'SN' => ['isUserTable' => false, 'name' => '提现流水号'],
-                'USER_NAME' => ['isUserTable' => false, 'name' => '会员编号'],
-                'WITHDRAW_PERIOD_NUM' => ['isUserTable' => false, 'name' => '提现期数'],
-                'ID_CARD' => ['isUserTable' => false, 'name' => '身份证号'],
+                'SN' => ['isUserTable' => false, 'name' => 'Withdrawal serial number'],//提现流水号
+                'USER_NAME' => ['isUserTable' => false, 'name' => 'Member code'],// 会员编号
+                'WITHDRAW_PERIOD_NUM' => ['isUserTable' => false, 'name' => 'Period'],// 提现期数
+//                'ID_CARD' => ['isUserTable' => false, 'name' => '身份证号'],
                 //'AUDIT_STATUS_NAME' => ['isUserTable' => false, 'name' => '审核状态', 'other' => 'select', 'selectData' => [['id' =>0, 'name' => '提现待审核'], ['id' => 2, 'name' => '提现已审核'], ['id' => 3, 'name' => '提现待付款'], ['id' => 4, 'name' => '付款失败'], ['id' => 5, 'name' => '已拒绝'], ['id' => 6, 'name' => '提现已付款'], ['id' => 7, 'name' => '已退回']]],
-                'CREATED_AT' => ['isUserTable' => false, 'name' => '申请时间', 'other' => 'date'],
+                'CREATED_AT' => ['isUserTable' => false, 'name' => 'Withdrawal time', 'other' => 'date'],  // 申请时间
             ];
         }
         return $this->filterTypes;

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

@@ -51,6 +51,8 @@ class DecOrderList extends \common\libs\dataList\DataList implements DataListInt
         if(!$this->columns){
             $this->columns = [
                 'ID' => null,
+                'DETAIL_TYPE' => null,
+                'UPGRADE_TYPE' => null,
                 'DEC_SN' => [
                     'header' => 'Entry code',//报单编号
                     'headerOther' => ['width' => '200'],

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

@@ -104,7 +104,7 @@ class GoodsList extends \common\libs\dataList\DataList implements DataListInterf
                     'headerOther' => ['width' => '150'],
                 ],
                 'SELL_PRICE_STANDARD' => [
-                    'header' => 'Standard price($)',//标准价格($)
+                    'header' => 'US price($)',//标准价格($)
                     'headerOther' => [
                         'width' => '150',
                     ],
@@ -118,7 +118,7 @@ class GoodsList extends \common\libs\dataList\DataList implements DataListInterf
                     },
                 ],
                 'SELL_PRICE' => [
-                    'header' => 'Products Prices(₦)',//商品价格
+                    'header' => 'Sales Price(₦)',//商品价格
                     'headerOther' => [
                         'width' => '150',
                     ],
@@ -180,7 +180,7 @@ class GoodsList extends \common\libs\dataList\DataList implements DataListInterf
                     ],
                 ],
                 'STATUS' => [
-                    'header' => 'STATUS',//状态
+                    'header' => 'Status',//状态
                     'value' => function($row) {
                         return $row['STATUS'] == 1 ? 'On sale' : 'Sold out'; //已上架：已下架
                     },
@@ -189,7 +189,7 @@ class GoodsList extends \common\libs\dataList\DataList implements DataListInterf
                     ],
                 ],
                 'UPDATED_AT' => [
-                    'header' => 'Update time',//更新时间
+                    'header' => 'Update Time',//更新时间
                     'value' => function ($row) {
                         return (new DateTime([
                             'value' => $row['UPDATED_AT'],
@@ -217,7 +217,7 @@ class GoodsList extends \common\libs\dataList\DataList implements DataListInterf
                 'GOODS_NAME'=> ['name'=> 'Products name'],//商品名称
                 'GOODS_NO'=> ['name'=> 'Products code'],//商品编号
 //                'SELL_TYPE'=> ['name'=> '复消购买方式', 'other'=> 'select', 'selectData'=> [['id'=> 1, 'name'=> '余额购买'],['id'=> 2, 'name'=> '积分购买']]],
-                'SELL_PRICE'=> ['name'=> 'Products Prices'],//销售价格
+                'SELL_PRICE'=> ['name'=> 'Products Price'],//销售价格
                 'PRICE_PV'=> ['name'=> 'Products BV'],//销售PV
                 'CATEGORY_TYPE' => ['name' => 'Products Category', 'other'=> 'select', 'selectData'=> ShopGoods::CATEGORY_TYPE],//商品分类
             ];

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

@@ -5,6 +5,7 @@ use common\helpers\Cache;
 use common\helpers\Tool;
 use common\libs\dataList\DataListInterface;
 use common\models\OrderDec;
+use common\models\ShopGoods;
 use common\models\User;
 use common\libs\dataList\column\DateTime;
 
@@ -141,6 +142,13 @@ class OrderDecList extends \common\libs\dataList\DataList implements DataListInt
                     },
                     'headerOther' => ['width' => '190'],
                 ],
+                'PAY_TYPE' => [
+                    'header' => 'Pay type',// 支付方式
+                    'value' => function ($row) {
+                        return ShopGoods::payTypes()[$row['PAY_TYPE']]['name'] ?? ShopGoods::payTypes()['cash']['name'];
+                    },
+                    'headerOther' => ['width' => '190'],
+                ],
                 'DELIVERY_AT' => [
                     'header' => 'Delivery time',//发货时间
                     'value' => function ($row) {

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

@@ -5,10 +5,15 @@ use common\helpers\Cache;
 use common\helpers\Tool;
 use common\helpers\user\Info;
 use common\libs\dataList\DataListInterface;
+use common\models\ApproachOrder;
+use common\models\ApproachOrderGoods;
 use common\models\Order;
 use common\models\OrderGoods;
+use common\models\ShopGoods;
 use common\models\User;
 use common\libs\dataList\column\DateTime;
+use yii\data\Pagination;
+use yii\db\Query;
 
 class OrderList extends \common\libs\dataList\DataList implements DataListInterface
 {
@@ -25,17 +30,43 @@ class OrderList extends \common\libs\dataList\DataList implements DataListInterf
      */
     public function dataHandle()
     {
-        $this->listData = Order::lists($this->condition, $this->params, [
-            'select' => 'O.*,U.REAL_NAME,U.DEC_ID,OG.*',
-            'orderBy' => 'O.CREATED_AT DESC, O.ID DESC',
-            'from' => Order::tableName() . ' AS O',
-            'join' => [
-                ['LEFT JOIN', OrderGoods::tableName() . ' AS OG', 'OG.ORDER_SN=O.SN'],
-                ['LEFT JOIN', User::tableName() . ' AS U', 'U.ID=O.USER_ID'],
-            ],
-            'page' => $this->page,
-            'pageSize' => $this->pageSize,
-        ]);
+        $orderQuery = Order::find()
+            ->alias('O')
+            ->where($this->condition, $this->params)
+            ->select('O.*,U.REAL_NAME,U.DEC_ID,SG.CATEGORY_TYPE,OG.REAL_PRICE,OG.TAX_RATE,OG.BUY_NUMS,OG.SKU_CODE,OG.GOODS_TITLE,OG.REAL_PV')
+            ->join('LEFT JOIN', User::tableName() . ' AS U', 'U.ID=O.USER_ID')
+            ->join('LEFT JOIN', OrderGoods::tableName() . ' AS OG', 'OG.ORDER_SN=O.SN')
+            ->join('LEFT JOIN', ShopGoods::tableName() . ' AS SG', 'SG.ID=OG.GOODS_ID')
+            ->orderBy('O.CREATED_AT DESC');
+
+        // 订单中间表只查询待支付和支付失败的订单
+        $this->params[':NOT_PAID'] = \Yii::$app->params['orderStatus']['notPaid']['value'];   // 待支付
+        $this->params[':FAIL_PAID'] = \Yii::$app->params['orderStatus']['failPaid']['value'];   // 支付失败
+        $orderStandardQuery = ApproachOrder::find()
+            ->alias('O')
+            ->where($this->condition . ' AND (O.STATUS = :NOT_PAID OR O.STATUS = :FAIL_PAID)', $this->params)
+            ->select('O.*,U.REAL_NAME,U.DEC_ID,SG.CATEGORY_TYPE,OG.REAL_PRICE,OG.TAX_RATE,OG.BUY_NUMS,OG.SKU_CODE,OG.GOODS_TITLE,OG.REAL_PV')
+            ->join('LEFT JOIN', User::tableName() . ' AS U', 'U.ID=O.USER_ID')
+            ->join('LEFT JOIN', ApproachOrderGoods::tableName() . ' AS OG', 'OG.ORDER_SN=O.SN')
+            ->join('LEFT JOIN', ShopGoods::tableName() . ' AS SG', 'SG.ID=OG.GOODS_ID')
+            ->orderBy('O.CREATED_AT DESC');
+
+        $queryAll = $orderQuery->union($orderStandardQuery, true);
+        $query = (new Query())->from(['Q' => $queryAll])->select('Q.*')->distinct()->orderBy(['CREATED_AT' => SORT_DESC]);
+
+        $totalCount = $query->count();
+        $pagination = new Pagination(['totalCount' => $totalCount, 'pageSize' => \Yii::$app->request->get('pageSize')]);
+        $lists = $query->offset($pagination->offset)->limit($pagination->limit)->all();
+
+        $this->listData = [
+            'list' => $lists,
+            'currentPage'=>$pagination->page,
+            'totalPages'=>$pagination->pageCount,
+            'startNum' => $pagination->page * $pagination->pageSize + 1,
+            'totalCount' => $pagination->totalCount,
+            'pageSize' => $pagination->pageSize,
+        ];
+
         foreach ($this->listData['list'] as $key => $value) {
             $CREATE_USER_ID = Info::getUserIdByUserName($value['CREATE_USER']);
             $this->listData['list'][$key]['DEC_USER_NAME'] = Info::getUserNameByUserId($value['DEC_ID']);
@@ -52,6 +83,8 @@ class OrderList extends \common\libs\dataList\DataList implements DataListInterf
         $regionConfig = Cache::getRegionConfig();
         if(!$this->columns){
             $this->columns = [
+                'ID' => null,
+                'DEC_SN' => null,
                 'USER_NAME' => [
                     'header' => 'Member code',//会员编号
                     'headerOther' => ['width' => '120'],
@@ -72,8 +105,8 @@ class OrderList extends \common\libs\dataList\DataList implements DataListInterf
                     'header' => 'Order code',//订单号
                     'headerOther' => ['width' => '200'],
                 ],
-                'STATUS' => null,
-                'STATUS_NAME' => [
+//                'STATUS' => null,
+                'STATUS' => [
                     'header' => 'Order status',//订单状态
                     'headerOther' => [
                         'width' => '110',
@@ -163,14 +196,14 @@ class OrderList extends \common\libs\dataList\DataList implements DataListInterf
                     'header' => 'Order type',//订单类型
                     'headerOther' => ['width' => '120'],
                     'value' => function ($row) {
-                            if($row['ORDER_TYPE']=='FO'){
-                                $orderType = 'remain BV order';
-                            }else if($row['ORDER_TYPE']=='ZC'){
-                                $orderType = 'declaration form';
-                            }else{
-                                $orderType = ($row['PAY_TYPE']=='cash') ? 'Cancel again': 'integral';//'重消' : '积分'
-                            }
-                        return $orderType;
+                        switch ($row['ORDER_TYPE']) {
+                            case 'FO':
+                                return 'remain BV order';
+                            case 'ZC':
+                                return 'Welcome pack';
+                            case 'FX':
+                                return in_array($row['PAY_TYPE'], ['cash', 'pay_stack']) ? 'Reselling': 'Points'; //'重消' : '积分'
+                        }
                     },
                 ],
                 'WAREHOUSE' => [
@@ -185,6 +218,13 @@ class OrderList extends \common\libs\dataList\DataList implements DataListInterf
                     },
                     'headerOther' => ['width' => '190'],
                 ],
+                'PAY_TYPE' => [
+                    'header' => 'Pay type',// 支付方式
+                    'value' => function ($row) {
+                        return ShopGoods::payTypes()[$row['PAY_TYPE']]['name'] ?? ShopGoods::payTypes()['cash']['name'];
+                    },
+                    'headerOther' => ['width' => '190'],
+                ],
                 'PAY_AT' => [
                     'header' => 'Payment time',//支付时间
                     'value' => function ($row) {
@@ -203,7 +243,6 @@ class OrderList extends \common\libs\dataList\DataList implements DataListInterf
                     },
                     'headerOther' => ['width' => '190'],
                 ],
-                'PAY_TYPE' => null,
                 'REAL_PRICE' => [
                     'header' => 'item pricing',//商品单价
                     'headerOther' => [
@@ -330,6 +369,12 @@ class OrderList extends \common\libs\dataList\DataList implements DataListInterf
                 'ORDER_TYPE'=> ['name'=> 'Order Type'],
                 'PERIOD_NUM'=> ['name'=> 'Number of periods'],//期数
                 'CREATED_AT'=> ['name'=> 'Creation time', 'other'=>'date'],//创建时间
+                'STATUS'=> ['name'=> 'Order status', 'other'=> 'select', 'selectData'=> [
+                    ['id' => \Yii::$app->params['orderStatus']['paid']['value'], 'name' => \Yii::$app->params['orderStatus']['paid']['label']],
+                    ['id' => \Yii::$app->params['orderStatus']['notPaid']['value'], 'name' => \Yii::$app->params['orderStatus']['notPaid']['label']],
+                    ['id' => \Yii::$app->params['orderStatus']['failPaid']['value'], 'name' => \Yii::$app->params['orderStatus']['failPaid']['label']]
+                ]
+                ],
             ];
         }
         return $this->filterTypes;

backendApi/modules/v1/models/lists/user/IndexList.php

@@ -211,19 +211,19 @@ class IndexList extends \common\libs\dataList\DataList implements DataListInterf
                     'header' => 'Resettlement area',//安置区域
                     'headerOther' => ['width' => '100'],
                 ],
-                'ID_TYPE' => [
-                    'header' => 'Document type',//证件类型
-                    'value' => function($row) {
-                        return $row['ID_TYPE'] == 0 ? 'Identity No.' : '';//'身份证' : ''
-                    },
-                ],
-                'ID_CARD' => [
-                    'header' => 'Identification Number',//证件号码
-                    'value' => function($row) {
-                        return "\t".$row['ID_CARD'];
-                    },
-                    'headerOther' => ['width' => '180'],
-                ],
+//                'ID_TYPE' => [
+//                    'header' => 'Document type',//证件类型
+//                    'value' => function($row) {
+//                        return $row['ID_TYPE'] == 0 ? 'Identity No.' : '';//'身份证' : ''
+//                    },
+//                ],
+//                'ID_CARD' => [
+//                    'header' => 'Identification Number',//证件号码
+//                    'value' => function($row) {
+//                        return "\t".$row['ID_CARD'];
+//                    },
+//                    'headerOther' => ['width' => '180'],
+//                ],
 //                'SPOUSE_NAME' => [
 //                    'header' => '配偶姓名',
 //                    'headerOther' => ['width' => '100'],
@@ -346,31 +346,31 @@ class IndexList extends \common\libs\dataList\DataList implements DataListInterf
                         return $openBankConfig[$row['OPEN_BANK']]['BANK_NAME'] ?? '';
                     },
                 ],
-                'BANK_AREA' => [
-                    'header' => 'Banking region',//银行地区
-                    'value' => function($row) use($regionConfig) {
-                        $province = $regionConfig[$row['BANK_PROVINCE']]['REGION_NAME'] ?? '';
-                        $city = $regionConfig[$row['BANK_CITY']]['REGION_NAME'] ?? '';
-                        $county = $regionConfig[$row['BANK_COUNTY']]['REGION_NAME'] ?? '';
-                        return $province.$city.$county;
-                    },
-                    'showValue' => function($row) use($regionConfig) {
-                        $province = $regionConfig[$row['BANK_PROVINCE']]['REGION_NAME'] ?? '';
-                        $city = $regionConfig[$row['BANK_CITY']]['REGION_NAME'] ?? '';
-                        $county = $regionConfig[$row['BANK_COUNTY']]['REGION_NAME'] ?? '';
-                        return '<div class="addr" title='.$province.$city.$county.'>'.$province.$city.$county.'</div>';
-                    },
-                    'headerOther' => [
-                        'width' => '200'
-                    ],
-                ],
-                'BANK_ADDRESS' => [
-                    'header' => 'Account opening address',//开户地址
-                    'headerOther' => ['width' => '250'],
-                    'showValue' => function($row) {
-                        return '<div class="addr" title='.$row['BANK_ADDRESS'].'>'.$row['BANK_ADDRESS'].'</div>';
-                    },
-                ],
+//                'BANK_AREA' => [
+//                    'header' => 'Banking region',//银行地区
+//                    'value' => function($row) use($regionConfig) {
+//                        $province = $regionConfig[$row['BANK_PROVINCE']]['REGION_NAME'] ?? '';
+//                        $city = $regionConfig[$row['BANK_CITY']]['REGION_NAME'] ?? '';
+//                        $county = $regionConfig[$row['BANK_COUNTY']]['REGION_NAME'] ?? '';
+//                        return $province.$city.$county;
+//                    },
+//                    'showValue' => function($row) use($regionConfig) {
+//                        $province = $regionConfig[$row['BANK_PROVINCE']]['REGION_NAME'] ?? '';
+//                        $city = $regionConfig[$row['BANK_CITY']]['REGION_NAME'] ?? '';
+//                        $county = $regionConfig[$row['BANK_COUNTY']]['REGION_NAME'] ?? '';
+//                        return '<div class="addr" title='.$province.$city.$county.'>'.$province.$city.$county.'</div>';
+//                    },
+//                    'headerOther' => [
+//                        'width' => '200'
+//                    ],
+//                ],
+//                'BANK_ADDRESS' => [
+//                    'header' => 'Account opening address',//开户地址
+//                    'headerOther' => ['width' => '250'],
+//                    'showValue' => function($row) {
+//                        return '<div class="addr" title='.$row['BANK_ADDRESS'].'>'.$row['BANK_ADDRESS'].'</div>';
+//                    },
+//                ],
                 'BANK_NO' => [
                     'header' => 'Bank account number',//银行帐号
                     'headerOther' => ['width' => '220'],
@@ -379,12 +379,12 @@ class IndexList extends \common\libs\dataList\DataList implements DataListInterf
                     },
                 ],
                 'SEX' => 'Gender',//性别
-                'NATION_NAME' => [
-                    'header' => 'nation',//民族
-                    'value' => function($row) {
-                        return \Yii::$app->params['nation'][$row['NATION']]['name'] ?? '';
-                    },
-                ],
+//                'NATION_NAME' => [
+//                    'header' => 'nation',//民族
+//                    'value' => function($row) {
+//                        return \Yii::$app->params['nation'][$row['NATION']]['name'] ?? '';
+//                    },
+//                ],
                 'AREA' => [
                     'header' => 'Common address',//常用地址
                     'value' => function($row) use($regionConfig) {

backendApi/web/.gitignore

@@ -3,4 +3,3 @@
 upload
 /upload/excelExport
 /upload/excel_export
-index.php

backendEle/src/components/ExcelUploader.vue

@@ -37,7 +37,7 @@
     props: {
       uploadBtnTitle: {
         type: String,
-        default: '上传',
+        default: 'Upload',
       },
       requestUploadRoute: {
         type: String,

backendEle/src/components/Filter.vue

@@ -30,7 +30,7 @@
     <div v-show="userNameDisplay" :class="`filter-item filter-user-name ${userNameClass}`">
       <el-input v-model="filterModel.userName" placeholder="请输入会员编号"></el-input>
     </div>
-    <el-button class="filter-item filter-filter-btn" type="primary" @click="handleFilter">筛选</el-button>
+    <el-button class="filter-item filter-filter-btn" type="primary" @click="handleFilter">Select</el-button>
   </div>
 </template>
 
@@ -188,4 +188,4 @@ export default {
       display: none;
     }
   }
-</style>
+</style>

backendEle/src/components/FilterUser.vue

@@ -313,7 +313,7 @@
       handleOptionPlus() {
         if (this.filterType === '' || this.filterSymbol === '' || (this.filterValue === '' && this.filterAreaValue === [])) {
           this.$message({
-            message: '请填写完整筛选内容',
+            message: 'please complete the selection',//请填写完整筛选内容
             type: 'warning'
           });
           return false

backendEle/src/components/WithdrawTable.vue

@@ -23,7 +23,7 @@
           {{tool.formatDate(scope.row.CREATED_AT)}}
         </template>
       </el-table-column>
-      <el-table-column label="预计付款日期" width="120">
+      <el-table-column label="Estimated date of payment" width="120"> <!-- 预计付款日期 -->
         <template slot-scope="scope">
           {{tool.formatDate(scope.row.PLAN_PAID_AT,false)}}
         </template>
@@ -68,14 +68,14 @@
           {{(scope.row.BASE_INFO.STATUS_NAME)}}
         </template>
       </el-table-column>
-      <el-table-column label="身份证号" width="170">
-        <template slot-scope="scope">
-          {{scope.row.BASE_INFO.ID_CARD}}
-        </template>
-      </el-table-column>
+<!--      <el-table-column label="身份证号" width="170">-->
+<!--        <template slot-scope="scope">-->
+<!--          {{scope.row.BASE_INFO.ID_CARD}}-->
+<!--        </template>-->
+<!--      </el-table-column>-->
       <el-table-column label="提现方式">
         <template slot-scope="scope">
-          {{scope.row.IS_AUTO_WITHDRAW==='1'?'自动提现':'手动提现'}}
+          {{scope.row.IS_AUTO_WITHDRAW==='1'?'auto withdrawal':'manual withdrawal'}}
         </template>
       </el-table-column>
       <el-table-column label="提现金额" width="110">
@@ -178,7 +178,7 @@
           {{scope.row.AUDIT_ADMIN_NAME}}
         </template>
       </el-table-column>
-      <el-table-column label="备注" width="150">
+      <el-table-column label="Note" width="150"> <!-- 备注 -->
         <template slot-scope="scope">
           {{scope.row.REMARK}}
         </template>
@@ -213,7 +213,7 @@
           <el-dropdown size="small" trigger="click"
                        v-if="withdrawStatus!==-1 && scope.row.AUDIT_STATUS!=='7' && (permission.hasPermission(`finance/withdraw-status`)||permission.hasPermission(`finance/invoice-audit-add`)||permission.hasPermission(`finance/invoice-audit-edit`))">
             <el-button type="primary" size="small" @click.stop="">
-              操作该数据<i class="el-icon-arrow-down el-icon--right"></i>
+              Action<i class="el-icon-arrow-down el-icon--right"></i>
             </el-button>
             <el-dropdown-menu slot="dropdown">
               <!--<el-dropdown-item command="add"-->
@@ -222,39 +222,39 @@
                 <!--补录发票信息-->
               <!--</el-dropdown-item>-->
               <el-dropdown-item command="status"
-                                @click.native="handleStatusShow(scope.row, 2, '确定对当前提现进行审核通过操作？')"
-                                v-show="scope.row.AUDIT_STATUS==='0' && permission.hasPermission(`finance/withdraw-status`)">
-                审核通过
+                                @click.native="handleStatusShow(scope.row, 2, 'Are you sure to approve the current withdrawal?')"
+                                v-show="scope.row.AUDIT_STATUS==='0' && permission.hasPermission(`finance/withdraw-status`)"> <!-- 确定对当前提现进行审核通过操作？ -->
+                Approve <!-- 审核通过 -->
               </el-dropdown-item>
               <el-dropdown-item command="status"
-                                @click.native="handleStatusShow(scope.row, 3, '确定对当前提现进行设为待付款操作？')"
-                                v-show="scope.row.AUDIT_STATUS === '2' && permission.hasPermission(`finance/withdraw-status`)">
+                                @click.native="handleStatusShow(scope.row, 3, 'Are you sure to set the current withdrawal as payment action?？')"
+                                v-show="scope.row.AUDIT_STATUS === '2' && permission.hasPermission(`finance/withdraw-status`)"> <!-- 确定对当前提现进行设为待付款操作？ -->
                 设为待付款
               </el-dropdown-item>
               <el-dropdown-item command="status"
-                                @click.native="handleStatusShow(scope.row, 6, '确定对当前提现进行设为已付款操作？')"
-                                v-show="scope.row.AUDIT_STATUS === '3' && permission.hasPermission(`finance/withdraw-status`)">
+                                @click.native="handleStatusShow(scope.row, 6, 'Are you sure to set the current withdrawal as paid?？')"
+                                v-show="scope.row.AUDIT_STATUS === '3' && permission.hasPermission(`finance/withdraw-status`)"> <!-- 确定对当前提现进行设为已付款操作 -->
                 设为已付款
               </el-dropdown-item>
               <el-dropdown-item command="status"
-                                @click.native="handleStatusShow(scope.row, 3, '确定对当前提现进行设为待付款操作？')"
-                                v-show="scope.row.AUDIT_STATUS === '4' && permission.hasPermission(`finance/withdraw-status`)">
+                                @click.native="handleStatusShow(scope.row, 3, 'Are you sure to set the current withdrawal as payment action?？')"
+                                v-show="scope.row.AUDIT_STATUS === '4' && permission.hasPermission(`finance/withdraw-status`)"> <!-- 确定对当前提现进行设为待付款操作？ -->
                 设为待付款
               </el-dropdown-item>
               <el-dropdown-item command="status"
-                                @click.native="handleStatusShow(scope.row, 4, '确定对当前提现进行设为付款失败操作？', '付款失败备注')"
-                                v-show="scope.row.AUDIT_STATUS === '6' && permission.hasPermission(`finance/withdraw-status`)">
+                                @click.native="handleStatusShow(scope.row, 4, 'Are you sure to set payment failure for the current withdrawal?？', '付款失败备注')"
+                                v-show="scope.row.AUDIT_STATUS === '6' && permission.hasPermission(`finance/withdraw-status`)"> <!-- 确定对当前提现进行设为付款失败操作？ -->
                 设为付款失败
               </el-dropdown-item>
               <el-dropdown-item command="status"
                                 @click.native="handleStatusShow(scope.row, 7, '确定对当前提现进行设为提现退回操作？', '提现退回备注')"
                                 v-show="scope.row.AUDIT_STATUS === '0' && permission.hasPermission(`finance/withdraw-status`)">
-                设为提现退回
+                Return <!-- 设为提现退回 -->
               </el-dropdown-item>
               <el-dropdown-item command="status"
                                 @click.native="handleStatusShow(scope.row, 7, '该会员已提供发票，请确认是否处理提现退回？', '提现退回备注')"
                                 v-show="(scope.row.AUDIT_STATUS === '1'||scope.row.AUDIT_STATUS === '2'||scope.row.AUDIT_STATUS === '3') && permission.hasPermission(`finance/withdraw-status`)">
-                设为提现退回
+                Return <!-- 设为提现退回 -->
               </el-dropdown-item>
             </el-dropdown-menu>
           </el-dropdown>
@@ -297,7 +297,7 @@
         <!--下载Excel模板-->
       <!--</el-button>-->
       <el-button type="success" size="small" @click="handleExport"
-                 v-show="permission.hasPermission(`finance/withdraw-export`)">导出Excel
+                 v-show="permission.hasPermission(`finance/withdraw-export`)">Export Excel
       </el-button>
       <el-button type="primary" size="small" @click="handleAdd" v-if="false">新增提现</el-button>
       <pagination :total="totalCount" :page_size="pageSize" @size-change="handleSizeChange" @current-change="handleCurrentChange"></pagination>
@@ -322,36 +322,36 @@
         <el-form-item label="提现金额">
           <el-input v-model="form.amount" :disabled="true"></el-input>
         </el-form-item>
-        <el-form-item label="预计付款日期">
+        <el-form-item label="Estimated date of payment"> <!-- 预计付款日期 -->
           <el-date-picker
               v-model="form.planPaidAt"
               type="date"
-              placeholder="选择日期"
+              placeholder="Select date"
               value-format="yyyy-MM-dd"
               :picker-options="pickerOptions0"
-          >
+          > <!-- 选择日期 -->
           </el-date-picker>
         </el-form-item>
-        <el-form-item label="备注">
+        <el-form-item label="Note"> <!-- 备注 -->
           <el-input v-model="form.createRemark"></el-input>
         </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 withdrawal info" :visible.sync="dialogAuditFormVisible"> <!-- 审核提现信息 -->
       <el-alert
           :title="auditForm.auditTips"
           type="warning" :closable="false">
       </el-alert>
       <el-form :model="auditForm" label-width="150px" style="width:500px;" v-loading="dialogAuditLoading">
-        <el-form-item label="预计付款日期" v-show="withdrawStatus===2||withdrawStatus===4">
+        <el-form-item label="Estimated date of payment" v-show="withdrawStatus===2||withdrawStatus===4"> <!-- 预计付款日期 -->
           <el-date-picker
               v-model="auditForm.planPaidAt"
               type="date"
-              placeholder="选择日期"
+              placeholder="Select date"
               value-format="yyyy-MM-dd"
               :picker-options="pickerOptions0"
           >
@@ -361,7 +361,7 @@
           <el-date-picker
               v-model="auditForm.paidAt"
               type="date"
-              placeholder="选择日期"
+              placeholder="Select date"
               value-format="yyyy-MM-dd"
               :picker-options="pickerOptions1"
           >
@@ -372,8 +372,8 @@
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button @click="dialogAuditFormVisible = false">取 消</el-button>
-        <el-button type="primary" @click.native="handleStatus">提 交</el-button>
+        <el-button @click="dialogAuditFormVisible = false">Cancel<!-- 取 消 --></el-button>
+        <el-button type="primary" @click.native="handleStatus">Submit<!-- 提 交 --></el-button>
       </div>
     </el-dialog>
 
@@ -392,7 +392,7 @@
           <el-date-picker
               v-model="invoiceForm.invoiceDate"
               type="date"
-              placeholder="选择日期"
+              placeholder="Select date"
               value-format="yyyy-MM-dd"
           >
           </el-date-picker>
@@ -434,13 +434,13 @@
           <el-input v-model="invoiceForm.invoiceRemark" type="textarea"
                     :rows="2"></el-input>
         </el-form-item>
-        <el-form-item label="备注">
+        <el-form-item label="Note"> <!-- 备注 -->
           <el-input v-model="invoiceForm.createRemark"></el-input>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button @click="dialogAddInvoiceVisible = false">取 消</el-button>
-        <el-button type="primary" @click.native="handleAddInvoice">提 交</el-button>
+        <el-button @click="dialogAddInvoiceVisible = false">Cancel<!-- 取 消 --></el-button>
+        <el-button type="primary" @click.native="handleAddInvoice">Submit<!-- 提 交 --></el-button>
       </div>
     </el-dialog>
   </div>
@@ -571,9 +571,9 @@
         this.$refs.multipleTable.toggleRowExpansion(row)
       },
       handleExport() {
-        this.$confirm('确定要导出当前表格中的提现数据吗？', '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
+        this.$confirm('确定要导出当前表格中的提现数据吗？', 'Hint', {
+          confirmButtonText: 'confirm', // 确定
+          cancelButtonText: 'cancel', // 取消
           type: 'warning'
         }).then(() => {
           return network.getData('finance/withdraw-export', {status: this.withdrawStatus})
@@ -649,9 +649,9 @@
         this.auditForm.auditStatus = status
       },
       handleStatus() {
-        this.$confirm('确定要对所选数据修改状态吗？', '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
+        this.$confirm('Are you sure to change the state of the selected data?', 'Hint', { // 确定要对所选数据修改状态吗？
+          confirmButtonText: 'confirm', // 确定
+          cancelButtonText: 'cancel', // 取消
           type: 'warning'
         }).then(() => {
           return network.postData('finance/withdraw-status', this.auditForm)

backendEle/src/utils/editor.js

@@ -3,14 +3,14 @@ import {CDN_IMG_URL} from './config'
 const EDITOR_ROOT_URL = `${CDN_IMG_URL}/tinymce`
 const EDITOR_LANGUAGE = `${EDITOR_ROOT_URL}/langs/zh_CN.js`
 let fullEditor = {
-  language_url: EDITOR_LANGUAGE,
+  // language_url: EDITOR_LANGUAGE,
   height: 500,
   plugins: 'print preview searchreplace autolink directionality visualblocks visualchars fullscreen link template codesample table charmap hr pagebreak nonbreaking anchor toc insertdatetime advlist lists textcolor wordcount imagetools contextmenu colorpicker textpattern help',
   toolbar1: 'formatselect | bold italic strikethrough forecolor backcolor | link | alignleft aligncenter alignright alignjustify  | numlist bullist outdent indent  | removeformat',
 }
 
 let textEditor = {
-  language_url: EDITOR_LANGUAGE,
+  // language_url: EDITOR_LANGUAGE,
   height: 500,
   menubar: false,
   plugins: [
@@ -25,4 +25,4 @@ export {
   fullEditor,
   textEditor,
   EDITOR_ROOT_URL
-}
+}

backendEle/src/utils/permission.js

@@ -32,4 +32,4 @@ const permission = {
   },
 }
 
-export default permission
+export default permission

backendEle/src/utils/tool.js

@@ -80,7 +80,7 @@ let tool = {
       status = error.data.status ? error.data.status : 0
     }
     if (todo || status === 401) {
-      message = todo?'未获得授权，请重新登录':(message==='Your request was made with invalid credentials.'?'未获得授权，请重新登录':message)
+      message = todo ? 'Not authorized, please log in again.' : (message === 'Your request was made with invalid credentials.' ? 'Not authorized, please log in again.' : message)
       userInfo.logout()
     }
     return {message, todo}

backendEle/src/views/ad/edit.vue

@@ -26,7 +26,7 @@
                         @on-success="handleSuccess"></leo-uploader>
         </el-form-item>
         <el-form-item>
-          <el-button type="primary" :loading="submitButtonStat" @click="onSubmit">提交</el-button>
+          <el-button type="primary" :loading="submitButtonStat" @click="onSubmit">Submit<!-- 提交 --></el-button>
         </el-form-item>
       </el-form>
     </div>

backendEle/src/views/ad/list.vue

@@ -60,11 +60,11 @@
           <template slot-scope="scope">
             <el-dropdown size="small" trigger="click" v-if="permission.hasPermission(`ad/ad-delete`) || permission.hasPermission(`ad/edit`)">
               <el-button type="primary" size="small" @click.stop="">
-                操作该数据<i class="el-icon-arrow-down el-icon--right"></i>
+                Action<i class="el-icon-arrow-down el-icon--right"></i>
               </el-button>
               <el-dropdown-menu slot="dropdown">
-                <el-dropdown-item command="edit" @click.native="handleEdit(scope.row)" v-if="permission.hasPermission(`ad/edit`)">编辑</el-dropdown-item>
-                <el-dropdown-item command="delete" @click.native="handleDelete(scope.row)" v-if="permission.hasPermission(`ad/ad-delete`)">删除</el-dropdown-item>
+                <el-dropdown-item command="edit" @click.native="handleEdit(scope.row)" v-if="permission.hasPermission(`ad/edit`)">Edit</el-dropdown-item>
+                <el-dropdown-item command="delete" @click.native="handleDelete(scope.row)" v-if="permission.hasPermission(`ad/ad-delete`)">Delete</el-dropdown-item>
               </el-dropdown-menu>
             </el-dropdown>
           </template>
@@ -73,10 +73,10 @@
       <div class="white-box-footer">
         <el-dropdown size="small" trigger="click" v-if="permission.hasPermission(`ad/ad-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="delete" @click.native="handleMuliDel()">删除</el-dropdown-item>
+            <el-dropdown-item command="delete" @click.native="handleMuliDel()">Delete</el-dropdown-item>
           </el-dropdown-menu>
         </el-dropdown>
         <el-button type="primary" size="small" @click="handleAdd" icon="el-icon-plus" v-if="permission.hasPermission(`ad/add`)">添加广告</el-button>
@@ -153,9 +153,9 @@ export default {
     },
     delData (id = null) {
       let obj = this
-      obj.$confirm('确定删除选定的数据？', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
+      obj.$confirm('确定删除选定的数据？', 'Notice', {
+        confirmButtonText: 'confirm', // 确定
+        cancelButtonText: 'cancel', // 取消
         type: 'warning'
       }).then(() => {
         let selectedIds = []
@@ -187,4 +187,4 @@ export default {
 
 <style scoped>
 
-</style>
+</style>

backendEle/src/views/ad/location.vue

@@ -2,40 +2,40 @@
   <div v-loading="loading">
     <div class="white-box">
       <el-table :data="tableData" stripe style="width: 100%;">
-        <el-table-column label="广告位名称" prop="LOCATION_NAME">
+        <el-table-column label="Ad" prop="LOCATION_NAME"> <!-- 广告位名称 -->
           <template slot-scope="scope">
             <el-tag type="warning" size="small" class="no-border">{{scope.row.LOCATION_NAME}}</el-tag>
           </template>
         </el-table-column>
-        <el-table-column label="描述" prop="REMARK"></el-table-column>
-        <el-table-column label="类型">
+        <el-table-column label="Description" prop="REMARK"></el-table-column> <!-- 描述 -->
+        <el-table-column label="Type"> <!-- 类型 -->
           <template slot-scope="scope">
             <template v-if="scope.row.TYPE === '1'">
-              <el-tag type="success">幻灯</el-tag>
+              <el-tag type="success">Slideshow</el-tag> <!-- 幻灯 -->
             </template>
             <template v-else-if="scope.row.TYPE === '2'">
-              <el-tag>图片</el-tag>
+              <el-tag>Image</el-tag> <!-- 图片 -->
             </template>
           </template>
         </el-table-column>
-        <el-table-column label="创建人">
+        <el-table-column label="Creator"> <!-- 创建人 -->
           <template slot-scope="scope">
             {{scope.row.CREATE_ADMIN_NAME}}
           </template>
         </el-table-column>
-        <el-table-column label="创建时间">
+        <el-table-column label="Create time"> <!-- 创建时间 -->
           <template slot-scope="scope">
             {{tool.formatDate(scope.row.CREATED_AT)}}
           </template>
         </el-table-column>
-        <el-table-column fixed="right" label="操作" width="180">
+        <el-table-column fixed="right" label="Action" width="180"> <!-- 操作 -->
           <template slot-scope="scope">
             <el-dropdown size="small" trigger="click" v-if="permission.hasPermission(`ad/list`)">
               <el-button type="primary" size="small" @click.stop="">
-                操作该数据<i class="el-icon-arrow-down el-icon--right"></i>
+                Action<i class="el-icon-arrow-down el-icon--right"></i>
               </el-button>
               <el-dropdown-menu slot="dropdown">
-                <el-dropdown-item command="edit" @click.native="handleShow(scope.row)">查看</el-dropdown-item>
+                <el-dropdown-item command="edit" @click.native="handleShow(scope.row)">查看</el-dropdown-item> <!--  -->
               </el-dropdown-menu>
             </el-dropdown>
           </template>
@@ -96,4 +96,4 @@ export default {
 
 <style scoped>
 
-</style>
+</style>

backendEle/src/views/admin/index.vue

@@ -2,7 +2,7 @@
   <div v-loading="loading">
     <div class="white-box">
       <div class="filter-box">
-        <filter-user :filter-types.sync="filterTypes" filter-btn-name="筛选"
+        <filter-user :filter-types.sync="filterTypes" filter-btn-name="Select"
                      @select-value="handleFilterUser"></filter-user>
       </div>
       <el-table :data="tableData" stripe style="width: 100%;" @selection-change="handleSelectionChange" :height="tool.getTableHeight()">
@@ -77,11 +77,11 @@
           <template slot-scope="scope">
             <el-dropdown size="small" trigger="click" @command="handleRow" @click.stop="" v-if="scope.row.DONT_DEL!=='1'&&(permission.hasPermission(`admin/edit`)||permission.hasPermission(`admin/admin-delete`))">
               <el-button type="primary" size="small">
-                操作该数据<i class="el-icon-arrow-down el-icon--right"></i>
+                Action<i class="el-icon-arrow-down el-icon--right"></i>
               </el-button>
               <el-dropdown-menu slot="dropdown">
-                <el-dropdown-item :command="`edit|${scope.row.ID}`" v-if="permission.hasPermission(`admin/edit`)">编辑资料</el-dropdown-item>
-                <el-dropdown-item :command="`delete|${scope.row.ID}`" v-if="permission.hasPermission(`admin/admin-delete`)">删除</el-dropdown-item>
+                <el-dropdown-item :command="`edit|${scope.row.ID}`" v-if="permission.hasPermission(`admin/edit`)">Edit</el-dropdown-item>
+                <el-dropdown-item :command="`delete|${scope.row.ID}`" v-if="permission.hasPermission(`admin/admin-delete`)">Delete</el-dropdown-item>
               </el-dropdown-menu>
             </el-dropdown>
           </template>
@@ -90,10 +90,10 @@
       <div class="white-box-footer">
         <el-dropdown size="small" trigger="click" @command="handleMuliDel" v-if="permission.hasPermission(`admin/admin-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="delete">删除</el-dropdown-item>
+            <el-dropdown-item command="delete">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(`admin/add`)">添加管理员</el-button>
@@ -201,9 +201,9 @@
                 })
             },
             delData (obj, id = null) {
-                obj.$confirm('确定删除选定的数据？', '提示', {
-                    confirmButtonText: '确定',
-                    cancelButtonText: '取消',
+                obj.$confirm('确定删除选定的数据？', 'Notice', {
+                    confirmButtonText: 'confirm', // 确定
+                    cancelButtonText: 'cancel', // 取消
                     type: 'warning'
                 }).then(() => {
                     let selectedIds = []

backendEle/src/views/admin/role-column.vue

@@ -22,7 +22,7 @@
         </el-table-column>
       </el-table>
       <div style="margin-top: 20px">
-        <el-button type="primary" :loading="submitButtonStat" @click="onSubmit" style="float: right;">提交</el-button>
+        <el-button type="primary" :loading="submitButtonStat" @click="onSubmit" style="float: right;">Submit<!-- 提交 --></el-button>
       </div>
     </div>
   </div>

backendEle/src/views/admin/role-permission.vue

@@ -22,7 +22,7 @@
         </el-table-column>
       </el-table>
       <div style="margin-top: 20px">
-        <el-button type="primary" :loading="submitButtonStat" @click="onSubmit" style="float: right;">提交</el-button>
+        <el-button type="primary" :loading="submitButtonStat" @click="onSubmit" style="float: right;">Submit<!-- 提交 --></el-button>
       </div>
     </div>
   </div>
@@ -127,4 +127,4 @@ export default {
 
 <style scoped>
 
-</style>
+</style>

backendEle/src/views/admin/role.vue

@@ -2,7 +2,7 @@
   <div v-loading="loading">
     <div class="white-box">
       <div class="filter-box">
-        <filter-user :filter-types.sync="filterTypes" filter-btn-name="筛选"
+        <filter-user :filter-types.sync="filterTypes" filter-btn-name="Select"
                      @select-value="handleFilterUser"></filter-user>
       </div>
       <el-table :data="tableData" stripe style="width: 100%;" @selection-change="handleSelectionChange" :height="tool.getTableHeight()">
@@ -37,13 +37,13 @@
           <template slot-scope="scope">
             <el-dropdown size="small" trigger="click" @command="handleRow" @click.stop="" v-if="scope.row.DONT_DEL==='0'&&(permission.hasPermission(`admin/role-permission`)||permission.hasPermission(`admin/role-edit`)||permission.hasPermission(`admin/role-delete`))">
               <el-button type="primary" size="small">
-                操作该数据<i class="el-icon-arrow-down el-icon--right"></i>
+                Action<i class="el-icon-arrow-down el-icon--right"></i>
               </el-button>
               <el-dropdown-menu slot="dropdown">
                 <el-dropdown-item :command="`permission|${scope.row.ID}`" v-if="permission.hasPermission(`admin/role-permission`)">权限</el-dropdown-item>
 <!--                <el-dropdown-item :command="`column|${scope.row.ID}`" v-if="permission.hasPermission(`admin/role-column`)">列表字段权限</el-dropdown-item>-->
-                <el-dropdown-item :command="`edit|${scope.row.ID}`" v-if="permission.hasPermission(`admin/role-edit`)">编辑</el-dropdown-item>
-                <el-dropdown-item :command="`delete|${scope.row.ID}`" v-if="permission.hasPermission(`admin/role-delete`)">删除</el-dropdown-item>
+                <el-dropdown-item :command="`edit|${scope.row.ID}`" v-if="permission.hasPermission(`admin/role-edit`)">Edit</el-dropdown-item>
+                <el-dropdown-item :command="`delete|${scope.row.ID}`" v-if="permission.hasPermission(`admin/role-delete`)">Delete</el-dropdown-item>
               </el-dropdown-menu>
             </el-dropdown>
           </template>
@@ -52,10 +52,10 @@
       <div class="white-box-footer">
         <el-dropdown size="small" trigger="click" @command="muliDelHandle" v-if="permission.hasPermission(`admin/role-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="delete">删除</el-dropdown-item>
+            <el-dropdown-item command="delete">Delete</el-dropdown-item>
           </el-dropdown-menu>
         </el-dropdown>
         <el-button type="primary" size="small" @click="onAdd" icon="el-icon-plus" v-if="permission.hasPermission(`admin/role-add`)">添加角色</el-button>
@@ -135,9 +135,9 @@
         this.$router.push({path: `/admin/role-add`})
       },
       delHandle(obj,id) {
-        obj.$confirm('确定删除选定的数据？', '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
+        obj.$confirm('确定删除选定的数据？', 'Notice', {
+          confirmButtonText: 'confirm', // 确定
+          cancelButtonText: 'cancel', // 取消
           type: 'warning'
         }).then(() => {
           network.getData(`admin/role-delete/${id}`).then(response => {
@@ -151,9 +151,9 @@
       },
       muliDelHandle(command) {
         if (command === 'delete') {
-          this.$confirm('确定删除选定的数据？', '提示', {
-            confirmButtonText: '确定',
-            cancelButtonText: '取消',
+          this.$confirm('确定删除选定的数据？', 'Notice', {
+            confirmButtonText: 'confirm', // 确定
+            cancelButtonText: 'cancel', // 取消
             type: 'warning'
           }).then(() => {
             let selectedIds = []

backendEle/src/views/article/category-add.vue

@@ -1,12 +1,12 @@
 <template>
   <div v-loading="loading">
     <div class="white-box">
-      <el-form ref="form" :model="form" label-width="100px" style="width:500px;">
-        <el-form-item label="分类名称">
+      <el-form ref="form" :model="form" label-width="150px" style="width:500px;">
+        <el-form-item label="Category name"><!--分类名称-->
           <el-input v-model="form.cateName"></el-input>
         </el-form-item>
         <el-form-item>
-          <el-button type="primary" :loading="submitButtonStat" @click="onSubmit">提交</el-button>
+          <el-button type="primary" :loading="submitButtonStat" @click="onSubmit">Confirm<!-- 提交 --></el-button>
         </el-form-item>
       </el-form>
     </div>
@@ -54,4 +54,4 @@ export default {
 
 <style scoped>
 
-</style>
+</style>

backendEle/src/views/article/category.vue

@@ -3,26 +3,26 @@
     <div class="white-box">
       <el-table :data="tableData" stripe style="width: 100%;" @selection-change="handleSelectionChange">
         <el-table-column type="selection" width="55"></el-table-column>
-        <el-table-column label="分类名称" prop="CATE_NAME"></el-table-column>
-        <el-table-column label="排序" width="100">
+        <el-table-column label="Category name" prop="CATE_NAME"></el-table-column><!--分类名称-->
+        <el-table-column label="Order" width="100"><!--排序-->
           <template slot-scope="scope">
             <el-input v-model="scope.row.SORT" min="0" max="99"
                       @change="handleChangeSort(scope.row, scope.row.SORT)"></el-input>
           </template>
         </el-table-column>
-        <el-table-column label="创建时间">
+        <el-table-column label="Creation time"><!--创建时间-->
           <template slot-scope="scope">
             {{tool.formatDate(scope.row.CREATED_AT)}}
           </template>
         </el-table-column>
-        <el-table-column fixed="right" label="操作" width="180">
+        <el-table-column fixed="right" label="Action" width="180"><!--操作-->
           <template slot-scope="scope">
             <el-dropdown size="small" trigger="click">
               <el-button type="primary" size="small" @click.stop="">
-                操作该数据<i class="el-icon-arrow-down el-icon--right"></i>
+                Action<i class="el-icon-arrow-down el-icon--right"></i>
               </el-button>
               <el-dropdown-menu slot="dropdown">
-                <el-dropdown-item command="edit" @click.native="handleDelete(scope.row)">删除</el-dropdown-item>
+                <el-dropdown-item command="edit" @click.native="handleDelete(scope.row)">Delete</el-dropdown-item>
               </el-dropdown-menu>
             </el-dropdown>
           </template>
@@ -31,13 +31,13 @@
       <div class="white-box-footer">
         <el-dropdown size="small" trigger="click">
           <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="delete" @click.native="handleMuliDel()">删除</el-dropdown-item>
+            <el-dropdown-item command="delete" @click.native="handleMuliDel()">Delete</el-dropdown-item>
           </el-dropdown-menu>
         </el-dropdown>
-        <el-button type="primary" size="small" @click="handleAdd">新建分类</el-button>
+        <el-button type="primary" size="small" @click="handleAdd">New category</el-button><!--新建分类-->
         <el-pagination
           @size-change="handleSizeChange"
           @current-change="handleCurrentChange"
@@ -106,9 +106,9 @@ export default {
     },
     delData (id = null) {
       let obj = this
-      obj.$confirm('确定删除选定的数据？', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
+      obj.$confirm('Are you sure to delete the selected data？', 'Hint', {//确定删除选定的数据
+        confirmButtonText: 'confirm', // 确定
+        cancelButtonText: 'cancel', // 取消
         type: 'warning'
       }).then(() => {
         let selectedIds = []
@@ -140,4 +140,4 @@ export default {
 
 <style scoped>
 
-</style>
+</style>

backendEle/src/views/article/edit.vue

@@ -2,20 +2,20 @@
   <div v-loading="loading">
     <div class="white-box">
       <el-form ref="form" :model="form" label-width="100px" style="">
-        <el-form-item label="标题" style="width: 500px;">
+        <el-form-item label="Title" style="width: 500px;"><!--标题-->
           <el-input v-model="form.title"></el-input>
         </el-form-item>
-        <el-form-item label="分类">
-          <el-select v-model="form.cid" placeholder="请选择分类">
+        <el-form-item label="Category"><!--分类-->
+          <el-select v-model="form.cid" placeholder="please select category"><!--请选择分类-->
             <el-option v-for="item in allCategory" :label="item.CATE_NAME" :value="item.ID" :key="item.ID"></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="内容">
+        <el-form-item label="Content"><!--内容-->
           <editor id="contentEditor" :cloud-channel="editorRootUrl" ref="contentEditor" v-model="form.content"
                   :init="editorOptions"></editor>
         </el-form-item>
         <el-form-item>
-          <el-button type="primary" :loading="submitButtonStat" @click="onSubmit">提交</el-button>
+          <el-button type="primary" :loading="submitButtonStat" @click="onSubmit">Confirm<!-- 提交 --></el-button>
         </el-form-item>
       </el-form>
     </div>
@@ -91,4 +91,4 @@ export default {
 
 <style scoped>
 
-</style>
+</style>

backendEle/src/views/article/index.vue

@@ -3,26 +3,26 @@
     <div class="white-box">
       <el-table :data="tableData" stripe style="width: 100%;" @selection-change="handleSelectionChange">
         <el-table-column type="selection" width="55"></el-table-column>
-        <el-table-column label="标题" prop="TITLE"></el-table-column>
-        <el-table-column label="分类">
+        <el-table-column label="Title" prop="TITLE"></el-table-column><!--标题-->
+        <el-table-column label="Category"><!--分类-->
           <template slot-scope="scope">
             {{allData.allCategory[scope.row.CID].CATE_NAME}}
           </template>
         </el-table-column>
-        <el-table-column label="创建时间">
+        <el-table-column label="Creation time"><!--创建时间-->
           <template slot-scope="scope">
             {{tool.formatDate(scope.row.CREATED_AT)}}
           </template>
         </el-table-column>
-        <el-table-column fixed="right" label="操作" width="180">
+        <el-table-column fixed="right" label="Action" width="180"><!--操作-->
           <template slot-scope="scope">
             <el-dropdown size="small" trigger="click">
               <el-button type="primary" size="small" @click.stop="">
-                操作该数据<i class="el-icon-arrow-down el-icon--right"></i>
+                Action<i class="el-icon-arrow-down el-icon--right"></i>
               </el-button>
               <el-dropdown-menu slot="dropdown">
-                <el-dropdown-item command="edit" @click.native="handleEdit(scope.row)">编辑</el-dropdown-item>
-                <el-dropdown-item command="delete" @click.native="handleDelete(scope.row)">删除</el-dropdown-item>
+                <el-dropdown-item command="edit" @click.native="handleEdit(scope.row)">Edit</el-dropdown-item>
+                <el-dropdown-item command="delete" @click.native="handleDelete(scope.row)">Delete</el-dropdown-item>
               </el-dropdown-menu>
             </el-dropdown>
           </template>
@@ -31,13 +31,13 @@
       <div class="white-box-footer">
         <el-dropdown size="small" trigger="click">
           <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="delete" @click.native="handleMuliDel()">删除</el-dropdown-item>
+            <el-dropdown-item command="delete" @click.native="handleMuliDel()">Delete</el-dropdown-item>
           </el-dropdown-menu>
         </el-dropdown>
-        <el-button type="primary" size="small" @click="handleAdd">添加文章</el-button>
+        <el-button type="primary" size="small" @click="handleAdd">New article</el-button><!--添加文章-->
         <el-pagination
           @size-change="handleSizeChange"
           @current-change="handleCurrentChange"
@@ -106,9 +106,9 @@ export default {
     },
     delData (id = null) {
       let obj = this
-      obj.$confirm('确定删除选定的数据？', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
+      obj.$confirm('Are you sure to delete the selected data？', 'Hint', {// 确定删除选定的数据
+        confirmButtonText: 'confirm', // 确定
+        cancelButtonText: 'cancel', // 取消
         type: 'warning'
       }).then(() => {
         let selectedIds = []
@@ -140,4 +140,4 @@ export default {
 
 <style scoped>
 
-</style>
+</style>

backendEle/src/views/atlas/emp-user-line.vue

@@ -58,7 +58,7 @@
           </el-table>
           <div class="white-box-footer">
             <el-button type="success" size="small" @click="handleExport"
-                       v-show="permission.hasPermission(`atlas/emp-user-list-export`)">导出Excel
+                       v-show="permission.hasPermission(`atlas/emp-user-list-export`)">Export Excel
             </el-button>
           </div>
         </el-tab-pane>
@@ -138,9 +138,9 @@
           })
       },
       handleExport(){
-          this.$confirm(`确定要导出当前数据吗？`, '提示', {
-              confirmButtonText: '确定',
-              cancelButtonText: '取消',
+          this.$confirm(`确定要导出当前数据吗？`, 'Notice', {
+              confirmButtonText: 'confirm', // 确定
+              cancelButtonText: 'cancel', // 取消
               type: 'warning'
           }).then(() => {
               return network.getData(`atlas/emp-user-list-export`, this.filterForm)

backendEle/src/views/atlas/emp-user-list.vue

@@ -29,7 +29,7 @@
       </el-table>
       <div class="white-box-footer">
         <el-button type="success" size="small" @click="handleExport"
-                   v-show="permission.hasPermission(`atlas/emp-user-list-export`)">导出Excel
+                   v-show="permission.hasPermission(`atlas/emp-user-list-export`)">Export Excel
         </el-button>
       </div>
     </div>
@@ -78,9 +78,9 @@ export default {
       })
     },
     handleExport(){
-      this.$confirm(`确定要导出当前数据吗？`, '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
+      this.$confirm(`确定要导出当前数据吗？`, 'Notice', {
+        confirmButtonText: 'confirm', // 确定
+        cancelButtonText: 'cancel', // 取消
         type: 'warning'
       }).then(() => {
         return network.getData(`atlas/emp-user-list-export`, this.filterForm)
@@ -104,4 +104,4 @@ export default {
     clear: both;}
   .filter-user .el-input-group{position: relative;}
   .filter-user .el-input-group,.filter-user .el-button{float: left;margin-right: 15px;}
-</style>
+</style>

backendEle/src/views/atlas/network-line-opt.vue

@@ -73,7 +73,7 @@
           </el-table>
           <div class="white-box-footer">
             <el-button type="success" size="small" @click="handleExport"
-                       v-show="permission.hasPermission(`atlas/network-line-list-export`)">导出Excel
+                       v-show="permission.hasPermission(`atlas/network-line-list-export`)">Export Excel
             </el-button>
             <pagination :total="totalCount" :page_size="pageSize" @size-change="handleSizeChange" @current-change="handleCurrentChange"></pagination>
           </div>
@@ -196,9 +196,9 @@
         //this.getData(this.currentPage, this.pageSize, false)
       },
       handleExport(){
-        this.$confirm(`确定要导出当前数据吗？`, '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
+        this.$confirm(`确定要导出当前数据吗？`, 'Notice', {
+          confirmButtonText: 'confirm', // 确定
+          cancelButtonText: 'cancel', // 取消
           type: 'warning'
         }).then(() => {
           return network.getData(`atlas/network-line-list-export`, this.filterForm)

backendEle/src/views/atlas/network-list.vue

@@ -45,7 +45,7 @@
           <template slot-scope="scope">
             <el-dropdown size="small" trigger="click">
               <el-button type="primary" size="small" @click.stop="">
-                操作该数据<i class="el-icon-arrow-down el-icon--right"></i>
+                Action<i class="el-icon-arrow-down el-icon--right"></i>
               </el-button>
               <el-dropdown-menu slot="dropdown">
                 <el-dropdown-item command="edit" @click.native="handleShow(scope.row)">查看下级</el-dropdown-item>
@@ -123,4 +123,4 @@ export default {
 
 <style scoped>
 
-</style>
+</style>

backendEle/src/views/atlas/network-opt.vue

@@ -17,16 +17,24 @@
           </div>
           <el-tree :props="props" :data="treeData" node-key="USER_ID" @node-click="getChildData" ref="tree" :indent="0"
                    default-expand-all :height="tool.getTableHeight(true)">
-                <span :id="'node_'+data.USER_ID" :class="'custom-tree-node '+data.className"
-                      slot-scope="{ node, data }">
-                    <span :class="'el-icon-loading '+ data.displayNone"></span>
-                    <span :class="data.icon"></span>
-                    <span>
-                      <el-tag type="danger">层数：{{countTopDeep(data.TOP_NETWORK_DEEP,topDeep)}}</el-tag> <el-tag><!-- 会员编号 -->Member code：{{ node.label }}</el-tag> <el-tag>Name<!-- 姓名 -->：{{data.REAL_NAME}}</el-tag> <el-tag type="danger"><!-- 区位 -->Location：{{data.RELATIVE_LOCATION}}</el-tag> <el-tag type="success"><!-- 级别 -->Level：{{data.DEC_LV_NAME}}</el-tag> <el-tag type="warning"><!-- 聘级 -->Rank：{{data.EMP_LV_NAME}}</el-tag> <el-tag><!-- 加入期数 -->Number of joining periods：{{data.PERIOD_AT}}</el-tag></span>
-                </span>
+            <span :id="'node_'+data.USER_ID" :class="'custom-tree-node '+data.className"
+                  slot-scope="{ node, data }">
+              <span :class="'el-icon-loading '+ data.displayNone"></span>
+              <span :class="data.icon"></span>
+              <span>
+                <el-tag type="danger">Number of Layers：{{countTopDeep(data.TOP_NETWORK_DEEP,topDeep)}}</el-tag>
+                <el-tag><!-- 会员编号 -->Member code：{{ node.label }}</el-tag>
+                <el-tag>Name<!-- 姓名 -->：{{data.REAL_NAME}}</el-tag>
+                <el-tag type="danger"><!-- 区位 -->Location：{{data.RELATIVE_LOCATION}}</el-tag>
+                <el-tag type="success"><!-- 级别 -->Level：{{data.DEC_LV_NAME}}</el-tag>
+                <el-tag type="warning"><!-- 聘级 -->Rank：{{data.EMP_LV_NAME}}</el-tag>
+                <el-tag type="warning"><!-- 聘级 -->Star：{{data.STAR_LV_NAME}}</el-tag>
+                <el-tag><!-- 加入期数 -->Number of joining periods：{{data.PERIOD_AT}}</el-tag>
+              </span>
+            </span>
           </el-tree>
         </el-tab-pane>
-        <el-tab-pane label="Placement network list" name="two" v-if="permission.hasPermission(`user/network-list`)"><!-- 安置网络列表 -->
+        <el-tab-pane label="Placement network list" name="two" v-if="permission.hasPermission(`atlas/network-list`)"><!-- 安置网络列表 -->
           <div class="filter-user">
             <el-input v-model="filterForm.userName" size="small" style="width:300px;">
               <template slot="prepend"><!-- 会员编号 -->Member code</template>
@@ -79,171 +87,170 @@
 </template>
 
 <script>
-  import network from '@/utils/network'
-  import tool from '@/utils/tool'
-  import store from '@/utils/vuexStore'
-  import permission from '@/utils/permission'
-  import Pagination from '@/components/Pagination'
-  import baseInfo from '@/utils/baseInfo'
+import network from '@/utils/network'
+import tool from '@/utils/tool'
+import store from '@/utils/vuexStore'
+import permission from '@/utils/permission'
+import Pagination from '@/components/Pagination'
+import baseInfo from '@/utils/baseInfo'
 
-  export default {
-    name: 'atlas_network-opt',
-    components: {Pagination},
-    mounted() {
-      this.getData()
-      store.state.socket.onMessageCallback = this.onMessageCallback
-    },
-    data() {
-      return {
-        loading: true,
-        tabActiveName: 'first',
-        permission: permission,
-        //relation
-        props: {
-          label: 'USER_NAME',
-          children: 'children',
-          //isLeaf: 'leaf',
-          icon: 'icon',
-        },
-        treeData: null,
-        expandDeep: 2,
-        topDeep: 0,
-        mainUserName: '',
+export default {
+  name: 'atlas_network-opt',
+  components: {Pagination},
+  mounted() {
+    this.getData()
+    store.state.socket.onMessageCallback = this.onMessageCallback
+  },
+  data() {
+    return {
+      loading: true,
+      tabActiveName: 'first',
+      permission: permission,
+      //relation
+      props: {
+        label: 'USER_NAME',
+        children: 'children',
+        //isLeaf: 'leaf',
+        icon: 'icon',
+      },
+      treeData: null,
+      expandDeep: 2,
+      topDeep: 0,
+      mainUserName: '',
+      periodNum: null,
+      listPeriodNum: null,
+      allData: null,
+      tableHeaders: null,
+      tableData: null,
+      currentPage: 1,
+      totalPages: 1,
+      totalCount: 1,
+      pageSize: 20,
+      tool: tool,
+      filterForm: {
+        userName: null,
+        deep: 2,
         periodNum: null,
-        listPeriodNum: null,
-        allData: null,
-        tableHeaders: null,
-        tableData: null,
-        currentPage: 1,
-        totalPages: 1,
-        totalCount: 1,
-        pageSize: 20,
-        tool: tool,
-        filterForm: {
-          userName: null,
-          deep: 2,
-          periodNum: null,
-        },
-        listTopDeep: 0,
+      },
+      listTopDeep: 0,
+    }
+  },
+  methods: {
+    getData() {
+      this.$message({
+        message: 'Getting data, please wait', // 正在获取数据，请稍后
+      })
+      this.periodNum = baseInfo.nowPeriodNum()
+      this.filterForm.periodNum = baseInfo.nowPeriodNum()
+      if (permission.hasPermission(`atlas/network-list`) && !permission.hasPermission(`atlas/network`)) {
+        this.tabActiveName = 'two'
+        this.getListData()
       }
-    },
-    methods: {
-      getData() {
-        this.$message({
-          message: 'Getting data, please wait',//正在获取数据，请稍后
-        })
-        this.periodNum = baseInfo.nowPeriodNum()
-        this.filterForm.periodNum = baseInfo.nowPeriodNum()
-        if (permission.hasPermission(`atlas/network-list`) && !permission.hasPermission(`atlas/network`)) {
-          this.tabActiveName = 'two'
-          this.getListData()
-        }
-        if (permission.hasPermission(`atlas/network`)) {
-          this.tabActiveName = 'first'
-          if(permission.hasPermission(`atlas/network-list`)){
-            this.getMainData(null,true)
-          }else{
-            this.getMainData()
-          }
+      if (permission.hasPermission(`atlas/network`)) {
+        this.tabActiveName = 'first'
+        if(permission.hasPermission(`atlas/network-list`)){
+          this.getMainData(null,true)
+        }else{
+          this.getMainData()
         }
-      },
-      getMainData (userName = null, getList = false) {
-        this.$message.closeAll()
+      }
+    },
+    getMainData (userName = null, getList = false) {
+      this.$message.closeAll()
+      this.$message({
+        message: 'Getting data, please wait',//正在获取数据，请稍后
+      })
+      let thisObj = this
+      let requestData = {
+        periodNum: this.periodNum
+      }
+      if (this.mainUserName !== null) {
+        requestData = {userName: this.mainUserName,periodNum: this.periodNum}
+      }
+      network.getData('atlas/main-user-info', requestData).then(response => {
+        thisObj.treeData = response
+        thisObj.topDeep = Number(response[0].TOP_NETWORK_DEEP)
+        thisObj.listPeriodNum = response[0].listPeriodNum
+        if(getList) thisObj.getListData()
+        thisObj.loading = false
+      }).catch(response => {
+        thisObj.loading = false
+      })
+    },
+    getChildData (data, node) {
+      let thisObj = this
+      let userId = data.USER_ID
+      let thisData = data
+      if (thisData.leaf) {
+        return ''
+      }
+      if (thisData.isExpanded) {
+        return ''
+      }
+      if (thisData.children !== null && thisData.children.length > 0) {
+        return ''
+      }
+      thisData.displayNone = ''
+      network.getData('atlas/network', {
+        id: userId,
+        deep: thisObj.expandDeep,
+        periodNum: this.periodNum
+      }).then(response => {
+        thisObj.$refs.tree.updateKeyChildren(userId, response.allData)
+        thisObj.listPeriodNum = response.periodNum
+        thisData.displayNone = 'display-none'
+        thisData.isExpanded = true
+      })
+    },
+    countTopDeep(deep,topDeep){
+      return Number(deep)-Number(topDeep)
+    },
+    handleCurrentChange (page) {
+      this.getListData(page, this.pageSize)
+    },
+    handleSizeChange (pageSize) {
+      this.getListData(this.currentPage, pageSize)
+    },
+    handleFilter () {
+      this.getListData(1, this.pageSize)
+      this.tabActiveName = 'two'
+    },
+    handleShow(row) {
+      this.loading = true
+      this.filterForm.userName = row.SEE_USER_NAME
+      this.getListData(1, this.pageSize)
+      this.tabActiveName = 'two'
+    },
+    getListData (page, pageSize) {
+      let obj = this
+      network.getPageData(this, 'atlas/network-list', page, pageSize, this.filterForm, function (response) {
+        obj.allData = response
+        obj.listTopDeep = response.listTopDeep
+      })
+    },
+    onMessageCallback(data) {
+      //this.getData(this.currentPage, this.pageSize, false)
+    },
+    handleExport(){
+      this.$confirm(`Are you sure you want to export the current data？`, 'Hint', {//`确定要导出当前数据吗？`, '提示'
+        confirmButtonText: 'confirm', // 确定
+        cancelButtonText: 'cancel', // 取消
+        type: 'warning'
+      }).then(() => {
+        return network.getData(`atlas/network-list-export`, this.filterForm)
+      }).then(response => {
         this.$message({
-          message: 'Getting data, please wait',//正在获取数据，请稍后
+          message: response,
+          type: 'success'
         })
-        let thisObj = this
-        let requestData = {
-          periodNum: this.periodNum
-        }
-        if (this.mainUserName !== null) {
-          requestData = {userName: this.mainUserName,periodNum: this.periodNum}
-        }
-        network.getData('atlas/main-user-info', requestData).then(response => {
-          thisObj.treeData = response
-          thisObj.topDeep = Number(response[0].TOP_NETWORK_DEEP)
-          thisObj.listPeriodNum = response[0].listPeriodNum
-          if(getList) thisObj.getListData()
-          thisObj.loading = false
-        }).catch(response => {
-          thisObj.loading = false
-        })
-      },
-      getChildData (data, node) {
-        let thisObj = this
-        let userId = data.USER_ID
-        let thisData = data
-        if (thisData.leaf) {
-          return ''
-        }
-        if (thisData.isExpanded) {
-          return ''
-        }
-        if (thisData.children !== null && thisData.children.length > 0) {
-          return ''
-        }
-        thisData.displayNone = ''
-        network.getData('atlas/network', {
-          id: userId,
-          deep: thisObj.expandDeep,
-          periodNum: this.periodNum
-        }).then(response => {
-          thisObj.$refs.tree.updateKeyChildren(userId, response.allData)
-          thisObj.listPeriodNum = response.periodNum
-          thisData.displayNone = 'display-none'
-          thisData.isExpanded = true
-        })
-      },
-      countTopDeep(deep,topDeep){
-        return Number(deep)-Number(topDeep)
-      },
-      handleCurrentChange (page) {
-        this.getListData(page, this.pageSize)
-      },
-      handleSizeChange (pageSize) {
-        this.getListData(this.currentPage, pageSize)
-      },
-      handleFilter () {
-        this.getListData(1, this.pageSize)
-        this.tabActiveName = 'two'
-      },
-      handleShow(row) {
-        this.loading = true
-        this.filterForm.userName = row.SEE_USER_NAME
-        this.getListData(1, this.pageSize)
-        this.tabActiveName = 'two'
-      },
-      getListData (page, pageSize) {
-        let obj = this
-        network.getPageData(this, 'atlas/network-list', page, pageSize, this.filterForm, function (response) {
-          obj.allData = response
-          obj.listTopDeep = response.listTopDeep
-        })
-      },
-      onMessageCallback(data) {
-        //this.getData(this.currentPage, this.pageSize, false)
-      },
-      handleExport(){
-        this.$confirm(`Are you sure you want to export the current data？`, 'Hint', {//`确定要导出当前数据吗？`, '提示'
-          confirmButtonText: 'confirm',//确定
-          cancelButtonText: 'cancel',//取消
-          type: 'warning'
-        }).then(() => {
-          return network.getData(`atlas/network-list-export`, this.filterForm)
-        }).then(response => {
-          this.$message({
-            message: response,
-            type: 'success'
-          })
-        }).catch(response => {
-
-        })
-      },
-      enterToGetData (ev) {
-        this.getMainData()
-      },
-    }
+      }).catch(response => {
+      })
+    },
+    enterToGetData (ev) {
+      this.getMainData()
+    },
   }
+}
 </script>
 
 <style>

backendEle/src/views/atlas/relation-list.vue

@@ -49,7 +49,7 @@
           <template slot-scope="scope">
             <el-dropdown size="small" trigger="click">
               <el-button type="primary" size="small" @click.stop="">
-                操作该数据<i class="el-icon-arrow-down el-icon--right"></i>
+                Action<i class="el-icon-arrow-down el-icon--right"></i>
               </el-button>
               <el-dropdown-menu slot="dropdown">
                 <el-dropdown-item command="edit" @click.native="handleShow(scope.row)">查看下级</el-dropdown-item>
@@ -59,7 +59,7 @@
         </el-table-column>
       </el-table>
       <div class="white-box-footer">
-        <el-button type="success" size="small" @click="handleExport">导出Excel</el-button>
+        <el-button type="success" size="small" @click="handleExport">Export Excel</el-button>
         <pagination :total="totalCount" :page_size="pageSize" @size-change="handleSizeChange" @current-change="handleCurrentChange"></pagination>
       </div>
     </div>
@@ -124,9 +124,9 @@
         })
       },
       handleExport(){
-        this.$confirm(`确定要导出当前数据吗？`, '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
+        this.$confirm(`确定要导出当前数据吗？`, 'Notice', {
+          confirmButtonText: 'confirm', // 确定
+          cancelButtonText: 'cancel', // 取消
           type: 'warning'
         }).then(() => {
           return network.getData(`atlas/relation-list-export`, this.filterForm)
@@ -149,4 +149,4 @@
 
 <style scoped>
 
-</style>
+</style>

backendEle/src/views/atlas/relation-opt.vue

@@ -21,11 +21,18 @@
                       slot-scope="{ node, data }">
                     <span :class="'el-icon-loading '+ data.displayNone"></span>
                     <span :class="data.icon"></span>
-                  <span><el-tag type="danger"><!-- 代数 -->Algebra：{{countTopDeep(data.TOP_RELATION_DEEP,topDeep)}}</el-tag> <el-tag><!-- 会员编号 -->Member code：{{ node.label }}</el-tag> <el-tag type="success">Name<!-- 姓名 -->：{{data.REAL_NAME}}</el-tag> <el-tag type="warning">Level<!-- 级别 -->：{{data.DEC_LV_NAME}}</el-tag> <el-tag type="warning"><!-- 聘级 -->Rank：{{data.EMP_LV_NAME}}</el-tag></span>
+                    <span>
+                      <el-tag type="danger"><!-- 代数 -->Algebra：{{countTopDeep(data.TOP_RELATION_DEEP,topDeep)}}</el-tag>
+                      <el-tag><!-- 会员编号 -->Member code：{{ node.label }}</el-tag>
+                      <el-tag type="success">Name<!-- 姓名 -->：{{data.REAL_NAME}}</el-tag>
+                      <el-tag type="warning">Level<!-- 级别 -->：{{data.DEC_LV_NAME}}</el-tag>
+                      <el-tag type="warning">Rank：<!-- 聘级 -->{{data.EMP_LV_NAME}}</el-tag>
+                      <el-tag type="warning">Star：<!-- 星级 -->{{data.STAR_LV_NAME}}</el-tag>
+                    </span>
                 </span>
           </el-tree>
         </el-tab-pane>
-        <el-tab-pane label="Development network list" name="two" v-if="permission.hasPermission(`user/relation-list`)"><!-- 开拓网络列表 -->
+        <el-tab-pane label="Development network list" name="two" v-if="permission.hasPermission(`atlas/relation-list`)"><!-- 开拓网络列表 -->
           <div class="filter-user">
             <el-input v-model="filterForm.userName" size="small" style="width:300px;">
               <template slot="prepend"><!-- 会员编号 -->Member code</template>
@@ -146,7 +153,7 @@
       getData() {
         this.$message({
           message: 'Getting data, please wait',//正在获取数据，请稍后
-          duration:0
+          duration: 0
         })
         this.periodNum = baseInfo.nowPeriodNum()
         this.filterForm.periodNum = baseInfo.nowPeriodNum()
@@ -246,8 +253,8 @@
       },
       handleExport(){
         this.$confirm(`Are you sure you want to export the current data？`, 'Hint', {//`确定要导出当前数据吗？`, '提示'
-          confirmButtonText: 'confirm',//确定
-          cancelButtonText: 'cancel',//取消
+          confirmButtonText: 'confirm', // 确定
+          cancelButtonText: 'cancel', // 取消
           type: 'warning'
         }).then(() => {
           return network.getData(`atlas/relation-list-export`, this.filterForm)

backendEle/src/views/bonus/calc-qy-filter.vue

@@ -6,7 +6,7 @@
     <div :class="`filter-item`">
       <el-input v-model="filterModel.userName" placeholder="请输入会员编号"></el-input>
     </div>
-    <el-button class="filter-item filter-filter-btn" type="primary" @click="handleFilter">筛选</el-button>
+    <el-button class="filter-item filter-filter-btn" type="primary" @click="handleFilter">Select</el-button>
   </div>
 </template>
 
@@ -97,4 +97,4 @@ export default {
       display: none;
     }
   }
-</style>
+</style>

backendEle/src/views/bonus/cf-lx-apply.vue

@@ -15,7 +15,7 @@
         </el-form-item>
 
         <el-form-item>
-          <el-button type="primary" @click="onSubmit" :loading="submitButtonStat">提交</el-button>
+          <el-button type="primary" @click="onSubmit" :loading="submitButtonStat">Submit<!-- 提交 --></el-button>
         </el-form-item>
       </el-form>
     </div>
@@ -70,4 +70,4 @@ export default {
 
 <style scoped>
 
-</style>
+</style>

backendEle/src/views/bonus/cf-lx-audit-list.vue

@@ -26,14 +26,14 @@
           <template slot-scope="scope" v-if="scope.row.AUDIT_STATUS==='0' && (permission.hasPermission(`bonus/cf-lx-audit`)||permission.hasPermission(`bonus/cf-lx-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>
+                Action<i class="el-icon-arrow-down el-icon--right"></i>
               </el-button>
               <el-dropdown-menu slot="dropdown">
                 <el-dropdown-item command="pass" @click.native="handleAudit(scope.row, 'true')" v-if="permission.hasPermission(`bonus/cf-lx-audit`)">审核通过</el-dropdown-item>
                 <el-dropdown-item command="refuse" @click.native="handleAudit(scope.row, 'reject')" v-if="permission.hasPermission(`bonus/cf-lx-audit`)">审核拒绝
                 </el-dropdown-item>
                 <el-dropdown-item command="del" @click.native="handleDel(scope.row.ID)"
-                                  v-show="permission.hasPermission(`bonus/cf-lx-audit-delete`)">删除数据
+                                  v-show="permission.hasPermission(`bonus/cf-lx-audit-delete`)">Delete
                 </el-dropdown-item>
               </el-dropdown-menu>
             </el-dropdown>
@@ -43,15 +43,15 @@
       <div class="white-box-footer">
         <el-dropdown size="small" trigger="click" @command="handleMuli" v-if="(status===0) && (permission.hasPermission(`bonus/cf-lx-audit`)||permission.hasPermission(`bonus/cf-lx-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="pass" v-if="permission.hasPermission(`bonus/cf-lx-audit`)">批量审核</el-dropdown-item>
             <el-dropdown-item command="reject" v-if="permission.hasPermission(`bonus/cf-lx-audit`)">批量拒审</el-dropdown-item>
-            <el-dropdown-item command="del" @click.native="handleDel()" v-if="permission.hasPermission(`bonus/cf-lx-audit-delete`)">批量删除</el-dropdown-item>
+            <el-dropdown-item command="del" @click.native="handleDel()" v-if="permission.hasPermission(`bonus/cf-lx-audit-delete`)">Delete in batches</el-dropdown-item>
           </el-dropdown-menu>
         </el-dropdown>
-        <el-button type="success" size="small" @click="handleExport" v-show="permission.hasPermission(`bonus/cf-lx-audit-export`)">导出Excel</el-button>
+        <el-button type="success" size="small" @click="handleExport" v-show="permission.hasPermission(`bonus/cf-lx-audit-export`)">Export Excel</el-button>
         <pagination :total="totalCount" :page_size="pageSize" @size-change="handleSizeChange" @current-change="handleCurrentChange"></pagination>
       </div>
     </div>
@@ -151,9 +151,9 @@
         if (status === 'reject') {
           title = '确定要拒绝审核？请输入备注'
         }
-        this.$prompt(title, '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
+        this.$prompt(title, 'Notice', { // 提示
+          confirmButtonText: 'confirm', // 确定
+          cancelButtonText: 'cancel', // 取消
         }).then(({value}) => {
           let selectedIds = []
           if (row === null) {
@@ -184,9 +184,9 @@
       },
       handleDel(id = null) {
         let obj = this
-        this.$confirm('确定删除选定的数据？', '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
+        this.$confirm('确定删除选定的数据？', 'Notice', {
+          confirmButtonText: 'confirm', // 确定
+          cancelButtonText: 'cancel', // 取消
           type: 'warning'
         }).then(() => {
           let selectedIds = []
@@ -230,9 +230,9 @@
         })
       },
       handleExport(){
-        this.$confirm(`确定要导出当前数据吗？`, '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
+        this.$confirm(`确定要导出当前数据吗？`, 'Notice', {
+          confirmButtonText: 'confirm', // 确定
+          cancelButtonText: 'cancel', // 取消
           type: 'warning'
         }).then(() => {
           return network.getData(`bonus/cf-lx-audit-export`, this.filterModel)

backendEle/src/views/bonus/flow-cf.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</el-button>
         <pagination :total="totalCount" :page_size="pageSize" @size-change="handleSizeChange" @current-change="handleCurrentChange"></pagination>
       </div>
     </div>
@@ -73,9 +73,9 @@
         })
       },
       handleExport(){
-        this.$confirm(`确定要导出当前数据吗？`, '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
+        this.$confirm(`确定要导出当前数据吗？`, 'Notice', {
+          confirmButtonText: 'confirm', // 确定
+          cancelButtonText: 'cancel', // 取消
           type: 'warning'
         }).then(() => {
           return network.getData(`bonus/flow-cf-export`, this.filterModel)

backendEle/src/views/bonus/flow-lx.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</el-button>
         <pagination :total="totalCount" :page_size="pageSize" @size-change="handleSizeChange" @current-change="handleCurrentChange"></pagination>
       </div>
     </div>
@@ -73,9 +73,9 @@
         })
       },
       handleExport(){
-        this.$confirm(`确定要导出当前数据吗？`, '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
+        this.$confirm(`确定要导出当前数据吗？`, 'Notice', {
+          confirmButtonText: 'confirm', // 确定
+          cancelButtonText: 'cancel', // 取消
           type: 'warning'
         }).then(() => {
           return network.getData(`bonus/flow-lx-export`, this.filterModel)

backendEle/src/views/bonus/flow-rp.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</el-button>
         <pagination :total="totalCount" :page_size="pageSize" @size-change="handleSizeChange" @current-change="handleCurrentChange"></pagination>
       </div>
     </div>
@@ -73,9 +73,9 @@
         })
       },
       handleExport(){
-        this.$confirm(`确定要导出当前数据吗？`, '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
+        this.$confirm(`确定要导出当前数据吗？`, 'Notice', {
+          confirmButtonText: 'confirm', // 确定
+          cancelButtonText: 'cancel', // 取消
           type: 'warning'
         }).then(() => {
           return network.getData(`bonus/flow-rp-export`, this.filterModel)

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

@@ -6,7 +6,7 @@
     <div :class="`filter-item`">
       <el-input v-model="filterModel.userName" placeholder="请输入会员编号"></el-input>
     </div>
-    <el-button class="filter-item filter-filter-btn" type="primary" @click="handleFilter">筛选</el-button>
+    <el-button class="filter-item filter-filter-btn" type="primary" @click="handleFilter">Select</el-button>
   </div>
 </template>
 
@@ -97,4 +97,4 @@ export default {
       display: none;
     }
   }
-</style>
+</style>

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

@@ -123,8 +123,8 @@ export default {
     },
     handleExport(){
       this.$confirm(`Are you sure you want to export the current data？`, 'Hint', {//`确定要导出当前数据吗？`, '提示'
-        confirmButtonText: 'confirm',//确定
-        cancelButtonText: 'cancel',//取消
+        confirmButtonText: 'confirm', // 确定
+        cancelButtonText: 'cancel', // 取消
         type: 'warning'
       }).then(() => {
         return network.getData(`bonus/new-period-bonus-export`, this.filterModel)

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

@@ -6,7 +6,7 @@
     <div :class="`filter-item`">
       <el-input v-model="filterModel.userName" placeholder="请输入会员编号"></el-input>
     </div>
-    <el-button class="filter-item filter-filter-btn" type="primary" @click="handleFilter">筛选</el-button>
+    <el-button class="filter-item filter-filter-btn" type="primary" @click="handleFilter">Select</el-button>
   </div>
 </template>
 
@@ -97,4 +97,4 @@ export default {
       display: none;
     }
   }
-</style>
+</style>

backendEle/src/views/bonus/perf-standard.vue

@@ -18,7 +18,7 @@
         </el-table-column>
       </el-table>
       <div class="white-box-footer">
-        <el-button type="success" size="small" @click="handleExport" v-show="permission.hasPermission(`bonus/perf-month-export`)">导出Excel</el-button>
+        <el-button type="success" size="small" @click="handleExport" v-show="permission.hasPermission(`bonus/perf-month-export`)">Export Excel</el-button>
         <pagination :total="totalCount" :page_size="pageSize" @size-change="handleSizeChange" @current-change="handleCurrentChange"></pagination>
       </div>
     </div>
@@ -87,9 +87,9 @@ export default {
       if(window.location.href.indexOf('filter') === -1){
         filterData.filterType = this.filterStatus !== 'ALL' ? `=,${this.filterStatus}` : ''
       }
-      this.$confirm('确定要导出当前表格中的数据吗？', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
+      this.$confirm('确定要导出当前表格中的数据吗？', 'Notice', {
+        confirmButtonText: 'confirm', // 确定
+        cancelButtonText: 'cancel', // 取消
         type: 'warning'
       }).then(() => {
         return network.getData('bonus/perf-standard-export', filterData)

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

@@ -19,7 +19,7 @@
         </el-table-column>
       </el-table>
       <div class="white-box-footer">
-        <el-button type="success" size="small" @click="handleExport" v-show="permission.hasPermission(`bonus/period-perf-export`)">导出Excel</el-button>
+        <el-button type="success" size="small" @click="handleExport" v-show="permission.hasPermission(`bonus/period-perf-export`)">Export Excel</el-button>
         <pagination :total="totalCount" :page_size="pageSize" @size-change="handleSizeChange" @current-change="handleCurrentChange"></pagination>
       </div>
     </div>
@@ -88,9 +88,9 @@ export default {
       if(window.location.href.indexOf('filter') === -1){
         filterData.filterType = this.filterStatus !== 'ALL' ? `=,${this.filterStatus}` : ''
       }
-      this.$confirm('确定要导出当前表格中的数据吗？', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
+      this.$confirm('确定要导出当前表格中的数据吗？', 'Notice', {
+        confirmButtonText: 'confirm', // 确定
+        cancelButtonText: 'cancel', // 取消
         type: 'warning'
       }).then(() => {
         return network.getData('bonus/period-perf-export', filterData)

backendEle/src/views/bonus/period.vue

@@ -3,7 +3,7 @@
     <div class="white-box">
       <div class="filter-box">
         <filter-user :filter-types.sync="filterTypes" filter-btn-name="screen"
-                     @select-value="handleFilterUser"></filter-user><!-- 筛选 -->
+                     @select-value="handleFilterUser"></filter-user><!-- Select -->
       </div>
       <el-table :data="tableData" stripe style="width: 100%;" @selection-change="handleSelectionChange"
                 :height="tool.getTableHeight()">
@@ -65,11 +65,11 @@
             <!-- 完成 -->complete：{{tool.formatDate(scope.row.SENT_AT)}}
           </template>
         </el-table-column>
-        <el-table-column fixed="right" label="operation" width="180"><!-- 操作 -->
+        <el-table-column fixed="right" label="Action" width="180"><!-- 操作 -->
           <template slot-scope="scope">
             <el-dropdown size="small" trigger="click" v-if="scope.row.BUTTON_IS_CAN">
               <el-button type="primary" size="small" @click.stop="">
-                <!-- 操作该数据 -->Operate on this data<i class="el-icon-arrow-down el-icon--right"></i>
+                <!-- 操作该数据 -->Action<i class="el-icon-arrow-down el-icon--right"></i>
               </el-button>
               <el-dropdown-menu slot="dropdown">
                 <el-dropdown-item @click.native="closeHandle(scope.row)"
@@ -177,8 +177,8 @@
     methods: {
       closeHandle(row) {
         this.$confirm('Confirm to manually seal the current period？', 'Hint', {//'确定对当前期进行手动封期操作？', '提示'
-          confirmButtonText: 'confirm',//确定
-          cancelButtonText: 'cancel',//取消
+          confirmButtonText: 'confirm', // 确定
+          cancelButtonText: 'cancel', // 取消
           type: 'warning'
         }).then(() => {
           return network.getData(`bonus/close-period/${row.PERIOD_NUM}`)
@@ -193,8 +193,8 @@
       },
       calcHandle(row) {
         this.$confirm('Confirm to perform settlement operation for the current period？', 'Hint', {//'确定对当前期进行结算操作？', '提示'
-          confirmButtonText: 'confirm',//确定
-          cancelButtonText:  'cancel',//取消
+          confirmButtonText: 'confirm', // 确定
+          cancelButtonText:  'cancel', // 取消
           type: 'warning'
         }).then(() => {
           return network.getData(`bonus/calc-period/${row.PERIOD_NUM}`)
@@ -209,8 +209,8 @@
       },
       perfHandle(row) {
         this.$confirm('Confirm to generate performance sheet for the current period？', 'Hint', {//'确定对当前期进行生成业绩单操作？', '提示'
-          confirmButtonText: 'confirm',//确定
-          cancelButtonText:  'cancel',//取消
+          confirmButtonText: 'confirm', // 确定
+          cancelButtonText:  'cancel', // 取消
           type: 'warning'
         }).then(() => {
           return network.getData(`bonus/perf-period/${row.PERIOD_NUM}`)
@@ -225,8 +225,8 @@
       },
       sentHandle(row) {
         this.$confirm('Are you sure to connect the current period? Performance sheet and settlement cannot be generated after network connection', 'Hint', {//'确定对当前期进行挂网操作？挂网后无法生成业绩单和结算', '提示'
-          confirmButtonText: 'confirm',//确定
-          cancelButtonText:  'cancel',//取消
+          confirmButtonText: 'confirm', // 确定
+          cancelButtonText:  'cancel', // 取消
           type: 'warning'
         }).then(() => {
           return network.getData(`bonus/send-period/${row.PERIOD_NUM}`)

backendEle/src/views/bonus/real-time-perf.vue

@@ -7,7 +7,7 @@
             <template slot="append">【{{realName}}】</template>
           </el-input>
         </div>
-        <el-button class="filter-item filter-filter-btn" type="primary" @click="handleFilter">筛选</el-button>
+        <el-button class="filter-item filter-filter-btn" type="primary" @click="handleFilter">Select</el-button>
       </div>
       <h3>当周实时新增业绩</h3>
       <el-table class="table-box" :data="weekData" stripe style="width: 100%;">

backendEle/src/views/bonus/resend-qy-audit-list.vue

@@ -26,14 +26,14 @@
           <template slot-scope="scope" v-if="scope.row.AUDIT_STATUS==='0' && (permission.hasPermission(`bonus/resend-qy-audit`)||permission.hasPermission(`bonus/resend-qy-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>
+                Action<i class="el-icon-arrow-down el-icon--right"></i>
               </el-button>
               <el-dropdown-menu slot="dropdown">
                 <el-dropdown-item command="pass" @click.native="handleAudit(scope.row, 'true')" v-if="permission.hasPermission(`bonus/resend-qy-audit`)">审核通过</el-dropdown-item>
                 <el-dropdown-item command="refuse" @click.native="handleAudit(scope.row, 'reject')" v-if="permission.hasPermission(`bonus/resend-qy-audit`)">审核拒绝
                 </el-dropdown-item>
                 <el-dropdown-item command="del" @click.native="handleDel(scope.row.ID)"
-                                  v-show="permission.hasPermission(`bonus/cf-lx-audit-delete`)">删除数据
+                                  v-show="permission.hasPermission(`bonus/cf-lx-audit-delete`)">Delete
                 </el-dropdown-item>
               </el-dropdown-menu>
             </el-dropdown>
@@ -43,15 +43,15 @@
       <div class="white-box-footer">
         <el-dropdown size="small" trigger="click" @command="handleMuli" v-if="(filterStatus==='0') && (permission.hasPermission(`bonus/resend-qy-audit`)||permission.hasPermission(`bonus/resend-qy-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="pass" v-if="permission.hasPermission(`bonus/resend-qy-audit`)">批量审核</el-dropdown-item>
             <el-dropdown-item command="reject" v-if="permission.hasPermission(`bonus/resend-qy-audit`)">批量拒审</el-dropdown-item>
-            <el-dropdown-item command="del" @click.native="handleDel()" v-if="permission.hasPermission(`bonus/resend-qy-audit-delete`)">批量删除</el-dropdown-item>
+            <el-dropdown-item command="del" @click.native="handleDel()" v-if="permission.hasPermission(`bonus/resend-qy-audit-delete`)">Delete in batches</el-dropdown-item>
           </el-dropdown-menu>
         </el-dropdown>
-        <el-button type="success" size="small" @click="handleExport" v-show="permission.hasPermission(`bonus/resend-qy-audit-list-export`)">导出Excel</el-button>
+        <el-button type="success" size="small" @click="handleExport" v-show="permission.hasPermission(`bonus/resend-qy-audit-list-export`)">Export Excel</el-button>
         <pagination :total="totalCount" :page_size="pageSize" @size-change="handleSizeChange" @current-change="handleCurrentChange"></pagination>
       </div>
     </div>
@@ -124,9 +124,9 @@ export default {
       if (status === 'reject') {
         title = '确定要拒绝审核？请输入备注'
       }
-      this.$prompt(title, '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
+      this.$prompt(title, 'Notice', {
+        confirmButtonText: 'confirm', // 确定
+        cancelButtonText: 'cancel', // 取消
       }).then(({value}) => {
         let selectedIds = []
         if (row === null) {
@@ -157,9 +157,9 @@ export default {
     },
     handleDel(id = null) {
       let obj = this
-      this.$confirm('确定删除选定的数据？', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
+      this.$confirm('确定删除选定的数据？', 'Notice', {
+        confirmButtonText: 'confirm', // 确定
+        cancelButtonText: 'cancel', // 取消
         type: 'warning'
       }).then(() => {
         let selectedIds = []
@@ -202,9 +202,9 @@ export default {
       })
     },
     handleExport(){
-      this.$confirm(`确定要导出当前数据吗？`, '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
+      this.$confirm(`确定要导出当前数据吗？`, 'Notice', {
+        confirmButtonText: 'confirm', // 确定
+        cancelButtonText: 'cancel', // 取消
         type: 'warning'
       }).then(() => {
         return network.getData(`bonus/resend-qy-audit-list-export`, this.filterModel)

backendEle/src/views/bonus/resend-qy-list.vue

@@ -25,7 +25,7 @@
           <template slot-scope="scope">
             <el-dropdown size="small" trigger="click" v-if="scope.row.RESEND_STATUS==='0' && permission.hasPermission(`bonus/resend-qy`)">
               <el-button type="primary" size="small" @click.stop="">
-                操作该数据<i class="el-icon-arrow-down el-icon--right"></i>
+                Action<i class="el-icon-arrow-down el-icon--right"></i>
               </el-button>
               <el-dropdown-menu slot="dropdown">
                 <el-dropdown-item @click.native="handleResend(scope.row.ID)"
@@ -39,13 +39,13 @@
       <div class="white-box-footer">
         <el-dropdown size="small" trigger="click" v-if="(filterStatus==='0') && permission.hasPermission(`bonus/resend-qy`)">
           <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="del" @click.native="handleResend()">批量补发</el-dropdown-item>
           </el-dropdown-menu>
         </el-dropdown>
-        <el-button type="success" size="small" @click="handleExport" v-show="permission.hasPermission(`bonus/resend-qy-list-export`)">导出Excel</el-button>
+        <el-button type="success" size="small" @click="handleExport" v-show="permission.hasPermission(`bonus/resend-qy-list-export`)">Export Excel</el-button>
         <pagination :total="totalCount" :page_size="pageSize" @size-change="handleSizeChange" @current-change="handleCurrentChange"></pagination>
       </div>
     </div>
@@ -107,9 +107,9 @@ export default {
         return false
       }
       let obj = this
-      this.$prompt('确定为所选数据申请补发区域津贴？请填写备注', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
+      this.$prompt('确定为所选数据申请补发区域津贴？请填写备注', 'Notice', {
+        confirmButtonText: 'confirm', // 确定
+        cancelButtonText: 'cancel', // 取消
         inputValue: '',
         type: 'warning'
       }).then(({value}) => {
@@ -155,9 +155,9 @@ export default {
       })
     },
     handleExport(){
-      this.$confirm(`确定要导出当前数据吗？`, '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
+      this.$confirm(`确定要导出当前数据吗？`, 'Notice', {
+        confirmButtonText: 'confirm', // 确定
+        cancelButtonText: 'cancel', // 取消
         type: 'warning'
       }).then(() => {
         return network.getData(`bonus/resend-qy-list-export`, this.filterModel)

backendEle/src/views/bonus/score-month.vue

@@ -89,8 +89,8 @@ export default {
         filterData.filterType = this.filterStatus !== 'ALL' ? `=,${this.filterStatus}` : ''
       }
       this.$confirm('Are you sure you want to export the data in the current table？', 'Hint', {//'确定要导出当前表格中的数据吗？', '提示',
-        confirmButtonText: 'confirm',//确定
-        cancelButtonText:  'cancel',//取消
+        confirmButtonText: 'confirm', // 确定
+        cancelButtonText:  'cancel', // 取消
         type: 'warning'
       }).then(() => {
         return network.getData('bonus/score-month-export', filterData)

backendEle/src/views/bonus/trace-bt-filter.vue

@@ -11,7 +11,7 @@
         <template slot="append">【{{realName}}】</template>
       </el-input>
     </div>
-    <el-button class="filter-item filter-filter-btn" type="primary" @click="handleFilter">筛选</el-button>
+    <el-button class="filter-item filter-filter-btn" type="primary" @click="handleFilter">Select</el-button>
   </div>
 </template>
 

backendEle/src/views/bonus/trace-bt.vue

@@ -22,7 +22,7 @@
         </el-table-column>
       </el-table>
       <div class="white-box-footer">
-        <el-button type="success" size="small" @click="handleExport" v-show="permission.hasPermission(`bonus/trace-bt-export`)">导出Excel</el-button>
+        <el-button type="success" size="small" @click="handleExport" v-show="permission.hasPermission(`bonus/trace-bt-export`)">Export Excel</el-button>
         <pagination :total="totalCount" :page_size="pageSize" @size-change="handleSizeChange" @current-change="handleCurrentChange"></pagination>
       </div>
     </div>
@@ -88,9 +88,9 @@
         })
       },
       handleExport(){
-        this.$confirm(`确定要导出当前数据吗？`, '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
+        this.$confirm(`确定要导出当前数据吗？`, 'Notice', {
+          confirmButtonText: 'confirm', // 确定
+          cancelButtonText: 'cancel', // 取消
           type: 'warning'
         }).then(() => {
           return network.getData(`bonus/trace-bt-export`, this.filterData)

backendEle/src/views/bonus/trace-down-bd.vue

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

backendEle/src/views/bonus/trace-down-fx.vue

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

backendEle/src/views/bonus/trace-down-gl.vue

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

backendEle/src/views/bonus/trace-down-gx.vue

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

backendEle/src/views/bonus/trace-down-qy-filter.vue

@@ -27,7 +27,7 @@
         <template slot="append">【{{realName}}】</template>
       </el-input>
     </div>
-    <el-button class="filter-item filter-filter-btn" type="primary" @click="handleFilter">筛选</el-button>
+    <el-button class="filter-item filter-filter-btn" type="primary" @click="handleFilter">Select</el-button>
   </div>
 </template>
 
@@ -158,4 +158,4 @@
       display: none;
     }
   }
-</style>
+</style>

backendEle/src/views/bonus/trace-down-qy.vue

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

backendEle/src/views/bonus/trace-down-tg.vue

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

backendEle/src/views/bonus/trace-down-xf.vue

@@ -15,7 +15,7 @@
         </el-table-column>
       </el-table>
       <div class="white-box-footer">
-        <el-button type="success" size="small" @click="handleExport" v-show="permission.hasPermission(`bonus/trace-down-tg-export`)">导出Excel</el-button>
+        <el-button type="success" size="small" @click="handleExport" v-show="permission.hasPermission(`bonus/trace-down-tg-export`)">Export Excel</el-button>
         <pagination :total="totalCount" :page_size="pageSize" @size-change="handleSizeChange" @current-change="handleCurrentChange"></pagination>
       </div>
     </div>
@@ -71,9 +71,9 @@
         })
       },
       handleExport(){
-        this.$confirm(`确定要导出当前数据吗？`, '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
+        this.$confirm(`确定要导出当前数据吗？`, 'Hint', {
+          confirmButtonText: 'confirm', // 确定
+          cancelButtonText: 'cancel', // 取消
           type: 'warning'
         }).then(() => {
           return network.getData(`bonus/trace-down-xf-export`, this.filterData)

backendEle/src/views/bonus/trace-down-yc-filter.vue

@@ -8,7 +8,7 @@
         <template slot="append">【{{realName}}】</template>
       </el-input>
     </div>
-    <el-button class="filter-item filter-filter-btn" type="primary" @click="handleFilter">筛选</el-button>
+    <el-button class="filter-item filter-filter-btn" type="primary" @click="handleFilter">Select</el-button>
   </div>
 </template>
 

backendEle/src/views/bonus/trace-down-yc.vue

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

backendEle/src/views/bonus/trace-down-yj.vue

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

backendEle/src/views/bonus/trace-fl-filter.vue

@@ -11,7 +11,7 @@
         <template slot="append">【{{realName}}】</template>
       </el-input>
     </div>
-    <el-button class="filter-item filter-filter-btn" type="primary" @click="handleFilter">筛选</el-button>
+    <el-button class="filter-item filter-filter-btn" type="primary" @click="handleFilter">Select</el-button>
   </div>
 </template>
 
@@ -143,4 +143,4 @@
       display: none;
     }
   }
-</style>
+</style>

backendEle/src/views/bonus/trace-fl.vue

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

backendEle/src/views/bonus/trace-fw-filter.vue

@@ -11,7 +11,7 @@
         <template slot="append">【{{realName}}】</template>
       </el-input>
     </div>
-    <el-button class="filter-item filter-filter-btn" type="primary" @click="handleFilter">筛选</el-button>
+    <el-button class="filter-item filter-filter-btn" type="primary" @click="handleFilter">Select</el-button>
   </div>
 </template>
 
@@ -143,4 +143,4 @@
       display: none;
     }
   }
-</style>
+</style>

backendEle/src/views/bonus/trace-fw.vue

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

backendEle/src/views/bonus/trace-up-bd.vue

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

backendEle/src/views/bonus/trace-up-filter.vue

@@ -8,7 +8,7 @@
         <template slot="append">【{{realName}}】</template>
       </el-input>
     </div>
-    <el-button class="filter-item filter-filter-btn" type="primary" @click="handleFilter">筛选</el-button>
+    <el-button class="filter-item filter-filter-btn" type="primary" @click="handleFilter">Select</el-button>
   </div>
 </template>
 
@@ -138,4 +138,4 @@
       display: none;
     }
   }
-</style>
+</style>

backendEle/src/views/bonus/trace-up-fx.vue

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

backendEle/src/views/bonus/trace-up-gl.vue

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

backendEle/src/views/bonus/trace-up-gx.vue

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

backendEle/src/views/bonus/trace-up-qy.vue

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

backendEle/src/views/bonus/trace-up-tg.vue

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

backendEle/src/views/bonus/trace-up-xf.vue

@@ -15,7 +15,7 @@
         </el-table-column>
       </el-table>
       <div class="white-box-footer">
-        <el-button type="success" size="small" @click="handleExport" v-show="permission.hasPermission(`bonus/trace-up-tg-export`)">导出Excel</el-button>
+        <el-button type="success" size="small" @click="handleExport" v-show="permission.hasPermission(`bonus/trace-up-tg-export`)">Export Excel</el-button>
         <pagination :total="totalCount" :page_size="pageSize" @size-change="handleSizeChange" @current-change="handleCurrentChange"></pagination>
       </div>
     </div>
@@ -71,9 +71,9 @@
         })
       },
       handleExport(){
-        this.$confirm(`确定要导出当前数据吗？`, '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
+        this.$confirm(`确定要导出当前数据吗？`, 'Hint', {
+          confirmButtonText: 'confirm', // 确定
+          cancelButtonText: 'cancel', // 取消
           type: 'warning'
         }).then(() => {
           return network.getData(`bonus/trace-up-xf-export`, this.filterData)

backendEle/src/views/bonus/trace-up-yc.vue

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

backendEle/src/views/bonus/trace-up-yj.vue

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

backendEle/src/views/bonus/yc-perf.vue

@@ -7,7 +7,7 @@
             <template slot="append">【{{realName}}】</template>
           </el-input>
         </div>
-        <el-button class="filter-item filter-filter-btn" type="primary" @click="handleFilter">筛选</el-button>
+        <el-button class="filter-item filter-filter-btn" type="primary" @click="handleFilter">Select</el-button>
       </div>
       <el-table class="table-box" :data="ycPerfList" stripe style="width: 100%;">
         <el-table-column label="用户名" prop="USER_NAME"></el-table-column>

backendEle/src/views/config/api-edit.vue

@@ -25,14 +25,14 @@
               <el-date-picker
                 v-model="item.VALUE"
                 type="datetime"
-                placeholder="选择日期时间">
+                placeholder="Select date">
               </el-date-picker>
             </template>
             <template v-else-if="item.INPUT_TYPE==='6'">
               <el-date-picker
                 v-model="item.VALUE"
                 type="date"
-                placeholder="选择日期">
+                placeholder="Select date">
               </el-date-picker>
             </template>
             <template v-else-if="item.INPUT_TYPE==='7'">
@@ -131,4 +131,4 @@ export default {
 
 <style scoped>
 
-</style>
+</style>

backendEle/src/views/config/api-opt.vue

@@ -32,10 +32,10 @@
               <template slot-scope="scope">
                 <el-dropdown size="small" trigger="click" @click.stop="" v-if="permission.hasPermission(`config/ocr-api-edit`)">
                   <el-button type="primary" size="small">
-                    操作该数据<i class="el-icon-arrow-down el-icon--right"></i>
+                    Action<i class="el-icon-arrow-down el-icon--right"></i>
                   </el-button>
                   <el-dropdown-menu slot="dropdown">
-                    <el-dropdown-item command="edit" @click.native="handleEdit('ocr', scope.row)">编辑</el-dropdown-item>
+                    <el-dropdown-item command="edit" @click.native="handleEdit('ocr', scope.row)">Edit</el-dropdown-item>
                   </el-dropdown-menu>
                 </el-dropdown>
               </template>
@@ -77,10 +77,10 @@
               <template slot-scope="scope">
                 <el-dropdown size="small" trigger="click" @click.stop="" v-if="permission.hasPermission(`config/sms-api-edit`)">
                   <el-button type="primary" size="small">
-                    操作该数据<i class="el-icon-arrow-down el-icon--right"></i>
+                    Action<i class="el-icon-arrow-down el-icon--right"></i>
                   </el-button>
                   <el-dropdown-menu slot="dropdown">
-                    <el-dropdown-item command="edit" @click.native="handleEdit('sms', scope.row)">编辑</el-dropdown-item>
+                    <el-dropdown-item command="edit" @click.native="handleEdit('sms', scope.row)">Edit</el-dropdown-item>
                   </el-dropdown-menu>
                 </el-dropdown>
               </template>
@@ -132,4 +132,4 @@ export default {
 
 <style scoped>
 
-</style>
+</style>

backendEle/src/views/config/base.vue

@@ -24,14 +24,14 @@
               <el-date-picker
                 v-model="item.VALUE"
                 type="datetime"
-                placeholder="选择日期时间">
+                placeholder="Select date">
               </el-date-picker>
             </template>
             <template v-else-if="item.INPUT_TYPE==='6'">
               <el-date-picker
                 v-model="item.VALUE"
                 type="date"
-                placeholder="选择日期">
+                placeholder="Select date">
               </el-date-picker>
             </template>
             <template v-else-if="item.INPUT_TYPE==='7'">
@@ -111,4 +111,4 @@ export default {
 
 <style scoped>
 
-</style>
+</style>

backendEle/src/views/config/bonus-opt.vue

@@ -34,14 +34,14 @@
                   <el-date-picker
                     v-model="item.VALUE"
                     type="datetime"
-                    placeholder="选择日期时间">
+                    placeholder="Select date">
                   </el-date-picker>
                 </template>
                 <template v-else-if="item.INPUT_TYPE==='6'">
                   <el-date-picker
                     v-model="item.VALUE"
                     type="date"
-                    placeholder="选择日期">
+                    placeholder="Select date">
                   </el-date-picker>
                 </template>
                 <template v-else-if="item.INPUT_TYPE==='7'">
@@ -91,19 +91,26 @@
     </div>
     <div class="panel" v-if="permission.hasPermission(`config/bonus-dec-level`)">
       <div class="panel-heading">
-        团队奖
+        绩效奖
       </div>
       <div class="panel-wrapper">
         <div class="panel-body">
           <el-table :data="decLevelTableData" stripe style="width: 100%;">
             <el-table-column prop="LEVEL_NAME" label="级别名称"></el-table-column>
-            <el-table-column label="拿奖比例(%)">
+            <el-table-column label="拿奖比例">
               <template slot-scope="scope">
                 <el-input v-model="scope.row.QY_PERCENT" min="0" max="100">
                   <template slot="append">%</template>
                 </el-input>
               </template>
             </el-table-column>
+            <el-table-column label="个人封顶值">
+              <template slot-scope="scope">
+                <el-input v-model="scope.row.INCOME_CAP" min="0">
+                  <template slot="append">$</template>
+                </el-input>
+              </template>
+            </el-table-column>
           </el-table>
         </div>
         <div class="panel-footer">