theo 3 лет назад
Родитель
Сommit
3cd6295fc1
72 измененных файлов с 310 добавлено и 310 удалено
  1. 2 2
      backendApi/config/menu.php
  2. 1 1
      backendApi/modules/v1/controllers/BonusController.php
  3. 1 1
      backendApi/modules/v1/controllers/UserController.php
  4. 1 1
      backendApi/modules/v1/models/lists/atlas/NetworkList.php
  5. 1 1
      backendApi/modules/v1/models/lists/atlas/RelationList.php
  6. 6 6
      backendApi/modules/v1/models/lists/bonus/BalanceList.php
  7. 14 14
      backendApi/modules/v1/models/lists/bonus/FlowBonusList.php
  8. 2 2
      backendApi/modules/v1/models/lists/bonus/PerfMonthList.php
  9. 17 17
      backendApi/modules/v1/models/lists/bonus/PerfOrderList.php
  10. 16 16
      backendApi/modules/v1/models/lists/bonus/PeriodBonusList.php
  11. 2 2
      backendApi/modules/v1/models/lists/bonus/ScoreMonthList.php
  12. 2 2
      backendApi/modules/v1/models/lists/bonus/UserPerfList.php
  13. 2 2
      backendApi/modules/v1/models/lists/finance/BalanceAuditList.php
  14. 5 5
      backendApi/modules/v1/models/lists/finance/HistoryBonusList.php
  15. 1 1
      backendApi/modules/v1/models/lists/finance/RechargeList.php
  16. 2 2
      backendApi/modules/v1/models/lists/finance/WithdrawList.php
  17. 8 8
      backendApi/modules/v1/models/lists/log/UserHandleList.php
  18. 9 9
      backendApi/modules/v1/models/lists/log/UserLoginList.php
  19. 6 6
      backendApi/modules/v1/models/lists/shop/DecOrderList.php
  20. 11 11
      backendApi/modules/v1/models/lists/shop/GoodsList.php
  21. 4 4
      backendApi/modules/v1/models/lists/shop/OrderDecList.php
  22. 10 10
      backendApi/modules/v1/models/lists/shop/OrderList.php
  23. 4 4
      backendApi/modules/v1/models/lists/shop/OrderShopList.php
  24. 5 5
      backendApi/modules/v1/models/lists/shop/OrderStandardList.php
  25. 1 1
      backendApi/modules/v1/models/lists/shop/PackageList.php
  26. 1 1
      backendApi/modules/v1/models/lists/user/DecLevelList.php
  27. 18 18
      backendApi/modules/v1/models/lists/user/IndexList.php
  28. 1 1
      backendApi/modules/v1/models/lists/user/MoveList.php
  29. 3 3
      backendEle/src/components/WithdrawTable.vue
  30. 7 7
      backendEle/src/router/index.js
  31. 3 3
      backendEle/src/views/atlas/network-opt.vue
  32. 2 2
      backendEle/src/views/atlas/relation-opt.vue
  33. 1 1
      backendEle/src/views/bonus/balance-list.vue
  34. 4 4
      backendEle/src/views/bonus/period.vue
  35. 2 2
      backendEle/src/views/finance/balance-audit-list.vue
  36. 1 1
      backendEle/src/views/finance/change-balance-opt.vue
  37. 1 1
      backendEle/src/views/finance/deal-type.vue
  38. 1 1
      backendEle/src/views/finance/recharge-status.vue
  39. 1 1
      backendEle/src/views/finance/withdraw-add.vue
  40. 2 2
      backendEle/src/views/finance/withdraw.vue
  41. 1 1
      backendEle/src/views/shop/goods-add.vue
  42. 2 2
      backendEle/src/views/shop/index.vue
  43. 1 1
      backendEle/src/views/user/change-user-dec-level.vue
  44. 3 3
      backendEle/src/views/user/change-user-dec-role.vue
  45. 2 2
      backendEle/src/views/user/empty-list.vue
  46. 3 3
      backendEle/src/views/user/index.vue
  47. 2 2
      backendEle/src/views/user/move.vue
  48. 6 6
      backendEle/src/views/user/user-add-opt.vue
  49. 1 1
      common/config/params.php
  50. 10 10
      common/libs/export/BaseExport.php
  51. 1 1
      common/models/Withdraw.php
  52. 11 11
      common/models/forms/AdminAddUserForm.php
  53. 14 14
      common/models/forms/ApproachDeclarationForm.php
  54. 35 35
      common/models/forms/DeclarationForm.php
  55. 2 2
      common/models/forms/DeclarationUpgradeForm.php
  56. 1 1
      common/models/forms/OrderForm.php
  57. 9 9
      common/models/forms/ShopGoodsForm.php
  58. 1 1
      frontendApi/config/menu.php
  59. 8 8
      frontendApi/modules/v1/controllers/ShopController.php
  60. 1 1
      frontendEle/src/router/index.js
  61. 3 3
      frontendEle/src/views/atlas/network.vue
  62. 1 1
      frontendEle/src/views/bonus/index.vue
  63. 1 1
      frontendEle/src/views/config/receive-address-edit.vue
  64. 1 1
      frontendEle/src/views/config/receive-address-list.vue
  65. 1 1
      frontendEle/src/views/finance/transfer-add.vue
  66. 1 1
      frontendEle/src/views/finance/transfer-list.vue
  67. 1 1
      frontendEle/src/views/shop/order-list.vue
  68. 1 1
      frontendEle/src/views/shop/order.vue
  69. 1 1
      frontendEle/src/views/shop/reconsume-order.vue
  70. 2 2
      frontendEle/src/views/user/dec.vue
  71. 1 1
      frontendEle/src/views/user/index.vue
  72. 1 1
      frontendEle/src/views/user/upgrade.vue

+ 2 - 2
backendApi/config/menu.php

@@ -131,7 +131,7 @@ return [
             //['name'=>'删除审核会员状态', 'class'=>'', 'icon'=>'', 'controller'=>'user', 'action'=>'status-audit-delete', 'routePath'=>'user/status-audit-delete', 'show'=>0,],
             ['name'=>'Member level adjustment list', 'class'=>'', 'icon'=>'', 'controller'=>'user', 'action'=>'dec-level-list', 'routePath'=>'user/dec-level-list', 'show'=>1,],//会员级别调整列表
             ['name'=>'修改会员级别', 'class'=>'', 'icon'=>'', 'controller'=>'user', 'action'=>'change-user-dec-level', 'routePath'=>'user/change-user-dec-level', 'show'=>0,],
-            ['name'=>'Modify entry center level', 'class'=>'', 'icon'=>'', 'controller'=>'user', 'action'=>'change-user-dec-role', 'routePath'=>'user/change-user-dec-role', 'show'=>1,],//修改报单中心级别
+            ['name'=>'Modify Stockist level', 'class'=>'', 'icon'=>'', 'controller'=>'user', 'action'=>'change-user-dec-role', 'routePath'=>'user/change-user-dec-role', 'show'=>1,],//修改报单中心级别
             //['name'=>'清空关停会员钱包', 'class'=>'', 'icon'=>'', 'controller'=>'user', 'action'=>'clear-wallet', 'routePath'=>'user/clear-wallet', 'show'=>0,],
 //            ['name'=>'会员历史年度最高聘级表', 'class'=>'', 'icon'=>'', 'controller'=>'user', 'action'=>'year-highest-emp-lv', 'routePath'=>'user/year-highest-emp-lv', 'show'=>1,],
 //            ['name'=>'会员历史年度最高聘级表导出', 'class'=>'', 'icon'=>'', 'controller'=>'user', 'action'=>'user/year-highest-emp-lv-export', 'routePath'=>'user/user/year-highest-emp-lv-export', 'show'=>0,],
@@ -139,7 +139,7 @@ return [
         ]
     ],
     'atlas'=>[
-        'name'=>'Network Atlas',//网络图谱
+        'name'=>'Network Chart',//网络图谱
         'class' => '',
         'icon'=>'el-icon-data-line',
         'controller'=>'atlas',

+ 1 - 1
backendApi/modules/v1/controllers/BonusController.php

@@ -842,7 +842,7 @@ class BonusController extends BaseController {
         }
         $data = $this->_periodBonus($periodNum,false);
         if( isset($data['filterTypes']) && is_array($data['filterTypes']) ) {
-            $data['filterTypes'] = array_merge(['periodNum'=>['isUserTable'=> false, 'name'=> 'Number of settlement periods']], $data['filterTypes']);
+            $data['filterTypes'] = array_merge(['periodNum'=>['isUserTable'=> false, 'name'=> 'Pay Cycle(PC)']], $data['filterTypes']);
         }
 
         return static::notice($data);

+ 1 - 1
backendApi/modules/v1/controllers/UserController.php

@@ -1445,7 +1445,7 @@ class UserController extends BaseController
     public function actionChangeUserDecRole()
     {
         if (Yii::$app->request->isPost) {
-            return parent::edit(DecRoleLogForm::class, 'Successfully modified the document entry center level', 'adminChange', [//修改报单中心级别成功
+            return parent::edit(DecRoleLogForm::class, 'Successfully modified the document Stockist level', 'adminChange', [//修改报单中心级别成功
                 'adminChange',
             ], null, function ($form, $result) {
                 //$userName = Info::getUserNameByUserId($result['ID']);

+ 1 - 1
backendApi/modules/v1/models/lists/atlas/NetworkList.php

@@ -105,7 +105,7 @@ class NetworkList extends \common\libs\dataList\DataList implements DataListInte
                     ],
                 ],
                 'PERIOD_AT' => [
-                    'header' => 'Number of joining periods',//加入期数
+                    'header' => 'Joining Period',//加入期数
                     'headerOther' => ['width' => '110'],
                 ],
             ];

+ 1 - 1
backendApi/modules/v1/models/lists/atlas/RelationList.php

@@ -99,7 +99,7 @@ class RelationList extends \common\libs\dataList\DataList implements DataListInt
                     ],
                 ],
                 'PERIOD_AT' => [
-                    'header' => 'Number of joining periods',//加入期数
+                    'header' => 'Joining Period',//加入期数
                     'headerOther' => ['width' => '110'],
                 ],
             ];

+ 6 - 6
backendApi/modules/v1/models/lists/bonus/BalanceList.php

@@ -347,7 +347,7 @@ class BalanceList extends \common\libs\dataList\DataList implements DataListInte
                         'tag'=>['type'=>'danger', 'size' => 'small', 'class'=>'no-border'],
                     ],
                 ],
-                'PERIOD_AT' => 'Number of joining periods',//加入期数
+                'PERIOD_AT' => 'Joining Period',//加入期数
 //                'DEC_DEC_ROLE_NAME' => [
 //                    'header' => '所属报单中心级别',
 //                    'headerOther' => ['width' => '150'],
@@ -361,14 +361,14 @@ class BalanceList extends \common\libs\dataList\DataList implements DataListInte
 //                    'headerOther' => ['width' => '150'],
 //                ],
                 'MOBILE' => [
-                    'header' => 'Phone number',//手机号码
+                    'header' => 'Phone Number', // 手机号码
                     'value' => function($row) {
                         return "\t".$row['MOBILE'];
                     },
                     'headerOther' => ['width' => '120'],
                 ],
                 'TEL' => [
-                    'header' => 'Alternate phone number',//备用手机号码
+                    'header' => 'Alternate Phone Number', // 备用手机号码
                     'value' => function($row) {
                         return "\t".$row['TEL'];
                     },
@@ -436,12 +436,12 @@ class BalanceList extends \common\libs\dataList\DataList implements DataListInte
 //                'STATUS'=> ['isUserTable'=> true, 'name'=> '会员状态', 'other'=> 'status'],
 //                'STATUS_AT'=> ['isUserTable'=> true, 'name'=> '会员状态变更时间', 'other'=> 'date'],
 //                'HIGHEST_EMP_LV_NAME'=> ['isUserTable'=> false, 'name'=> '历史最高聘级', 'other'=> 'empLevel'],
-                'PERIOD_AT'=> ['isUserTable'=> false, 'name'=> 'Number of joining periods'],//加入期数
+                'PERIOD_AT'=> ['isUserTable'=> false, 'name'=> 'Joining Period'],//加入期数
 //                'DEC_DEC_ROLE_NAME'=> ['isUserTable'=> true, 'name'=> '所属报单中心级别', 'other'=> 'decRole'],
 //                'DEC_USER_NAME'=> ['isUserTable'=> true, 'name'=> '所属报单中心编号'],
 //                'DEC_REAL_NAME'=> ['isUserTable'=> true, 'name'=> '所属报单中心姓名'],
-                'MOBILE'=> ['isUserTable'=> false, 'name'=> 'Phone number'],//手机号码
-                'TEL'=> ['isUserTable'=> false, 'name'=> 'Alternate phone number'],//备用手机号码
+                'MOBILE'=> ['isUserTable'=> false, 'name'=> 'Phone Number'],//手机号码
+                'TEL'=> ['isUserTable'=> false, 'name'=> 'Alternate Phone Number'],//备用手机号码
 //                'AREA'=> ['isUserTable'=> true, 'name'=> '常用地址', 'other'=> 'area'],
 //                'SUB_COM_NAME'=> ['isUserTable'=> true, 'name'=> '所属分公司', 'other'=> 'subCompany'],
 //                'IS_DIRECT_SELLER'=> ['isUserTable'=> true, 'name'=> '是否直销员', 'other'=> 'yesOrNo'],

+ 14 - 14
backendApi/modules/v1/models/lists/bonus/FlowBonusList.php

@@ -64,8 +64,8 @@ class FlowBonusList extends \common\libs\dataList\DataList implements DataListIn
                     },
                     'headerOther' => ['width' => '170'],
                 ],
-                'PERIOD_NUM' => 'Number of periods',//期数
-                'CALC_MONTH' => 'Settlement month',//结算月
+                'PERIOD_NUM' => 'Period Number', // 期数
+                'CALC_MONTH' => 'Bonus Month', // 结算月
                 'DEAL_TYPE_NAME' => [
                     'header' => 'Transaction type',//交易类型
                     'headerOther' => [
@@ -168,7 +168,7 @@ class FlowBonusList extends \common\libs\dataList\DataList implements DataListIn
                     ],
                 ],
                 'AMOUNT' => [
-                    'header' => 'A turnover',//交易额
+                    'header' => 'Debit/Credit', // 交易额
                     'value' => function ($row) {
                         $result = (new Price([
                             'value' => $row['AMOUNT'],
@@ -193,7 +193,7 @@ class FlowBonusList extends \common\libs\dataList\DataList implements DataListIn
                     },
                 ],
                 'TOTAL' => [
-                    'header' => 'Post transaction balance',//交易后余额
+                    'header' => 'New Balance', // 交易后余额
                     'value' => function ($row) {
                         return (new Price([
                             'value' => $row['TOTAL'],
@@ -208,7 +208,7 @@ class FlowBonusList extends \common\libs\dataList\DataList implements DataListIn
                     'headerOther' => ['width' => '110'],
                 ],
                 'REMARK' => [
-                    'header' => 'Note',//备注
+                    'header' => 'Remark',//备注
                     'headerOther' => ['width' => '250'],
                 ],
                 'TRANSFER_SN' => [
@@ -228,22 +228,22 @@ class FlowBonusList extends \common\libs\dataList\DataList implements DataListIn
         if (!$this->filterTypes) {
             $this->filterTypes = [
                 'CREATED_AT' => ['isUserTable' => false, 'name' => 'Creation time', 'other' => 'date'],//创建时间
-                'PERIOD_NUM' => ['isUserTable' => false, 'name' => 'Number of periods'],//期数
-                'CALC_MONTH' => ['isUserTable' => false, 'name' => 'Settlement month', 'other' => 'month'],//结算月
-                'DEAL_TYPE_NAME' => ['isUserTable' => false, 'name' => 'Transaction type', 'other' => 'dealTypes'],//交易类型
-                'USER_NAME' => ['isUserTable' => false, 'name' => 'Member code'],//会员编号
-                'REAL_NAME' => ['isUserTable' => false, 'name' => 'Member name'],//会员姓名
-                'LAST_DEC_LV_NAME' => ['isUserTable' => false, 'name' => 'Member level', 'other' => 'decLevel'],//会员等级
+                'PERIOD_NUM' => ['isUserTable' => false, 'name' => 'Period Number'],//期数
+                'CALC_MONTH' => ['isUserTable' => false, 'name' => 'Bonus Month', 'other' => 'month'],//结算月
+                'DEAL_TYPE_NAME' => ['isUserTable' => false, 'name' => 'Transaction Type', 'other' => 'dealTypes'],//交易类型
+                'USER_NAME' => ['isUserTable' => false, 'name' => 'Member Code'],//会员编号
+                'REAL_NAME' => ['isUserTable' => false, 'name' => 'Member Name'],//会员姓名
+                'LAST_DEC_LV_NAME' => ['isUserTable' => false, 'name' => 'Member Level', 'other' => 'decLevel'],//会员等级
                 'LAST_EMP_LV_NAME' => ['isUserTable' => false, 'name' => 'Rank', 'other' => 'empLevel'],//聘级
 //                'LAST_STATUS_NAME' => ['isUserTable' => false, 'name' => '会员状态', 'other' => 'status'],
 //                'SYSTEM_NAME' => ['isUserTable' => true, 'name' => '体系', 'other' => 'systems'],
                 'IS_DEC' => ['isUserTable' => false, 'name' => 'Declaration center or not', 'other' => 'yesOrNo'],//是否报单中心
 //                'DEC_ROLE_NAME' => ['isUserTable' => true, 'name' => '报单中心级别', 'other' => 'decRole'],
 //                'IS_DIRECT_SELLER' => ['isUserTable' => true, 'name' => '是否直销员', 'other' => 'yesOrNo'],
-                'AMOUNT' => ['isUserTable' => false, 'name' => 'A turnover'],//交易额
-                'TOTAL' => ['isUserTable' => false, 'name' => 'Post transaction balance'],//交易后余额
+                'AMOUNT' => ['isUserTable' => false, 'name' => 'Debit/Credit'],//交易额
+                'TOTAL' => ['isUserTable' => false, 'name' => 'New Balance'], // 交易后余额
                 'ADMIN_NAME' => ['isUserTable' => false, 'name' => 'Operator'],//操作人
-                'REMARK' => ['isUserTable' => false, 'name' => 'Note'],//备注
+                'REMARK' => ['isUserTable' => false, 'name' => 'Remark'],//备注
                 'TRANSFER_SN' => ['isUserTable' => false, 'name' => 'Serial number'],//流水号
             ];
         }

+ 2 - 2
backendApi/modules/v1/models/lists/bonus/PerfMonthList.php

@@ -56,7 +56,7 @@ class PerfMonthList extends \common\libs\dataList\DataList implements DataListIn
         if(!$this->columns){
             $this->columns = [
                 'CALC_MONTH' => [
-                    'header' => 'Settlement month',//结算月
+                    'header' => 'Bonus Month',//结算月
                     'headerOther' => [
                         'width' => '100',
                     ],
@@ -218,7 +218,7 @@ class PerfMonthList extends \common\libs\dataList\DataList implements DataListIn
     {
         if(!$this->filterTypes){
             $this->filterTypes = [
-                'CALC_MONTH'=> ['isUserTable'=> false, 'name'=> 'Settlement month'],//结算月
+                'CALC_MONTH'=> ['isUserTable'=> false, 'name'=> 'Bonus Month'],//结算月
                 'USER_NAME'=> ['isUserTable'=> false, 'name'=> 'Member code'],//会员编号
                 'REC_USER_NAME'=> ['isUserTable'=> false, 'name'=> 'Recommender No'],//推荐人编号
                 'CREATED_AT'=> ['isUserTable'=> false, 'name'=> 'Creation time', 'other'=> 'date'],//创建时间

+ 17 - 17
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' => 'Number of settlement periods',//结算期数
+                    'header' => 'Pay Cycle(PC)',//结算期数
                     'headerOther' => [
                         'width' => '100',
                     ],
                 ],
                 'SN' => [
-                    'header' => 'Performance sheet No',//业绩单编号
+                    'header' => 'Sales No.',//业绩单编号
                     'value' => function($row) {
                         return "\t".$row['SN'];
                     },
@@ -76,7 +76,7 @@ class PerfOrderList extends \common\libs\dataList\DataList implements DataListIn
                     ],
                 ],
                 'DEC_TYPE' => [
-                    'header' => 'Performance sheet type',//业绩单类型
+                    'header' => 'Type',//业绩单类型
                     'headerOther' => [
                         'width' => '130',
                     ],
@@ -92,7 +92,7 @@ class PerfOrderList extends \common\libs\dataList\DataList implements DataListIn
                     },
                 ],
                 'DEC_STATUS_NAME' => [
-                    'header' => 'Performance sheet status',//业绩单状态
+                    'header' => 'Status',//业绩单状态
                     'headerOther' => [
                         'width' => '110',
                     ],
@@ -110,13 +110,13 @@ class PerfOrderList extends \common\libs\dataList\DataList implements DataListIn
                     ],
                 ],
                 'LAST_REC_USER_NAME' => [
-                    'header' => 'Pioneer No. at settlement',//结算时开拓者编号
+                    'header' => 'Sponsor No. at settlement',//结算时开拓者编号
                     'headerOther' => [
                         'width' => '150',
                     ],
                 ],
                 'LAST_REC_REAL_NAME' => [
-                    'header' => 'Pioneer name at settlement',//结算时开拓者姓名
+                    'header' => 'Sponsor name at settlement',//结算时开拓者姓名
                     'headerOther' => [
                         'width' => '150',
                     ],
@@ -177,18 +177,18 @@ class PerfOrderList extends \common\libs\dataList\DataList implements DataListIn
     {
         if(!$this->filterTypes){
             $this->filterTypes = [
-                'PERIOD_NUM'=> ['isUserTable'=> false, 'name'=> 'Number of settlement periods'],//结算期数
-                'SN'=> ['isUserTable'=> false, 'name'=> 'Performance sheet No'],//业绩单编号
+                'PERIOD_NUM'=> ['isUserTable'=> false, 'name'=> 'Pay Cycle(PC)'], // 结算期数
+                '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'],//创建时间
+                 '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'=> 'Sponsor No. at settlement'], // 结算时开拓者编号
+                'LAST_REC_REAL_NAME'=> ['isUserTable'=> false, 'name'=> 'Sponsor 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;

+ 16 - 16
backendApi/modules/v1/models/lists/bonus/PeriodBonusList.php

@@ -76,7 +76,7 @@ class PeriodBonusList extends \common\libs\dataList\DataList implements DataList
             $this->columns = [
                 'ID' => null,
                 'PERIOD_NUM' => [
-                    'header' => 'Number of settlement periods',//结算期数
+                    'header' => 'Pay Cycle(PC)', // 结算期数
                     'headerOther' => [
                         'width' => '150',
                     ],
@@ -85,7 +85,7 @@ class PeriodBonusList extends \common\libs\dataList\DataList implements DataList
                     ],
                 ],
                 'CALCULATED_AT' => [
-                    'header' => 'Settlement time',//结算时间
+                    'header' => 'Date', // 结算时间
                     'value' => function($row) {
                         return (new DateTime([
                             'value' => $row['CALCULATED_AT'],
@@ -130,19 +130,19 @@ class PeriodBonusList extends \common\libs\dataList\DataList implements DataList
                     ],
                 ],
                 'LAST_MOBILE' => [
-                    'header' => 'phone number',//手机号码
+                    'header' => 'Phone Number',//手机号码
                     'headerOther' => [
                         'width' => '120',
                     ],
                 ],
                 'LAST_PERIOD_AT' => [
-                    'header' => 'Number of joining periods',//加入期数
+                    'header' => 'Joining Period', // 加入期数
                     'headerOther' => [
                         'width' => '100',
                     ],
                 ],
                 'LAST_CREATED_AT' => [
-                    'header' => 'Join time',//加入时间
+                    'header' => 'Joining Date', // 加入时间
                     'value' => function($row) {
                         return (new DateTime([
                             'value' => $row['LAST_CREATED_AT'],
@@ -151,13 +151,13 @@ class PeriodBonusList extends \common\libs\dataList\DataList implements DataList
                     'headerOther' => ['width' => '170'],
                 ],
                 'LAST_REC_USER_NAME' => [
-                    'header' => 'Pioneer No',//开拓者编号
+                    'header' => 'Sponsor No',//开拓者编号
                     'headerOther' => [
                         'width' => '150',
                     ],
                 ],
                 'LAST_REC_REAL_NAME' => [
-                    'header' => 'Pioneer name',//开拓者姓名
+                    'header' => 'Sponsor Name',//开拓者姓名
                     'headerOther' => [
                         'width' => '120',
                     ],
@@ -595,7 +595,7 @@ class PeriodBonusList extends \common\libs\dataList\DataList implements DataList
 //                    ],
 //                ],
                 'CALC_MONTH' => [
-                    'header' => 'Settlement month',//结算月
+                    'header' => 'Bonus Month',//结算月
                     'headerOther' => [
                         'width' => '100',
                     ],
@@ -775,13 +775,13 @@ class PeriodBonusList extends \common\libs\dataList\DataList implements DataList
                 'LAST_REAL_NAME'=> ['isUserTable'=> false, 'name'=> 'Member name'],//会员姓名
                 'LAST_DEC_LV_NAME'=> ['isUserTable'=> false, 'name'=> 'Member level at settlement', 'other'=> 'decLevel'],//结算时会员级别
                 'LAST_EMP_LV_NAME'=> ['isUserTable'=> false, 'name'=> 'Member rank at settlement', 'other'=> 'empLevel'],//结算时会员聘级
-                'LAST_MOBILE'=> ['isUserTable'=> false, 'name'=> 'phone number'],//手机号
-                'LAST_PERIOD_AT'=> ['isUserTable'=> false, 'name'=> 'Number of joining periods'],//加入期数
-                'LAST_CREATED_AT'=> ['isUserTable'=> false, 'name'=> 'Join time', 'other'=> 'date'],//加入时间
-                'CALCULATED_AT'=> ['isUserTable'=> false, 'name'=> 'Settlement time', 'other'=> 'date'],//备份时间
-                'LAST_REC_USER_NAME'=> ['isUserTable'=> false, 'name'=> 'Pioneer No'],//开拓者编号
-                'LAST_REC_REAL_NAME'=> ['isUserTable'=> false, 'name'=> 'Pioneer name'],//开拓者姓名
-                'LAST_CON_USER_NAME'=> ['isUserTable'=> false, 'name'=> 'Superior number'],//上级编号
+                'LAST_MOBILE'=> ['isUserTable'=> false, 'name'=> 'Phone Number'],//手机号
+                'LAST_PERIOD_AT'=> ['isUserTable'=> false, 'name'=> 'Joining Period'], // 加入期数
+                'LAST_CREATED_AT'=> ['isUserTable'=> false, 'name'=> 'Joining Date', 'other'=> 'date'], // 加入时间
+                'CALCULATED_AT'=> ['isUserTable'=> false, 'name'=> 'Date', 'other'=> 'date'], // 备份时间
+                'LAST_REC_USER_NAME'=> ['isUserTable'=> false, 'name'=> 'Sponsor No'],//开拓者编号
+                'LAST_REC_REAL_NAME'=> ['isUserTable'=> false, 'name'=> 'Sponsor Name'],//开拓者姓名
+                'LAST_CON_USER_NAME'=> ['isUserTable'=> false, 'name'=> 'Superior Number'],//上级编号
                 'LAST_CON_REAL_NAME'=> ['isUserTable'=> false, 'name'=> 'Name of superior'],//上级姓名
                 'PV_1L'=> ['isUserTable'=> false, 'name'=> 'I. new market performance'],//一市场新增业绩
                 'SURPLUS_1L'=> ['isUserTable'=> false, 'name'=> 'I. market balance performance'],//一市场结余业绩
@@ -798,7 +798,7 @@ class PeriodBonusList extends \common\libs\dataList\DataList implements DataList
                 'BONUS_QY'=> ['isUserTable'=> false, 'name'=> 'Team award'],//团队奖
 //                'BONUS_YC'=> ['isUserTable'=> false, 'name'=> 'Honor Award'],//荣衔奖
 //                'ORI_BONUS_STANDARD'=> ['isUserTable'=> false, 'name'=> 'Team growth Award'],//团队成长奖
-                'CALC_MONTH'=> ['isUserTable'=> false, 'name'=> 'Settlement month'],//结算月
+                'CALC_MONTH'=> ['isUserTable'=> false, 'name'=> 'Bonus Month'],//结算月
             ];
         }
         return $this->filterTypes;

+ 2 - 2
backendApi/modules/v1/models/lists/bonus/ScoreMonthList.php

@@ -47,7 +47,7 @@ class ScoreMonthList extends \common\libs\dataList\DataList implements DataListI
         if(!$this->columns){
             $this->columns = [
                 'CALC_MONTH' => [
-                    'header' => 'Settlement month',//结算月
+                    'header' => 'Bonus Month',//结算月
                     'headerOther' => [
                         'width' => '100',
                     ],
@@ -130,7 +130,7 @@ class ScoreMonthList extends \common\libs\dataList\DataList implements DataListI
     {
         if(!$this->filterTypes){
             $this->filterTypes = [
-                'CALC_MONTH'=> ['isUserTable'=> false, 'name'=> 'Settlement month'],//结算月
+                'CALC_MONTH'=> ['isUserTable'=> false, 'name'=> 'Bonus Month'],//结算月
                 'USER_NAME'=> ['isUserTable'=> false, 'name'=> 'Member code'],//会员编号
                 'CREATED_AT'=> ['isUserTable'=> false, 'name'=> 'Creation time', 'other'=> 'date'],//创建时间
             ];

+ 2 - 2
backendApi/modules/v1/models/lists/bonus/UserPerfList.php

@@ -72,7 +72,7 @@ class UserPerfList extends \common\libs\dataList\DataList implements DataListInt
                     },
                 ],
                 'SURPLUS_1L' => [
-                    'header' => 'Left market residual performance',//一市场剩余业绩
+                    'header' => 'Remainder@Left Leg',//一市场剩余业绩
                     'headerOther' => [
                         'width' => '240',
                     ],
@@ -83,7 +83,7 @@ class UserPerfList extends \common\libs\dataList\DataList implements DataListInt
                     },
                 ],
                 'SURPLUS_2L' => [
-                    'header' => 'Right market residual performance',//二市场剩余业绩
+                    'header' => 'Remainder@Right Leg',//二市场剩余业绩
                     'headerOther' => [
                         'width' => '240',
                     ],

+ 2 - 2
backendApi/modules/v1/models/lists/finance/BalanceAuditList.php

@@ -138,7 +138,7 @@ class BalanceAuditList extends \common\libs\dataList\DataList implements DataLis
                     },
                 ],
                 'CREATE_REMARK' => [
-                    'header' => 'Note',//备注
+                    'header' => 'Remark',//备注
                     'headerOther' => [
                         'width' => '180',
                     ],
@@ -215,7 +215,7 @@ class BalanceAuditList extends \common\libs\dataList\DataList implements DataLis
                 'TYPE_NAME' => ['isUserTable' => false, 'name' => 'Account type', 'other' => 'select', 'selectData' => Tool::formatFilter(BalanceAudit::TYPE, 'name', 'label')],//账户类型
                 'DEAL_TYPE_NAME' => ['isUserTable' => false, 'name' => 'Transaction type', 'other' => 'select', 'selectData' => Tool::formatFilter(DealType::getAllTypesForShow(), 'ID', 'TYPE_NAME')],//交易类型
                 'AMOUNT' => ['isUserTable' => false, 'name' => 'Adjustment amount'],//调整金额
-                'CREATE_REMARK' => ['isUserTable' => false, 'name' => 'Note'],//备注
+                'CREATE_REMARK' => ['isUserTable' => false, 'name' => 'Remark'],//备注
                 'REMARK_IS_SHOW' => ['isUserTable' => false, 'name' => 'Whether the front desk displays comments', 'other' => 'yesOrNo'],//前台是否显示备注
                 'CREATE_ADMIN_NAME' => ['isUserTable' => false, 'name' => 'applicant'],//申请人
                 'CREATED_AT' => ['isUserTable' => false, 'name' => 'Application time', 'other' => 'date'],//申请时间

+ 5 - 5
backendApi/modules/v1/models/lists/finance/HistoryBonusList.php

@@ -282,14 +282,14 @@ class HistoryBonusList extends \common\libs\dataList\DataList implements DataLis
                     'headerOther' => ['width' => '150'],
                 ],
                 'MOBILE' => [
-                    'header' => 'Phone number',//手机号码
+                    'header' => 'Phone Number',//手机号码
                     'value' => function($row) {
                         return "\t".$row['MOBILE'];
                     },
                     'headerOther' => ['width' => '150'],
                 ],
                 'TEL' => [
-                    'header' => 'Alternate phone number',//备用手机号码
+                    'header' => 'Alternate Phone Number',//备用手机号码
                     'value' => function($row) {
                         return "\t".$row['TEL'];
                     },
@@ -372,9 +372,9 @@ class HistoryBonusList extends \common\libs\dataList\DataList implements DataLis
 //                'DEC_DEC_ROLE_NAME' => ['isUserTable' => false, 'name' => '所属报单中心级别', 'other' => 'decRole'],
                 'DEC_USER_NAME' => ['isUserTable' => false, 'name' => 'Code of distributor'],//所属报单中心编号
                 'DEC_REAL_NAME' => ['isUserTable' => false, 'name' => 'Name of distributor'],//所属报单中心姓名
-                'MOBILE' => ['isUserTable' => false, 'name' => 'Phone number'],//手机号码
-                'TEL' => ['isUserTable' => false, 'name' => 'Alternate phone number'],//备用手机号码
-                'AREA' => ['isUserTable' => false, 'name' => 'Commonly used address', 'other' => 'area'],//常用地址
+                'MOBILE' => ['isUserTable' => false, 'name' => 'Phone Number'],//手机号码
+                'TEL' => ['isUserTable' => false, 'name' => 'Alternate Phone Number'],//备用手机号码
+                'AREA' => ['isUserTable' => false, 'name' => 'Commonly Used Address', 'other' => 'area'],//常用地址
 //                'SUB_COM_NAME' => ['isUserTable' => false, 'name' => '所属分公司', 'other' => 'subCompany'],
 //                'IS_DIRECT_SELLER' => ['isUserTable' => false, 'name' => '是否直销员', 'other' => 'yesOrNo'],
                 'BACKUP_AT' => ['isUserTable' => false, 'name' => 'Backup time', 'other' => 'date'],//备份时间

+ 1 - 1
backendApi/modules/v1/models/lists/finance/RechargeList.php

@@ -103,7 +103,7 @@ class RechargeList extends \common\libs\dataList\DataList implements DataListInt
                     'headerOther' => ['width' => '190'],
                 ],
                 'REMARK' => [
-                    'header' => 'Note', // 备注
+                    'header' => 'Remark', // 备注
                     'headerOther' => [
                         'width' => '200',
                     ],

+ 2 - 2
backendApi/modules/v1/models/lists/finance/WithdrawList.php

@@ -157,7 +157,7 @@ class WithdrawList extends \common\libs\dataList\DataList implements DataListInt
                     },
                 ],
                 'MOBILE' => [
-                    'header' => 'Phone number', // 手机号
+                    'header' => 'Phone Number', // 手机号
                     'headerOther' => ['width' => '150'],
                 ],
                 'UPDATE_ADMIN_NAME' => [
@@ -165,7 +165,7 @@ class WithdrawList extends \common\libs\dataList\DataList implements DataListInt
                     'headerOther' => ['width' => '150'],
                 ],
                 'REMARK' => [
-                    'header' => 'Note', // 备注
+                    'header' => 'Remark', // 备注
                     'headerOther' => [
                         'width' => '200',
                     ],

+ 8 - 8
backendApi/modules/v1/models/lists/log/UserHandleList.php

@@ -50,7 +50,7 @@ class UserHandleList extends \common\libs\dataList\DataList implements DataListI
                 'save_before_content' => null,
                 'save_after_content' => null,
                 'opt_type' => [
-                    'header' => 'Operation type',//操作类型
+                    'header' => 'Operation Type',//操作类型
                     'headerOther' => [
                         'width' => '200',
                     ],
@@ -61,13 +61,13 @@ class UserHandleList extends \common\libs\dataList\DataList implements DataListI
                     },
                 ],
                 'opt_obj_name' => [
-                    'header' => 'Operation object code',//操作对象编号
+                    'header' => 'Operation Object Code',//操作对象编号
                     'headerOther' => [
                         'width' => '130',
                     ],
                 ],
                 'remark' => [
-                    'header' => 'note',//备注
+                    'header' => 'Remark', // 备注
                     'headerOther' => [
                         'width' => '120',
                         'show-overflow-tooltip'=>true,
@@ -81,7 +81,7 @@ class UserHandleList extends \common\libs\dataList\DataList implements DataListI
                     ],
                 ],
                 'created_at' => [
-                    'header' => 'Operation time',//操作时间
+                    'header' => 'Operation Time',//操作时间
                     'value' => function($row) {
                         return (new DateTime([
                             'value' => $row['created_at'],
@@ -135,11 +135,11 @@ class UserHandleList extends \common\libs\dataList\DataList implements DataListI
                 ['id'=>'修改主点位','name'=>'Modify master point'],//修改主点位
             ];
             $this->filterTypes = [
-                'opt_type' => ['isUserTable'=>false, 'name'=>'Operation type', 'other'=> 'select', 'selectData'=> $selectData],//操作类型
-                'opt_obj_name' => ['isUserTable'=>false, 'name'=>'Operation object No'],//操作对象编号
-                'remark' => ['isUserTable'=>false, 'name'=>'note'],//备注
+                'opt_type' => ['isUserTable'=>false, 'name'=>'Operation Type', 'other'=> 'select', 'selectData'=> $selectData],//操作类型
+                'opt_obj_name' => ['isUserTable'=>false, 'name'=>'Operation Object No'],//操作对象编号
+                'remark' => ['isUserTable'=>false, 'name'=>'Remark'], // 备注
                 'user_name' => ['isUserTable'=>false, 'name'=>'Operator'],//操作人
-                'created_at' => ['isUserTable'=>false, 'name'=>'Operation time', 'other'=> 'date'],//操作时间
+                'created_at' => ['isUserTable'=>false, 'name'=>'Operation Time', 'other'=> 'date'],//操作时间
                 'period_num' => ['isUserTable'=>false, 'name'=>'Number of periods'],//操作时间
                 'ip' => ['isUserTable'=>false, 'name'=>'IP address'],//IP地址
                 'device' => ['isUserTable'=>false, 'name'=>'client'],//客户端

+ 9 - 9
backendApi/modules/v1/models/lists/log/UserLoginList.php

@@ -56,7 +56,7 @@ class UserLoginList extends \common\libs\dataList\DataList implements DataListIn
         if(!$this->columns){
             $this->columns = [
                 'opt_type' => [
-                    'header' => 'Operation type',//操作类型
+                    'header' => 'Operation Type',//操作类型
                     'headerOther' => [
                         'width' => '120',
                     ],
@@ -70,7 +70,7 @@ class UserLoginList extends \common\libs\dataList\DataList implements DataListIn
                     },
                 ],
                 'opt_obj' => [
-                    'header' => 'Operation object',//操作对象
+                    'header' => 'Operation Object',//操作对象
                     'headerOther' => [
                         'width' => '120',
                     ],
@@ -103,7 +103,7 @@ class UserLoginList extends \common\libs\dataList\DataList implements DataListIn
                     ],
                 ],
                 'created_at' => [
-                    'header' => 'Operation time',//操作时间
+                    'header' => 'Operation Time',//操作时间
                     'value' => function($row) {
                         return (new DateTime([
                             'value' => $row['created_at'],
@@ -150,14 +150,14 @@ class UserLoginList extends \common\libs\dataList\DataList implements DataListIn
         if(!$this->filterTypes){
             $this->filterTypes = [
 //                'opt_type' => ['isUserTable'=>false, 'name'=>'操作类型', 'other'=> 'select', 'selectData'=> [['id'=> 1, 'name'=> '登录成功'], ['id'=> 0, 'name'=> '登录失败']]],
-                'opt_type' => ['isUserTable'=>false, 'name'=>'Operation type', 'other'=> 'select', 'selectData'=> [['id'=> 1, 'name'=> 'login succeeded'], ['id'=> 0, 'name'=> 'login failed']]],
-                'user_name' => ['isUserTable'=>false, 'name'=>'Object number'],//对象编号
+                'opt_type' => ['isUserTable'=>false, 'name'=>'Operation Type', 'other'=> 'select', 'selectData'=> [['id'=> 1, 'name'=> 'login succeeded'], ['id'=> 0, 'name'=> 'login failed']]],
+                'user_name' => ['isUserTable'=>false, 'name'=>'Object Number'],//对象编号
                 'success_times' => ['isUserTable'=>false, 'name'=>'Login success times'],//登录成功次数
                 'fail_times' => ['isUserTable'=>false, 'name'=>'Number of login failures'],//登录失败次数
-                'created_at' => ['isUserTable'=>false, 'name'=>'Operation time', 'other'=> 'date'],//操作时间
-                'period_num' => ['isUserTable'=>false, 'name'=>'Number of periods'],//期数
-                'ip' => ['isUserTable'=>false, 'name'=>'IP address'],//IP地址
-                'device' => ['isUserTable'=>false, 'name'=>'client'],//客户端
+                'created_at' => ['isUserTable'=>false, 'name'=>'Operation Time', 'other'=> 'date'],//操作时间
+                'period_num' => ['isUserTable'=>false, 'name'=>'Number of Periods'],//期数
+                'ip' => ['isUserTable'=>false, 'name'=>'IP Address'],//IP地址
+                'device' => ['isUserTable'=>false, 'name'=>'Client'],//客户端
                 'user_agent' => ['isUserTable'=>false, 'name'=>'operating system'],//操作系统
                 'request_route' => ['isUserTable'=>false, 'name'=>'Request path'],//请求路径
             ];

+ 6 - 6
backendApi/modules/v1/models/lists/shop/DecOrderList.php

@@ -139,7 +139,7 @@ class DecOrderList extends \common\libs\dataList\DataList implements DataListInt
                     },
                 ],
                 'REMARK' => [
-                    'header' => 'Note',//备注
+                    'header' => 'Remark', // 备注
                     'headerOther' => [
                         'width' => '200',
                     ],
@@ -151,11 +151,11 @@ class DecOrderList extends \common\libs\dataList\DataList implements DataListInt
                     },
                 ],
                 'REC_USER_NAME' => [
-                    'header' => 'Entry pioneer',//报单时开拓者
+                    'header' => 'Entry Sponsor',//报单时开拓者
                     'headerOther' => ['width' => '150'],
                 ],
                 'REC_REAL_NAME' => [
-                    'header' => 'Entry pioneer name',//报单时开拓者姓名
+                    'header' => 'Entry Sponsor Name',//报单时开拓者姓名
                     'headerOther' => ['width' => '150'],
                 ],
                 'CON_USER_NAME' => [
@@ -167,21 +167,21 @@ class DecOrderList extends \common\libs\dataList\DataList implements DataListInt
                     'headerOther' => ['width' => '150'],
                 ],
                 'PROVINCE' => [
-                    'header' => 'state',//
+                    'header' => 'State', // 
                     'headerOther' => ['width' => '120'],
                     'value' => function ($row) use($regionConfig) {
                         return $regionConfig[$row['PROVINCE']]['REGION_NAME'] ?? '';
                     },
                 ],
                 'CITY' => [
-                    'header' => 'local government area',//
+                    'header' => 'Local Government Area', // 
                     'headerOther' => ['width' => '120'],
                     'value' => function ($row) use($regionConfig) {
                         return $regionConfig[$row['CITY']]['REGION_NAME'] ?? '';
                     },
                 ],
                 'COUNTY' => [
-                    'header' => 'city',//
+                    'header' => 'City', // 
                     'headerOther' => ['width' => '120'],
                     'value' => function ($row) use($regionConfig) {
                         return $regionConfig[$row['COUNTY']]['REGION_NAME'] ?? '';

+ 11 - 11
backendApi/modules/v1/models/lists/shop/GoodsList.php

@@ -38,7 +38,7 @@ class GoodsList extends \common\libs\dataList\DataList implements DataListInterf
             $this->columns = [
                 'ID' => null,
                 'GOODS_NAME' => [
-                    'header' => 'Products name',//商品名称
+                    'header' => 'Product Name', // 商品名称
                     'headerOther' => ['width' => '200'],
                 ],
                 'GOODS_NO' => [
@@ -53,7 +53,7 @@ class GoodsList extends \common\libs\dataList\DataList implements DataListInterf
                 //     'headerOther' => ['width' => '150'],
                 // ],
                 'SELL_DISCOUNT' => [
-                    'header' => 'Products discount',//商品折扣
+                    'header' => 'Discount Rate',//商品折扣
                     'value' => function($row) {
                         $discount = 0;
                         if ($row['TYPE'] == 1) {
@@ -83,7 +83,7 @@ class GoodsList extends \common\libs\dataList\DataList implements DataListInterf
                     'headerOther' => ['width' => '150'],
                 ],
                 'CATEGORY_TYPE' => [
-                    'header' => 'Products Category',//商品分类
+                    'header' => 'Product Category',//商品分类
                     'value' => function($row) {
                         $categoryType = array_column(ShopGoods::CATEGORY_TYPE, NULL, 'id');
                         return $categoryType[$row['CATEGORY_TYPE']]['name'] ?? '';
@@ -91,7 +91,7 @@ class GoodsList extends \common\libs\dataList\DataList implements DataListInterf
                     'headerOther' => ['width' => '150'],
                 ],
                 'SELL_TYPE' => [
-                    'header' => 'Purchase method',//购买方式
+                    'header' => 'Payment Mode',//购买方式
                     'value' => function($row){
                         $sellType = ShopGoods::SALE_TYPE;
                         $sel = explode(',',$row['SELL_TYPE']);
@@ -174,7 +174,7 @@ class GoodsList extends \common\libs\dataList\DataList implements DataListInterf
                     },
                 ],
                 'STORE_NUMS' => [
-                    'header' => 'Inventory',//库存
+                    'header' => 'Inventory', // 库存
                     'headerOther' => [
                         'width' => '110',
                     ],
@@ -213,13 +213,13 @@ class GoodsList extends \common\libs\dataList\DataList implements DataListInterf
                 //'TYPE' => ['isUserTable' => false, 'name' => '商品来源', 'other' => 'select', 'selectData' => [['id' => 1, 'name' => '国内商品'], ['id' => 2, 'name' => '进口商品']]],
                 //'GIFT_TYPE' => ['isUserTable' => false, 'name' => '商品类型', 'other' => 'select', 'selectData' => [['id' => 1, 'name' => '报单区'], ['id' => 2, 'name' => '复消区'], ['id' => 3, 'name' => '工作室报单'], ['id' => 4, 'name' => '工作室复消']]],
                 'GIFT_TYPE' => ['isUserTable' => false, 'name' => 'Products type', 'other' => 'select', 'selectData' => [['id' => 1, 'name' => 'Entry area'], ['id' => 2, 'name' => 'Reselling area'], ['id' => 3, 'name' => 'Office Entry area'], ['id' => 4, 'name' => 'Office Reselling area']]],
-                'STATUS'=> ['name'=> 'Status', 'other'=> 'select', 'selectData'=> [['id'=> 0, 'name'=> 'Sold out'],['id'=> 1, 'name'=> 'On sale']]],//状态,已下架,已上架
-                'GOODS_NAME'=> ['name'=> 'Products name'],//商品名称
-                'GOODS_NO'=> ['name'=> 'Products code'],//商品编号
+                'STATUS'=> ['name'=> 'Status', 'other'=> 'select', 'selectData'=> [['id'=> 0, 'name'=> 'Sold out'],['id'=> 1, 'name'=> 'On sale']]], // 状态,已下架,已上架
+                'GOODS_NAME'=> ['name'=> 'Product Name'], // 商品名称
+                'GOODS_NO'=> ['name'=> 'Products Code'], // 商品编号
 //                'SELL_TYPE'=> ['name'=> '复消购买方式', 'other'=> 'select', 'selectData'=> [['id'=> 1, 'name'=> '余额购买'],['id'=> 2, 'name'=> '积分购买']]],
-                'SELL_PRICE'=> ['name'=> 'Products Price'],//销售价格
-                'PRICE_PV'=> ['name'=> 'Products BV'],//销售PV
-                'CATEGORY_TYPE' => ['name' => 'Products Category', 'other'=> 'select', 'selectData'=> ShopGoods::CATEGORY_TYPE],//商品分类
+                'SELL_PRICE'=> ['name'=> 'Products Price'], // 销售价格
+                'PRICE_PV'=> ['name'=> 'Products BV'], // 销售PV
+                'CATEGORY_TYPE' => ['name' => 'Product Category', 'other'=> 'select', 'selectData'=> ShopGoods::CATEGORY_TYPE], // 商品分类
             ];
         }
         return $this->filterTypes;

+ 4 - 4
backendApi/modules/v1/models/lists/shop/OrderDecList.php

@@ -56,7 +56,7 @@ class OrderDecList extends \common\libs\dataList\DataList implements DataListInt
                     'headerOther' => ['width' => '200'],
                 ],
                 'CONSIGNEE' => [
-                    'header' => 'consignee',//收货人
+                    'header' => 'Recipient',//收货人
                     'headerOther' => [
                         'width' => '150',
                     ],
@@ -71,21 +71,21 @@ class OrderDecList extends \common\libs\dataList\DataList implements DataListInt
                     'header' => 'Contact 2',//联系方式2
                 ],
                 'PROVINCE' => [
-                    'header' => 'state',//
+                    'header' => 'State', // 
                     'headerOther' => ['width' => '120'],
                     'value' => function ($row) use($regionConfig) {
                         return $regionConfig[$row['PROVINCE']]['REGION_NAME'] ?? '';
                     },
                 ],
                 'CITY' => [
-                    'header' => 'local government area',//地方政府
+                    'header' => 'Local Government Area', // 地方政府
                     'headerOther' => ['width' => '120'],
                     'value' => function ($row) use($regionConfig) {
                         return $regionConfig[$row['CITY']]['REGION_NAME'] ?? '';
                     },
                 ],
                 'COUNTY' => [
-                    'header' => 'city',//市
+                    'header' => 'City', // 区
                     'headerOther' => ['width' => '120'],
                     'value' => function ($row) use($regionConfig) {
                         return $regionConfig[$row['COUNTY']]['REGION_NAME'] ?? '';

+ 10 - 10
backendApi/modules/v1/models/lists/shop/OrderList.php

@@ -90,7 +90,7 @@ class OrderList extends \common\libs\dataList\DataList implements DataListInterf
                     'headerOther' => ['width' => '120'],
                 ],
                 'DEC_USER_NAME' => [
-                    'header' => 'Entry Center',//报单中心
+                    'header' => 'Stockist', // 报单中心
                     'headerOther' => ['width' => '120'],
                 ],
                 'CREATE_USER' => [
@@ -98,7 +98,7 @@ class OrderList extends \common\libs\dataList\DataList implements DataListInterf
                     'headerOther' => ['width' => '120'],
                 ],
                 'CREATE_USER_NAME' => [
-                    'header' => 'Creator name',//创建人姓名
+                    'header' => 'Stockist Name',//创建人姓名
                     'headerOther' => ['width' => '120'],
                 ],
                 'SN' => [
@@ -107,7 +107,7 @@ class OrderList extends \common\libs\dataList\DataList implements DataListInterf
                 ],
 //                'STATUS' => null,
                 'STATUS' => [
-                    'header' => 'Order status',//订单状态
+                    'header' => 'Status',//订单状态
                     'headerOther' => [
                         'width' => '110',
                     ],
@@ -116,11 +116,11 @@ class OrderList extends \common\libs\dataList\DataList implements DataListInterf
                     },
                 ],
                 'SKU_CODE' => [
-                    'header' => 'Inventory code',//存货编码
+                    'header' => 'Product Code',//存货编码
                     'headerOther' => ['width' => '150'],
                 ],
                 'GOODS_TITLE' => [
-                    'header' => 'Inventory name',//存货名称
+                    'header' => 'Product Name', // 存货名称
                     'headerOther' => ['width' => '200'],
                 ],
                 'BUY_NUMS' => [
@@ -128,7 +128,7 @@ class OrderList extends \common\libs\dataList\DataList implements DataListInterf
                     'headerOther' => ['width' => '100'],
                 ],
                 'CONSIGNEE' => [
-                    'header' => 'Consignee',//收货人
+                    'header' => 'Recipient',//收货人
                     'headerOther' => [
                         'width' => '150',
                     ],
@@ -143,21 +143,21 @@ class OrderList extends \common\libs\dataList\DataList implements DataListInterf
                     'header' => 'Contact 2',//联系方式2
                 ],
                 'PROVINCE' => [
-                    'header' => 'state',//
+                    'header' => 'State', // 
                     'headerOther' => ['width' => '120'],
                     'value' => function ($row) use($regionConfig) {
                         return $regionConfig[$row['PROVINCE']]['REGION_NAME'] ?? '';
                     },
                 ],
                 'CITY' => [
-                    'header' => 'local government area',//地方政府
+                    'header' => 'Local Government Area', // 地方政府
                     'headerOther' => ['width' => '120'],
                     'value' => function ($row) use($regionConfig) {
                         return $regionConfig[$row['CITY']]['REGION_NAME'] ?? '';
                     },
                 ],
                 'COUNTY' => [
-                    'header' => 'city',//市
+                    'header' => 'City', // 区
                     'headerOther' => ['width' => '120'],
                     'value' => function ($row) use($regionConfig) {
                         return $regionConfig[$row['COUNTY']]['REGION_NAME'] ?? '';
@@ -366,7 +366,7 @@ class OrderList extends \common\libs\dataList\DataList implements DataListInterf
                 'MOBILE'=> ['name'=> 'Contact 1'],//联系方式1
                 'PERIOD_NUM'=> ['name'=> 'Number of periods'],//期数
                 'CREATED_AT'=> ['name'=> 'Creation time', 'other'=>'date'],//创建时间
-                'STATUS'=> ['name'=> 'Order status', 'other'=> 'select', 'selectData'=> [
+                'STATUS'=> ['name'=> 'Status', 'other'=> 'select', 'selectData'=> [
                     ['id' => \Yii::$app->params['orderStatus']['paid']['value'], 'name' => \Yii::$app->params['orderStatus']['paid']['label']],
                     ['id' => \Yii::$app->params['orderStatus']['notPaid']['value'], 'name' => \Yii::$app->params['orderStatus']['notPaid']['label']],
                     ['id' => \Yii::$app->params['orderStatus']['failPaid']['value'], 'name' => \Yii::$app->params['orderStatus']['failPaid']['label']]

+ 4 - 4
backendApi/modules/v1/models/lists/shop/OrderShopList.php

@@ -65,7 +65,7 @@ class OrderShopList extends \common\libs\dataList\DataList implements DataListIn
                     },
                 ],
                 'CONSIGNEE' => [
-                    'header' => 'consignee',//收货人
+                    'header' => 'Recipient',//收货人
                     'headerOther' => [
                         'width' => '150',
                     ],
@@ -80,21 +80,21 @@ class OrderShopList extends \common\libs\dataList\DataList implements DataListIn
                     'header' => 'Contact 2',//联系方式1
                 ],
                 'PROVINCE' => [
-                    'header' => 'state',//
+                    'header' => 'State', // 
                     'headerOther' => ['width' => '120'],
                     'value' => function ($row) use($regionConfig) {
                         return $regionConfig[$row['PROVINCE']]['REGION_NAME'] ?? '';
                     },
                 ],
                 'CITY' => [
-                    'header' => 'local government area',//地方政府
+                    'header' => 'Local Government Area', // 地方政府
                     'headerOther' => ['width' => '120'],
                     'value' => function ($row) use($regionConfig) {
                         return $regionConfig[$row['CITY']]['REGION_NAME'] ?? '';
                     },
                 ],
                 'COUNTY' => [
-                    'header' => 'city',//市
+                    'header' => 'City', // 区
                     'headerOther' => ['width' => '120'],
                     'value' => function ($row) use($regionConfig) {
                         return $regionConfig[$row['COUNTY']]['REGION_NAME'] ?? '';

+ 5 - 5
backendApi/modules/v1/models/lists/shop/OrderStandardList.php

@@ -48,7 +48,7 @@ class OrderStandardList extends \common\libs\dataList\DataList implements DataLi
         if(!$this->columns){
             $this->columns = [
                 'CALC_MONTH' => [
-                    'header' => 'Settlement month',//结算月
+                    'header' => 'Bonus Month', // 结算月
                 ],
                 'USER_NAME' => [
                     'header' => 'Member code',//会员编号
@@ -66,7 +66,7 @@ class OrderStandardList extends \common\libs\dataList\DataList implements DataLi
                     },
                 ],
                 'CONSIGNEE' => [
-                    'header' => 'consignee',//收货人
+                    'header' => 'Recipient', // 收货人
                     'headerOther' => [
                         'width' => '150',
                     ],
@@ -81,21 +81,21 @@ class OrderStandardList extends \common\libs\dataList\DataList implements DataLi
                     'header' => 'Contact 2',//联系方式2
                 ],
                 'PROVINCE' => [
-                    'header' => 'state',
+                    'header' => 'State',
                     'headerOther' => ['width' => '120'],
                     'value' => function ($row) use($regionConfig) {
                         return $regionConfig[$row['PROVINCE']]['REGION_NAME'] ?? '';
                     },
                 ],
                 'CITY' => [
-                    'header' => 'local government area',//地方行政区
+                    'header' => 'Local Government Area', // 地方行政区
                     'headerOther' => ['width' => '120'],
                     'value' => function ($row) use($regionConfig) {
                         return $regionConfig[$row['CITY']]['REGION_NAME'] ?? '';
                     },
                 ],
                 'COUNTY' => [
-                    'header' => 'city',//市
+                    'header' => 'City', // 区
                     'headerOther' => ['width' => '120'],
                     'value' => function ($row) use($regionConfig) {
                         return $regionConfig[$row['COUNTY']]['REGION_NAME'] ?? '';

+ 1 - 1
backendApi/modules/v1/models/lists/shop/PackageList.php

@@ -70,7 +70,7 @@ class PackageList extends \common\libs\dataList\DataList implements DataListInte
                     },
                 ],
 			'STORE_NUMS' => [
-			    'header' => 'Kitting stock',//库存
+			    'header' => 'Kitting stock', // 库存
 			    'headerOther' => ['width' => '200'],
 			],
                 'AMOUNT' => [

+ 1 - 1
backendApi/modules/v1/models/lists/user/DecLevelList.php

@@ -79,7 +79,7 @@ class DecLevelList extends \common\libs\dataList\DataList implements DataListInt
                     ],
                 ],
                 'ADMIN_NAME' => [
-                    'header' => 'Operation administrator',//操作管理员
+                    'header' => 'Operation Administrator',//操作管理员
 //                    'headerOther' => ['width' => '120'],
                 ],
                 'CREATED_AT' => [

+ 18 - 18
backendApi/modules/v1/models/lists/user/IndexList.php

@@ -118,7 +118,7 @@ class IndexList extends \common\libs\dataList\DataList implements DataListInterf
                 ],
                 'ALLOW_LOGIN' => ['header' => 'Filter allow login','hidden'=>true],//筛选允许登录
                 'CREATED_AT' => [
-                    'header' => 'Date of accession',//加入日期
+                    'header' => 'Joining Date', // 加入日期
                     'value' => function($row) {
                         return (new DateTime([
                             'value' => $row['CREATED_AT'],
@@ -126,7 +126,7 @@ class IndexList extends \common\libs\dataList\DataList implements DataListInterf
                     },
                     'headerOther' => ['width' => '170'],
                 ],
-                'PERIOD_AT' => 'Number of joining periods',//加入期数
+                'PERIOD_AT' => 'Joining Period',//加入期数
                 'DEC_LV_NAME' => [
                     'header' => 'Real time membership level',//实时会员级别
                     'headerOther' => [
@@ -204,7 +204,7 @@ class IndexList extends \common\libs\dataList\DataList implements DataListInterf
                     'headerOther' => ['width' => '150'],
                 ],
                 'CON_REAL_NAME' => [
-                    'header' => 'Placement name',//安置姓名
+                    'header' => 'Placement Name',//安置姓名
                     'headerOther' => ['width' => '100'],
                 ],
                 'RELATIVE_LOCATION' => [
@@ -243,21 +243,21 @@ class IndexList extends \common\libs\dataList\DataList implements DataListInterf
 //                    },
 //                ],
                 'MOBILE' => [
-                    'header' => 'phone number',//手机号码
+                    'header' => 'Phone Number',//手机号码
                     'value' => function($row) {
                         return "\t".$row['MOBILE'];
                     },
                     'headerOther' => ['width' => '120'],
                 ],
                 'TEL' => [
-                    'header' => 'Alternate Phone number​',//备用手机号码
+                    'header' => 'Alternate Phone Number', // 备用手机号码
                     'value' => function($row) {
                         return "\t".$row['TEL'];
                     },
                     'headerOther' => ['width' => '120'],
                 ],
                 'DEC_USER_NAME' => [
-                    'header' => 'No. of reporting center',//所属报单中心编号
+                    'header' => 'Stockist Code', // 所属报单中心编号
                     'headerOther' => ['width' => '150'],
                 ],
                 'IS_DEC' => [
@@ -333,14 +333,14 @@ class IndexList extends \common\libs\dataList\DataList implements DataListInterf
                     },
                 ],
                 'DEC_ROLE_NAME' => [
-                    'header' => 'Entry center level',//报单中心级别
+                    'header' => 'Stockist Level',//报单中心级别
                     'headerOther' => ['width' => '110'],
                     'value' => function($row) use($decRoleConfig) {
                         return $decRoleConfig[$row['DEC_ROLE_ID']]['ROLE_NAME'] ?? '';
                     },
                 ],
                 'OPEN_BANK_NAME' => [
-                    'header' => 'Deposit bank',//开户银行
+                    'header' => 'Bank Name',//开户银行
                     'headerOther' => ['width' => '110'],
                     'value' => function($row) use($openBankConfig) {
                         return $openBankConfig[$row['OPEN_BANK']]['BANK_NAME'] ?? '';
@@ -508,7 +508,7 @@ class IndexList extends \common\libs\dataList\DataList implements DataListInterf
                     'headerOther' => ['width' => '110'],
                 ],
                 'ALLOW_TRANSFER' => [
-                    'header' => 'Transfer function enabled',//转账功能开启
+                    'header' => 'Enable "Transfer"', // 转账功能开启
                     'value' => function($row) {
                         return $row['ALLOW_TRANSFER'] == 1 ? 'on': 'off';//'开启' : '关闭'
                     },
@@ -542,7 +542,7 @@ class IndexList extends \common\libs\dataList\DataList implements DataListInterf
                     },
                 ],
                 'IS_MODIFY_PASSWORD' => [
-                    'header' => 'Password modification status',//密码修改状态
+                    'header' => 'Edit Password', // 密码修改状态
                     'value' => function($row) {
                         return $row['IS_MODIFY_PASSWORD'] == 1 ? 'on': 'off';//'开启' : '关闭'
                     },
@@ -570,12 +570,12 @@ class IndexList extends \common\libs\dataList\DataList implements DataListInterf
     {
         if(!$this->filterTypes){
             $this->filterTypes = [
-                'USER_NAME'=> ['name'=> 'Member code'],//会员编号
-                'REAL_NAME'=> ['name'=> 'Member name'],//会员姓名
+                'USER_NAME'=> ['name'=> 'Member code'], // 会员编号
+                'REAL_NAME'=> ['name'=> 'Member name'], // 会员姓名
 //                'ALLOW_LOGIN'=> ['name'=> '允许登录', 'other'=> 'yesOrNo'],
-                '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'],//实时会员级别
+                'CREATED_AT'=> ['name'=> 'Joining Date', 'other'=> 'date'], // 加入日期
+                'PERIOD_AT'=> ['name'=> 'Joining Period'], // 加入期数
+                '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'=> 'Real time employment', 'other'=> 'empLevel'],//实时聘级
@@ -589,12 +589,12 @@ class IndexList extends \common\libs\dataList\DataList implements DataListInterf
 //                'SPOUSE_IDCARD'=> ['name'=> '配偶身份证号'],
 //                'SYSTEM_NAME'=> ['name'=> '体系名称', 'other'=> 'systems'],
 //                'SUB_COM_NAME'=> ['name'=> '所属分公司', 'other'=> 'subCompany'],
-                'MOBILE'=> ['name'=> 'phone number'],//手机号码
+                'MOBILE'=> ['name'=> 'Phone Number'],//手机号码
 //                'TEL'=> ['name'=> '备用手机号码'],
-                'DEC_USER_NAME'=> ['name'=> 'No. of reporting center'],//所属报单中心编号
+                'DEC_USER_NAME'=> ['name'=> 'Stockist Code'], // 所属报单中心编号
                 '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'],//报单中心级别
+                'DEC_ROLE_NAME'=> ['name'=> 'Stockist Level', 'other'=> 'decRole'],//报单中心级别
 //                'OPEN_BANK_NAME'=> ['name'=> '开户银行', 'other'=> 'banks'],
 //                'BANK_AREA'=> ['name'=> '银行地区', 'other'=> 'area'],
 //                'BANK_ADDRESS'=> ['name'=> '开户地址'],

+ 1 - 1
backendApi/modules/v1/models/lists/user/MoveList.php

@@ -107,7 +107,7 @@ class MoveList extends \common\libs\dataList\DataList implements DataListInterfa
                     'headerOther' => ['width' => '120'],
                 ],
                 'CREATED_AT' => [
-                    'header' => 'Date of accession',//加入日期
+                    'header' => 'Joining Date', // 加入日期
                     'value' => function($row) {
                         return (new DateTime([
                             'value' => $row['CREATED_AT'],

+ 3 - 3
backendEle/src/components/WithdrawTable.vue

@@ -178,7 +178,7 @@
           {{scope.row.AUDIT_ADMIN_NAME}}
         </template>
       </el-table-column>
-      <el-table-column label="Note" width="150"> <!-- 备注 -->
+      <el-table-column label="Remark" width="150"> <!-- 备注 -->
         <template slot-scope="scope">
           {{scope.row.REMARK}}
         </template>
@@ -332,7 +332,7 @@
           > <!-- 选择日期 -->
           </el-date-picker>
         </el-form-item>
-        <el-form-item label="Note"> <!-- 备注 -->
+        <el-form-item label="Remark"> <!-- 备注 -->
           <el-input v-model="form.createRemark"></el-input>
         </el-form-item>
       </el-form>
@@ -434,7 +434,7 @@
           <el-input v-model="invoiceForm.invoiceRemark" type="textarea"
                     :rows="2"></el-input>
         </el-form-item>
-        <el-form-item label="Note"> <!-- 备注 -->
+        <el-form-item label="Remark"> <!-- 备注 -->
           <el-input v-model="invoiceForm.createRemark"></el-input>
         </el-form-item>
       </el-form>

+ 7 - 7
backendEle/src/router/index.js

@@ -146,7 +146,7 @@ export const constantRouterMap = [
         component: _import('shop/goods-add'),
         name: 'shop_goods-add',
         meta: {
-          title: 'Products add', // 商品添加
+          title: 'Add Product', // 商品添加
           breadcrumb: [
             {title: 'Dashboard', path: '/dashboard/index'}, // Dashboard
             {title: 'Shopping Mall', path: '/shop/dec-order-list'}, // 商城管理
@@ -461,7 +461,7 @@ export const constantRouterMap = [
         component: _import('user/change-user-dec-role'),
         name: 'user_change-user-dec-role',
         meta: {
-          title: 'Modify entry center level', // 修改报单中心级别
+          title: 'Modify Stockist Level', // 修改报单中心级别
           breadcrumb: [
             {title: 'Dashboard', path: '/dashboard/index'}, // Dashboard
             {title: 'Member management', path: '/user/index'}, // 会员管理
@@ -507,7 +507,7 @@ export const constantRouterMap = [
           title: 'Sponor network', // 开拓网络
           breadcrumb: [
             {title: 'Dashboard', path: '/dashboard/index'}, // Dashboard
-            {title: 'Network Atlas', path: '/atlas/relation-opt'}, // 网络图谱
+            {title: 'Network Chart', path: '/atlas/relation-opt'}, // 网络图谱
           ],
         },
       },
@@ -519,7 +519,7 @@ export const constantRouterMap = [
           title: 'Placement network', // 安置网络
           breadcrumb: [
             {title: 'Dashboard', path: '/dashboard/index'}, // Dashboard
-            {title: 'Network Atlas', path: '/atlas/relation-opt'}, // 网络图谱
+            {title: 'Network Chart', path: '/atlas/relation-opt'}, // 网络图谱
           ],
         },
       },
@@ -531,7 +531,7 @@ export const constantRouterMap = [
           title: '安置链路',
           breadcrumb: [
             {title: 'Dashboard', path: '/dashboard/index'},
-            {title: 'Network Atlas', path: '/atlas/relation-opt'},
+            {title: 'Network Chart', path: '/atlas/relation-opt'},
           ],
         },
       },
@@ -543,7 +543,7 @@ export const constantRouterMap = [
           title: '聘级网络',
           breadcrumb: [
             {title: 'Dashboard', path: '/dashboard/index'},
-            {title: 'Network Atlas', path: '/atlas/relation-opt'},
+            {title: 'Network Chart', path: '/atlas/relation-opt'},
           ],
         },
       },
@@ -555,7 +555,7 @@ export const constantRouterMap = [
       //     title: '聘级网络列表',
       //     breadcrumb: [
       //       {title: 'Dashboard', path: '/dashboard/index'},
-      //       {title: 'Network Atlas', path: '/atlas/relation-opt'},
+      //       {title: 'Network Chart', path: '/atlas/relation-opt'},
       //     ],
       //   },
       // },

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

@@ -27,9 +27,9 @@
                 <el-tag>Name<!-- 姓名 -->:{{data.REAL_NAME}}</el-tag>
                 <el-tag type="danger"><!-- 区位 -->Location:{{data.RELATIVE_LOCATION}}</el-tag>
                 <el-tag type="success"><!-- 级别 -->Level:{{data.DEC_LV_NAME}}</el-tag>
-                <el-tag type="warning"><!-- 聘级 -->Rank:{{data.EMP_LV_NAME}}</el-tag>
-                <el-tag type="warning"><!-- 聘级 -->Star:{{data.STAR_LV_NAME}}</el-tag>
-                <el-tag><!-- 加入期数 -->Number of joining periods:{{data.PERIOD_AT}}</el-tag>
+                <el-tag type="warning"><!-- 聘级 -->Rank:{{data.EMP_LV_NAME}}, {{data.STAR_LV_NAME}}</el-tag>
+<!--                <el-tag type="warning">&lt;!&ndash; 聘级 &ndash;&gt;Star:{{data.STAR_LV_NAME}}</el-tag>-->
+                <el-tag><!-- 加入期数 -->Joining Period:{{data.PERIOD_AT}}</el-tag>
               </span>
             </span>
           </el-tree>

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

@@ -26,8 +26,8 @@
                       <el-tag><!-- 会员编号 -->Member code:{{ node.label }}</el-tag>
                       <el-tag type="success">Name<!-- 姓名 -->:{{data.REAL_NAME}}</el-tag>
                       <el-tag type="warning">Level<!-- 级别 -->:{{data.DEC_LV_NAME}}</el-tag>
-                      <el-tag type="warning">Rank:<!-- 聘级 -->{{data.EMP_LV_NAME}}</el-tag>
-                      <el-tag type="warning">Star:<!-- 星级 -->{{data.STAR_LV_NAME}}</el-tag>
+                      <el-tag type="warning">Rank:<!-- 聘级 -->{{data.EMP_LV_NAME}}, {{data.STAR_LV_NAME}}</el-tag>
+<!--                      <el-tag type="warning">Star:&lt;!&ndash; 星级 &ndash;&gt;{{data.STAR_LV_NAME}}</el-tag>-->
                     </span>
                 </span>
           </el-tree>

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

@@ -43,7 +43,7 @@
             <el-option v-for="(item,key) in statuses" :label="item.label" :value="item.value" :key="key"></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="Note"><!-- 备注 -->
+        <el-form-item label="Remark"><!-- 备注 -->
           <el-input type="textarea" :row="2" placeholder="Please enter the content" v-model="form.remark"><!-- 请输入内容 --></el-input>
         </el-form-item>
       </el-form>

+ 4 - 4
backendEle/src/views/bonus/period.vue

@@ -12,7 +12,7 @@
             <el-tag type="" size="small" class="no-border">{{scope.row.PERIOD_NUM}}</el-tag>
           </template>
         </el-table-column>
-        <el-table-column label="Settlement month" width="100"><!-- 所在结算月 -->
+        <el-table-column label="Bonus Month" width="100"><!-- 所在结算月 -->
           <template slot-scope="scope">
             <el-tag type="warning" size="small" class="no-border">{{scope.row.CALC_YEAR}}-{{scope.row.CALC_MONTH}}
             </el-tag>
@@ -47,7 +47,7 @@
                          :width="50" :stroke-width="3"></el-progress>
           </template>
         </el-table-column>
-        <el-table-column label="Settlement time" width="210"><!-- 结算时间 -->
+        <el-table-column label="Date" width="210"><!-- 结算时间 -->
           <template slot-scope="scope">
             <!-- 开始 -->start:{{tool.formatDate(scope.row.CALCULATE_STARTED_AT)}}<br>
             <!-- 完成 -->complete:{{tool.formatDate(scope.row.CALCULATED_AT)}}
@@ -154,8 +154,8 @@
         permission: permission,
         filterTypes: {
           'periodNum': {isUserTable: false, name: 'Number of periods'},//期数
-          'year': {isUserTable: false, name: 'Settlement year'},//所在结算年
-          'month': {isUserTable: false, name: 'Settlement month'},//所在结算月
+          'year': {isUserTable: false, name: 'Bonus Year'},//所在结算年
+          'month': {isUserTable: false, name: 'Bonus Month'},//所在结算月
           'startTime': {isUserTable: false, name: 'Period start time', other: 'date'},//期数开始时间
           'endTime': {isUserTable: false, name: 'Period end time', other: 'date'},//期数结束时间
           'closedAt': {isUserTable: false, name: 'Closing time', other: 'date'},//封期时间

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

@@ -93,7 +93,7 @@
                          :key="item.ID"></el-option>
             </el-select>
           </el-form-item>
-          <el-form-item label="Note"><!-- 备注 -->
+          <el-form-item label="Remark"><!-- 备注 -->
             <el-input v-model="form.remark"></el-input>
           </el-form-item>
           <el-form-item label="Remarks foreground display"><!-- 备注前台显示 -->
@@ -136,7 +136,7 @@
             <el-switch v-model="form.isShow" active-value="1" inactive-value="0">
             </el-switch>
           </el-form-item>
-          <el-form-item label="Note"><!-- 备注 -->
+          <el-form-item label="Remark"><!-- 备注 -->
             <el-input v-model="form.remark"></el-input>
           </el-form-item>
         </el-form>

+ 1 - 1
backendEle/src/views/finance/change-balance-opt.vue

@@ -35,7 +35,7 @@
                            :key="item.ID"></el-option>
               </el-select>
             </el-form-item>
-            <el-form-item label="Note"><!--备注-->
+            <el-form-item label="Remark"><!--备注-->
               <el-input v-model="form.remark"></el-input>
             </el-form-item>
             <el-form-item label="Note on display"><!--备注前台显示-->

+ 1 - 1
backendEle/src/views/finance/deal-type.vue

@@ -39,7 +39,7 @@
             {{tool.formatDate(scope.row.UPDATED_AT)}}
           </template>
         </el-table-column>
-        <el-table-column label="Note" width="150">
+        <el-table-column label="Remark" width="150">
           <template slot-scope="scope">
             {{scope.row.CREATE_REMARK}}
           </template>

+ 1 - 1
backendEle/src/views/finance/recharge-status.vue

@@ -9,7 +9,7 @@
                                    :value="index"></el-option>
                     </el-select>
                 </el-form-item>
-                <el-form-item label="Note"> <!-- 备注 -->
+                <el-form-item label="Remark"> <!-- 备注 -->
                     <el-input v-model="form.createRemark"></el-input>
                 </el-form-item>
                 <el-form-item>

+ 1 - 1
backendEle/src/views/finance/withdraw-add.vue

@@ -20,7 +20,7 @@
         <el-form-item label="提现金额">
           <el-input v-model="form.applyAmount" type="number"></el-input>
         </el-form-item>
-        <el-form-item label="Note"> <!-- 备注 -->
+        <el-form-item label="Remark"> <!-- 备注 -->
           <el-input v-model="form.createRemark"></el-input>
         </el-form-item>
         <el-form-item>

+ 2 - 2
backendEle/src/views/finance/withdraw.vue

@@ -144,7 +144,7 @@
               >
               </el-date-picker>
             </el-form-item>
-            <el-form-item label="Note"> <!-- 备注 -->
+            <el-form-item label="Remark"> <!-- 备注 -->
               <el-input v-model="form.createRemark"></el-input>
             </el-form-item>
           </el-form>
@@ -402,7 +402,7 @@ export default {
       }).catch(response => {
       })
     },
-    handleStatusShow(row, status, title, remark = 'Note') { // 备注
+    handleStatusShow(row, status, title, remark = 'Remark') { // 备注
       this.auditForm = {
         auditTips: '',
         auditStatus: null,

+ 1 - 1
backendEle/src/views/shop/goods-add.vue

@@ -3,7 +3,7 @@
         <div class="white-box">
             <el-form ref="form"  label-width="250px" class="form-page">
 
-                <el-form-item label="Products Name"><!-- 商品名称 -->
+                <el-form-item label="Product Name"><!-- 商品名称 -->
                     <el-input v-model="form.goodsName"></el-input>
                 </el-form-item>
                 <!-- <el-form-item label="商品来源">

+ 2 - 2
backendEle/src/views/shop/index.vue

@@ -52,7 +52,7 @@
                     </el-dropdown-menu>
                 </el-dropdown>-->
                 <el-button type="primary" size="small" @click="handlestate" icon="el-icon-plus"
-                           v-if="permission.hasPermission(`shop/goods-add`)"><!-- 商品添加 -->Products add
+                           v-if="permission.hasPermission(`shop/goods-add`)"><!-- 商品添加 -->Add Product
                 </el-button>
 
                 <el-button type="success" size="small" @click="handleExport" v-show="permission.hasPermission(`shop/goods-list-export`)">Export Excel</el-button>
@@ -67,7 +67,7 @@
             <el-form :model="form" label-width="250px" class="form-dialog" v-loading="dialogEditLoading">
 
 
-                    <el-form-item label="Products Name"><!-- 商品名称 -->
+                    <el-form-item label="Product Name"><!-- 商品名称 -->
                         <el-input v-model="form.goodsName"></el-input>
                     </el-form-item>
                     <!-- <el-form-item label="商品来源">

+ 1 - 1
backendEle/src/views/user/change-user-dec-level.vue

@@ -19,7 +19,7 @@
                        :key="key"></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="note"><!-- 备注 -->
+        <el-form-item label="Remark"><!-- 备注 -->
           <el-input type="textarea" :rows="2" placeholder="" v-model="form.remark">
           </el-input>
         </el-form-item>

+ 3 - 3
backendEle/src/views/user/change-user-dec-role.vue

@@ -8,13 +8,13 @@
             allDecRole[userInfo.DEC_ROLE_ID]['ROLE_NAME'] : ''}}
           </el-tag>
         </el-form-item>
-        <el-form-item label="Entry center level"><!-- 报单中心级别 -->
-          <el-select v-model="form.levelId" placeholder="Please select the entry center level"><!-- 请选择报单中心级别 -->
+        <el-form-item label="Stockist Level"><!-- 报单中心级别 -->
+          <el-select v-model="form.levelId" placeholder="Please select the Stockist level"><!-- 请选择报单中心级别 -->
             <el-option v-for="(item,key) in allDecRole" :label="item.ROLE_NAME" :value="item.ID"
                        :key="key"></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="Note"><!-- 备注 -->
+        <el-form-item label="Remark"><!-- 备注 -->
           <el-input type="textarea" :rows="2" placeholder="" v-model="form.remark">
           </el-input>
         </el-form-item>

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

@@ -123,7 +123,7 @@
         <el-form-item label="ID"><!-- 身份证号 -->
           <el-input v-model="formModifyProfile.idCard"></el-input>
         </el-form-item>
-        <el-form-item label="phone number"><!-- 手机号 -->
+        <el-form-item label="Phone Number"><!-- 手机号 -->
           <el-input v-model="formModifyProfile.mobile"></el-input>
         </el-form-item>
         <el-form-item label="Bank name"><!-- 银行名称 -->
@@ -335,7 +335,7 @@
               })
               return
           }
-          let isDecTip = isDec === true ? 'set as entry center ':' Cancel entry center ' //'设为报单中心' : '取消报单中心'
+          let isDecTip = isDec === true ? 'set as Stockist ':' Cancel Stockist ' //'设为报单中心' : '取消报单中心'
           this.$confirm(`Are you sure you want to【${isDecTip}】?`, 'Hint', {//`确定要对所选会员【${isDecTip}】吗?`, '提示'
               confirmButtonText: 'confirm', // 确定
               cancelButtonText: 'cancel', // 取消

+ 3 - 3
backendEle/src/views/user/index.vue

@@ -115,7 +115,7 @@
           </el-button>
           <el-dropdown-menu slot="dropdown">
             <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 command="notDec" @click.native="handleIsDecManage(false)">Cancel Stockist<!-- 取消报单中心 -->
             </el-dropdown-item>
           </el-dropdown-menu>
         </el-dropdown>
@@ -218,7 +218,7 @@
         <el-form-item label="Identity No."><!-- 身份证号 -->
           <el-input v-model="formModifyProfile.idCard"></el-input>
         </el-form-item>
-        <el-form-item label="phone number"><!-- 手机号 -->
+        <el-form-item label="Phone Number"><!-- 手机号 -->
           <el-input v-model="formModifyProfile.mobile"></el-input>
         </el-form-item>
         <el-form-item label="Bank name"><!-- 银行名称 -->
@@ -430,7 +430,7 @@
               })
               return
           }
-          let isDecTip = isDec === true ? 'Set as declaration Center' : 'Cancel entry Center'//'设为报单中心' : '取消报单中心'
+          let isDecTip = isDec === true ? 'Set as declaration Center' : 'Cancel Stockist'//'设为报单中心' : '取消报单中心'
           this.$confirm(`Are you sure you want to【${isDecTip}】?`, 'Hint', {//确定要对所选会员【${isDecTip}】吗?`, '提示'
               confirmButtonText: 'confirm', // 确定
               cancelButtonText: 'cancel', // 取消

+ 2 - 2
backendEle/src/views/user/move.vue

@@ -122,7 +122,7 @@
             <el-option label="III. Market" value="3" key="location_3"></el-option><!-- 三市场 -->
           </el-select>
         </el-form-item>
-        <el-form-item label="note"><!-- 备注 -->
+        <el-form-item label="Remark"><!-- 备注 -->
           <el-input v-model="form.remark"></el-input>
         </el-form-item>
       </el-form>
@@ -185,7 +185,7 @@
             <el-option label="III. Market" value="3" key="location_3"></el-option><!-- 三市场 -->
           </el-select>
         </el-form-item>
-        <el-form-item label="note"><!-- 备注 -->
+        <el-form-item label="Remark"><!-- 备注 -->
           <el-input v-model="form.remark"></el-input>
         </el-form-item>
       </el-form>

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

@@ -27,8 +27,8 @@
             <el-form-item label="Declaration center or not"><!-- 是否报单中心 -->
               <el-switch v-model="form.isDec"></el-switch>
             </el-form-item>
-            <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-form-item label="Stockist Level" v-show="form.isDec"><!-- 报单中心级别 -->
+              <el-select v-model="form.decRoleId" placeholder="Please select the Stockist level"><!-- 请选择报单中心级别 -->
                 <el-option v-for="(item,index) in allDecRole" :key="index" :label="item.ROLE_NAME"
                            :value="item.ID"></el-option>
               </el-select>
@@ -39,7 +39,7 @@
             <el-form-item>
               <template slot="label">
                 <span class="text-danger">*</span>
-                Entry Center No<!-- 报单中心编号 -->
+                Stockist No<!-- 报单中心编号 -->
               </template>
               <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">
@@ -70,7 +70,7 @@
             <el-form-item>
               <template slot="label">
                 <span class="text-danger">*</span>
-                Pioneer<!-- 开拓人 -->
+                Sponsor<!-- 开拓人 -->
               </template>
               <el-input v-model="form.recUserName" @change="handleChkRecUser">
                 <template slot="append">【{{recRealName}}】</template>
@@ -101,7 +101,7 @@
             </el-form-item>
             <el-form-item>
               <template slot="label">
-                phone number<!-- 手机号 -->
+                Phone Number<!-- 手机号 -->
               </template>
               <el-input v-model="form.mobile" maxlength="11"></el-input>
             </el-form-item>
@@ -125,7 +125,7 @@
                   </el-date-picker>
                 </el-form-item>
 
-                <el-form-item label="Alternate Phone number​" v-show="false"><!-- 备用手机号 -->
+                <el-form-item label="Alternate Phone Number" v-show="false"><!-- 备用手机号 -->
                   <el-input v-model="form.tel" maxlength="11"></el-input>
                 </el-form-item>
 

+ 1 - 1
common/config/params.php

@@ -333,7 +333,7 @@ return [
     'exportModule' => [
         'shop' => ['label' => 'Mall management', 'value'=>'shop'],//商城管理
         'user' => ['label' => 'Member management', 'value'=>'user'],//会员管理
-        'atlas' => ['label' => 'Network Atlas', 'value'=>'atlas'],//网络图谱
+        'atlas' => ['label' => 'Network Chart', 'value'=>'atlas'],//网络图谱
         'reconsume' => ['label' => 'Resale management', 'value'=>'reconsume'],//复销管理
         'bonus' => ['label' => 'Bonus management', 'value'=>'bonus'],//奖金管理
         //'report' => ['label' => '报表管理', 'value'=>'report'],

+ 10 - 10
common/libs/export/BaseExport.php

@@ -727,13 +727,13 @@ ORDER;
                             
                             <table border="1" width="100%" style="padding: 10px 5px; text-align: center;">
                                 <tr>
-                                    <th width="15%" style="font-size: 14px; font-weight: bold; text-align: center;">Product code</th>
-                                    <th width="25%" style="font-size: 14px; font-weight: bold; text-align: center;">Product name</th>
-                                    <th width="15%" style="font-size: 14px; font-weight: bold; text-align: center;">Product price</th>
+                                    <th width="15%" style="font-size: 14px; font-weight: bold; text-align: center;">Product Code</th>
+                                    <th width="25%" style="font-size: 14px; font-weight: bold; text-align: center;">Product Name</th>
+                                    <th width="15%" style="font-size: 14px; font-weight: bold; text-align: center;">Product Price</th>
                                     <th width="10%" style="font-size: 14px; font-weight: bold; text-align: center;">Qty</th>
-                                    <th width="10%" style="font-size: 14px; font-weight: bold; text-align: center;">Tax rate</th>
+                                    <th width="10%" style="font-size: 14px; font-weight: bold; text-align: center;">Tax Rate</th>
                                     <th width="10%" style="font-size: 14px; font-weight: bold; text-align: center;">Tax</th>
-                                    <th width="15%" style="font-size: 14px; font-weight: bold; text-align: center;">Total amount</th>
+                                    <th width="15%" style="font-size: 14px; font-weight: bold; text-align: center;">Total Amount</th>
                                 </tr>
                                 {$orderDetails}
                                 <tr>
@@ -982,13 +982,13 @@ ORDER;
                             
                             <table border="1" width="100%" style="padding: 10px 5px; text-align: center;">
                                 <tr>
-                                    <th width="15%" style="font-size: 14px; font-weight: bold; text-align: center;">Product code</th>
-                                    <th width="25%" style="font-size: 14px; font-weight: bold; text-align: center;">Product name</th>
-                                    <th width="15%" style="font-size: 14px; font-weight: bold; text-align: center;">Product price</th>
+                                    <th width="15%" style="font-size: 14px; font-weight: bold; text-align: center;">Product Code</th>
+                                    <th width="25%" style="font-size: 14px; font-weight: bold; text-align: center;">Product Name</th>
+                                    <th width="15%" style="font-size: 14px; font-weight: bold; text-align: center;">Product Price</th>
                                     <th width="10%" style="font-size: 14px; font-weight: bold; text-align: center;">Qty</th>
-                                    <th width="10%" style="font-size: 14px; font-weight: bold; text-align: center;">Tax rate</th>
+                                    <th width="10%" style="font-size: 14px; font-weight: bold; text-align: center;">Tax Rate</th>
                                     <th width="10%" style="font-size: 14px; font-weight: bold; text-align: center;">Tax</th>
-                                    <th width="15%" style="font-size: 14px; font-weight: bold; text-align: center;">Total amount</th>
+                                    <th width="15%" style="font-size: 14px; font-weight: bold; text-align: center;">Total Amount</th>
                                 </tr>
                                 {$orderDetails}
                                 <tr>

+ 1 - 1
common/models/Withdraw.php

@@ -127,7 +127,7 @@ class Withdraw extends \common\components\ActiveRecord {
             'BANK_COUNTY' => '银行地区',
             'P_MONTH' => '表分区标识',
             'AUDIT_STATUS' => '审核状态',
-            'REMARK' => 'Note', // 备注,
+            'REMARK' => 'Remark', // 备注,
             'UPDATE_ADMIN' => '修改管理员',
             'UPDATE_REMARK' => '修改备注',
             'AUDIT_ADMIN' => '审核管理员',

+ 11 - 11
common/models/forms/AdminAddUserForm.php

@@ -101,12 +101,12 @@ class AdminAddUserForm extends Model {
 
     public function attributeLabels() {
         return [
-            'userName' => 'Member code',//会员编号
-            'nation' => 'nation',//民族
-            'realName' => 'Member name',//会员姓名
+            'userName' => 'Member Code',//会员编号
+            'nation' => 'Nation',//民族
+            'realName' => 'Member Name',//会员姓名
             'idCard' => 'ID',//身份证号
-            'mobile' => 'phone number',//手机号
-            'address' => 'address',//地址
+            'mobile' => 'Phone Number',//手机号
+            'address' => 'Address',//地址
             'openBank' => 'Bank Name',//开户行
             'bankAddress' => 'Account opening sub branch',//开户支行
             'bankNo' => 'bank account',//银行账号
@@ -115,11 +115,11 @@ class AdminAddUserForm extends Model {
             'areaSelected' => 'Location',//所在地区
             'tel' => 'Telephone',//电话
             'isDec' => 'Declaration center or not',//是否报单中心
-            'decUserName' => 'Entry Center No',//报单中心编号
+            'decUserName' => 'Stockist No', // 报单中心编号
             'birthday' => 'birthday',//生日
-            'decRoleId' => 'Entry center level',//报单中心级别
+            'decRoleId' => 'Stockist Level',//报单中心级别
             'conUserName' => 'Contact person Member No',//接点人会员编号
-            'recUserName' => 'Pioneer Member No',
+            'recUserName' => 'Sponsor 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, 'Entry center does not exist');//报单中心不存在
+            $this->addError($attribute, 'Stockist does not exist');//报单中心不存在
         } else {
             $this->_decId = $decUser['ID'];
         }
@@ -142,7 +142,7 @@ class AdminAddUserForm extends Model {
      */
     public function issetDecRoleId($attribute) {
         if ($this->isDec && !$this->decRoleId) {
-            $this->addError($attribute, 'Entry center level cannot be empty');//报单中心级别不能为空
+            $this->addError($attribute, 'Stockist level cannot be empty');//报单中心级别不能为空
         }
     }
 
@@ -338,7 +338,7 @@ class AdminAddUserForm extends Model {
                 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('Failed to reduce the number of recommended pioneers');//减少开拓人推荐数量失败
+                throw new Exception('Failed to reduce the number of recommended Sponsor');//减少开拓人推荐数量失败
             }
             // 删除会员信息
             if(!UserInfo::deleteAll('USER_ID=:USER_ID', [':USER_ID' => $this->_delUserId])){

+ 14 - 14
common/models/forms/ApproachDeclarationForm.php

@@ -147,9 +147,9 @@ class ApproachDeclarationForm extends Model
             'insertUserName' => 'Member user name',//会员用户名
             'password' => 'Login password',//登陆密码
             'payPassword' => 'Payment password',//支付密码
-            'realName' => 'Member name',//会员姓名
+            'realName' => 'Member Name',//会员姓名
             'insertUserIdCard' => 'ID',//身份证号
-            'mobile' => 'phone number',//手机号
+            'mobile' => 'Phone Number',//手机号
             'openBank' => 'openBank',//开户行
             'bankAddress' => 'bankAddress',//开户支行
             'bankNo' => 'bankNo',//银行账号
@@ -158,12 +158,12 @@ class ApproachDeclarationForm extends Model
             'bankCounty' => 'bankCounty',//银行县区
             'conUserName' => 'Instructor user name',//指导老师用户名
             'recUserName' => 'Developer user name',//开拓人用户名
-            'decUserName' => 'Entry center user name',//报单中心用户名
+            'decUserName' => 'Stockist user name',//报单中心用户名
             'conUid' => 'Instructor member ID',//指导老师会员ID
-            'recUid' => 'Pioneer member ID',//'开拓人会员ID
+            'recUid' => 'Sponsor member ID',//'开拓人会员ID
             'location' => 'market',//市场
             'consignee' => 'consignee',//收货人
-            'acceptMobile' => 'Consignee is phone number',//收货人手机
+            'acceptMobile' => 'Recipient Phone Number',//收货人手机
             'province' => 'Receiving Province',//收货省
             'city' => 'Receiving City',//收货市
             'county' => 'Receiving area / county',//收货区县
@@ -192,7 +192,7 @@ class ApproachDeclarationForm 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, 'Entry center does not exist');//报单中心不存在
+            $this->addError($attribute, 'Stockist does not exist');//报单中心不存在
             return false;
         } else {
             // 判断报单中心是否在新加入会员的安置网上级中
@@ -205,7 +205,7 @@ class ApproachDeclarationForm extends Model
 //            exit;
             if (!isset($flipParent[$this->decUserName])) {
                 //$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');
+                $this->addError($attribute, 'To' . $this->insertUserName . 'Entry, Stockist' . $this->decUserName . 'not in exist' . $this->insertUserName . 'in the placement superiors');
                 return ;
             }
             $this->_decId = $decUser['ID'];
@@ -294,10 +294,10 @@ class ApproachDeclarationForm extends Model
                 if(!$recUserTemp){
                     if($this->insertUserName){
                         //$this->addError($attribute, '为'.$this->insertUserName.'报单,开拓人'.$this->recUserName.'不存在');
-                        $this->addError($attribute, 'To'.$this->insertUserName.'Entry,Pioneer'.$this->recUserName.'not in exist');
+                        $this->addError($attribute, 'To'.$this->insertUserName.'Entry, Sponsor'.$this->recUserName.'not in exist');
                     } else {
                        // $this->addError($attribute, '开拓人'.$this->recUserName.'不存在');
-                        $this->addError($attribute, 'Pioneer'.$this->recUserName.'not in exist');
+                        $this->addError($attribute, 'Sponsor'.$this->recUserName.'not in exist');
                     }
 
                     return ;
@@ -327,7 +327,7 @@ class ApproachDeclarationForm extends Model
                 $this->loopFindParentToNetwork($this->insertUserName);
                 if (!$this->recUserIsInNetworkParent()) {
                    // $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');
+                    $this->addError($attribute, 'To' . $this->insertUserName . 'Entry, Sponsor' . $this->recUserName . 'not in exist' . $this->insertUserName . 'in the placement superiors');
                     return ;
                 }
             }
@@ -481,7 +481,7 @@ class ApproachDeclarationForm extends Model
                 $recUserTemp = UserInfo::findOneAsArray('USER_NAME=:USER_NAME', [':USER_NAME' => $this->recUserName]);
                 if(!$recUserTemp){
 //                    $this->addError($attribute, '为'.$this->insertUserName.'报单,开拓人'.$this->recUserName.'不存在');
-                    $this->addError($attribute, 'To'.$this->insertUserName.'Entry,Pioneer'.$this->recUserName.'not in exist');
+                    $this->addError($attribute, 'To'.$this->insertUserName.'Entry, Sponsor'.$this->recUserName.'not in exist');
                     return ;
                 }
                 $recUserTemp['CON_NUM'] = UserNetwork::firstFloorChildNum($recUserTemp['USER_ID']);
@@ -506,13 +506,13 @@ class ApproachDeclarationForm extends Model
             // 判断接点会员的下级会员是否大于三个,如果大于三个则不允许
             if($conUser['CON_NUM'] >= 3){
 //                $this->addError($attribute, '为'.$this->insertUserName.'报单,指导老师'.$this->conUserName.'下级点位已满');
-                $this->addError($attribute, 'To'.$this->insertUserName.'Entry,Pioneer'.$this->conUserName.'lower level is full');
+                $this->addError($attribute, 'To'.$this->insertUserName.'Entry, Sponsor'.$this->conUserName.'lower level is full');
                 return;
             }
             // 判断指导老师相应的区位是否已满
             if($conUser['LOCATION'.$this->location]){
 //                $this->addError($attribute, '为'.$this->insertUserName.'报单,指导老师'.$this->conUserName.'该市场已存在会员');
-                $this->addError($attribute, 'To'.$this->insertUserName.'Entry,Pioneer'.$this->conUserName.'Members already exist in this market');
+                $this->addError($attribute, 'To'.$this->insertUserName.'Entry, Sponsor'.$this->conUserName.'Members already exist in this market');
                 return;
             }
 //            if($conUser['CON_NUM'] == 0 && $this->location != 1){
@@ -558,7 +558,7 @@ class ApproachDeclarationForm extends Model
                 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->recUserName) $this->addError($attribute, 'For the first purchase, the Sponsor 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 {

+ 35 - 35
common/models/forms/DeclarationForm.php

@@ -131,34 +131,34 @@ class DeclarationForm extends Model
     public function attributeLabels()
     {
         return [
-            'type' => 'Entry type',//报单类型
-            'decLv' => 'Entry level',//报单级别
+            'type' => 'Entry type', // 报单类型
+            'decLv' => 'Entry level', // 报单级别
             //'decPv' => '报单PV',
-            'decWay' => 'Entry method',//报单方式
-            'packageId' => 'Entry Package',//报单套餐
-            'goodsId' => 'product ID',//商品ID
-            'goodsNum' => 'Product quantity',//商品数量
+            'decWay' => 'Entry method', // 报单方式
+            'packageId' => 'Entry Package', // 报单套餐
+            'goodsId' => 'product ID', // 商品ID
+            'goodsNum' => 'Product quantity', // 商品数量
             //'addType' => '新增会员方式',
-            'insertUserName' => 'Member user name',//会员用户名
-            'password' => 'Login password',//登陆密码
-            'payPassword' => 'Payment password',//支付密码
-            'realName' => 'Member name',//会员姓名
-            'insertUserIdCard' => 'ID',//身份证号
-            'mobile' => 'phone number',//手机号
-            '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',//收货人手机
+            'insertUserName' => 'Member user name', // 会员用户名
+            'password' => 'Login password', // 登陆密码
+            'payPassword' => 'Payment password', // 支付密码
+            'realName' => 'Member name', // 会员姓名
+            'insertUserIdCard' => 'ID', // 身份证号
+            'mobile' => 'Phone Number', // 手机号
+            'openBank' => 'openBank', // 开户行
+            'bankAddress' => 'bankAddress', // 开户支行
+            'bankNo' => 'bankNo', // 银行账号
+            'bankProvince' => 'bankProvince', // 银行省份
+            'bankCity' => 'bankCity', // 银行城市
+            'bankCounty' => 'bankCounty', // 银行县区
+            'conUserName' => 'Instructor user name', // 指导老师用户名
+            'recUserName' => 'Developer user name', // 开拓人用户名
+            'decUserName' => 'Stockist user name', // 报单中心用户名
+            'conUid' => 'Instructor Member ID', // 指导老师会员ID
+            'recUid' => 'Sponsor Member ID', // 开拓人会员ID
+            'location' => 'market', // 市场
+            'consignee' => 'Recipient', // 收货人
+            'acceptMobile' => 'Recipient Phone Number', // 收货人手机
             'province' => 'Receiving Province',//收货省
             'city' => 'Receiving City',//收货市
             'county' => 'Receiving area / county',//收货区县
@@ -187,7 +187,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, 'Entry center does not exist');//报单中心不存在
+            $this->addError($attribute, 'Stockist does not exist');//报单中心不存在
             return false;
         } else {
             // 判断报单中心是否在新加入会员的安置网上级中
@@ -200,7 +200,7 @@ class DeclarationForm extends Model
 //            exit;
             if (!isset($flipParent[$this->decUserName])) {
                 //$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');
+                $this->addError($attribute, 'To' . $this->insertUserName . 'Entry, Stockist' . $this->decUserName . 'not in exist' . $this->insertUserName . 'in the placement superiors');
                 return ;
             }
             $this->_decId = $decUser['ID'];
@@ -289,10 +289,10 @@ class DeclarationForm extends Model
                 if(!$recUserTemp){
                     if($this->insertUserName){
                         //$this->addError($attribute, '为'.$this->insertUserName.'报单,开拓人'.$this->recUserName.'不存在');
-                        $this->addError($attribute, 'To'.$this->insertUserName.'Entry,Pioneer'.$this->recUserName.'not in exist');
+                        $this->addError($attribute, 'To'.$this->insertUserName.'Entry, Sponsor'.$this->recUserName.'not in exist');
                     } else {
                        // $this->addError($attribute, '开拓人'.$this->recUserName.'不存在');
-                        $this->addError($attribute, 'Pioneer'.$this->recUserName.'not in exist');
+                        $this->addError($attribute, 'Sponsor'.$this->recUserName.'not in exist');
                     }
 
                     return ;
@@ -322,7 +322,7 @@ class DeclarationForm extends Model
                 $this->loopFindParentToNetwork($this->insertUserName);
                 if (!$this->recUserIsInNetworkParent()) {
                    // $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');
+                    $this->addError($attribute, 'To' . $this->insertUserName . 'Entry, Sponsor' . $this->recUserName . 'not in exist' . $this->insertUserName . 'in the placement superiors');
                     return ;
                 }
             }
@@ -491,7 +491,7 @@ class DeclarationForm extends Model
                 $recUserTemp = UserInfo::findOneAsArray('USER_NAME=:USER_NAME', [':USER_NAME' => $this->recUserName]);
                 if(!$recUserTemp){
 //                    $this->addError($attribute, '为'.$this->insertUserName.'报单,开拓人'.$this->recUserName.'不存在');
-                    $this->addError($attribute, 'To'.$this->insertUserName.'Entry,Pioneer'.$this->recUserName.'not in exist');
+                    $this->addError($attribute, 'To'.$this->insertUserName.'Entry, Sponsor'.$this->recUserName.'not in exist');
                     return ;
                 }
                 $recUserTemp['CON_NUM'] = UserNetwork::firstFloorChildNum($recUserTemp['USER_ID']);
@@ -516,13 +516,13 @@ class DeclarationForm extends Model
             // 判断接点会员的下级会员是否大于三个,如果大于三个则不允许
             if($conUser['CON_NUM'] >= 3){
 //                $this->addError($attribute, '为'.$this->insertUserName.'报单,指导老师'.$this->conUserName.'下级点位已满');
-                $this->addError($attribute, 'To'.$this->insertUserName.'Entry,Pioneer'.$this->conUserName.'lower level is full');
+                $this->addError($attribute, 'To'.$this->insertUserName.'Entry, Sponsor'.$this->conUserName.'lower level is full');
                 return;
             }
             // 判断指导老师相应的区位是否已满
             if($conUser['LOCATION'.$this->location]){
 //                $this->addError($attribute, '为'.$this->insertUserName.'报单,指导老师'.$this->conUserName.'该市场已存在会员');
-                $this->addError($attribute, 'To'.$this->insertUserName.'Entry,Pioneer'.$this->conUserName.'Members already exist in this market');
+                $this->addError($attribute, 'To'.$this->insertUserName.'Entry, Sponsor'.$this->conUserName.'Members already exist in this market');
                 return;
             }
 //            if($conUser['CON_NUM'] == 0 && $this->location != 1){
@@ -568,7 +568,7 @@ class DeclarationForm extends Model
                 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->recUserName) $this->addError($attribute, 'For the first purchase, the Sponsor 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 {

+ 2 - 2
common/models/forms/DeclarationUpgradeForm.php

@@ -86,7 +86,7 @@ class DeclarationUpgradeForm extends Model
             'goodsNum' => 'Product quantity',//商品数量
             'insertUserName' => 'Member number to be upgraded',//要升级的会员编号
             'consignee' => 'consignee',//收货人
-            'acceptMobile' => 'The phone number of Consignee',//收货人手机
+            'acceptMobile' => 'The Phone Number of Consignee',//收货人手机
             'province' => 'Receiving Province',//收货省
             'city' => 'Receiving City',//收货市
             'county' => 'Receiving area / county',//收货区县
@@ -380,7 +380,7 @@ class DeclarationUpgradeForm extends Model
         ->asArray()
         ->one();
         if (!$decUser) {
-            $this->addError($attribute, 'Entry center does not exist');//报单中心不存在
+            $this->addError($attribute, 'Stockist does not exist');//报单中心不存在
             return false;
         } else {
             // 判断报单中心是否在新加入会员的安置网上级中

+ 1 - 1
common/models/forms/OrderForm.php

@@ -105,7 +105,7 @@ class OrderForm extends Model
             'city' => '市',
             'county' => '区',
             'lgaName' => 'lga name',
-            'cityName' => 'city name',
+            'cityName' => 'City Name',
             'detailaddress' => '收货详细地址',
             'email' => 'Email',
         ];

+ 9 - 9
common/models/forms/ShopGoodsForm.php

@@ -69,20 +69,20 @@ class ShopGoodsForm extends Model
         return [
             'selectedIds' => '商品ID',
             'id' => '产品ID',
-            'goodsName' => '商品名称',
-            'sellDiscount' => '会员折扣',
-            'giftType' => '商品类型',
-            'categoryType' => '商品分类',
+            'goodsName' => 'Product Name', // 商品名称
+            'sellDiscount' => 'Discount Rate', // 会员折扣
+            'giftType' => 'Product Type', // 商品类型
+            'categoryType' => 'Product Category', // 商品分类
             'sellType' => '出售方式',
-            'goodsNo' => '产品编号',
+            'goodsNo' => 'Product Code', // 产品编号
             'unit' => '单位',
             'cover' => '封面',
-            'sellPrice' => '销售价格',
+            'sellPrice' => 'Price', // 销售价格
             'sellPriceStandard' => '标准价格',
-            'marketPrice' => '市场价格',
-            'pricePv' => '销售PV',
+            'marketPrice' => 'Market Price', // 市场价格
+            'pricePv' => 'BV', // 销售PV
             //'point' => '兑换积分',
-            'storeNums' => '库存',
+            'storeNums' => 'Inventory', // 库存
             'content' => '产品详情',
             'listOrder' => '排序',
             'taxRate' => '税率',

+ 1 - 1
frontendApi/config/menu.php

@@ -55,7 +55,7 @@ return [
         ]
     ],
     'atlas'=>[
-        'name'=>'Network Atlas',
+        'name'=>'Network Chart',
         'class' => '',
         'icon'=>'el-icon-data-line',
         'controller'=>'atlas',

+ 8 - 8
frontendApi/modules/v1/controllers/ShopController.php

@@ -642,9 +642,9 @@ ORDER;
                             
                             <table border="1" width="100%" style="padding: 10px 5px; text-align: center;">
                                 <tr>
-                                    <th width="15%" style="font-size: 14px; font-weight: bold; text-align: center;">Product code</th>
-                                    <th width="25%" style="font-size: 14px; font-weight: bold; text-align: center;">Product name</th>
-                                    <th width="15%" style="font-size: 14px; font-weight: bold; text-align: center;">Product price</th>
+                                    <th width="15%" style="font-size: 14px; font-weight: bold; text-align: center;">Product Code</th>
+                                    <th width="25%" style="font-size: 14px; font-weight: bold; text-align: center;">Product Name</th>
+                                    <th width="15%" style="font-size: 14px; font-weight: bold; text-align: center;">Product Price</th>
                                     <th width="10%" style="font-size: 14px; font-weight: bold; text-align: center;">Qty</th>
                                     <th width="10%" style="font-size: 14px; font-weight: bold; text-align: center;">Tax rate</th>
                                     <th width="10%" style="font-size: 14px; font-weight: bold; text-align: center;">Tax</th>
@@ -888,13 +888,13 @@ ORDER;
                             
                             <table border="1" width="100%" style="padding: 10px 20px; text-align: center;">
                                 <tr>
-                                    <th width="15%" style="font-size: 14px; font-weight: bold; text-align: center;">Product code</th>
-                                    <th width="25%" style="font-size: 14px; font-weight: bold; text-align: center;">Product name</th>
-                                    <th width="15%" style="font-size: 14px; font-weight: bold; text-align: center;">Product price</th>
+                                    <th width="15%" style="font-size: 14px; font-weight: bold; text-align: center;">Product Code</th>
+                                    <th width="25%" style="font-size: 14px; font-weight: bold; text-align: center;">Product Name</th>
+                                    <th width="15%" style="font-size: 14px; font-weight: bold; text-align: center;">Product Price</th>
                                     <th width="10%" style="font-size: 14px; font-weight: bold; text-align: center;">Qty</th>
-                                    <th width="10%" style="font-size: 14px; font-weight: bold; text-align: center;">Tax rate</th>
+                                    <th width="10%" style="font-size: 14px; font-weight: bold; text-align: center;">Tax Rate</th>
                                     <th width="10%" style="font-size: 14px; font-weight: bold; text-align: center;">Tax</th>
-                                    <th width="15%" style="font-size: 14px; font-weight: bold; text-align: center;">Total amount</th>
+                                    <th width="15%" style="font-size: 14px; font-weight: bold; text-align: center;">Total Amount</th>
                                 </tr>
                                 {$orderDetails}
                                 <tr>

+ 1 - 1
frontendEle/src/router/index.js

@@ -259,7 +259,7 @@ export const constantRouterMap = [
                     title: 'Placement network',
                     breadcrumb: [
                         {title: 'Dashboard', path: '/dashboard/index'},
-                        {title: 'Network Atlas', path: '/atlas/network'},
+                        {title: 'Network Chart', path: '/atlas/network'},
                     ],
                 },
             },

+ 3 - 3
frontendEle/src/views/atlas/network.vue

@@ -24,9 +24,9 @@
             <el-tag>Name: {{data.REAL_NAME}}</el-tag>
             <el-tag type="danger">Location: {{data.RELATIVE_LOCATION}}</el-tag>
             <el-tag type="success">Level: {{data.DEC_LV_NAME}}</el-tag>
-            <el-tag type="warning">Rank: {{data.EMP_LV_NAME}}</el-tag>
-            <el-tag type="warning">Star: {{data.STAR_LV_NAME}}</el-tag>
-            <el-tag>Number of joining periods: {{data.PERIOD_AT}}</el-tag>
+            <el-tag type="warning">Rank: {{data.EMP_LV_NAME}}, {{data.STAR_LV_NAME}}</el-tag>
+<!--            <el-tag type="warning">Star: {{data.STAR_LV_NAME}}</el-tag>-->
+            <el-tag>Joining Period: {{data.PERIOD_AT}}</el-tag>
           </span>
         </span>
       </el-tree>

+ 1 - 1
frontendEle/src/views/bonus/index.vue

@@ -69,7 +69,7 @@
             {{tool.formatPrice(scope.row.TOTAL)}}
           </template>
         </el-table-column>
-        <el-table-column label="Note" prop="REMARK"></el-table-column><!-- 备注 -->
+        <el-table-column label="Remark" prop="REMARK"></el-table-column><!-- 备注 -->
       </el-table>
       <div slot="footer" class="dialog-footer">
         <pagination :total="totalCount" :page_size="pageSize" @size-change="handleSizeChange" @current-change="handleCurrentChange"></pagination>

+ 1 - 1
frontendEle/src/views/config/receive-address-edit.vue

@@ -12,7 +12,7 @@
         <el-form-item>
           <template slot="label">
             <span class="text-danger">*</span>
-            Phone number<!-- 手机号 -->
+            Phone Number<!-- 手机号 -->
           </template>
           <el-input v-model="form.mobile"></el-input>
         </el-form-item>

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

@@ -3,7 +3,7 @@
     <div class="white-box">
       <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="Phone Number" prop="MOBILE" width="150"></el-table-column><!-- 手机号码 -->
 
         <el-table-column label="Address" prop="ADDRESS" ></el-table-column><!-- 详细地址 -->
 

+ 1 - 1
frontendEle/src/views/finance/transfer-add.vue

@@ -38,7 +38,7 @@
         <el-form-item label="Actual amount transferred into" v-show="fee!=='0'"> <!-- 实际到账金额 -->
           <el-tag type="warning">{{realAmount}} NGN</el-tag> <!-- 元 -->
         </el-form-item>
-        <el-form-item label="Note" style="margin-top: 25px;"> <!-- 备注 -->
+        <el-form-item label="Remark" style="margin-top: 25px;"> <!-- 备注 -->
           <el-input v-model="form.remark"></el-input>
         </el-form-item>
         <el-form-item>

+ 1 - 1
frontendEle/src/views/finance/transfer-list.vue

@@ -27,7 +27,7 @@
             {{tool.formatDate(scope.row.CREATED_AT)}}<br>
           </template>
         </el-table-column>
-        <el-table-column label="Note" prop="REMARK"></el-table-column> <!-- 备注 -->
+        <el-table-column label="Remark" prop="REMARK"></el-table-column> <!-- 备注 -->
       </el-table>
       <div class="white-box-footer">
         <!--<el-button type="primary" size="small" @click="handleAdd">我要转账</el-button>-->

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

@@ -23,7 +23,7 @@
                 <el-table-column width="120" label="Member Code" prop="USER_NAME"></el-table-column><!--会员编号-->
                 <el-table-column width="120" label="Member Name" prop="REAL_NAME"></el-table-column><!--会员姓名-->
                 <el-table-column width="130" label="Recipient name" prop="CONSIGNEE"></el-table-column><!--收货人-->
-                <el-table-column width="120" label="Phone number" prop="MOBILE"></el-table-column><!--收货电话-->
+                <el-table-column width="120" label="Phone Number" prop="MOBILE"></el-table-column><!--收货电话-->
                 <el-table-column width="150" label="Shipping Address" prop="FULL_ADDRESS"></el-table-column><!--收货地址-->
                 <el-table-column label="Payment" prop="PAY_TYPE"></el-table-column>
                 <el-table-column width="120" label="Created time" prop="CREATED_AT"></el-table-column>

+ 1 - 1
frontendEle/src/views/shop/order.vue

@@ -64,7 +64,7 @@
                 Full address:{{item.ADDRESS}}, {{item.CITY_NAME}}, {{item.LGA_NAME}}, {{item.PROVINCE_NAME}}  &nbsp;&nbsp;&nbsp;&nbsp;
                 <!-- 详细地址 -->  &nbsp;&nbsp;
                 <!-- 收件人姓名 -->  Recipient name:{{item.CONSIGNEE}}&nbsp;&nbsp;&nbsp;&nbsp;
-                <!-- 手机号码 --> Phone number:{{item.MOBILE}}
+                <!-- 手机号码 --> Phone Number:{{item.MOBILE}}
               </el-radio>
             </div>
             <div class="address">

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

@@ -72,7 +72,7 @@
                     <el-form-item>
                         <template slot="label">
                             <span class="text-danger">*</span>
-                            Phone number<!--手机号-->
+                            Phone Number<!--手机号-->
                         </template>
                         <el-input v-model="addrform.acceptMobile"></el-input>
                     </el-form-item>

+ 2 - 2
frontendEle/src/views/user/dec.vue

@@ -156,7 +156,7 @@
                 <el-form-item>
                     <template slot="label">
 
-                        Phone number<!-- 会员手机 -->
+                        Phone Number<!-- 会员手机 -->
                     </template>
                     <el-input v-model="form.mobile"></el-input>
                 </el-form-item>
@@ -195,7 +195,7 @@
                 <el-form-item>
                     <template slot="label">
 
-                        Phone number<!-- 收货人手机 -->
+                        Phone Number<!-- 收货人手机 -->
                     </template>
                     <el-input v-model="form.acceptMobile"></el-input>
                 </el-form-item>

+ 1 - 1
frontendEle/src/views/user/index.vue

@@ -19,7 +19,7 @@
 <!--            <el-form-item label="Identity No.">&lt;!&ndash; 身份证号 &ndash;&gt;-->
 <!--              <el-input v-model="infoData.ID_CARD" :disabled="true"></el-input>-->
 <!--            </el-form-item>-->
-            <el-form-item label="Phone number"><!-- 手机号 -->
+            <el-form-item label="Phone Number"><!-- 手机号 -->
               <el-input v-model="infoData.MOBILE" :disabled="true"></el-input>
             </el-form-item>
             <el-form-item label="Email"><!-- Email -->

+ 1 - 1
frontendEle/src/views/user/upgrade.vue

@@ -143,7 +143,7 @@
                 </el-form-item>
                 <el-form-item v-if="!isMax">
                     <template slot="label">
-                         Phone number<!-- 收货人手机 -->
+                         Phone Number<!-- 收货人手机 -->
                     </template>
                     <el-input v-model="form.acceptMobile"></el-input>
                 </el-form-item>