Merge branch 'feature/new-backend-adaptation' of http://16.162.42.175:8014/guanli/ngds into feature/new-backend-adaptation

# Conflicts:
#	common/messages/en-US/ctx.php
#	common/messages/zh-CN/ctx.php

backendApi/config/menu.php

@@ -525,4 +525,4 @@ return [
             ['name'=>'编辑报单中心级别', 'class'=>'', 'icon'=>'', 'controller'=>'config', 'action'=>'dec-role-edit', 'routePath'=>'config/dec-role-edit', 'show'=>0,],
         ],
     ],
-];
+];

backendApi/modules/v1/controllers/AdController.php

@@ -78,7 +78,7 @@ class AdController extends BaseController
      */
     public function actionAdd(){
         if(Yii::$app->request->isPost) {
-            return parent::edit(AdForm::class, 'Add Ad Succeed', null, null, null, function($formModel, $result){
+            return parent::edit(AdForm::class, Yii::t('ctx', 'AdAddedSuccessfully'), null, null, null, function($formModel, $result){
                 // 添加操作日志
                 // Log::adminHandle('添加广告:'.$result->TITLE);
             });
@@ -98,7 +98,7 @@ class AdController extends BaseController
     public function actionEdit(){
         $id = Yii::$app->request->get('id');
         if(Yii::$app->request->isPost) {
-            return parent::edit(AdForm::class, 'Edit Ad Succeed', null, null, null, function($formModel, $result){
+            return parent::edit(AdForm::class, Yii::t('ctx', 'EditAdSuccessfully'), null, null, null, function($formModel, $result){
                 // 添加操作日志
                 // Log::adminHandle('编辑广告:'.$result->TITLE);
             });
@@ -163,9 +163,9 @@ class AdController extends BaseController
             $formModel = new AdForm();
             $formModel->scenario = 'sort';
             if($formModel->load(Yii::$app->request->get(), '') && $formModel->sortTo()){
-                return static::notice('Success');
+                return static::notice(Yii::t('ctx', 'successfully'));
             } else {
-                return static::notice('Fail', 400);
+                return static::notice(Yii::t('ctx', 'failed'), 400);
             }
         }
     }
@@ -180,9 +180,9 @@ class AdController extends BaseController
             $formModel = new AdForm();
             $formModel->scenario = 'status';
             if($formModel->load(Yii::$app->request->get(), '') && $formModel->statusTo()){
-                return static::notice('Success');
+                return static::notice(Yii::t('ctx', 'successfully'));
             } else {
-                return static::notice('Fail', 400);
+                return static::notice(Yii::t('ctx', 'failed'), 400);
             }
         }
     }
@@ -210,4 +210,4 @@ class AdController extends BaseController
             return static::notice($token);
         }
     }
-}
+}

backendApi/modules/v1/controllers/ArticleController.php

@@ -45,7 +45,7 @@ class ArticleController extends BaseController
      */
     public function actionCategoryAdd(){
         if(Yii::$app->request->isPost) {
-            return parent::edit(ArticleCategoryForm::class, 'Successful');
+            return parent::edit(ArticleCategoryForm::class, Yii::t('ctx', 'successfully'));
         }
     }
 
@@ -70,9 +70,9 @@ class ArticleController extends BaseController
             $formModel = new ArticleCategoryForm();
             $formModel->scenario = 'sort';
             if($formModel->load(Yii::$app->request->get(), '') && $formModel->sortTo()){
-                return static::notice('Successful');
+                return static::notice(Yii::t('ctx', 'successfully'));
             } else {
-                return static::notice('Fail', 400);
+                return static::notice(Yii::t('ctx', 'failed'), 400);
             }
         }
     }
@@ -99,7 +99,7 @@ class ArticleController extends BaseController
      */
     public function actionAdd(){
         if(Yii::$app->request->isPost) {
-            return parent::edit(ArticleForm::class, 'Successful');
+            return parent::edit(ArticleForm::class, Yii::t('ctx', 'successfully'));
         }
         // 获取全部分类
         $allCategory = ArticleCategory::find()->where('STATUS=1')->asArray()->all();
@@ -115,7 +115,7 @@ class ArticleController extends BaseController
     public function actionEdit(){
         $id = Yii::$app->request->get('id');
         if(Yii::$app->request->isPost){
-            return parent::edit(ArticleForm::class, 'Successful');
+            return parent::edit(ArticleForm::class, Yii::t('ctx', 'successfully'));
         }
         $oneData = Article::findOneAsArray(['ID'=>$id]);
         $oneData['CONTENT'] = is_resource($oneData['CONTENT']) ? stream_get_contents($oneData['CONTENT']) : '';
@@ -231,10 +231,10 @@ class ArticleController extends BaseController
             $formModel = new ArticleForm();
             $formModel->scenario = 'sort';
             if ($formModel->load(Yii::$app->request->get(), '') && $formModel->sortTo()) {
-                return static::notice('Success');
+                return static::notice(Yii::t('ctx', 'successfully'));
             } else {
-                return static::notice('Fail', 400);
+                return static::notice(Yii::t('ctx', 'failed'), 400);
             }
         }
     }
-}
+}

backendApi/modules/v1/controllers/BaseController.php

@@ -143,7 +143,7 @@ class BaseController extends \yii\rest\ActiveController {
             $selected = \Yii::$app->request->post('selected');
         }
         if (!$selected) {
-            return self::notice('must select one item to hide', 500); // 必须选择一条删除数据
+            return self::notice( Yii::t('ctx', 'mustSelectOneItemToDelete'), 500); // 必须选择一条删除数据
         }
         if (is_array($selected)) {
             $condition = ['AND', ['IN', 'ID', $selected]];
@@ -167,7 +167,8 @@ class BaseController extends \yii\rest\ActiveController {
             }
             if ($afterFun) $afterFun($selected);
             $transaction->commit();
-            return self::notice($stateStr.' successfully'); // 隐藏/取消隐藏 成功
+
+            return self::notice(Yii::t('ctx', $stateStr.'Successfully')); // 隐藏/取消隐藏 成功
         } catch (Exception $e) {
             $transaction->rollBack();
             return self::notice($e->getMessage(), 500);
@@ -226,7 +227,7 @@ class BaseController extends \yii\rest\ActiveController {
             if ($isDelData) {
                 // 真实删除数据
                 if (!$modelClass::deleteAll($condition, $params)) {
-                    throw new Exception(Yii::t('ctx', 'deleteFailed'));//删除失败 
+                    throw new Exception(Yii::t('ctx', 'deleteFailed'));//删除失败
                 }
             } else {
                 // 设置IS_DEL字段为1

backendApi/modules/v1/controllers/BonusController.php

@@ -352,7 +352,7 @@ class BonusController extends BaseController {
 
 
     /**
-     * 会员余额流水 
+     * 会员余额流水
      * @return mixed
      * @throws \yii\base\Exception
      * @throws HttpException
@@ -847,9 +847,8 @@ class BonusController extends BaseController {
         }
         $data = $this->_periodBonus($periodNum,false);
         if( isset($data['filterTypes']) && is_array($data['filterTypes']) ) {
-            $data['filterTypes'] = array_merge(['periodNum'=>['isUserTable'=> false, 'name'=> 'Pay Cycle（PC）']], $data['filterTypes']);
+            $data['filterTypes'] = array_merge(['periodNum'=>['isUserTable'=> false, 'name'=> \Yii::t('ctx', 'payCycle')]], $data['filterTypes']);
         }
-
         return static::notice($data);
     }
 
@@ -921,7 +920,7 @@ class BonusController extends BaseController {
     public function actionOtherPeriodBonusFilterTypes(){
         $listObj = new PeriodBonusList();
         $filterTypes = $listObj->getFilterTypes();
-        $filterTypes = array_merge(['periodNum'=>['isUserTable'=> false, 'name'=> '结算期数']], $filterTypes);
+        $filterTypes = array_merge(['periodNum'=>['isUserTable'=> false, 'name'=> \Yii::t('ctx', 'payCycle')]], $filterTypes);
         return static::notice($filterTypes);
     }
 
@@ -997,9 +996,9 @@ class BonusController extends BaseController {
      */
     public function actionTraceDownQy() {
         $periodNum = Yii::$app->request->get('periodNum');
-        if (!$periodNum) return static::notice('请填写期数', 400);
+        if (!$periodNum) return static::notice(\Yii::t('ctx', 'requirePeriods'), 400);
         $userName = Yii::$app->request->get('userName');
-        if (!$userName) return static::notice('请填写会员编号', 400);
+        if (!$userName) return static::notice(\Yii::t('ctx', 'requireMemberNumber'), 400);
         $period = Period::instance();
         if (!$period->isCalculated($periodNum)) {
             return static::notice([]);
@@ -1989,7 +1988,7 @@ class BonusController extends BaseController {
     }
 
     /**
-     * 区域津贴补发列表导出 
+     * 区域津贴补发列表导出
      * @return mixed
      * @throws \yii\db\Exception
      * @throws HttpException
@@ -2842,4 +2841,4 @@ class BonusController extends BaseController {
             return static::notice('Illegal request', 400); // 非法请求
         }
     }
-}
+}

backendApi/modules/v1/controllers/FileController.php

@@ -69,10 +69,41 @@ class FileController extends BaseController
             }
         }
         // 全部模块
-        $data['allModuleName'] = Yii::$app->params['exportModule'];
+        //$data['allModuleName'] = Yii::$app->params['exportModule'];
+        $data['allModuleName'] = $this->returnAllModuleNameTranslate(Yii::$app->params['exportModule']);
         return static::notice($data);
     }
 
+    /**
+     *  多语言
+     */
+    public function returnAllModuleNameTranslate($allModuleName = []){
+        foreach($allModuleName as $k=>$v){
+            switch ($k)
+            {
+                case 'shop':
+                    $allModuleName[$k]['label'] = \Yii::t('ctx', 'mallManagement');
+                    break;
+                case 'user':
+                    $allModuleName[$k]['label'] = Yii::t('ctx', 'memberManagement');
+                    break;
+                case 'atlas':
+                    $allModuleName[$k]['label'] = Yii::t('ctx', 'networkChart');
+                    break;
+                case 'reconsume':
+                    $allModuleName[$k]['label'] = Yii::t('ctx', 'resaleManagement');
+                    break;
+                case 'bonus':
+                    $allModuleName[$k]['label'] = Yii::t('ctx', 'bonusManagement');
+                    break;
+                case 'finance':
+                    $allModuleName[$k]['label'] = Yii::t('ctx', 'financialManagement');
+                    break;
+            }
+        }
+        return $allModuleName;
+    }
+
     /**
      * 删除已导出文件
      * @return mixed
@@ -140,4 +171,4 @@ class FileController extends BaseController
         }
     }
 
-}
+}

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

@@ -56,7 +56,7 @@ class BalanceList extends \common\libs\dataList\DataList implements DataListInte
             $this->columns = [
                 'USER_ID' => null, // 这种传输方式主要是用于索引，因为过滤后的字段可能没有这种ID，但是一些功能的操作还需要用这种ID去关联，例如前台会员列表中的勾选批量状态管理，这里需要的就是USER_ID
                 'USER_NAME' => [
-                    'header' => 'Member Code', // 会员编号
+                    'header' => \Yii::t('ctx', 'memberCode'), // 会员编号
                     'headerOther' => [
                         'width' => '150',
                     ],
@@ -65,7 +65,7 @@ class BalanceList extends \common\libs\dataList\DataList implements DataListInte
                     ],
                 ],
                 'REAL_NAME' => [
-                    'header' => 'Member Name', // 会员姓名
+                    'header' => \Yii::t('ctx', 'memberName'), // 会员姓名
                     'headerOther' => [
                         'width' => '120',
                     ],
@@ -74,7 +74,7 @@ class BalanceList extends \common\libs\dataList\DataList implements DataListInte
                     ],
                 ],
                 'IS_DEC' => [
-                    'header' => 'Whether Stockist', // 是否报单中心
+                    'header' => \Yii::t('ctx', 'whetherStockist'), // 是否报单中心
                     'value' => function($row) {
                         return (new YesNo([
                             'value' => $row['IS_DEC'],
@@ -92,7 +92,7 @@ class BalanceList extends \common\libs\dataList\DataList implements DataListInte
                     },
                 ],
                 'BONUS' => [
-                    'header' => 'Member Bonus', // 会员奖金余额
+                    'header' => \Yii::t('ctx', 'memberBonus'), // 会员奖金余额
                     'value' => function($row) {
                         return (new Price([
                             'value' => $row['BONUS'],
@@ -107,7 +107,7 @@ class BalanceList extends \common\libs\dataList\DataList implements DataListInte
                     ],
                 ],
                 'CASH' => [
-                    'header' => 'Member Ecoin', // 会员余额
+                    'header' => \Yii::t('ctx', 'memberEcoin'), // 会员余额
                     'value' => function($row) {
                         return (new Price([
                             'value' => $row['CASH'],
@@ -122,7 +122,7 @@ class BalanceList extends \common\libs\dataList\DataList implements DataListInte
                     ],
                 ],
                 'TOURISM_POINTS' => [
-                    'header' => 'Travel Incentive', // 旅游积分
+                    'header' => \Yii::t('ctx', 'travelIncentive'), // 旅游积分
                     'value' => function($row) {
                         return (new Price([
                             'value' => $row['TOURISM_POINTS'],
@@ -137,7 +137,7 @@ class BalanceList extends \common\libs\dataList\DataList implements DataListInte
                     ],
                 ],
                 'GARAGE_POINTS' => [
-                    'header' => 'Car Incentive', // 车积分
+                    'header' => \Yii::t('ctx', 'carIncentive'), // 车积分
                     'value' => function($row) {
                         return (new Price([
                             'value' => $row['GARAGE_POINTS'],
@@ -152,7 +152,7 @@ class BalanceList extends \common\libs\dataList\DataList implements DataListInte
                     ],
                 ],
                 'VILLA_POINTS' => [
-                    'header' => 'Villa Incentive', // 房积分
+                    'header' => \Yii::t('ctx', 'villaIncentive'), // 房积分
                     'value' => function($row) {
                         return (new Price([
                             'value' => $row['VILLA_POINTS'],
@@ -167,18 +167,18 @@ class BalanceList extends \common\libs\dataList\DataList implements DataListInte
                     ],
                 ],
                 'PERIOD_AT' => [
-                    'header' => 'Joining Period', // 加入期数
+                    'header' =>\Yii::t('ctx', 'joiningPeriod'), // 加入期数
                     'headerOther' => ['width' => '110'],
                 ],
                 'MOBILE' => [
-                    'header' => 'Phone Number', // 手机号码
+                    'header' => \Yii::t('ctx', 'phoneNumber'), // 手机号码
                     'value' => function($row) {
                         return "\t".$row['MOBILE'];
                     },
                     'headerOther' => ['width' => '120'],
                 ],
                 'TEL' => [
-                    'header' => 'Alternate Phone Number', // 备用手机号码
+                    'header' => Yii::t('ctx', 'alternatePhoneNumber'), // 备用手机号码
                     'value' => function($row) {
                         return "\t".$row['TEL'];
                     },
@@ -197,16 +197,16 @@ class BalanceList extends \common\libs\dataList\DataList implements DataListInte
     {
         if(!$this->filterTypes){
             $this->filterTypes = [
-                'USER_NAME'=> ['isUserTable'=> false, 'name'=> 'Member Code'], // 会员编号
-                'REAL_NAME'=> ['isUserTable'=> false, 'name'=> 'Member Name'], // 会员姓名
-                'IS_DEC'=> ['isUserTable'=> false, 'name'=> 'Whether Stockist', 'other'=> 'yesOrNo'], // 是否报单中心
-                'BONUS'=> ['isUserTable'=> false, 'name'=> 'Member Bonus'], // 会员奖金余额
-                'CASH'=> ['isUserTable'=> false, 'name'=> 'Member Ecoin'], // 会员余额
-                'PERIOD_AT'=> ['isUserTable'=> false, 'name'=> 'Joining Period'], // 加入期数
-                'MOBILE'=> ['isUserTable'=> false, 'name'=> 'Phone Number'], // 手机号码
-                'TEL'=> ['isUserTable'=> false, 'name'=> 'Alternate Phone Number'], // 备用手机号码
+                'USER_NAME'=> ['isUserTable'=> false, 'name'=> \Yii::t('ctx', 'memberCode')], // 会员编号
+                'REAL_NAME'=> ['isUserTable'=> false, 'name'=> \Yii::t('ctx', 'memberName')], // 会员姓名
+                'IS_DEC'=> ['isUserTable'=> false, 'name'=> \Yii::t('ctx', 'whetherStockist'), 'other'=> 'yesOrNo'], // 是否报单中心
+                'BONUS'=> ['isUserTable'=> false, 'name'=> \Yii::t('ctx', 'memberBonus')], // 会员奖金余额
+                'CASH'=> ['isUserTable'=> false, 'name'=> \Yii::t('ctx', 'memberEcoin')], // 会员余额
+                'PERIOD_AT'=> ['isUserTable'=> false, 'name'=> \Yii::t('ctx', 'joiningPeriod')], // 加入期数
+                'MOBILE'=> ['isUserTable'=> false, 'name'=> \Yii::t('ctx', 'phoneNumber')], // 手机号码
+                'TEL'=> ['isUserTable'=> false, 'name'=> \Yii::t('ctx', 'alternatePhoneNumber')], // 备用手机号码
             ];
         }
         return $this->filterTypes;
     }
-}
+}

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

@@ -56,7 +56,7 @@ class FlowBonusList extends \common\libs\dataList\DataList implements DataListIn
             $this->columns = [
                 'ID' => null,
                 'CREATED_AT' => [
-                    'header' => 'Creation Time', // 创建时间
+                    'header' => Yii::t('ctx', 'createAt'), // 创建时间
                     'value' => function ($row) {
                         return (new DateTime([
                             'value' => $row['CREATED_AT'],
@@ -65,25 +65,25 @@ class FlowBonusList extends \common\libs\dataList\DataList implements DataListIn
                     'headerOther' => ['width' => '170'],
                 ],
                 'PERIOD_NUM' => [
-                    'header' => 'Period Number', // 期数
+                    'header' => Yii::t('ctx', 'periodNumber'), // 期数
                     'headerOther' => [
                         'width' => '120',
                     ],
                 ],
                 'CALC_MONTH' => [
-                    'header' => 'Bonus Month', // 结算月
+                    'header' => Yii::t('ctx', 'bonusMonth'), // 结算月
                     'headerOther' => [
                         'width' => '120',
                     ],
                 ],
                 'DEAL_TYPE_NAME' => [
-                    'header' => 'Transaction Type', // 交易类型
+                    'header' => Yii::t('ctx', 'transactionType'), // 交易类型
                     'headerOther' => [
                         'width' => '150',
                     ],
                 ],
                 'USER_NAME' => [
-                    'header' => 'Member Code', // 会员编号
+                    'header' => Yii::t('ctx', 'memberCode'), // 会员编号
                     'headerOther' => [
                         'width' => '150',
                     ],
@@ -92,7 +92,7 @@ class FlowBonusList extends \common\libs\dataList\DataList implements DataListIn
                     ],
                 ],
                 'REAL_NAME' => [
-                    'header' => 'Member Name', // 会员姓名
+                    'header' => Yii::t('ctx', 'memberName'), // 会员姓名
                     'headerOther' => [
                         'width' => '120',
                     ],
@@ -101,7 +101,7 @@ class FlowBonusList extends \common\libs\dataList\DataList implements DataListIn
                     ],
                 ],
                 'LAST_DEC_LV_NAME' => [
-                    'header' => 'Member Level', // 会员级别
+                    'header' => Yii::t('ctx', 'memberLevel'), // 会员级别
                     'headerOther' => [
                         'width' => '110',
                     ],
@@ -110,7 +110,7 @@ class FlowBonusList extends \common\libs\dataList\DataList implements DataListIn
                     ],
                 ],
                 'IS_DEC' => [
-                    'header' => 'Whether Stockist', // 是否报单中心
+                    'header' => Yii::t('ctx', 'whetherStockist'), // 是否报单中心
                     'value' => function ($row) {
                         return (new YesNo([
                             'value' => $row['IS_DEC'],
@@ -128,7 +128,7 @@ class FlowBonusList extends \common\libs\dataList\DataList implements DataListIn
                     },
                 ],
                 'BEFORE_BALANCE' => [
-                    'header' => 'Balance Before Transaction', // 交易前余额
+                    'header' => Yii::t('ctx', 'balanceBeforeTransaction'), // 交易前余额
                     'value' => function ($row) {
                         return (new Price([
                             'value' => $row['TOTAL'] - $row['AMOUNT'],
@@ -139,7 +139,7 @@ class FlowBonusList extends \common\libs\dataList\DataList implements DataListIn
                     ],
                 ],
                 'AMOUNT' => [
-                    'header' => 'Debit/Credit', // 交易额
+                    'header' => Yii::t('ctx', 'debitCredit'), // 交易额
                     'value' => function ($row) {
                         $result = (new Price([
                             'value' => $row['AMOUNT'],
@@ -164,7 +164,7 @@ class FlowBonusList extends \common\libs\dataList\DataList implements DataListIn
                     },
                 ],
                 'TOTAL' => [
-                    'header' => 'New Balance', // 交易后余额
+                    'header' => Yii::t('ctx', 'newBalance'), // 交易后余额
                     'value' => function ($row) {
                         return (new Price([
                             'value' => $row['TOTAL'],
@@ -175,15 +175,15 @@ class FlowBonusList extends \common\libs\dataList\DataList implements DataListIn
                     ],
                 ],
                 'ADMIN_NAME' => [
-                    'header' => 'Operator', // 操作人
+                    'header' => Yii::t('ctx', 'operator'), // 操作人
                     'headerOther' => ['width' => '110'],
                 ],
                 'REMARK' => [
-                    'header' => 'Remark', // 备注
+                    'header' => Yii::t('ctx', 'remark'), // 备注
                     'headerOther' => ['width' => '250'],
                 ],
                 'TRANSFER_SN' => [
-                    'header' => 'Serial Number', // 流水号
+                    'header' => Yii::t('ctx', 'serialNumber'), // 流水号
                     'headerOther' => ['width' => '250'],
                 ],
             ];
@@ -198,22 +198,22 @@ class FlowBonusList extends \common\libs\dataList\DataList implements DataListIn
     public function getFilterTypes() {
         if (!$this->filterTypes) {
             $this->filterTypes = [
-                'CREATED_AT' => ['isUserTable' => false, 'name' => 'Creation Time', 'other' => 'date'], // 创建时间
-                'PERIOD_NUM' => ['isUserTable' => false, 'name' => 'Period Number'], // 期数
-                'CALC_MONTH' => ['isUserTable' => false, 'name' => 'Bonus Month', 'other' => 'month'], // 结算月
-                'DEAL_TYPE_NAME' => ['isUserTable' => false, 'name' => 'Transaction Type', 'other' => 'dealTypes'], // 交易类型
-                'USER_NAME' => ['isUserTable' => false, 'name' => 'Member Code'], // 会员编号
-                'REAL_NAME' => ['isUserTable' => false, 'name' => 'Member Name'], // 会员姓名
-                'LAST_DEC_LV_NAME' => ['isUserTable' => false, 'name' => 'Member Level', 'other' => 'decLevel'], // 会员等级
-                'LAST_EMP_LV_NAME' => ['isUserTable' => false, 'name' => 'Rank', 'other' => 'empLevel'], // 聘级
-                'IS_DEC' => ['isUserTable' => false, 'name' => 'Whether Stockist', 'other' => 'yesOrNo'], // 是否报单中心
-                'AMOUNT' => ['isUserTable' => false, 'name' => 'Debit/Credit'], // 交易额
-                'TOTAL' => ['isUserTable' => false, 'name' => 'New Balance'], // 交易后余额
-                'ADMIN_NAME' => ['isUserTable' => false, 'name' => 'Operator'], // 操作人
-                'REMARK' => ['isUserTable' => false, 'name' => 'Remark'], // 备注
-                'TRANSFER_SN' => ['isUserTable' => false, 'name' => 'Serial Number'], // 流水号
+                'CREATED_AT' => ['isUserTable' => false, 'name' => Yii::t('ctx', 'createAt'), 'other' => 'date'], // 创建时间
+                'PERIOD_NUM' => ['isUserTable' => false, 'name' => Yii::t('ctx', 'periodNumber')], // 期数
+                'CALC_MONTH' => ['isUserTable' => false, 'name' => Yii::t('ctx', 'bonusMonth'), 'other' => 'month'], // 结算月
+                'DEAL_TYPE_NAME' => ['isUserTable' => false, 'name' => Yii::t('ctx', 'transactionType'), 'other' => 'dealTypes'], // 交易类型
+                'USER_NAME' => ['isUserTable' => false, 'name' => Yii::t('ctx', 'memberCode')], // 会员编号
+                'REAL_NAME' => ['isUserTable' => false, 'name' => Yii::t('ctx', 'memberName')], // 会员姓名
+                'LAST_DEC_LV_NAME' => ['isUserTable' => false, 'name' => Yii::t('ctx', 'memberLevel'), 'other' => 'decLevel'], // 会员等级
+                'LAST_EMP_LV_NAME' => ['isUserTable' => false, 'name' => Yii::t('ctx', 'rank'), 'other' => 'empLevel'], // 聘级
+                'IS_DEC' => ['isUserTable' => false, 'name' => Yii::t('ctx', 'whetherStockist'), 'other' => 'yesOrNo'], // 是否报单中心
+                'AMOUNT' => ['isUserTable' => false, 'name' => Yii::t('ctx', 'debitCredit')], // 交易额
+                'TOTAL' => ['isUserTable' => false, 'name' => Yii::t('ctx', 'newBalance')], // 交易后余额
+                'ADMIN_NAME' => ['isUserTable' => false, 'name' => Yii::t('ctx', 'operator')], // 操作人
+                'REMARK' => ['isUserTable' => false, 'name' => Yii::t('ctx', 'remark')], // 备注
+                'TRANSFER_SN' => ['isUserTable' => false, 'name' => Yii::t('ctx', 'serialNumber')], // 流水号
             ];
         }
         return $this->filterTypes;
     }
-}
+}

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

@@ -57,49 +57,49 @@ class PerfMonthList extends \common\libs\dataList\DataList implements DataListIn
         if(!$this->columns){
             $this->columns = [
                 'CALC_MONTH' => [
-                    'header' => 'Bonus Month', // 结算月
+                    'header' => Yii::t('ctx', 'bonusMonth'), // 结算月
                     'headerOther' => [
                         'width' => '110',
                     ],
                 ],
                 'USER_NAME' => [
-                    'header' => 'Member Code', // 会员编号
+                    'header' => Yii::t('ctx', 'memberCode'), // 会员编号
                     'headerOther' => [
                         'width' => '120',
                     ],
                 ],
                 'REAL_NAME' => [
-                    'header' => 'Member Name', // 会员姓名
+                    'header' => Yii::t('ctx', 'memberName'), // 会员姓名
                     'headerOther' => [
                         'width' => '150',
                     ],
                 ],
                 'REC_USER_NAME' => [
-                    'header' => 'Recommender No', // 推荐人编号
+                    'header' => Yii::t('ctx', 'recommenderNo'), // 推荐人编号
                     'headerOther' => [
                         'width' => '140',
                     ],
                 ],
                 'REC_REAL_NAME' => [
-                    'header' => 'Recommender Name', // 推荐人姓名
+                    'header' => Yii::t('ctx', 'recommenderName'), // 推荐人姓名
                     'headerOther' => [
                         'width' => '160',
                     ],
                 ],
                 'LAST_DEC_LV_NAME' => [
-                    'header' => 'PC Member Level', // 结算时会员级别
+                    'header' =>  Yii::t('ctx', 'PCMemberLevel'), // 结算时会员级别
                     'headerOther' => [
                         'width' => '150',
                     ],
                 ],
                 'LAST_EMP_LV_NAME' => [
-                    'header' => 'Director Rank', // 结算时会员聘级
+                    'header' => Yii::t('ctx', 'directorRank'), // 结算时会员聘级
                     'headerOther' => [
                         'width' => '150',
                     ],
                 ],
                 'PV_PCS' => [
-                    'header' => 'Personal Performance', // 个人业绩
+                    'header' => Yii::t('ctx', 'personalPerformance'), // 个人业绩
                     'headerOther' => [
                         'width' => '170',
                     ],
@@ -110,7 +110,7 @@ class PerfMonthList extends \common\libs\dataList\DataList implements DataListIn
                     },
                 ],
                 'PV_PGS' => [
-                    'header' => 'Director PGS Performance', // 管理奖个人小组业绩
+                    'header' => Yii::t('ctx', 'directorPGSPerformance'), // 管理奖个人小组业绩
                     'headerOther' => [
                         'width' => '190',
                     ],
@@ -121,7 +121,7 @@ class PerfMonthList extends \common\libs\dataList\DataList implements DataListIn
                     },
                 ],
                 'VIP_PV_1L_ZC' => [
-                    'header' => 'L. New Market Entry Performance', // 一市场新增报单业绩
+                    'header' => Yii::t('ctx', 'LNewMarketEntryPerformance'), // 一市场新增报单业绩
                     'headerOther' => [
                         'width' => '240',
                     ],
@@ -132,7 +132,7 @@ class PerfMonthList extends \common\libs\dataList\DataList implements DataListIn
                     },
                 ],
                 'VIP_PV_2L_ZC' => [
-                    'header' => 'R. New Market Entry Performance', // 二市场新增报单业绩
+                    'header' =>  Yii::t('ctx', 'RNewMarketEntryPerformance'), // 二市场新增报单业绩
                     'headerOther' => [
                         'width' => '240',
                     ],
@@ -143,7 +143,7 @@ class PerfMonthList extends \common\libs\dataList\DataList implements DataListIn
                     },
                 ],
                 'VIP_SURPLUS_1L_ZC' => [
-                    'header' => 'L. Market Monthly Remaining Declaration Performance', // 一市场月剩余报单业绩
+                    'header' => Yii::t('ctx', 'LMarketMonthlyRemainingDeclarationPerformance'), // 一市场月剩余报单业绩
                     'headerOther' => [
                         'width' => '370',
                     ],
@@ -154,7 +154,7 @@ class PerfMonthList extends \common\libs\dataList\DataList implements DataListIn
                     },
                 ],
                 'VIP_SURPLUS_2L_ZC' => [
-                    'header' => 'R. Market Monthly Remaining Declaration Performance', // 二市场月剩余报单业绩
+                    'header' =>  Yii::t('ctx', 'RMarketMonthlyRemainingDeclarationPerformance'), // 二市场月剩余报单业绩
                     'headerOther' => [
                         'width' => '370',
                     ],
@@ -165,7 +165,7 @@ class PerfMonthList extends \common\libs\dataList\DataList implements DataListIn
                     },
                 ],
                 'PV_PSS' => [
-                    'header' => 'Monthly New Team Performance', // 月新增团队业绩
+                    'header' => Yii::t('ctx', 'monthlyNewTeamPerformance'), // 月新增团队业绩
                     'headerOther' => [
                         'width' => '230',
                     ],
@@ -176,7 +176,7 @@ class PerfMonthList extends \common\libs\dataList\DataList implements DataListIn
                     },
                 ],
                 'PV_PSS_TOTAL' => [
-                    'header' => 'Monthly Cumulative Team Performance', // 月累计团队业绩
+                    'header' => Yii::t('ctx', 'monthlyCumulativeTeamPerformance'), // 月累计团队业绩
                     'headerOther' => [
                         'width' => '270',
                     ],
@@ -187,7 +187,7 @@ class PerfMonthList extends \common\libs\dataList\DataList implements DataListIn
                     },
                 ],
                 'CREATED_AT' => [
-                    'header' => 'Creation Time', // 创建时间
+                    'header' => Yii::t('ctx', 'createAt'), // 创建时间
                     'value' => function($row) {
                         return (new DateTime([
                             'value' => $row['CREATED_AT'],
@@ -208,12 +208,12 @@ class PerfMonthList extends \common\libs\dataList\DataList implements DataListIn
     {
         if(!$this->filterTypes){
             $this->filterTypes = [
-                'CALC_MONTH'=> ['isUserTable'=> false, 'name'=> 'Bonus Month'], // 结算月
-                'USER_NAME'=> ['isUserTable'=> false, 'name'=> 'Member Code'], // 会员编号
-                'REC_USER_NAME'=> ['isUserTable'=> false, 'name'=> 'Recommender No'], // 推荐人编号
-                'CREATED_AT'=> ['isUserTable'=> false, 'name'=> 'Creation Time', 'other'=> 'date'], // 创建时间
+                'CALC_MONTH'=> ['isUserTable'=> false, 'name'=>  Yii::t('ctx', 'bonusMonth')], // 结算月
+                'USER_NAME'=> ['isUserTable'=> false, 'name'=> Yii::t('ctx', 'memberCode')], // 会员编号
+                'REC_USER_NAME'=> ['isUserTable'=> false, 'name'=> Yii::t('ctx', 'recommenderNo')], // 推荐人编号
+                'CREATED_AT'=> ['isUserTable'=> false, 'name'=> Yii::t('ctx', 'createAt'), 'other'=> 'date'], // 创建时间
             ];
         }
         return $this->filterTypes;
     }
-}
+}

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

@@ -61,13 +61,13 @@ class PerfOrderList extends \common\libs\dataList\DataList implements DataListIn
         if(!$this->columns){
             $this->columns = [
                 'PERIOD_NUM' => [
-                    'header' => 'Pay Cycle（PC）', // 结算期数
+                    'header' => Yii::t('ctx', 'payCycle'), // 结算期数
                     'headerOther' => [
                         'width' => '140',
                     ],
                 ],
                 'SN' => [
-                    'header' => 'Sales No',//业绩单编号
+                    'header' => Yii::t('ctx', 'salesNo'),//业绩单编号
                     'value' => function($row) {
                         return "\t".$row['SN'];
                     },
@@ -76,7 +76,7 @@ class PerfOrderList extends \common\libs\dataList\DataList implements DataListIn
                     ],
                 ],
                 'DEC_TYPE' => [
-                    'header' => 'Type', // 业绩单类型
+                    'header' =>  Yii::t('ctx', 'saleType'), // 业绩单类型
                     'headerOther' => [
                         'width' => '130',
                     ],
@@ -92,37 +92,37 @@ class PerfOrderList extends \common\libs\dataList\DataList implements DataListIn
                     },
                 ],
                 'DEC_STATUS_NAME' => [
-                    'header' => 'Status', // 业绩单状态
+                    'header' => Yii::t('ctx', 'saleStatus'), // 业绩单状态
                     'headerOther' => [
                         'width' => '110',
                     ],
                 ],
                 'USER_NAME' => [
-                    'header' => 'Member Code', // 会员编号
+                    'header' => Yii::t('ctx', 'memberCode'), // 会员编号
                     'headerOther' => [
                         'width' => '110',
                     ],
                 ],
                 'REAL_NAME' => [
-                    'header' => 'Member Name', // 会员姓名
+                    'header' => Yii::t('ctx', 'memberName'), // 会员姓名
                     'headerOther' => [
                         'width' => '150',
                     ],
                 ],
                 'LAST_REC_USER_NAME' => [
-                    'header' => 'Sponsor No. At Settlement', // 结算时开拓者编号
+                    'header' => Yii::t('ctx', 'sponsorNoAtSettlement'), // 结算时开拓者编号
                     'headerOther' => [
                         'width' => '190',
                     ],
                 ],
                 'LAST_REC_REAL_NAME' => [
-                    'header' => 'Sponsor Name At Settlement', // 结算时开拓者姓名
+                    'header' => Yii::t('ctx', 'sponsorNameAtSettlement'), // 结算时开拓者姓名
                     'headerOther' => [
                         'width' => '210',
                     ],
                 ],
                 'PV' => [
-                    'header' => 'Entry BV', // 报单BV
+                    'header' => Yii::t('ctx', 'entryBV'), // 报单BV
                     'headerOther' => [
                         'width' => '150',
                     ],
@@ -133,7 +133,7 @@ class PerfOrderList extends \common\libs\dataList\DataList implements DataListIn
                     },
                 ],
                 'DEC_AMOUNT' => [
-                    'header' => 'Entry Amount', // 报单金额
+                    'header' => Yii::t('ctx', 'entryAmount'), // 报单金额
                     'headerOther' => [
                         'width' => '150',
                     ],
@@ -144,19 +144,19 @@ class PerfOrderList extends \common\libs\dataList\DataList implements DataListIn
                     },
                 ],
                 'DEC_SN' => [
-                    'header' => 'Entry No', // 报单编号
+                    'header' => Yii::t('ctx', 'entryNo'), // 报单编号
                     'headerOther' => [
                         'width' => '250',
                     ],
                 ],
                 'FROM_TABLES' => [
-                    'header' => 'Order Source',
+                    'header' => Yii::t('ctx', 'orderSource'),
                     'headerOther' => [
                         'width' => '250',
                     ],
                 ],
                 'CREATED_AT' => [
-                    'header' => 'Creation Time', // 创建时间
+                    'header' => Yii::t('ctx', 'createAt'), // 创建时间
                     'value' => function($row) {
                         return (new DateTime([
                             'value' => $row['CREATED_AT'],
@@ -177,20 +177,20 @@ class PerfOrderList extends \common\libs\dataList\DataList implements DataListIn
     {
         if(!$this->filterTypes){
             $this->filterTypes = [
-                'PERIOD_NUM'=> ['isUserTable'=> false, 'name'=> 'Pay Cycle（PC）'], // 结算期数
-                'SN'=> ['isUserTable'=> false, 'name'=> 'Sales No'], // 业绩单编号
-                'DEC_STATUS_NAME'=> ['isUserTable'=> false, 'name'=> 'Status','other'=> 'select',
-                 'selectData'=> [['id'=> 1, 'name'=> 'Reviewed'], ['id'=> 2, 'name'=> 'Waste disposal']],], // 业绩单状态,已审核,置废
-                'USER_NAME'=> ['isUserTable'=> false, 'name'=> 'Member Code'], // 会员编号
-                'REAL_NAME'=> ['isUserTable'=> false, 'name'=> 'Member Name'], // 会员姓名
-                'LAST_REC_USER_NAME'=> ['isUserTable'=> false, 'name'=> 'Sponsor No. At Settlement'], // 结算时开拓者编号
-                'LAST_REC_REAL_NAME'=> ['isUserTable'=> false, 'name'=> 'Sponsor Name At Settlement'], // 结算时开拓者姓名
-                'PV'=> ['isUserTable'=> false, 'name'=> 'Entry BV'], // 报单BV
-                'DEC_AMOUNT'=> ['isUserTable'=> false, 'name'=> 'Entry Amount'], // 报单金额
-                'DEC_SN'=> ['isUserTable'=> false, 'name'=> 'Entry No'], // 报单编号
-                'CREATED_AT'=> ['isUserTable'=> true, 'name'=> 'Creation Time', 'other'=> 'date'], // 创建时间
+                'PERIOD_NUM'=> ['isUserTable'=> false, 'name'=> Yii::t('ctx', 'payCycle')], // 结算期数
+                'SN'=> ['isUserTable'=> false, 'name'=> Yii::t('ctx', 'salesNo')], // 业绩单编号
+                'DEC_STATUS_NAME'=> ['isUserTable'=> false, 'name'=> Yii::t('ctx', 'saleStatus'),'other'=> 'select',
+                 'selectData'=> [['id'=> 1, 'name'=> Yii::t('ctx', 'reviewed')], ['id'=> 2, 'name'=> Yii::t('ctx', 'wastedisposal')]],], // 业绩单状态,已审核,置废
+                'USER_NAME'=> ['isUserTable'=> false, 'name'=> Yii::t('ctx', 'memberCode')], // 会员编号
+                'REAL_NAME'=> ['isUserTable'=> false, 'name'=> Yii::t('ctx', 'memberName')], // 会员姓名
+                'LAST_REC_USER_NAME'=> ['isUserTable'=> false, 'name'=> Yii::t('ctx', 'sponsorNoAtSettlement')], // 结算时开拓者编号
+                'LAST_REC_REAL_NAME'=> ['isUserTable'=> false, 'name'=> Yii::t('ctx', 'sponsorNameAtSettlement')], // 结算时开拓者姓名
+                'PV'=> ['isUserTable'=> false, 'name'=> Yii::t('ctx', 'entryBV')], // 报单BV
+                'DEC_AMOUNT'=> ['isUserTable'=> false, 'name'=> Yii::t('ctx', 'entryAmount')], // 报单金额
+                'DEC_SN'=> ['isUserTable'=> false, 'name'=> Yii::t('ctx', 'entryNo')], // 报单编号
+                'CREATED_AT'=> ['isUserTable'=> true, 'name'=> Yii::t('ctx', 'createAt'), 'other'=> 'date'], // 创建时间
             ];
         }
         return $this->filterTypes;
     }
-}
+}

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

@@ -47,25 +47,25 @@ class PerfPeriodList extends \common\libs\dataList\DataList implements DataListI
         if(!$this->columns){
             $this->columns = [
                 'PERIOD_NUM' => [
-                    'header' => 'Number Of Periods', // 期数
+                    'header' =>  Yii::t('ctx', 'numberOfPhases'), // 期数
                     'headerOther' => [
                         'width' => '140',
                     ],
                 ],
                 'USER_NAME' => [
-                    'header' => 'Member Code', // 会员编号
+                    'header' => Yii::t('ctx', 'memberCode'), // 会员编号
                     'headerOther' => [
                         'width' => '120',
                     ],
                 ],
                 'REAL_NAME' => [
-                    'header' => 'Member Name', // 会员姓名
+                    'header' => Yii::t('ctx', 'memberName'), // 会员姓名
                     'headerOther' => [
                         'width' => '150',
                     ],
                 ],
                 'PV_PCS' => [
-                    'header' => 'Personal Performance', // 个人业绩
+                    'header' => Yii::t('ctx', 'personalPerformance'), // 个人业绩
                     'headerOther' => [
                         'width' => '160',
                     ],
@@ -76,16 +76,16 @@ class PerfPeriodList extends \common\libs\dataList\DataList implements DataListI
                     },
                 ],
                 'IS_ACTIVE' => [
-                    'header' => 'Whether Active', // 是否活跃
+                    'header' => Yii::t('ctx', 'personalPerformance'), // 是否活跃
                     'headerOther' => [
                         'width' => '120',
                     ],
                     'value' => function($row) {
-                        return $row['IS_ACTIVE'] == 1 ? 'Yes' : 'No';
+                        return $row['IS_ACTIVE'] == 1 ? Yii::t('ctx', 'yes') : Yii::t('ctx', 'no');
                     },
                 ],
                 'PV_PCS_ZC' => [
-                    'header' => 'Declaration Performance', // 报单业绩
+                    'header' => Yii::t('ctx', 'declarationPerformance'), // 报单业绩
                     'headerOther' => [
                         'width' => '180',
                     ],
@@ -96,7 +96,7 @@ class PerfPeriodList extends \common\libs\dataList\DataList implements DataListI
                     },
                 ],
                 'PV_PCS_FX' => [
-                    'header' => 'Cancellation Performance', // 复消业绩
+                    'header' => Yii::t('ctx', 'cancellationPerformance'), // 复消业绩
                     'headerOther' => [
                         'width' => '190',
                     ],
@@ -107,7 +107,7 @@ class PerfPeriodList extends \common\libs\dataList\DataList implements DataListI
                     },
                 ],
                 'PV_1L' => [
-                    'header' => 'L. New Market Performance', // 一市场新增业绩
+                    'header' =>  Yii::t('ctx', 'LNewMarketPerformance'), // 一市场新增业绩
                     'headerOther' => [
                         'width' => '200',
                     ],
@@ -118,7 +118,7 @@ class PerfPeriodList extends \common\libs\dataList\DataList implements DataListI
                     },
                 ],
                 'PV_1L_ZC' => [
-                    'header' => 'L. New Performance Of Market Entry', // 一市场报单新增业绩
+                    'header' => Yii::t('ctx', 'LNewPerformanceOfMarketEntry'), // 一市场报单新增业绩
                     'headerOther' => [
                         'width' => '250',
                     ],
@@ -129,7 +129,7 @@ class PerfPeriodList extends \common\libs\dataList\DataList implements DataListI
                     },
                 ],
                 'PV_1L_FX' => [
-                    'header' => 'L. New Performance Of Market Re Cancellation', // 一市场复消新增业绩
+                    'header' => Yii::t('ctx', 'LNewPerformanceOfMarketReCancellation'), // 一市场复消新增业绩
                     'headerOther' => [
                         'width' => '320',
                     ],
@@ -140,7 +140,7 @@ class PerfPeriodList extends \common\libs\dataList\DataList implements DataListI
                     },
                 ],
                 'PV_2L' => [
-                    'header' => 'R. New Market Performance', // 二市场新增业绩
+                    'header' => Yii::t('ctx', 'RNewMarketPerformance'), // 二市场新增业绩
                     'headerOther' => [
                         'width' => '200',
                     ],
@@ -151,7 +151,7 @@ class PerfPeriodList extends \common\libs\dataList\DataList implements DataListI
                     },
                 ],
                 'PV_2L_ZC' => [
-                    'header' => 'R. New Performance Of Market Entry', // 二市场报单新增业绩
+                    'header' => Yii::t('ctx', 'RNewPerformanceOfMarketEntry'), // 二市场报单新增业绩
                     'headerOther' => [
                         'width' => '260',
                     ],
@@ -162,7 +162,7 @@ class PerfPeriodList extends \common\libs\dataList\DataList implements DataListI
                     },
                 ],
                 'PV_2L_FX' => [
-                    'header' => 'R. New Performance Of Market Re Cancellation', // 二市场复消新增业绩
+                    'header' => Yii::t('ctx', 'RNewPerformanceOfMarketReCancellation'), // 二市场复消新增业绩
                     'headerOther' => [
                         'width' => '320',
                     ],
@@ -173,7 +173,7 @@ class PerfPeriodList extends \common\libs\dataList\DataList implements DataListI
                     },
                 ],
                 'SURPLUS_1L' => [
-                    'header' => 'L. Market Balance Performance', // 一市场结余业绩
+                    'header' => Yii::t('ctx', 'LMarketBalancePerformance'), // 一市场结余业绩
                     'value' => function($row) {
                         return (new Price([
                             'value' => $row['SURPLUS_1L'],
@@ -185,7 +185,7 @@ class PerfPeriodList extends \common\libs\dataList\DataList implements DataListI
                     ],
                 ],
                 'SURPLUS_2L' => [
-                    'header' => 'R. Market Balance Performance', // 二市场结余业绩
+                    'header' => Yii::t('ctx', 'RMarketBalancePerformance'), // 二市场结余业绩
                     'value' => function($row) {
                         return (new Price([
                             'value' => $row['SURPLUS_2L'],
@@ -197,7 +197,7 @@ class PerfPeriodList extends \common\libs\dataList\DataList implements DataListI
                     ],
                 ],
                 'SURPLUS_1L_ZC' => [
-                    'header' => 'L. Market Entry Balance Performance', // 一市场报单结余业绩
+                    'header' =>  Yii::t('ctx', 'LMarketEntryBalancePerformance'), // 一市场报单结余业绩
                     'value' => function($row) {
                         return (new Price([
                             'value' => $row['SURPLUS_1L_ZC'],
@@ -209,7 +209,7 @@ class PerfPeriodList extends \common\libs\dataList\DataList implements DataListI
                     ],
                 ],
                 'SURPLUS_2L_ZC' => [
-                    'header' => 'R. Market Entry Balance Performance', // 二市场报单结余业绩
+                    'header' => Yii::t('ctx', 'RMarketEntryBalancePerformance'), // 二市场报单结余业绩
                     'value' => function($row) {
                         return (new Price([
                             'value' => $row['SURPLUS_2L_ZC'],
@@ -221,7 +221,7 @@ class PerfPeriodList extends \common\libs\dataList\DataList implements DataListI
                     ],
                 ],
                 'SURPLUS_1L_FX' => [
-                    'header' => 'L. Market Reconditioning Balance Performance', // 一市场复消结余业绩
+                    'header' => Yii::t('ctx', 'LMarketReconditioningBalancePerformance'), // 一市场复消结余业绩
                     'value' => function($row) {
                         return (new Price([
                             'value' => $row['SURPLUS_1L_FX'],
@@ -233,7 +233,7 @@ class PerfPeriodList extends \common\libs\dataList\DataList implements DataListI
                     ],
                 ],
                 'SURPLUS_2L_FX' => [
-                    'header' => 'R. Market Re Cancellation Balance Performance', // 二市场复消结余业绩
+                    'header' =>Yii::t('ctx', 'RMarketReCancellationBalancePerformance'), // 二市场复消结余业绩
                     'value' => function($row) {
                         return (new Price([
                             'value' => $row['SURPLUS_2L_FX'],
@@ -245,7 +245,7 @@ class PerfPeriodList extends \common\libs\dataList\DataList implements DataListI
                     ],
                 ],
                 'PV_PSS' => [
-                    'header' => 'Team Performance', // 团队业绩
+                    'header' => Yii::t('ctx', 'teamPerformance'), // 团队业绩
                     'headerOther' => [
                         'width' => '150',
                     ],
@@ -256,7 +256,7 @@ class PerfPeriodList extends \common\libs\dataList\DataList implements DataListI
                     },
                 ],
                 'CREATED_AT' => [
-                    'header' => 'Creation Time', // 创建时间
+                    'header' => Yii::t('ctx', 'createAt'), // 创建时间
                     'value' => function($row) {
                         return (new DateTime([
                             'value' => $row['CREATED_AT'],
@@ -277,11 +277,11 @@ class PerfPeriodList extends \common\libs\dataList\DataList implements DataListI
     {
         if(!$this->filterTypes){
             $this->filterTypes = [
-                'PERIOD_NUM'=> ['isUserTable'=> false, 'name'=> 'Number Of Periods'], // 期数
-                'USER_NAME'=> ['isUserTable'=> false, 'name'=> 'Member Code'], // 会员编号
-                'CREATED_AT'=> ['isUserTable'=> false, 'name'=> 'Creation Time', 'other'=> 'date'], // 创建时间
+                'PERIOD_NUM'=> ['isUserTable'=> false, 'name'=> Yii::t('ctx', 'numberOfPhases')], // 期数
+                'USER_NAME'=> ['isUserTable'=> false, 'name'=> Yii::t('ctx', 'memberCode')], // 会员编号
+                'CREATED_AT'=> ['isUserTable'=> false, 'name'=> Yii::t('ctx', 'createAt'), 'other'=> 'date'], // 创建时间
             ];
         }
         return $this->filterTypes;
     }
-}
+}

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

@@ -76,7 +76,7 @@ class PeriodBonusList extends \common\libs\dataList\DataList implements DataList
             $this->columns = [
                 'ID' => null,
                 'PERIOD_NUM' => [
-                    'header' => 'Pay Cycle（PC）', // 结算期数
+                    'header' => \Yii::t('ctx', 'payCycle'), // 结算期数
                     'headerOther' => [
                         'width' => '150',
                     ],
@@ -85,7 +85,7 @@ class PeriodBonusList extends \common\libs\dataList\DataList implements DataList
                     ],
                 ],
                 'CALCULATED_AT' => [
-                    'header' => 'Date ', // 结算时间
+                    'header' =>  \Yii::t('ctx', 'bonusDate'), // 结算时间
                     'value' => function($row) {
                         return (new DateTime([
                             'value' => $row['CALCULATED_AT'],
@@ -94,7 +94,7 @@ class PeriodBonusList extends \common\libs\dataList\DataList implements DataList
                     'headerOther' => ['width' => '170'],
                 ],
                 'LAST_USER_NAME' => [
-                    'header' => 'Member Code', // 会员编号
+                    'header' => \Yii::t('ctx', 'memberCode'), // 会员编号
                     'headerOther' => [
                         'width' => '150',
                     ],
@@ -103,7 +103,7 @@ class PeriodBonusList extends \common\libs\dataList\DataList implements DataList
                     ],
                 ],
                 'LAST_REAL_NAME' => [
-                    'header' => 'Member Name', // 会员姓名
+                    'header' => \Yii::t('ctx', 'memberName'), // 会员姓名
                     'headerOther' => [
                         'width' => '120',
                     ],
@@ -112,37 +112,37 @@ class PeriodBonusList extends \common\libs\dataList\DataList implements DataList
                     ],
                 ],
                 'LAST_DEC_LV_NAME' => [
-                    'header' => 'PC Member Level', // 结算时会员级别
+                    'header' => \Yii::t('ctx', 'PCMemberLevel'), // 结算时会员级别
                     'headerOther' => [
                         'width' => '140',
                     ],
                 ],
                 'LAST_EMP_LV_NAME' => [
-                    'header' => 'Latest Director', // 结算时会员最新管理星级
+                    'header' => \Yii::t('ctx', 'latestDirector'), // 结算时会员最新管理星级
                     'headerOther' => [
                         'width' => '140',
                     ],
                 ],
                 'LAST_CROWN_LV_NAME' => [
-                    'header' => 'Latest Crown',//结算时会员最新皇冠星级
+                    'header' => \Yii::t('ctx', 'latestCrown'),//结算时会员最新皇冠星级
                     'headerOther' => [
                         'width' => '140',
                     ],
                 ],
                 'LAST_MOBILE' => [
-                    'header' => 'Phone Number',//手机号码
+                    'header' => \Yii::t('ctx', 'phoneNumber'),//手机号码
                     'headerOther' => [
                         'width' => '120',
                     ],
                 ],
                 'LAST_PERIOD_AT' => [
-                    'header' => 'Joining Period', // 加入期数
+                    'header' => Yii::t('ctx', 'joiningPeriod'), // 加入期数
                     'headerOther' => [
                         'width' => '110',
                     ],
                 ],
                 'LAST_CREATED_AT' => [
-                    'header' => 'Joining Date', // 加入时间
+                    'header' => Yii::t('ctx', 'joiningDate'), // 加入时间
                     'value' => function($row) {
                         return (new DateTime([
                             'value' => $row['LAST_CREATED_AT'],
@@ -151,31 +151,31 @@ class PeriodBonusList extends \common\libs\dataList\DataList implements DataList
                     'headerOther' => ['width' => '170'],
                 ],
                 'LAST_REC_USER_NAME' => [
-                    'header' => 'Sponsor No', // 开拓者编号
+                    'header' => Yii::t('ctx', 'sponsorNo'), // 开拓者编号
                     'headerOther' => [
                         'width' => '150',
                     ],
                 ],
                 'LAST_REC_REAL_NAME' => [
-                    'header' => 'Sponsor Name', // 开拓者姓名
+                    'header' => Yii::t('ctx', 'sponsorName'), // 开拓者姓名
                     'headerOther' => [
                         'width' => '120',
                     ],
                 ],
                 'LAST_CON_USER_NAME' => [
-                    'header' => 'Superior Code', // 上级编号
+                    'header' => Yii::t('ctx', 'superiorCode'), // 上级编号
                     'headerOther' => [
                         'width' => '150',
                     ],
                 ],
                 'LAST_CON_REAL_NAME' => [
-                    'header' => 'Superior Name', // 上级姓名
+                    'header' => Yii::t('ctx', 'superiorName'), // 上级姓名
                     'headerOther' => [
                         'width' => '120',
                     ],
                 ],
                 'BONUS_TG' => [
-                    'header' => 'Welcome Bonus', // 销售奖金
+                    'header' => Yii::t('ctx', 'welcomeBonus'), // 销售奖金
                     'value' => function($row) {
                         return (new Price([
                             'value' => $row['BONUS_TG'],
@@ -187,7 +187,7 @@ class PeriodBonusList extends \common\libs\dataList\DataList implements DataList
                     ],
                 ],
                 'BONUS_QY' => [
-                    'header' => 'Team Bonus', // 绩效奖金
+                    'header' => Yii::t('ctx', 'teamBonus'), // 绩效奖金
                     'value' => function($row) {
                         return (new Price([
                             'value' => $row['BONUS_QY'],
@@ -199,7 +199,7 @@ class PeriodBonusList extends \common\libs\dataList\DataList implements DataList
                     ],
                 ],
                 'ORI_CAPPED_BONUS_QY' => [
-                    'header' => 'Uncapped Team Bonus', // 绩效奖未封顶金额
+                    'header' => Yii::t('ctx', 'uncappedTeamBonus'), // 绩效奖未封顶金额
                     'value' => function($row) {
                         return (new Price([
                             'value' => $row['ORI_CAPPED_BONUS_QY'],
@@ -211,7 +211,7 @@ class PeriodBonusList extends \common\libs\dataList\DataList implements DataList
                     ],
                 ],
                 'BONUS_BS' => [
-                    'header' => 'Director Bonus',// 管理奖/蓝星奖
+                    'header' => Yii::t('ctx', 'directorBonus'),// 管理奖/蓝星奖
                     'value' => function($row) {
                         return (new Price([
                             'value' => $row['BONUS_BS'],
@@ -223,7 +223,7 @@ class PeriodBonusList extends \common\libs\dataList\DataList implements DataList
                     ],
                 ],
                 'BONUS_BD' => [
-                    'header' => 'Stockist Commission', // 服务奖
+                    'header' =>  Yii::t('ctx', 'stockistCommission'), // 服务奖
                     'value' => function($row) {
                         return (new Price([
                             'value' => $row['BONUS_BD'],
@@ -235,7 +235,7 @@ class PeriodBonusList extends \common\libs\dataList\DataList implements DataList
                     ],
                 ],
                 'BONUS_QUARTER' => [
-                    'header' => 'Quarterly Bonus', // 季度分红
+                    'header' => Yii::t('ctx', 'quarterlyBonus'), // 季度分红
                     'value' => function($row) {
                         return (new Price([
                             'value' => $row['BONUS_QUARTER'],
@@ -247,7 +247,7 @@ class PeriodBonusList extends \common\libs\dataList\DataList implements DataList
                     ],
                 ],
                 'BONUS_REAL' => [
-                    'header' => 'Actual Bonus', // 实发奖金
+                    'header' => Yii::t('ctx', 'actualBonus'), // 实发奖金
                     'value' => function($row) {
                         return (new Price([
                             'value' => $row['BONUS_REAL'],
@@ -259,7 +259,7 @@ class PeriodBonusList extends \common\libs\dataList\DataList implements DataList
                     ],
                 ],
                 'BONUS_TOTAL' => [
-                    'header' => 'Total Bonus', // 总奖金
+                    'header' => Yii::t('ctx', 'totalBonus'), // 总奖金
                     'value' => function($row) {
                         return (new Price([
                             'value' => $row['BONUS_TOTAL'],
@@ -271,7 +271,7 @@ class PeriodBonusList extends \common\libs\dataList\DataList implements DataList
                     ],
                 ],
                 'BONUS_INCOME' => [
-                    'header' => 'Total Revenue', // 总收入
+                    'header' => Yii::t('ctx', 'totalRevenue'), // 总收入
                     'value' => function($row) {
                         return (new Price([
                             'value' => $row['BONUS_INCOME'],
@@ -283,7 +283,7 @@ class PeriodBonusList extends \common\libs\dataList\DataList implements DataList
                     ],
                 ],
                 'CALC_MONTH' => [
-                    'header' => 'Bonus Month', // 结算月
+                    'header' => Yii::t('ctx', 'bonusMonth'), // 结算月
                     'headerOther' => [
                         'width' => '110',
                     ],
@@ -301,29 +301,29 @@ class PeriodBonusList extends \common\libs\dataList\DataList implements DataList
     {
         if(!$this->filterTypes){
             $this->filterTypes = [
-                'LAST_USER_NAME'=> ['isUserTable'=> false, 'name'=> 'Member Code'], // 会员编号
-                'LAST_REAL_NAME'=> ['isUserTable'=> false, 'name'=> 'Member Name'], // 会员姓名
-                'LAST_DEC_LV_NAME'=> ['isUserTable'=> false, 'name'=> 'PC Member Level', 'other'=> 'decLevel'], // 结算时会员级别
-                'LAST_EMP_LV_NAME'=> ['isUserTable'=> false, 'name'=> 'Latest Director', 'other'=> 'empLevel'], // 结算时会员管理星级
-                'LAST_CROWN_LV_NAME'=> ['isUserTable'=> false, 'name'=> 'Latest Crown', 'other'=> 'crownLevel'], // 结算时会员皇冠星级
-                'LAST_MOBILE'=> ['isUserTable'=> false, 'name'=> 'Phone Number'], // 手机号
-                'LAST_PERIOD_AT'=> ['isUserTable'=> false, 'name'=> 'Joining Period'], // 加入期数
-                'LAST_CREATED_AT'=> ['isUserTable'=> false, 'name'=> 'Joining Date', 'other'=> 'date'], // 加入时间
-                'CALCULATED_AT'=> ['isUserTable'=> false, 'name'=> 'Date', 'other'=> 'date'], // 备份时间
-                'LAST_REC_USER_NAME'=> ['isUserTable'=> false, 'name'=> 'Sponsor No'], // 开拓者编号
-                'LAST_REC_REAL_NAME'=> ['isUserTable'=> false, 'name'=> 'Sponsor Name'], // 开拓者姓名
-                'LAST_CON_USER_NAME'=> ['isUserTable'=> false, 'name'=> 'Superior Number'], // 上级编号
-                'LAST_CON_REAL_NAME'=> ['isUserTable'=> false, 'name'=> 'Superior Name'], // 上级姓名
-                'PV_1L'=> ['isUserTable'=> false, 'name'=> 'I. new market performance'], // 一市场新增业绩
-                'SURPLUS_1L'=> ['isUserTable'=> false, 'name'=> 'I. market balance performance'], // 一市场结余业绩
-                'PV_2L'=> ['isUserTable'=> false, 'name'=> 'II. new market performance'], // 二市场新增业绩
-                'SURPLUS_2L'=> ['isUserTable'=> false, 'name'=> 'II. market balance performance'], // 二市场结余业绩
-                'BONUS_BD'=> ['isUserTable'=> false, 'name'=> 'Stockist Commission'], // 服务奖
-                'BONUS_GL'=> ['isUserTable'=> false, 'name'=> 'Management Award'], // 管理奖
-                'BONUS_QY'=> ['isUserTable'=> false, 'name'=> 'Team Bonus'], // 团队奖
-                'CALC_MONTH'=> ['isUserTable'=> false, 'name'=> 'Bonus Month'], // 结算月
+                'LAST_USER_NAME'=> ['isUserTable'=> false, 'name'=> Yii::t('ctx', 'memberCode')], // 会员编号
+                'LAST_REAL_NAME'=> ['isUserTable'=> false, 'name'=> Yii::t('ctx', 'memberName')], // 会员姓名
+                'LAST_DEC_LV_NAME'=> ['isUserTable'=> false, 'name'=> Yii::t('ctx', 'PCMemberLevel'), 'other'=> 'decLevel'], // 结算时会员级别
+                'LAST_EMP_LV_NAME'=> ['isUserTable'=> false, 'name'=> Yii::t('ctx', 'latestDirector'), 'other'=> 'empLevel'], // 结算时会员管理星级
+                'LAST_CROWN_LV_NAME'=> ['isUserTable'=> false, 'name'=> Yii::t('ctx', 'latestCrown'), 'other'=> 'crownLevel'], // 结算时会员皇冠星级
+                'LAST_MOBILE'=> ['isUserTable'=> false, 'name'=> Yii::t('ctx', 'phoneNumber')], // 手机号
+                'LAST_PERIOD_AT'=> ['isUserTable'=> false, 'name'=> Yii::t('ctx', 'joiningPeriod')], // 加入期数
+                'LAST_CREATED_AT'=> ['isUserTable'=> false, 'name'=> Yii::t('ctx', 'joiningDate'), 'other'=> 'date'], // 加入时间
+                'CALCULATED_AT'=> ['isUserTable'=> false, 'name'=> Yii::t('ctx', 'date'), 'other'=> 'date'], // 备份时间
+                'LAST_REC_USER_NAME'=> ['isUserTable'=> false, 'name'=> Yii::t('ctx', 'sponsorNo')], // 开拓者编号
+                'LAST_REC_REAL_NAME'=> ['isUserTable'=> false, 'name'=> Yii::t('ctx', 'sponsorName')], // 开拓者姓名
+                'LAST_CON_USER_NAME'=> ['isUserTable'=> false, 'name'=> Yii::t('ctx', 'superiorNumber')], // 上级编号
+                'LAST_CON_REAL_NAME'=> ['isUserTable'=> false, 'name'=> Yii::t('ctx', 'superiorName')], // 上级姓名
+                'PV_1L'=> ['isUserTable'=> false, 'name'=> Yii::t('ctx', 'oneNewMarketPerformance')], // 一市场新增业绩
+                'SURPLUS_1L'=> ['isUserTable'=> false, 'name'=> Yii::t('ctx', 'oneMarketBalancePerformance')], // 一市场结余业绩
+                'PV_2L'=> ['isUserTable'=> false, 'name'=> Yii::t('ctx', 'twoNewMarketPerformance')], // 二市场新增业绩
+                'SURPLUS_2L'=> ['isUserTable'=> false, 'name'=> Yii::t('ctx', 'twoMarketBalancePerformance')], // 二市场结余业绩
+                'BONUS_BD'=> ['isUserTable'=> false, 'name'=> Yii::t('ctx', 'stockistCommission')], // 服务奖
+                'BONUS_GL'=> ['isUserTable'=> false, 'name'=> Yii::t('ctx', 'managementAward')], // 管理奖
+                'BONUS_QY'=> ['isUserTable'=> false, 'name'=> Yii::t('ctx', 'teamBonus')], // 团队奖
+                'CALC_MONTH'=> ['isUserTable'=> false, 'name'=> Yii::t('ctx', 'bonusMonth')], // 结算月
             ];
         }
         return $this->filterTypes;
     }
-}
+}

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

@@ -49,19 +49,19 @@ class UserPerfList extends \common\libs\dataList\DataList implements DataListInt
         if(!$this->columns){
             $this->columns = [
                 'USER_NAME' => [
-                    'header' => 'Member Code', // 会员编号
+                    'header' => Yii::t('ctx', 'memberCode'), // 会员编号
                     'headerOther' => [
                         'width' => '200',
                     ],
                 ],
                 'REAL_NAME' => [
-                    'header' => 'Member Name', // 会员姓名
+                    'header' => Yii::t('ctx', 'memberName'), // 会员姓名
                     'headerOther' => [
                         'width' => '200',
                     ],
                 ],
                 'PV_PCS' => [
-                    'header' => 'Personal Performance', // 个人业绩
+                    'header' => Yii::t('ctx', 'personalPerformance'), // 个人业绩
                     'headerOther' => [
                         'width' => '180',
                     ],
@@ -72,7 +72,7 @@ class UserPerfList extends \common\libs\dataList\DataList implements DataListInt
                     },
                 ],
                 'SURPLUS_1L' => [
-                    'header' => 'Remainder@Left Leg', // 一市场剩余业绩
+                    'header' => Yii::t('ctx', 'remainderLeftLeg'), // 一市场剩余业绩
                     'headerOther' => [
                         'width' => '240',
                     ],
@@ -83,7 +83,7 @@ class UserPerfList extends \common\libs\dataList\DataList implements DataListInt
                     },
                 ],
                 'SURPLUS_2L' => [
-                    'header' => 'Remainder@Right Leg', // 二市场剩余业绩
+                    'header' => Yii::t('ctx', 'remainderRightLeg'), // 二市场剩余业绩
                     'headerOther' => [
                         'width' => '240',
                     ],
@@ -94,7 +94,7 @@ class UserPerfList extends \common\libs\dataList\DataList implements DataListInt
                     },
                 ],
                 'PV_PSS_TOTAL' => [
-                    'header' => 'Cumulative Team Performance', // 累计团队业绩
+                    'header' => Yii::t('ctx', 'cumulativeTeamPerformance'), // 累计团队业绩
                     'headerOther' => [
                         'width' => '250',
                     ],
@@ -117,9 +117,9 @@ class UserPerfList extends \common\libs\dataList\DataList implements DataListInt
     {
         if(!$this->filterTypes){
             $this->filterTypes = [
-                'USER_NAME'=> ['isUserTable'=> false, 'name'=> 'Member Code'], // 会员编号
+                'USER_NAME'=> ['isUserTable'=> false, 'name'=> Yii::t('ctx', 'memberCode')], // 会员编号
             ];
         }
         return $this->filterTypes;
     }
-}
+}

backendApi/modules/v1/models/lists/log/AdminHandleList.php

@@ -13,7 +13,7 @@ class AdminHandleList extends \common\libs\dataList\DataList implements DataList
      * @return string
      */
     public function getListName(){
-        return '管理员操作日志';
+        return \Yii::t('ctx', 'adminLoginLog');
     }
 
     /**
@@ -47,7 +47,7 @@ class AdminHandleList extends \common\libs\dataList\DataList implements DataList
                 'save_before_content' => null,
                 'save_after_content' => null,
                 'opt_type' => [
-                    'header' => '操作类型',
+                    'header' => \Yii::t('ctx', 'operatingType'),
                     'headerOther' => [
                         'width' => '200',
                     ],
@@ -58,13 +58,13 @@ class AdminHandleList extends \common\libs\dataList\DataList implements DataList
                     },
                 ],
                 'opt_obj_name' => [
-                    'header' => '操作对象编号',
+                    'header' => \Yii::t('ctx', 'operationObjectNumber'),
                     'headerOther' => [
                         'width' => '130',
                     ],
                 ],
                 'remark' => [
-                    'header' => '备注',
+                    'header' => \Yii::t('ctx', 'remarks'),
                     'headerOther' => [
                         'width' => '120',
                         'show-overflow-tooltip'=>true,
@@ -72,13 +72,13 @@ class AdminHandleList extends \common\libs\dataList\DataList implements DataList
                     ],
                 ],
                 'admin_name' => [
-                    'header' => '操作人',
+                    'header' => \Yii::t('ctx', 'operator'),
                     'headerOther' => [
                         'width' => '130',
                     ],
                 ],
                 'created_at' => [
-                    'header' => '操作时间',
+                    'header' => \Yii::t('ctx', 'operatingTime'),
                     'value' => function($row) {
                         return (new DateTime([
                             'value' => $row['created_at'],
@@ -86,27 +86,27 @@ class AdminHandleList extends \common\libs\dataList\DataList implements DataList
                     },
                     'headerOther' => ['width' => '180'],
                 ],
-                'period_num' => '期数',
+                'period_num' =>  \Yii::t('ctx', 'numberOfPhases'),
                 'ip' => [
-                    'header' => 'IP地址',
+                    'header' => \Yii::t('ctx', 'IPAddress'),
                     'headerOther' => [
                         'width' => '150',
                     ],
                 ],
                 'device' => [
-                    'header' => '客户端',
+                    'header' => \Yii::t('ctx', 'client'),
                     'headerOther' => [
                         'width' => '150',
                     ],
                 ],
                 'user_agent' => [
-                    'header' => '操作系统',
+                    'header' => \Yii::t('ctx', 'operatingSystem'),
                     'headerOther' => [
                         'width' => '950',
                     ],
                 ],
                 'request_route' => [
-                    'header' => '请求路径',
+                    'header' => \Yii::t('ctx', 'requestPath'),
                     'headerOther' => [
                         'width' => '250',
                     ],
@@ -124,52 +124,52 @@ class AdminHandleList extends \common\libs\dataList\DataList implements DataList
     {
         if(!$this->filterTypes){
             $selectData = [
-                ['id'=>'更新期数配置','name'=>'更新期数配置'],
-                ['id'=>'更新级别奖金配置','name'=>'更新级别奖金配置'],
-                ['id'=>'更新奖金配置','name'=>'更新奖金配置'],
-                ['id'=>'更新聘级奖金配置','name'=>'更新聘级奖金配置'],
-                ['id'=>'更新转账配置','name'=>'更新转账配置'],
-                ['id'=>'申请变动会员余额','name'=>'申请变动会员余额'],
-                ['id'=>'审核会员余额','name'=>'审核会员余额'],
-                ['id'=>'批量申请变动会员余额','name'=>'批量申请变动会员余额'],
-                ['id'=>'空单录入','name'=>'空单录入'],
-                ['id'=>'删除空单会员','name'=>'删除空单会员'],
-                ['id'=>'修改会员级别','name'=>'修改会员级别'],
-                ['id'=>'申请调整会员业绩','name'=>'申请调整会员业绩'],
-                ['id'=>'申请修改会员状态','name'=>'申请修改会员状态'],
-                ['id'=>'设置团队领导人','name'=>'设置团队领导人'],
-                ['id'=>'申请修改会员状态','name'=>'申请修改会员状态'],
-                ['id'=>'审核会员状态','name'=>'审核会员状态'],
-                ['id'=>'显示图谱','name'=>'显示图谱'],
-                ['id'=>'隐藏图谱','name'=>'隐藏图谱'],
-                ['id'=>'设置报单中心','name'=>'设置报单中心'],
-                ['id'=>'取消报单中心','name'=>'取消报单中心'],
-                ['id'=>'会员激活','name'=>'会员激活'],
-                ['id'=>'会员锁定','name'=>'会员锁定'],
-                ['id'=>'修改会员资料','name'=>'修改会员资料'],
-                ['id'=>'编辑管理员','name'=>'编辑管理员'],
-                ['id'=>'申请移网','name'=>'申请移网'],
-                ['id'=>'审核通过移网','name'=>'审核通过移网'],
-                ['id'=>'重置密码','name'=>'重置密码'],
-                ['id'=>'撤销体系','name'=>'撤销体系'],
-                ['id'=>'添加体系','name'=>'添加体系'],
-                ['id'=>'编辑体系','name'=>'编辑体系'],
-                ['id'=>'恢复体系','name'=>'恢复体系'],
+                ['id'=>'更新期数配置','name'=>\Yii::t('ctx', 'updateNumberOfPhasesConfig')],
+                ['id'=>'更新级别奖金配置','name'=>\Yii::t('ctx', 'updateLevelBonusConfig')],
+                ['id'=>'更新奖金配置','name'=>\Yii::t('ctx', 'updateBonusConfig')],
+                ['id'=>'更新聘级奖金配置','name'=>\Yii::t('ctx', 'updateRankBonusConfig')],
+                ['id'=>'更新转账配置','name'=>\Yii::t('ctx', 'updateTransferConfig')],
+                ['id'=>'申请变动会员余额','name'=>\Yii::t('ctx', 'requestChangeUserBalance')],
+                ['id'=>'审核会员余额','name'=>\Yii::t('ctx', 'checkUserBalance')],
+                ['id'=>'批量申请变动会员余额','name'=>\Yii::t('ctx', 'batchRequestChangeUserBalance')],
+                ['id'=>'空单录入','name'=>\Yii::t('ctx', 'blankEntry')],
+                ['id'=>'删除空单会员','name'=>\Yii::t('ctx', 'delBlankUser')],
+                ['id'=>'修改会员级别','name'=>\Yii::t('ctx', 'changeUserLevel')],
+                ['id'=>'申请调整会员业绩','name'=>\Yii::t('ctx', 'applyAdjustmentUserPerformance')],
+                ['id'=>'申请修改会员状态','name'=>\Yii::t('ctx', 'applyModifyUserStatus')],
+                ['id'=>'设置团队领导人','name'=>\Yii::t('ctx', 'setTeamLeaders')],
+                //['id'=>'申请修改会员状态','name'=>'申请修改会员状态'],
+                ['id'=>'审核会员状态','name'=>\Yii::t('ctx', 'checkUserStatus')],
+                ['id'=>'显示图谱','name'=>\Yii::t('ctx', 'displayMap')],
+                ['id'=>'隐藏图谱','name'=>\Yii::t('ctx', 'hiddenMap')],
+                ['id'=>'设置报单中心','name'=>\Yii::t('ctx', 'setDeclarationCenter')],
+                ['id'=>'取消报单中心','name'=>\Yii::t('ctx', 'cancelDeclarationCenter')],
+                ['id'=>'会员激活','name'=>\Yii::t('ctx', 'userActivation')],
+                ['id'=>'会员锁定','name'=>\Yii::t('ctx', 'userLocking')],
+                ['id'=>'修改会员资料','name'=>\Yii::t('ctx', 'modifyUserInfo')],
+                ['id'=>'编辑管理员','name'=>\Yii::t('ctx', 'editAdmin')],
+                ['id'=>'申请移网','name'=>\Yii::t('ctx', 'applyRemoveNetwork')],
+                ['id'=>'审核通过移网','name'=>\Yii::t('ctx', 'approveRemoveNetwork')],
+                ['id'=>'重置密码','name'=>\Yii::t('ctx', 'resetPasswords')],
+                ['id'=>'撤销体系','name'=>\Yii::t('ctx', 'cancellationSystem')],
+                ['id'=>'添加体系','name'=>\Yii::t('ctx', 'addSystem')],
+                ['id'=>'编辑体系','name'=>\Yii::t('ctx', 'editSystem')],
+                ['id'=>'恢复体系','name'=>\Yii::t('ctx', 'recoverySystem')],
                 ['id'=>'perf adjustment','name'=>'perf adjustment'],
             ];
             $this->filterTypes = [
-                'opt_type' => ['isUserTable'=>false, 'name'=>'操作类型', 'other'=> 'select', 'selectData'=> $selectData],
-                'opt_obj_name' => ['isUserTable'=>false, 'name'=>'操作对象编号'],
-                'remark' => ['isUserTable'=>false, 'name'=>'备注'],
-                'admin_name' => ['isUserTable'=>false, 'name'=>'操作人'],
-                'created_at' => ['isUserTable'=>false, 'name'=>'操作时间', 'other'=> 'date'],
-                'period_num' => ['isUserTable'=>false, 'name'=>'期数'],
-                'ip' => ['isUserTable'=>false, 'name'=>'IP地址'],
-                'device' => ['isUserTable'=>false, 'name'=>'客户端'],
-                'user_agent' => ['isUserTable'=>false, 'name'=>'操作系统'],
-                'request_route' => ['isUserTable'=>false, 'name'=>'请求路径'],
+                'opt_type' => ['isUserTable'=>false, 'name'=>\Yii::t('ctx', 'operatingType'), 'other'=> 'select', 'selectData'=> $selectData],
+                'opt_obj_name' => ['isUserTable'=>false, 'name'=>\Yii::t('ctx', 'operationObjectNumber')],
+                'remark' => ['isUserTable'=>false, 'name'=>\Yii::t('ctx', 'remarks')],
+                'admin_name' => ['isUserTable'=>false, 'name'=>\Yii::t('ctx', 'operator')],
+                'created_at' => ['isUserTable'=>false, 'name'=>\Yii::t('ctx', 'operatingTime'), 'other'=> 'date'],
+                'period_num' => ['isUserTable'=>false, 'name'=>\Yii::t('ctx', 'numberOfPhases')],
+                'ip' => ['isUserTable'=>false, 'name'=>\Yii::t('ctx', 'IPAddress')],
+                'device' => ['isUserTable'=>false, 'name'=>\Yii::t('ctx', 'client')],
+                'user_agent' => ['isUserTable'=>false, 'name'=>\Yii::t('ctx', 'operatingSystem')],
+                'request_route' => ['isUserTable'=>false, 'name'=>\Yii::t('ctx', 'requestPath')],
             ];
         }
         return $this->filterTypes;
     }
-}
+}

backendApi/modules/v1/models/lists/log/AdminLoginList.php

@@ -14,7 +14,7 @@ class AdminLoginList extends \common\libs\dataList\DataList implements DataListI
      * @return string
      */
     public function getListName(){
-        return '管理员登录日志';
+        return \Yii::t('ctx', 'adminLoginLog');
     }
 
     /**
@@ -45,12 +45,12 @@ class AdminLoginList extends \common\libs\dataList\DataList implements DataListI
         if(!$this->columns){
             $this->columns = [
                 'opt_type' => [
-                    'header' => '操作类型',
+                    'header' => \Yii::t('ctx', 'operatingType'),
                     'headerOther' => [
                         'width' => '120',
                     ],
                     'value' => function($row) {
-                        return (isset($row['opt_type']) && $row['opt_type'] == 1 )? '登录成功' : '登录失败';
+                        return (isset($row['opt_type']) && $row['opt_type'] == 1 )? \Yii::t('ctx', 'loginSuccess') : \Yii::t('ctx', 'loginFail');
                     },
                     'valueOther' => function($row) {
                         return [
@@ -59,7 +59,7 @@ class AdminLoginList extends \common\libs\dataList\DataList implements DataListI
                     },
                 ],
                 'opt_obj' => [
-                    'header' => '操作对象',
+                    'header' => \Yii::t('ctx', 'operationObjectNumber'),
                     'headerOther' => [
                         'width' => '120',
                     ],
@@ -68,31 +68,31 @@ class AdminLoginList extends \common\libs\dataList\DataList implements DataListI
                     },
                 ],
                 'adm_name' => [
-                    'header' => '对象编号',
+                    'header' => \Yii::t('ctx', 'operator'),
                     'headerOther' => [
                         'width' => '110',
                     ],
                 ],
                 'return_result' => [
-                    'header' => '返回内容',
+                    'header' => \Yii::t('ctx', 'returnResult'),
                     'headerOther' => [
                         'width' => '250',
                     ],
                 ],
                 'success_times' => [
-                    'header' => '登录成功次数',
+                    'header' => \Yii::t('ctx', 'successTimes'),
                     'headerOther' => [
                         'width' => '110',
                     ],
                 ],
                 'fail_times' => [
-                    'header' => '登录失败次数',
+                    'header' => \Yii::t('ctx', 'failTimes'),
                     'headerOther' => [
                         'width' => '110',
                     ],
                 ],
                 'created_at' => [
-                    'header' => '操作时间',
+                    'header' => \Yii::t('ctx', 'operatingTime'),
                     'value' => function($row) {
                         return (new DateTime([
                             'value' => $row['created_at'],
@@ -100,27 +100,27 @@ class AdminLoginList extends \common\libs\dataList\DataList implements DataListI
                     },
                     'headerOther' => ['width' => '180'],
                 ],
-                'period_num' => '期数',
+                'period_num' =>  \Yii::t('ctx', 'numberOfPhases'),
                 'ip' => [
-                    'header' => 'IP地址',
+                    'header' => \Yii::t('ctx', 'IPAddress'),
                     'headerOther' => [
                         'width' => '150',
                     ],
                 ],
                 'device' => [
-                    'header' => '客户端',
+                    'header' => \Yii::t('ctx', 'client'),
                     'headerOther' => [
                         'width' => '150',
                     ],
                 ],
                 'user_agent' => [
-                    'header' => '操作系统',
+                    'header' =>  \Yii::t('ctx', 'operatingSystem'),
                     'headerOther' => [
                         'width' => '950',
                     ],
                 ],
                 'request_route' => [
-                    'header' => '请求路径',
+                    'header' => \Yii::t('ctx', 'requestPath'),
                     'headerOther' => [
                         'width' => '250',
                     ],
@@ -138,18 +138,18 @@ class AdminLoginList extends \common\libs\dataList\DataList implements DataListI
     {
         if(!$this->filterTypes){
             $this->filterTypes = [
-                'opt_type' => ['isUserTable'=>false, 'name'=>'操作类型', 'other'=> 'select', 'selectData'=> [['id'=> 1, 'name'=> '登录成功'], ['id'=> 0, 'name'=> '登录失败']]],
-                'adm_name' => ['isUserTable'=>false, 'name'=>'对象编号'],
-                'success_times' => ['isUserTable'=>false, 'name'=>'登录成功次数'],
-                'fail_times' => ['isUserTable'=>false, 'name'=>'登录失败次数'],
-                'created_at' => ['isUserTable'=>false, 'name'=>'操作时间', 'other'=> 'date'],
-                'period_num' => ['isUserTable'=>false, 'name'=>'期数'],
-                'ip' => ['isUserTable'=>false, 'name'=>'IP地址'],
-                'device' => ['isUserTable'=>false, 'name'=>'客户端'],
-                'user_agent' => ['isUserTable'=>false, 'name'=>'操作系统'],
-                'request_route' => ['isUserTable'=>false, 'name'=>'请求路径'],
+                'opt_type' => ['isUserTable'=>false, 'name'=>\Yii::t('ctx', 'operatingType'), 'other'=> 'select', 'selectData'=> [['id'=> 1, 'name'=> \Yii::t('ctx', 'loginSuccess')], ['id'=> 0, 'name'=> \Yii::t('ctx', 'loginFail')]]],
+                'adm_name' => ['isUserTable'=>false, 'name'=>\Yii::t('ctx', 'objectNumber')],
+                'success_times' => ['isUserTable'=>false, 'name'=>\Yii::t('ctx', 'successTimes')],
+                'fail_times' => ['isUserTable'=>false, 'name'=>\Yii::t('ctx', 'failTimes')],
+                'created_at' => ['isUserTable'=>false, 'name'=>\Yii::t('ctx', 'operatingTime'), 'other'=> 'date'],
+                'period_num' => ['isUserTable'=>false, 'name'=>\Yii::t('ctx', 'numberOfPhases')],
+                'ip' => ['isUserTable'=>false, 'name'=>\Yii::t('ctx', 'IPAddress')],
+                'device' => ['isUserTable'=>false, 'name'=>\Yii::t('ctx', 'client')],
+                'user_agent' => ['isUserTable'=>false, 'name'=>\Yii::t('ctx', 'operatingSystem')],
+                'request_route' => ['isUserTable'=>false, 'name'=>\Yii::t('ctx', 'requestPath')],
             ];
         }
         return $this->filterTypes;
     }
-}
+}

backendApi/modules/v1/models/lists/log/SystemList.php

@@ -45,12 +45,12 @@ class SystemList extends \common\libs\dataList\DataList implements DataListInter
         if(!$this->columns){
             $this->columns = [
                 'opt_type' => [
-                    'header' => '操作类型',
+                    'header' => \Yii::t('ctx', 'operatingType'),
                     'headerOther' => [
                         'width' => '120',
                     ],
                     'value' => function($row) {
-                        return (isset($row['opt_type']) && $row['opt_type'] == 'call' )? '调用' : '被调用';
+                        return (isset($row['opt_type']) && $row['opt_type'] == 'call' )? \Yii::t('ctx', 'call') : \Yii::t('ctx', 'beCcalled');
                     },
                     'valueOther' => function($row) {
                         return [
@@ -59,39 +59,39 @@ class SystemList extends \common\libs\dataList\DataList implements DataListInter
                     },
                 ],
                 'opt_target_name' => [
-                    'header' => '操作对象',
+                    'header' => \Yii::t('ctx', 'operatingObject'),
                     'headerOther' => [
                         'width' => '120',
                     ],
                 ],
                 'opt_obj_name' => [
-                    'header' => '对象编号',
+                    'header' => \Yii::t('ctx', 'objectNumber'),
                     'headerOther' => [
                         'width' => '110',
                     ],
                 ],
                 'request_content' => [
-                    'header' => '请求内容',
+                    'header' => \Yii::t('ctx', 'requestContent'),
                     'headerOther' => [
                         'show-overflow-tooltip'=>true,
                         'min-width'=>'250',
                     ],
                 ],
                 'response_content' => [
-                    'header' => '返回内容',
+                    'header' => \Yii::t('ctx', 'requestContent'),
                     'headerOther' => [
                         'show-overflow-tooltip'=>true,
                         'min-width'=>'250',
                     ],
                 ],
                 'opt_user' => [
-                    'header' => '操作人',
+                    'header' => \Yii::t('ctx', 'operator'),
                     'headerOther' => [
                         'width' => '130',
                     ],
                 ],
                 'created_at' => [
-                    'header' => '操作时间',
+                    'header' => \Yii::t('ctx', 'operatingTime'),
                     'value' => function($row) {
                         return (new DateTime([
                             'value' => $row['created_at'],
@@ -99,27 +99,27 @@ class SystemList extends \common\libs\dataList\DataList implements DataListInter
                     },
                     'headerOther' => ['width' => '180'],
                 ],
-                'period_num' => '期数',
+                'period_num' => \Yii::t('ctx', 'numberOfPhases'),
                 'ip' => [
-                    'header' => 'IP地址',
+                    'header' => \Yii::t('ctx', 'IPAddress'),
                     'headerOther' => [
                         'width' => '150',
                     ],
                 ],
                 'device' => [
-                    'header' => '客户端',
+                    'header' => \Yii::t('ctx', 'IPAddress'),
                     'headerOther' => [
                         'width' => '150',
                     ],
                 ],
                 'user_agent' => [
-                    'header' => '操作系统',
+                    'header' =>  \Yii::t('ctx', 'operatingSystem'),
                     'headerOther' => [
                         'width' => '350',
                     ],
                 ],
                 'request_route' => [
-                    'header' => '请求路径',
+                    'header' => \Yii::t('ctx', 'requestPath'),
                     'headerOther' => [
                         'width' => '250',
                     ],
@@ -137,18 +137,18 @@ class SystemList extends \common\libs\dataList\DataList implements DataListInter
     {
         if(!$this->filterTypes){
             $this->filterTypes = [
-                'opt_type' => ['isUserTable'=>false, 'name'=>'操作类型', 'other'=> 'select', 'selectData'=> [['id'=> 'call', 'name'=> '调用'], ['id'=> 'called', 'name'=> '被调用']]],
-                'opt_target_name' => ['isUserTable'=>false, 'name'=>'操作对象'],
-                'opt_obj_name' => ['isUserTable'=>false, 'name'=>'对象编号'],
-                'opt_user' => ['isUserTable'=>false, 'name'=>'操作人'],
-                'created_at' => ['isUserTable'=>false, 'name'=>'操作时间', 'other'=> 'date'],
-                'period_num' => ['isUserTable'=>false, 'name'=>'期数'],
-                'ip' => ['isUserTable'=>false, 'name'=>'IP地址'],
-                'device' => ['isUserTable'=>false, 'name'=>'客户端'],
-                'user_agent' => ['isUserTable'=>false, 'name'=>'操作系统'],
-                'request_route' => ['isUserTable'=>false, 'name'=>'请求路径'],
+                'opt_type' => ['isUserTable'=>false, 'name'=>\Yii::t('ctx', 'operatingType'), 'other'=> 'select', 'selectData'=> [['id'=> 'call', 'name'=> \Yii::t('ctx', 'call')], ['id'=> 'called', 'name'=> \Yii::t('ctx', 'beCcalled')]]],
+                'opt_target_name' => ['isUserTable'=>false, 'name'=>\Yii::t('ctx', 'operatingObject')],
+                'opt_obj_name' => ['isUserTable'=>false, 'name'=>\Yii::t('ctx', 'objectNumber')],
+                'opt_user' => ['isUserTable'=>false, 'name'=>\Yii::t('ctx', 'operator')],
+                'created_at' => ['isUserTable'=>false, 'name'=>\Yii::t('ctx', 'operatingTime'), 'other'=> 'date'],
+                'period_num' => ['isUserTable'=>false, 'name'=>\Yii::t('ctx', 'numberOfPhases')],
+                'ip' => ['isUserTable'=>false, 'name'=>\Yii::t('ctx', 'IPAddress')],
+                'device' => ['isUserTable'=>false, 'name'=>\Yii::t('ctx', 'client')],
+                'user_agent' => ['isUserTable'=>false, 'name'=>\Yii::t('ctx', 'operatingSystem')],
+                'request_route' => ['isUserTable'=>false, 'name'=>\Yii::t('ctx', 'requestPath')],
             ];
         }
         return $this->filterTypes;
     }
-}
+}

backendApi/modules/v1/models/lists/log/UserHandleList.php

@@ -16,7 +16,7 @@ class UserHandleList extends \common\libs\dataList\DataList implements DataListI
      * @return string
      */
     public function getListName(){
-        return '会员操作日志';
+        return \Yii::t('ctx', 'userOperatingLog');
     }
 
     /**
@@ -50,7 +50,7 @@ class UserHandleList extends \common\libs\dataList\DataList implements DataListI
                 'save_before_content' => null,
                 'save_after_content' => null,
                 'opt_type' => [
-                    'header' => 'Operation Type', // 操作类型
+                    'header' =>  \Yii::t('ctx', 'operatingType'), // 操作类型
                     'headerOther' => [
                         'width' => '200',
                     ],
@@ -61,13 +61,13 @@ class UserHandleList extends \common\libs\dataList\DataList implements DataListI
                     },
                 ],
                 'opt_obj_name' => [
-                    'header' => 'Operation Object Code',//操作对象编号
+                    'header' => \Yii::t('ctx', 'operationObjectNumber'),//操作对象编号
                     'headerOther' => [
                         'width' => '130',
                     ],
                 ],
                 'remark' => [
-                    'header' => 'Remark', // 备注
+                    'header' => \Yii::t('ctx', 'remarks'), // 备注
                     'headerOther' => [
                         'width' => '120',
                         'show-overflow-tooltip'=>true,
@@ -75,13 +75,13 @@ class UserHandleList extends \common\libs\dataList\DataList implements DataListI
                     ],
                 ],
                 'user_name' => [
-                    'header' => 'Operator',//操作人
+                    'header' => \Yii::t('ctx', 'operator'),//操作人
                     'headerOther' => [
                         'width' => '130',
                     ],
                 ],
                 'created_at' => [
-                    'header' => 'Operation Time',//操作时间
+                    'header' => \Yii::t('ctx', 'operatingTime'),//操作时间
                     'value' => function($row) {
                         return (new DateTime([
                             'value' => $row['created_at'],
@@ -89,27 +89,27 @@ class UserHandleList extends \common\libs\dataList\DataList implements DataListI
                     },
                     'headerOther' => ['width' => '180'],
                 ],
-                'period_num' => 'Number Of Periods', // 期数
+                'period_num' => \Yii::t('ctx', 'numberOfPhases'), // 期数
                 'ip' => [
-                    'header' => 'IP Address', // IP地址
+                    'header' => \Yii::t('ctx', 'IPAddress'), // IP地址
                     'headerOther' => [
                         'width' => '150',
                     ],
                 ],
                 'device' => [
-                    'header' => 'Client', // 客户端
+                    'header' => \Yii::t('ctx', 'client'), // 客户端
                     'headerOther' => [
                         'width' => '150',
                     ],
                 ],
                 'user_agent' => [
-                    'header' => 'Operating System', // 操作系统
+                    'header' => \Yii::t('ctx', 'operatingSystem'), // 操作系统
                     'headerOther' => [
                         'width' => '950',
                     ],
                 ],
                 'request_route' => [
-                    'header' => 'Request Path', // 请求路径
+                    'header' => \Yii::t('ctx', 'requestPath'), // 请求路径
                     'headerOther' => [
                         'width' => '250',
                     ],
@@ -127,26 +127,26 @@ class UserHandleList extends \common\libs\dataList\DataList implements DataListI
     {
         if(!$this->filterTypes){
             $selectData = [
-                ['id'=>'开启关闭自动提现','name'=>'Enable / Disable Automatic Withdrawal'], // 开启关闭自动提现
-                ['id'=>'开启关闭复销短信提醒','name'=>'Enable / Disable Re Sales SMS Reminder'], // 开启关闭复销短信提醒
-                ['id'=>'会员转账','name'=>'Member Transfer'], // 会员转账
-                ['id'=>'会员提现申请','name'=>'Member Withdrawal Application'], // 会员提现申请
-                ['id'=>'会员修改资料','name'=>'Member Modification Information'], // 会员修改资料
-                ['id'=>'修改主点位','name'=>'Modify Master Point'], // 修改主点位
+                ['id'=>'开启关闭自动提现','name'=>\Yii::t('ctx', 'enableDisableAutomaticWithdrawal')], // 开启关闭自动提现
+                ['id'=>'开启关闭复销短信提醒','name'=>\Yii::t('ctx', 'enableDisableReSalesSMSReminder')], // 开启关闭复销短信提醒
+                ['id'=>'会员转账','name'=>\Yii::t('ctx', 'memberTransfer')], // 会员转账
+                ['id'=>'会员提现申请','name'=>\Yii::t('ctx', 'memberWithdrawalApplication')], // 会员提现申请
+                ['id'=>'会员修改资料','name'=>\Yii::t('ctx', 'memberModificationInformation')], // 会员修改资料
+                ['id'=>'修改主点位','name'=>\Yii::t('ctx', 'modifyMasterPoint')], // 修改主点位
             ];
             $this->filterTypes = [
-                'opt_type' => ['isUserTable'=>false, 'name'=>'Operation Type', 'other'=> 'select', 'selectData'=> $selectData], // 操作类型
-                'opt_obj_name' => ['isUserTable'=>false, 'name'=>'Operation Object No'], // 操作对象编号
-                'remark' => ['isUserTable'=>false, 'name'=>'Remark'], // 备注
-                'user_name' => ['isUserTable'=>false, 'name'=>'Operator'], // 操作人
-                'created_at' => ['isUserTable'=>false, 'name'=>'Operation Time', 'other'=> 'date'], // 操作时间
-                'period_num' => ['isUserTable'=>false, 'name'=>'Number Of Periods'], // 操作时间
-                'ip' => ['isUserTable'=>false, 'name'=>'IP Address'], // IP地址
-                'device' => ['isUserTable'=>false, 'name'=>'Client'], // 客户端
-                'user_agent' => ['isUserTable'=>false, 'name'=>'Operating System'], // 操作系统
-                'request_route' => ['isUserTable'=>false, 'name'=>'Request Path'], // 请求路径
+                'opt_type' => ['isUserTable'=>false, 'name'=>\Yii::t('ctx', 'operatingType'), 'other'=> 'select', 'selectData'=> $selectData], // 操作类型
+                'opt_obj_name' => ['isUserTable'=>false, 'name'=>\Yii::t('ctx', 'operationObjectNumber')], // 操作对象编号
+                'remark' => ['isUserTable'=>false, 'name'=>\Yii::t('ctx', 'remarks')], // 备注
+                'user_name' => ['isUserTable'=>false, 'name'=>\Yii::t('ctx', 'operator')], // 操作人
+                'created_at' => ['isUserTable'=>false, 'name'=>\Yii::t('ctx', 'operatingTime'), 'other'=> 'date'], // 操作时间
+                'period_num' => ['isUserTable'=>false, 'name'=>\Yii::t('ctx', 'numberOfPhases')], // 期数
+                'ip' => ['isUserTable'=>false, 'name'=>\Yii::t('ctx', 'IPAddress')], // IP地址
+                'device' => ['isUserTable'=>false, 'name'=>\Yii::t('ctx', 'client')],
+                'user_agent' => ['isUserTable'=>false, 'name'=>\Yii::t('ctx', 'operatingSystem')],
+                'request_route' => ['isUserTable'=>false, 'name'=>\Yii::t('ctx', 'requestPath')],
             ];
         }
         return $this->filterTypes;
     }
-}
+}

backendApi/modules/v1/models/lists/log/UserLoginList.php

@@ -15,7 +15,7 @@ class UserLoginList extends \common\libs\dataList\DataList implements DataListIn
      * @return string
      */
     public function getListName(){
-        return '会员登录日志';
+        return \Yii::t('ctx', 'userLoginLog');
     }
 
     /**
@@ -57,12 +57,12 @@ class UserLoginList extends \common\libs\dataList\DataList implements DataListIn
         if(!$this->columns){
             $this->columns = [
                 'opt_type' => [
-                    'header' => 'Operation Type',//操作类型
+                    'header' => \Yii::t('ctx', 'operatingType'),//操作类型
                     'headerOther' => [
                         'width' => '120',
                     ],
                     'value' => function($row) {
-                        return (isset($row['opt_type']) && $row['opt_type'] == 1 )? 'login succeeded' : 'login failed';//'登录成功' : '登录失败';
+                        return (isset($row['opt_type']) && $row['opt_type'] == 1 )? \Yii::t('ctx', 'loginSuccess') : \Yii::t('ctx', 'loginFail');//'登录成功' : '登录失败';
                     },
                     'valueOther' => function($row) {
                         return [
@@ -71,7 +71,7 @@ class UserLoginList extends \common\libs\dataList\DataList implements DataListIn
                     },
                 ],
                 'opt_obj' => [
-                    'header' => 'Operation Object', // 操作对象
+                    'header' => \Yii::t('ctx', 'operationObjectNumber'), // 操作对象
                     'headerOther' => [
                         'width' => '130',
                     ],
@@ -80,31 +80,31 @@ class UserLoginList extends \common\libs\dataList\DataList implements DataListIn
                     },
                 ],
                 'user_name' => [
-                    'header' => 'Object Number', // 对象编号
+                    'header' => \Yii::t('ctx', 'objectNumber'), // 对象编号
                     'headerOther' => [
                         'width' => '120',
                     ],
                 ],
                 'return_result' => [
-                    'header' => 'Return Content', // 返回内容
+                    'header' => \Yii::t('ctx', 'returnResult'), // 返回内容
                     'headerOther' => [
                         'width' => '250',
                     ],
                 ],
                 'success_times' => [
-                    'header' => 'Login Success Times', // 登录成功次数
+                    'header' => \Yii::t('ctx', 'successTimes'), // 登录成功次数
                     'headerOther' => [
                         'width' => '160',
                     ],
                 ],
                 'fail_times' => [
-                    'header' => 'Number Of Login Failures', // 登录失败次数
+                    'header' => \Yii::t('ctx', 'failTimes'), // 登录失败次数
                     'headerOther' => [
                         'width' => '190',
                     ],
                 ],
                 'created_at' => [
-                    'header' => 'Operation Time', // 操作时间
+                    'header' => \Yii::t('ctx', 'operatingTime'), // 操作时间
                     'value' => function($row) {
                         return (new DateTime([
                             'value' => $row['created_at'],
@@ -113,35 +113,35 @@ class UserLoginList extends \common\libs\dataList\DataList implements DataListIn
                     'headerOther' => ['width' => '180'],
                 ],
                 'period_num' => [
-                    'header' => 'Number Of Periods', // 期数
+                    'header' => \Yii::t('ctx', 'numberOfPhases'), // 期数
                     'headerOther' => ['width' => '180'],
                     ],
                 'ip' => [
-                    'header' => 'IP Address', // IP地址
+                    'header' => \Yii::t('ctx', 'IPAddress'), // IP地址
                     'headerOther' => [
                         'width' => '150',
                     ],
                 ],
                 'device' => [
-                    'header' => 'Client', // 客户端
+                    'header' => \Yii::t('ctx', 'client'), // 客户端
                     'headerOther' => [
                         'width' => '150',
                     ],
                 ],
                 'user_agent' => [
-                    'header' => 'Operating System', // 操作系统
+                    'header' => \Yii::t('ctx', 'operatingSystem'), // 操作系统
                     'headerOther' => [
                         'width' => '950',
                     ],
                 ],
                 'request_route' => [
-                    'header' => 'Request Path', // 请求路径
+                    'header' => \Yii::t('ctx', 'requestPath'), // 请求路径
                     'headerOther' => [
                         'width' => '250',
                     ],
                 ],
                 'version' => [
-                    'header' => 'Version', // 版本
+                    'header' => \Yii::t('ctx', 'version'), // 版本
                     'headerOther' => [
                         'width' => '100',
                     ],
@@ -160,19 +160,19 @@ class UserLoginList extends \common\libs\dataList\DataList implements DataListIn
         if(!$this->filterTypes){
             $this->filterTypes = [
 //                'opt_type' => ['isUserTable'=>false, 'name'=>'操作类型', 'other'=> 'select', 'selectData'=> [['id'=> 1, 'name'=> '登录成功'], ['id'=> 0, 'name'=> '登录失败']]],
-                'opt_type' => ['isUserTable'=>false, 'name'=>'Operation Type', 'other'=> 'select', 'selectData'=> [['id'=> 1, 'name'=> 'login succeeded'], ['id'=> 0, 'name'=> 'login failed']]],
-                'user_name' => ['isUserTable'=>false, 'name'=>'Object Number'],//对象编号
-                'success_times' => ['isUserTable'=>false, 'name'=>'Login Success Times'],//登录成功次数
-                'fail_times' => ['isUserTable'=>false, 'name'=>'Number Of Login Failures'],//登录失败次数
-                'created_at' => ['isUserTable'=>false, 'name'=>'Operation Time', 'other'=> 'date'],//操作时间
-                'period_num' => ['isUserTable'=>false, 'name'=>'Number Of Periods'],//期数
-                'ip' => ['isUserTable'=>false, 'name'=>'IP Address'],//IP地址
-                'device' => ['isUserTable'=>false, 'name'=>'Client'],//客户端
-                'user_agent' => ['isUserTable'=>false, 'name'=>'Operating System'],//操作系统
-                'request_route' => ['isUserTable'=>false, 'name'=>'Request Path'],//请求路径
-                'version' => ['isUserTable'=>false, 'name'=>'Version'],//版本
+                'opt_type' => ['isUserTable'=>false, 'name'=>\Yii::t('ctx', 'operatingType'), 'other'=> 'select', 'selectData'=> [['id'=> 1, 'name'=> \Yii::t('ctx', 'loginSuccess')], ['id'=> 0, 'name'=> \Yii::t('ctx', 'loginFail')]]],
+                'user_name' => ['isUserTable'=>false, 'name'=>\Yii::t('ctx', 'objectNumber')],//对象编号
+                'success_times' => ['isUserTable'=>false, 'name'=>\Yii::t('ctx', 'successTimes')],//登录成功次数
+                'fail_times' => ['isUserTable'=>false, 'name'=>\Yii::t('ctx', 'failTimes')],//登录失败次数
+                'created_at' => ['isUserTable'=>false, 'name'=>\Yii::t('ctx', 'operatingTime'), 'other'=> 'date'],//操作时间
+                'period_num' => ['isUserTable'=>false, 'name'=>\Yii::t('ctx', 'numberOfPhases')],//期数
+                'ip' => ['isUserTable'=>false, 'name'=>\Yii::t('ctx', 'IPAddress')],
+                'device' => ['isUserTable'=>false, 'name'=>\Yii::t('ctx', 'client')],
+                'user_agent' => ['isUserTable'=>false, 'name'=>\Yii::t('ctx', 'operatingSystem')],
+                'request_route' => ['isUserTable'=>false, 'name'=>\Yii::t('ctx', 'requestPath')],
+                'version' => ['isUserTable'=>false, 'name'=>\Yii::t('ctx', 'version')],//版本
             ];
         }
         return $this->filterTypes;
     }
-}
+}

backendEle/src/views/ad/edit.vue

@@ -27,7 +27,8 @@
           </el-select>
         </el-form-item>
         <el-form-item label="Image"> <!-- 广告图片 -->
-          <leo-uploader :requestRoute="'ad/upload'" :defaultImageUrl="defaultImageUrl" width="400px" height="160px"
+          <leo-uploader :requestRoute="'ad/upload'" :defaultImageUrl="defaultImageUrl"
+                        width="400px" height="160px"
                         @on-success="handleSuccess"></leo-uploader>
         </el-form-item>
         <el-form-item>

common/config/params-swoole.php

@@ -1,4 +1,5 @@
 <?php
+$mainConfig = include  __DIR__. '/config-product.php';
 /**
  * Created by PhpStorm.
  * User: leo
@@ -37,4 +38,4 @@ return [
         'host'             => $mainConfig['swooleBonusClientConfig']['host'], 		//IP
         'port'             => $mainConfig['swooleBonusClientConfig']['port'],      		//端口
     ],
-];
+];

common/config/params.php

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

common/libs/dataList/DataList.php

@@ -253,7 +253,9 @@ class DataList extends Model
                     }
                 } elseif(is_array($column)) {
                     if(!isset($column['header'])){
-                        throw new Exception('column数组中必须存在header');
+                        //throw new Exception('column数组中必须存在header');
+                        $this->addError('header', \Yii::t('ctx', 'columnArrayMustExistHeader')); // 提交场景不存在
+                        return null;
                     }
                     if($key == 0){
                         if(!isset($column['hidden']) || !$column['hidden']){
@@ -425,11 +427,15 @@ class DataList extends Model
         } else {
             $admin = Admin::findOneAsArray('ID=:ID', [':ID'=>$userId]);
             if(!$admin){
-                throw new Exception('管理员不存在');
+                //throw new Exception('管理员不存在');
+                $this->addError('admin', \Yii::t('ctx', 'adminUserDoesNotExist')); // 提交场景不存在
+                return null;
             }
             $roleId = $admin['ROLE_ID'];
             if(!$roleId){
-                throw new Exception('管理组不存在');
+                //throw new Exception('管理组不存在');
+                $this->addError('roleid', \Yii::t('ctx', 'adminUserGroupDoesNotExist')); // 提交场景不存在
+                return null;
             }
         }
         // 如果是超级管理员直接返回不做处理
@@ -458,4 +464,4 @@ class DataList extends Model
             $this->columns = [];
         }
     }
-}
+}

common/libs/export/BaseExport.php

@@ -1470,4 +1470,4 @@ ORDER;
         $this->complete();
         return true;
     }
-}
+}

common/messages/en-US/ctx.php

@@ -78,6 +78,92 @@ return [
     'unableDelete' => 'Unable to delete',
 
 
+    #Log
+    'adminUserDoesNotExist'  => '管理员不存在',
+    'adminUserGroupDoesNotExist'  => '管理组不存在',
+    'columnArrayMustExistHeader'  => 'column数组中必须存在header',
+    'operatingType'  => 'Operation Type',
+    'operatingObject'  => '操作对象',
+    'objectNumber'  => '对象编号',
+    'requestContent'  => '请求内容',
+    'returnContent'  => '返回内容',
+    'operator'  => 'Operator',
+    'operatingTime'  => 'Operation Time',
+    'numberOfPhases'  => 'Number Of Periods',
+    'IPAddress'  => 'IP Address',
+    'client'  => 'Client',
+    'operatingSystem'  => 'Operating System',
+    'requestPath'  => 'Request Path',
+    'operationObjectNumber'  => 'Operation Object No',
+    'remarks'  => 'Remark',
+    'returnResult'  => '返回内容',
+    'successTimes'  => '登录成功次数',
+    'failTimes'  => '登录失败次数',
+    'loginSuccess'  => '登录成功',
+    'loginFail'  => '登录失败',
+    'adminLoginLog'  => '管理员登录日志',
+    'userLoginLog'  => '会员登录日志',
+    'version'  => '版本号',
+    'adminOperatingLog'  => '管理员操作日志',
+    'updateNumberOfPhasesConfig'  => '更新期数配置',
+    'updateLevelBonusConfig'  => '更新级别奖金配置',
+    'updateBonusConfig'  => '更新奖金配置',
+    'updateRankBonusConfig'  => '更新聘级奖金配置',
+    'updateTransferConfig'  => '更新转账配置',
+    'requestChangeUserBalance'  => '申请变动会员余额',
+    'checkUserBalance'  => '审核会员余额',
+    'batchRequestChangeUserBalance'  => '批量申请变动会员余额',
+    'blankEntry'  => '空单录入',
+    'delBlankUser'  => '删除空单会员',
+    'changeUserLevel'  => '修改会员级别',
+    'applyAdjustmentUserPerformance'  => '申请调整会员业绩',
+    'applyModifyUserStatus'  => '申请修改会员状态',
+    'setTeamLeaders'  => '设置团队领导人',
+    'checkUserStatus'  => '审核会员状态',
+    'displayMap'  => '显示图谱',
+    'hiddenMap'  => '隐藏图谱',
+    'setDeclarationCenter'  => '设置报单中心',
+    'cancelDeclarationCenter'  => '取消报单中心',
+    'userActivation'  => '会员激活',
+    'userLocking'  => '会员锁定',
+    'modifyUserInfo'  => '修改会员资料',
+    'editAdmin'  => '编辑管理员',
+    'applyRemoveNetwork'  => '申请移网',
+    'approveRemoveNetwork'  => '审核通过移网',
+    'resetPasswords'  => '重置密码',
+    'cancellationSystem'  => '撤销体系',
+    'addSystem'  => '添加体系',
+    'editSystem'  => '编辑体系',
+    'recoverySystem'  => '恢复体系',
+    'systemLog'  => '系统日志',
+    'call'  => '调用',
+    'beCcalled'  => '被调用',
+    'userOperatingLog'  => '会员操作日志',
+    'enableDisableAutomaticWithdrawal'  => 'Enable / Disable Automatic Withdrawal',
+    'enableDisableReSalesSMSReminder'  => 'Enable / Disable Re Sales SMS Reminder',
+    'memberTransfer'  => 'Member Transfer',
+    'memberWithdrawalApplication'  => 'Member Withdrawal Application',
+    'memberModificationInformation'  => 'Member Modification Information',
+    'modifyMasterPoint'  => 'Modify Master Point',
+    'periodNumber' => 'Period Number',
+    'serialNumber' => 'Serial Number',
+    'rank'  => 'Rank',
+
+    #Ad
+    'AdAddedSuccessfully' => '广告添加成功',
+    'EditAdSuccessfully' => '广告编辑成功',
+
+    #Article
+    'articleNotExists'  => '文章不存在',
+
+    #File
+    'mallManagement'    => 'Mall Management',
+    'memberManagement'  => 'Member Management',
+    'networkChart' => 'Network Chart',
+    'resaleManagement' => 'Resale management',
+    'bonusManagement' => 'Bonus management',
+    'financialManagement' => 'financial management',
+
     # 公用
     'amountUnit' => '₦',
     'sceneDoesNotExist' => 'Scene does not exist',
@@ -101,6 +187,10 @@ return [
     'invalidParameter' => 'Invalid Parameter',
     'dataDoesNotExists' => 'The data does not exist',
     'operationAdministrator' => 'Operation Administrator',
+    'typeError' => 'Type error',
+    'contentError' => 'Content error',
+    'hideSuccessfully' => 'hide successfully',
+    'UnhideSuccessfully' => 'Unhide successfully',
 
     # 会员
     'memberCode' => 'Member Code',
@@ -346,7 +436,7 @@ return [
     'failedToGenerateMemberNumber' => 'Failed to generate member number',
     'memberNumberDoesNotExist' => 'Member number does not exist',
     'repeatSalesMemberNoDoesNotExist' => 'Repeat sales Member No. does not exist',
-    
+
     'memberDoesNotInSamePlacementNetwork' => 'The member is not in the same placement network as the current user',
     'viewSubMembersMost' => 'View the top 20 sub members of the member at most',
     'upgradeMethodIncorrect' => 'The upgrade method is incorrect. Please contact the customer service personnel',
@@ -405,6 +495,89 @@ return [
     'transferDoesNotOpen' => '转账功能未启用',
     'transferTypeDoesNotExists' => '没有可用的转账类型',
     'rechargeApplicationHasBeenSubmitted' => 'Recharge application has been submitted, please wait for review.',
+//    'whetherStockist' => 'Whether Stockist',
+    'travelIncentive' => 'Travel Incentive',
+    'carIncentive' => 'Car Incentive',
+    'villaIncentive' => 'Villa Incentive',
+//    'joiningPeriod' => 'Joining Period',
+//    'phoneNumber' => 'Phone Number',
+//    'alternatePhoneNumber'  => 'Alternate Phone Number',
+    'requirePeriods' => '请填写期数',
+    'requireMemberNumber' => '请填写会员编号',
+    'payCycle' => 'Pay Cycle（PC）',
+//    'PCMemberLevel' => 'PC Member Level',
+//    'latestDirector' => 'Latest Director',
+//    'latestCrown' => 'Latest Crown',
+//    'joiningDate' => 'Joining Date',
+    'sponsorNo' => 'Sponsor No',
+    'sponsorName' => 'Sponsor Name',
+    'superiorCode' => 'Superior Code',
+    'superiorName' => 'Superior Name',
+    'superiorNumber' => 'Superior Number',
+    'welcomeBonus' => 'Welcome Bonus',
+    'teamBonus' => 'Team Bonus',
+    'uncappedTeamBonus' => 'Uncapped Team Bonus',
+    'directorBonus' => 'Director Bonus',
+    'stockistCommission' => 'Stockist Commission',
+    'quarterlyBonus' => 'Quarterly Bonus',
+    'actualBonus' => 'Actual Bonus',
+    'totalBonus' => 'Total Bonus',
+    'totalRevenue' => 'Total Revenue',
+    'bonusMonth' => 'Bonus Month',
+    'oneNewMarketPerformance' => 'I. new market performance',
+    'twoNewMarketPerformance' => 'II. new market performance',
+    'oneMarketBalancePerformance' => 'I. market balance performance',
+    'twoMarketBalancePerformance' => 'II. market balance performance',
+    'managementAward' => 'Management Award',
+    'bonusDate' => '结算时间',
+    'transactionType' => 'Transaction Type',
+    'memberLevel' => 'Member Level',
+    'balanceBeforeTransaction' => 'Balance Before Transaction',
+    'debitCredit' => 'Debit/Credit',
+    'newBalance' => 'New Balance',
+    'personalPerformance' => 'Personal Performance',
+    'remainderLeftLeg' => 'Remainder@Left Leg',
+    'remainderRightLeg' => 'Remainder@Right Leg',
+    'cumulativeTeamPerformance' => 'Cumulative Team Performance',
+    'salesNo' => 'Sales No',
+    'saleType' => 'Type',
+    'saleStatus' => 'Status',
+    'sponsorNoAtSettlement' => 'Sponsor No. At Settlement',
+    'sponsorNameAtSettlement' => 'Sponsor Name At Settlement',
+    'entryBV' => 'Entry BV',
+    'entryAmount' => 'Entry Amount',
+    'entryNo' => 'Entry No',
+    'orderSource' => 'Order Source',
+    'reviewed' => 'Reviewed',
+    'wastedisposal' => 'Waste disposal',
+    'whetherActive' => 'Whether Active',
+    'yes' => 'Yes',
+    'no' => 'No',
+    'declarationPerformance' => 'Declaration Performance',
+    'cancellationPerformance' => 'Cancellation Performance',
+    'LNewMarketPerformance' => 'L. New Market Performance',
+    'LNewPerformanceOfMarketEntry' => 'L. New Performance Of Market Entry',
+    'LNewPerformanceOfMarketReCancellation' => 'L. New Performance Of Market Re Cancellation',
+    'RNewMarketPerformance' => 'R. New Market Performance',
+    'RNewPerformanceOfMarketEntry' => 'R. New Performance Of Market Entry',
+    'RNewPerformanceOfMarketReCancellation' => 'R. New Performance Of Market Re Cancellation',
+    'LMarketBalancePerformance' => 'L. Market Balance Performance',
+    'RMarketBalancePerformance'=> 'R. Market Balance Performance',
+    'LMarketEntryBalancePerformance' => 'L. Market Entry Balance Performance',
+    'RMarketEntryBalancePerformance' => 'R. Market Entry Balance Performance',
+    'LMarketReconditioningBalancePerformance' => 'L. Market Reconditioning Balance Performance',
+    'RMarketReCancellationBalancePerformance' => 'R. Market Re Cancellation Balance Performance',
+    'teamPerformance' => 'Team Performance',
+    'recommenderNo' => 'Recommender No',
+    'recommenderName' => 'Recommender Name',
+    'directorRank' => 'Director Rank',
+    'directorPGSPerformance' => 'Director PGS Performance',
+    'LNewMarketEntryPerformance' => 'L. New Market Entry Performance',
+    'RNewMarketEntryPerformance' => 'R. New Market Entry Performance',
+    'LMarketMonthlyRemainingDeclarationPerformance' => 'L. Market Monthly Remaining Declaration Performance',
+    'RMarketMonthlyRemainingDeclarationPerformance' => 'R. Market Monthly Remaining Declaration Performance',
+    'monthlyNewTeamPerformance' => 'Monthly New Team Performance',
+    'monthlyCumulativeTeamPerformance' => 'Monthly Cumulative Team Performance',
 
     # 设置
     'autoWithdrawHasBeenClosed' => '开启关闭自动提现成功',
@@ -434,7 +607,7 @@ return [
 
     # 登录
     'refreshTokenFailed' => 'refresh token failed',
-    
+
     'accountDoesNotExist' => 'The account does not exist',
     'memberNameOrPasswordIncorrect' => 'The member name or password is incorrect',
     'abnormalMemberCode' => 'Abnormal member code',
@@ -454,4 +627,4 @@ return [
 
 
 
-];
+];

common/messages/zh-CN/ctx.php

@@ -77,6 +77,90 @@ return [
     'modifyTransactionTypeCompleted' => '修改交易类型完成',
     'unableDelete' => '无法删除',
 
+    #Log
+    'adminUserDoesNotExist'  => '管理员不存在',
+    'adminUserGroupDoesNotExist'  => '管理组不存在',
+    'columnArrayMustExistHeader'  => 'column数组中必须存在header',
+    'operatingType'  => '操作类型',
+    'operatingObject'  => '操作对象',
+    'objectNumber'  => '对象编号',
+    'requestContent'  => '请求内容',
+    'returnContent'  => '返回内容',
+    'operator'  => '操作人',
+    'operatingTime'  => '操作时间',
+    'numberOfPhases'  => '期数',
+    'IPAddress'  => 'IP地址',
+    'client'  => '客户端',
+    'operatingSystem'  => '操作系统',
+    'requestPath'  => '请求路径',
+    'operationObjectNumber'  => '操作对象编号',
+    'remarks'  => '备注',
+    'returnResult'  => '返回内容',
+    'successTimes'  => '登录成功次数',
+    'failTimes'  => '登录失败次数',
+    'loginSuccess'  => '登录成功',
+    'loginFail'  => '登录失败',
+    'adminLoginLog'  => '管理员登录日志',
+    'userLoginLog'  => '会员登录日志',
+    'version'  => '版本号',
+    'adminOperatingLog'  => '管理员操作日志',
+    'updateNumberOfPhasesConfig'  => '更新期数配置',
+    'updateLevelBonusConfig'  => '更新级别奖金配置',
+    'updateBonusConfig'  => '更新奖金配置',
+    'updateRankBonusConfig'  => '更新聘级奖金配置',
+    'updateTransferConfig'  => '更新转账配置',
+    'requestChangeUserBalance'  => '申请变动会员余额',
+    'checkUserBalance'  => '审核会员余额',
+    'batchRequestChangeUserBalance'  => '批量申请变动会员余额',
+    'blankEntry'  => '空单录入',
+    'delBlankUser'  => '删除空单会员',
+    'changeUserLevel'  => '修改会员级别',
+    'applyAdjustmentUserPerformance'  => '申请调整会员业绩',
+    'applyModifyUserStatus'  => '申请修改会员状态',
+    'setTeamLeaders'  => '设置团队领导人',
+    'checkUserStatus'  => '审核会员状态',
+    'displayMap'  => '显示图谱',
+    'hiddenMap'  => '隐藏图谱',
+    'setDeclarationCenter'  => '设置报单中心',
+    'cancelDeclarationCenter'  => '取消报单中心',
+    'userActivation'  => '会员激活',
+    'userLocking'  => '会员锁定',
+    'modifyUserInfo'  => '修改会员资料',
+    'editAdmin'  => '编辑管理员',
+    'applyRemoveNetwork'  => '申请移网',
+    'approveRemoveNetwork'  => '审核通过移网',
+    'resetPasswords'  => '重置密码',
+    'cancellationSystem'  => '撤销体系',
+    'addSystem'  => '添加体系',
+    'editSystem'  => '编辑体系',
+    'recoverySystem'  => '恢复体系',
+    'systemLog'  => '系统日志',
+    'call'  => '调用',
+    'beCcalled'  => '被调用',
+    'userOperatingLog'  => '会员操作日志',
+    'enableDisableAutomaticWithdrawal'  => '开启关闭自动提现',
+    'enableDisableReSalesSMSReminder'  => '开启关闭复销短信提醒',
+    'memberTransfer'  => '会员转账',
+    'memberWithdrawalApplication'  => '会员提现申请',
+    'memberModificationInformation'  => '会员修改资料',
+    'modifyMasterPoint'  => '修改主点位',
+    'periodNumber'  => '期数',
+
+    #Ad
+    'AdAddedSuccessfully' => '广告添加成功',
+    'EditAdSuccessfully' => '广告编辑成功',
+
+    #Article
+    'articleNotExists'  => '文章不存在',
+
+    #File
+    'mallManagement'    => '商城管理',
+    'memberManagement'  => '会员管理',
+    'networkChart'  => '网络图谱',
+    'resaleManagement'  => '复销管理',
+    'bonusManagement'  => '奖金管理',
+    'financialManagement' => '财务管理',
+
     # 公用
     'amountUnit' => '元',
     'sceneDoesNotExist' => '场景不存在',
@@ -211,24 +295,24 @@ return [
     'whetherToMove' => '是否正在移动',
     'percentage' => '移动百分比',
     'AdministratorOfMoving' => '移网管理员',
-    'joiningDate' => '加入日期',
-    'joiningPeriod' => '加入期数',
+//    'joiningDate' => '加入日期',
+//    'joiningPeriod' => '加入期数',
     'currentMemberLevel' => '实时会员级别',
     'currentAdjustmentDate' => '实时调整日期',
-    'PCMemberLevel' => '结算时会员级别',
+//    'PCMemberLevel' => '结算时会员级别',
     'highestDirector' => '最高管理星级',
-    'latestDirector' => '最新管理星级',
+//    'latestDirector' => '最新管理星级',
     'highestCrown' => '最高皇冠星级',
-    'latestCrown' => '最新皇冠星级',
+//    'latestCrown' => '最新皇冠星级',
     'recommendationNo' => '推荐编号',
     'recommendedName' => '推荐姓名',
     'placementNo' => '安置编号',
     'placementName' => '安置姓名',
     'resettlementArea' => '安置区域',
-    'phoneNumber' => '手机号码',
-    'alternatePhoneNumber' => '备用手机号码',
+//    'phoneNumber' => '手机号码',
+//    'alternatePhoneNumber' => '备用手机号码',
     'stockistCode' => '所属报单中心编号',
-    'whetherStockist' => '是否报单中心',
+//    'whetherStockist' => '是否报单中心',
     'stockistOrNot' => '是否报单中心',
     'whetherChartDisplay' => '是否显示图谱',
     'whetherRechargeDisplay' => '是否显示充值',
@@ -248,6 +332,10 @@ return [
     # 网络
     'placementNetwork' => '安置网络',
     'sponsorNetwork' => '开拓网络',
+    'typeError' => '类型错误',
+    'contentError' => '内容错误',
+    'hideSuccessfully' => '隐藏成功',
+    'UnhideSuccessfully' => '取消隐藏成功',
 
 
     /**【以下内容为会员端词条，如果管理端有相同词条，移入分割线之上使用即可，翻译完全部项目之后删除以下内容】
@@ -351,7 +439,7 @@ return [
     'failedToGenerateMemberNumber' => '会员编号生成失败',
     'memberNumberDoesNotExist' => '会员编号不存在',
     'repeatSalesMemberNoDoesNotExist' => '复消会员编号不存在',
-    
+
     'memberDoesNotInSamePlacementNetwork' => '会员与当前用户不再同一安置网络内',
     'viewSubMembersMost' => '最多查看会员的前20层子会员',
     'upgradeMethodIncorrect' => '升级方式不正确，请联系客服人员',
@@ -410,6 +498,91 @@ return [
     'transferDoesNotOpen' => '转账功能未启用',
     'transferTypeDoesNotExists' => '没有可用的转账类型',
     'rechargeApplicationHasBeenSubmitted' => '充值申请已提交，请等待审核',
+    'whetherStockist' => '是否报单中心',
+    'travelIncentive' => '旅游积分',
+    'carIncentive' => '车积分',
+    'villaIncentive' => '房积分',
+    'joiningPeriod' => '加入期数',
+    'phoneNumber' => '手机号码',
+    'alternatePhoneNumber' => '备用手机号码',
+    'requirePeriods' => '请填写期数',
+    'requireMemberNumber' => '请填写会员编号',
+    'payCycle' => '结算期数',
+    'PCMemberLevel' => '结算时会员级别',
+    'latestDirector' => '结算时会员最新管理星级',
+    'latestCrown' => '结算时会员最新皇冠星级',
+    'joiningDate' => '加入时间',
+    'sponsorNo' => '开拓者编号',
+    'sponsorName' => '开拓者姓名',
+    'superiorCode' => '上级编号',
+    'superiorName' => '上级姓名',
+    'welcomeBonus' => '销售奖金',
+    'teamBonus' => '绩效奖金',
+    'uncappedTeamBonus' => '绩效奖未封顶金额',
+    'directorBonus' => '管理奖/蓝星奖',
+    'stockistCommission' => '服务奖',
+    'quarterlyBonus' => '季度分红',
+    'actualBonus' => '实发奖金',
+    'totalBonus' => '总奖金',
+    'totalRevenue' => '总收入',
+    'bonusMonth' => '结算月',
+    'superiorNumber' => '上级编号',
+    'oneNewMarketPerformance' => '一市场新增业绩',
+    'twoNewMarketPerformance' => '二市场新增业绩',
+    'oneMarketBalancePerformance' => '一市场结余业绩',
+    'twoMarketBalancePerformance' => '二市场结余业绩',
+    'managementAward' => '管理奖',
+    'bonusDate' => '结算时间',
+    'transactionType' => '交易类型',
+    'memberLevel' => '会员级别',
+    'balanceBeforeTransaction' => '交易前余额',
+    'debitCredit' => '交易额',
+    'newBalance' => '交易后余额',
+    'serialNumber' => '流水号',
+    'rank' => '聘级',
+    'personalPerformance' => '个人业绩',
+    'remainderLeftLeg' => '一市场剩余业绩',
+    'remainderRightLeg' => '二市场剩余业绩',
+    'cumulativeTeamPerformance' => '累计团队业绩',
+    'salesNo' => '业绩单编号',
+    'saleType' => '业绩单类型',
+    'saleStatus' => '业绩单状态',
+    'sponsorNoAtSettlement' => '结算时开拓者编号',
+    'sponsorNameAtSettlement' => '结算时开拓者姓名',
+    'entryBV' => '报单BV',
+    'entryAmount' => '报单金额',
+    'entryNo' => '报单编号',
+    'orderSource' => 'Order Source',
+    'reviewed' => '已审核',
+    'wastedisposal' => '置废',
+    'whetherActive' => '是否活跃',
+    'yes' => '是',
+    'no' => '否',
+    'declarationPerformance' => '报单业绩',
+    'cancellationPerformance' => '复消业绩',
+    'LNewMarketPerformance' => '一市场新增业绩',
+    'LNewPerformanceOfMarketEntry' => '一市场报单新增业绩',
+    'LNewPerformanceOfMarketReCancellation' => '一市场复消新增业绩',
+    'RNewMarketPerformance' => '二市场新增业绩',
+    'RNewPerformanceOfMarketEntry' => '二市场报单新增业绩',
+    'RNewPerformanceOfMarketReCancellation' => '二市场复消新增业绩',
+    'LMarketBalancePerformance' => '一市场结余业绩',
+    'RMarketBalancePerformance' => '二市场结余业绩',
+    'LMarketEntryBalancePerformance' => '一市场报单结余业绩',
+    'RMarketEntryBalancePerformance' => '二市场报单结余业绩',
+    'LMarketReconditioningBalancePerformance' => '一市场复消结余业绩',
+    'RMarketReCancellationBalancePerformance' => '二市场复消结余业绩',
+    'teamPerformance' => '团队业绩',
+    'recommenderNo' => '推荐人编号',
+    'recommenderName' => '推荐人姓名',
+    'directorRank' => '结算时会员聘级',
+    'directorPGSPerformance' => '管理奖个人小组业绩',
+    'LNewMarketEntryPerformance' => '一市场新增报单业绩',
+    'RNewMarketEntryPerformance' => '二市场新增报单业绩',
+    'LMarketMonthlyRemainingDeclarationPerformance' => '一市场月剩余报单业绩',
+    'RMarketMonthlyRemainingDeclarationPerformance' => '二市场月剩余报单业绩',
+    'monthlyNewTeamPerformance' => '月新增团队业绩',
+    'monthlyCumulativeTeamPerformance' => '月累计团队业绩',
 
     # 设置
     'autoWithdrawHasBeenClosed' => '开启关闭自动提现成功',
@@ -444,7 +617,6 @@ return [
 
     # 登录
     'refreshTokenFailed' => '刷新token失败',
-    
     'wrongTransactionType' => '错误的交易类型',
     'accountDoesNotExist' => '账号不存在',
     'memberNameOrPasswordIncorrect' => '用户名或密码错误',
@@ -458,4 +630,4 @@ return [
 
 
 
-];
+];

common/models/forms/AdForm.php

@@ -96,7 +96,7 @@ class AdForm extends Model
      */
     public function isType($attribute){
         if(!in_array($this->type, [Ad::TYPE_LINK, Ad::TYPE_ARTICLE])){
-            $this->addError($attribute, 'Type error'); // 类型错误
+            $this->addError($attribute, \Yii::t('ctx', 'typeError')); // 类型错误
         }
     }
 
@@ -106,7 +106,7 @@ class AdForm extends Model
      */
     public function isContent($attribute){
         if($this->content == ""){
-            $this->addError($attribute, 'Content error'); // 内容错误
+            $this->addError($attribute, \Yii::t('ctx', 'contentError')); // 内容错误
         }
     }
 
@@ -132,7 +132,7 @@ class AdForm extends Model
                 $model->UPDATE_ADMIN = \Yii::$app->user->id;
                 $model->UPDATED_AT = Date::nowTime();
             } else {
-                $this->addError('edit', '提交场景不存在');
+                $this->addError('edit', \Yii::t('ctx', 'submissionDoesNotExist'));
                 return null;
             }
             $model->TITLE = $this->title;

common/models/forms/ArticleForm.php

@@ -79,7 +79,7 @@ class ArticleForm extends Model
             }  elseif($this->scenario == 'sort') {
                 $model = Article::findOne(['ID'=>$this->id]);
             } else {
-                $this->addError('edit', 'Scenario not exists');// 提交场景不存在
+                $this->addError('edit', \Yii::t('ctx', 'sceneDoesNotExist'));// 提交场景不存在
                 return null;
             }
             $model->TITLE = $this->title;