root 3 лет назад
Родитель
Сommit
ba1a54ee35

+ 5 - 5
backendApi/config/menu.php

@@ -42,14 +42,14 @@ return [
             // 新添加的商品操作 ---stop
             ['name'=>'商品列表导出', 'class'=>'', 'icon'=>'', 'controller'=>'shop', 'action'=>'goods-list-export', 'routePath'=>'shop/goods-list-export', 'show'=>0,],
             ['name'=>' Kitting products manage', 'class'=>'', 'icon'=>'', 'controller'=>'shop', 'action'=>'package', 'routePath'=>'shop/package', 'show'=>1,],//套餐管理
-            ['name'=>'报单列表', 'class'=>'', 'icon'=>'', 'controller'=>'shop', 'action'=>'dec-order-list', 'routePath'=>'shop/dec-order-list', 'show'=>1,],
+            ['name'=>'Entry list', 'class'=>'', 'icon'=>'', 'controller'=>'shop', 'action'=>'dec-order-list', 'routePath'=>'shop/dec-order-list', 'show'=>1,],//报单列表
             ['name'=>'报单列表导出', 'class'=>'', 'icon'=>'', 'controller'=>'shop', 'action'=>'dec-order-list-export', 'routePath'=>'shop/dec-order-list-export', 'show'=>0,],
-            ['name'=>'订单列表', 'class'=>'', 'icon'=>'', 'controller'=>'shop', 'action'=>'order-list', 'routePath'=>'shop/order-list', 'show'=>1,],
+            ['name'=>'Order list', 'class'=>'', 'icon'=>'', 'controller'=>'shop', 'action'=>'order-list', 'routePath'=>'shop/order-list', 'show'=>1,],//订单列表
             ['name'=>'订单列表导出', 'class'=>'', 'icon'=>'', 'controller'=>'shop', 'action'=>'order-list-export', 'routePath'=>'shop/order-list-export', 'show'=>0,],
             ['name'=>'订单发货', 'class'=>'', 'icon'=>'', 'controller'=>'shop', 'action'=>'order-delivery', 'routePath'=>'shop/order-delivery', 'show'=>0,],
-            ['name'=>'外部商城订单列表', 'class'=>'', 'icon'=>'', 'controller'=>'shop', 'action'=>'order-shop-list', 'routePath'=>'shop/order-shop-list', 'show'=>1,],
-            ['name'=>'外部商城报单列表', 'class'=>'', 'icon'=>'', 'controller'=>'shop', 'action'=>'order-dec-list', 'routePath'=>'shop/order-dec-list', 'show'=>1,],
-            ['name'=>'外部商城达标订单列表', 'class'=>'', 'icon'=>'', 'controller'=>'shop', 'action'=>'order-standard-list', 'routePath'=>'shop/order-standard-list', 'show'=>1,],
+            ['name'=>'External mall order list', 'class'=>'', 'icon'=>'', 'controller'=>'shop', 'action'=>'order-shop-list', 'routePath'=>'shop/order-shop-list', 'show'=>1,],//外部商城订单列表
+            ['name'=>'External mall entry list', 'class'=>'', 'icon'=>'', 'controller'=>'shop', 'action'=>'order-dec-list', 'routePath'=>'shop/order-dec-list', 'show'=>1,],//外部商城报单列表
+            ['name'=>'List of qualified orders of external mall', 'class'=>'', 'icon'=>'', 'controller'=>'shop', 'action'=>'order-standard-list', 'routePath'=>'shop/order-standard-list', 'show'=>1,],//外部商城达标订单列表
         ]
     ],
     'user'=>[

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

@@ -149,37 +149,37 @@ class DecOrderList extends \common\libs\dataList\DataList implements DataListInt
                     },
                 ],
                 'REC_USER_NAME' => [
-                    'header' => '报单时开拓者',//报单时开拓者
+                    'header' => 'Sponor member code',//报单时开拓者
                     'headerOther' => ['width' => '150'],
                 ],
                 'REC_REAL_NAME' => [
-                    'header' => '报单时开拓者姓名',
+                    'header' => 'Sponor member name',//报单时开拓者姓名
                     'headerOther' => ['width' => '150'],
                 ],
                 'CON_USER_NAME' => [
-                    'header' => '报单时上级',
+                    'header' => 'Placement member code',//报单时上级
                     'headerOther' => ['width' => '150'],
                 ],
                 'CON_REAL_NAME' => [
-                    'header' => '报单时上级姓名',
+                    'header' => 'Placement member name',//报单时上级姓名
                     'headerOther' => ['width' => '150'],
                 ],
                 'PROVINCE' => [
-                    'header' => '省',
+                    'header' => 'state',//省
                     'headerOther' => ['width' => '120'],
                     'value' => function ($row) use($regionConfig) {
                         return $regionConfig[$row['PROVINCE']]['REGION_NAME'] ?? '';
                     },
                 ],
                 'CITY' => [
-                    'header' => '市',
+                    'header' => 'local government area',//市
                     'headerOther' => ['width' => '120'],
                     'value' => function ($row) use($regionConfig) {
                         return $regionConfig[$row['CITY']]['REGION_NAME'] ?? '';
                     },
                 ],
                 'COUNTY' => [
-                    'header' => '区',
+                    'header' => 'city',//区
                     'headerOther' => ['width' => '120'],
                     'value' => function ($row) use($regionConfig) {
                         return $regionConfig[$row['COUNTY']]['REGION_NAME'] ?? '';
@@ -244,7 +244,7 @@ class DecOrderList extends \common\libs\dataList\DataList implements DataListInt
                 'DEC_AMOUNT'=> ['name'=> 'Entry amount'],//报单金额
                 'DEC_PV'=> ['name'=> 'Entry BV'],//报单BV
                 'PERIOD_NUM'=> ['name'=> 'Current Period'],//期数
-                'REC_USER_NAME'=> ['name'=> '报单时开拓者'],//报单时开拓者
+                'REC_USER_NAME'=> ['name'=> 'Sponor member code'],//报单时开拓者
                 'CREATED_AT'=> ['name'=> 'Creation Time', 'other'=> 'date'],//创建时间
                 'UPDATED_AT'=> ['name'=> 'Update Time', 'other'=> 'date'],//更新时间
             ];

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

@@ -15,7 +15,7 @@ class OrderDecList extends \common\libs\dataList\DataList implements DataListInt
      * @return string
      */
     public function getListName(){
-        return '外部商城报单列表';
+        return 'External mall entry list';//外部商城报单列表
     }
 
     /**
@@ -44,63 +44,63 @@ class OrderDecList extends \common\libs\dataList\DataList implements DataListInt
         if(!$this->columns){
             $this->columns = [
                 'PERIOD_NUM' => [
-                    'header' => '期数',
+                    'header' => 'Current Period',//期数
                 ],
                 'USER_NAME' => [
-                    'header' => '会员编号',
+                    'header' => 'Member code',//会员编号
                     'headerOther' => ['width' => '120'],
                 ],
                 'SN' => [
-                    'header' => '订单号',
+                    'header' => 'Order number',//订单号
                     'headerOther' => ['width' => '200'],
                 ],
                 'CONSIGNEE' => [
-                    'header' => '收货人',
+                    'header' => 'Consignee',//收货人
                     'headerOther' => [
                         'width' => '150',
                     ],
                 ],
                 'MOBILE' => [
-                    'header' => '联系方式1',
+                    'header' => 'contact information 1',//联系方式1
                     'headerOther' => [
                         'width' => '150',
                     ],
                 ],
                 'TEL' => [
-                    'header' => '联系方式2',
+                    'header' => 'contact information 2',//联系方式2
                 ],
                 'PROVINCE' => [
-                    'header' => '省',
+                    'header' => 'state',//省
                     'headerOther' => ['width' => '120'],
                     'value' => function ($row) use($regionConfig) {
                         return $regionConfig[$row['PROVINCE']]['REGION_NAME'] ?? '';
                     },
                 ],
                 'CITY' => [
-                    'header' => '市',
+                    'header' => 'local government area',//市
                     'headerOther' => ['width' => '120'],
                     'value' => function ($row) use($regionConfig) {
                         return $regionConfig[$row['CITY']]['REGION_NAME'] ?? '';
                     },
                 ],
                 'COUNTY' => [
-                    'header' => '区',
+                    'header' => 'city',//区
                     'headerOther' => ['width' => '120'],
                     'value' => function ($row) use($regionConfig) {
                         return $regionConfig[$row['COUNTY']]['REGION_NAME'] ?? '';
                     },
                 ],
                 'ADDRESS' => [
-                    'header' => '详细地址',
+                    'header' => 'Detailed address',//详细地址
                     'headerOther' => [
                         'width' => '300',
                     ],
                 ],
                 'WAREHOUSE' => [
-                    'header' => '发货仓',
+                    'header' => 'Current Period',//发货仓
                 ],
                 'CREATED_AT' => [
-                    'header' => '创建时间',
+                    'header' => 'Creation time',//创建时间
                     'value' => function ($row) {
                         return (new DateTime([
                             'value' => $row['CREATED_AT'],
@@ -109,7 +109,7 @@ class OrderDecList extends \common\libs\dataList\DataList implements DataListInt
                     'headerOther' => ['width' => '190'],
                 ],
                 'PAY_AMOUNT' => [
-                    'header' => '支付金额',
+                    'header' => 'Payment amount',//支付金额
                     'headerOther' => [
                         'width' => '150',
                     ],
@@ -121,7 +121,7 @@ class OrderDecList extends \common\libs\dataList\DataList implements DataListInt
                     ],
                 ],
                 'PAY_PV' => [
-                    'header' => '支付PV',
+                    'header' => 'Payment BV',//支付BV
                     'headerOther' => [
                         'width' => '150',
                     ],
@@ -133,7 +133,7 @@ class OrderDecList extends \common\libs\dataList\DataList implements DataListInt
                     ],
                 ],
                 'PAY_AT' => [
-                    'header' => '支付时间',
+                    'header' => 'Payment time',//支付时间
                     'value' => function ($row) {
                         return (new DateTime([
                             'value' => $row['PAY_AT'],
@@ -142,7 +142,7 @@ class OrderDecList extends \common\libs\dataList\DataList implements DataListInt
                     'headerOther' => ['width' => '190'],
                 ],
                 'DELIVERY_AT' => [
-                    'header' => '发货时间',
+                    'header' => 'Delivery time',//发货时间
                     'value' => function ($row) {
                         return (new DateTime([
                             'value' => $row['DELIVERY_AT'],
@@ -151,7 +151,7 @@ class OrderDecList extends \common\libs\dataList\DataList implements DataListInt
                     'headerOther' => ['width' => '190'],
                 ],
                 'PAY_FREIGHT' => [
-                    'header' => '运费',
+                    'header' => 'Postage',//运费
                     'headerOther' => [
                         'width' => '150',
                     ],
@@ -165,22 +165,22 @@ class OrderDecList extends \common\libs\dataList\DataList implements DataListInt
                     },
                 ],
                 'EXPRESS_COMPANY' => [
-                    'header' => '快递公司',
+                    'header' => 'Express company',//快递公司
                     'headerOther' => ['width' => '150'],
                 ],
                 'ORDER_TRACK_NO' => [
-                    'header' => '快递单号',
+                    'header' => 'Express Number',//快递单号
                     'headerOther' => ['width' => '200'],
                 ],
                 'EXPRESS_TYPE' => [
-                    'header' => '发货方式',
+                    'header' => 'Shipping method',//发货方式
                     'headerOther' => ['width' => '150'],
                     'value' => function ($row) {
-                        return $row['EXPRESS_TYPE']==0 ? '邮寄' : '自提';
+                        return $row['EXPRESS_TYPE']==0 ? 'mail' : 'Self Pick-up';//'邮寄' : '自提'
                     },
                 ],
                 'FRONT_REMARK' => [
-                    'header' => '会员备注',
+                    'header' => 'Member notes',//会员备注
                     'headerOther' => [
                         'width' => '200',
                     ],
@@ -204,10 +204,10 @@ class OrderDecList extends \common\libs\dataList\DataList implements DataListInt
     {
         if(!$this->filterTypes){
             $this->filterTypes = [
-                'SN'=> ['name'=> '订单编号'],
-                'USER_NAME'=> ['name'=> '会员编号'],
-                'PERIOD_NUM'=> ['name'=> '期数'],
-                'CREATED_AT'=> ['name'=> '创建时间', 'other'=>'date'],
+                'SN'=> ['name'=> 'Order code'],//订单编号
+                'USER_NAME'=> ['name'=> 'Member code'],//会员编号
+                'PERIOD_NUM'=> ['name'=> 'Current period'],//期数
+                'CREATED_AT'=> ['name'=> 'Creation time', 'other'=>'date'],//创建时间
             ];
         }
         return $this->filterTypes;

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

@@ -17,7 +17,7 @@ class OrderList extends \common\libs\dataList\DataList implements DataListInterf
      * @return string
      */
     public function getListName(){
-        return '订单列表';
+        return 'Order list';//订单列表
     }
 
     /**
@@ -53,28 +53,28 @@ class OrderList extends \common\libs\dataList\DataList implements DataListInterf
         if(!$this->columns){
             $this->columns = [
                 'USER_NAME' => [
-                    'header' => '会员编号',
+                    'header' => 'Member code',//会员编号
                     'headerOther' => ['width' => '120'],
                 ],
                 'DEC_USER_NAME' => [
-                    'header' => '报单中心',
+                    'header' => 'Entry Center',//报单中心
                     'headerOther' => ['width' => '120'],
                 ],
                 'CREATE_USER' => [
-                    'header' => '创建人编号',
+                    'header' => 'Member code',//创建人编号
                     'headerOther' => ['width' => '120'],
                 ],
                 'CREATE_USER_NAME' => [
-                    'header' => '创建人姓名',
+                    'header' => 'Member name',//创建人姓名
                     'headerOther' => ['width' => '120'],
                 ],
                 'SN' => [
-                    'header' => '订单号',
+                    'header' => 'Order code',//订单号
                     'headerOther' => ['width' => '200'],
                 ],
                 'STATUS' => null,
                 'STATUS_NAME' => [
-                    'header' => '订单状态',
+                    'header' => 'Order status',//订单状态
                     'headerOther' => [
                         'width' => '110',
                     ],
@@ -83,48 +83,48 @@ class OrderList extends \common\libs\dataList\DataList implements DataListInterf
                     },
                 ],
                 'SKU_CODE' => [
-                    'header' => '存货编码',
+                    'header' => 'Products code',//存货编码
                     'headerOther' => ['width' => '150'],
                 ],
                 'GOODS_TITLE' => [
-                    'header' => '存货名称',
+                    'header' => 'Products name',//存货名称
                     'headerOther' => ['width' => '200'],
                 ],
                 'BUY_NUMS' => [
-                    'header' => '数量',
+                    'header' => 'Quantity',//数量
                     'headerOther' => ['width' => '100'],
                 ],
                 'CONSIGNEE' => [
-                    'header' => '收货人',
+                    'header' => 'Consignee',//收货人
                     'headerOther' => [
                         'width' => '150',
                     ],
                 ],
                 'MOBILE' => [
-                    'header' => '联系方式1',
+                    'header' => 'contact information 1',//联系方式1
                     'headerOther' => [
                         'width' => '150',
                     ],
                 ],
                 'TEL' => [
-                    'header' => '联系方式2',
+                    'header' => 'contact information 2',//联系方式2
                 ],
                 'PROVINCE' => [
-                    'header' => '省',
+                    'header' => 'state',//省
                     'headerOther' => ['width' => '120'],
                     'value' => function ($row) use($regionConfig) {
                         return $regionConfig[$row['PROVINCE']]['REGION_NAME'] ?? '';
                     },
                 ],
                 'CITY' => [
-                    'header' => '市',
+                    'header' => 'local government area',//市
                     'headerOther' => ['width' => '120'],
                     'value' => function ($row) use($regionConfig) {
                         return $regionConfig[$row['CITY']]['REGION_NAME'] ?? '';
                     },
                 ],
                 'COUNTY' => [
-                    'header' => '区',
+                    'header' => 'city',//区
                     'headerOther' => ['width' => '120'],
                     'value' => function ($row) use($regionConfig) {
                         return $regionConfig[$row['COUNTY']]['REGION_NAME'] ?? '';
@@ -151,31 +151,31 @@ class OrderList extends \common\libs\dataList\DataList implements DataListInterf
 //                    ],
 //                ],
                 'ADDRESS' => [
-                    'header' => '详细地址',
+                    'header' => 'Detailed address',//详细地址
                     'headerOther' => [
                         'width' => '300',
                     ],
                 ],
                 'PERIOD_NUM' => [
-                    'header' => '期数',
+                    'header' => 'Current Period',//期数
                 ],
                 'ORDER_TYPE' => [
-                    'header' => '订单类型',
+                    'header' => 'Order type',//订单类型
                     'headerOther' => ['width' => '120'],
                     'value' => function ($row) {
                             if($row['ORDER_TYPE']=='ZC'){
-                                $orderType = '报单';
+                                $orderType = 'Entry';//报单
                             }else{
-                                $orderType = ($row['PAY_TYPE']=='cash') ? '重消' : '积分';
+                                $orderType = ($row['PAY_TYPE']=='cash') ? 'Reselling' : 'integral';//重消' : '积分
                             }
                         return $orderType;
                     },
                 ],
                 'WAREHOUSE' => [
-                    'header' => '发货仓',
+                    'header' => 'Delivery warehouse',//发货仓
                 ],
                 'CREATED_AT' => [
-                    'header' => '创建时间',
+                    'header' => 'Creation time',//创建时间
                     'value' => function ($row) {
                         return (new DateTime([
                             'value' => $row['CREATED_AT'],
@@ -184,7 +184,7 @@ class OrderList extends \common\libs\dataList\DataList implements DataListInterf
                     'headerOther' => ['width' => '190'],
                 ],
                 'PAY_AT' => [
-                    'header' => '支付时间',
+                    'header' => 'Payment time',//支付时间
                     'value' => function ($row) {
                         return (new DateTime([
                             'value' => $row['PAY_AT'],
@@ -193,7 +193,7 @@ class OrderList extends \common\libs\dataList\DataList implements DataListInterf
                     'headerOther' => ['width' => '190'],
                 ],
                 'DELIVERY_AT' => [
-                    'header' => '发货时间',
+                    'header' => 'Delivery time',//发货时间
                     'value' => function ($row) {
                         return (new DateTime([
                             'value' => $row['DELIVERY_AT'],
@@ -202,7 +202,7 @@ class OrderList extends \common\libs\dataList\DataList implements DataListInterf
                     'headerOther' => ['width' => '190'],
                 ],
                 'REAL_PRICE' => [
-                    'header' => '商品单价',
+                    'header' => 'Product price',//商品单价
                     'headerOther' => [
                         'width' => '150',
                     ],
@@ -216,7 +216,7 @@ class OrderList extends \common\libs\dataList\DataList implements DataListInterf
                     },
                 ],
                 'REAL_PV' => [
-                    'header' => '商品金额',
+                    'header' => 'Product BV',//商品BV
                     'headerOther' => [
                         'width' => '150',
                     ],
@@ -230,7 +230,7 @@ class OrderList extends \common\libs\dataList\DataList implements DataListInterf
                     },
                 ],
                 'PAY_FREIGHT' => [
-                    'header' => '运费',
+                    'header' => 'Postage',//运费
                     'headerOther' => [
                         'width' => '150',
                     ],
@@ -244,22 +244,22 @@ class OrderList extends \common\libs\dataList\DataList implements DataListInterf
                     },
                 ],
                 'EXPRESS_COMPANY' => [
-                    'header' => '快递公司',
+                    'header' => 'Express company',//快递公司
                     'headerOther' => ['width' => '150'],
                 ],
                 'ORDER_TRACK_NO' => [
-                    'header' => '快递单号',
+                    'header' => 'Express Number',//快递单号
                     'headerOther' => ['width' => '200'],
                 ],
                 'EXPRESS_TYPE' => [
-                    'header' => '发货方式',
+                    'header' => 'Shipping method',//发货方式
                     'headerOther' => ['width' => '150'],
                     'value' => function ($row) {
-                        return $row['EXPRESS_TYPE']==0 ? '邮寄' : '自提';
+                        return $row['EXPRESS_TYPE']==0 ? 'mail' : 'Self Pick-up';//邮寄,自提
                     },
                 ],
                 'FRONT_REMARK' => [
-                    'header' => '会员备注',
+                    'header' => 'Member notes',//会员备注
                     'headerOther' => [
                         'width' => '200',
                     ],
@@ -272,7 +272,7 @@ class OrderList extends \common\libs\dataList\DataList implements DataListInterf
                 ],
                 'DELIVERY_STATUS' => null,
                 'DELIVERY_STATUS_NAME' => [
-                    'header' => '发货状态',
+                    'header' => 'Shipment status',//发货状态
                     'headerOther' => [
                         'width' => '110',
                     ],
@@ -293,11 +293,11 @@ class OrderList extends \common\libs\dataList\DataList implements DataListInterf
     {
         if(!$this->filterTypes){
             $this->filterTypes = [
-                'SN'=> ['name'=> '订单编号'],
-                'USER_NAME'=> ['name'=> '会员编号'],
-                'MOBILE'=> ['name'=> '联系方式1'],
-                'PERIOD_NUM'=> ['name'=> '期数'],
-                'CREATED_AT'=> ['name'=> '创建时间', 'other'=>'date'],
+                'SN'=> ['name'=> 'Order code'],//订单编号
+                'USER_NAME'=> ['name'=> 'Member code'],
+                'MOBILE'=> ['name'=> 'contact information 1'],//联系方式1
+                'PERIOD_NUM'=> ['name'=> 'Current Period'],//期数
+                'CREATED_AT'=> ['name'=> 'Creation time', 'other'=>'date'],//创建时间
             ];
         }
         return $this->filterTypes;

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

@@ -18,7 +18,7 @@ class OrderShopList extends \common\libs\dataList\DataList implements DataListIn
      * @return string
      */
     public function getListName(){
-        return '外部商城订单列表';
+        return 'External mall order list';//外部商城订单列表
     }
 
     /**
@@ -47,70 +47,70 @@ class OrderShopList extends \common\libs\dataList\DataList implements DataListIn
         if(!$this->columns){
             $this->columns = [
                 'PERIOD_NUM' => [
-                    'header' => '期数',
+                    'header' => 'Current Period',//期数
                 ],
                 'USER_NAME' => [
-                    'header' => '会员编号',
+                    'header' => 'Member code',//会员编号
                     'headerOther' => ['width' => '120'],
                 ],
                 'SN' => [
-                    'header' => '订单号',
+                    'header' => 'Order number',//订单号
                     'headerOther' => ['width' => '200'],
                 ],
                 'PAY_TYPE' => [
-                    'header' => '订单类型',
+                    'header' => 'Order type',//订单类型
                     'headerOther' => ['width' => '120'],
                     'value' => function ($row) {
-                        return $row['PAY_TYPE']=='cash' ? '重消订单' : '积分订单';
+                        return $row['PAY_TYPE']=='cash' ? 'Reselling order' : 'Integral ORDER';//'重消订单' : '积分订单'
                     },
                 ],
                 'CONSIGNEE' => [
-                    'header' => '收货人',
+                    'header' => 'Consignee',//收货人
                     'headerOther' => [
                         'width' => '150',
                     ],
                 ],
                 'MOBILE' => [
-                    'header' => '联系方式1',
+                    'header' => 'contact information 1',//联系方式1
                     'headerOther' => [
                         'width' => '150',
                     ],
                 ],
                 'TEL' => [
-                    'header' => '联系方式2',
+                    'header' => 'contact information 2',//联系方式2
                 ],
                 'PROVINCE' => [
-                    'header' => '省',
+                    'header' => 'state',//省
                     'headerOther' => ['width' => '120'],
                     'value' => function ($row) use($regionConfig) {
                         return $regionConfig[$row['PROVINCE']]['REGION_NAME'] ?? '';
                     },
                 ],
                 'CITY' => [
-                    'header' => '市',
+                    'header' => 'local government area',//市
                     'headerOther' => ['width' => '120'],
                     'value' => function ($row) use($regionConfig) {
                         return $regionConfig[$row['CITY']]['REGION_NAME'] ?? '';
                     },
                 ],
                 'COUNTY' => [
-                    'header' => '区',
+                    'header' => 'city',//区
                     'headerOther' => ['width' => '120'],
                     'value' => function ($row) use($regionConfig) {
                         return $regionConfig[$row['COUNTY']]['REGION_NAME'] ?? '';
                     },
                 ],
                 'ADDRESS' => [
-                    'header' => '详细地址',
+                    'header' => 'Detailed address',//详细地址
                     'headerOther' => [
                         'width' => '300',
                     ],
                 ],
                 'WAREHOUSE' => [
-                    'header' => '发货仓',
+                    'header' => 'Current Period',//发货仓
                 ],
                 'CREATED_AT' => [
-                    'header' => '创建时间',
+                    'header' => 'Creation time',//创建时间
                     'value' => function ($row) {
                         return (new DateTime([
                             'value' => $row['CREATED_AT'],
@@ -119,7 +119,7 @@ class OrderShopList extends \common\libs\dataList\DataList implements DataListIn
                     'headerOther' => ['width' => '190'],
                 ],
                 'PAY_AMOUNT' => [
-                    'header' => '支付金额',
+                    'header' => 'Payment amount',//支付金额
                     'headerOther' => [
                         'width' => '150',
                     ],
@@ -131,7 +131,7 @@ class OrderShopList extends \common\libs\dataList\DataList implements DataListIn
                     ],
                 ],
                 'PAY_PV' => [
-                    'header' => '支付PV',
+                    'header' => 'Payment BV',//支付BV
                     'headerOther' => [
                         'width' => '150',
                     ],
@@ -143,7 +143,7 @@ class OrderShopList extends \common\libs\dataList\DataList implements DataListIn
                     ],
                 ],
                 'PAY_AT' => [
-                    'header' => '支付时间',
+                    'header' => 'Payment time',//支付时间
                     'value' => function ($row) {
                         return (new DateTime([
                             'value' => $row['PAY_AT'],
@@ -152,7 +152,7 @@ class OrderShopList extends \common\libs\dataList\DataList implements DataListIn
                     'headerOther' => ['width' => '190'],
                 ],
                 'DELIVERY_AT' => [
-                    'header' => '发货时间',
+                    'header' => 'Delivery time',//发货时间
                     'value' => function ($row) {
                         return (new DateTime([
                             'value' => $row['DELIVERY_AT'],
@@ -161,7 +161,7 @@ class OrderShopList extends \common\libs\dataList\DataList implements DataListIn
                     'headerOther' => ['width' => '190'],
                 ],
                 'PAY_FREIGHT' => [
-                    'header' => '运费',
+                    'header' => 'Postage',//运费
                     'headerOther' => [
                         'width' => '150',
                     ],
@@ -175,22 +175,22 @@ class OrderShopList extends \common\libs\dataList\DataList implements DataListIn
                     },
                 ],
                 'EXPRESS_COMPANY' => [
-                    'header' => '快递公司',
+                    'header' => 'Express company',//快递公司
                     'headerOther' => ['width' => '150'],
                 ],
                 'ORDER_TRACK_NO' => [
-                    'header' => '快递单号',
+                    'header' => 'Express Number',//快递单号
                     'headerOther' => ['width' => '200'],
                 ],
                 'EXPRESS_TYPE' => [
-                    'header' => '发货方式',
+                    'header' => 'Shipping method',//发货方式
                     'headerOther' => ['width' => '150'],
                     'value' => function ($row) {
-                        return $row['EXPRESS_TYPE']==0 ? '邮寄' : '自提';
+                        return $row['EXPRESS_TYPE']==0 ? 'mail' : 'Self Pick-up';//'邮寄' : '自提'
                     },
                 ],
                 'FRONT_REMARK' => [
-                    'header' => '会员备注',
+                    'header' => 'Member notes',//会员备注
                     'headerOther' => [
                         'width' => '200',
                     ],
@@ -214,10 +214,10 @@ class OrderShopList extends \common\libs\dataList\DataList implements DataListIn
     {
         if(!$this->filterTypes){
             $this->filterTypes = [
-                'SN'=> ['name'=> '订单编号'],
-                'USER_NAME'=> ['name'=> '会员编号'],
-                'PERIOD_NUM'=> ['name'=> '期数'],
-                'CREATED_AT'=> ['name'=> '创建时间', 'other'=>'date'],
+                'SN'=> ['name'=> 'Order code'],//订单编号
+                'USER_NAME'=> ['name'=> 'Member code'],//会员编号
+                'PERIOD_NUM'=> ['name'=> 'Current period'],//期数
+                'CREATED_AT'=> ['name'=> 'Creation time', 'other'=>'date'],//创建时间
             ];
         }
         return $this->filterTypes;

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

@@ -19,7 +19,7 @@ class OrderStandardList extends \common\libs\dataList\DataList implements DataLi
      * @return string
      */
     public function getListName(){
-        return '外部商城订单列表';
+        return 'List of qualified orders of external mall';//外部商城订单列表
     }
 
     /**
@@ -48,70 +48,70 @@ class OrderStandardList extends \common\libs\dataList\DataList implements DataLi
         if(!$this->columns){
             $this->columns = [
                 'CALC_MONTH' => [
-                    'header' => '结算月',
+                    'header' => 'Settlement month',//结算月
                 ],
                 'USER_NAME' => [
-                    'header' => '会员编号',
+                    'header' => 'Member code',//会员编号
                     'headerOther' => ['width' => '120'],
                 ],
                 'SN' => [
-                    'header' => '订单号',
+                    'header' => 'Order number',//订单号
                     'headerOther' => ['width' => '200'],
                 ],
                 'PAY_TYPE' => [
-                    'header' => '订单类型',
+                    'header' => 'Order type',//订单类型
                     'headerOther' => ['width' => '120'],
                     'value' => function ($row) {
-                        return $row['PAY_TYPE']=='cash' ? '重消订单' : '积分订单';
+                        return $row['PAY_TYPE']=='cash' ? 'order again' : 'Points order';//'重消订单' : '积分订单'
                     },
                 ],
                 'CONSIGNEE' => [
-                    'header' => '收货人',
+                    'header' => 'Consignee',//收货人
                     'headerOther' => [
                         'width' => '150',
                     ],
                 ],
                 'MOBILE' => [
-                    'header' => '联系方式1',
+                    'header' => 'contact information 1',//联系方式1
                     'headerOther' => [
                         'width' => '150',
                     ],
                 ],
                 'TEL' => [
-                    'header' => '联系方式2',
+                    'header' => 'contact information 2',//联系方式2
                 ],
                 'PROVINCE' => [
-                    'header' => '省',
+                    'header' => 'state',//省
                     'headerOther' => ['width' => '120'],
                     'value' => function ($row) use($regionConfig) {
                         return $regionConfig[$row['PROVINCE']]['REGION_NAME'] ?? '';
                     },
                 ],
                 'CITY' => [
-                    'header' => '市',
+                    'header' => 'local government area',//市
                     'headerOther' => ['width' => '120'],
                     'value' => function ($row) use($regionConfig) {
                         return $regionConfig[$row['CITY']]['REGION_NAME'] ?? '';
                     },
                 ],
                 'COUNTY' => [
-                    'header' => '区',
+                    'header' => 'city',//区
                     'headerOther' => ['width' => '120'],
                     'value' => function ($row) use($regionConfig) {
                         return $regionConfig[$row['COUNTY']]['REGION_NAME'] ?? '';
                     },
                 ],
                 'ADDRESS' => [
-                    'header' => '详细地址',
+                    'header' => 'Detailed address',//详细地址
                     'headerOther' => [
                         'width' => '300',
                     ],
                 ],
                 'WAREHOUSE' => [
-                    'header' => '发货仓',
+                    'header' => 'Current Period',//发货仓
                 ],
                 'CREATED_AT' => [
-                    'header' => '创建时间',
+                    'header' => 'Creation time',//创建时间
                     'value' => function ($row) {
                         return (new DateTime([
                             'value' => $row['CREATED_AT'],
@@ -120,7 +120,7 @@ class OrderStandardList extends \common\libs\dataList\DataList implements DataLi
                     'headerOther' => ['width' => '190'],
                 ],
                 'PAY_AMOUNT' => [
-                    'header' => '支付金额',
+                    'header' => 'Payment amount',//支付金额
                     'headerOther' => [
                         'width' => '150',
                     ],
@@ -132,7 +132,7 @@ class OrderStandardList extends \common\libs\dataList\DataList implements DataLi
                     ],
                 ],
                 'PAY_PV' => [
-                    'header' => '支付PV',
+                    'header' => 'Payment BV',//支付BV
                     'headerOther' => [
                         'width' => '150',
                     ],
@@ -144,7 +144,7 @@ class OrderStandardList extends \common\libs\dataList\DataList implements DataLi
                     ],
                 ],
                 'PAY_AT' => [
-                    'header' => '支付时间',
+                    'header' => 'Payment time',//支付时间
                     'value' => function ($row) {
                         return (new DateTime([
                             'value' => $row['PAY_AT'],
@@ -153,7 +153,7 @@ class OrderStandardList extends \common\libs\dataList\DataList implements DataLi
                     'headerOther' => ['width' => '190'],
                 ],
                 'DELIVERY_AT' => [
-                    'header' => '发货时间',
+                    'header' => 'Delivery time',//发货时间
                     'value' => function ($row) {
                         return (new DateTime([
                             'value' => $row['DELIVERY_AT'],
@@ -162,7 +162,7 @@ class OrderStandardList extends \common\libs\dataList\DataList implements DataLi
                     'headerOther' => ['width' => '190'],
                 ],
                 'PAY_FREIGHT' => [
-                    'header' => '运费',
+                    'header' => 'Postage',//运费
                     'headerOther' => [
                         'width' => '150',
                     ],
@@ -176,22 +176,22 @@ class OrderStandardList extends \common\libs\dataList\DataList implements DataLi
                     },
                 ],
                 'EXPRESS_COMPANY' => [
-                    'header' => '快递公司',
+                    'header' => 'Express company',//快递公司
                     'headerOther' => ['width' => '150'],
                 ],
                 'ORDER_TRACK_NO' => [
-                    'header' => '快递单号',
+                    'header' => 'Express Number',//快递单号
                     'headerOther' => ['width' => '200'],
                 ],
                 'EXPRESS_TYPE' => [
-                    'header' => '发货方式',
+                    'header' => 'Shipping method',//发货方式
                     'headerOther' => ['width' => '150'],
                     'value' => function ($row) {
-                        return $row['EXPRESS_TYPE']==0 ? '邮寄' : '自提';
+                        return $row['EXPRESS_TYPE']==0 ? 'mail' : 'Self Pick-up';//'邮寄' : '自提'
                     },
                 ],
                 'FRONT_REMARK' => [
-                    'header' => '会员备注',
+                    'header' => 'Member notes',//会员备注
                     'headerOther' => [
                         'width' => '200',
                     ],
@@ -215,10 +215,10 @@ class OrderStandardList extends \common\libs\dataList\DataList implements DataLi
     {
         if(!$this->filterTypes){
             $this->filterTypes = [
-                'SN'=> ['name'=> '订单编号'],
-                'USER_NAME'=> ['name'=> '会员编号'],
-                'PERIOD_NUM'=> ['name'=> '期数'],
-                'CREATED_AT'=> ['name'=> '创建时间', 'other'=>'date'],
+                'SN'=> ['name'=> 'Order code'],//订单编号
+                'USER_NAME'=> ['name'=> 'Member code'],//会员编号
+                'PERIOD_NUM'=> ['name'=> 'Current period'],//期数
+                'CREATED_AT'=> ['name'=> 'Creation time', 'other'=>'date'],//创建时间
             ];
         }
         return $this->filterTypes;

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

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

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

@@ -46,10 +46,10 @@ export const constantRouterMap = [
         component: _import('shop/dec-order-list'),
         name: 'shop_dec-order-list',
         meta: {
-          title: '报单列表',
+          title: 'Entry list',//报单列表
           breadcrumb: [
-            {title: '首页', path: '/dashboard/index'},
-            {title: '商城管理', path: '/shop/dec-order-list'},
+            {title: 'Home Page', path: '/dashboard/index'},//首页
+            {title: 'Products Management', path: '/shop/dec-order-list'},//商城管理
           ],
         },
       },
@@ -58,10 +58,10 @@ export const constantRouterMap = [
         component: _import('shop/order-list'),
         name: 'shop_order-list',
         meta: {
-          title: '订单列表',
+          title: 'Order list',//订单列表
           breadcrumb: [
-            {title: '首页', path: '/dashboard/index'},
-            {title: '商城管理', path: '/shop/dec-order-list'},
+            {title: 'Home Page', path: '/dashboard/index'},//首页
+            {title: 'Products Management', path: '/shop/dec-order-list'},//商城管理
           ],
         },
 
@@ -71,10 +71,10 @@ export const constantRouterMap = [
         component: _import('shop/order-shop-list'),
         name: 'shop_order_shop-list',
         meta: {
-          title: '外部商城订单列表',
+          title: 'External mall order list',//外部商城订单列表
           breadcrumb: [
-            {title: '首页', path: '/dashboard/index'},
-            {title: '商城管理', path: '/shop/dec-order-list'},
+            {title: 'Home Page', path: '/dashboard/index'},//首页
+            {title: 'Products Management', path: '/shop/dec-order-list'},//商城管理
           ],
         },
 
@@ -84,10 +84,10 @@ export const constantRouterMap = [
             component: _import('shop/order-dec-list'),
             name: 'shop_order_dec-list',
             meta: {
-                title: '外部商城报单列表',
+                title: 'External mall entry list',//外部商城报单列表
                 breadcrumb: [
-                    {title: '首页', path: '/dashboard/index'},
-                    {title: '商城管理', path: '/shop/dec-order-list'},
+                    {title: 'Home Page', path: '/dashboard/index'},//首页
+                    {title: 'Products Management', path: '/shop/dec-order-list'},//商城管理
                 ],
             },
 
@@ -97,10 +97,10 @@ export const constantRouterMap = [
         component: _import('shop/order-standard-list'),
         name: 'shop_order_standard-list',
         meta: {
-          title: '外部商城达标订单列表',
+          title: 'List of qualified orders of external mall',//外部商城达标订单列表
           breadcrumb: [
-            {title: '首页', path: '/dashboard/index'},
-            {title: '商城管理', path: '/shop/dec-order-list'},
+            {title: 'Home Page', path: '/dashboard/index'},//首页
+            {title: 'Products Management', path: '/shop/dec-order-list'},//商城管理
           ],
         },
 
@@ -169,10 +169,10 @@ export const constantRouterMap = [
         component: _import('user/index'),
         name: 'user_index',
         meta: {
-          title: '会员列表',
+          title: 'Member list',//会员列表
           breadcrumb: [
-            {title: '首页', path: '/dashboard/index'},
-            {title: '会员管理', path: '/user/index'},
+            {title: 'Home Page', path: '/dashboard/index'},//首页
+            {title: 'Member management', path: '/user/index'},//会员管理
           ],
         },
       },

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

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

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

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

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

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

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

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

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

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

BIN
common/config/.config.php.swp