Merge branch 'feature/york-1365-i18n-inpro-0613' of http://18.167.157.193:1026/guanli/ngds into feature/theo-translate

# Conflicts:
#	backendApi/config/menu.php
#	backendEle/src/views/user/user-add-opt.vue
#	frontendEle/src/views/finance/withdraw-add.vue
#	frontendEle/src/views/shop/order.vue
#	frontendEle/src/views/user/dec.vue

backendApi/config/menu.php

@@ -42,18 +42,18 @@ return [
             // 新添加的商品操作 ---stop
             ['name'=>'商品列表导出', 'class'=>'', 'icon'=>'', 'controller'=>'shop', 'action'=>'goods-list-export', 'routePath'=>'shop/goods-list-export', 'show'=>0,],
             ['name'=>' Kitting products manage', 'class'=>'', 'icon'=>'', 'controller'=>'shop', 'action'=>'package', 'routePath'=>'shop/package', 'show'=>1,],//套餐管理
-            ['name'=>'报单列表', 'class'=>'', 'icon'=>'', 'controller'=>'shop', 'action'=>'dec-order-list', 'routePath'=>'shop/dec-order-list', 'show'=>1,],
+            ['name'=>'Welcome Pack Listing', 'class'=>'', 'icon'=>'', 'controller'=>'shop', 'action'=>'dec-order-list', 'routePath'=>'shop/dec-order-list', 'show'=>1,],//报单列表
             ['name'=>'报单列表导出', 'class'=>'', 'icon'=>'', 'controller'=>'shop', 'action'=>'dec-order-list-export', 'routePath'=>'shop/dec-order-list-export', 'show'=>0,],
-            ['name'=>'订单列表', 'class'=>'', 'icon'=>'', 'controller'=>'shop', 'action'=>'order-list', 'routePath'=>'shop/order-list', 'show'=>1,],
+            ['name'=>'order list', 'class'=>'', 'icon'=>'', 'controller'=>'shop', 'action'=>'order-list', 'routePath'=>'shop/order-list', 'show'=>1,],//订单列表
             ['name'=>'订单列表导出', 'class'=>'', 'icon'=>'', 'controller'=>'shop', 'action'=>'order-list-export', 'routePath'=>'shop/order-list-export', 'show'=>0,],
             ['name'=>'订单发货', 'class'=>'', 'icon'=>'', 'controller'=>'shop', 'action'=>'order-delivery', 'routePath'=>'shop/order-delivery', 'show'=>0,],
-            ['name'=>'外部商城订单列表', 'class'=>'', 'icon'=>'', 'controller'=>'shop', 'action'=>'order-shop-list', 'routePath'=>'shop/order-shop-list', 'show'=>1,],
-//            ['name'=>'外部商城报单列表', 'class'=>'', 'icon'=>'', 'controller'=>'shop', 'action'=>'order-dec-list', 'routePath'=>'shop/order-dec-list', 'show'=>1,],
-//            ['name'=>'外部商城达标订单列表', 'class'=>'', 'icon'=>'', 'controller'=>'shop', 'action'=>'order-standard-list', 'routePath'=>'shop/order-standard-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,],//外部商城达标订单列表
         ]
     ],
     'user'=>[
-        'name'=>'会员管理',
+        'name'=>'Member management',//会员管理
         'class' => '',
         'icon'=>'el-icon-user',
         'controller'=>'user',
@@ -61,7 +61,7 @@ return [
         'routePath'=>'user',
         'show'=>1,
         'child'=>[
-            ['name'=>'会员列表', 'class'=>'', 'icon'=>'', 'controller'=>'user', 'action'=>'index', 'routePath'=>'user/index', 'show'=>1,],
+            ['name'=>'Member list', 'class'=>'', 'icon'=>'', 'controller'=>'user', 'action'=>'index', 'routePath'=>'user/index', 'show'=>1,],//会员列表
             ['name'=>'登录到前台', 'class'=>'', 'icon'=>'', 'controller'=>'user', 'action'=>'login-to-frontend', 'routePath'=>'user/login-to-frontend', 'show'=>0,],
 //            ['name'=>'指定会员管理登录管理', 'class'=>'', 'icon'=>'', 'controller'=>'user', 'action'=>'batch-close-login', 'routePath'=>'user/batch-close-login', 'show'=>0,],
 //            ['name'=>'按条件登录管理', 'class'=>'', 'icon'=>'', 'controller'=>'user', 'action'=>'close-login', 'routePath'=>'user/close-login', 'show'=>0,],
@@ -82,9 +82,9 @@ return [
             ['name'=>'修改个人资料', 'class'=>'', 'icon'=>'', 'controller'=>'user', 'action'=>'modify-profile', 'routePath'=>'user/modify-profile', 'show'=>0,],
             ['name'=>'会员状态', 'class'=>'', 'icon'=>'', 'controller'=>'user', 'action'=>'modify-status', 'routePath'=>'user/modify-status', 'show'=>0,],
             ['name'=>'密码修改状态', 'class'=>'', 'icon'=>'', 'controller'=>'user', 'action'=>'is-modify-password-status', 'routePath'=>'user/is-modify-password-status', 'show'=>0,],
-            ['name'=>'空单操作', 'class'=>'', 'icon'=>'', 'controller'=>'user', 'action'=>'user-add-opt', 'routePath'=>'user/user-add-opt', 'show'=>1,],
+            ['name'=>'Empty order operation', 'class'=>'', 'icon'=>'', 'controller'=>'user', 'action'=>'user-add-opt', 'routePath'=>'user/user-add-opt', 'show'=>1,],//空单操作
             ['name'=>'空单添加', 'class'=>'', 'icon'=>'', 'controller'=>'user', 'action'=>'user-add', 'routePath'=>'user/user-add', 'show'=>0,],
-            ['name'=>'空单列表', 'class'=>'', 'icon'=>'', 'controller'=>'user', 'action'=>'empty-list', 'routePath'=>'user/empty-list', 'show'=>1,],
+            ['name'=>'Empty list', 'class'=>'', 'icon'=>'', 'controller'=>'user', 'action'=>'empty-list', 'routePath'=>'user/empty-list', 'show'=>1,],//空单列表
 //            ['name'=>'空单批量1导入', 'class'=>'', 'icon'=>'', 'controller'=>'user', 'action'=>'import-users-to-excel-table', 'routePath'=>'user/import-users-to-excel-table', 'show'=>0,],
 //            ['name'=>'空单批量2添加', 'class'=>'', 'icon'=>'', 'controller'=>'user', 'action'=>'import-users-add', 'routePath'=>'user/import-users-add', 'show'=>0,],
 //            ['name'=>'空单删除', 'class'=>'', 'icon'=>'', 'controller'=>'user', 'action'=>'user-del', 'routePath'=>'user/user-del', 'show'=>0,],
@@ -105,7 +105,7 @@ return [
             //['name'=>'体系导出', 'class'=>'', 'icon'=>'', 'controller'=>'user', 'action'=>'system-export', 'routePath'=>'user/system-export', 'show'=>0,],
             //['name'=>'团队领导人列表', 'class'=>'', 'icon'=>'', 'controller'=>'user', 'action'=>'group', 'routePath'=>'user/group', 'show'=>1,],
             //['name'=>'团队领导人列表导出', 'class'=>'', 'icon'=>'', 'controller'=>'user', 'action'=>'group-export', 'routePath'=>'user/group-export', 'show'=>0,],
-            ['name'=>'移网管理', 'class'=>'', 'icon'=>'', 'controller'=>'user', 'action'=>'move', 'routePath'=>'user/move', 'show'=>1,],
+            ['name'=>'Mobile network management', 'class'=>'', 'icon'=>'', 'controller'=>'user', 'action'=>'move', 'routePath'=>'user/move', 'show'=>1,],//移网管理
             ['name'=>'申请移网', 'class'=>'', 'icon'=>'', 'controller'=>'user', 'action'=>'move-add', 'routePath'=>'user/move-add', 'show'=>0,],
             ['name'=>'移网修改并审核', 'class'=>'', 'icon'=>'', 'controller'=>'user', 'action'=>'move-pass', 'routePath'=>'user/move-pass', 'show'=>0,],
             ['name'=>'移网审核', 'class'=>'', 'icon'=>'', 'controller'=>'user', 'action'=>'move-audit', 'routePath'=>'user/move-audit', 'show'=>0,],
@@ -135,7 +135,7 @@ return [
         ]
     ],
     'atlas'=>[
-        'name'=>'网络图谱',
+        'name'=>'Network Atlas',//网络图谱
         'class' => '',
         'icon'=>'el-icon-data-line',
         'controller'=>'atlas',
@@ -143,11 +143,11 @@ return [
         'routePath'=>'atlas',
         'show'=>1,
         'child'=>[
-            ['name'=>'开拓网络', 'class'=>'', 'icon'=>'', 'controller'=>'atlas', 'action'=>'relation-opt', 'routePath'=>'atlas/relation-opt', 'show'=>1,],
+            ['name'=>'Expand 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'=>'安置网络', 'class'=>'', 'icon'=>'', 'controller'=>'atlas', 'action'=>'network-opt', 'routePath'=>'atlas/network-opt', 'show'=>1,],
+            ['name'=>'Resettlement 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,],
@@ -176,7 +176,7 @@ return [
 //        ]
 //    ],
     'bonus'=>[
-        'name'=>'奖金管理',
+        'name'=>'Bonus management',//奖金管理
         'class' => '',
         'icon'=>'el-icon-coin',
         'controller'=>'bonus',
@@ -251,7 +251,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'=>'用户业绩', 'class'=>'', 'icon'=>'', 'controller'=>'bonus', 'action'=>'user-perf', 'routePath'=>'bonus/user-perf', 'show'=>1,],
+            ['name'=>'User 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,],
@@ -265,7 +265,7 @@ return [
 //            ['name'=>'报单中心货补追溯导出', 'class'=>'', 'icon'=>'', 'controller'=>'bonus', 'action'=>'trace-fl-export', 'routePath'=>'bonus/trace-fl-export', 'show'=>0,],
 //            ['name'=>'区域业绩提成追溯', 'class'=>'', 'icon'=>'', 'controller'=>'bonus', 'action'=>'trace-fw', 'routePath'=>'bonus/trace-fw', 'show'=>1,],
 //            ['name'=>'区域业绩提成追溯导出', 'class'=>'', 'icon'=>'', 'controller'=>'bonus', 'action'=>'trace-fw-export', 'routePath'=>'bonus/trace-fw-export', 'show'=>0,],
-            ['name'=>'业绩单', 'class'=>'', 'icon'=>'', 'controller'=>'bonus', 'action'=>'perf-order', 'routePath'=>'bonus/perf-order', 'show'=>1,],
+            ['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'=>'期业绩', 'class'=>'', 'icon'=>'', 'controller'=>'bonus', 'action'=>'perf-period-list', 'routePath'=>'bonus/perf-period-list', 'show'=>1,],

backendApi/modules/v1/controllers/AtlasController.php

@@ -51,7 +51,7 @@ class AtlasController extends BaseController {
         $deep = Yii::$app->request->get('deep', 2);
         $periodNum = Yii::$app->request->get('periodNum', null);
         if ($deep > 23) {
-            return static::notice('最多查看会员的前23层子会员', 400);
+            return static::notice('Top 23 sub members of members can be viewed at most', 400);//最多查看会员的前23层子会员
         }
         $allData = UserRelation::getChildrenWithDeepAndLayer($userId, $deep, 1, $periodNum);
         return static::notice(['allData' => $allData, 'periodNum' => $periodNum]);
@@ -115,7 +115,7 @@ class AtlasController extends BaseController {
             $userId = Yii::$app->params['mainUserId'];
         } else {
             if (!$userId = Info::getUserIdByUserName($userName)) {
-                return static::notice('会员不存在', 400);
+                return static::notice('Member does not exist', 400);//会员不存在
             }
         }
         $listObj = new RelationList();
@@ -159,7 +159,7 @@ class AtlasController extends BaseController {
         $periodNum = Yii::$app->request->get('periodNum', null);
         $deep = Yii::$app->request->get('deep', 2);
         if ($deep > 20) {
-            return static::notice('最多查看会员的前20层子会员', 400);
+            return static::notice('View the top 20 sub members of the member at most', 400);//最多查看会员的前20层子会员
         }
         $allData = UserNetwork::getChildrenWithDeepAndLayer($userId, $deep, 1, $periodNum);
         return static::notice(['allData' => $allData, 'periodNum' => $periodNum]);
@@ -180,7 +180,7 @@ class AtlasController extends BaseController {
             $userId = Yii::$app->params['mainUserId'];
         } else {
             if (!$userId = Info::getUserIdByUserName($userName)) {
-                return static::notice('会员不存在', 400);
+                return static::notice('Member does not exist', 400);//会员不存在
             }
         }
         $listObj = new NetworkList();

backendApi/modules/v1/controllers/UserController.php

@@ -889,7 +889,7 @@ class UserController extends BaseController
             $userInfo['GARAGE_POINTS'] = Balance::getAccountBalance($userInfo['ID'], 'garage_points');
             return static::notice($userInfo);
         }else{
-            return static::notice('会员编号不存在', 400);
+            return static::notice('Member number does not exist', 400);//会员编号不存在
         }
     }
 
@@ -1070,7 +1070,7 @@ class UserController extends BaseController
     public function actionUserAdd()
     {
         if (Yii::$app->request->isPost) {
-            return parent::edit(AdminAddUserForm::class, '添加成功', null, null, null, function ($form, $result) {
+            return parent::edit(AdminAddUserForm::class, 'Successfully added', null, null, null, function ($form, $result) {//添加成功
                 // Log::adminHandle('后台添加会员:' . $result['USER_NAME'], 1, $result['ID'], $result['USER_NAME']);
             });
         }
@@ -1081,7 +1081,7 @@ class UserController extends BaseController
         // 所有开户行
         $allOpenBank = OpenBank::findAllAsArray('STATUS=1');
         if (!$userName = Info::generateUserName('NG')) {
-            return static::notice('会员编号生成失败', 400);
+            return static::notice('Failed to generate member number', 400);//会员编号生成失败
         }
         return static::notice(['allDecRole' => $allDecRole, 'allNation' => $allNation, 'allOpenBank' => $allOpenBank, 'userName' => $userName]);
     }
@@ -1113,7 +1113,7 @@ class UserController extends BaseController
             } elseif ($result === 0) {
                 return static::notice(['finish' => true]);
             } else {
-                return static::notice('发生错误：' . $errorMsg, 400);
+                return static::notice('An error occurred：' . $errorMsg, 400);//发生错误
             }
         }
     }
@@ -1122,7 +1122,7 @@ class UserController extends BaseController
         $form = new UserBasicForm();
         $form->scenario = 'modifyPassword';
         if(Yii::$app->request->isPost && $form->load(Yii::$app->request->post(), '') && $result = $form->edit()){
-            return static::notice('密码修改成功');
+            return static::notice('Password modified successfully');//密码修改成功
         } else {
             return static::notice(Form::formatErrorsForApi($form->getErrors()), 400);
         }
@@ -1137,7 +1137,7 @@ class UserController extends BaseController
         $id = Yii::$app->request->get('id');
         $userInfo = User::findOneAsArray('ID=:ID', [':ID' => $id]);
         if (!$userInfo) {
-            return static::notice('数据不存在', 400);
+            return static::notice('Data does not exist', 400);//数据不存在
         }
         $allNation = \Yii::$app->params['nation'];
         $allOpenBank = OpenBank::findAllAsArray('STATUS=1');
@@ -1161,7 +1161,7 @@ class UserController extends BaseController
         $form = new UserBasicForm();
         $form->scenario = 'modifyProfile';
         if(Yii::$app->request->isPost && $form->load(Yii::$app->request->post(), '') && $result = $form->modifyProfile()){
-            return static::notice('个人资料修改成功');
+            return static::notice('Personal data modified successfully');//个人资料修改成功
         } else {
             return static::notice(Form::formatErrorsForApi($form->getErrors()), 400);
         }
@@ -1171,7 +1171,7 @@ class UserController extends BaseController
         $form = new UserBasicForm();
         $form->scenario = 'modifyStatus';
         if(Yii::$app->request->isPost && $form->load(Yii::$app->request->post(), '') && $result = $form->modifyStatus()){
-            return static::notice('会员状态修改成功');
+            return static::notice('Member status modified successfully');//会员状态修改成功
         } else {
             return static::notice(Form::formatErrorsForApi($form->getErrors()), 400);
         }
@@ -1186,7 +1186,7 @@ class UserController extends BaseController
         $form = new UserBasicForm();
         $form->scenario = 'isModifyPasswordStatus';
         if(Yii::$app->request->isPost && $form->load(Yii::$app->request->post(), '') && $result = $form->isModifyPasswordStatus()){
-            return static::notice('状态修改成功');
+            return static::notice('Status modified successfully');//状态修改成功
         } else {
             return static::notice(Form::formatErrorsForApi($form->getErrors()), 400);
         }
@@ -1217,7 +1217,7 @@ class UserController extends BaseController
             } elseif ($result === 0) {
                 return static::notice(['finish' => true]);
             } else {
-                return static::notice('发生错误：' . $errorMsg, 400);
+                return static::notice('An error occurred：' . $errorMsg, 400);//发生错误
             }
         }
     }
@@ -1231,42 +1231,42 @@ class UserController extends BaseController
     {
         $userName = Yii::$app->request->get('userName');
         if (!$uid = Info::getUserIdByUserName($userName)) {
-            return static::notice('用户不存在' . $userName, 400);
+            return static::notice('user does not exist' . $userName, 400);//用户不存在
         }
         if (UserInfo::findOneAsArray('REC_UID=:REC_UID AND DELETED=0', [':REC_UID' => $uid], 'USER_ID')) {
-            return static::notice('此会员已开拓其它会员不可以删除', 400);
+            return static::notice('This member has developed other members and cannot be deleted', 400);//此会员已开拓其它会员不可以删除
         }
         if (UserInfo::findOneAsArray('CON_UID=:CON_UID AND DELETED=0', [':CON_UID' => $uid], 'USER_ID')) {
-            return static::notice('此会员已安置其它会员不可以删除', 400);
+            return static::notice('This member has been placed with other members and cannot be deleted', 400);//此会员已安置其它会员不可以删除
         }
         if (User::findOneAsArray('DEC_ID=:DEC_ID AND DELETED=0', [':DEC_ID' => $uid], 'ID')) {
-            return static::notice('此会员已报单其它会员不可以删除', 400);
+            return static::notice('This member has submitted a bill and other members cannot delete it', 400);//此会员已报单其它会员不可以删除
         }
         if (DecOrder::findOneAsArray('USER_ID=:TO_USER_ID OR TO_USER_ID=:TO_USER_ID', [':TO_USER_ID' => $uid], 'ID')) {
-            return static::notice('此会员已报单不可以删除', 400);
+            return static::notice('This member has submitted a bill and cannot be deleted', 400);//此会员已报单不可以删除
         }
         $info = Info::baseInfoWithNet($uid);
         if ($info['REG_FROM'] == 1) {
-            return static::notice('此会员不是空单无法删除', 400);
+            return static::notice('This member is not empty and cannot be deleted', 400);//此会员不是空单无法删除
         }
         $sentMaxPeriodNum = Period::sentMaxPeriodNum();
         if ($info['PERIOD_AT'] <= $sentMaxPeriodNum) {
-            return static::notice('此会员加入期数小于等于已挂网期数', 400);
+            return static::notice('The number of enrollment periods of this member is less than or equal to the number of online periods', 400);//此会员加入期数小于等于已挂网期数
         }
         if (User::find()->where('ID=:ID AND VERIFIED=1', [':ID' => $uid])->exists()) {
-            return static::notice('此会员已实名认证无法删除', 400);
+            return static::notice('This member has been authenticated by real name and cannot be deleted', 400);//此会员已实名认证无法删除
         }
         if (User::find()->where('ID=:ID AND SUB_COM_LEADER=1', [':ID' => $uid])->exists()) {
-            return static::notice('此会员是分公司领导人无法删除', 400);
+            return static::notice('This member is a branch leader and cannot be deleted', 400);//此会员是分公司领导人无法删除
         }
         if (UserInfo::find()->where('USER_ID=:USER_ID AND (IS_GROUP_LEADER=1 OR IS_SYSTEM_LEADER=1 OR IS_BIND=1 OR IS_TEAM=1)', [':USER_ID' => $uid])->exists()) {
-            return static::notice('此会员存在以下情况无法删除，团队领导人/体系领导人/点位绑定/点位合作', 400);
+            return static::notice('This member cannot be deleted due to the following conditions: Team Leader / system leader / point binding / point cooperation', 400);//此会员存在以下情况无法删除，团队领导人/体系领导人/点位绑定/点位合作
         }
         if (FlowBonus::findOneAsArray('USER_ID=:USER_ID', [':USER_ID' => $uid], 'ID')) {
-            return static::notice('该会员产生过余额流水无法删除', 400);
+            return static::notice('This member has generated a balance flow, which cannot be deleted', 400);//该会员产生过余额流水无法删除
         }
         if (UserMove::findOneAsArray('USER_ID=:USER_ID', [':USER_ID' => $uid], 'ID')) {
-            return static::notice('该会员发生过移网无法删除', 400);
+            return static::notice('The member cannot be deleted due to network migration', 400);//该会员发生过移网无法删除
         }
         return static::notice($info);
     }
@@ -1285,7 +1285,7 @@ class UserController extends BaseController
             $user = User::getBaseInfoFromRedis($result);
             //// Log::adminHandle('删除空单会员' . $user['USER_NAME'], 1, $result, $user['USER_NAME']);
             // Log::adminHandle('删除空单会员' . $user['USER_NAME'], 1);
-            return static::notice('删除空单会员完成');
+            return static::notice('Delete empty member');//删除空单会员完成
         }
         return static::notice(Form::formatErrorsForApi($formModel->getErrors()), 400);
     }
@@ -1428,7 +1428,7 @@ class UserController extends BaseController
     public function actionChangeUserDecLevel()
     {
         if (Yii::$app->request->isPost) {
-            return parent::edit(DecLevelLogForm::class, '修改会员级别成功', 'adminChange', [
+            return parent::edit(DecLevelLogForm::class, 'Member level modified successfully', 'adminChange', [//修改会员级别成功
                 'adminChange',
             ], null, function ($form, $result) {
                 //$userName = Info::getUserNameByUserId($result['ID']);
@@ -1445,7 +1445,7 @@ class UserController extends BaseController
     public function actionChangeUserDecRole()
     {
         if (Yii::$app->request->isPost) {
-            return parent::edit(DecRoleLogForm::class, '修改报单中心级别成功', 'adminChange', [
+            return parent::edit(DecRoleLogForm::class, 'Successfully modified the document entry center level', 'adminChange', [//修改报单中心级别成功
                 'adminChange',
             ], null, function ($form, $result) {
                 //$userName = Info::getUserNameByUserId($result['ID']);
@@ -1462,7 +1462,7 @@ class UserController extends BaseController
     public function actionChangeShowEmpLevel()
     {
         if (Yii::$app->request->isPost) {
-            return parent::edit(ChangeShowEmpLvForm::class, '修改会员前台显示聘级成功', 'adminChange', [
+            return parent::edit(ChangeShowEmpLvForm::class, 'Succeeded in modifying the member foreground display level', 'adminChange', [//修改会员前台显示聘级成功
                 'adminChange',
             ], null, function ($form, $result) {
                 //$userName = Info::getUserNameByUserId($result['ID']);
@@ -1506,7 +1506,7 @@ class UserController extends BaseController
     public function actionRegInfoEdit()
     {
         if (Yii::$app->request->isPost) {
-            return parent::edit(RegInfoAuditForm::class, '注册信息修改提交成功，审核后生效', 'editRegInfo', ['editRegInfo'], null, function ($form, $result) {
+            return parent::edit(RegInfoAuditForm::class, 'The registration information modification has been submitted successfully and will take effect after approval', 'editRegInfo', ['editRegInfo'], null, function ($form, $result) {//注册信息修改提交成功，审核后生效
                 $user = User::getBaseInfoFromRedis($result['USER_ID']);
                 // Log::adminHandle('申请为' . $user['USER_NAME'] . '注册信息修改', 1, $result['USER_ID'], $user['USER_NAME']);
             });
@@ -1556,7 +1556,7 @@ class UserController extends BaseController
     public function actionRegInfoAuditAdd()
     {
         if (Yii::$app->request->isPost) {
-            return parent::edit(RegInfoAuditForm::class, '注册信息录入成功', 'add', ['add'], null, function ($form, $result) {
+            return parent::edit(RegInfoAuditForm::class, 'Registration information entered successfully', 'add', ['add'], null, function ($form, $result) {//注册信息录入成功
                 $user = User::getBaseInfoFromRedis($result['USER_ID']);
                 // Log::adminHandle('申请为' . $user['USER_NAME'] . '注册信息录入', 1, $result['USER_ID'], $user['USER_NAME']);
             });
@@ -1585,7 +1585,7 @@ class UserController extends BaseController
         $id = Yii::$app->request->get('id');
         $regInfo = RegInfoAudit::findOneAsArray('ID=:ID', [':ID' => $id]);
         if (!$regInfo) {
-            return static::notice('数据不存在', 400);
+            return static::notice('Data does not exist', 400);//数据不存在
         }
         $regInfo['BASE_INFO'] = Info::baseInfoZh($regInfo['USER_ID']);
         $regInfo['REG_EXPIRES'] = Date::convert($regInfo['REG_EXPIRES']);
@@ -1609,7 +1609,7 @@ class UserController extends BaseController
         if ($formModel->load(Yii::$app->request->post(), '') && $result = $formModel->edit()) {
             $user = User::getBaseInfoFromRedis($result['USER_ID']);
             // Log::adminHandle('修改' . $user['USER_NAME'] . '注册信息录入数据', 1, $result['USER_ID'], $user['USER_NAME']);
-            return static::notice('修改注册信息录入数据完成');
+            return static::notice('Completion of modifying registration information and entering data');//修改注册信息录入数据完成
         }
         return static::notice(Form::formatErrorsForApi($formModel->getErrors()), 400);
     }
@@ -1627,7 +1627,7 @@ class UserController extends BaseController
         if ($formModel->load(Yii::$app->request->post(), '') && $result = $formModel->audit()) {
             $user = User::getBaseInfoFromRedis($result['USER_ID']);
             // Log::adminHandle('审核' . $user['USER_NAME'] . '注册信息', 1, $result['USER_ID'], $user['USER_NAME']);
-            return static::notice('审核注册信息完成');
+            return static::notice('Audit registration information completed');//审核注册信息完成
         }
         return static::notice(Form::formatErrorsForApi($formModel->getErrors()), 400);
     }

backendApi/modules/v1/models/lists/atlas/NetworkList.php

@@ -72,15 +72,15 @@ class NetworkList extends \common\libs\dataList\DataList implements DataListInte
                 'USER_ID' => null, // 这种传输方式主要是用于索引，因为过滤后的字段可能没有这种ID，但是一些功能的操作还需要用这种ID去关联，例如前台会员列表中的勾选批量状态管理，这里需要的就是USER_ID
                 'SEE_USER_NAME' => null,
                 'COUNT_DEEP' => [
-                    'header' => '层数',
+                    'header' => 'Number of layers',//层数
                     'headerOther' => ['width' => '100'],
                 ],
                 'USER_NAME' => [
-                    'header' => '安置会员编号',
+                    'header' => 'Placement member number',//安置会员编号
 //                    'headerOther' => ['width' => '150'],
                 ],
                 'REAL_NAME' => [
-                    'header' => '安置会员姓名',
+                    'header' => 'Placement member name',//安置会员姓名
 //                    'headerOther' => [
 //                        'width' => '120',
 //                    ],
@@ -93,19 +93,19 @@ class NetworkList extends \common\libs\dataList\DataList implements DataListInte
 //                    'headerOther' => ['width' => '110'],
 //                ],
                 'DEC_LV_NAME' => [
-                    'header' => '推荐会员级别',
+                    'header' => 'Recommended member level',//推荐会员级别
                     'headerOther' => [
                         'width' => '110',
                     ],
                 ],
                 'EMP_LV_NAME' => [
-                    'header' => '推荐会员聘级',
+                    'header' => 'Recommended member Rank',//推荐会员聘级
                     'headerOther' => [
                         'width' => '130',
                     ],
                 ],
                 'PERIOD_AT' => [
-                    'header' => '加入期数',
+                    'header' => 'Number of joining periods',//加入期数
                     'headerOther' => ['width' => '110'],
                 ],
             ];
@@ -120,9 +120,9 @@ class NetworkList extends \common\libs\dataList\DataList implements DataListInte
     public function getFilterTypes() {
         if (!$this->filterTypes) {
             $this->filterTypes = [
-                'userName' => ['isUserTable' => false, 'name' => '会员编号'],
-                'deep' => ['isUserTable' => false, 'name' => '深度'],
-                'periodNum' => ['isUserTable' => false, 'name' => '期数'],
+                'userName' => ['isUserTable' => false, 'name' => 'Member code'],//会员编号
+                'deep' => ['isUserTable' => false, 'name' => 'depth'],//深度
+                'periodNum' => ['isUserTable' => false, 'name' => 'Number of periods'],//期数
             ];
         }
         return $this->filterTypes;

backendApi/modules/v1/models/lists/atlas/RelationList.php

@@ -73,33 +73,33 @@ class RelationList extends \common\libs\dataList\DataList implements DataListInt
 //                    'headerOther' => ['width' => '110'],
 //                ],
                 'COUNT_DEEP' => [
-                    'header' => '层数',
+                    'header' => 'Number of layers',//层数
                     'headerOther' => ['width' => '100'],
                 ],
                 'USER_NAME' => [
-                    'header' => '推荐会员编号',
+                        'header' => 'Recommended member No',//推荐会员编号
 //                    'headerOther' => ['width' => '150'],
                 ],
                 'REAL_NAME' => [
-                    'header' => '推荐会员姓名',
+                    'header' => 'Name of recommended member',//推荐会员姓名
 //                    'headerOther' => [
 //                        'width' => '120',
 //                    ],
                 ],
                 'DEC_LV_NAME' => [
-                    'header' => '推荐会员级别',
+                    'header' => 'Recommended member level',//推荐会员级别
                     'headerOther' => [
                         'width' => '110',
                     ],
                 ],
                 'EMP_LV_NAME' => [
-                    'header' => '推荐会员聘级',
+                    'header' => 'Recommended member Rank',//推荐会员聘级
                     'headerOther' => [
                         'width' => '130',
                     ],
                 ],
                 'PERIOD_AT' => [
-                    'header' => '加入期数',
+                    'header' => 'Number of joining periods',//加入期数
                     'headerOther' => ['width' => '110'],
                 ],
             ];
@@ -114,9 +114,9 @@ class RelationList extends \common\libs\dataList\DataList implements DataListInt
     public function getFilterTypes() {
         if (!$this->filterTypes) {
             $this->filterTypes = [
-                'userName' => ['isUserTable' => false, 'name' => '会员编号'],
-                'deep' => ['isUserTable' => false, 'name' => '深度'],
-                'periodNum' => ['isUserTable' => false, 'name' => '期数'],
+                'userName' => ['isUserTable' => false, 'name' => 'Member code'],//会员编号
+                'deep' => ['isUserTable' => false, 'name' => 'depth'],//深度
+                'periodNum' => ['isUserTable' => false, 'name' => 'Number of periods'],//期数
             ];
         }
         return $this->filterTypes;

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

@@ -61,13 +61,13 @@ class PerfOrderList extends \common\libs\dataList\DataList implements DataListIn
         if(!$this->columns){
             $this->columns = [
                 'PERIOD_NUM' => [
-                    'header' => '结算期数',
+                    'header' => 'Number of settlement periods',//结算期数
                     'headerOther' => [
                         'width' => '100',
                     ],
                 ],
                 'SN' => [
-                    'header' => '业绩单编号',
+                    'header' => 'Performance sheet No',//业绩单编号
                     'value' => function($row) {
                         return "\t".$row['SN'];
                     },
@@ -76,53 +76,53 @@ class PerfOrderList extends \common\libs\dataList\DataList implements DataListIn
                     ],
                 ],
                 'DEC_TYPE' => [
-                    'header' => '业绩单类型',
+                    'header' => 'Performance sheet type',//业绩单类型
                     'headerOther' => [
                         'width' => '110',
                     ],
                     'value' => function($row){
                         $decTypes = [
-                            'ZC'=> '首购单',
-                            'YH'=> '优惠单',
-                            'ZG'=> '增购单',
-                            'LS'=> '零售单',
-                            'FX'=> '复销单',
+                            'ZC'=> 'First purchase order',//首购单
+                            'YH'=> 'Coupon',//优惠单
+                            'ZG'=> 'Additional purchase order',//增购单
+                            'LS'=> 'Retail order',//零售单
+                            'FX'=> 'Re sales order',//复销单
                         ];
                         return $decTypes[strtoupper($row['DEC_TYPE'])];
                     },
                 ],
                 'DEC_STATUS_NAME' => [
-                    'header' => '业绩单状态',
+                    'header' => 'Performance sheet status',//业绩单状态
                     'headerOther' => [
                         'width' => '110',
                     ],
                 ],
                 'USER_NAME' => [
-                    'header' => '会员编号',
+                    'header' => 'Member code',//会员编号
                     'headerOther' => [
                         'width' => '110',
                     ],
                 ],
                 'REAL_NAME' => [
-                    'header' => '会员姓名',
+                    'header' => 'Member name',//会员姓名
                     'headerOther' => [
                         'width' => '150',
                     ],
                 ],
                 'LAST_REC_USER_NAME' => [
-                    'header' => '结算时开拓者编号',
+                    'header' => 'Pioneer No. at settlement',//结算时开拓者编号
                     'headerOther' => [
                         'width' => '150',
                     ],
                 ],
                 'LAST_REC_REAL_NAME' => [
-                    'header' => '结算时开拓者姓名',
+                    'header' => 'Pioneer name at settlement',//结算时开拓者姓名
                     'headerOther' => [
                         'width' => '150',
                     ],
                 ],
                 'PV' => [
-                    'header' => '报单BV',
+                    'header' => 'Entry BV',//报单BV
                     'headerOther' => [
                         'width' => '150',
                     ],
@@ -133,7 +133,7 @@ class PerfOrderList extends \common\libs\dataList\DataList implements DataListIn
                     },
                 ],
                 'DEC_AMOUNT' => [
-                    'header' => '报单金额',
+                    'header' => 'Entry amount',//报单金额
                     'headerOther' => [
                         'width' => '150',
                     ],
@@ -144,13 +144,13 @@ class PerfOrderList extends \common\libs\dataList\DataList implements DataListIn
                     },
                 ],
                 'DEC_SN' => [
-                    'header' => '报单编号',
+                    'header' => 'Entry No',//报单编号
                     'headerOther' => [
                         'width' => '250',
                     ],
                 ],
                 'CREATED_AT' => [
-                    'header' => '创建时间',
+                    'header' => 'Creation time',//创建时间
                     'value' => function($row) {
                         return (new DateTime([
                             'value' => $row['CREATED_AT'],
@@ -171,18 +171,18 @@ class PerfOrderList extends \common\libs\dataList\DataList implements DataListIn
     {
         if(!$this->filterTypes){
             $this->filterTypes = [
-                'PERIOD_NUM'=> ['isUserTable'=> false, 'name'=> '结算期数'],
-                'SN'=> ['isUserTable'=> false, 'name'=> '业绩单编号'],
-                'DEC_STATUS_NAME'=> ['isUserTable'=> false, 'name'=> '业绩单状态','other'=> 'select',
-                 'selectData'=> [['id'=> 1, 'name'=> '已审核'], ['id'=> 2, 'name'=> '置废']],],
-                'USER_NAME'=> ['isUserTable'=> false, 'name'=> '会员编号'],
-                'REAL_NAME'=> ['isUserTable'=> false, 'name'=> '会员姓名'],
-                'LAST_REC_USER_NAME'=> ['isUserTable'=> false, 'name'=> '结算时开拓者编号'],
-                'LAST_REC_REAL_NAME'=> ['isUserTable'=> false, 'name'=> '结算时开拓者姓名'],
-                'PV'=> ['isUserTable'=> false, 'name'=> '报单BV'],
-                'DEC_AMOUNT'=> ['isUserTable'=> false, 'name'=> '报单金额'],
-                'DEC_SN'=> ['isUserTable'=> false, 'name'=> '报单编号'],
-                'CREATED_AT'=> ['isUserTable'=> true, 'name'=> '创建时间', 'other'=> 'date'],
+                'PERIOD_NUM'=> ['isUserTable'=> false, 'name'=> 'Number of settlement periods'],//结算期数
+                'SN'=> ['isUserTable'=> false, 'name'=> 'Performance sheet No'],//业绩单编号
+                'DEC_STATUS_NAME'=> ['isUserTable'=> false, 'name'=> 'Performance sheet status','other'=> 'select',
+                 'selectData'=> [['id'=> 1, 'name'=> 'Reviewed'], ['id'=> 2, 'name'=> 'Waste disposal']],],//业绩单状态,已审核,置废
+                'USER_NAME'=> ['isUserTable'=> false, 'name'=> 'Member code'],//会员编号
+                'REAL_NAME'=> ['isUserTable'=> false, 'name'=> 'Member name'],//会员姓名
+                'LAST_REC_USER_NAME'=> ['isUserTable'=> false, 'name'=> 'Pioneer No. at settlement'],//结算时开拓者编号
+                'LAST_REC_REAL_NAME'=> ['isUserTable'=> false, 'name'=> 'Pioneer name at settlement'],//结算时开拓者姓名
+                'PV'=> ['isUserTable'=> false, 'name'=> 'Entry BV'],//报单BV
+                'DEC_AMOUNT'=> ['isUserTable'=> false, 'name'=> 'Entry amount'],//报单金额
+                'DEC_SN'=> ['isUserTable'=> false, 'name'=> 'Entry No'],//报单编号
+                'CREATED_AT'=> ['isUserTable'=> true, 'name'=> 'Creation time', 'other'=> 'date'],//创建时间
             ];
         }
         return $this->filterTypes;

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

@@ -49,19 +49,19 @@ class UserPerfList extends \common\libs\dataList\DataList implements DataListInt
         if(!$this->columns){
             $this->columns = [
                 'USER_NAME' => [
-                    'header' => '会员编号',
+                    'header' => 'Member code',//会员编号
                     'headerOther' => [
                         'width' => '110',
                     ],
                 ],
                 'REAL_NAME' => [
-                    'header' => '会员姓名',
+                    'header' => 'Member name',//会员姓名
                     'headerOther' => [
                         'width' => '150',
                     ],
                 ],
                 'PV_PCS' => [
-                    'header' => '个人业绩',
+                    'header' => 'Personal performance',//个人业绩
                     'headerOther' => [
                         'width' => '150',
                     ],
@@ -72,7 +72,7 @@ class UserPerfList extends \common\libs\dataList\DataList implements DataListInt
                     },
                 ],
                 'SURPLUS_1L' => [
-                    'header' => '一市场剩余业绩',
+                    'header' => 'I. remaining market performance',//一市场剩余业绩
                     'headerOther' => [
                         'width' => '150',
                     ],
@@ -83,7 +83,7 @@ class UserPerfList extends \common\libs\dataList\DataList implements DataListInt
                     },
                 ],
                 'SURPLUS_2L' => [
-                    'header' => '二市场剩余业绩',
+                    'header' => 'II. remaining market performance',//二市场剩余业绩
                     'headerOther' => [
                         'width' => '150',
                     ],
@@ -93,19 +93,19 @@ class UserPerfList extends \common\libs\dataList\DataList implements DataListInt
                         ]))->result();
                     },
                 ],
-                'SURPLUS_3L' => [
-                    'header' => '三市场剩余业绩',
-                    'headerOther' => [
-                        'width' => '150',
-                    ],
-                    'value' => function($row) {
-                        return (new Price([
-                            'value' => $row['SURPLUS_3L'],
-                        ]))->result();
-                    },
-                ],
+//                'SURPLUS_3L' => [
+//                    'header' => '三市场剩余业绩',
+//                    'headerOther' => [
+//                        'width' => '150',
+//                    ],
+//                    'value' => function($row) {
+//                        return (new Price([
+//                            'value' => $row['SURPLUS_3L'],
+//                        ]))->result();
+//                    },
+//                ],
                 'SURPLUS_1L_ZC' => [
-                    'header' => '一市场报单剩余业绩',
+                    'header' => 'I. remaining performance of market declaration',//一市场报单剩余业绩
                     'headerOther' => [
                         'width' => '150',
                     ],
@@ -116,7 +116,7 @@ class UserPerfList extends \common\libs\dataList\DataList implements DataListInt
                     },
                 ],
                 'SURPLUS_2L_ZC' => [
-                    'header' => '二市场报单剩余业绩',
+                    'header' => 'II. remaining performance of market declaration',//二市场报单剩余业绩
                     'headerOther' => [
                         'width' => '150',
                     ],
@@ -126,19 +126,19 @@ class UserPerfList extends \common\libs\dataList\DataList implements DataListInt
                         ]))->result();
                     },
                 ],
-                'SURPLUS_3L_ZC' => [
-                    'header' => '三市场报单剩余业绩',
-                    'headerOther' => [
-                        'width' => '150',
-                    ],
-                    'value' => function($row) {
-                        return (new Price([
-                            'value' => $row['SURPLUS_3L_ZC'],
-                        ]))->result();
-                    },
-                ],
+//                'SURPLUS_3L_ZC' => [
+//                    'header' => '三市场报单剩余业绩',
+//                    'headerOther' => [
+//                        'width' => '150',
+//                    ],
+//                    'value' => function($row) {
+//                        return (new Price([
+//                            'value' => $row['SURPLUS_3L_ZC'],
+//                        ]))->result();
+//                    },
+//                ],
                 'VIP_SURPLUS_1L_ZC' => [
-                    'header' => '一市场VIP报单剩余业绩',
+                    'header' => 'I. remaining performance of VIP declaration in the market',//一市场VIP报单剩余业绩
                     'headerOther' => [
                         'width' => '150',
                     ],
@@ -149,7 +149,7 @@ class UserPerfList extends \common\libs\dataList\DataList implements DataListInt
                     },
                 ],
                 'VIP_SURPLUS_2L_ZC' => [
-                    'header' => '二市场VIP报单剩余业绩',
+                    'header' => 'II. remaining performance of VIP declaration in the market',//二市场VIP报单剩余业绩
                     'headerOther' => [
                         'width' => '150',
                     ],
@@ -159,19 +159,19 @@ class UserPerfList extends \common\libs\dataList\DataList implements DataListInt
                         ]))->result();
                     },
                 ],
-                'VIP_SURPLUS_3L_ZC' => [
-                    'header' => '三市场VIP报单剩余业绩',
-                    'headerOther' => [
-                        'width' => '150',
-                    ],
-                    'value' => function($row) {
-                        return (new Price([
-                            'value' => $row['VIP_SURPLUS_3L_ZC'],
-                        ]))->result();
-                    },
-                ],
+//                'VIP_SURPLUS_3L_ZC' => [
+//                    'header' => '三市场VIP报单剩余业绩',
+//                    'headerOther' => [
+//                        'width' => '150',
+//                    ],
+//                    'value' => function($row) {
+//                        return (new Price([
+//                            'value' => $row['VIP_SURPLUS_3L_ZC'],
+//                        ]))->result();
+//                    },
+//                ],
                 'PV_PSS_TOTAL' => [
-                    'header' => '累计团队业绩',
+                    'header' => 'Cumulative team performance',//累计团队业绩
                     'headerOther' => [
                         'width' => '150',
                     ],
@@ -194,7 +194,7 @@ class UserPerfList extends \common\libs\dataList\DataList implements DataListInt
     {
         if(!$this->filterTypes){
             $this->filterTypes = [
-                'USER_NAME'=> ['isUserTable'=> false, 'name'=> '会员编号'],
+                'USER_NAME'=> ['isUserTable'=> false, 'name'=> 'Member code'],//会员编号
             ];
         }
         return $this->filterTypes;

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

@@ -16,7 +16,7 @@ class DecOrderList extends \common\libs\dataList\DataList implements DataListInt
      * @return string
      */
     public function getListName(){
-        return 'Entry list';//报单列表
+        return 'Welcome Pack Listing';//报单列表
     }
 
     /**
@@ -72,11 +72,11 @@ class DecOrderList extends \common\libs\dataList\DataList implements DataListInt
                     'headerOther' => ['width' => '150'],
                 ],
                 'ID_CARD' => [
-                    'header' => 'Membership id number',//会员身份证号
+                    'header' => 'Identity No.',//会员身份证号
                     'headerOther' => ['width' => '150'],
                 ],
                 'MOBILE' => [
-                    'header' => 'Member mobile Phone Number',//会员手机号
+                    'header' => 'Member Phone Number',//会员手机号
                     'headerOther' => ['width' => '150'],
                 ],
                 'DEC_LV_NAME' => [
@@ -149,37 +149,37 @@ class DecOrderList extends \common\libs\dataList\DataList implements DataListInt
                     },
                 ],
                 'REC_USER_NAME' => [
-                    'header' => '报单时开拓者',//报单时开拓者
+                    'header' => 'Entry pioneer',//报单时开拓者
                     'headerOther' => ['width' => '150'],
                 ],
                 'REC_REAL_NAME' => [
-                    'header' => '报单时开拓者姓名',
+                    'header' => 'Entry pioneer name',//报单时开拓者姓名
                     'headerOther' => ['width' => '150'],
                 ],
                 'CON_USER_NAME' => [
-                    'header' => '报单时上级',
+                    'header' => 'Entry superior',//报单时上级
                     'headerOther' => ['width' => '150'],
                 ],
                 'CON_REAL_NAME' => [
-                    'header' => '报单时上级姓名',
+                    'header' => 'Entry superior name',//报单时上级姓名
                     'headerOther' => ['width' => '150'],
                 ],
                 'PROVINCE' => [
-                    'header' => '省',
+                    'header' => 'state',//省
                     'headerOther' => ['width' => '120'],
                     'value' => function ($row) use($regionConfig) {
                         return $regionConfig[$row['PROVINCE']]['REGION_NAME'] ?? '';
                     },
                 ],
                 'CITY' => [
-                    'header' => '市',
+                    'header' => 'local government area',//市
                     'headerOther' => ['width' => '120'],
                     'value' => function ($row) use($regionConfig) {
                         return $regionConfig[$row['CITY']]['REGION_NAME'] ?? '';
                     },
                 ],
                 'COUNTY' => [
-                    'header' => '区',
+                    'header' => 'city',//区
                     'headerOther' => ['width' => '120'],
                     'value' => function ($row) use($regionConfig) {
                         return $regionConfig[$row['COUNTY']]['REGION_NAME'] ?? '';
@@ -238,8 +238,8 @@ class DecOrderList extends \common\libs\dataList\DataList implements DataListInt
                 'TO_USER_NAME'=> ['name'=> 'Entry Member code'],//被报单人
                 'REAL_NAME'=> ['name'=> 'Member name'],//会员姓名
                 'DEC_REAL_NAME'=> ['name'=> 'Entry name'],//报单中心姓名
-                'ID_CARD'=> ['name'=> 'Membership id number'],//会员身份证号
-                'MOBILE'=> ['name'=> 'Member mobile Phone Number'],//会员手机号
+                'ID_CARD'=> ['name'=> 'Identity No.'],//会员身份证号
+                'MOBILE'=> ['name'=> 'Member Phone Number'],//会员手机号
                 'DEC_LV_NAME'=> ['name'=> 'Member Levels', 'other'=> 'decLevel'],//会员级别
                 'DEC_AMOUNT'=> ['name'=> 'Entry amount'],//报单金额
                 'DEC_PV'=> ['name'=> 'Entry BV'],//报单BV

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

@@ -44,63 +44,63 @@ class OrderDecList extends \common\libs\dataList\DataList implements DataListInt
         if(!$this->columns){
             $this->columns = [
                 'PERIOD_NUM' => [
-                    'header' => '期数',
+                    'header' => 'Number of periods',//期数
                 ],
                 'USER_NAME' => [
-                    'header' => '会员编号',
+                    'header' => 'Member code',//会员编号
                     'headerOther' => ['width' => '120'],
                 ],
                 'SN' => [
-                    'header' => '订单号',
+                    'header' => 'SN',//订单号
                     'headerOther' => ['width' => '200'],
                 ],
                 'CONSIGNEE' => [
-                    'header' => '收货人',
+                    'header' => 'consignee',//收货人
                     'headerOther' => [
                         'width' => '150',
                     ],
                 ],
                 'MOBILE' => [
-                    'header' => '联系方式1',
+                    'header' => 'Contact 1',//联系方式1
                     'headerOther' => [
                         'width' => '150',
                     ],
                 ],
                 'TEL' => [
-                    'header' => '联系方式2',
+                    'header' => 'Contact 2',//联系方式2
                 ],
                 'PROVINCE' => [
-                    'header' => '省',
+                    'header' => 'state',//州
                     'headerOther' => ['width' => '120'],
                     'value' => function ($row) use($regionConfig) {
                         return $regionConfig[$row['PROVINCE']]['REGION_NAME'] ?? '';
                     },
                 ],
                 'CITY' => [
-                    'header' => '市',
+                    'header' => 'local government area',//地方政府
                     'headerOther' => ['width' => '120'],
                     'value' => function ($row) use($regionConfig) {
                         return $regionConfig[$row['CITY']]['REGION_NAME'] ?? '';
                     },
                 ],
                 'COUNTY' => [
-                    'header' => '区',
+                    'header' => 'city',//市
                     'headerOther' => ['width' => '120'],
                     'value' => function ($row) use($regionConfig) {
                         return $regionConfig[$row['COUNTY']]['REGION_NAME'] ?? '';
                     },
                 ],
                 'ADDRESS' => [
-                    'header' => '详细地址',
+                    'header' => 'Detailed address',//详细地址
                     'headerOther' => [
                         'width' => '300',
                     ],
                 ],
                 'WAREHOUSE' => [
-                    'header' => '发货仓',
+                    'header' => 'Delivery warehouse',//发货仓
                 ],
                 'CREATED_AT' => [
-                    'header' => '创建时间',
+                    'header' => 'Creation time',//创建时间
                     'value' => function ($row) {
                         return (new DateTime([
                             'value' => $row['CREATED_AT'],
@@ -109,7 +109,7 @@ class OrderDecList extends \common\libs\dataList\DataList implements DataListInt
                     'headerOther' => ['width' => '190'],
                 ],
                 'PAY_AMOUNT' => [
-                    'header' => '支付金额',
+                    'header' => 'Payment amount',//支付金额
                     'headerOther' => [
                         'width' => '150',
                     ],
@@ -121,7 +121,7 @@ class OrderDecList extends \common\libs\dataList\DataList implements DataListInt
                     ],
                 ],
                 'PAY_PV' => [
-                    'header' => '支付BV',
+                    'header' => 'Pay BV',//支付BV
                     'headerOther' => [
                         'width' => '150',
                     ],
@@ -133,7 +133,7 @@ class OrderDecList extends \common\libs\dataList\DataList implements DataListInt
                     ],
                 ],
                 'PAY_AT' => [
-                    'header' => '支付时间',
+                    'header' => 'Payment time',//支付时间
                     'value' => function ($row) {
                         return (new DateTime([
                             'value' => $row['PAY_AT'],
@@ -142,7 +142,7 @@ class OrderDecList extends \common\libs\dataList\DataList implements DataListInt
                     'headerOther' => ['width' => '190'],
                 ],
                 'DELIVERY_AT' => [
-                    'header' => '发货时间',
+                    'header' => 'Delivery time',//发货时间
                     'value' => function ($row) {
                         return (new DateTime([
                             'value' => $row['DELIVERY_AT'],
@@ -151,7 +151,7 @@ class OrderDecList extends \common\libs\dataList\DataList implements DataListInt
                     'headerOther' => ['width' => '190'],
                 ],
                 'PAY_FREIGHT' => [
-                    'header' => '运费',
+                    'header' => 'freight',//运费
                     'headerOther' => [
                         'width' => '150',
                     ],
@@ -165,22 +165,22 @@ class OrderDecList extends \common\libs\dataList\DataList implements DataListInt
                     },
                 ],
                 'EXPRESS_COMPANY' => [
-                    'header' => '快递公司',
+                    'header' => 'Courier Services Company',//快递公司
                     'headerOther' => ['width' => '150'],
                 ],
                 'ORDER_TRACK_NO' => [
-                    'header' => '快递单号',
+                    'header' => 'courier number',//快递单号
                     'headerOther' => ['width' => '200'],
                 ],
                 'EXPRESS_TYPE' => [
-                    'header' => '发货方式',
+                    'header' => 'Shipping method',//发货方式
                     'headerOther' => ['width' => '150'],
                     'value' => function ($row) {
-                        return $row['EXPRESS_TYPE']==0 ? '邮寄' : '自提';
+                        return $row['EXPRESS_TYPE']==0 ? 'mailing ':' auto pick ';//'邮寄' : '自提'
                     },
                 ],
                 'FRONT_REMARK' => [
-                    'header' => '会员备注',
+                    'header' => 'Member notes',//会员备注
                     'headerOther' => [
                         'width' => '200',
                     ],
@@ -204,10 +204,10 @@ class OrderDecList extends \common\libs\dataList\DataList implements DataListInt
     {
         if(!$this->filterTypes){
             $this->filterTypes = [
-                'SN'=> ['name'=> '订单编号'],
-                'USER_NAME'=> ['name'=> '会员编号'],
-                'PERIOD_NUM'=> ['name'=> '期数'],
-                'CREATED_AT'=> ['name'=> '创建时间', 'other'=>'date'],
+                'SN'=> ['name'=> 'Order No'],//订单编号
+                'USER_NAME'=> ['name'=> 'Member code'],//会员编号
+                'PERIOD_NUM'=> ['name'=> 'Number of periods'],//期数
+                'CREATED_AT'=> ['name'=> 'Creation time', 'other'=>'date'],//创建时间
             ];
         }
         return $this->filterTypes;

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

@@ -53,28 +53,28 @@ class OrderList extends \common\libs\dataList\DataList implements DataListInterf
         if(!$this->columns){
             $this->columns = [
                 'USER_NAME' => [
-                    'header' => '会员编号',
+                    'header' => 'Member code',//会员编号
                     'headerOther' => ['width' => '120'],
                 ],
                 'DEC_USER_NAME' => [
-                    'header' => '报单中心',
+                    'header' => 'Entry Center',//报单中心
                     'headerOther' => ['width' => '120'],
                 ],
                 'CREATE_USER' => [
-                    'header' => '创建人编号',
+                    'header' => 'Creator No',//创建人编号
                     'headerOther' => ['width' => '120'],
                 ],
                 'CREATE_USER_NAME' => [
-                    'header' => '创建人姓名',
+                    'header' => 'Creator name',//创建人姓名
                     'headerOther' => ['width' => '120'],
                 ],
                 'SN' => [
-                    'header' => '订单号',
+                    'header' => 'SN',//订单号
                     'headerOther' => ['width' => '200'],
                 ],
                 'STATUS' => null,
                 'STATUS_NAME' => [
-                    'header' => '订单状态',
+                    'header' => 'Order status',//订单状态
                     'headerOther' => [
                         'width' => '110',
                     ],
@@ -83,48 +83,48 @@ class OrderList extends \common\libs\dataList\DataList implements DataListInterf
                     },
                 ],
                 'SKU_CODE' => [
-                    'header' => '存货编码',
+                    'header' => 'Inventory code',//存货编码
                     'headerOther' => ['width' => '150'],
                 ],
                 'GOODS_TITLE' => [
-                    'header' => '存货名称',
+                    'header' => 'Inventory name',//存货名称
                     'headerOther' => ['width' => '200'],
                 ],
                 'BUY_NUMS' => [
-                    'header' => '数量',
+                    'header' => 'quantity',//数量
                     'headerOther' => ['width' => '100'],
                 ],
                 'CONSIGNEE' => [
-                    'header' => '收货人',
+                    'header' => 'consignee',//收货人
                     'headerOther' => [
                         'width' => '150',
                     ],
                 ],
                 'MOBILE' => [
-                    'header' => '联系方式1',
+                    'header' => 'Contact 1',//联系方式1
                     'headerOther' => [
                         'width' => '150',
                     ],
                 ],
                 'TEL' => [
-                    'header' => '联系方式2',
+                    'header' => 'Contact 2',//联系方式2
                 ],
                 'PROVINCE' => [
-                    'header' => '省',
+                    'header' => 'state',//州
                     'headerOther' => ['width' => '120'],
                     'value' => function ($row) use($regionConfig) {
                         return $regionConfig[$row['PROVINCE']]['REGION_NAME'] ?? '';
                     },
                 ],
                 'CITY' => [
-                    'header' => '市',
+                    'header' => 'local government area',//地方政府
                     'headerOther' => ['width' => '120'],
                     'value' => function ($row) use($regionConfig) {
                         return $regionConfig[$row['CITY']]['REGION_NAME'] ?? '';
                     },
                 ],
                 'COUNTY' => [
-                    'header' => '区',
+                    'header' => 'city',//市
                     'headerOther' => ['width' => '120'],
                     'value' => function ($row) use($regionConfig) {
                         return $regionConfig[$row['COUNTY']]['REGION_NAME'] ?? '';
@@ -151,31 +151,31 @@ class OrderList extends \common\libs\dataList\DataList implements DataListInterf
 //                    ],
 //                ],
                 'ADDRESS' => [
-                    'header' => '详细地址',
+                    'header' => 'Detailed address',//详细地址
                     'headerOther' => [
                         'width' => '300',
                     ],
                 ],
                 'PERIOD_NUM' => [
-                    'header' => '期数',
+                    'header' => 'Number of periods',//期数
                 ],
                 'ORDER_TYPE' => [
-                    'header' => '订单类型',
+                    'header' => 'Order type',//订单类型
                     'headerOther' => ['width' => '120'],
                     'value' => function ($row) {
                             if($row['ORDER_TYPE']=='ZC'){
-                                $orderType = '报单';
+                                $orderType = 'declaration form';
                             }else{
-                                $orderType = ($row['PAY_TYPE']=='cash') ? '重消' : '积分';
+                                $orderType = ($row['PAY_TYPE']=='cash') ? 'Cancel again': 'integral';//'重消' : '积分'
                             }
                         return $orderType;
                     },
                 ],
                 'WAREHOUSE' => [
-                    'header' => '发货仓',
+                    'header' => 'Delivery warehouse',//发货仓
                 ],
                 'CREATED_AT' => [
-                    'header' => '创建时间',
+                    'header' => 'Creation time',//创建时间
                     'value' => function ($row) {
                         return (new DateTime([
                             'value' => $row['CREATED_AT'],
@@ -184,7 +184,7 @@ class OrderList extends \common\libs\dataList\DataList implements DataListInterf
                     'headerOther' => ['width' => '190'],
                 ],
                 'PAY_AT' => [
-                    'header' => '支付时间',
+                    'header' => 'Payment time',//支付时间
                     'value' => function ($row) {
                         return (new DateTime([
                             'value' => $row['PAY_AT'],
@@ -193,7 +193,7 @@ class OrderList extends \common\libs\dataList\DataList implements DataListInterf
                     'headerOther' => ['width' => '190'],
                 ],
                 'DELIVERY_AT' => [
-                    'header' => '发货时间',
+                    'header' => 'Delivery time',//发货时间
                     'value' => function ($row) {
                         return (new DateTime([
                             'value' => $row['DELIVERY_AT'],
@@ -203,7 +203,7 @@ class OrderList extends \common\libs\dataList\DataList implements DataListInterf
                 ],
                 'PAY_TYPE' => null,
                 'REAL_PRICE' => [
-                    'header' => '商品单价',
+                    'header' => 'item pricing',//商品单价
                     'headerOther' => [
                         'width' => '150',
                     ],
@@ -217,7 +217,7 @@ class OrderList extends \common\libs\dataList\DataList implements DataListInterf
                     },
                 ],
                 'REAL_PV' => [
-                    'header' => '商品金额',
+                    'header' => 'Commodity amount',//商品金额
                     'headerOther' => [
                         'width' => '150',
                     ],
@@ -231,7 +231,7 @@ class OrderList extends \common\libs\dataList\DataList implements DataListInterf
                     },
                 ],
                 'PAY_FREIGHT' => [
-                    'header' => '运费',
+                    'header' => 'freight',//运费
                     'headerOther' => [
                         'width' => '150',
                     ],
@@ -245,22 +245,22 @@ class OrderList extends \common\libs\dataList\DataList implements DataListInterf
                     },
                 ],
                 'EXPRESS_COMPANY' => [
-                    'header' => '快递公司',
+                    'header' => 'Courier Services Company',//快递公司
                     'headerOther' => ['width' => '150'],
                 ],
                 'ORDER_TRACK_NO' => [
-                    'header' => '快递单号',
+                    'header' => 'courier number',//快递单号
                     'headerOther' => ['width' => '200'],
                 ],
                 'EXPRESS_TYPE' => [
-                    'header' => '发货方式',
+                    'header' => 'Shipping method',//发货方式
                     'headerOther' => ['width' => '150'],
                     'value' => function ($row) {
-                        return $row['EXPRESS_TYPE']==0 ? '邮寄' : '自提';
+                        return $row['EXPRESS_TYPE']==0 ? 'mailing ':' auto pick ';//'邮寄' : '自提'
                     },
                 ],
                 'FRONT_REMARK' => [
-                    'header' => '会员备注',
+                    'header' => 'Member notes',//会员备注
                     'headerOther' => [
                         'width' => '200',
                     ],
@@ -273,7 +273,7 @@ class OrderList extends \common\libs\dataList\DataList implements DataListInterf
                 ],
                 'DELIVERY_STATUS' => null,
                 'DELIVERY_STATUS_NAME' => [
-                    'header' => '发货状态',
+                    'header' => 'Shipment status',//发货状态
                     'headerOther' => [
                         'width' => '110',
                     ],
@@ -294,11 +294,11 @@ class OrderList extends \common\libs\dataList\DataList implements DataListInterf
     {
         if(!$this->filterTypes){
             $this->filterTypes = [
-                'SN'=> ['name'=> '订单编号'],
-                'USER_NAME'=> ['name'=> '会员编号'],
-                'MOBILE'=> ['name'=> '联系方式1'],
-                'PERIOD_NUM'=> ['name'=> '期数'],
-                'CREATED_AT'=> ['name'=> '创建时间', 'other'=>'date'],
+                'SN'=> ['name'=> 'Order No'],//订单编号
+                'USER_NAME'=> ['name'=> 'Member code'],//会员编号
+                'MOBILE'=> ['name'=> 'Contact 1'],//联系方式1
+                'PERIOD_NUM'=> ['name'=> 'Number of periods'],//期数
+                'CREATED_AT'=> ['name'=> 'Creation time', 'other'=>'date'],//创建时间
             ];
         }
         return $this->filterTypes;

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

@@ -47,70 +47,70 @@ class OrderShopList extends \common\libs\dataList\DataList implements DataListIn
         if(!$this->columns){
             $this->columns = [
                 'PERIOD_NUM' => [
-                    'header' => '期数',
+                    'header' => 'Number of periods',//期数
                 ],
                 'USER_NAME' => [
-                    'header' => '会员编号',
+                    'header' => 'Member code',//会员编号
                     'headerOther' => ['width' => '120'],
                 ],
                 'SN' => [
-                    'header' => '订单号',
+                    'header' => 'SN',//订单号
                     'headerOther' => ['width' => '200'],
                 ],
                 'PAY_TYPE' => [
-                    'header' => '订单类型',
+                    'header' => 'Order type',//订单类型
                     'headerOther' => ['width' => '120'],
                     'value' => function ($row) {
-                        return $row['PAY_TYPE']=='cash' ? '重消订单' : '积分订单';
+                        return $row['PAY_TYPE']=='cash' ? 'cancel order again': 'point order';//'重消订单' : '积分订单'
                     },
                 ],
                 'CONSIGNEE' => [
-                    'header' => '收货人',
+                    'header' => 'consignee',//收货人
                     'headerOther' => [
                         'width' => '150',
                     ],
                 ],
                 'MOBILE' => [
-                    'header' => '联系方式1',
+                    'header' => 'Contact 1',//联系方式1
                     'headerOther' => [
                         'width' => '150',
                     ],
                 ],
                 'TEL' => [
-                    'header' => '联系方式2',
+                    'header' => 'Contact 2',//联系方式1
                 ],
                 'PROVINCE' => [
-                    'header' => '省',
+                    'header' => 'state',//州
                     'headerOther' => ['width' => '120'],
                     'value' => function ($row) use($regionConfig) {
                         return $regionConfig[$row['PROVINCE']]['REGION_NAME'] ?? '';
                     },
                 ],
                 'CITY' => [
-                    'header' => '市',
+                    'header' => 'local government area',//地方政府
                     'headerOther' => ['width' => '120'],
                     'value' => function ($row) use($regionConfig) {
                         return $regionConfig[$row['CITY']]['REGION_NAME'] ?? '';
                     },
                 ],
                 'COUNTY' => [
-                    'header' => '区',
+                    'header' => 'city',//市
                     'headerOther' => ['width' => '120'],
                     'value' => function ($row) use($regionConfig) {
                         return $regionConfig[$row['COUNTY']]['REGION_NAME'] ?? '';
                     },
                 ],
                 'ADDRESS' => [
-                    'header' => '详细地址',
+                    'header' => 'Detailed address',//详细地址
                     'headerOther' => [
                         'width' => '300',
                     ],
                 ],
                 'WAREHOUSE' => [
-                    'header' => '发货仓',
+                    'header' => 'Delivery warehouse',//发货仓
                 ],
                 'CREATED_AT' => [
-                    'header' => '创建时间',
+                    'header' => 'Creation time',//创建时间
                     'value' => function ($row) {
                         return (new DateTime([
                             'value' => $row['CREATED_AT'],
@@ -119,7 +119,7 @@ class OrderShopList extends \common\libs\dataList\DataList implements DataListIn
                     'headerOther' => ['width' => '190'],
                 ],
                 'PAY_AMOUNT' => [
-                    'header' => '支付金额',
+                    'header' => 'Payment amount',//支付金额
                     'headerOther' => [
                         'width' => '150',
                     ],
@@ -131,7 +131,7 @@ class OrderShopList extends \common\libs\dataList\DataList implements DataListIn
                     ],
                 ],
                 'PAY_PV' => [
-                    'header' => '支付BV',
+                    'header' => 'Pay BV',//支付BV
                     'headerOther' => [
                         'width' => '150',
                     ],
@@ -143,7 +143,7 @@ class OrderShopList extends \common\libs\dataList\DataList implements DataListIn
                     ],
                 ],
                 'PAY_AT' => [
-                    'header' => '支付时间',
+                    'header' => 'Payment time',//支付时间
                     'value' => function ($row) {
                         return (new DateTime([
                             'value' => $row['PAY_AT'],
@@ -152,7 +152,7 @@ class OrderShopList extends \common\libs\dataList\DataList implements DataListIn
                     'headerOther' => ['width' => '190'],
                 ],
                 'DELIVERY_AT' => [
-                    'header' => '发货时间',
+                    'header' => 'Delivery time',//发货时间
                     'value' => function ($row) {
                         return (new DateTime([
                             'value' => $row['DELIVERY_AT'],
@@ -161,7 +161,7 @@ class OrderShopList extends \common\libs\dataList\DataList implements DataListIn
                     'headerOther' => ['width' => '190'],
                 ],
                 'PAY_FREIGHT' => [
-                    'header' => '运费',
+                    'header' => 'freight',//运费
                     'headerOther' => [
                         'width' => '150',
                     ],
@@ -175,22 +175,22 @@ class OrderShopList extends \common\libs\dataList\DataList implements DataListIn
                     },
                 ],
                 'EXPRESS_COMPANY' => [
-                    'header' => '快递公司',
+                    'header' => 'Courier Services Company',//快递公司
                     'headerOther' => ['width' => '150'],
                 ],
                 'ORDER_TRACK_NO' => [
-                    'header' => '快递单号',
+                    'header' => 'courier number',//快递单号
                     'headerOther' => ['width' => '200'],
                 ],
                 'EXPRESS_TYPE' => [
-                    'header' => '发货方式',
+                        'header' => 'Shipping method',//发货方式
                     'headerOther' => ['width' => '150'],
                     'value' => function ($row) {
-                        return $row['EXPRESS_TYPE']==0 ? '邮寄' : '自提';
+                        return $row['EXPRESS_TYPE']==0 ? 'mailing ':' auto pick ' ;//'邮寄' : '自提'
                     },
                 ],
                 'FRONT_REMARK' => [
-                    'header' => '会员备注',
+                    'header' => 'Member notes',//会员备注
                     'headerOther' => [
                         'width' => '200',
                     ],
@@ -214,10 +214,10 @@ class OrderShopList extends \common\libs\dataList\DataList implements DataListIn
     {
         if(!$this->filterTypes){
             $this->filterTypes = [
-                'SN'=> ['name'=> '订单编号'],
-                'USER_NAME'=> ['name'=> '会员编号'],
-                'PERIOD_NUM'=> ['name'=> '期数'],
-                'CREATED_AT'=> ['name'=> '创建时间', 'other'=>'date'],
+                'SN'=> ['name'=> 'Order No'],//订单编号
+                'USER_NAME'=> ['name'=> 'Member number'],//会员编号
+                'PERIOD_NUM'=> ['name'=> 'Number of periods'],//期数
+                'CREATED_AT'=> ['name'=> 'Creation time', 'other'=>'date'],//创建时间
             ];
         }
         return $this->filterTypes;

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

@@ -48,70 +48,70 @@ class OrderStandardList extends \common\libs\dataList\DataList implements DataLi
         if(!$this->columns){
             $this->columns = [
                 'CALC_MONTH' => [
-                    'header' => '结算月',
+                    'header' => 'Settlement month',//结算月
                 ],
                 'USER_NAME' => [
-                    'header' => '会员编号',
+                    'header' => 'Member code',//会员编号
                     'headerOther' => ['width' => '120'],
                 ],
                 'SN' => [
-                    'header' => '订单号',
+                    'header' => 'SN',//订单号
                     'headerOther' => ['width' => '200'],
                 ],
                 'PAY_TYPE' => [
-                    'header' => '订单类型',
+                    'header' => 'order type',//订单类型
                     'headerOther' => ['width' => '120'],
                     'value' => function ($row) {
-                        return $row['PAY_TYPE']=='cash' ? '重消订单' : '积分订单';
+                        return $row['PAY_TYPE']=='cash' ? 'Cancel order again' : 'Points order';//'重消订单' : '积分订单'
                     },
                 ],
                 'CONSIGNEE' => [
-                    'header' => '收货人',
+                    'header' => 'consignee',//收货人
                     'headerOther' => [
                         'width' => '150',
                     ],
                 ],
                 'MOBILE' => [
-                    'header' => '联系方式1',
+                    'header' => 'Contact 1',//联系方式1
                     'headerOther' => [
                         'width' => '150',
                     ],
                 ],
                 'TEL' => [
-                    'header' => '联系方式2',
+                    'header' => 'Contact 2',//联系方式2
                 ],
                 'PROVINCE' => [
-                    'header' => '省',
+                    'header' => 'state',
                     'headerOther' => ['width' => '120'],
                     'value' => function ($row) use($regionConfig) {
                         return $regionConfig[$row['PROVINCE']]['REGION_NAME'] ?? '';
                     },
                 ],
                 'CITY' => [
-                    'header' => '市',
+                    'header' => 'local government area',//地方行政区
                     'headerOther' => ['width' => '120'],
                     'value' => function ($row) use($regionConfig) {
                         return $regionConfig[$row['CITY']]['REGION_NAME'] ?? '';
                     },
                 ],
                 'COUNTY' => [
-                    'header' => '区',
+                    'header' => 'city',//市
                     'headerOther' => ['width' => '120'],
                     'value' => function ($row) use($regionConfig) {
                         return $regionConfig[$row['COUNTY']]['REGION_NAME'] ?? '';
                     },
                 ],
                 'ADDRESS' => [
-                    'header' => '详细地址',
+                    'header' => 'Detailed address',//详细地址
                     'headerOther' => [
                         'width' => '300',
                     ],
                 ],
                 'WAREHOUSE' => [
-                    'header' => '发货仓',
+                    'header' => 'Delivery warehouse',//发货仓
                 ],
                 'CREATED_AT' => [
-                    'header' => '创建时间',
+                    'header' => 'Creation time',//创建时间
                     'value' => function ($row) {
                         return (new DateTime([
                             'value' => $row['CREATED_AT'],
@@ -120,7 +120,7 @@ class OrderStandardList extends \common\libs\dataList\DataList implements DataLi
                     'headerOther' => ['width' => '190'],
                 ],
                 'PAY_AMOUNT' => [
-                    'header' => '支付金额',
+                    'header' => 'Payment amount',//支付金额
                     'headerOther' => [
                         'width' => '150',
                     ],
@@ -132,7 +132,7 @@ class OrderStandardList extends \common\libs\dataList\DataList implements DataLi
                     ],
                 ],
                 'PAY_PV' => [
-                    'header' => '支付BV',
+                    'header' => 'Pay BV',//支付BV
                     'headerOther' => [
                         'width' => '150',
                     ],
@@ -144,7 +144,7 @@ class OrderStandardList extends \common\libs\dataList\DataList implements DataLi
                     ],
                 ],
                 'PAY_AT' => [
-                    'header' => '支付时间',
+                    'header' => 'Payment time',//支付时间
                     'value' => function ($row) {
                         return (new DateTime([
                             'value' => $row['PAY_AT'],
@@ -153,7 +153,7 @@ class OrderStandardList extends \common\libs\dataList\DataList implements DataLi
                     'headerOther' => ['width' => '190'],
                 ],
                 'DELIVERY_AT' => [
-                    'header' => '发货时间',
+                    'header' => 'Delivery time',//发货时间
                     'value' => function ($row) {
                         return (new DateTime([
                             'value' => $row['DELIVERY_AT'],
@@ -162,7 +162,7 @@ class OrderStandardList extends \common\libs\dataList\DataList implements DataLi
                     'headerOther' => ['width' => '190'],
                 ],
                 'PAY_FREIGHT' => [
-                    'header' => '运费',
+                    'header' => 'freight',//运费
                     'headerOther' => [
                         'width' => '150',
                     ],
@@ -176,22 +176,22 @@ class OrderStandardList extends \common\libs\dataList\DataList implements DataLi
                     },
                 ],
                 'EXPRESS_COMPANY' => [
-                    'header' => '快递公司',
+                    'header' => 'Courier Services Company',//快递公司
                     'headerOther' => ['width' => '150'],
                 ],
                 'ORDER_TRACK_NO' => [
-                    'header' => '快递单号',
+                    'header' => 'courier number',//快递单号
                     'headerOther' => ['width' => '200'],
                 ],
                 'EXPRESS_TYPE' => [
-                    'header' => '发货方式',
+                    'header' => 'Shipping method',//发货方式
                     'headerOther' => ['width' => '150'],
                     'value' => function ($row) {
-                        return $row['EXPRESS_TYPE']==0 ? '邮寄' : '自提';
+                        return $row['EXPRESS_TYPE']==0 ? 'mailing ':' auto pick ';//'邮寄' : '自提'
                     },
                 ],
                 'FRONT_REMARK' => [
-                    'header' => '会员备注',
+                    'header' => 'Member notes',//会员备注
                     'headerOther' => [
                         'width' => '200',
                     ],
@@ -215,10 +215,10 @@ class OrderStandardList extends \common\libs\dataList\DataList implements DataLi
     {
         if(!$this->filterTypes){
             $this->filterTypes = [
-                'SN'=> ['name'=> '订单编号'],
-                'USER_NAME'=> ['name'=> '会员编号'],
-                'PERIOD_NUM'=> ['name'=> '期数'],
-                'CREATED_AT'=> ['name'=> '创建时间', 'other'=>'date'],
+                'SN'=> ['name'=> 'Order No'],//订单编号
+                'USER_NAME'=> ['name'=> 'Member code'],//会员编号
+                'PERIOD_NUM'=> ['name'=> 'Number of periods'],//期数
+                'CREATED_AT'=> ['name'=> 'Creation time', 'other'=>'date'],//创建时间
             ];
         }
         return $this->filterTypes;

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

@@ -90,11 +90,11 @@ class IndexList extends \common\libs\dataList\DataList implements DataListInterf
                 'USER_ID' => null, // 这种传输方式主要是用于索引，因为过滤后的字段可能没有这种ID，但是一些功能的操作还需要用这种ID去关联，例如前台会员列表中的勾选批量状态管理，这里需要的就是USER_ID
                 'BTF_URL' => null,
                 'USER_NAME' => [
-                    'header' => '会员编号',
+                    'header' => 'Member code',//会员编号
                     'headerOther' => ['width' => '150'],
                 ],
                 'REAL_NAME' => [
-                    'header' => '会员姓名',
+                    'header' => 'Member name',//会员姓名
                     'headerOther' => [
                         'width' => '120',
                     ],
@@ -103,22 +103,22 @@ class IndexList extends \common\libs\dataList\DataList implements DataListInterf
                     ],
                 ],
                 'LOGIN_STATUS_NAME' => [
-                    'header' => '登录状态',
+                    'header' => 'Login status',//登录状态
                     'value' => function($row) {
-                        return $row['ALLOW_LOGIN'] == 1 ? '允许登录' : '禁止登录';
+                        return $row['ALLOW_LOGIN'] == 1 ? 'allow Login': 'prohibit Login';//'允许登录' : '禁止登录'
                     },
                     'headerOther' => ['width' => '110'],
                 ],
                 'STATUS' => [
-                    'header' => '状态',
+                    'header' => 'status',//状态
                     'value' => function($row) {
-                        return $row['STATUS'] == 1 ? '激活' : '锁定';
+                        return $row['STATUS'] == 1 ? 'activate': 'lock';//'激活' : '锁定'
                     },
                     'headerOther' => ['width' => '110'],
                 ],
-                'ALLOW_LOGIN' => ['header' => '筛选允许登录','hidden'=>true],
+                'ALLOW_LOGIN' => ['header' => 'Filter allow login','hidden'=>true],//筛选允许登录
                 'CREATED_AT' => [
-                    'header' => '加入日期',
+                    'header' => 'Date of accession',//加入日期
                     'value' => function($row) {
                         return (new DateTime([
                             'value' => $row['CREATED_AT'],
@@ -126,9 +126,9 @@ class IndexList extends \common\libs\dataList\DataList implements DataListInterf
                     },
                     'headerOther' => ['width' => '170'],
                 ],
-                'PERIOD_AT' => '加入期数',
+                'PERIOD_AT' => 'Number of joining periods',//加入期数
                 'DEC_LV_NAME' => [
-                    'header' => '实时会员级别',
+                    'header' => 'Real time membership level',//实时会员级别
                     'headerOther' => [
                         'width' => '110',
                     ],
@@ -140,7 +140,7 @@ class IndexList extends \common\libs\dataList\DataList implements DataListInterf
                     ],
                 ],
                 'DEC_LV_UPDATED_AT' => [
-                    'header' => '实时调整日期',
+                    'header' => 'Real time adjustment date',//实时调整日期
                     'value' => function($row) {
                         return (new DateTime([
                             'value' => $row['DEC_LV_UPDATED_AT'],
@@ -149,7 +149,7 @@ class IndexList extends \common\libs\dataList\DataList implements DataListInterf
                     'headerOther' => ['width' => '170'],
                 ],
                 'LAST_DEC_LV_NAME' => [
-                    'header' => '结算时会员级别',
+                    'header' => 'Member level at settlement',//结算时会员级别
                     'headerOther' => [
                         'width' => '120',
                     ],
@@ -165,7 +165,7 @@ class IndexList extends \common\libs\dataList\DataList implements DataListInterf
                     ],
                 ],
                 'EMP_LV_NAME' => [
-                    'header' => '实时聘级',
+                    'header' => 'Real time employment',//实时聘级
                     'headerOther' => [
                         'width' => '130',
                     ],
@@ -192,33 +192,33 @@ class IndexList extends \common\libs\dataList\DataList implements DataListInterf
 //                    'headerOther' => ['width' => '210'],
 //                ],
                 'REC_USER_NAME' => [
-                    'header' => '推荐编号',
+                    'header' => 'Recommendation No',//推荐编号
                     'headerOther' => ['width' => '150'],
                 ],
                 'REC_REAL_NAME' => [
-                    'header' => '推荐姓名',
+                    'header' => 'Recommended name',//推荐姓名
                     'headerOther' => ['width' => '100'],
                 ],
                 'CON_USER_NAME' => [
-                    'header' => '安置编号',
+                    'header' => 'Placement No',//安置编号
                     'headerOther' => ['width' => '150'],
                 ],
                 'CON_REAL_NAME' => [
-                    'header' => '安置姓名',
+                    'header' => 'Placement name',//安置姓名
                     'headerOther' => ['width' => '100'],
                 ],
                 'RELATIVE_LOCATION' => [
-                    'header' => '安置区域',
+                    'header' => 'Resettlement area',//安置区域
                     'headerOther' => ['width' => '100'],
                 ],
                 'ID_TYPE' => [
-                    'header' => '证件类型',
+                    'header' => 'Document type',//证件类型
                     'value' => function($row) {
-                        return $row['ID_TYPE'] == 0 ? '身份证' : '';
+                        return $row['ID_TYPE'] == 0 ? 'Identity No.' : '';//'身份证' : ''
                     },
                 ],
                 'ID_CARD' => [
-                    'header' => '证件号码',
+                    'header' => 'Identification Number',//证件号码
                     'value' => function($row) {
                         return "\t".$row['ID_CARD'];
                     },
@@ -243,25 +243,25 @@ class IndexList extends \common\libs\dataList\DataList implements DataListInterf
 //                    },
 //                ],
                 'MOBILE' => [
-                    'header' => '手机号码',
+                    'header' => 'phone number',//手机号码
                     'value' => function($row) {
                         return "\t".$row['MOBILE'];
                     },
                     'headerOther' => ['width' => '120'],
                 ],
                 'TEL' => [
-                    'header' => '备用手机号码',
+                    'header' => 'Alternate Phone number​',//备用手机号码
                     'value' => function($row) {
                         return "\t".$row['TEL'];
                     },
                     'headerOther' => ['width' => '120'],
                 ],
                 'DEC_USER_NAME' => [
-                    'header' => '所属报单中心编号',
+                    'header' => 'No. of reporting center',//所属报单中心编号
                     'headerOther' => ['width' => '150'],
                 ],
                 'IS_DEC' => [
-                    'header' => '是否报单中心',
+                    'header' => 'Declaration center or not',//是否报单中心
                     'value' => function($row) {
                         return (new YesNo([
                             'value' => $row['IS_DEC'],
@@ -279,7 +279,7 @@ class IndexList extends \common\libs\dataList\DataList implements DataListInterf
                     },
                 ],
                 'IS_STUDIO' => [
-                    'header' => '是否工作室',
+                    'header' => 'Studio or not',//是否工作室
                     'value' => function($row) {
                         return (new YesNo([
                             'value' => $row['IS_STUDIO'],
@@ -297,7 +297,7 @@ class IndexList extends \common\libs\dataList\DataList implements DataListInterf
                     },
                 ],
                 'IS_ATLAS' => [
-                    'header' => '是否显示图谱',
+                    'header' => 'Whether the atlas is displayed',//是否显示图谱
                     'value' => function($row) {
                         return (new YesNo([
                             'value' => $row['IS_ATLAS'],
@@ -315,7 +315,7 @@ class IndexList extends \common\libs\dataList\DataList implements DataListInterf
                     },
                 ],
                 'IS_RECHARGE' => [
-                    'header' => '是否显示充值',
+                    'header' => 'Whether to display recharge',//是否显示充值
                     'value' => function($row) {
                         return (new YesNo([
                             'value' => $row['IS_RECHARGE'],
@@ -333,21 +333,21 @@ class IndexList extends \common\libs\dataList\DataList implements DataListInterf
                     },
                 ],
                 'DEC_ROLE_NAME' => [
-                    'header' => '报单中心级别',
+                    'header' => 'Entry center level',//报单中心级别
                     'headerOther' => ['width' => '110'],
                     'value' => function($row) use($decRoleConfig) {
                         return $decRoleConfig[$row['DEC_ROLE_ID']]['ROLE_NAME'] ?? '';
                     },
                 ],
                 'OPEN_BANK_NAME' => [
-                    'header' => '开户银行',
+                    'header' => 'Deposit bank',//开户银行
                     'headerOther' => ['width' => '110'],
                     'value' => function($row) use($openBankConfig) {
                         return $openBankConfig[$row['OPEN_BANK']]['BANK_NAME'] ?? '';
                     },
                 ],
                 'BANK_AREA' => [
-                    'header' => '银行地区',
+                    'header' => 'Banking region',//银行地区
                     'value' => function($row) use($regionConfig) {
                         $province = $regionConfig[$row['BANK_PROVINCE']]['REGION_NAME'] ?? '';
                         $city = $regionConfig[$row['BANK_CITY']]['REGION_NAME'] ?? '';
@@ -365,28 +365,28 @@ class IndexList extends \common\libs\dataList\DataList implements DataListInterf
                     ],
                 ],
                 'BANK_ADDRESS' => [
-                    'header' => '开户地址',
+                    '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' => '银行帐号',
+                    'header' => 'Bank account number',//银行帐号
                     'headerOther' => ['width' => '220'],
                     'value' => function($row) {
                         return "\t".$row['BANK_NO'];
                     },
                 ],
-                'SEX' => '性别',
+                'SEX' => 'Gender',//性别
                 'NATION_NAME' => [
-                    'header' => '民族',
+                    'header' => 'nation',//民族
                     'value' => function($row) {
                         return \Yii::$app->params['nation'][$row['NATION']]['name'] ?? '';
                     },
                 ],
                 'AREA' => [
-                    'header' => '常用地址',
+                    'header' => 'Common address',//常用地址
                     'value' => function($row) use($regionConfig) {
                         $province = $regionConfig[$row['PROVINCE']]['REGION_NAME'] ?? '';
                         $city = $regionConfig[$row['CITY']]['REGION_NAME'] ?? '';
@@ -404,7 +404,7 @@ class IndexList extends \common\libs\dataList\DataList implements DataListInterf
                     ],
                 ],
                 'ADDRESS' => [
-                    'header' => '身份证地址',
+                    'header' => 'ID card address',//身份证地址
                     'value' => function($row) {
                         return $row['ADDRESS'];
                     },
@@ -420,7 +420,7 @@ class IndexList extends \common\libs\dataList\DataList implements DataListInterf
 //                    },
 //                ],
                 'VERIFIED' => [
-                    'header' => '实名认证',
+                    'header' => 'Real name authentication',//实名认证
                     'value' => function($row) {
                         return (new YesNo([
                             'value' => $row['VERIFIED'],
@@ -438,7 +438,7 @@ class IndexList extends \common\libs\dataList\DataList implements DataListInterf
                     },
                 ],
                 'VERIFIED_AT' => [
-                    'header' => '实名认证日期',
+                    'header' => 'Real name certification date',//实名认证日期
                     'value' => function($row) {
                         return (new DateTime([
                             'value' => $row['VERIFIED_AT'],
@@ -501,16 +501,16 @@ class IndexList extends \common\libs\dataList\DataList implements DataListInterf
 //                    },
 //                ],
                 'BIRTHDAY' => [
-                    'header' => '生日',
+                    'header' => 'birthday',//生日
                     'value' => function($row) {
                         return date('Y-m-d', strtotime($row['BIRTHDAY']));
                     },
                     'headerOther' => ['width' => '110'],
                 ],
                 'ALLOW_TRANSFER' => [
-                    'header' => '转账功能开启',
+                    'header' => 'Transfer function enabled',//转账功能开启
                     'value' => function($row) {
-                        return $row['ALLOW_TRANSFER'] == 1 ? '开启' : '关闭';
+                        return $row['ALLOW_TRANSFER'] == 1 ? 'on': 'off';//'开启' : '关闭'
                     },
                     'headerOther' => function($row) {
                         return [
@@ -524,7 +524,7 @@ class IndexList extends \common\libs\dataList\DataList implements DataListInterf
                     },
                 ],
                 'DEC_CLOSED' => [
-                    'header' => '是否关闭报单',
+                    'header' => 'Close entry',//是否关闭报单
                     'value' => function($row) {
                         return (new YesNo([
                             'value' => $row['DEC_CLOSED'],
@@ -542,9 +542,9 @@ class IndexList extends \common\libs\dataList\DataList implements DataListInterf
                     },
                 ],
                 'IS_MODIFY_PASSWORD' => [
-                    'header' => '密码修改状态',
+                    'header' => 'Password modification status',//密码修改状态
                     'value' => function($row) {
-                        return $row['IS_MODIFY_PASSWORD'] == 1 ? '开启' : '关闭';
+                        return $row['IS_MODIFY_PASSWORD'] == 1 ? 'on': 'off';//'开启' : '关闭'
                     },
                     'headerOther' => function($row) {
                         return [
@@ -570,39 +570,40 @@ class IndexList extends \common\libs\dataList\DataList implements DataListInterf
     {
         if(!$this->filterTypes){
             $this->filterTypes = [
-                'USER_NAME'=> ['name'=> '会员编号'],
-                'REAL_NAME'=> ['name'=> '会员姓名'],
+                'USER_NAME'=> ['name'=> 'Member code'],//会员编号
+                'REAL_NAME'=> ['name'=> 'Member name'],//会员姓名
 //                'ALLOW_LOGIN'=> ['name'=> '允许登录', 'other'=> 'yesOrNo'],
-                'CREATED_AT'=> ['name'=> '加入日期', 'other'=> 'date'],
-                'PERIOD_AT'=> ['name'=> '加入期数'],
-                'DEC_LV_NAME'=> ['name'=> '实时会员级别', 'other'=> 'decLevel'],
+                'CREATED_AT'=> ['name'=> 'Date of accession', 'other'=> 'date'],//加入日期
+                'PERIOD_AT'=> ['name'=> 'Number of joining periods'],//加入期数
+                'DEC_LV_NAME'=> ['name'=> 'Real time membership level', 'other'=> 'decLevel'],//实时会员级别
 //                'DEC_LV_UPDATED_AT'=> ['name'=> '实时调整日期', 'other'=> 'date'],
 //                'LAST_DEC_LV_NAME'=> ['name'=> '结算时会员级别', 'other'=> 'decLevel'],
-                'EMP_LV_NAME'=> ['name'=> '实时聘级', 'other'=> 'empLevel'],
+                'EMP_LV_NAME'=> ['name'=> 'Real time employment', 'other'=> 'empLevel'],//实时聘级
 //                'HIGHEST_EMP_LV_NAME'=> ['name'=> '历史最高聘级', 'other'=> 'empLevel'],
 //                'HIGHEST_EMP_LV_PERIOD'=> ['name'=> '首次达到历史最高聘级的期数'],
-                'REC_USER_NAME'=> ['name'=> '推荐编号'],
-                'CON_USER_NAME'=> ['name'=> '安置编号'],
+                'REC_USER_NAME'=> ['name'=> 'Recommendation No'],//推荐编号
+                'CON_USER_NAME'=> ['name'=> 'Placement No'],//安置编号
                 //'ID_TYPE'=> ['name'=> '证件类型', 'other'=> 'select', 'selectData'=> [['id'=> 0, 'name'=> '身份证']]],
-                'ID_CARD'=> ['name'=> '证件号码'],
+                'ID_CARD'=> ['name'=> 'Identification Number'],//证件号码
 //                'SPOUSE_NAME'=> ['name'=> '配偶姓名'],
 //                'SPOUSE_IDCARD'=> ['name'=> '配偶身份证号'],
 //                'SYSTEM_NAME'=> ['name'=> '体系名称', 'other'=> 'systems'],
 //                'SUB_COM_NAME'=> ['name'=> '所属分公司', 'other'=> 'subCompany'],
-                'MOBILE'=> ['name'=> '手机号码'],
+                'MOBILE'=> ['name'=> 'phone number'],//手机号码
 //                'TEL'=> ['name'=> '备用手机号码'],
-                'DEC_USER_NAME'=> ['name'=> '所属报单中心编号'],
-                'IS_DEC'=> ['name'=> '是否报单中心', 'other'=> 'yesOrNo'],
-                'IS_STUDIO'=> ['name'=> '是否工作室', 'other'=> 'yesOrNo'],
-                'DEC_ROLE_NAME'=> ['name'=> '报单中心级别', 'other'=> 'decRole'],
+                'DEC_USER_NAME'=> ['name'=> 'No. of reporting center'],//所属报单中心编号
+                'IS_DEC'=> ['name'=> 'Declaration center or not', 'other'=> 'yesOrNo'],//是否报单中心
+                'IS_STUDIO'=> ['name'=> 'Studio or not', 'other'=> 'yesOrNo'],//是否工作室
+                'DEC_ROLE_NAME'=> ['name'=> 'Entry center level', 'other'=> 'decRole'],//报单中心级别
 //                'OPEN_BANK_NAME'=> ['name'=> '开户银行', 'other'=> 'banks'],
 //                'BANK_AREA'=> ['name'=> '银行地区', 'other'=> 'area'],
 //                'BANK_ADDRESS'=> ['name'=> '开户地址'],
 //                'BANK_NO'=> ['name'=> '银行账号'],
 //                'SEX'=> ['name'=> '性别', 'other'=> 'sex'],
 //                'NATION_NAME'=> ['name'=> '民族', 'other'=> 'nations'],
-                'AREA'=> ['name'=> '常用地址', 'other'=> 'area'],
-                'STATUS'=> ['name'=> '激活状态', 'other'=> 'select', 'selectData'=> [['id'=> 0, 'name'=> '锁定'],['id'=> 1, 'name'=> '激活']]],
+                'AREA'=> ['name'=> 'Common address', 'other'=> 'area'],//常用地址
+                'STATUS'=> ['name'=> 'Active status', 'other'=> 'select', 'selectData'=> [['id'=> 0, 'name'=> 'locking'],['id'=> 1, 'name'=> 'activation']]],
+//                'STATUS'=> ['name'=> '激活状态', 'other'=> 'select', 'selectData'=> [['id'=> 0, 'name'=> '锁定'],['id'=> 1, 'name'=> '激活']]],
 //                'ADDRESS'=> ['name'=> '身份证地址'],
 //                'IS_AUTO_WITHDRAW'=> [
 //                    'isUserTable'=> false,

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

@@ -61,11 +61,11 @@ class MoveList extends \common\libs\dataList\DataList implements DataListInterfa
                 'ID' => null,
                 'USER_ID' => null,
                 'MOVE_USER_NAME' => [
-                    'header' => '移动的会员',
+                    'header' => 'Mobile members',//移动的会员
                     'headerOther' => ['width' => '150'],
                 ],
                 'MOVE_REAL_NAME' => [
-                    'header' => '移动的会员姓名',
+                    'header' => 'Mobile members name',//移动的会员名字
                     'headerOther' => [
                         'width' => '150',
                     ],
@@ -74,40 +74,40 @@ class MoveList extends \common\libs\dataList\DataList implements DataListInterfa
                     ],
                 ],
                 'FROM_USER_NAME' => [
-                    'header' => '移动前接点',
+                    'header' => 'Move front contact',//移动前接点
                     'headerOther' => ['width' => '150'],
                 ],
                 'TO_USER_NAME' => [
-                    'header' => '移动后接点',
+                    'header' => 'Moving rear contact',//移动后接点
                     'headerOther' => ['width' => '150'],
                 ],
                 'TYPE' => [
-                    'header' => '移网类型',
+                    'header' => 'Network transfer type',//移网类型
                     'headerOther' => [
                         'width' => '120',
                     ],
                     'value' => function($row) {
-                        return $row['TYPE'] == UserMove::TYPE_NETWORK ? '安置网络' : '开拓网络';
+                        return $row['TYPE'] == UserMove::TYPE_NETWORK ? 'placement network':'development network';//'安置网络' : '开拓网络'
                     },
                 ],
                 'LOCATION' => [
-                    'header' => '移动到位置',
+                    'header' => 'Move to position',//移动到位置
                     'headerOther' => ['width' => '150'],
                 ],
-                'PERIOD_NUM' => '移动时的期数',
+                'PERIOD_NUM' => 'Number of periods when moving',//移动时的期数
                 'IS_MOVING' => [
-                    'header' => '是否正在移动',
+                    'header' => 'Are you moving',//是否正在移动
                     'headerOther' => ['width' => '100'],
                 ],
                 'MOVE_PERCENT' => [
-                    'header' => '移动百分比',
+                    'header' => 'Movement percentage',//移动百分比
                 ],
                 'MOVE_ADMIN_NAME' => [
-                    'header' => '移网管理员',
+                    'header' => 'Mobile administrator',//移网管理员
                     'headerOther' => ['width' => '120'],
                 ],
                 'CREATED_AT' => [
-                    'header' => '加入日期',
+                    'header' => 'Date of accession',//加入日期
                     'value' => function($row) {
                         return (new DateTime([
                             'value' => $row['CREATED_AT'],
@@ -117,18 +117,18 @@ class MoveList extends \common\libs\dataList\DataList implements DataListInterfa
                 ],
                 'AUDIT_STATUS' => null,
                 'AUDIT_STATUS_NAME' => [
-                    'header' => '审核状态',
+                    'header' => 'Audit status',//审核状态
                     'headerOther' => ['width' => '100'],
                     'value' => function ($row) {
                         return UserMove::STATUS_NAME[$row['AUDIT_STATUS']];
                     },
                 ],
                 'AUDIT_ADMIN_NAME' => [
-                    'header' => '审核管理员',
+                    'header' => 'Audit administrator',//审核管理员
                     'headerOther' => ['width' => '100'],
                 ],
                 'AUDITED_AT' => [
-                    'header' => '审核时间',
+                    'header' => 'Audit time',//审核时间
                     'value' => function ($row) {
                         return (new DateTime([
                             'value' => $row['AUDITED_AT'],
@@ -149,17 +149,17 @@ class MoveList extends \common\libs\dataList\DataList implements DataListInterfa
     {
         if(!$this->filterTypes){
             $this->filterTypes = [
-                'MOVE_USER_NAME'=> ['isUserTable' => false,'name'=> '移动的会员'],
-                'MOVE_REAL_NAME'=> ['isUserTable' => false,'name'=> '移动的会员姓名'],
-                'filterStatus'=> ['isUserTable' => false,'name'=> '审核状态'],
+                'MOVE_USER_NAME'=> ['isUserTable' => false,'name'=> 'Mobile members'],//移动的会员
+                'MOVE_REAL_NAME'=> ['isUserTable' => false,'name'=> 'Mobile members name'],//移动的会员姓名
+                'filterStatus'=> ['isUserTable' => false,'name'=> 'Audit status'],//审核状态
 //                'moveType'=> ['isUserTable' => false,'name'=> '移网类型', 'other'=> 'select','selectData'=>UserMove::TYPE_NAME],
 //                'FROM_USER_NAME'=> ['isUserTable' => false,'name'=> '移动前接点'],
 //                'TO_USER_NAME'=> ['isUserTable' => false,'name'=> '移动后接点', 'other'=> 'decLevel'],
-                'PERIOD_NUM'=> ['isUserTable' => false,'name'=> '移动时的期数'],
-                'MOVE_ADMIN_NAME'=> ['isUserTable' => false,'name'=> '移网管理员'],
-                'AUDIT_ADMIN_NAME'=> ['isUserTable' => false,'name'=> '审核管理员'],
+                'PERIOD_NUM'=> ['isUserTable' => false,'name'=> 'Number of periods when moving'],//移动时的期数
+                'MOVE_ADMIN_NAME'=> ['isUserTable' => false,'name'=> 'Mobile administrator'],//移网管理员
+                'AUDIT_ADMIN_NAME'=> ['isUserTable' => false,'name'=> 'Audit administrator'],//审核管理员
 //                'CREATED_AT' => ['isUserTable' => false, 'name' => '申请时间', 'other' => 'date'],
-                'AUDITED_AT' => ['isUserTable' => false, 'name' => '审核时间', 'other' => 'date'],
+                'AUDITED_AT' => ['isUserTable' => false, 'name' => 'Audit time', 'other' => 'date'],//审核时间
             ];
         }
         return $this->filterTypes;

backendEle/src/router/index.js

@@ -46,10 +46,10 @@ export const constantRouterMap = [
         component: _import('shop/dec-order-list'),
         name: 'shop_dec-order-list',
         meta: {
-          title: '报单列表',
+          title: 'Welcome Pack Listing',//报单列表
           breadcrumb: [
-            {title: '首页', path: '/dashboard/index'},
-            {title: '商城管理', path: '/shop/dec-order-list'},
+            {title: 'Dashboard', path: '/dashboard/index'},//首页
+            {title: 'Products Management', path: '/shop/dec-order-list'},//商城管理
           ],
         },
       },
@@ -58,10 +58,10 @@ export const constantRouterMap = [
         component: _import('shop/order-list'),
         name: 'shop_order-list',
         meta: {
-          title: '订单列表',
+          title: 'order list',//订单列表
           breadcrumb: [
-            {title: '首页', path: '/dashboard/index'},
-            {title: '商城管理', path: '/shop/dec-order-list'},
+            {title: 'Dashboard', path: '/dashboard/index'},//首页
+            {title: 'Products Management', path: '/shop/dec-order-list'},//商城管理
           ],
         },
 
@@ -71,10 +71,10 @@ export const constantRouterMap = [
         component: _import('shop/order-shop-list'),
         name: 'shop_order_shop-list',
         meta: {
-          title: '外部商城订单列表',
+          title: 'External mall order list',//外部商城订单列表
           breadcrumb: [
-            {title: '首页', path: '/dashboard/index'},
-            {title: '商城管理', path: '/shop/dec-order-list'},
+            {title: 'Dashboard', path: '/dashboard/index'},//首页
+            {title: 'Products Management', path: '/shop/dec-order-list'},//商城管理
           ],
         },
 
@@ -84,10 +84,10 @@ export const constantRouterMap = [
             component: _import('shop/order-dec-list'),
             name: 'shop_order_dec-list',
             meta: {
-                title: '外部商城报单列表',
+                title: 'External mall entry list',//外部商城报单列表
                 breadcrumb: [
-                    {title: '首页', path: '/dashboard/index'},
-                    {title: '商城管理', path: '/shop/dec-order-list'},
+                    {title: 'Dashboard', path: '/dashboard/index'},//首页
+                    {title: 'Products Management', path: '/shop/dec-order-list'},//商城管理
                 ],
             },
 
@@ -97,10 +97,10 @@ export const constantRouterMap = [
         component: _import('shop/order-standard-list'),
         name: 'shop_order_standard-list',
         meta: {
-          title: '外部商城达标订单列表',
+          title: 'List of qualified orders of external mall',//外部商城达标订单列表
           breadcrumb: [
-            {title: '首页', path: '/dashboard/index'},
-            {title: '商城管理', path: '/shop/dec-order-list'},
+            {title: 'Dashboard', path: '/dashboard/index'},//首页
+            {title: 'Products Management', path: '/shop/dec-order-list'},//商城管理
           ],
         },
 
@@ -181,10 +181,10 @@ export const constantRouterMap = [
         component: _import('user/user-add-opt'),
         name: 'user_user-add-opt',
         meta: {
-          title: '空单操作',
+          title: 'Empty order operation',//空单操作
           breadcrumb: [
-            {title: '首页', path: '/dashboard/index'},
-            {title: '会员管理', path: '/user/index'},
+            {title: 'Dashboard', path: '/dashboard/index'},//首页
+            {title: 'Member management', path: '/user/index'},//会员管理
           ],
         },
       },
@@ -193,10 +193,10 @@ export const constantRouterMap = [
             component: _import('user/empty-list'),
             name: 'user_empty_list',
             meta: {
-                title: '空单列表',
+                title: 'Empty list',//空单列表
                 breadcrumb: [
-                    {title: '首页', path: '/dashboard/index'},
-                    {title: '会员管理', path: '/user/index'},
+                    {title: 'Dashboard', path: '/dashboard/index'},//首页
+                    {title: 'Member management', path: '/user/index'},//会员管理
                 ],
             },
         },
@@ -337,10 +337,10 @@ export const constantRouterMap = [
         component: _import('user/move'),
         name: 'user_move',
         meta: {
-          title: '移网管理',
+          title: 'Mobile network management',//移网管理
           breadcrumb: [
-            {title: '首页', path: '/dashboard/index'},
-            {title: '会员管理', path: '/user/index'},
+            {title: 'Dashboard', path: '/dashboard/index'},//首页
+            {title: 'Member management', path: '/user/index'},//会员管理
           ],
         },
       },
@@ -508,10 +508,10 @@ export const constantRouterMap = [
         component: _import('atlas/relation-opt'),
         name: 'atlas_relation-opt',
         meta: {
-          title: '开拓网络',
+          title: 'Expand network',//开拓网络
           breadcrumb: [
-            {title: '首页', path: '/dashboard/index'},
-            {title: '网络图谱', path: '/atlas/relation-opt'},
+            {title: 'Dashboard', path: '/dashboard/index'},//首页
+            {title: 'Network Atlas', path: '/atlas/relation-opt'},//网络图谱
           ],
         },
       },
@@ -520,10 +520,10 @@ export const constantRouterMap = [
         component: _import('atlas/network-opt'),
         name: 'atlas_network-opt',
         meta: {
-          title: '安置网络',
+          title: 'Resettlement network',//安置网络
           breadcrumb: [
-            {title: '首页', path: '/dashboard/index'},
-            {title: '网络图谱', path: '/atlas/relation-opt'},
+            {title: 'Dashboard', path: '/dashboard/index'},//首页
+            {title: 'Network Atlas', path: '/atlas/relation-opt'},//网络图谱
           ],
         },
       },
@@ -1097,10 +1097,10 @@ export const constantRouterMap = [
         component: _import('bonus/perf-order'),
         name: 'bonus_perf-order',
         meta: {
-          title: '业绩单',
+          title: 'Performance sheet',//业绩单
           breadcrumb: [
-            {title: '首页', path: '/dashboard/index'},
-            {title: '奖金管理', path: '/bonus/period'},
+            {title: 'Dashboard', path: '/dashboard/index'},//首页
+            {title: 'Bonus management', path: '/bonus/period'},//奖金管理
           ],
         },
       },
@@ -1181,10 +1181,10 @@ export const constantRouterMap = [
         component: _import('bonus/user-perf'),
         name: 'leo-user-perf-table',
         meta: {
-          title: '用户业绩',
+          title: 'User performance',//用户业绩
           breadcrumb: [
-            {title: '首页', path: '/dashboard/index'},
-            {title: '奖金管理', path: '/bonus/period'},
+            {title: 'Dashboard', path: '/dashboard/index'},//首页
+            {title: 'Bonus management', path: '/bonus/period'},//奖金管理
           ],
         },
       },

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

@@ -2,18 +2,18 @@
   <div v-loading="loading">
     <div class="white-box">
       <el-tabs v-model="tabActiveName">
-        <el-tab-pane label="安置网络图" name="first" v-if="permission.hasPermission(`atlas/network`)">
+        <el-tab-pane label="Resettlement network diagram" name="first" v-if="permission.hasPermission(`atlas/network`)"><!-- 安置网络图 -->
           <div class="filter-user" @keyup.enter="enterToGetData()">
             <el-input v-model="mainUserName" size="small" style="width:300px;">
-              <template slot="prepend">顶级会员</template>
+              <template slot="prepend">Top member<!-- 顶级会员 --></template>
             </el-input>
-            <el-input v-model="expandDeep" size="small" style="width:150px;">
-              <template slot="prepend">展开深度</template>
+            <el-input v-model="expandDeep" size="small" style="width:200px;">
+              <template slot="prepend">Spread depth<!-- 展开深度 --></template>
             </el-input>
             <el-input v-model="periodNum" size="small" style="width:150px;" v-show="false">
-              <template slot="prepend">期数</template>
+              <template slot="prepend">Number of periods<!-- 期数 --></template>
             </el-input>
-            <el-button type="primary" size="small" @click="getMainData()">确定</el-button>
+            <el-button type="primary" size="small" @click="getMainData()">confirm<!-- 确定 --></el-button>
           </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)">
@@ -22,22 +22,22 @@
                     <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>会员编号：{{ node.label }}</el-tag> <el-tag>姓名：{{data.REAL_NAME}}</el-tag> <el-tag type="danger">区位：{{data.RELATIVE_LOCATION}}</el-tag> <el-tag type="success">级别：{{data.DEC_LV_NAME}}</el-tag> <el-tag type="warning">聘级：{{data.EMP_LV_NAME}}</el-tag> <el-tag>加入期数：{{data.PERIOD_AT}}</el-tag></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>
           </el-tree>
         </el-tab-pane>
-        <el-tab-pane label="安置网络列表" name="two" v-if="permission.hasPermission(`user/network-list`)">
+        <el-tab-pane label="Placement network list" name="two" v-if="permission.hasPermission(`user/network-list`)"><!-- 安置网络列表 -->
           <div class="filter-user">
             <el-input v-model="filterForm.userName" size="small" style="width:300px;">
-              <template slot="prepend">会员编号</template>
+              <template slot="prepend"><!-- 会员编号 -->Member code</template>
             </el-input>
             <el-input v-model="filterForm.deep" size="small" style="width:150px;">
-              <template slot="prepend">深度</template>
+              <template slot="prepend"><!-- 深度 -->depth</template>
             </el-input>
             <el-input v-model="filterForm.periodNum" size="small" style="width:150px;" v-show="false">
-              <template slot="prepend">期数</template>
+              <template slot="prepend"><!-- 期数 -->Number of periods</template>
             </el-input>
-            <el-button type="primary" size="small" @click="handleFilter">确定</el-button>
+            <el-button type="primary" size="small" @click="handleFilter">confirm<!-- 确定 --></el-button>
           </div>
 
           <el-table :data="tableData" stripe style="width: 100%;" :height="tool.getTableHeight(true)">
@@ -53,7 +53,7 @@
                 </template>
                 <template v-else>
                   <template v-if="tableHeader.index === 'USER_NAME'">
-                    <el-tooltip class="item" effect="dark" content="查看该会员的下级" placement="top">
+                    <el-tooltip class="item" effect="dark" content="View the subordinates of this member" placement="top"><!-- 查看该会员的下级 -->
                     <el-button @click.native="handleShow(scope.row)" size="small" type="primary">
                       {{scope.row[tableHeader.index].value}}
                     </el-button>
@@ -68,7 +68,7 @@
           </el-table>
           <div class="white-box-footer">
             <el-button type="success" size="small" @click="handleExport"
-                       v-show="permission.hasPermission(`atlas/network-list-export`)">导出Excel
+                       v-show="permission.hasPermission(`atlas/network-list-export`)">Export Excel<!-- 导出Excel -->
             </el-button>
             <pagination :total="totalCount" :page_size="pageSize" @size-change="handleSizeChange" @current-change="handleCurrentChange"></pagination>
           </div>
@@ -130,7 +130,7 @@
     methods: {
       getData() {
         this.$message({
-          message: '正在获取数据，请稍后',
+          message: 'Getting data, please wait',//正在获取数据，请稍后
         })
         this.periodNum = baseInfo.nowPeriodNum()
         this.filterForm.periodNum = baseInfo.nowPeriodNum()
@@ -150,7 +150,7 @@
       getMainData (userName = null, getList = false) {
         this.$message.closeAll()
         this.$message({
-          message: '正在获取数据，请稍后',
+          message: 'Getting data, please wait',//正在获取数据，请稍后
         })
         let thisObj = this
         let requestData = {
@@ -224,9 +224,9 @@
         //this.getData(this.currentPage, this.pageSize, false)
       },
       handleExport(){
-        this.$confirm(`确定要导出当前数据吗？`, '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
+        this.$confirm(`Are you sure you want to export the current data？`, 'Hint', {//`确定要导出当前数据吗？`, '提示'
+          confirmButtonText: 'confirm',//确定
+          cancelButtonText: 'cancel',//取消
           type: 'warning'
         }).then(() => {
           return network.getData(`atlas/network-list-export`, this.filterForm)

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

@@ -2,18 +2,18 @@
   <div v-loading="loading">
     <div class="white-box">
       <el-tabs v-model="tabActiveName">
-        <el-tab-pane label="开拓网络图" name="first" v-if="permission.hasPermission(`atlas/relation`)">
+        <el-tab-pane label="Development network diagram" name="first" v-if="permission.hasPermission(`atlas/relation`)"><!-- 开拓网络图 -->
           <div class="filter-user">
             <el-input v-model="mainUserName" size="small" style="width:300px;">
-              <template slot="prepend">顶级会员</template>
+              <template slot="prepend">Top member<!-- 顶级会员 --></template>
             </el-input>
-            <el-input v-model="expandDeep" size="small" style="width:150px;">
-              <template slot="prepend">展开深度</template>
+            <el-input v-model="expandDeep" size="small" style="width:200px;">
+              <template slot="prepend">Spread depth<!-- 展开深度 --></template>
             </el-input>
             <el-input v-model="periodNum" size="small" style="width:150px;" v-show="false">
-              <template slot="prepend">期数</template>
+              <template slot="prepend">Number of periods<!-- 期数 --></template>
             </el-input>
-            <el-button type="primary" size="small" @click="getMainData()">确定</el-button>
+            <el-button type="primary" size="small" @click="getMainData()">confirm<!-- 确定 --></el-button>
           </div>
           <el-tree :props="props" :data="treeData" node-key="USER_ID" @node-click="getChildData" ref="tree" :indent="0"
                    default-expand-all>
@@ -21,22 +21,22 @@
                       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_RELATION_DEEP,topDeep)}}</el-tag> <el-tag>会员编号：{{ node.label }}</el-tag> <el-tag type="success">姓名：{{data.REAL_NAME}}</el-tag> <el-tag type="warning">级别：{{data.DEC_LV_NAME}}</el-tag> <el-tag type="warning">聘级：{{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></span>
                 </span>
           </el-tree>
         </el-tab-pane>
-        <el-tab-pane label="开拓网络列表" name="two" v-if="permission.hasPermission(`user/relation-list`)">
+        <el-tab-pane label="Development network list" name="two" v-if="permission.hasPermission(`user/relation-list`)"><!-- 开拓网络列表 -->
           <div class="filter-user">
             <el-input v-model="filterForm.userName" size="small" style="width:300px;">
-              <template slot="prepend">会员编号</template>
+              <template slot="prepend"><!-- 会员编号 -->Member code</template>
             </el-input>
             <el-input v-model="filterForm.deep" size="small" style="width:150px;">
-              <template slot="prepend">深度</template>
+              <template slot="prepend"><!-- 深度 -->depth</template>
             </el-input>
             <el-input v-model="filterForm.periodNum" size="small" style="width:150px;" v-show="false">
-              <template slot="prepend">期数</template>
+              <template slot="prepend"><!-- 期数 -->Number of periods</template>
             </el-input>
-            <el-button type="primary" size="small" @click="handleFilter">确定</el-button>
+            <el-button type="primary" size="small" @click="handleFilter">confirm<!-- 确定 --></el-button>
           </div>
 
           <el-table :data="tableData" stripe style="width: 100%;" :height="tool.getTableHeight(true)">
@@ -53,7 +53,7 @@
                 </template>
                 <template v-else>
                   <template v-if="tableHeader.index === 'USER_NAME'">
-                    <el-tooltip class="item" effect="dark" content="查看该会员的下级" placement="top">
+                    <el-tooltip class="item" effect="dark" content="View the subordinates of this member" placement="top"><!-- 查看该会员的下级 -->
                       <el-button @click.native="handleShow(scope.row)" size="small" type="primary">
                         {{scope.row[tableHeader.index].value}}
                       </el-button>
@@ -83,7 +83,7 @@
           </el-table>
           <div class="white-box-footer">
             <el-button type="success" size="small" @click="handleExport"
-                       v-show="permission.hasPermission(`atlas/relation-list-export`)">导出Excel
+                       v-show="permission.hasPermission(`atlas/relation-list-export`)">Export Excel<!-- 导出Excel -->
             </el-button>
             <pagination :total="totalCount" :page_size="pageSize" @size-change="handleSizeChange" @current-change="handleCurrentChange"></pagination>
           </div>
@@ -145,7 +145,7 @@
     methods: {
       getData() {
         this.$message({
-          message: '正在获取数据，请稍后',
+          message: 'Getting data, please wait',//正在获取数据，请稍后
           duration:0
         })
         this.periodNum = baseInfo.nowPeriodNum()
@@ -166,7 +166,7 @@
       getMainData (userName = null, getList = false) {
         this.$message.closeAll()
         this.$message({
-          message: '正在获取数据，请稍后',
+          message: 'Getting data, please wait',//正在获取数据，请稍后
         })
         let thisObj = this
         let requestData = {
@@ -199,7 +199,7 @@
           return ''
         }
         this.$message({
-          message: '正在获取数据，请稍后',
+          message: 'Getting data, please wait',//正在获取数据，请稍后
         })
         thisData.displayNone = ''
         network.getData('atlas/relation', {
@@ -245,9 +245,9 @@
         //this.getData(this.currentPage, this.pageSize, false)
       },
       handleExport(){
-        this.$confirm(`确定要导出当前数据吗？`, '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
+        this.$confirm(`Are you sure you want to export the current data？`, 'Hint', {//`确定要导出当前数据吗？`, '提示'
+          confirmButtonText: 'confirm',//确定
+          cancelButtonText: 'cancel',//取消
           type: 'warning'
         }).then(() => {
           return network.getData(`atlas/relation-list-export`, this.filterForm)

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

@@ -2,8 +2,8 @@
   <div v-loading="loading">
     <div class="white-box">
       <el-tabs v-model="filterStatus" @tab-click="handleFilterStatusClick">
-        <el-tab-pane label="全部" name="ALL" :lazy="true"></el-tab-pane>
-        <el-tab-pane label="首购单" name="ZC" :lazy="true"></el-tab-pane>
+        <el-tab-pane label="All" name="ALL" :lazy="true"></el-tab-pane><!-- 全部 -->
+        <el-tab-pane label="First purchase order" name="ZC" :lazy="true"></el-tab-pane><!-- 首购单 -->
         <!--<el-tab-pane label="增购单" name="ZG" :lazy="true"></el-tab-pane>-->
         <!--<el-tab-pane label="零售单" name="LS" :lazy="true"></el-tab-pane>-->
         <!--<el-tab-pane label="复销单" name="FX" :lazy="true"></el-tab-pane>-->
@@ -26,7 +26,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-order-export`)">导出Excel</el-button>
+        <el-button type="success" size="small" @click="handleExport" v-show="permission.hasPermission(`bonus/perf-order-export`)">Export Excel<!-- 导出Excel --></el-button>
         <pagination :total="totalCount" :page_size="pageSize" @size-change="handleSizeChange" @current-change="handleCurrentChange"></pagination>
       </div>
     </div>
@@ -98,9 +98,9 @@ export default {
       if(window.location.href.indexOf('filter') === -1){
         filterData.filterType = this.filterStatus !== 'ALL' ? `=,${this.filterStatus}` : ''
       }
-      this.$confirm('确定要导出当前表格中的数据吗？', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
+      this.$confirm('Are you sure you want to export the data in the current table?', 'Hint', {//'确定要导出当前表格中的数据吗？', '提示'
+        confirmButtonText: 'confirm',//确定
+        cancelButtonText: 'cancel',//取消
         type: 'warning'
       }).then(() => {
         return network.getData('bonus/perf-order-export', filterData)

backendEle/src/views/bonus/user-perf.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/user-perf-export`)">导出Excel</el-button>
+        <el-button type="success" size="small" @click="handleExport" v-show="permission.hasPermission(`bonus/user-perf-export`)">Export Excel<!-- 导出Excel --></el-button>
         <pagination :total="totalCount" :page_size="pageSize" @size-change="handleSizeChange" @current-change="handleCurrentChange"></pagination>
       </div>
     </div>
@@ -87,9 +87,9 @@
         if(window.location.href.indexOf('filter') === -1){
           filterData.filterType = this.filterStatus !== 'ALL' ? `=,${this.filterStatus}` : ''
         }
-        this.$confirm('确定要导出当前表格中的数据吗？', '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
+        this.$confirm('Are you sure you want to export the data in the current table?', 'Hint', {//'确定要导出当前表格中的数据吗？', '提示',
+          confirmButtonText: 'confirm',//确定
+          cancelButtonText: 'cancel',//取消
           type: 'warning'
         }).then(() => {
           return network.getData('bonus/user-perf-export', filterData)

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

@@ -20,22 +20,22 @@
         </el-table-column>
       </el-table>
       <div class="white-box-footer">
-        <el-button type="success" size="small" @click="handleImport" v-show="permission.hasPermission(`shop/order-dec-list-import`)">订单导入</el-button>
+        <el-button type="success" size="small" @click="handleImport" v-show="permission.hasPermission(`shop/order-dec-list-import`)">Order import<!-- 订单导入 --></el-button>
 
         <pagination :total="totalCount" :page_size="pageSize" @size-change="handleSizeChange"
                     @current-change="handleCurrentChange"></pagination>
       </div>
     </div>
-    <el-dialog title="订单导入" :visible.sync="importDialogVisible" width="50%">
+    <el-dialog title="Order import" :visible.sync="importDialogVisible" width="50%"><!-- 订单导入 -->
       <el-form ref="form" :model="excelForm" style="width: 100%;" class="form-page">
-        <el-form-item label="当前导入订单日期">
-          <el-date-picker  v-model="excelForm.orderDay" type="date" placeholder="选择日期"  value-format="yyyy-MM-dd">
+        <el-form-item label="Current import order date"><!-- 当前导入订单日期 -->
+          <el-date-picker  v-model="excelForm.orderDay" type="date" placeholder="Select date"  value-format="yyyy-MM-dd"><!-- 选择日期 -->
           </el-date-picker>
         </el-form-item>
-        <el-form-item v-show="false" label="当前导入订单期数">
+        <el-form-item v-show="false" label="Current import order periods"><!-- 当前导入订单期数 -->
           <el-input v-model="excelForm.periodNum"></el-input>
         </el-form-item>
-        <el-form-item label="Excel 文件总行数">
+        <el-form-item label="Total rows of Excel file"><!-- Excel 文件总行数 -->
           <el-input v-model="excelForm.rowCount"></el-input>
         </el-form-item>
         <el-form-item>
@@ -47,9 +47,9 @@
                   :other-params="excelForm"
                   :finish-callback-func="uploadFinishFunc"
                   excel-option="addUser"
-                  upload-btn-title="Excel导入"
+                  upload-btn-title="Excel import"
                   style="float: left;"
-          ></leo-excel-uploader>
+          ></leo-excel-uploader><!-- Excel导入 -->
           <!--          <el-button type="primary" @click="handleExcel" style="float: left; margin-left: 10px;">下载模板</el-button>-->
         </el-form-item>
       </el-form>

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

@@ -18,41 +18,41 @@
             </template>
           </template>
         </el-table-column>
-        <el-table-column fixed="right" label="操作" width="180">
+        <el-table-column fixed="right" label="operation" 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>
+                Operate on this data<!-- 操作该数据 --><i class="el-icon-arrow-down el-icon--right"></i>
               </el-button>
               <el-dropdown-menu slot="dropdown">
-                <el-dropdown-item command="edit" @click.native="handleEdit(scope.row)" v-if="permission.hasPermission(`shop/edit`)">编辑订单</el-dropdown-item>
-                <el-dropdown-item command="delivery" @click.native="handleShowDeliveryDialog(scope.row)" v-if="permission.hasPermission(`shop/order-delivery`) && scope.row['STATUS'] === '1' && scope.row['DELIVERY_STATUS'] === '0' ">发货</el-dropdown-item>
-                <el-dropdown-item command="refund" @click.native="handleRefund(scope.row.SN)" v-if="permission.hasPermission(`shop/order-delivery`) && scope.row['PAY_TYPE'] === 'pay_stack' && scope.row['STATUS'] === '1' && scope.row['DELIVERY_STATUS'] === '0' ">退款</el-dropdown-item>
+                <el-dropdown-item command="edit" @click.native="handleEdit(scope.row)" v-if="permission.hasPermission(`shop/edit`)">Edit order<!-- 编辑订单 --></el-dropdown-item>
+                <el-dropdown-item command="delivery" @click.native="handleShowDeliveryDialog(scope.row)" v-if="permission.hasPermission(`shop/order-delivery`) && scope.row['STATUS'] === '1' && scope.row['DELIVERY_STATUS'] === '0' ">deliver goods<!-- 发货 --></el-dropdown-item>
+                <el-dropdown-item command="refund" @click.native="handleRefund(scope.row.SN)" v-if="permission.hasPermission(`shop/order-delivery`) && scope.row['PAY_TYPE'] === 'pay_stack' && scope.row['STATUS'] === '1' && scope.row['DELIVERY_STATUS'] === '0' ">Refund<!-- 退款 --></el-dropdown-item>
               </el-dropdown-menu>
             </el-dropdown>
           </template>
         </el-table-column>
       </el-table>
       <div class="white-box-footer">
-        <el-button type="success" size="small" @click="handleExport" v-show="permission.hasPermission(`shop/order-list-export`)">导出Excel</el-button>
-        <el-button type="primary" size="small" @click="handleExportPDF" v-show="permission.hasPermission(`shop/order-list-export`)">导出PDF</el-button>
+        <el-button type="success" size="small" @click="handleExport" v-show="permission.hasPermission(`shop/order-list-export`)">Export Excel</el-button>
+        <el-button type="primary" size="small" @click="handleExportPDF" v-show="permission.hasPermission(`shop/order-list-export`)">Export PDF</el-button>
         <pagination :total="totalCount" :page_size="pageSize" @size-change="handleSizeChange"
                     @current-change="handleCurrentChange"></pagination>
       </div>
     </div>
 
-    <el-dialog title="发货" :visible.sync="dialogDeliveryVisible">
+    <el-dialog title="deliver goods" :visible.sync="dialogDeliveryVisible"><!-- 发货 -->
       <el-form :model="deliveryForm" label-width="150px" class="form-dialog">
-        <el-form-item label="快递公司">
+        <el-form-item label="Courier Services Company"><!-- 快递公司 -->
           <el-input v-model="deliveryForm.expressCompany"></el-input>
         </el-form-item>
-        <el-form-item label="快递单号">
+        <el-form-item label="courier number"><!-- 快递单号 -->
           <el-input v-model="deliveryForm.orderTrackNo"></el-input>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button @click="dialogDeliveryVisible = false">取 消</el-button>
-        <el-button type="primary" @click.native="handleDelivery">发货</el-button>
+        <el-button @click="dialogDeliveryVisible = false">Cancel<!-- 取 消 --></el-button>
+        <el-button type="primary" @click.native="handleDelivery">deliver goods<!-- 发货 --></el-button>
       </div>
     </el-dialog>
   </div>
@@ -117,9 +117,9 @@
         })
       },
       handleExport(){
-        this.$confirm(`确定要导出当前数据吗？`, '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
+        this.$confirm(`Are you sure you want to export the current data？`, 'Hint', {//`确定要导出当前数据吗？`, '提示'
+          confirmButtonText: 'confirm',//确定
+          cancelButtonText: 'cancel',//取消
           type: 'warning'
         }).then(() => {
           return network.getData(`shop/order-list-export`, this.filterModel)
@@ -135,7 +135,7 @@
         handleExportPDF() {
             if (this.multipleSelection.length === 0) {
                 this.$message({
-                    message: '请选择一条订单导出',
+                    message: 'Please select an order to export',//请选择一条订单导出
                     type: 'error'
                 })
                 return false
@@ -147,15 +147,15 @@
             let orderSnSet = Array.from(new Set(orderSnList))
             if (orderSnSet.length !== 1) {
                 this.$message({
-                    message: '每次只能导出一条订单',
+                    message: 'Only one order can be exported at a time',//每次只能导出一条订单
                     type: 'error'
                 })
                 return false
             }
 
-            this.$confirm(`确定要导出当前数据吗？`, '提示', {
-                confirmButtonText: '确定',
-                cancelButtonText: '取消',
+            this.$confirm(`Are you sure you want to export the current data？`, 'Hint', {//`确定要导出当前数据吗？`, '提示'
+                confirmButtonText: 'confirm',//确定
+                cancelButtonText: 'cancel',//取消
                 type: 'info'
             }).then(() => {
                 // 导出时只需要订单ID即可
@@ -196,9 +196,9 @@
       },
         // 退款
         handleRefund(orderSn) {
-            this.$confirm(`确定要将此订单退款吗？`, '提示', {
-                confirmButtonText: '确定',
-                cancelButtonText: '取消',
+            this.$confirm(`Are you sure you want to refund this order？`, 'Hint', {//`确定要将此订单退款吗？`, '提示',
+                confirmButtonText: 'confirm',//确定
+                cancelButtonText:  'cancel',//取消
                 type: 'warning'
             }).then(() => {
                 return network.postData(`shop/order-refund`, { sn: orderSn.value })

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

@@ -20,28 +20,28 @@
         </el-table-column>
       </el-table>
       <div class="white-box-footer">
-        <el-button type="success" size="small" @click="handleImport" v-show="permission.hasPermission(`shop/order-shop-list-import`)">订单导入</el-button>
+        <el-button type="success" size="small" @click="handleImport" v-show="permission.hasPermission(`shop/order-shop-list-import`)">Order import<!-- 订单导入 --></el-button>
 
         <pagination :total="totalCount" :page_size="pageSize" @size-change="handleSizeChange"
                     @current-change="handleCurrentChange"></pagination>
       </div>
     </div>
-    <el-dialog title="订单导入" :visible.sync="importDialogVisible" width="50%">
+    <el-dialog title="Order import" :visible.sync="importDialogVisible" width="50%"><!-- 订单导入 -->
       <el-form ref="form" :model="excelForm" style="width: 100%;" class="form-page">
-        <el-form-item label="当前导入订单日期">
-          <el-date-picker  v-model="excelForm.orderDay" type="date" placeholder="选择日期"  value-format="yyyy-MM-dd">
+        <el-form-item label="Current import order date"><!-- 当前导入订单日期 -->
+          <el-date-picker  v-model="excelForm.orderDay" type="date" placeholder="Select date"  value-format="yyyy-MM-dd"><!-- 选择日期 -->
           </el-date-picker>
         </el-form-item>
-        <el-form-item label="当前导入订单类型">
-          <el-select v-model="excelForm.orderType" placeholder="请选择订单类型" style="width: 400px;">
-            <el-option label="复销订单" value="cash" :key="1"></el-option>
-            <el-option label="积分订单" value="point" :key="2"></el-option>
+        <el-form-item label="Current import order type"><!-- 当前导入订单类型 -->
+          <el-select v-model="excelForm.orderType" placeholder="Please select order type" style="width: 400px;"><!-- 请选择订单类型 -->
+            <el-option label="Resale order" value="cash" :key="1"></el-option><!-- 复销订单 -->
+            <el-option label="Points order" value="point" :key="2"></el-option><!-- 积分订单 -->
           </el-select>
         </el-form-item>
-        <el-form-item v-show="false" label="当前导入订单期数">
+        <el-form-item v-show="false" label="Current import order periods"><!-- 当前导入订单期数 -->
           <el-input v-model="excelForm.periodNum"></el-input>
         </el-form-item>
-        <el-form-item label="Excel 文件总行数">
+        <el-form-item label="Total rows of Excel file"><!-- Excel 文件总行数 -->
           <el-input v-model="excelForm.rowCount"></el-input>
         </el-form-item>
         <el-form-item>
@@ -53,9 +53,9 @@
             :other-params="excelForm"
             :finish-callback-func="uploadFinishFunc"
             excel-option="addUser"
-            upload-btn-title="Excel导入"
+            upload-btn-title="Excel import"
             style="float: left;"
-          ></leo-excel-uploader>
+          ></leo-excel-uploader><!-- Excel导入 -->
 <!--          <el-button type="primary" @click="handleExcel" style="float: left; margin-left: 10px;">下载模板</el-button>-->
         </el-form-item>
       </el-form>

backendEle/src/views/shop/order-standard-list.vue

@@ -19,16 +19,16 @@
         </el-table-column>
       </el-table>
       <div class="white-box-footer">
-        <el-button type="success" size="small" @click="handleImport" v-show="permission.hasPermission(`shop/order-standard-list-import`)">订单导入</el-button>
+        <el-button type="success" size="small" @click="handleImport" v-show="permission.hasPermission(`shop/order-standard-list-import`)">Order import<!-- 订单导入 --></el-button>
 
         <pagination :total="totalCount" :page_size="pageSize" @size-change="handleSizeChange"
                     @current-change="handleCurrentChange"></pagination>
       </div>
     </div>
-    <el-dialog title="订单导入" :visible.sync="importDialogVisible" width="50%">
+    <el-dialog title="Order import" :visible.sync="importDialogVisible" width="50%"><!-- 订单导入 -->
       <el-form ref="form" :model="excelForm" style="width: 100%;" class="form-page">
         <el-form-item label="当前导入订单日期">
-          <el-date-picker  v-model="excelForm.orderMonth" type="month" placeholder="选择月"  value-format="yyyy-MM">
+          <el-date-picker  v-model="excelForm.orderMonth" type="month" placeholder="Select month"  value-format="yyyy-MM"><!-- 选择月 -->
           </el-date-picker>
         </el-form-item>
 <!--        <el-form-item label="当前导入订单类型">-->
@@ -40,7 +40,7 @@
 <!--        <el-form-item v-show="false" label="当前导入订单期数">-->
 <!--          <el-input v-model="excelForm.periodNum"></el-input>-->
 <!--        </el-form-item>-->
-        <el-form-item label="Excel 文件总行数">
+        <el-form-item label="Total rows of Excel file"><!-- Excel 文件总行数 -->
           <el-input v-model="excelForm.rowCount"></el-input>
         </el-form-item>
         <el-form-item>
@@ -52,9 +52,9 @@
             :other-params="excelForm"
             :finish-callback-func="uploadFinishFunc"
             excel-option="addUser"
-            upload-btn-title="Excel导入"
+            upload-btn-title="Excel import"
             style="float: left;"
-          ></leo-excel-uploader>
+          ></leo-excel-uploader><!-- Excel导入 -->
 <!--          <el-button type="primary" @click="handleExcel" style="float: left; margin-left: 10px;">下载模板</el-button>-->
         </el-form-item>
       </el-form>

backendEle/src/views/user/empty-list.vue

@@ -41,21 +41,21 @@
             </template>
           </template>
         </el-table-column>
-        <el-table-column fixed="right" label="操作" width="180">
+        <el-table-column fixed="right" label="operation" 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>
+                Operate on this data<!-- 操作该数据 --><i class="el-icon-arrow-down el-icon--right"></i>
               </el-button>
               <el-dropdown-menu slot="dropdown">
                 <el-dropdown-item @click.native="handleModifyPassword(scope.row)"
-                                  v-if="permission.hasPermission(`user/modify-password`)">修改密码
+                                  v-if="permission.hasPermission(`user/modify-password`)">Change Password<!-- 修改密码 -->
                 </el-dropdown-item>
                 <el-dropdown-item @click.native="handleModifyProfile(scope.row)"
-                                  v-if="permission.hasPermission(`user/modify-profile`)">修改个人资料
+                                  v-if="permission.hasPermission(`user/modify-profile`)">Modify personal data<!-- 修改个人资料 -->
                 </el-dropdown-item>
-                <el-dropdown-item @click.native="handleStatusActive(scope.row)">状态激活 </el-dropdown-item>
-                <el-dropdown-item @click.native="handleStatusLock(scope.row)">状态锁定 </el-dropdown-item>
+                <el-dropdown-item @click.native="handleStatusActive(scope.row)">Status activation<!-- 状态激活 --> </el-dropdown-item>
+                <el-dropdown-item @click.native="handleStatusLock(scope.row)">Status lock<!-- 状态锁定 --> </el-dropdown-item>
               </el-dropdown-menu>
             </el-dropdown>
           </template>
@@ -93,53 +93,53 @@
     </div>
     <el-dialog :title="formModifyPassword.typeName" :visible.sync="dialogModifyPasswordVisible" width="50%">
       <el-form ref="form" :model="formModifyPassword" label-width="120px" class="form-dialog">
-        <el-form-item label="类型">
-          <el-select v-model="formModifyPassword.passwordType" placeholder="请选择类型">
+        <el-form-item label="type"><!-- 类型 -->
+          <el-select v-model="formModifyPassword.passwordType" placeholder="Please select a type"><!-- 请选择类型 -->
             <el-option v-for="(item,key) in passwordType" :label="item.label" :value="item.type"
                        :key="key"></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="密码">
-          <el-input placeholder="密码" v-model="formModifyPassword.password">
+        <el-form-item label="password"><!-- 密码 -->
+          <el-input placeholder="password" v-model="formModifyPassword.password"><!-- 密码 -->
           </el-input>
         </el-form-item>
         <el-form-item>
-          <el-button type="primary" @click="handleModifyPasswordSubmit" :loading="submitPasswordButtonStat">提交</el-button>
+          <el-button type="primary" @click="handleModifyPasswordSubmit" :loading="submitPasswordButtonStat">Submit<!-- 提交 --></el-button>
         </el-form-item>
       </el-form>
     </el-dialog>
 
     <el-dialog :title="formModifyProfile.typeName" :visible.sync="dialogModifyProfileVisible" width="50%">
       <el-form ref="form" :model="formModifyProfile" label-width="120px" class="form-dialog">
-        <el-form-item label="民族">
-          <el-select v-model="formModifyProfile.nation" placeholder="请选择民族">
+        <el-form-item label="nation"><!-- 民族 -->
+          <el-select v-model="formModifyProfile.nation" placeholder="Please select nationality"><!-- 请选择民族 -->
             <el-option v-for="(item,index) in allNation" :key="index" :label="item.name"
                        :value="item.id"></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="会员姓名">
+        <el-form-item label="Member name"><!-- 会员姓名 -->
           <el-input v-model="formModifyProfile.realName"></el-input>
         </el-form-item>
-        <el-form-item label="身份证号">
+        <el-form-item label="ID"><!-- 身份证号 -->
           <el-input v-model="formModifyProfile.idCard"></el-input>
         </el-form-item>
-        <el-form-item label="手机号">
+        <el-form-item label="phone number"><!-- 手机号 -->
           <el-input v-model="formModifyProfile.mobile"></el-input>
         </el-form-item>
-        <el-form-item label="银行名称">
-          <el-select v-model="formModifyProfile.openBank" placeholder="请选择银行名称">
+        <el-form-item label="Bank name"><!-- 银行名称 -->
+          <el-select v-model="formModifyProfile.openBank" placeholder="Please select a bank name"><!-- 请选择银行名称 -->
             <el-option v-for="(item,index) in allOpenBank" :key="index" :label="item.BANK_NAME"
                        :value="item.BANK_CODE"></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="开户行地址">
+        <el-form-item label="Bank Address"><!-- 开户行地址 -->
           <el-input v-model="formModifyProfile.bankAddress"></el-input>
         </el-form-item>
-        <el-form-item label="银行帐号">
+        <el-form-item label="Bank account number"><!-- 银行帐号 -->
           <el-input v-model="formModifyProfile.bankNo"></el-input>
         </el-form-item>
         <el-form-item>
-          <el-button type="primary" @click="handleModifyProfileSubmit" :loading="submitProfileButtonStat">提交</el-button>
+          <el-button type="primary" @click="handleModifyProfileSubmit" :loading="submitProfileButtonStat">Submit<!-- 提交 --></el-button>
         </el-form-item>
       </el-form>
     </el-dialog>
@@ -210,7 +210,7 @@
         dialogVisible: false,
         formCloseLogin: {
           userName: null,
-          typeName: '登录管理',
+          typeName: 'Login management',//登录管理
           type: null,
           isClose: 0,
           remark: '',
@@ -225,7 +225,7 @@
         dialogModifyProfileVisible: false,
         formCloseDec: {
           userName: null,
-          typeName: '管理报单',
+          typeName: 'Manage entry',//管理报单
           type: null,
           isClose: 0,
           remark: '',
@@ -234,13 +234,13 @@
         formModifyPassword: {
             userId:'',
             password: '',
-            typeName: '修改密码',
+            typeName: 'Change Password',//修改密码
             passwordType: 'password',
             // remark: '',
         },
         formModifyProfile: {
             userId:'',
-            typeName: '修改个人资料',
+            typeName: 'Modify personal data',//修改个人资料
             nation: '',
             realName: '',
             idCard: '',
@@ -252,11 +252,11 @@
         passwordType: [
             {
                 type:"password",
-                label:"登录密码"
+                label:"Login password"//登录密码
             },
             {
                 type:"payPassword",
-                label:"支付密码"
+                label:"Payment password"//支付密码
             },
         ],
         allOpenBank:null,
@@ -301,15 +301,15 @@
       handleGroupManage(isGroup) {
         if (this.multipleSelection.length < 1) {
           this.$message({
-            message: '请勾选要操作的会员',
+            message: 'Please check the member to be operated',//请勾选要操作的会员
             type: 'warning'
           })
           return
         }
-        let groupTip = isGroup === true ? '设为团队领导人' : '取消团队领导人'
-        this.$confirm(`确定要对所选会员【${groupTip}】吗？`, '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
+        let groupTip = isGroup === true ? 'set as team leader ':' Cancel team leader '//'设为团队领导人' : '取消团队领导人'
+        this.$confirm(`Are you sure you want to【${groupTip}】？`, 'Hint', {//`确定要对所选会员【${groupTip}】吗？`, '提示'
+          confirmButtonText: 'confirm',//确定
+          cancelButtonText: 'cancel',//取消
           type: 'warning'
         }).then(() => {
           let selectedIds = []
@@ -330,15 +330,15 @@
       handleIsDecManage(isDec) {
           if (this.multipleSelection.length < 1) {
               this.$message({
-                  message: '请勾选要操作的会员',
+                  message: 'Please check the member to be operated',//请勾选要操作的会员
                   type: 'warning'
               })
               return
           }
-          let isDecTip = isDec === true ? '设为报单中心' : '取消报单中心'
-          this.$confirm(`确定要对所选会员【${isDecTip}】吗？`, '提示', {
-              confirmButtonText: '确定',
-              cancelButtonText: '取消',
+          let isDecTip = isDec === true ? 'set as entry center ':' Cancel entry center ' //'设为报单中心' : '取消报单中心'
+          this.$confirm(`Are you sure you want to【${isDecTip}】？`, 'Hint', {//`确定要对所选会员【${isDecTip}】吗？`, '提示'
+              confirmButtonText: 'confirm',//确定
+              cancelButtonText: 'cancel',//取消
               type: 'warning'
           }).then(() => {
               let selectedIds = []
@@ -359,15 +359,15 @@
         handleIsAtlasManage(isAtlas) {
             if (this.multipleSelection.length < 1) {
                 this.$message({
-                    message: '请勾选要操作的会员',
+                    message: 'Please check the member to be operated',//请勾选要操作的会员
                     type: 'warning'
                 })
                 return
             }
-            let isAtlasTip = isAtlas === true ? '显示图谱' : '隐藏图谱'
-            this.$confirm(`确定要对所选会员【${isAtlasTip}】吗？`, '提示', {
-                confirmButtonText: '确定',
-                cancelButtonText: '取消',
+            let isAtlasTip = isAtlas === true ? 'show atlas': 'hide atlas'//'显示图谱' : '隐藏图谱'
+            this.$confirm(`Are you sure you want to【${isAtlasTip}】？`, 'Hint', {//`确定要对所选会员【${isAtlasTip}】吗？`, '提示'
+                confirmButtonText: 'confirm',//确定
+                cancelButtonText: 'cancel',//取消
                 type: 'warning'
             }).then(() => {
                 let selectedIds = []
@@ -388,15 +388,15 @@
       getTypeName(type) {
         switch (type) {
           case 1:
-            return '按指定会员'
+            return 'By designated member'//按指定会员
           case 2:
-            return '按开拓网络'
+            return 'Expand network by'//按开拓网络
           case 3:
-            return '按安置网络'
+            return 'By placement network'//按安置网络
           case 4:
-            return '按会员体系'
+            return 'By membership system'//按会员体系
           case 5:
-            return '按省份地区'
+            return 'By province and region'//按省份地区
           default:
             return ''
         }
@@ -405,13 +405,13 @@
         if (type === 2 || type === 3 || type === 4) {
           if (this.multipleSelection.length > 1) {
             this.$message({
-              message: '此登录管理不允许勾选多名会员',
+              message: 'Multiple members are not allowed to be checked in this login management',//此登录管理不允许勾选多名会员
               type: 'warning'
             })
             return;
           } else if (this.multipleSelection.length < 1) {
             this.$message({
-              message: '请选择会员编号',
+              message: 'Please select a member number',//请选择会员编号
               type: 'warning'
             })
             return;
@@ -419,27 +419,27 @@
         }
         if (type === 1 && this.multipleSelection.length <= 0) {
           this.$message({
-            message: '请选择会员编号',
+            message: 'Please select a member number',//请选择会员编号
             type: 'warning'
           })
           return;
         }
         if (type === 5 && this.multipleSelection.length > 0) {
           this.$message({
-            message: '按照地区关闭登录无需勾选会员',
+            message: 'Closing login by region without checking member',//按照地区关闭登录无需勾选会员
             type: 'warning'
           })
           return;
         }
         this.formCloseLogin = {
           userName: null,
-          typeName: '登录管理',
+          typeName: 'Login management',//登录管理
           type: null,
           isClose: 0,
           remark: '',
           areaSelected: null,
         },
-          this.formCloseLogin.typeName = this.getTypeName(type) + '管理登录'
+          this.formCloseLogin.typeName = this.getTypeName(type) + 'Manage logins'//管理登录
         this.formCloseLogin.type = type
         this.dialogVisible = true
       },
@@ -509,9 +509,9 @@
         // })
       },
       handleExport() {
-        this.$confirm(`确定要导出当前数据吗？`, '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
+        this.$confirm(`Are you sure you want to export the current data？`, 'Hint', {//`确定要导出当前数据吗？`, '提示'
+          confirmButtonText: 'confirm',//确定
+          cancelButtonText: 'cancel',//取消
           type: 'warning'
         }).then(() => {
           return network.getData(`user/index-export`, this.filterModel)
@@ -531,13 +531,13 @@
         if (type === 2 || type === 3 || type === 4) {
           if (this.multipleSelection.length > 1) {
             this.$message({
-              message: '此报单管理不允许勾选多名会员',
+              message: 'Multiple members are not allowed to be checked in this entry management',//此报单管理不允许勾选多名会员
               type: 'warning'
             })
             return;
           } else if (this.multipleSelection.length < 1) {
             this.$message({
-              message: '请勾选要管理报单的会员',
+              message: 'Please check the member to manage the entry',//请勾选要管理报单的会员
               type: 'warning'
             })
             return;
@@ -545,27 +545,27 @@
         }
         if (type === 1 && this.multipleSelection.length <= 0) {
           this.$message({
-            message: '请勾选要管理报单的会员',
+            message: 'Please check the member to manage the entry',//请勾选要管理报单的会员
             type: 'warning'
           })
           return;
         }
         if (type === 5 && this.multipleSelection.length > 0) {
           this.$message({
-            message: '按照地区关闭报单无需勾选会员',
+            message: 'Closing entry by region without checking memberManage entry',//按照地区关闭报单无需勾选会员
             type: 'warning'
           })
           return;
         }
         this.formCloseDec = {
           userName: null,
-          typeName: '管理报单',
+          typeName: 'Manage entry',//管理报单
           type: null,
           isClose: 0,
           remark: '',
           areaSelected: null,
         },
-          this.formCloseDec.typeName = this.getTypeName(type) + '管理报单'
+          this.formCloseDec.typeName = this.getTypeName(type) + 'Manage entry'//管理报单
         this.formCloseDec.type = type
         this.dialogDecVisible = true
       },
@@ -682,4 +682,3 @@
   }
 
 </script>
-

backendEle/src/views/user/index.vue

@@ -27,7 +27,7 @@
                   <el-dropdown-menu slot="dropdown">
                     <el-dropdown-item command="login" v-show="scope.row.BTF_URL !== null">
                       <a :href="`${frontendServer}/#/login-by-backend?${scope.row.BTF_URL}`" target="_blank"
-                         style="color:#606266;">快速登录</a>
+                         style="color:#606266;">Quick logon<!-- 快速登录 --></a>
                     </el-dropdown-item>
                   </el-dropdown-menu>
                 </el-dropdown>
@@ -41,23 +41,23 @@
             </template>
           </template>
         </el-table-column>
-        <el-table-column fixed="right" label="操作" width="180">
+        <el-table-column fixed="right" label="operation" 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>
+                Operate on this data<!-- 操作该数据 --><i class="el-icon-arrow-down el-icon--right"></i>
               </el-button>
               <el-dropdown-menu slot="dropdown">
                 <el-dropdown-item @click.native="handleModifyPassword(scope.row)"
-                                  v-if="permission.hasPermission(`user/modify-password`)">修改密码
+                                  v-if="permission.hasPermission(`user/modify-password`)">Change Password<!-- 修改密码 -->
                 </el-dropdown-item>
                 <el-dropdown-item @click.native="handleModifyProfile(scope.row)"
-                                  v-if="permission.hasPermission(`user/modify-profile`)">修改个人资料
+                                  v-if="permission.hasPermission(`user/modify-profile`)">Modify personal data<!-- 修改个人资料 -->
                 </el-dropdown-item>
-                <el-dropdown-item @click.native="handleStatusActive(scope.row)" v-if="permission.hasPermission(`user/modify-status`)">状态激活 </el-dropdown-item>
-                <el-dropdown-item @click.native="handleStatusLock(scope.row)" v-if="permission.hasPermission(`user/modify-status`)">状态锁定 </el-dropdown-item>
-                <el-dropdown-item @click.native="handleIsModifyPassword(scope.row, 1)" v-if="permission.hasPermission(`user/is-modify-password-status`)">开启密码修改</el-dropdown-item>
-                <el-dropdown-item @click.native="handleIsModifyPassword(scope.row, 0)" v-if="permission.hasPermission(`user/is-modify-password-status`)">关闭密码修改</el-dropdown-item>
+                <el-dropdown-item @click.native="handleStatusActive(scope.row)" v-if="permission.hasPermission(`user/modify-status`)">Status activation<!-- 状态激活 --> </el-dropdown-item>
+                <el-dropdown-item @click.native="handleStatusLock(scope.row)" v-if="permission.hasPermission(`user/modify-status`)">Status lock<!-- 状态锁定 --> </el-dropdown-item>
+                <el-dropdown-item @click.native="handleIsModifyPassword(scope.row, 1)" v-if="permission.hasPermission(`user/is-modify-password-status`)">Open password modification<!-- 开启密码修改 --></el-dropdown-item>
+                <el-dropdown-item @click.native="handleIsModifyPassword(scope.row, 0)" v-if="permission.hasPermission(`user/is-modify-password-status`)">Turn off password modification<!-- 关闭密码修改 --></el-dropdown-item>
               </el-dropdown-menu>
             </el-dropdown>
           </template>
@@ -111,44 +111,44 @@
         <!--</el-dropdown>-->
         <el-dropdown size="small" trigger="click" v-show="permission.hasPermission(`user/is-dec`)">
           <el-button type="primary" size="small" @click.stop="">
-            报单中心管理<i class="el-icon-arrow-down el-icon--right"></i>
+            Declaration Center Management<!-- 报单中心管理 --><i class="el-icon-arrow-down el-icon--right"></i>
           </el-button>
           <el-dropdown-menu slot="dropdown">
-            <el-dropdown-item command="isDec" @click.native="handleIsDecManage(true)">设为报单中心</el-dropdown-item>
-            <el-dropdown-item command="notDec" @click.native="handleIsDecManage(false)">取消报单中心
+            <el-dropdown-item command="isDec" @click.native="handleIsDecManage(true)">Set as declaration Center<!-- 设为报单中心 --></el-dropdown-item>
+            <el-dropdown-item command="notDec" @click.native="handleIsDecManage(false)">Cancel entry Center<!-- 取消报单中心 -->
             </el-dropdown-item>
           </el-dropdown-menu>
         </el-dropdown>
 
         <el-dropdown size="small" trigger="click" v-show="permission.hasPermission(`user/is-studio`)">
           <el-button type="primary" size="small" @click.stop="">
-            工作室管理<i class="el-icon-arrow-down el-icon--right"></i>
+            Studio management<!-- 工作室管理 --><i class="el-icon-arrow-down el-icon--right"></i>
           </el-button>
           <el-dropdown-menu slot="dropdown">
-            <el-dropdown-item command="isStudio" @click.native="handleIsStudioManage(true)">设为工作室</el-dropdown-item>
-            <el-dropdown-item command="notStudio" @click.native="handleIsStudioManage(false)">取消工作室
+            <el-dropdown-item command="isStudio" @click.native="handleIsStudioManage(true)">Set as studio<!-- 设为工作室 --></el-dropdown-item>
+            <el-dropdown-item command="notStudio" @click.native="handleIsStudioManage(false)">Cancel room<!-- 取消工作室 -->
             </el-dropdown-item>
           </el-dropdown-menu>
         </el-dropdown>
 
         <el-dropdown size="small" trigger="click" v-show="permission.hasPermission(`user/is-atlas`)">
           <el-button type="primary" size="small" @click.stop="">
-            图谱管理<i class="el-icon-arrow-down el-icon--right"></i>
+            Atlas management<!-- 图谱管理 --><i class="el-icon-arrow-down el-icon--right"></i>
           </el-button>
           <el-dropdown-menu slot="dropdown">
-            <el-dropdown-item command="isAtlas" @click.native="handleIsAtlasManage(true)">显示图谱</el-dropdown-item>
-            <el-dropdown-item command="notAtlas" @click.native="handleIsAtlasManage(false)">隐藏图谱
+            <el-dropdown-item command="isAtlas" @click.native="handleIsAtlasManage(true)">Display Atlas<!-- 显示图谱 --></el-dropdown-item>
+            <el-dropdown-item command="notAtlas" @click.native="handleIsAtlasManage(false)">Hidden Atlas<!-- 隐藏图谱 -->
             </el-dropdown-item>
           </el-dropdown-menu>
         </el-dropdown>
 
         <el-dropdown size="small" trigger="click" v-show="permission.hasPermission(`user/is-recharge`)">
           <el-button type="primary" size="small" @click.stop="">
-            充值管理<i class="el-icon-arrow-down el-icon--right"></i>
+            Recharge management<!-- 充值管理 --><i class="el-icon-arrow-down el-icon--right"></i>
           </el-button>
           <el-dropdown-menu slot="dropdown">
-            <el-dropdown-item command="isAtlas" @click.native="handleIsRechargeManage(true)">显示充值</el-dropdown-item>
-            <el-dropdown-item command="notAtlas" @click.native="handleIsRechargeManage(false)">隐藏充值
+            <el-dropdown-item command="isAtlas" @click.native="handleIsRechargeManage(true)">Display recharge<!-- 显示充值 --></el-dropdown-item>
+            <el-dropdown-item command="notAtlas" @click.native="handleIsRechargeManage(false)">Hide recharge<!-- 隐藏充值 -->
             </el-dropdown-item>
           </el-dropdown-menu>
         </el-dropdown>
@@ -176,7 +176,7 @@
           <!--</el-dropdown-menu>-->
         <!--</el-dropdown>-->
         <el-button type="success" size="small" @click="handleExport"
-                   v-show="permission.hasPermission(`user/index-export`)">导出Excel
+                   v-show="permission.hasPermission(`user/index-export`)">Export Excel
         </el-button>
         <pagination :total="totalCount" :page_size="pageSize" @size-change="handleSizeChange"
                     @current-change="handleCurrentChange"></pagination>
@@ -184,14 +184,14 @@
     </div>
     <el-dialog :title="formModifyPassword.typeName" :visible.sync="dialogModifyPasswordVisible" width="50%">
       <el-form ref="form" :model="formModifyPassword" label-width="120px" class="form-dialog">
-        <el-form-item label="类型">
-          <el-select v-model="formModifyPassword.passwordType" placeholder="请选择类型">
+        <el-form-item label="type"><!-- 类型 -->
+          <el-select v-model="formModifyPassword.passwordType" placeholder="Please select a type"><!-- 请选择类型 -->
             <el-option v-for="(item,key) in passwordType" :label="item.label" :value="item.type"
                        :key="key"></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="密码">
-          <el-input placeholder="密码" v-model="formModifyPassword.password">
+        <el-form-item label="password"><!-- 密码 -->
+          <el-input placeholder="password" v-model="formModifyPassword.password"><!-- 密码 -->
           </el-input>
         </el-form-item>
         <!--<el-form-item label="备注">-->
@@ -199,42 +199,42 @@
           <!--</el-input>-->
         <!--</el-form-item>-->
         <el-form-item>
-          <el-button type="primary" @click="handleModifyPasswordSubmit" :loading="submitPasswordButtonStat">提交</el-button>
+          <el-button type="primary" @click="handleModifyPasswordSubmit" :loading="submitPasswordButtonStat">Submit<!-- 提交 --></el-button>
         </el-form-item>
       </el-form>
     </el-dialog>
 
     <el-dialog :title="formModifyProfile.typeName" :visible.sync="dialogModifyProfileVisible" width="50%">
       <el-form ref="form" :model="formModifyProfile" label-width="120px" class="form-dialog">
-        <el-form-item label="民族">
-          <el-select v-model="formModifyProfile.nation" placeholder="请选择民族">
+        <el-form-item label="nation"><!-- 民族 -->
+          <el-select v-model="formModifyProfile.nation" placeholder="Please select nationality"><!-- 请选择民族 -->
             <el-option v-for="(item,index) in allNation" :key="index" :label="item.name"
                        :value="item.id"></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="会员姓名">
+        <el-form-item label="Member name"><!-- 会员姓名 -->
           <el-input v-model="formModifyProfile.realName"></el-input>
         </el-form-item>
-        <el-form-item label="身份证号">
+        <el-form-item label="Identity No."><!-- 身份证号 -->
           <el-input v-model="formModifyProfile.idCard"></el-input>
         </el-form-item>
-        <el-form-item label="手机号">
+        <el-form-item label="phone number"><!-- 手机号 -->
           <el-input v-model="formModifyProfile.mobile"></el-input>
         </el-form-item>
-        <el-form-item label="银行名称">
-          <el-select v-model="formModifyProfile.openBank" placeholder="请选择银行名称">
+        <el-form-item label="Bank name"><!-- 银行名称 -->
+          <el-select v-model="formModifyProfile.openBank" placeholder="Please select a bank name"><!-- 请选择银行名称 -->
             <el-option v-for="(item,index) in allOpenBank" :key="index" :label="item.BANK_NAME"
                        :value="item.BANK_CODE"></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="开户行地址">
+        <el-form-item label="Bank Address"><!-- 开户行地址 -->
           <el-input v-model="formModifyProfile.bankAddress"></el-input>
         </el-form-item>
-        <el-form-item label="银行帐号">
+        <el-form-item label="Bank account number"><!-- 银行帐号 -->
           <el-input v-model="formModifyProfile.bankNo"></el-input>
         </el-form-item>
         <el-form-item>
-          <el-button type="primary" @click="handleModifyProfileSubmit" :loading="submitProfileButtonStat">提交</el-button>
+          <el-button type="primary" @click="handleModifyProfileSubmit" :loading="submitProfileButtonStat">Submit<!-- 提交 --></el-button>
         </el-form-item>
       </el-form>
     </el-dialog>
@@ -305,7 +305,7 @@
         dialogVisible: false,
         formCloseLogin: {
           userName: null,
-          typeName: '登录管理',
+          typeName: 'Login management',//登录管理
           type: null,
           isClose: 0,
           remark: '',
@@ -320,7 +320,7 @@
         dialogModifyProfileVisible: false,
         formCloseDec: {
           userName: null,
-          typeName: '管理报单',
+          typeName: 'Manage entry',//管理报单
           type: null,
           isClose: 0,
           remark: '',
@@ -329,13 +329,13 @@
         formModifyPassword: {
             userId:'',
             password: '',
-            typeName: '修改密码',
+            typeName: 'Change Password',//修改密码
             passwordType: 'password',
             // remark: '',
         },
         formModifyProfile: {
             userId:'',
-            typeName: '修改个人资料',
+            typeName: 'Modify personal data',//修改个人资料
             nation: '',
             realName: '',
             idCard: '',
@@ -347,11 +347,11 @@
         passwordType: [
             {
                 type:"password",
-                label:"登录密码"
+                label:"login password"//登录密码
             },
             {
                 type:"payPassword",
-                label:"支付密码"
+                label:"Payment password"//支付密码
             },
         ],
         allOpenBank:null,
@@ -396,15 +396,15 @@
       handleGroupManage(isGroup) {
         if (this.multipleSelection.length < 1) {
           this.$message({
-            message: '请勾选要操作的会员',
+            message: 'Please check the member to be operated',//请勾选要操作的会员
             type: 'warning'
           })
           return
         }
-        let groupTip = isGroup === true ? '设为团队领导人' : '取消团队领导人'
-        this.$confirm(`确定要对所选会员【${groupTip}】吗？`, '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
+        let groupTip = isGroup === true ? 'Set as team leader' : 'Cancel team leader' //'设为团队领导人' : '取消团队领导人'
+        this.$confirm(`Are you sure you want to【${groupTip}】？`, 'Hint', {//`确定要对所选会员【${groupTip}】吗？`, '提示'
+          confirmButtonText: 'confirm',//确定
+          cancelButtonText: 'cancel',//取消
           type: 'warning'
         }).then(() => {
           let selectedIds = []
@@ -425,15 +425,15 @@
       handleIsDecManage(isDec) {
           if (this.multipleSelection.length < 1) {
               this.$message({
-                  message: '请勾选要操作的会员',
+                  message: 'Please check the member to be operated',//请勾选要操作的会员
                   type: 'warning'
               })
               return
           }
-          let isDecTip = isDec === true ? '设为报单中心' : '取消报单中心'
-          this.$confirm(`确定要对所选会员【${isDecTip}】吗？`, '提示', {
-              confirmButtonText: '确定',
-              cancelButtonText: '取消',
+          let isDecTip = isDec === true ? 'Set as declaration Center' : 'Cancel entry Center'//'设为报单中心' : '取消报单中心'
+          this.$confirm(`Are you sure you want to【${isDecTip}】？`, 'Hint', {//确定要对所选会员【${isDecTip}】吗？`, '提示'
+              confirmButtonText: 'confirm',//确定
+              cancelButtonText: 'cancel',//取消
               type: 'warning'
           }).then(() => {
               let selectedIds = []
@@ -454,15 +454,15 @@
         handleIsStudioManage(isStudio) {
             if (this.multipleSelection.length < 1) {
                 this.$message({
-                    message: '请勾选要操作的会员',
+                    message: 'Please check the member to be operated',//请勾选要操作的会员
                     type: 'warning'
                 })
                 return
             }
-            let isStudioTip = isStudio === true ? '设为工作室' : '取消工作室'
-            this.$confirm(`确定要对所选会员【${isStudioTip}】吗？`, '提示', {
-                confirmButtonText: '确定',
-                cancelButtonText: '取消',
+            let isStudioTip = isStudio === true ? 'Set as studio' : 'Cancel room'//'设为工作室' : '取消工作室'
+            this.$confirm(`Are you sure you want to【${isStudioTip}】？`, 'Hint', {
+                confirmButtonText: 'confirm',//确定
+                cancelButtonText: 'cancel',//取消
                 type: 'warning'
             }).then(() => {
                 let selectedIds = []
@@ -483,15 +483,15 @@
         handleIsAtlasManage(isAtlas) {
             if (this.multipleSelection.length < 1) {
                 this.$message({
-                    message: '请勾选要操作的会员',
+                    message: 'Please check the member to be operated',//请勾选要操作的会员
                     type: 'warning'
                 })
                 return
             }
-            let isAtlasTip = isAtlas === true ? '显示图谱' : '隐藏图谱'
-            this.$confirm(`确定要对所选会员【${isAtlasTip}】吗？`, '提示', {
-                confirmButtonText: '确定',
-                cancelButtonText: '取消',
+            let isAtlasTip = isAtlas === true ? 'Display Atlas' : 'Hidden Atlas'//'显示图谱' : '隐藏图谱'
+            this.$confirm(`Are you sure you want to【${isAtlasTip}】？`, 'Hint', {//`确定要对所选会员【${isAtlasTip}】吗？`, '提示'
+                confirmButtonText: 'confirm',//确定
+                cancelButtonText: 'cancel',//取消
                 type: 'warning'
             }).then(() => {
                 let selectedIds = []
@@ -512,15 +512,15 @@
         handleIsRechargeManage(isRecharge) {
             if (this.multipleSelection.length < 1) {
                 this.$message({
-                    message: '请勾选要操作的会员',
+                    message: 'Please check the member to be operated',//请勾选要操作的会员
                     type: 'warning'
                 })
                 return
             }
-            let isRechargeTip = isRecharge === true ? '显示充值' : '隐藏充值'
-            this.$confirm(`确定要对所选会员【${isRechargeTip}】吗？`, '提示', {
-                confirmButtonText: '确定',
-                cancelButtonText: '取消',
+            let isRechargeTip = isRecharge === true ? 'Display recharge' : 'Hide recharge'// '显示充值' : '隐藏充值'
+            this.$confirm(`Are you sure you want to【${isRechargeTip}】？`, 'Hint', {//`确定要对所选会员【${isRechargeTip}】吗？`, '提示'
+                confirmButtonText: 'confirm',//确定
+                cancelButtonText: 'cancel',//取消
                 type: 'warning'
             }).then(() => {
                 let selectedIds = []
@@ -541,15 +541,15 @@
       getTypeName(type) {
         switch (type) {
           case 1:
-            return '按指定会员'
+            return 'By designated member'//按指定会员
           case 2:
-            return '按开拓网络'
+            return 'Expand network by'//按开拓网络
           case 3:
-            return '按安置网络'
+            return 'By placement network'//按安置网络
           case 4:
-            return '按会员体系'
+            return 'By membership system'//按会员体系
           case 5:
-            return '按省份地区'
+            return 'By province and region'//按省份地区
           default:
             return ''
         }
@@ -558,13 +558,13 @@
         if (type === 2 || type === 3 || type === 4) {
           if (this.multipleSelection.length > 1) {
             this.$message({
-              message: '此登录管理不允许勾选多名会员',
+              message: 'Multiple members are not allowed to be checked in this login management',//此登录管理不允许勾选多名会员
               type: 'warning'
             })
             return;
           } else if (this.multipleSelection.length < 1) {
             this.$message({
-              message: '请选择会员编号',
+              message: 'Please select a member number',//请选择会员编号
               type: 'warning'
             })
             return;
@@ -572,27 +572,27 @@
         }
         if (type === 1 && this.multipleSelection.length <= 0) {
           this.$message({
-            message: '请选择会员编号',
+            message: 'Please select a member number',//请选择会员编号
             type: 'warning'
           })
           return;
         }
         if (type === 5 && this.multipleSelection.length > 0) {
           this.$message({
-            message: '按照地区关闭登录无需勾选会员',
+            message: 'Closing login by region without checking member',//按照地区关闭登录无需勾选会员
             type: 'warning'
           })
           return;
         }
         this.formCloseLogin = {
           userName: null,
-          typeName: '登录管理',
+          typeName: 'Login management',//登录管理
           type: null,
           isClose: 0,
           remark: '',
           areaSelected: null,
         },
-          this.formCloseLogin.typeName = this.getTypeName(type) + '管理登录'
+          this.formCloseLogin.typeName = this.getTypeName(type) + 'Manage logins'//管理登录
         this.formCloseLogin.type = type
         this.dialogVisible = true
       },
@@ -662,9 +662,9 @@
         // })
       },
       handleExport() {
-        this.$confirm(`确定要导出当前数据吗？`, '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
+        this.$confirm(`Are you sure you want to export the current data？`, 'Hint', {//(`确定要导出当前数据吗？`, '提示', 
+          confirmButtonText: 'confirm',//确定
+          cancelButtonText: 'cancel',//取消
           type: 'warning'
         }).then(() => {
           return network.getData(`user/index-export`, this.filterModel)
@@ -684,13 +684,13 @@
         if (type === 2 || type === 3 || type === 4) {
           if (this.multipleSelection.length > 1) {
             this.$message({
-              message: '此报单管理不允许勾选多名会员',
+              message: 'Multiple members are not allowed to be checked in this entry management',//此报单管理不允许勾选多名会员
               type: 'warning'
             })
             return;
           } else if (this.multipleSelection.length < 1) {
             this.$message({
-              message: '请勾选要管理报单的会员',
+              message: 'Please check the member to manage the entry',//请勾选要管理报单的会员
               type: 'warning'
             })
             return;
@@ -698,27 +698,27 @@
         }
         if (type === 1 && this.multipleSelection.length <= 0) {
           this.$message({
-            message: '请勾选要管理报单的会员',
+            message: 'Please check the member to manage the entry',//请勾选要管理报单的会员
             type: 'warning'
           })
           return;
         }
         if (type === 5 && this.multipleSelection.length > 0) {
           this.$message({
-            message: '按照地区关闭报单无需勾选会员',
+            message: 'Closing entry by region without checking member',//按照地区关闭报单无需勾选会员
             type: 'warning'
           })
           return;
         }
         this.formCloseDec = {
           userName: null,
-          typeName: '管理报单',
+          typeName: 'Manage entry',//管理报单
           type: null,
           isClose: 0,
           remark: '',
           areaSelected: null,
         },
-          this.formCloseDec.typeName = this.getTypeName(type) + '管理报单'
+          this.formCloseDec.typeName = this.getTypeName(type) + 'Manage entry',//管理报单
         this.formCloseDec.type = type
         this.dialogDecVisible = true
       },

backendEle/src/views/user/move.vue

@@ -2,10 +2,10 @@
   <div v-loading="loading">
     <div class="white-box">
       <el-tabs v-model="filterStatus" @tab-click="handleFilterStatusClick">
-        <el-tab-pane label="全部" name="-1" :lazy="true"></el-tab-pane>
-        <el-tab-pane label="待审核" name="0" :lazy="true"></el-tab-pane>
-        <el-tab-pane label="审核通过" name="1" :lazy="true"></el-tab-pane>
-        <el-tab-pane label="审核拒绝" name="3" :lazy="true"></el-tab-pane>
+        <el-tab-pane label="whole" name="-1" :lazy="true"></el-tab-pane><!-- 全部 -->
+        <el-tab-pane label="To be reviewed" name="0" :lazy="true"></el-tab-pane><!-- 待审核 -->
+        <el-tab-pane label="Approved" name="1" :lazy="true"></el-tab-pane><!-- 审核通过 -->
+        <el-tab-pane label="Audit reject" name="3" :lazy="true"></el-tab-pane><!-- 审核拒绝 -->
       </el-tabs>
       <div class="filter-box">
         <filter-user ref="filterUser" :filter-types.sync="filterTypes" @select-value="handleFilterUser"></filter-user>
@@ -28,22 +28,22 @@
             </template>
           </template>
         </el-table-column>
-        <el-table-column fixed="right" label="操作" width="180" v-if="tableHeaders">
+        <el-table-column fixed="right" label="operation" width="180" v-if="tableHeaders"><!-- 操作 -->
           <template slot-scope="scope"
                     v-if="scope.row.AUDIT_STATUS==='0' && (permission.hasPermission(`user/move-pass`)||permission.hasPermission(`user/move-audit`)||permission.hasPermission(`user/move-delete`))">
             <el-dropdown size="small" trigger="click">
               <el-button type="primary" size="small" @click.stop="">
-                操作该数据<i class="el-icon-arrow-down el-icon--right"></i>
+                Operate on this data<!-- 操作该数据 --><i class="el-icon-arrow-down el-icon--right"></i>
               </el-button>
               <el-dropdown-menu slot="dropdown">
                 <el-dropdown-item command="pass" @click.native="handleAuditShow(scope.row)"
-                                  v-show="permission.hasPermission(`user/move-pass`)">审核通过
+                                  v-show="permission.hasPermission(`user/move-pass`)">Approved<!-- 审核通过 -->
                 </el-dropdown-item>
                 <el-dropdown-item command="refuse" @click.native="handleAudit(scope.row, 'reject')"
-                                  v-show="permission.hasPermission(`user/move-audit`)">审核拒绝
+                                  v-show="permission.hasPermission(`user/move-audit`)">Audit reject<!-- 审核拒绝 -->
                 </el-dropdown-item>
                 <el-dropdown-item command="del" @click.native="handleDel(scope.row.ID)"
-                                  v-show="permission.hasPermission(`user/move-delete`)">删除数据
+                                  v-show="permission.hasPermission(`user/move-delete`)">Delete data<!-- 删除数据 -->
                 </el-dropdown-item>
               </el-dropdown-menu>
             </el-dropdown>
@@ -53,145 +53,145 @@
       <div class="white-box-footer">
         <el-dropdown size="small" trigger="click" @command="handleMuli" v-if="(filterStatus==='0') && permission.hasPermission(`user/move-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="del" @click.native="handleDel()">批量删除</el-dropdown-item>
+            <el-dropdown-item command="del" @click.native="handleDel()">Batch delete<!-- 批量删除 --></el-dropdown-item>
           </el-dropdown-menu>
         </el-dropdown>
         <el-button type="primary" size="small" @click="handleAdd" icon="el-icon-plus"
-                   v-show="permission.hasPermission(`user/move-add`)">新建移网申请
+                   v-show="permission.hasPermission(`user/move-add`)">New network transfer application<!-- 新建移网申请 -->
         </el-button>
         <el-button type="success" size="small" @click="handleExport"
-                   v-show="permission.hasPermission(`user/move-export`)">导出Excel
+                   v-show="permission.hasPermission(`user/move-export`)">Export Excel
         </el-button>
         <pagination :total="totalCount" :page_size="pageSize" @size-change="handleSizeChange" @current-change="handleCurrentChange"></pagination>
       </div>
     </div>
-    <el-dialog title="修改移网信息" :visible.sync="dialogEditFormVisible">
+    <el-dialog title="Modify network transfer information" :visible.sync="dialogEditFormVisible"><!-- 修改移网信息 -->
       <el-form :model="form" label-width="250px" class="form-dialog" v-loading="dialogEditLoading">
-        <el-form-item label="移网类型">
-          <el-select v-model="form.type" placeholder="请选择移网类型">
+        <el-form-item label="Network transfer type"><!-- 移网类型 -->
+          <el-select v-model="form.type" placeholder="Please select a network transfer type"><!-- 请选择移网类型 -->
             <el-option v-for="(item,key) in netType" :label="item.name" :value="item.id" :key="key"></el-option>
           </el-select>
         </el-form-item>
         <div v-if="form.type==='network'">
-          <el-form-item label="移动会员编号">
+          <el-form-item label="Mobile member code"><!-- 移动会员编号 -->
             <el-input v-model="form.baseInfo.USER_NAME" :disabled="true"></el-input>
           </el-form-item>
-          <el-form-item label="移动会员姓名">
+          <el-form-item label="Mobile member name"><!-- 移动会员姓名 -->
             <el-input v-model="form.baseInfo.REAL_NAME" :disabled="true"></el-input>
           </el-form-item>
-          <el-form-item label="原上级编号">
+          <el-form-item label="Original superior No"><!-- 原上级编号 -->
             <el-input v-model="form.baseInfo.CON_USER_NAME" :disabled="true"></el-input>
           </el-form-item>
-          <el-form-item label="原上级姓名">
+          <el-form-item label="Original superior name"><!-- 原上级姓名 -->
             <el-input v-model="form.baseInfo.CON_REAL_NAME" :disabled="true"></el-input>
           </el-form-item>
-          <el-form-item label="移动到节点会员编号">
+          <el-form-item label="Move to node member code"><!-- 移动到节点会员编号 -->
             <el-input v-model="form.toConUserName"></el-input>
           </el-form-item>
-          <el-form-item label="移动到节点会员姓名">
+          <el-form-item label="Move to node member name"><!-- 移动到节点会员姓名 -->
             <el-input v-model="form.toConRealName"></el-input>
           </el-form-item>
         </div>
         <div v-if="form.type==='relation'">
-          <el-form-item label="移动会员编号">
+          <el-form-item label="Mobile member code"><!-- 移动会员编号 -->
             <el-input v-model="form.baseInfo.USER_NAME" :disabled="true"></el-input>
           </el-form-item>
-          <el-form-item label="移动会员姓名">
+          <el-form-item label="Mobile member name"><!-- 移动会员姓名 -->
             <el-input v-model="form.baseInfo.REAL_NAME" :disabled="true"></el-input>
           </el-form-item>
-          <el-form-item label="原开拓人编号">
+          <el-form-item label="Original developer No"><!-- 原开拓人编号 -->
             <el-input v-model="form.baseInfo.REC_USER_NAME" :disabled="true"></el-input>
           </el-form-item>
-          <el-form-item label="原开拓人姓名">
+          <el-form-item label="Name of original developer"><!-- 原开拓人姓名 -->
             <el-input v-model="form.baseInfo.REC_REAL_NAME" :disabled="true"></el-input>
           </el-form-item>
-          <el-form-item label="移动到开拓会员编号">
+          <el-form-item label="Move to development member code"><!-- 移动到开拓会员编号 -->
             <el-input v-model="form.toConUserName"></el-input>
           </el-form-item>
-          <el-form-item label="移动到开拓会员姓名">
+          <el-form-item label="Move to development member name"><!-- 移动到开拓会员姓名 -->
             <el-input v-model="form.toConRealName"></el-input>
           </el-form-item>
         </div>
-        <el-form-item v-if="form.type==='network'" label="移动到区位">
-          <el-select v-model="form.location" placeholder="移动到区位">
-            <el-option label="一市场" value="1" key="location_1"></el-option>
-            <el-option label="二市场" value="2" key="location_2"></el-option>
-            <el-option label="三市场" value="3" key="location_3"></el-option>
+        <el-form-item v-if="form.type==='network'" label="Move to location"><!-- 移动到区位 -->
+          <el-select v-model="form.location" placeholder="Move to location"><!-- 移动到区位 -->
+            <el-option label="I. Market" value="1" key="location_1"></el-option><!-- 一市场 -->
+            <el-option label="II. Market" value="2" key="location_2"></el-option><!-- 二市场 -->
+            <el-option label="III. Market" value="3" key="location_3"></el-option><!-- 三市场 -->
           </el-select>
         </el-form-item>
-        <el-form-item label="备注">
+        <el-form-item label="note"><!-- 备注 -->
           <el-input v-model="form.remark"></el-input>
         </el-form-item>
       </el-form>
       <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 network transfer information" :visible.sync="dialogAuditFormVisible"><!-- 审核移网信息 -->
       <el-form :model="form" label-width="250px" class="form-dialog" v-loading="dialogAuditLoading">
-        <el-form-item label="移网类型">
-          <el-select v-model="form.type" placeholder="请选择移网类型">
+        <el-form-item label="Network transfer type"><!-- 移网类型 -->
+          <el-select v-model="form.type" placeholder="Please select a network transfer type"><!-- 请选择移网类型 -->
             <el-option v-for="(item,key) in netType" :label="item.name" :value="item.id" :key="key"></el-option>
           </el-select>
         </el-form-item>
         <div v-if="form.type==='network'">
-          <el-form-item label="移动会员编号">
+          <el-form-item label="Mobile member code"><!-- 移动会员编号 -->
             <el-input v-model="form.baseInfo.USER_NAME" :disabled="true"></el-input>
           </el-form-item>
-          <el-form-item label="移动会员姓名">
+          <el-form-item label="Mobile member name"><!-- 移动会员姓名 -->
             <el-input v-model="form.baseInfo.REAL_NAME" :disabled="true"></el-input>
           </el-form-item>
-          <el-form-item label="原上级编号">
+          <el-form-item label="Original superior No"><!-- 原上级编号 -->
             <el-input v-model="form.baseInfo.CON_USER_NAME" :disabled="true"></el-input>
           </el-form-item>
-          <el-form-item label="原上级姓名">
+          <el-form-item label="Original superior name"><!-- 原上级姓名 -->
             <el-input v-model="form.baseInfo.CON_REAL_NAME" :disabled="true"></el-input>
           </el-form-item>
-          <el-form-item label="移动到节点会员编号">
+          <el-form-item label="Move to node member code"><!-- 移动到节点会员编号 -->
             <el-input v-model="form.toConUserName"></el-input>
           </el-form-item>
-          <el-form-item label="移动到节点会员姓名">
+          <el-form-item label="Move to node member name"><!-- 移动到节点会员姓名 -->
             <el-input v-model="form.toConRealName"></el-input>
           </el-form-item>
         </div>
         <div v-if="form.type==='relation'">
-          <el-form-item label="移动会员编号">
+          <el-form-item label="Mobile member code"><!-- 移动会员编号 -->
             <el-input v-model="form.baseInfo.USER_NAME" :disabled="true"></el-input>
           </el-form-item>
-          <el-form-item label="移动会员姓名">
+          <el-form-item label="Mobile member name"><!-- 移动会员姓名 -->
             <el-input v-model="form.baseInfo.REAL_NAME" :disabled="true"></el-input>
           </el-form-item>
-          <el-form-item label="原开拓人编号">
+          <el-form-item label="Original developer No"><!-- 原开拓人编号 -->
             <el-input v-model="form.baseInfo.REC_USER_NAME" :disabled="true"></el-input>
           </el-form-item>
-          <el-form-item label="原开拓人姓名">
+          <el-form-item label="Name of original developer"><!-- 原开拓人姓名 -->
             <el-input v-model="form.baseInfo.REC_REAL_NAME" :disabled="true"></el-input>
           </el-form-item>
-          <el-form-item label="移动到开拓会员编号">
+          <el-form-item label="Move to development member code"><!-- 移动到开拓会员编号 -->
             <el-input v-model="form.toConUserName"></el-input>
           </el-form-item>
-          <el-form-item label="移动到开拓会员姓名">
+          <el-form-item label="Move to development member name"><!-- 移动到开拓会员姓名 -->
             <el-input v-model="form.toConRealName"></el-input>
           </el-form-item>
         </div>
-        <el-form-item v-if="form.type==='network'" label="移动到区位">
-          <el-select v-model="form.location" placeholder="移动到区位">
-            <el-option label="一市场" value="1" key="location_1"></el-option>
-            <el-option label="二市场" value="2" key="location_2"></el-option>
-            <el-option label="三市场" value="3" key="location_3"></el-option>
+        <el-form-item v-if="form.type==='network'" label="Move to location"><!-- 移动到区位 -->
+          <el-select v-model="form.location" placeholder="Move to location"><!-- 移动到区位 -->
+            <el-option label="I. Market" value="1" key="location_1"></el-option><!-- 一市场 -->
+            <el-option label="II. Market" value="2" key="location_2"></el-option><!-- 二市场 -->
+            <el-option label="III. Market" value="3" key="location_3"></el-option><!-- 三市场 -->
           </el-select>
         </el-form-item>
-        <el-form-item label="备注">
+        <el-form-item label="note"><!-- 备注 -->
           <el-input v-model="form.remark"></el-input>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button @click="dialogAuditFormVisible = false">取 消</el-button>
-        <el-button type="primary" @click.native="handleAuditPass">通 过</el-button>
+        <el-button @click="dialogAuditFormVisible = false">Cancel<!-- 取 消 --></el-button>
+        <el-button type="primary" @click.native="handleAuditPass">Adopted<!-- 通 过 --></el-button>
       </div>
     </el-dialog>
   </div>
@@ -259,7 +259,7 @@
       handleMuli(command) {
         if (this.multipleSelection.length < 1) {
           this.$message({
-            message: '请选择要操作的记录',
+            message: 'Please select the record to operate',//请选择要操作的记录
             type: 'warning'
           })
           return;
@@ -293,7 +293,7 @@
       handleEdit() {
         this.dialogEditFormVisible = false
         this.$message({
-          message: '正在修改数据',
+          message: 'Modifying data',//正在修改数据
           type: 'info'
         })
         let path = 'user/move-edit'
@@ -322,7 +322,7 @@
       handleAuditPass() {
         this.dialogAuditFormVisible = false
         this.$message({
-          message: '正在通过审核',
+          message: 'Passing audit',//正在通过审核
           type: 'info'
         })
         this.form.auditStatus = 'true'
@@ -338,19 +338,19 @@
       },
       handleAudit(row = null, status) {
         let obj = this
-        let title = '确定要通过审核？备注：'
+        let title = 'Are you sure you want to pass the audit? note：'//确定要通过审核？备注：
         if (status === 'reject') {
-          title = '确定要拒绝审核？备注：'
+          title = 'Are you sure you want to reject the approval? note：'//确定要拒绝审核？备注：
         }
 
-        this.$prompt(title, '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
+        this.$prompt(title, 'Hint', {//提示
+          confirmButtonText: 'confirm',//确定
+          cancelButtonText: 'cancel',//取消
           inputValue: '',
           //type: 'warning',
         }).then(({value}) => {
           this.$message({
-            message: '正在操作，请稍后',
+            message: 'Operation in progress, please wait',//正在操作，请稍后
             type: 'info'
           })
           let selectedIds = []
@@ -378,9 +378,9 @@
       },
       handleDel(id = null) {
         let obj = this
-        this.$confirm('确定删除选定的数据？', '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
+        this.$confirm('are you sure to delete the selected data?', 'Hint', {//'确定删除选定的数据？', '提示'
+          confirmButtonText: 'confirm',//确定
+          cancelButtonText: 'cancel',//取消
           type: 'warning'
         }).then(() => {
           let selectedIds = []
@@ -433,9 +433,9 @@
       //   }, null, ['MOVE_PERCENT'])
       // },
       handleExport() {
-        this.$confirm(`确定要导出当前数据吗？`, '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
+        this.$confirm(`Are you sure you want to export the current data?`, 'Hint', {//`确定要导出当前数据吗？`, '提示',
+          confirmButtonText: 'confirm',//确定
+          cancelButtonText: 'cancel',//取消
           type: 'warning'
         }).then(() => {
           return network.getData(`user/move-export`, this.filterModel)

backendEle/src/views/user/user-add-opt.vue

@@ -2,46 +2,46 @@
   <div v-loading="loading">
     <div class="white-box">
       <el-tabs v-model="tabActiveName">
-        <el-tab-pane label="手动添加" name="first" v-if="permission.hasPermission(`user/user-add`)">
+        <el-tab-pane label="Add manually" name="first" v-if="permission.hasPermission(`user/user-add`)"><!-- 手动添加 -->
           <el-form ref="form" :model="form" label-width="250px" class="form-page">
 
-            <div class="hr-tip"><span>账号信息</span></div>
+            <div class="hr-tip"><span>account information<!-- 账号信息 --></span></div>
 
             <el-form-item>
               <template slot="label">
                 <span class="text-danger">*</span>
-                会员编号
+                Member code<!-- 会员编号 -->
               </template>
               <el-input v-model="form.userName"></el-input>
             </el-form-item>
             <el-form-item>
               <template slot="label">
                 <span class="text-danger">*</span>
-                实时报单级别
+                Real time declaration level<!-- 实时报单级别 -->
               </template>
-              <el-select v-model="form.decLv" placeholder="请选择报单级别">
+              <el-select v-model="form.decLv" placeholder="Please select the entry level"><!-- 请选择报单级别 -->
                 <el-option v-for="(item,index) in allDecLevel" :key="index" :label="item.LEVEL_NAME"
                            :value="item.ID"></el-option>
               </el-select>
             </el-form-item>
-            <el-form-item label="是否报单中心">
+            <el-form-item label="Declaration center or not"><!-- 是否报单中心 -->
               <el-switch v-model="form.isDec"></el-switch>
             </el-form-item>
-            <el-form-item label="报单中心级别" v-show="form.isDec">
-              <el-select v-model="form.decRoleId" placeholder="请选择报单中心级别">
+            <el-form-item label="Entry center level" v-show="form.isDec"><!-- 报单中心级别 -->
+              <el-select v-model="form.decRoleId" placeholder="Please select the entry center level"><!-- 请选择报单中心级别 -->
                 <el-option v-for="(item,index) in allDecRole" :key="index" :label="item.ROLE_NAME"
                            :value="item.ID"></el-option>
               </el-select>
             </el-form-item>
 
-            <div class="hr-tip"><span>网络信息</span></div>
+            <div class="hr-tip"><span>network information<!-- 网络信息 --></span></div>
 
             <el-form-item>
               <template slot="label">
                 <span class="text-danger">*</span>
-                报单中心编号
+                Entry Center No<!-- 报单中心编号 -->
               </template>
-              <el-tooltip class="item" effect="dark" content="输入编号后点击空白处，可检测该编号的会员姓名" placement="top-start">
+              <el-tooltip class="item" effect="dark" content="After entering the number, click the blank space to detect the member name of the number" placement="top-start"><!-- 输入编号后点击空白处，可检测该编号的会员姓名 -->
                 <el-input v-model="form.decUserName" @change="handleChkDecUser">
                   <template slot="append">【{{decRealName}}】</template>
                 </el-input>
@@ -50,7 +50,7 @@
             <el-form-item>
               <template slot="label">
                 <span class="text-danger">*</span>
-                接点人
+                Contact person<!-- 接点人 -->
               </template>
               <el-input v-model="form.conUserName" @change="handleChkConUser">
                 <template slot="append">【{{conRealName}}】</template>
@@ -59,54 +59,60 @@
             <el-form-item>
               <template slot="label">
                 <span class="text-danger">*</span>
-                安置区位
+                Resettlement location<!-- 安置区位 -->
               </template>
               <el-radio-group v-model="form.location">
+<<<<<<< HEAD
                 <el-radio-button :label="1">左区</el-radio-button>
                 <el-radio-button :label="2">右区</el-radio-button>
+=======
+                <el-radio-button :label="1">left<!-- 左区 --></el-radio-button>
+                <el-radio-button :label="2">right<!-- 中区 --></el-radio-button>
+              <!--  <el-radio-button :label="3">右区</el-radio-button> -->
+>>>>>>> 5570d0bbb08148d2d4265a7483ab913771a95e3e
               </el-radio-group>
             </el-form-item>
             <el-form-item>
               <template slot="label">
                 <span class="text-danger">*</span>
-                开拓人
+                Pioneer<!-- 开拓人 -->
               </template>
               <el-input v-model="form.recUserName" @change="handleChkRecUser">
                 <template slot="append">【{{recRealName}}】</template>
               </el-input>
             </el-form-item>
 
-            <div class="hr-tip"><span>个人资料</span></div>
+            <div class="hr-tip"><span>personal data<!-- 个人资料 --></span></div>
 
             <el-form-item>
               <template slot="label">
                 <span class="text-danger">*</span>
-                会员姓名
+                Member name<!-- 会员姓名 -->
               </template>
               <el-input v-model="form.realName"></el-input>
             </el-form-item>
             <el-form-item>
               <template slot="label">
                 <span class="text-danger">*</span>
-                身份证号
+                Identity No.<!-- 身份证号 -->
               </template>
               <el-input v-model="form.idCard" maxlength="18" @change="handleChkBirth"></el-input>
             </el-form-item>
             <el-form-item>
               <template slot="label">
-                身份证地址
+                ID card address<!-- 身份证地址 -->
               </template>
               <el-input v-model="form.address"></el-input>
             </el-form-item>
             <el-form-item>
               <template slot="label">
-                手机号
+                phone number<!-- 手机号 -->
               </template>
               <el-input v-model="form.mobile" maxlength="11"></el-input>
             </el-form-item>
             <el-form-item prop="areaSelected">
               <template slot="label">
-                常用地区
+                Common areas<!-- 常用地区 -->
               </template>
               <el-cascader
                   size="large"
@@ -114,6 +120,7 @@
                   v-model="form.areaSelected">
               </el-cascader>
             </el-form-item>
+<<<<<<< HEAD
 <!--            <el-collapse style="margin-bottom: 20px;">-->
 <!--              <el-collapse-item title="其他信息" name="1">-->
 <!--                <el-form-item label="生日" v-show="false">-->
@@ -149,11 +156,48 @@
 <!--                <el-form-item label="银行账号">-->
 <!--                  <el-input v-model="form.bankNo" maxlength="19"></el-input>-->
 <!--                </el-form-item>-->
+=======
+            <el-collapse style="margin-bottom: 20px;">
+              <el-collapse-item title="Other information" name="1"><!-- 其他信息 -->
+                <el-form-item label="birthday" v-show="false"><!-- 生日 -->
+                  <el-date-picker
+                      v-model="form.birthday"
+                      type="date"
+                      placeholder="Obtained according to ID card" :readonly="true"><!-- 根据身份证获取 -->
+                  </el-date-picker>
+                </el-form-item>
+
+                <el-form-item label="Alternate Phone number​" v-show="false"><!-- 备用手机号 -->
+                  <el-input v-model="form.tel" maxlength="11"></el-input>
+                </el-form-item>
+
+                <div class="hr-tip"><span>Bank information<!-- 银行信息 --></span></div>
+
+                <el-form-item label="Bank Name"><!-- 开户行 -->
+                  <el-select v-model="form.openBank" placeholder="Please select the Bank of deposit"><!-- 请选择开户行 -->
+                    <el-option v-for="(item,index) in allOpenBank" :key="index" :label="item.BANK_NAME"
+                               :value="item.BANK_CODE"></el-option>
+                  </el-select>
+                </el-form-item>
+                <el-form-item label="Bank region" prop="bankAreaSelected"><!-- 银行所在地区 -->
+                  <el-cascader
+                      size="large"
+                      :options="regionData"
+                      v-model="form.bankAreaSelected">
+                  </el-cascader>
+                </el-form-item>
+                <el-form-item label="Account opening sub branch"><!-- 开户支行 -->
+                  <el-input v-model="form.bankAddress"></el-input>
+                </el-form-item>
+                <el-form-item label="bank account"><!-- 银行账号 -->
+                  <el-input v-model="form.bankNo" maxlength="19"></el-input>
+                </el-form-item>
+>>>>>>> 5570d0bbb08148d2d4265a7483ab913771a95e3e
 
 <!--              </el-collapse-item>-->
 <!--            </el-collapse>-->
             <el-form-item>
-              <el-button type="primary" @click="onSubmit" :loading="submitButtonStat">保存</el-button>
+              <el-button type="primary" @click="onSubmit" :loading="submitButtonStat">SAVE<!-- 保存 --></el-button>
             </el-form-item>
           </el-form>
         </el-tab-pane>
@@ -275,7 +319,7 @@
     methods: {
       getData() {
         this.$message({
-          message: '正在获取数据，请稍后',
+          message: 'Getting data, please wait',//正在获取数据，请稍后
         })
         if (permission.hasPermission(`user/user-del`)) {
           this.tabActiveName = 'third'
@@ -376,9 +420,9 @@
       },
       onDel() {
         let _this = this
-        _this.$confirm('确定要删除该会员？此操作不可撤销！', '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
+        _this.$confirm('Are you sure you want to delete this member? This action cannot be undone！', 'Hint', {//'确定要删除该会员？此操作不可撤销！', '提示',
+          confirmButtonText: 'confirm',//确定
+          cancelButtonText: 'cancel',//取消
           type: 'warning'
         }).then(() => {
           _this._handleDel()

common/models/ShopGoods.php

@@ -35,7 +35,7 @@ class ShopGoods extends \common\components\ActiveRecord
     const SALE_TYPE = [
         1 => [
             'id' => 1,
-            'name' => 'Balance payment', //余额购买
+            'name' => 'Account Balance', //余额购买
             'label' => 'cash',
         ],
 //        2 => [

common/models/forms/AdminAddUserForm.php

@@ -101,26 +101,26 @@ class AdminAddUserForm extends Model {
 
     public function attributeLabels() {
         return [
-            'userName' => '会员编号',
-            'nation' => '民族',
-            'realName' => '会员姓名',
-            'idCard' => '身份证号',
-            'mobile' => '手机号',
-            'address' => '地址',
-            'openBank' => '开户行',
-            'bankAddress' => '开户支行',
-            'bankNo' => '银行账号',
-            'bankAreaSelected' => '银行地区',
-            'decLv' => '实时报单级别',
-            'areaSelected' => '所在地区',
-            'tel' => '电话',
-            'isDec' => '是否报单中心',
-            'decUserName' => '报单中心编号',
-            'birthday' => '生日',
-            'decRoleId' => '报单中心级别',
-            'conUserName' => '接点人会员编号',
-            'recUserName' => '开拓人会员编号',
-            'location' => '安置区域',
+            'userName' => 'Member code',//会员编号
+            'nation' => 'nation',//民族
+            'realName' => 'Member name',//会员姓名
+            'idCard' => 'ID',//身份证号
+            'mobile' => 'phone number',//手机号
+            'address' => 'address',//地址
+            'openBank' => 'Bank Name',//开户行
+            'bankAddress' => 'Account opening sub branch',//开户支行
+            'bankNo' => 'bank account',//银行账号
+            'bankAreaSelected' => 'Banking region',//银行地区
+            'decLv' => 'Real time declaration level',//实时报单级别
+            'areaSelected' => 'Location',//所在地区
+            'tel' => 'Telephone',//电话
+            'isDec' => 'Declaration center or not',//是否报单中心
+            'decUserName' => 'Entry Center No',//报单中心编号
+            'birthday' => 'birthday',//生日
+            'decRoleId' => 'Entry center level',//报单中心级别
+            'conUserName' => 'Contact person Member No',//接点人会员编号
+            'recUserName' => 'Pioneer Member No',
+            'location' => 'Resettlement area',//安置区域
         ];
     }
 
@@ -130,7 +130,7 @@ class AdminAddUserForm extends Model {
      */
     public function issetDec($attribute) {
         if (!$decUser = User::find()->select('ID')->where('IS_DEC=1 AND USER_NAME=:USER_NAME', [':USER_NAME' => $this->decUserName])->asArray()->one()) {
-            $this->addError($attribute, '报单中心不存在');
+            $this->addError($attribute, 'Entry center does not exist');//报单中心不存在
         } else {
             $this->_decId = $decUser['ID'];
         }
@@ -142,13 +142,13 @@ class AdminAddUserForm extends Model {
      */
     public function issetDecRoleId($attribute) {
         if ($this->isDec && !$this->decRoleId) {
-            $this->addError($attribute, '报单中心级别不能为空');
+            $this->addError($attribute, 'Entry center level cannot be empty');//报单中心级别不能为空
         }
     }
 
     public function isLocation($attribute) {
         if (!in_array($this->location, ['1', '2', '3'])) {
-            $this->addError($attribute, '区位错误');
+            $this->addError($attribute, 'Location error');//区位错误
         }
     }
 
@@ -158,45 +158,45 @@ class AdminAddUserForm extends Model {
      */
     public function isDelUserName($attribute) {
         if (!$this->_delUserId = Info::getUserIdByUserName($this->delUserName)) {
-            $this->addError($attribute, '用户不存在');
+            $this->addError($attribute, 'user does not exist');//用户不存在
         }
         if (UserInfo::findOneAsArray('REC_UID=:REC_UID AND DELETED=0', [':REC_UID' => $this->_delUserId], 'USER_ID')) {
-            $this->addError($attribute, '此会员已开拓其它会员不可以删除');
+            $this->addError($attribute, 'This member has developed other members and cannot be deleted');//此会员已开拓其它会员不可以删除
         }
         if (UserInfo::findOneAsArray('CON_UID=:CON_UID AND DELETED=0', [':CON_UID' => $this->_delUserId], 'USER_ID')) {
-            $this->addError($attribute, '此会员已安置其它会员不可以删除');
+            $this->addError($attribute, 'This member has been placed with other members and cannot be deleted');//此会员已安置其它会员不可以删除
         }
         if (User::findOneAsArray('DEC_ID=:DEC_ID AND DELETED=0', [':DEC_ID' => $this->_delUserId], 'ID')) {
-            $this->addError($attribute, '此会员已报单其它会员不可以删除');
+            $this->addError($attribute, 'This member has submitted a bill and other members cannot delete it');//此会员已报单其它会员不可以删除
         }
         if (DecOrder::findOneAsArray('USER_ID=:TO_USER_ID OR TO_USER_ID=:TO_USER_ID', [':TO_USER_ID' => $this->_delUserId], 'ID')) {
-            $this->addError($attribute, '此会员已报单不可以删除');
+            $this->addError($attribute, 'This member has submitted a bill and cannot be deleted');//此会员已报单不可以删除
         }
         $info = Info::baseInfoWithNet($this->_delUserId);
         if ($info['REG_FROM'] == 1) {
-            $this->addError($attribute, '此会员不是空单无法删除');
+            $this->addError($attribute, 'This member is not empty and cannot be deleted');//此会员不是空单无法删除
         }
         $sentMaxPeriodNum = Period::sentMaxPeriodNum();
         if ($info['PERIOD_AT'] <= $sentMaxPeriodNum) {
-            $this->addError($attribute, '此会员加入期数小于等于已挂网期数');
+            $this->addError($attribute, 'The number of enrollment periods of this member is less than or equal to the number of online periods');//此会员加入期数小于等于已挂网期数
         }
         if (User::find()->where('ID=:ID AND VERIFIED=1', [':ID' => $this->_delUserId])->exists()) {
-            $this->addError($attribute, '此会员已实名认证无法删除');
+            $this->addError($attribute, 'This member has been authenticated by real name and cannot be deleted');//此会员已实名认证无法删除
         }
         if (User::find()->where('ID=:ID AND SUB_COM_LEADER=1', [':ID' => $this->_delUserId])->exists()) {
-            $this->addError($attribute, '此会员是分公司领导人无法删除');
+            $this->addError($attribute, 'This member is a branch leader and cannot be deleted');//此会员是分公司领导人无法删除
         }
         if (UserInfo::find()->where('USER_ID=:USER_ID AND (IS_GROUP_LEADER=1 OR IS_SYSTEM_LEADER=1 OR IS_BIND=1 OR IS_TEAM=1)', [':USER_ID' => $this->_delUserId])->exists()) {
-            $this->addError($attribute, '此会员存在以下情况无法删除，团队领导人/体系领导人/点位绑定/点位合作');
+            $this->addError($attribute, 'This member cannot be deleted due to the following conditions: Team Leader / system leader / point binding / point cooperation');//此会员存在以下情况无法删除，团队领导人/体系领导人/点位绑定/点位合作
         }
         if (Balance::hasBonus($this->_delUserId)) {
-            $this->addError($attribute, '此会员有余额无法删除');
+            $this->addError($attribute, 'This member has balance and cannot be deleted');//此会员有余额无法删除
         }
         if (FlowBonus::findOneAsArray('USER_ID=:USER_ID', [':USER_ID' => $this->_delUserId], 'ID')) {
-            $this->addError($attribute, '该会员产生过余额流水无法删除');
+            $this->addError($attribute, 'This member has generated a balance flow, which cannot be deleted');//该会员产生过余额流水无法删除
         }
         if (UserMove::findOneAsArray('USER_ID=:USER_ID', [':USER_ID' => $this->_delUserId], 'ID')) {
-            $this->addError($attribute, '该会员发生过移网无法删除');
+            $this->addError($attribute, 'The member cannot be deleted due to network migration');//该会员发生过移网无法删除
         }
     }
 
@@ -224,8 +224,8 @@ class AdminAddUserForm extends Model {
             $user->REAL_NAME = $this->realName;
             $user->ID_CARD = $this->idCard;
             $user->MOBILE = $this->mobile;
-            $user->ADDRESS = '无';
-            $user->ADDRESS = $this->address ? $this->address : '无';
+            $user->ADDRESS = 'nothing';//无
+            $user->ADDRESS = $this->address ? $this->address : 'nothing';//无
             $user->OPEN_BANK = $this->openBank;
             $user->BANK_ADDRESS = $this->bankAddress;
             $user->BANK_NO = $this->bankNo;
@@ -287,7 +287,7 @@ class AdminAddUserForm extends Model {
         $this->adminOperateLogger->saveAfterContent=array_merge($userData,$infoData);
 
         $this->adminOperateLogger->clean()->save([
-            'optType' => '空单录入',
+            'optType' => 'Blank document entry',//空单录入
             'userId' => $user->ID,
             'userName' => $user->USER_NAME,
         ]);
@@ -335,22 +335,22 @@ class AdminAddUserForm extends Model {
             $userInfo = UserInfo::findOneAsArray('USER_ID=:USER_ID', [':USER_ID'=>$this->_delUserId]);
             // 调整上级会员的CON_NUM和REC_NUM
             if(!UserInfo::updateAllCounters(['CON_NUM'=> -1], "USER_ID=:USER_ID", [':USER_ID'=>$userInfo['CON_UID']])){
-                throw new Exception('减少上级会员接点数量失败');
+                throw new Exception('Failed to reduce the number of superior member contacts');//减少上级会员接点数量失败
             }
             if(!UserInfo::updateAllCounters(['REC_NUM'=> -1], "USER_ID=:USER_ID", [':USER_ID'=>$userInfo['REC_UID']])){
-                throw new Exception('减少开拓人推荐数量失败');
+                throw new Exception('Failed to reduce the number of recommended pioneers');//减少开拓人推荐数量失败
             }
             // 删除会员信息
             if(!UserInfo::deleteAll('USER_ID=:USER_ID', [':USER_ID' => $this->_delUserId])){
-                throw new Exception('删除会员信息失败');
+                throw new Exception('Failed to delete member information');//删除会员信息失败
             }
             //删除安置
             if(!UserNetwork::deleteAll('USER_ID=:USER_ID', [':USER_ID' => $this->_delUserId])){
-                throw new Exception('删除会员安置数据失败');
+                throw new Exception('Failed to delete member placement data');//删除会员安置数据失败
             }
             //删除开拓
             if(!UserRelation::deleteAll('USER_ID=:USER_ID', [':USER_ID' => $this->_delUserId])){
-                throw new Exception('删除会员开拓数据失败');
+                throw new Exception('Failed to delete member development data');//删除会员开拓数据失败
             }
             //删除点位绑定
             UserBind::deleteAll('USER_ID=:USER_ID', [':USER_ID' => $this->_delUserId]);
@@ -366,7 +366,7 @@ class AdminAddUserForm extends Model {
         }
 
         $this->adminOperateLogger->clean()->save([
-            'optType' => '删除空单会员',
+            'optType' => 'Delete empty member',//删除空单会员
         ]);
         return $this->_delUserId;
     }

common/models/forms/DeclarationForm.php

@@ -131,39 +131,39 @@ class DeclarationForm extends Model
     public function attributeLabels()
     {
         return [
-            'type' => '报单类型',
-            'decLv' => '报单级别',
+            'type' => 'Entry type',//报单类型
+            'decLv' => 'Entry level',//报单级别
             //'decPv' => '报单PV',
-            'decWay' => '报单方式',
-            'packageId' => '报单套餐',
-            'goodsId' => '商品ID',
-            'goodsNum' => '商品数量',
+            'decWay' => 'Entry method',//报单方式
+            'packageId' => 'Entry Package',//报单套餐
+            'goodsId' => 'product ID',//商品ID
+            'goodsNum' => 'Product quantity',//商品数量
             //'addType' => '新增会员方式',
-            'insertUserName' => '会员用户名',
-            'password' => '登陆密码',
-            'payPassword' => '支付密码',
-            'realName' => '会员姓名',
-            'insertUserIdCard' => '身份证号',
-            'mobile' => '手机号',
-            'address' => '地址',
-            'openBank' => '开户行',
-            'bankAddress' => '开户支行',
-            'bankNo' => '银行账号',
-            'bankProvince' => '银行省份',
-            'bankCity' => '银行城市',
-            'bankCounty' => '银行县区',
-            'conUserName' => '指导老师用户名',
-            'recUserName' => '开拓人用户名',
-            'decUserName' => '报单中心用户名',
-            'conUid' => '指导老师会员ID',
-            'recUid' => '开拓人会员ID',
-            'location' => '市场',
-            'consignee' => '收货人',
-            'acceptMobile' => '收货人手机',
-            'province' => '收货省',
-            'city' => '收货市',
-            'county' => '收货区县',
-            'address' => '收货详细地址',
+            'insertUserName' => 'Member user name',//会员用户名
+            'password' => 'Login password',//登陆密码
+            'payPassword' => 'Payment password',//支付密码
+            'realName' => 'Member name',//会员姓名
+            'insertUserIdCard' => 'ID',//身份证号
+            'mobile' => 'phone number',//手机号
+            'address' => 'address',//地址
+            'openBank' => 'openBank',//开户行
+            'bankAddress' => 'bankAddress',//开户支行
+            'bankNo' => 'bankNo',//银行账号
+            'bankProvince' => 'bankProvince',//银行省份
+            'bankCity' => 'bankCity',//银行城市
+            'bankCounty' => 'bankCounty',//银行县区
+            'conUserName' => 'Instructor user name',//指导老师用户名
+            'recUserName' => 'Developer user name',//开拓人用户名
+            'decUserName' => 'Entry center user name',//报单中心用户名
+            'conUid' => 'Instructor member ID',//指导老师会员ID
+            'recUid' => 'Pioneer member ID',//'开拓人会员ID
+            'location' => 'market',//市场
+            'consignee' => 'consignee',//收货人
+            'acceptMobile' => 'Consignee is phone number',//收货人手机
+            'province' => 'Receiving Province',//收货省
+            'city' => 'Receiving City',//收货市
+            'county' => 'Receiving area / county',//收货区县
+            'address' => 'Receiving detailed address',//收货详细地址
         ];
     }
 
@@ -188,7 +188,7 @@ class DeclarationForm extends Model
      */
     public function issetDec($attribute){
         if (!$decUser = User::find()->select('ID')->where('IS_DEC=1 AND USER_NAME=:USER_NAME', [':USER_NAME' => $this->decUserName])->asArray()->one()) {
-            $this->addError($attribute, '报单中心不存在');
+            $this->addError($attribute, 'Entry center does not exist');//报单中心不存在
             return false;
         } else {
             // 判断报单中心是否在新加入会员的安置网上级中
@@ -200,7 +200,8 @@ class DeclarationForm extends Model
 //            echo $this->insertUserName.'=='.$this->decUserName;
 //            exit;
             if (!isset($flipParent[$this->decUserName])) {
-                $this->addError($attribute, '为' . $this->insertUserName . '报单，报单中心' . $this->decUserName . '不在' . $this->insertUserName . '的安置网上级中');
+                //$this->addError($attribute, '为' . $this->insertUserName . '报单，报单中心' . $this->decUserName . '不在' . $this->insertUserName . '的安置网上级中');
+                $this->addError($attribute, 'To' . $this->insertUserName . 'Entry,Entry Center' . $this->decUserName . 'not in exist' . $this->insertUserName . 'in the placement superiors');
                 return ;
             }
             $this->_decId = $decUser['ID'];
@@ -218,9 +219,11 @@ class DeclarationForm extends Model
                 $conUserTemp = UserInfo::findOneAsArray('USER_NAME=:USER_NAME', [':USER_NAME' => $this->conUserName]);
                 if(!$conUserTemp){
                     if($this->insertUserName){
-                        $this->addError($attribute, '为'.$this->insertUserName.'报单，指导老师'.$this->conUserName.'不存在');
+                        //$this->addError($attribute, '为'.$this->insertUserName.'报单，指导老师'.$this->conUserName.'不存在');
+                        $this->addError($attribute, 'To'.$this->insertUserName.'Entry,Instructor'.$this->conUserName.'not in exist');
                     } else {
-                        $this->addError($attribute, '指导老师'.$this->conUserName.'不存在');
+                        //$this->addError($attribute, '指导老师'.$this->conUserName.'不存在');
+                        $this->addError($attribute, 'Instructor'.$this->conUserName.'not in exist');
                     }
                     return ;
                 }
@@ -245,9 +248,11 @@ class DeclarationForm extends Model
             // 判断接点会员的下级会员是否大于三个，如果大于三个则不允许
             if($conUser['CON_NUM'] >= 3){
                 if($this->insertUserName){
-                    $this->addError($attribute, '为'.$this->insertUserName.'报单，指导老师'.$this->conUserName.'下级点位已满');
+                   // $this->addError($attribute, '为'.$this->insertUserName.'报单，指导老师'.$this->conUserName.'下级点位已满');
+                    $this->addError($attribute, 'To'.$this->insertUserName.'Entry，Instructor'.$this->conUserName.'lower level is full');
                 } else {
-                    $this->addError($attribute, '指导老师'.$this->conUserName.'下级点位已满');
+                    //$this->addError($attribute, '指导老师'.$this->conUserName.'下级点位已满');
+                    $this->addError($attribute, 'Instructor'.$this->conUserName.'lower level is full');
                 }
                 return;
             }
@@ -284,9 +289,11 @@ class DeclarationForm extends Model
                 $recUserTemp = UserInfo::findOneAsArray('USER_NAME=:USER_NAME', [':USER_NAME' => $this->recUserName]);
                 if(!$recUserTemp){
                     if($this->insertUserName){
-                        $this->addError($attribute, '为'.$this->insertUserName.'报单，开拓人'.$this->recUserName.'不存在');
+                        //$this->addError($attribute, '为'.$this->insertUserName.'报单，开拓人'.$this->recUserName.'不存在');
+                        $this->addError($attribute, 'To'.$this->insertUserName.'Entry,Pioneer'.$this->recUserName.'not in exist');
                     } else {
-                        $this->addError($attribute, '开拓人'.$this->recUserName.'不存在');
+                       // $this->addError($attribute, '开拓人'.$this->recUserName.'不存在');
+                        $this->addError($attribute, 'Pioneer'.$this->recUserName.'not in exist');
                     }
 
                     return ;
@@ -315,7 +322,8 @@ class DeclarationForm extends Model
             if($this->insertUserName) {
                 $this->loopFindParentToNetwork($this->insertUserName);
                 if (!$this->recUserIsInNetworkParent()) {
-                    $this->addError($attribute, '为' . $this->insertUserName . '报单，开拓人' . $this->recUserName . '不在' . $this->insertUserName . '的安置网上级中');
+                   // $this->addError($attribute, '为' . $this->insertUserName . '报单，开拓人' . $this->recUserName . '不在' . $this->insertUserName . '的安置网上级中');
+                    $this->addError($attribute, 'To' . $this->insertUserName . 'Entry,Pioneer' . $this->recUserName . 'not in exist' . $this->insertUserName . 'in the placement superiors');
                     return ;
                 }
             }
@@ -360,7 +368,8 @@ class DeclarationForm extends Model
         // 如果没有这个新加入的接点，
         else {
             if($this->insertUserName == $conUserName){
-                $this->addError('recUserName', '新加入的会员不存在');
+               // $this->addError('recUserName', '新加入的会员不存在');
+                $this->addError('recUserName', 'New member does not exist');
                 return false;
             }
             // 去数据库里查找这个会员的所有上级
@@ -400,7 +409,8 @@ class DeclarationForm extends Model
     public function isLocation($attribute){
         if($this->type == self::TYPE_ZC){
             if(!in_array($this->location, [1, 2, 3])){
-                $this->addError($attribute, '市场必须在第1市场、第2市场或第三3市场');
+                //$this->addError($attribute, '市场必须在第1市场、第2市场或第三3市场');
+                $this->addError($attribute, 'Please select a market');
             }
             $conUser = $recUser = null;
             if(isset($this->_tempParentUser[$this->conUserName])){
@@ -413,9 +423,11 @@ class DeclarationForm extends Model
                 // 判断指导老师相应的区位是否已满
                 if($conUser['LOCATION'.$this->location]){
                     if($this->insertUserName){
-                        $this->addError($attribute, '为'.$this->insertUserName.'报单，指导老师'.$this->conUserName.'的第'.$this->location.'市场已存在会员');
+                       // $this->addError($attribute, '为'.$this->insertUserName.'报单，指导老师'.$this->conUserName.'的第'.$this->location.'市场已存在会员');
+                        $this->addError($attribute, 'To'.$this->insertUserName.'Entry,Instructor'.$this->conUserName.'the'.($this->location == 1 ? 'left' : 'regiht').' superior already existing member');
                     } else {
-                        $this->addError($attribute, '指导老师'.$this->conUserName.'的第'.$this->location.'市场已存在会员');
+                       // $this->addError($attribute, '指导老师'.$this->conUserName.'的第'.$this->location.'市场已存在会员');
+                        $this->addError($attribute, 'Instructor'.$this->conUserName.'the'.($this->location == 1 ? 'left' : 'regiht').'superior already existing member');
                     }
                     return;
                 }
@@ -452,7 +464,8 @@ class DeclarationForm extends Model
             if(!isset($this->_tempParentUser[$this->conUserName])){
                 $conUserTemp = UserInfo::findOneAsArray('USER_NAME=:USER_NAME', [':USER_NAME' => $this->conUserName]);
                 if(!$conUserTemp){
-                    $this->addError($attribute, '为'.$this->insertUserName.'报单，指导老师'.$this->conUserName.'不存在');
+//                    $this->addError($attribute, '为'.$this->insertUserName.'报单，指导老师'.$this->conUserName.'不存在');
+                    $this->addError($attribute, 'To'.$this->insertUserName.'Entry,Instructor'.$this->conUserName.'not in exist');
                     return ;
                 }
                 $conUserTemp['CON_NUM'] = UserNetwork::firstFloorChildNum($conUserTemp['USER_ID']);
@@ -478,7 +491,8 @@ class DeclarationForm extends Model
             if(!isset($this->_tempParentUser[$this->recUserName])){
                 $recUserTemp = UserInfo::findOneAsArray('USER_NAME=:USER_NAME', [':USER_NAME' => $this->recUserName]);
                 if(!$recUserTemp){
-                    $this->addError($attribute, '为'.$this->insertUserName.'报单，开拓人'.$this->recUserName.'不存在');
+//                    $this->addError($attribute, '为'.$this->insertUserName.'报单，开拓人'.$this->recUserName.'不存在');
+                    $this->addError($attribute, 'To'.$this->insertUserName.'Entry,Pioneer'.$this->recUserName.'not in exist');
                     return ;
                 }
                 $recUserTemp['CON_NUM'] = UserNetwork::firstFloorChildNum($recUserTemp['USER_ID']);
@@ -502,12 +516,14 @@ class DeclarationForm extends Model
 
             // 判断接点会员的下级会员是否大于三个，如果大于三个则不允许
             if($conUser['CON_NUM'] >= 3){
-                $this->addError($attribute, '为'.$this->insertUserName.'报单，指导老师'.$this->conUserName.'下级点位已满');
+//                $this->addError($attribute, '为'.$this->insertUserName.'报单，指导老师'.$this->conUserName.'下级点位已满');
+                $this->addError($attribute, 'To'.$this->insertUserName.'Entry,Pioneer'.$this->conUserName.'lower level is full');
                 return;
             }
             // 判断指导老师相应的区位是否已满
             if($conUser['LOCATION'.$this->location]){
-                $this->addError($attribute, '为'.$this->insertUserName.'报单，指导老师'.$this->conUserName.'该市场已存在会员');
+//                $this->addError($attribute, '为'.$this->insertUserName.'报单，指导老师'.$this->conUserName.'该市场已存在会员');
+                $this->addError($attribute, 'To'.$this->insertUserName.'Entry,Pioneer'.$this->conUserName.'Members already exist in this market');
                 return;
             }
 //            if($conUser['CON_NUM'] == 0 && $this->location != 1){
@@ -548,16 +564,16 @@ class DeclarationForm extends Model
         if(array_key_exists($this->type, $this->_types)){
             if($this->type == self::TYPE_ZC){
                 if($this->scenario == 'userDec'){
-                    if(!$this->insertUserName) $this->addError($attribute, '首购必须填写加入会员编号');
+                    if(!$this->insertUserName) $this->addError($attribute, 'Membership number must be filled in for initial purchase');//首购必须填写加入会员编号
                 }
-                if(!$this->insertUserName) $this->addError($attribute, '首购必须填写加入会员编号');
-                if(!$this->insertUserIdCard) $this->addError($attribute, '首购必须填写加入会员的身份证号');
-                if(!$this->conUserName) $this->addError($attribute, '首购必须填写加入会员的指导老师编号');
-                if(!$this->recUserName) $this->addError($attribute, '首购必须填写加入会员的开拓人编号');
-                if(!$this->location) $this->addError($attribute, '首购必须填写加入会员的市场');
+                if(!$this->insertUserName) $this->addError($attribute, 'Membership number must be filled in for initial purchase');//首购必须填写加入会员编号
+                if(!$this->insertUserIdCard) $this->addError($attribute, 'For the first purchase, the ID number of the member must be filled in');//首购必须填写加入会员的身份证号
+                if(!$this->conUserName) $this->addError($attribute, 'For the first purchase, you must fill in the instructor number of the member');//首购必须填写加入会员的指导老师编号
+                if(!$this->recUserName) $this->addError($attribute, 'For the first purchase, the pioneer number of the member must be filled in');//首购必须填写加入会员的开拓人编号
+                if(!$this->location) $this->addError($attribute, 'The first purchase must be filled in the market of the member');//首购必须填写加入会员的市场
             }
         } else {
-            $this->addError($attribute, '报单类型不正确');
+            $this->addError($attribute, 'Incorrect entry type');//报单类型不正确
         }
     }
 
@@ -570,7 +586,7 @@ class DeclarationForm extends Model
             // 新加入会员的身份证号对应网内的其他会员
             $otherUser = User::findAllAsArray("ID_CARD=:ID_CARD AND IS_UNION=0 AND DELETED=0 AND (ID_CARD_PREFIX IS NULL OR ID_CARD_PREFIX='')", [':ID_CARD'=>$this->insertUserIdCard]);
             if(count($otherUser)>=7){
-                $this->addError($attribute, '同一个身份证限制只能报7单');
+                $this->addError($attribute, 'Only 7 documents can be reported for the same ID card');//同一个身份证限制只能报7单
             }
             if($otherUser){
                 $flipParent = array_flip(array_filter($this->_tempNetworkParentUser[$this->insertUserName]));
@@ -582,12 +598,14 @@ class DeclarationForm extends Model
                     }
                 }
                 if (!$isExsit) {
-                    $this->addError($attribute, '为' . $this->insertUserName . '报单，身份证号码相同的会员'.$otherUser[0]['USER_NAME'].'不在' . $this->insertUserName . '的安置网上级中');
+//                    $this->addError($attribute, '为' . $this->insertUserName . '报单，身份证号码相同的会员'.$otherUser[0]['USER_NAME'].'不在' . $this->insertUserName . '的安置网上级中');
+                    $this->addError($attribute, 'To' . $this->insertUserName . 'Entry,Members with the same ID number'.$otherUser[0]['USER_NAME'].'not in exist' . $this->insertUserName . 'in the placement superiors');
                     return ;
                 }
             }
         } else {
-            $this->addError($attribute, '为'.$this->insertUserName.'报单，接点人'.$this->conUserName.'不存在');
+//            $this->addError($attribute, '为'.$this->insertUserName.'报单，接点人'.$this->conUserName.'不存在');
+            $this->addError($attribute, 'To'.$this->insertUserName.'Entry,Contact person'.$this->conUserName.'not in exist');
         }
     }
 
@@ -606,14 +624,14 @@ class DeclarationForm extends Model
         // 首购单，需要添加会员操作
         if($this->type == self::TYPE_ZC){
             if (preg_match("/[\x7f-\xff]/", $this->insertUserName)) {  //判断字符串中是否有中文
-                throw new Exception('会员编号中不能含有汉字');
+                throw new Exception('Member number cannot contain Chinese characters');//会员编号中不能含有汉字
             }
             //报单商品及PV判断
             $decLevelConfig = Cache::getDecLevelConfig();
             $decLevel = $decLevelConfig[$this->decLv];
             $toDecLevel = $this->decLv;
             if(!$this->decLv){
-                throw new Exception('请选择报单级别');
+                throw new Exception('Please select the entry level');//请选择报单级别
             }
             if($this->decWay==1) {
                 $decPackage = DeclarationPackage::findOneAsArray('ID=:ID', [':ID'=>$this->packageId]);
@@ -656,7 +674,7 @@ class DeclarationForm extends Model
                     }
                 }
                 if($totalPv<$decLevel['PERF']){
-                    throw new Exception('自选商品总PV不能小于所选报单级别PV');
+                    throw new Exception('The total BV of self selected goods cannot be less than the BV of the selected entry level');//自选商品总BV不能小于所选报单级别BV
                 }
                 foreach ($decLevelConfig as $key=>$val){
                     if($totalPv>=$val['PERF']){
@@ -664,7 +682,7 @@ class DeclarationForm extends Model
                     }
                 }
                 if($this->decLv!=$toDecLevel){
-                    throw new Exception('自选商品总PV不能超过已选级别下一个级别的PV值');
+                    throw new Exception('The total BV of self selected goods cannot exceed the BV value of the next level under the selected level');//自选商品总BV不能超过已选级别下一个级别的BV值
                 }
                 $this->_decAmount = $totalAmount;
                 $this->_decPv = $totalPv;
@@ -672,7 +690,7 @@ class DeclarationForm extends Model
             //看现金余额是否充足
             $loginUserId = \Yii::$app->user->id;
             if (Cash::getAvailableBalance($loginUserId) < $this->_decAmount){
-                throw new Exception('报单人现金不足，无法完成报单');
+                throw new Exception('The applicant is short of cash and cannot complete the declaration');//报单人现金不足，无法完成报单
             }
 
             if(!($zcResult = $this->addUser($allData))) {
@@ -703,7 +721,7 @@ class DeclarationForm extends Model
         $user->ID_CARD = $this->insertUserIdCard;
         $user->MOBILE = $this->mobile;
         $user->EMAIL = $this->email;
-        $user->ADDRESS = $this->address ? $this->address : '无';
+        $user->ADDRESS = $this->address ? $this->address : 'nothing';//无
         $user->OPEN_BANK = $this->openBank;
         $user->BANK_ADDRESS = $this->bankAddress;
         $user->BANK_NO = $this->bankNo;
@@ -794,7 +812,7 @@ class DeclarationForm extends Model
         if($this->province!=1){
             $warehouse = Region::getWarehouseByCode($this->province);//仓库
             if(!$warehouse){
-                throw new Exception('地区暂时不支持配送，具体联系客服');
+                throw new Exception('Delivery is temporarily not supported in the region. Contact customer service for details');//地区暂时不支持配送，具体联系客服
             }
         }else{
             $warehouse = '01';
@@ -859,7 +877,8 @@ class DeclarationForm extends Model
                 throw new Exception(Form::formatErrorsForApi($addressModel->getErrors()));
             }
             //扣报单人现金钱包
-            Cash::changeUserCash(\Yii::$app->user->id, 'CASH', -abs($this->_decAmount), ['REMARK' =>'为'.$this->insertUserName.'报单']);
+//            Cash::changeUserCash(\Yii::$app->user->id, 'CASH', -abs($this->_decAmount), ['REMARK' =>'为'.$this->insertUserName.'报单']);
+            Cash::changeUserCash(\Yii::$app->user->id, 'CASH', -abs($this->_decAmount), ['REMARK' =>'To'.$this->insertUserName.'Entry']);
             return $addressModel;
         }else{
             $addressModel = new ReceiveAddress();
@@ -887,7 +906,8 @@ class DeclarationForm extends Model
             }
             // 如果是复销单的话，还需要考虑给会员的复销池减去金额
             elseif($this->type == self::TYPE_FX){
-                Reconsume::changePoolPV($oneOrder['TO_USER_ID'], -abs($oneOrder['DEC_PV']), ['REMARK'=>'删单扣除', 'DEAL_TYPE'=>Reconsume::TYPE_AUDIT_PV]);
+//                Reconsume::changePoolPV($oneOrder['TO_USER_ID'], -abs($oneOrder['DEC_PV']), ['REMARK'=>'删单扣除', 'DEAL_TYPE'=>Reconsume::TYPE_AUDIT_PV]);
+                Reconsume::changePoolPV($oneOrder['TO_USER_ID'], -abs($oneOrder['DEC_PV']), ['REMARK'=>'Deletion deduction', 'DEAL_TYPE'=>Reconsume::TYPE_AUDIT_PV]);
             }
             $transaction->commit();
         } catch (Exception $e) {

frontendApi/config/menu.php

@@ -29,7 +29,7 @@ return [
         'child'=>[
             ['name'=>'Products list', 'class'=>'', 'icon'=>'', 'controller'=>'shop', 'action'=>'index', 'routePath'=>'shop/index', 'show'=>1,],//商品列表
             ['name'=>'Repeat sales products', 'class'=>'', 'icon'=>'', 'controller'=>'shop', 'action'=>'reconsume', 'routePath'=>'shop/reconsume', 'show'=>1,'allow'=>'studio'],//复消商品
-            ['name'=>'Entry list', 'class'=>'', 'icon'=>'', 'controller'=>'shop', 'action'=>'dec-order-list', 'routePath'=>'shop/dec-order-list', 'show'=>1,],//报单列表
+            ['name'=>'Welcome Pack Listing', 'class'=>'', 'icon'=>'', 'controller'=>'shop', 'action'=>'dec-order-list', 'routePath'=>'shop/dec-order-list', 'show'=>1,],//报单列表
             ['name'=>'Order List', 'class'=>'', 'icon'=>'', 'controller'=>'shop', 'action'=>'order-list', 'routePath'=>'shop/order-list', 'show'=>1,],//订单列表
         ]
     ],
@@ -49,7 +49,7 @@ return [
 //            ['name'=>'点位绑定编辑', 'class'=>'', 'icon'=>'', 'controller'=>'user', 'action'=>'bind-edit', 'routePath'=>'user/bind-edit', 'show'=>0,],
             ['name'=>'Reset Password', 'class'=>'', 'icon'=>'', 'controller'=>'user', 'action'=>'password', 'routePath'=>'user/password', 'show'=>1],
             ['name'=>'Upgrade management', 'class'=>'', 'icon'=>'', 'controller'=>'upgrade', 'action'=>'dec', 'routePath'=>'user/upgrade', 'show'=>1,'allow'=>'declarer',],//升级管理
-            ['name'=>'Entry Management', 'class'=>'', 'icon'=>'', 'controller'=>'user', 'action'=>'dec', 'routePath'=>'user/dec', 'show'=>1,'allow'=>'declarer',],
+            ['name'=>'Welcome Pack management', 'class'=>'', 'icon'=>'', 'controller'=>'user', 'action'=>'dec', 'routePath'=>'user/dec', 'show'=>1,'allow'=>'declarer',],
         ]
     ],
     'atlas'=>[
@@ -135,7 +135,7 @@ return [
         'show'=>1,
         'child'=>[
 //            ['name'=>'个人设置', 'class'=>'', 'icon'=>'', 'controller'=>'config', 'action'=>'base', 'routePath'=>'config/base', 'show'=>1,],
-            ['name'=>'Receiving address', 'class'=>'', 'icon'=>'', 'controller'=>'config', 'action'=>'receive-address-list', 'routePath'=>'config/receive-address-list', 'show'=>1,],//收货地址管理
+            ['name'=>'Shipping Address', 'class'=>'', 'icon'=>'', 'controller'=>'config', 'action'=>'receive-address-list', 'routePath'=>'config/receive-address-list', 'show'=>1,],//收货地址管理
         ]
     ],
 ];

frontendApi/modules/v1/controllers/ShopController.php

@@ -287,7 +287,7 @@ class ShopController extends BaseController {
      */
     public function actionReconsumeCart(){
         $userId = \Yii::$app->user->id;
-        $payList = ['cash'=>['name'=>'Balance payment'],];//余额支付
+        $payList = ['cash'=>['name'=>'Account Balance'],];//余额支付
         $userBalance = [
             'points' => 0,
             'cash' => 0

frontendApi/modules/v1/controllers/UserController.php

@@ -437,7 +437,7 @@ class UserController extends BaseController {
             $userInfo['isLocation'] = '('.implode(',',$isLocation).')';
             return static::notice($userInfo);
         }else{
-            return static::notice('会员编号不存在', 400);
+            return static::notice('Member number does not exist', 400);//会员编号不存在
         }
     }
 

frontendEle/src/router/index.js

@@ -47,7 +47,7 @@ export const constantRouterMap = [
                 component: _import('shop/dec-order-list'),
                 name: 'shop_dec-order-list',
                 meta: {
-                    title: 'Entry list',//报单列表
+                    title: 'Welcome Pack Listing',//报单列表
                     breadcrumb: [
                         {title: 'Dashboard', path: '/dashboard/index'},//首页
                         {title: 'Products Management', path: '/shop/dec-order-list'},//商城管理
@@ -212,7 +212,7 @@ export const constantRouterMap = [
         component: _import('user/dec'),
         name: 'user_dec',
         meta: {
-          title: ' Entry Management',//报单管理
+          title: 'Welcome Pack management',//报单管理
           breadcrumb: [
             {title: 'Dashboard', path: '/dashboard/index'},//首页
             {title: 'Member management', path: '/user/index'},//会员管理
@@ -502,7 +502,7 @@ export const constantRouterMap = [
         component: _import('config/receive-address-list'),
         name: 'config_receive-address-list',
         meta: {
-          title: 'Receiving address',//收货地址管理
+          title: 'Shipping Address',//收货地址管理
           breadcrumb: [
             {title: 'Dashboard', path: '/dashboard/index'},//首页
             {title: 'Setting', path: '/config/base'},//设置
@@ -519,7 +519,7 @@ export const constantRouterMap = [
           breadcrumb: [
             {title: 'Dashboard', path: '/dashboard/index'},//首页
             {title: 'Setting', path: '/config/base'},//设置
-            {title: 'Receiving address', path: '/config/receive-address-list'},//收货地址管理
+            {title: 'Shipping Address', path: '/config/receive-address-list'},//收货地址管理
           ],
         },
       },
@@ -533,7 +533,7 @@ export const constantRouterMap = [
           breadcrumb: [
             {title: 'Dashboard', path: '/dashboard/index'},//首页
             {title: 'Setting', path: '/config/base'},//设置
-            {title: 'Receiving address', path: '/config/receive-address-list'},//收货地址管理
+            {title: 'Shipping Address', path: '/config/receive-address-list'},//收货地址管理
           ],
         },
       },

frontendEle/src/views/bonus/index.vue

@@ -4,9 +4,9 @@
       <el-table class="table-box" :data="walletData" stripe style="width: 100%;">
         <el-table-column label="Account type" prop="walletName"></el-table-column><!-- 账户类型 -->
         <el-table-column label="Account balance" prop="amount"></el-table-column><!-- 账户余额 -->
-        <el-table-column label="Trading record"><!-- 交易记录 -->
+        <el-table-column label="History"><!-- 交易记录 -->
           <template slot-scope="scope">
-            <el-button type="primary" v-show="dealSwitch==1" size="small" @click.native="showFlow(scope.row.walletType,scope.row.walletName)">View Trading record</el-button><!-- 查看交易记录 -->
+            <el-button type="primary" v-show="dealSwitch==1" size="small" @click.native="showFlow(scope.row.walletType,scope.row.walletName)">View record​</el-button><!-- 查看交易记录 -->
           </template>
         </el-table-column>
       </el-table>
@@ -208,4 +208,4 @@
 <style>
   .dialog-footer:after{content: '';
     clear: both;display: table;}
-</style>
+</style>

frontendEle/src/views/config/receive-address-list.vue

@@ -4,7 +4,7 @@
       <el-table class="table-box" ref="multipleTable" :data="tableData" stripe style="width: 100%;">
         <el-table-column label="Consignee" prop="CONSIGNEE" width="150"></el-table-column><!-- 收货人 -->
         <el-table-column label="Phone number" prop="MOBILE" width="150"></el-table-column><!-- 手机号码 -->
-        <el-table-column label="Detailed address" prop="ADDRESS" ></el-table-column><!-- 详细地址 -->
+        <el-table-column label="address" prop="ADDRESS" ></el-table-column><!-- 详细地址 -->
         <el-table-column label="City" prop="CITY_NAME" width="150"></el-table-column>
         <el-table-column label="Local Government Area" prop="LGA_NAME" width="180"></el-table-column>
         <el-table-column label="State" prop="PROVINCE_NAME" width="150"></el-table-column>
@@ -13,11 +13,11 @@
             {{scope.row.IS_DEFAULT === '1' ? 'YES' : 'NO'}}<!-- 是：否 -->
           </template>
         </el-table-column>
-        <el-table-column fixed="right" label="operation" width="180"><!-- 操作 -->
+        <el-table-column fixed="right" label="Edit/Delete​" width="180"><!-- 操作 -->
           <template slot-scope="scope">
             <el-dropdown size="small" trigger="click">
               <el-button type="primary" size="small" @click.stop="">
-                Operate on this data<!-- 操作该数据 --><i class="el-icon-arrow-down el-icon--right"></i>
+                Edit/Delete​<!-- 操作该数据 --><i class="el-icon-arrow-down el-icon--right"></i>
               </el-button>
               <el-dropdown-menu slot="dropdown">
                 <el-dropdown-item command="edit" @click.native="handleUpdate(scope.row)">Edit<!-- 编辑 --></el-dropdown-item>

frontendEle/src/views/finance/withdraw-add.vue

@@ -2,8 +2,8 @@
   <div v-loading="loading">
     <div class="white-box">
       <el-form ref="form" :model="form" label-width="200px" style="width:500px;">
-        <el-form-item label="Currently available bonus"><!-- 当前可用奖金 -->
-          <el-tag type="success">{{balance}}₦</el-tag>
+        <el-form-item label="Available bonus"><!-- 当前可用奖金 -->
+          <el-tag type="success">{{balance}}$</el-tag>
         </el-form-item>
         <!--<el-form-item label="当前提现比例">-->
           <!--<el-tag type="info">{{withdrawProp}}%</el-tag>-->
@@ -14,18 +14,18 @@
         <el-form-item label="Minimum withdrawal amount"><!-- 最小提现金额 -->
           <el-tag type="info">{{minAmount}}₦</el-tag>
         </el-form-item>
-        <el-form-item label="Withdrawal charge"><!-- 提现手续费 -->
+        <!--<el-form-item label="Withdrawal charge"> 提现手续费
           <el-tag type="info">{{withdrawFee}}%</el-tag>
-        </el-form-item>
-        <el-form-item label="Cash withdrawal amount"><!-- 提现金额 -->
+        </el-form-item>-->
+        <el-form-item label="Withdrawal Amount​"><!-- 提现金额 -->
           <el-input v-model="form.applyAmount" type="number" :min="minAmount" :max="maxAmount"></el-input>
         </el-form-item>
-        <el-form-item label="" v-if="isPact==='1'">
-          <el-checkbox v-model="checked"> Agreed to</el-checkbox><!-- 同意 -->
-          <a @click="dialogVisible = true" href="javascript:void(0)">《Service contract》</a><!-- 服务协议 -->
-        </el-form-item>
+      <!--   <el-form-item label="" v-if="isPact==='1'">
+          <el-checkbox v-model="checked"> Agreed to</el-checkbox>同意 
+          <a @click="dialogVisible = true" href="javascript:void(0)">《Service contract》</a>服务协议 
+        </el-form-item>-->
         <el-form-item>
-          <el-button type="primary" @click="onSubmit" :loading="submitButtonStat" :disabled="!checked">Confirm</el-button><!-- 确定 -->
+          <el-button type="primary" @click="onSubmit" :loading="submitButtonStat" >Confirm</el-button><!-- 确定 -->
         </el-form-item>
       </el-form>
     </div>

frontendEle/src/views/finance/withdraw.vue

@@ -13,30 +13,30 @@
             {{scope.row.REAL_NAME}}
           </template>
         </el-table-column>
-        <el-table-column label="Withdrawal way" width="140"><!-- 提现方式 -->
+       <!-- <el-table-column label="Withdrawal way" width="140"> 提现方式
           <template slot-scope="scope">
-            {{scope.row.IS_AUTO_WITHDRAW==='1'?'Automatic withdrawal':'Manual withdrawal'}}<!-- 自动体现：手动体现 -->
+            {{scope.row.IS_AUTO_WITHDRAW==='1'?'Automatic withdrawal':'Manual withdrawal'}} 自动体现：手动体现
           </template>
-        </el-table-column>
-        <el-table-column label="Cash withdrawal amount" prop="AMOUNT" width="200px"></el-table-column><!-- 提现金额 -->
-        <el-table-column label="Service charge" prop="FEES" width="120"></el-table-column><!-- 手续费 -->
-        <el-table-column label="Actual amount" prop="REAL_AMOUNT" width="120"></el-table-column><!-- 实际到账金额 -->
-        <el-table-column label="Withdraw time" width="120"><!-- 提现时间 -->
+        </el-table-column>-->
+        <el-table-column label="Withdrawal Amoun" prop="AMOUNT" width="200px"></el-table-column><!-- 提现金额 -->
+       <!-- <el-table-column label="Service charge" prop="FEES" width="120"></el-table-column> --><!-- 手续费 -->
+        <!-- <el-table-column label="Actual amount" prop="REAL_AMOUNT" width="120"></el-table-column> --><!-- 实际到账金额 -->
+        <el-table-column label="Date" width="120"><!-- 提现时间 -->
           <template slot-scope="scope">
             {{tool.formatDate(scope.row.CREATED_AT)}}
           </template>
         </el-table-column>
-        <el-table-column label="Withdraw state" width="120"><!-- 提现状态 -->
+        <el-table-column label="Status" width="120"><!-- 提现状态 -->
           <template slot-scope="scope">
             <el-tag :type="tool.statusType(scope.row.AUDIT_STATUS)">{{scope.row.STATUS_NAME}}</el-tag>
           </template>
         </el-table-column>
-        <el-table-column label="Note" width="120"><!-- 备注 -->
+        <el-table-column label="Remark" width="120"><!-- 备注 -->
           <template slot-scope="scope">
             <el-tag :type="tool.statusType(scope.row.REMARK)">{{scope.row.REMARK}}</el-tag>
           </template>
         </el-table-column>
-        <el-table-column label="Note Returned for withdrawal" width="220"><!-- 提现退回备注 -->
+        <el-table-column label="Note" width="220"><!-- 提现退回备注 -->
           <template slot-scope="scope">
             <el-tag :type="tool.statusType(scope.row.BACK_REMARK)">{{scope.row.BACK_REMARK}}</el-tag>
           </template>

frontendEle/src/views/shop/index.vue

@@ -46,7 +46,7 @@
                 </el-tab-pane>
             </el-tabs>
             <div class="white-box-footer">
-                <el-button @click="goToAccounts()">Settle accounts</el-button><!--去结算-->
+                <el-button @click="goToAccounts()">Check Out​</el-button><!--去结算-->
                 <pagination :total="totalCount" :page_size="pageSize" @size-change="handleSizeChange" @current-change="handleCurrentChange"></pagination>
             </div>
         </div>

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

@@ -138,7 +138,7 @@
                 </div>
             </div>
             <div>
-                <el-button @click="goToAccounts()" :loading="submitButtonStat">Settle accounts</el-button><!--去结算-->
+                <el-button @click="goToAccounts()" :loading="submitButtonStat">Pay​</el-button><!--去结算-->
             </div>
         </div>
     </div>

frontendEle/src/views/shop/reconsume.vue

@@ -37,7 +37,7 @@
                 </el-table-column>
             </el-table>
             <div class="white-box-footer">
-                <el-button @click="goToAccounts()">Settle accounts</el-button><!-- 去结算 -->
+                <el-button @click="goToAccounts()">Check Out​</el-button><!-- 去结算 -->
                 <pagination :total="totalCount" :page_size="pageSize" @size-change="handleSizeChange" @current-change="handleCurrentChange"></pagination>
             </div>
         </div>

frontendEle/src/views/user/dec.vue

@@ -1,33 +1,33 @@
 <template>
     <div v-loading="loading">
         <div class="white-box">
-            <el-form ref="form"  label-width="250px" class="form-page">
+            <el-form ref="form"  label-width="150px" class="form-page">
                 <div class="hr-tip"><span>Account Information<!--账号信息--></span></div>
 
-                <el-form-item label="Member code"><!--会员编号-->
+                <el-form-item label="New member code​"><!--会员编号-->
                     <el-input v-model="form.insertUserName"></el-input>
                 </el-form-item>
                 <el-form-item>
                     <template slot="label">
-                        Current entry level<!--实时报单级别-->
+                        Entry level<!--实时报单级别-->
                     </template>
                     <el-select v-model="form.decLv" placeholder="Select entry level" @change="selectOne($event)">
                         <el-option v-for="(item,index) in allDecLevel" :key="index" :label="item.LEVEL_NAME"
                                    :value="item.ID"></el-option>
                     </el-select><!--请选择报单级别-->
                 </el-form-item>
-                <el-form-item label="Entry Center code"><!--报单中心编号-->
+                <el-form-item label="Stockist code"><!--报单中心编号-->
                     <el-input v-model="form.decUserName"></el-input>
                 </el-form-item>
 
 
                 <el-form-item>
                     <template slot="label">
-                        Select entry type<!--报单方式二选一-->
+                        Select Welcome Pack​<!--报单方式二选一-->
                     </template>
-                    <el-tabs type="border-card" v-model="decWay" style="position: relative;width: 600px;">
+                    <el-tabs type="border-card" v-model="decWay" style="position: relative;width: 1050px;">
                         <el-tab-pane name="1">
-                            <span slot="label">Select entry Kitting products</span><!--报单级别套餐-->
+                            <span slot="label">Welcome Pack</span><!--报单级别套餐-->
                             <el-table class="table-box" :data="_tableData" stripe style="width: 100%;" highlight-current-row @current-change="handleCurrentChange">
                                 <el-table-column
                                         type="index"
@@ -42,14 +42,14 @@
                         </span>
                                     </template>
                                 </el-table-column>
-                                <el-table-column label="Kit name" prop="PACKAGE_NAME"><!-- 套餐名称 -->
+                                <el-table-column label="Package Name " prop="PACKAGE_NAME"><!-- 套餐名称 -->
 
                                 </el-table-column>
-                                <el-table-column label="Kit price" prop="AMOUNT"><!-- 套餐金额 -->
+                                <el-table-column label="Price " prop="AMOUNT"><!-- 套餐金额 -->
 
                                 </el-table-column>
 
-                                <el-table-column label="Kit BV" prop="PV"><!-- 套餐PV -->
+                                <el-table-column label="BV" prop="PV"><!-- 套餐PV -->
 
                                     <template>
 
@@ -65,7 +65,7 @@
 
                                     </template>
                                 </el-table-column>
-                                <el-table-column label="Kit products" prop="PACKAGE_CONTENT"><!-- 套餐内容 -->
+                                <el-table-column  width='500px' label="Details:" prop="PACKAGE_CONTENT"><!-- 套餐内容 -->
                                     <template >
 
                                     </template>
@@ -76,7 +76,7 @@
                                <el-button type="primary" @click="onclock" :loading="submitButton">保存</el-button>
                              </el-form-item>-->
                         </el-tab-pane>
-                        <el-tab-pane label="Select entry products" name="2"><!-- 商品报单 -->
+                        <el-tab-pane label="Product" name="2"><!-- 商品报单 -->
                             <el-table class="table-box" v-if="numList.length > 0" :data="tableDatas" stripe style="width: 100%;" highlight-current-row  @selection-change="handleSelectionChange">
                                 <el-table-column
                                         type="selection"
@@ -133,8 +133,8 @@
                 <el-form-item label="Placement tree"><!--安置区位-->
                     <el-radio-group v-model="form.location">
                         <el-radio-button :label="1">Left</el-radio-button><!--左区-->
-                        <!-- <el-radio-button :label="2">Middle</el-radio-button> --><!--中区-->
-                        <el-radio-button :label="3">Right</el-radio-button><!--右区-->
+                        <el-radio-button :label="2">Right</el-radio-button><!--中区-->
+                      <!--  <el-radio-button :label="3">Right</el-radio-button> --><!--右区-->
                     </el-radio-group>
                 </el-form-item>
 
@@ -148,7 +148,7 @@
                 <el-form-item>
                     <template slot="label">
 
-                        Mobile number<!-- 会员手机 -->
+                        Phone number​<!-- 会员手机 -->
                     </template>
                     <el-input v-model="form.mobile"></el-input>
                 </el-form-item>
@@ -161,7 +161,7 @@
                 <el-form-item>
                     <template slot="label">
 
-                        ID<!-- 身份证号 -->
+                        Identity No.<!-- 身份证号 -->
                     </template>
                     <el-input v-model="form.insertUserIdCard" maxlength="18"></el-input>
                 </el-form-item>
@@ -232,26 +232,26 @@
 
 <!--                <div class="hr-tip"><span>Bank Info&lt;!&ndash; 银行信息 &ndash;&gt;</span></div>-->
 
-<!--                <el-form-item label="Bank of deposit">&lt;!&ndash; 开户行 &ndash;&gt;-->
-<!--                    <el-select v-model="form.openBank" placeholder="Select Bank">&lt;!&ndash; 请选择开户行 &ndash;&gt;-->
-<!--                        <el-option v-for="(item,index) in allOpenBank" :key="index" :label="item.BANK_NAME"-->
-<!--                                   :value="item.BANK_CODE"></el-option>-->
-<!--                    </el-select>-->
-
-<!--                </el-form-item>-->
-<!--                <el-form-item label="Bank area" prop="bankAreaSelected">&lt;!&ndash; 银行所在地区 &ndash;&gt;-->
-<!--                    <el-cascader-->
-<!--                            size="large"-->
-<!--                            :options="regionData"-->
-<!--                            v-model="form.bankAreaSelected">-->
-<!--                    </el-cascader>-->
-<!--                </el-form-item>-->
-<!--                <el-form-item label="Account opening branch">&lt;!&ndash; 开户支行 &ndash;&gt;-->
-<!--                    <el-input v-model="form.bankAddress"></el-input>-->
-<!--                </el-form-item>-->
-<!--                <el-form-item label="Bank account No">&lt;!&ndash; 银行账号 &ndash;&gt;-->
-<!--                    <el-input v-model="form.bankNo" maxlength="19"></el-input>-->
-<!--                </el-form-item>-->
+                <el-form-item label="Bank Name"><!-- 开户行 -->
+                    <el-select v-model="form.openBank" placeholder="Select Bank"><!-- 请选择开户行 -->
+                        <el-option v-for="(item,index) in allOpenBank" :key="index" :label="item.BANK_NAME"
+                                   :value="item.BANK_CODE"></el-option>
+                    </el-select>
+
+                </el-form-item>
+               <!-- <el-form-item label="Bank area" prop="bankAreaSelected"> 银行所在地区
+                    <el-cascader
+                            size="large"
+                            :options="regionData"
+                            v-model="form.bankAreaSelected">
+                    </el-cascader>
+                </el-form-item> -->
+                <el-form-item label="Account Name"><!-- 开户支行 -->
+                    <el-input v-model="form.bankAddress"></el-input>
+                </el-form-item>
+                <el-form-item label="Account Number​"><!-- 银行账号 -->
+                    <el-input v-model="form.bankNo" maxlength="19"></el-input>
+                </el-form-item>
                 <el-form-item>
                     <el-button type="primary" @click="onSubmit" :loading="submitButtonStat">SAVE<!-- 保存 --></el-button>
                 </el-form-item>

frontendEle/src/views/user/index.vue

@@ -16,7 +16,7 @@
             <el-form-item label="Member name"><!-- 会员姓名 -->
               <el-input v-model="infoData.REAL_NAME" :disabled="true"></el-input>
             </el-form-item>
-            <el-form-item label="ID"><!-- 身份证号 -->
+            <el-form-item label="Identity No."><!-- 身份证号 -->
               <el-input v-model="infoData.ID_CARD" :disabled="true"></el-input>
             </el-form-item>
             <el-form-item label="Phone number"><!-- 手机号 -->

frontendEle/src/views/user/upgrade.vue

@@ -5,8 +5,8 @@
                 <div class="hr-tip"><span>Member information<!-- 会员信息 --></span></div>
                 <el-form-item label="Member code" prop="insertUserName"><!-- 会员编号 -->
                     <el-input v-model="form.insertUserName"
-                    placeholder="Please enter the member number to be upgraded"
-                    :rules="{ required: true, message: 'Please enter the member number to be upgraded', trigger: 'blur' }"
+                    placeholder="Please enter member code."
+                    :rules="{ required: true, message: 'Please enter member code.', trigger: 'blur' }"
                     @blur="upgradeInfo()"
                     ><!-- 请输入升级的会员编号 -->
                     </el-input>
@@ -133,7 +133,7 @@
                 </el-form-item>
                 <el-form-item v-if="!isMax">
                     <template slot="label">
-                        Mobile phone<!-- 收货人手机 -->
+                         Phone number<!-- 收货人手机 -->
                     </template>
                     <el-input v-model="form.acceptMobile"></el-input>
                 </el-form-item>