merge feature/new-backend-adaptation

backendApi/config/menu.php

@@ -20,6 +20,7 @@ return [
         'show'=>1,
         'wiki' => 'dashboard',
         'child'=>[
+            ['name'=>'首页', 'class'=>'', 'icon'=>'', 'controller'=>'dashboard', 'action'=>'index', 'routePath'=>'dashboard/index', 'show'=>0,],
 //            ['name'=>'总累计', 'class'=>'', 'icon'=>'', 'controller'=>'dashboard', 'action'=>'total-item', 'routePath'=>'dashboard/total-item', 'show'=>0,],
 //            ['name'=>'会员月注册数量', 'class'=>'', 'icon'=>'', 'controller'=>'dashboard', 'action'=>'reg-num', 'routePath'=>'dashboard/reg-num', 'show'=>0,],
 //            ['name'=>'月奖金量', 'class'=>'', 'icon'=>'', 'controller'=>'dashboard', 'action'=>'bonus-num', 'routePath'=>'dashboard/bonus-num', 'show'=>0,],
@@ -203,7 +204,7 @@ return [
             ['name'=>'生成业绩单', 'class'=>'', 'icon'=>'', 'controller'=>'bonus', 'action'=>'perf-period', 'routePath'=>'bonus/perf-period', 'show'=>0,],
             ['name'=>'结算操作', 'class'=>'', 'icon'=>'', 'controller'=>'bonus', 'action'=>'calc-period', 'routePath'=>'bonus/calc-period', 'show'=>0,],
             ['name'=>'挂网操作', 'class'=>'', 'icon'=>'', 'controller'=>'bonus', 'action'=>'send-period', 'routePath'=>'bonus/send-period', 'show'=>0,],
-            ['name'=>'Member bonus balance', 'class'=>'', 'icon'=>'', 'controller'=>'bonus', 'action'=>'balance-list', 'routePath'=>'bonus/balance-list', 'show'=>1, 'wiki' => 'memberBonusBalance'],//会员奖金余额
+            ['name'=>'Member bonus balance', 'class'=>'', 'icon'=>'', 'controller'=>'bonus', 'action'=>'balance-list', 'routePath'=>'bonus/balance-list', 'show'=>1, 'wiki' => 'memberBonusBalance'],//会员账户余额
             ['name'=>'会员奖金余额导出', 'class'=>'', 'icon'=>'', 'controller'=>'bonus', 'action'=>'balance-export', 'routePath'=>'bonus/balance-export', 'show'=>0,],
 //            ['name'=>'申请发放年度奖', 'class'=>'', 'icon'=>'', 'controller'=>'bonus', 'action'=>'cf-lx-apply', 'routePath'=>'bonus/cf-lx-apply', 'show'=>0,],
 //            ['name'=>'年度奖金发放审核', 'class'=>'', 'icon'=>'', 'controller'=>'bonus', 'action'=>'cf-lx-audit-list', 'routePath'=>'bonus/cf-lx-audit-list', 'show'=>1,],
@@ -338,7 +339,11 @@ return [
 //            ['name'=>'提现管理-提现已付款', 'class'=>'', 'icon'=>'', 'controller'=>'finance', 'action'=>'withdraw-6', 'routePath'=>'finance/withdraw-6', 'show'=>0,],
 //            ['name'=>'提现管理-付款失败', 'class'=>'', 'icon'=>'', 'controller'=>'finance', 'action'=>'withdraw-4', 'routePath'=>'finance/withdraw-4', 'show'=>0,],
 //            ['name'=>'提现管理-提现退回', 'class'=>'', 'icon'=>'', 'controller'=>'finance', 'action'=>'withdraw-7', 'routePath'=>'finance/withdraw-7', 'show'=>0,],
-            ['name'=>'Review withdrawal info', 'class'=>'', 'icon'=>'', 'controller'=>'finance', 'action'=>'withdraw-status', 'routePath'=>'finance/withdraw-status', 'show'=>0], // 审核提现信息
+            ['name'=>'Review withdrawal info', 'class'=>'', 'icon'=>'', 'controller'=>'finance', 'action'=>'withdraw-status', 'routePath'=>'finance/withdraw-status', 'show'=>0,], // 审核提现信息
+            ['name'=>'提现审核', 'class'=>'', 'icon'=>'', 'controller'=>'finance', 'action'=>'withdraw-status-audit', 'routePath'=>'finance/withdraw-status-audit', 'show'=>0,],
+            ['name'=>'提现退回', 'class'=>'', 'icon'=>'', 'controller'=>'finance', 'action'=>'withdraw-status-return', 'routePath'=>'finance/withdraw-status-return', 'show'=>0,],
+            ['name'=>'提现付款', 'class'=>'', 'icon'=>'', 'controller'=>'finance', 'action'=>'withdraw-status-pay', 'routePath'=>'finance/withdraw-status-pay', 'show'=>0,],
+            ['name'=>'提现取消', 'class'=>'', 'icon'=>'', 'controller'=>'finance', 'action'=>'withdraw-status-cancel', 'routePath'=>'finance/withdraw-status-cancel', 'show'=>0,],
             //['name'=>'发票信息添加', 'class'=>'', 'icon'=>'', 'controller'=>'finance', 'action'=>'invoice-audit-add', 'routePath'=>'finance/invoice-audit-add', 'show'=>0,],
             //['name'=>'发票信息编辑', 'class'=>'', 'icon'=>'', 'controller'=>'finance', 'action'=>'invoice-audit-edit', 'routePath'=>'finance/invoice-audit-edit', 'show'=>0,],
             //['name'=>'标记付款失败批量1导入', 'class'=>'', 'icon'=>'', 'controller'=>'finance', 'action'=>'import-withdraws-to-excel-table', 'routePath'=>'finance/import-withdraws-to-excel-table', 'show'=>0,],
@@ -374,10 +379,10 @@ return [
         'show'=>1,
         'wiki' => 'articleManagement',
         'child'=>[
-            ['name'=>'Category Management', 'class'=>'', 'icon'=>'', 'controller'=>'article', 'action'=>'category', 'routePath'=>'article/category', 'show'=>1, 'wiki' => 'categoryManagement'],//分类管理
-            ['name'=>'添加分类', 'class'=>'', 'icon'=>'', 'controller'=>'article', 'action'=>'category-add', 'routePath'=>'article/category-add', 'show'=>0,],
-            ['name'=>'删除分类', 'class'=>'', 'icon'=>'', 'controller'=>'article', 'action'=>'category-delete', 'routePath'=>'article/category-delete', 'show'=>0,],
-            ['name'=>'分类排序', 'class'=>'', 'icon'=>'', 'controller'=>'article', 'action'=>'category-sort', 'routePath'=>'article/category-sort', 'show'=>0,],
+//            ['name'=>'Category Management', 'class'=>'', 'icon'=>'', 'controller'=>'article', 'action'=>'category', 'routePath'=>'article/category', 'show'=>1, 'wiki' => 'categoryManagement'],//分类管理
+//            ['name'=>'添加分类', 'class'=>'', 'icon'=>'', 'controller'=>'article', 'action'=>'category-add', 'routePath'=>'article/category-add', 'show'=>0,],
+//            ['name'=>'删除分类', 'class'=>'', 'icon'=>'', 'controller'=>'article', 'action'=>'category-delete', 'routePath'=>'article/category-delete', 'show'=>0,],
+//            ['name'=>'分类排序', 'class'=>'', 'icon'=>'', 'controller'=>'article', 'action'=>'category-sort', 'routePath'=>'article/category-sort', 'show'=>0,],
             ['name'=>'Article Management', 'class'=>'', 'icon'=>'', 'controller'=>'article', 'action'=>'index', 'routePath'=>'article/index', 'show'=>1, 'wiki' => 'articleManagement'],//文章列表
             ['name'=>'添加文章', 'class'=>'', 'icon'=>'', 'controller'=>'article', 'action'=>'add', 'routePath'=>'article/add', 'show'=>0,],
             ['name'=>'编辑文章', 'class'=>'', 'icon'=>'', 'controller'=>'article', 'action'=>'edit', 'routePath'=>'article/edit', 'show'=>0,],
@@ -495,8 +500,9 @@ return [
             ['name'=>'站点设置', 'class'=>'', 'icon'=>'', 'controller'=>'config', 'action'=>'base', 'routePath'=>'config/base', 'show'=>1, 'wiki' => 'siteConfig'],
             ['name'=>'奖金设置', 'class'=>'', 'icon'=>'', 'controller'=>'config', 'action'=>'bonus-opt', 'routePath'=>'config/bonus-opt', 'show'=>1, 'wiki' => 'bonusConfig'],
             ['name'=>'奖金基本配置', 'class'=>'', 'icon'=>'', 'controller'=>'config', 'action'=>'bonus', 'routePath'=>'config/bonus', 'show'=>0,],
-//            ['name'=>'区域/复销奖配置', 'class'=>'', 'icon'=>'', 'controller'=>'config', 'action'=>'bonus-dec-level', 'routePath'=>'config/bonus-dec-level', 'show'=>0,],
-//            ['name'=>'育成/车房/养老配置', 'class'=>'', 'icon'=>'', 'controller'=>'config', 'action'=>'bonus-emp-level', 'routePath'=>'config/bonus-emp-level', 'show'=>0,],
+            ['name'=>'皇冠星级配置', 'class'=>'', 'icon'=>'', 'controller'=>'config', 'action'=>'bonus-dec-level', 'routePath'=>'config/bonus-crown-level', 'show'=>0,],
+            ['name'=>'级别配置', 'class'=>'', 'icon'=>'', 'controller'=>'config', 'action'=>'bonus-dec-level', 'routePath'=>'config/bonus-dec-level', 'show'=>0,],
+            ['name'=>'管理星级配置', 'class'=>'', 'icon'=>'', 'controller'=>'config', 'action'=>'bonus-emp-level', 'routePath'=>'config/bonus-emp-level', 'show'=>0,],
 //            ['name'=>'期数配置', 'class'=>'', 'icon'=>'', 'controller'=>'config', 'action'=>'period', 'routePath'=>'config/period', 'show'=>1,],
 //            ['name'=>'会员注册类型配置', 'class'=>'', 'icon'=>'', 'controller'=>'config', 'action'=>'reg-type', 'routePath'=>'config/reg-type', 'show'=>1,],
 //            ['name'=>'会员注册类型编辑', 'class'=>'', 'icon'=>'', 'controller'=>'config', 'action'=>'reg-type-edit', 'routePath'=>'config/reg-type-edit', 'show'=>0,],
@@ -505,18 +511,18 @@ return [
 //            ['name'=>'OCR接口编辑', 'class'=>'', 'icon'=>'', 'controller'=>'config', 'action'=>'ocr-api-edit', 'routePath'=>'config/ocr-api-edit', 'show'=>0,],
 //            ['name'=>'短信接口编辑', 'class'=>'', 'icon'=>'', 'controller'=>'config', 'action'=>'ocr-api-edit', 'routePath'=>'config/ocr-api-edit', 'show'=>0,],
 //            ['name'=>'短信管理', 'class'=>'', 'icon'=>'', 'controller'=>'config', 'action'=>'sms', 'routePath'=>'config/sms', 'show'=>1,],
-            ['name'=>'积分配置', 'class'=>'', 'icon'=>'', 'controller'=>'config', 'action'=>'score', 'routePath'=>'config/score', 'show'=>1, 'wiki' => 'scoreConfig'],
+//            ['name'=>'积分配置', 'class'=>'', 'icon'=>'', 'controller'=>'config', 'action'=>'score', 'routePath'=>'config/score', 'show'=>1, 'wiki' => 'scoreConfig'],
             ['name'=>'转账配置', 'class'=>'', 'icon'=>'', 'controller'=>'config', 'action'=>'transfer', 'routePath'=>'config/transfer', 'show'=>1, 'wiki' => 'transferConfig'],
             ['name'=>'汇率配置', 'class'=>'', 'icon'=>'', 'controller'=>'config', 'action'=>'exchange-rate', 'routePath'=>'config/exchange-rate', 'show'=>1,  'wiki' => 'exchangeRateConfig'],
             ['name'=>'其他配置', 'class'=>'', 'icon'=>'', 'controller'=>'config', 'action'=>'other', 'routePath'=>'config/other', 'show'=>1, 'wiki' => 'otherConfig'],
             ['name'=>'会员级别配置', 'class'=>'', 'icon'=>'', 'controller'=>'config', 'action'=>'dec-level', 'routePath'=>'config/dec-level', 'show'=>1, 'wiki' => 'decLevelConfig'],
             ['name'=>'添加会员级别', 'class'=>'', 'icon'=>'', 'controller'=>'config', 'action'=>'dec-level-add', 'routePath'=>'config/dec-level-add', 'show'=>0,],
             ['name'=>'编辑会员级别', 'class'=>'', 'icon'=>'', 'controller'=>'config', 'action'=>'dec-level-edit', 'routePath'=>'config/dec-level-edit', 'show'=>0,],
-            ['name'=>'会员聘级配置', 'class'=>'', 'icon'=>'', 'controller'=>'config', 'action'=>'emp-level', 'routePath'=>'config/emp-level', 'show'=>1, 'wiki' => 'empLevelConfig'],
-            ['name'=>'添加会员聘级', 'class'=>'', 'icon'=>'', 'controller'=>'config', 'action'=>'emp-level-add', 'routePath'=>'config/emp-level-add', 'show'=>0,],
-            ['name'=>'编辑会员聘级', 'class'=>'', 'icon'=>'', 'controller'=>'config', 'action'=>'emp-level-edit', 'routePath'=>'config/emp-level-edit', 'show'=>0,],
+//            ['name'=>'会员聘级配置', 'class'=>'', 'icon'=>'', 'controller'=>'config', 'action'=>'emp-level', 'routePath'=>'config/emp-level', 'show'=>1, 'wiki' => 'empLevelConfig'],
+//            ['name'=>'添加会员聘级', 'class'=>'', 'icon'=>'', 'controller'=>'config', 'action'=>'emp-level-add', 'routePath'=>'config/emp-level-add', 'show'=>0,],
+//            ['name'=>'编辑会员聘级', 'class'=>'', 'icon'=>'', 'controller'=>'config', 'action'=>'emp-level-edit', 'routePath'=>'config/emp-level-edit', 'show'=>0,],
             ['name'=>'报单中心级别配置', 'class'=>'', 'icon'=>'', 'controller'=>'config', 'action'=>'dec-role', 'routePath'=>'config/dec-role', 'show'=>1, 'wiki' => 'decRoleConfig'],
             ['name'=>'编辑报单中心级别', 'class'=>'', 'icon'=>'', 'controller'=>'config', 'action'=>'dec-role-edit', 'routePath'=>'config/dec-role-edit', 'show'=>0,],
         ],
     ],
-];
+];

backendApi/config/urlManagerRules.php

@@ -291,7 +291,7 @@ return [
             'POST emp-level-delete' => 'emp-level-delete',
             'POST bonus-dec-level' => 'bonus-dec-level',
             'POST bonus-emp-level' => 'bonus-emp-level',
-            'POST bonus-star-level' => 'bonus-star-level',
+            'POST bonus-crown-level' => 'bonus-crown-level',
             'GET clear-data' => 'clear-data',
             'GET clear-cache' => 'clear-cache',
             'GET clear-table-cache' => 'clear-table-cache',

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
@@ -453,4 +454,4 @@ class BaseController extends \yii\rest\ActiveController {
             'request' => $request,
         ];
     }
-}
+}

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/ConfigController.php

@@ -76,7 +76,7 @@ class ConfigController extends BaseController {
         if (Yii::$app->request->post() && $form->load(Yii::$app->request->post(), '')) {
             if ($form->updateBase()) {
                 Config::updateToCache();
-                return static::notice('更新站点设置成功');
+                return static::notice(Yii::t('ctx', 'successfully'));
             } else {
                 return static::notice(Form::formatErrorsForApi($form->getErrors()), 422);
             }
@@ -140,7 +140,7 @@ class ConfigController extends BaseController {
         if (Yii::$app->request->post() && $form->load(Yii::$app->request->post(), '')) {
             if ($form->updateBonus()) {
                 Config::updateToCache();
-                return static::notice('更新奖金配置成功');
+                return static::notice(Yii::t('ctx', 'successfully'));
             } else {
                 return static::notice(Form::formatErrorsForApi($form->getErrors()), 422);
             }
@@ -158,7 +158,7 @@ class ConfigController extends BaseController {
         if (Yii::$app->request->post() && $form->load(Yii::$app->request->post(), '')) {
             if ($form->updateBonus()) {
                 DeclarationLevel::updateToCache();
-                return static::notice('更新级别奖金配置成功');
+                return static::notice(Yii::t('ctx', 'successfully'));
             } else {
                 return static::notice(Form::formatErrorsForApi($form->getErrors()), 422);
             }
@@ -176,7 +176,7 @@ class ConfigController extends BaseController {
         if (Yii::$app->request->post() && $form->load(Yii::$app->request->post(), '')) {
             if ($form->updateBonus()) {
                 Cache::updateEmpLevelConfig();
-                return static::notice('更新聘级奖金配置成功');
+                return static::notice(Yii::t('ctx', 'successfully'));
             } else {
                 return static::notice(Form::formatErrorsForApi($form->getErrors()), 422);
             }
@@ -194,7 +194,7 @@ class ConfigController extends BaseController {
         if (Yii::$app->request->post() && $form->load(Yii::$app->request->post(), '')) {
             if ($form->updateBonus()) {
                 StarCrownLevel::updateToCache();
-                return static::notice('更新星级奖金配置成功');
+                return static::notice(Yii::t('ctx', 'successfully'));
             } else {
                 return static::notice(Form::formatErrorsForApi($form->getErrors()), 422);
             }
@@ -375,7 +375,7 @@ class ConfigController extends BaseController {
         if (Yii::$app->request->post() && $form->load(Yii::$app->request->post(), '')) {
             if ($form->updateTransfer()) {
                 Config::updateToCache();
-                return static::notice('更新转账配置成功');
+                return static::notice(Yii::t('ctx', 'successfully'));
             } else {
                 return static::notice(Form::formatErrorsForApi($form->getErrors()), 422);
             }
@@ -439,7 +439,7 @@ class ConfigController extends BaseController {
         if (Yii::$app->request->post() && $form->load(Yii::$app->request->post(), '')) {
             if ($form->updateOther()) {
                 Config::updateToCache();
-                return static::notice('更新其他配置成功');
+                return static::notice(Yii::t('ctx', 'successfully'));
             } else {
                 return static::notice(Form::formatErrorsForApi($form->getErrors()), 422);
             }
@@ -530,7 +530,7 @@ class ConfigController extends BaseController {
                 return static::notice('操作失败，请重试');
             }
         }
-        return static::notice('Illegal request'); // 非法请求
+        return static::notice(Yii::t('ctx', 'illegalRequest'), 405);
     }
 
     /**
@@ -553,7 +553,7 @@ class ConfigController extends BaseController {
     public function actionDecRoleEdit() {
         $id = Yii::$app->request->get('id');
         if (Yii::$app->request->isPost) {
-            return static::edit(DecRoleForm::class, '报单中心级别修改成功', null, null, null, function () {
+            return static::edit(DecRoleForm::class, Yii::t('ctx', 'successfully'), null, null, null, function () {
                 DecRole::updateToCache();
             });
         }
@@ -568,12 +568,12 @@ class ConfigController extends BaseController {
      */
     public function actionDecLevelAdd() {
         if (Yii::$app->request->isPost) {
-            return static::edit(DecLevelForm::class, '会员级别添加成功', null, null, null, function () {
+            return static::edit(DecLevelForm::class, Yii::t('ctx', 'successfully'), null, null, null, function () {
                 DeclarationLevel::updateToCache();
                 // Log::adminHandle('添加会员级别', 1);
             });
         }
-        return static::notice('非发请求', 405);
+        return static::notice(Yii::t('ctx', 'illegalRequest'), 405);
     }
 
     /**
@@ -584,7 +584,7 @@ class ConfigController extends BaseController {
     public function actionDecLevelEdit() {
         $id = Yii::$app->request->get('id');
         if (Yii::$app->request->isPost) {
-            return static::edit(DecLevelForm::class, '会员级别修改成功', null, null, null, function () {
+            return static::edit(DecLevelForm::class, Yii::t('ctx', 'successfully'), null, null, null, function () {
                 DeclarationLevel::updateToCache();
                 // Log::adminHandle('编辑报单级别参数', 1);
             });
@@ -630,7 +630,7 @@ class ConfigController extends BaseController {
      */
     public function actionEmpLevelAdd() {
         if (Yii::$app->request->isPost) {
-            return static::edit(EmployLevelForm::class, '会员聘级添加成功', null, null, null, function () {
+            return static::edit(EmployLevelForm::class, Yii::t('ctx', 'successfully'), null, null, null, function () {
                 EmployLevel::updateToCache();
                 // Log::adminHandle('添加会员聘级', 1);
             });
@@ -648,7 +648,7 @@ class ConfigController extends BaseController {
     public function actionEmpLevelEdit() {
         $id = Yii::$app->request->get('id');
         if (Yii::$app->request->isPost) {
-            return static::edit(EmployLevelForm::class, '会员聘级修改成功', null, null, null, function () {
+            return static::edit(EmployLevelForm::class, Yii::t('ctx', 'successfully'), null, null, null, function () {
                 EmployLevel::updateToCache();
                 // Log::adminHandle('编辑会员聘级', 1);
             });
@@ -718,7 +718,7 @@ class ConfigController extends BaseController {
      */
     public function actionWithdrawLevelAdd() {
         if (Yii::$app->request->isPost) {
-            return static::edit(WithdrawLevelForm::class, '提现金额等级添加成功', null, null, null, function () {
+            return static::edit(WithdrawLevelForm::class, Yii::t('ctx', 'successfully'), null, null, null, function () {
                 WithdrawLevel::updateToCache();
                 // Log::adminHandle('添加提现金额等级', 1);
             });
@@ -733,7 +733,7 @@ class ConfigController extends BaseController {
     public function actionWithdrawLevelEdit() {
         $id = Yii::$app->request->get('id');
         if (Yii::$app->request->isPost) {
-            return static::edit(WithdrawLevelForm::class, '提现金额等级修改成功', null, null, null, function () {
+            return static::edit(WithdrawLevelForm::class, Yii::t('ctx', 'successfully'), null, null, null, function () {
                 WithdrawLevel::updateToCache();
                 // Log::adminHandle('编辑提现金额等级', 1);
             });
@@ -775,7 +775,7 @@ class ConfigController extends BaseController {
         $id = Yii::$app->request->get('id');
         $regType = RegType::findOneAsArray('ID=:ID', [':ID' => $id]);
         if (!$regType) {
-            return static::notice('The data does not exist', 400); // 数据不存在
+            return static::notice(Yii::t('ctx', 'dataNotExists'), 400);
         }
         return static::notice(['id' => $regType['ID'], 'typeName' => $regType['TYPE_NAME'], 'isPact' => $regType['IS_PACT'], 'monthAmount' => $regType['MONTH_LIMIT_AMOUNT'], 'yearAmount' => $regType['YEAR_LIMIT_AMOUNT'], 'remark' => $regType['REMARK']]);
     }
@@ -794,12 +794,12 @@ class ConfigController extends BaseController {
             $formModel->id = $id;
             if ($formModel->load(Yii::$app->request->post(), '') && $result = $formModel->edit()) {
                 // Log::adminHandle('修改注册类型，ID为：' . $result['ID']);
-                return static::notice('修改注册类型成功');
+                return static::notice(Yii::t('ctx', 'successfully'));
             } else {
                 return static::notice(Form::formatErrorsForApi($formModel->getErrors()), 400);
             }
         }
-        return static::notice('Illegal request', 400); // 非法请求
+        return static::notice(Yii::t('ctx', 'illegalRequest'), 405);
     }
 
     /**
@@ -862,7 +862,7 @@ class ConfigController extends BaseController {
         if (\Yii::$app->request->isPost && $form->load($post, '')) {
             if ($form->updateExchangeRate()) {
                 Config::updateToCache();
-                return static::notice('更新汇率配置成功');
+                return static::notice(Yii::t('ctx', 'successfully'));
             } else {
                 return static::notice(Form::formatErrorsForApi($form->getErrors()), 422);
             }

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/controllers/UserController.php

@@ -337,7 +337,7 @@ class UserController extends BaseController
     public function actionBindAdd()
     {
         if (Yii::$app->request->isPost) {
-            return parent::edit(UserBindForm::class, '添加点位绑定成功', 'add', ['add'], null, function ($form, $result) {
+            return parent::edit(UserBindForm::class, Yii::t('ctx', 'successfully'), 'add', ['add'], null, function ($form, $result) {
                 // Log::adminHandle('为' . $form->userName . '添加点位绑定，主点位：' . $form->mainUserName);
             });
         }
@@ -353,7 +353,7 @@ class UserController extends BaseController
     {
         $id = Yii::$app->request->get('id');
         if (Yii::$app->request->isPost) {
-            return parent::edit(UserBindForm::class, '点位绑定编辑成功', 'edit', ['edit'], null, function ($form, $result) {
+            return parent::edit(UserBindForm::class, Yii::t('ctx', 'successfully'), 'edit', ['edit'], null, function ($form, $result) {
                 //$userBaseInfo = Info::baseInfo($result->USER_ID);
                 // Log::adminHandle('为' . $userBaseInfo['USER_NAME'] . '更改点位绑定关系');
             });
@@ -381,7 +381,7 @@ class UserController extends BaseController
         }, function ($selected) use ($userBindForm) {
             $userBindForm->delete($selected);
         }, false);
-        return self::notice('撤销点位绑定成功');
+        return self::notice(Yii::t('ctx', 'successfully'));
     }
 
     /**
@@ -394,7 +394,7 @@ class UserController extends BaseController
     {
         // 获取用户名
         if (!$userName = Info::generateUserName('hz')) {
-            return static::notice('会员编号生成失败', 400);
+            return static::notice(Yii::t('ctx', 'failed'), 400);
         }
         return static::notice(['userName' => $userName]);
     }
@@ -464,7 +464,7 @@ class UserController extends BaseController
     public function actionTeamworkAdd()
     {
         if (Yii::$app->request->isPost) {
-            return parent::edit(UserTeamworkForm::class, '添加合作点位成功', 'add', ['add'], null, function ($form, $result) {
+            return parent::edit(UserTeamworkForm::class, Yii::t('ctx', 'successfully'), 'add', ['add'], null, function ($form, $result) {
                 // Log::adminHandle('为' . $form->mainUserName . '添加合作点位，姓名：' . $form->userName, 0, $result->USER_ID, $form->userName);
             });
         }
@@ -485,7 +485,7 @@ class UserController extends BaseController
     {
         $id = Yii::$app->request->get('id');
         if (Yii::$app->request->isPost) {
-            return parent::edit(UserTeamworkForm::class, '合作点位编辑成功', 'changeDivide', ['changeDivide'], null, function ($form, $result) {
+            return parent::edit(UserTeamworkForm::class, Yii::t('ctx', 'successfully'), 'changeDivide', ['changeDivide'], null, function ($form, $result) {
                 foreach ($result['logs'] as $k => $value) {
                     $userName = Info::getUserNameByUserId($k);
                     // Log::adminHandle('为' . $userName . '编辑合作点位分成比例为' . $value , 1, $k, $userName);
@@ -592,7 +592,7 @@ class UserController extends BaseController
             $formModel->scenario = 'add';
             if ($formModel->load(Yii::$app->request->post(), '') && $formModel->edit()) {
                 // Log::adminHandle('添加体系' . Yii::$app->request->post('systemName'));
-                return static::notice('添加体系成功');
+                return static::notice(Yii::t('ctx', 'successfully'));
             } else {
                 return static::notice(Form::formatErrorsForApi($formModel->getErrors()), 400);
             }
@@ -610,7 +610,7 @@ class UserController extends BaseController
     {
         $id = Yii::$app->request->get('id');
         if (Yii::$app->request->isPost) {
-            return parent::edit(UserSystemForm::class, '编辑体系成功', 'edit', ['edit'], null, function ($form, $result) {
+            return parent::edit(UserSystemForm::class, Yii::t('ctx', 'successfully'), 'edit', ['edit'], null, function ($form, $result) {
                 // Log::adminHandle('编辑体系' . $result['SYSTEM_NAME']);
             });
         }
@@ -627,7 +627,7 @@ class UserController extends BaseController
      */
     public function actionSystemRenew()
     {
-        return parent::edit(UserSystemForm::class, '恢复体系成功', 'renewSystem', [
+        return parent::edit(UserSystemForm::class, Yii::t('ctx', 'successfully'), 'renewSystem', [
             'renewSystem',
         ], null, function ($form, $result) {
             // Log::adminHandle('编辑体系' . $result['SYSTEM_NAME']);
@@ -648,7 +648,7 @@ class UserController extends BaseController
         }, function ($selected) use ($userSystemForm) {
             $userSystemForm->delete($selected);
         }, false);
-        return self::notice('撤销体系成功');
+        return self::notice(Yii::t('ctx', 'successfully'));
     }
 
     /**
@@ -768,7 +768,7 @@ class UserController extends BaseController
     public function actionMoveAdd()
     {
         if (Yii::$app->request->isPost) {
-            return parent::edit(NetMoveForm::class, 'Application for net removal succeeds', 'add', ['add'], null, function ($form, $result) {   // 移网申请成功
+            return parent::edit(NetMoveForm::class, Yii::t('ctx', 'successfully'), 'add', ['add'], null, function ($form, $result) {   // 移网申请成功
 //                $user = User::getBaseInfoFromRedis($result['USER_ID']);
                 // Log::adminHandle('申请为' . $user['USER_NAME'] . '移网', 1, $result['USER_ID'], $user['USER_NAME']);
             });
@@ -782,7 +782,12 @@ class UserController extends BaseController
      */
     public function actionMoveNetType()
     {
-        return static::notice(['netType' => UserMove::TYPE_NAME]);
+        $network = UserMove::TYPE_NAME;
+        foreach ($network as &$item) {
+            $item['name'] = Yii::t('ctx', $item['label']);
+        }
+
+        return static::notice(['netType' => $network]);
     }
 
     /**
@@ -816,7 +821,7 @@ class UserController extends BaseController
         if ($formModel->load(Yii::$app->request->post(), '') && $result = $formModel->edit()) {
             $user = Info::baseInfoZh($result['USER_ID']);
             // Log::adminHandle('修改' . $user['USER_NAME'] . '移网录入数据', 1, $result['USER_ID'], $user['USER_NAME']);
-            return static::notice('The modification of the data input is complete'); // 修改移网录入数据完成
+            return static::notice(Yii::t('ctx', 'successfully')); // 修改移网录入数据完成
         }
         return static::notice(Form::formatErrorsForApi($formModel->getErrors()), 400);
     }
@@ -853,7 +858,7 @@ class UserController extends BaseController
         $formModel->scenario = 'changeAudit';
         if ($formModel->load(Yii::$app->request->post(), '') && $result = $formModel->changeAudit()) {
             // Log::adminHandle('审核移网数据');
-            return static::notice('Check and verify the net moving data'); // 审核移网数据完成
+            return static::notice(Yii::t('ctx', 'successfully')); // 审核移网数据完成
         }
         return static::notice(Form::formatErrorsForApi($formModel->getErrors()), 400);
     }
@@ -1077,7 +1082,7 @@ class UserController extends BaseController
     public function actionUserAdd()
     {
         if (Yii::$app->request->isPost) {
-            return parent::edit(AdminAddUserForm::class, 'Successfully added', null, null, null, function ($form, $result) {//添加成功
+            return parent::edit(AdminAddUserForm::class, Yii::t('ctx', 'successfully'), null, null, null, function ($form, $result) {//添加成功
                 // Log::adminHandle('后台添加会员:' . $result['USER_NAME'], 1, $result['ID'], $result['USER_NAME']);
             });
         }
@@ -1129,7 +1134,7 @@ class UserController extends BaseController
         $form = new UserBasicForm();
         $form->scenario = 'modifyPassword';
         if(Yii::$app->request->isPost && $form->load(Yii::$app->request->post(), '') && $result = $form->edit()){
-            return static::notice('Password modified successfully'); // 密码修改成功
+            return static::notice(Yii::t('ctx', 'successfully')); // 密码修改成功
         } else {
             return static::notice(Form::formatErrorsForApi($form->getErrors()), 400);
         }
@@ -1168,7 +1173,7 @@ class UserController extends BaseController
         $form = new UserBasicForm();
         $form->scenario = 'modifyProfile';
         if(Yii::$app->request->isPost && $form->load(Yii::$app->request->post(), '') && $result = $form->modifyProfile()){
-            return static::notice('Personal data modified successfully');//个人资料修改成功
+            return static::notice(Yii::t('ctx', 'successfully'));//个人资料修改成功
         } else {
             return static::notice(Form::formatErrorsForApi($form->getErrors()), 400);
         }
@@ -1178,7 +1183,7 @@ class UserController extends BaseController
         $form = new UserBasicForm();
         $form->scenario = 'modifyStatus';
         if(Yii::$app->request->isPost && $form->load(Yii::$app->request->post(), '') && $result = $form->modifyStatus()){
-            return static::notice('Member status modified successfully');//会员状态修改成功
+            return static::notice(Yii::t('ctx', 'successfully'));//会员状态修改成功
         } else {
             return static::notice(Form::formatErrorsForApi($form->getErrors()), 400);
         }
@@ -1193,7 +1198,7 @@ class UserController extends BaseController
         $form = new UserBasicForm();
         $form->scenario = 'isModifyPasswordStatus';
         if(Yii::$app->request->isPost && $form->load(Yii::$app->request->post(), '') && $result = $form->isModifyPasswordStatus()){
-            return static::notice('Status modified successfully');//状态修改成功
+            return static::notice(Yii::t('ctx', 'successfully'));//状态修改成功
         } else {
             return static::notice(Form::formatErrorsForApi($form->getErrors()), 400);
         }
@@ -1292,7 +1297,7 @@ class UserController extends BaseController
             $user = User::getBaseInfoFromRedis($result);
             //// Log::adminHandle('删除空单会员' . $user['USER_NAME'], 1, $result, $user['USER_NAME']);
             // Log::adminHandle('删除空单会员' . $user['USER_NAME'], 1);
-            return static::notice('Delete empty member');//删除空单会员完成
+            return static::notice(Yii::t('ctx', 'successfully'));//删除空单会员完成
         }
         return static::notice(Form::formatErrorsForApi($formModel->getErrors()), 400);
     }
@@ -1435,7 +1440,7 @@ class UserController extends BaseController
     public function actionChangeUserDecLevel()
     {
         if (Yii::$app->request->isPost) {
-            return parent::edit(DecLevelLogForm::class, 'Member Level Modified Successfully', 'adminChange', [ // 修改会员级别成功
+            return parent::edit(DecLevelLogForm::class, Yii::t('ctx', 'successfully'), 'adminChange', [ // 修改会员级别成功
                 'adminChange',
             ], null, function ($form, $result) {
                 //$userName = Info::getUserNameByUserId($result['ID']);
@@ -1452,7 +1457,7 @@ class UserController extends BaseController
     public function actionChangeUserDecRole()
     {
         if (Yii::$app->request->isPost) {
-            return parent::edit(DecRoleLogForm::class, 'Successfully modified the document Stockist level', 'adminChange', [//修改报单中心级别成功
+            return parent::edit(DecRoleLogForm::class, Yii::t('ctx', 'successfully'), 'adminChange', [//修改报单中心级别成功
                 'adminChange',
             ], null, function ($form, $result) {
                 //$userName = Info::getUserNameByUserId($result['ID']);
@@ -1469,7 +1474,7 @@ class UserController extends BaseController
     public function actionChangeShowEmpLevel()
     {
         if (Yii::$app->request->isPost) {
-            return parent::edit(ChangeShowEmpLvForm::class, 'Succeeded in modifying the member foreground display level', 'adminChange', [//修改会员前台显示聘级成功
+            return parent::edit(ChangeShowEmpLvForm::class, Yii::t('ctx', 'successfully'), 'adminChange', [//修改会员前台显示聘级成功
                 'adminChange',
             ], null, function ($form, $result) {
                 //$userName = Info::getUserNameByUserId($result['ID']);
@@ -1563,7 +1568,7 @@ class UserController extends BaseController
     public function actionRegInfoAuditAdd()
     {
         if (Yii::$app->request->isPost) {
-            return parent::edit(RegInfoAuditForm::class, 'Registration information entered successfully', 'add', ['add'], null, function ($form, $result) {//注册信息录入成功
+            return parent::edit(RegInfoAuditForm::class, Yii::t('ctx', 'successfully'), 'add', ['add'], null, function ($form, $result) {//注册信息录入成功
                 $user = User::getBaseInfoFromRedis($result['USER_ID']);
                 // Log::adminHandle('申请为' . $user['USER_NAME'] . '注册信息录入', 1, $result['USER_ID'], $user['USER_NAME']);
             });
@@ -1616,7 +1621,7 @@ class UserController extends BaseController
         if ($formModel->load(Yii::$app->request->post(), '') && $result = $formModel->edit()) {
             $user = User::getBaseInfoFromRedis($result['USER_ID']);
             // Log::adminHandle('修改' . $user['USER_NAME'] . '注册信息录入数据', 1, $result['USER_ID'], $user['USER_NAME']);
-            return static::notice('Completion of modifying registration information and entering data');//修改注册信息录入数据完成
+            return static::notice(Yii::t('ctx', 'successfully'));//修改注册信息录入数据完成
         }
         return static::notice(Form::formatErrorsForApi($formModel->getErrors()), 400);
     }
@@ -1634,7 +1639,7 @@ class UserController extends BaseController
         if ($formModel->load(Yii::$app->request->post(), '') && $result = $formModel->audit()) {
             $user = User::getBaseInfoFromRedis($result['USER_ID']);
             // Log::adminHandle('审核' . $user['USER_NAME'] . '注册信息', 1, $result['USER_ID'], $user['USER_NAME']);
-            return static::notice('Audit registration information completed');//审核注册信息完成
+            return static::notice(Yii::t('ctx', 'successfully'));//审核注册信息完成
         }
         return static::notice(Form::formatErrorsForApi($formModel->getErrors()), 400);
     }
@@ -1720,7 +1725,7 @@ class UserController extends BaseController
     public function actionCloseLogin()
     {
         if (Yii::$app->request->isPost) {
-            return parent::edit(CloseLoginForm::class, '操作成功', 'single', ['single'], null, function ($form, $result) {
+            return parent::edit(CloseLoginForm::class, Yii::t('ctx', 'successfully'), 'single', ['single'], null, function ($form, $result) {
 //                $appStr = CloseLoginForm::$apps[$form->shopOrBonus];
 //                $closeStr = CloseLoginForm::$closeSwitch[$form->isClose];
 //                $typeStr = CloseLoginForm::$types[$form->type];
@@ -1748,7 +1753,7 @@ class UserController extends BaseController
     public function actionCloseAreaLogin()
     {
         if (Yii::$app->request->isPost) {
-            return parent::edit(CloseLoginForm::class, '按地区登录操作成功', 'area', ['area'], null, function ($form, $result) {
+            return parent::edit(CloseLoginForm::class, Yii::t('ctx', 'successfully'), 'area', ['area'], null, function ($form, $result) {
 //                $appStr = CloseLoginForm::$apps[$form->shopOrBonus];
 //                $closeStr = CloseLoginForm::$closeSwitch[$form->isClose];
 //                $province = $form->areaSelected[0] ?? '';
@@ -1769,7 +1774,7 @@ class UserController extends BaseController
     public function actionBatchCloseLogin()
     {
         if (Yii::$app->request->isPost) {
-            return parent::edit(CloseLoginForm::class, '指定会员登录操作成功', 'batch', ['batch'], null, function ($form, $result) {
+            return parent::edit(CloseLoginForm::class, Yii::t('ctx', 'successfully'), 'batch', ['batch'], null, function ($form, $result) {
                 /*$appStr = CloseLoginForm::$apps[$form->shopOrBonus];
                 $closeStr = CloseLoginForm::$closeSwitch[$form->isClose];
                 $remark = $form->remark;
@@ -1803,7 +1808,7 @@ class UserController extends BaseController
     public function actionCloseDec()
     {
         if (Yii::$app->request->isPost) {
-            return parent::edit(CloseDecForm::class, '操作成功', 'single', ['single'], null, function ($form, $result) {
+            return parent::edit(CloseDecForm::class, Yii::t('ctx', 'successfully'), 'single', ['single'], null, function ($form, $result) {
 //                $closeStr = CloseDecForm::$closeSwitch[$form->isClose];
 //                $typeStr = CloseDecForm::$types[$form->type];
 //                $remark = $form->remark;
@@ -1820,7 +1825,7 @@ class UserController extends BaseController
     public function actionBatchCloseDec()
     {
         if (Yii::$app->request->isPost) {
-            return parent::edit(CloseDecForm::class, '指定会员报单操作成功', 'batch', ['batch'], null, function ($form, $result) {
+            return parent::edit(CloseDecForm::class, Yii::t('ctx', 'successfully'), 'batch', ['batch'], null, function ($form, $result) {
                 /*$closeStr = CloseDecForm::$closeSwitch[$form->isClose];
                 $remark = $form->remark;
                 if (is_array($result)) {
@@ -1843,7 +1848,7 @@ class UserController extends BaseController
     public function actionCloseAreaDec()
     {
         if (Yii::$app->request->isPost) {
-            return parent::edit(CloseDecForm::class, '按地区报单操作成功', 'area', ['area'], null, function ($form, $result) {
+            return parent::edit(CloseDecForm::class, Yii::t('ctx', 'successfully'), 'area', ['area'], null, function ($form, $result) {
 //                $closeStr = CloseDecForm::$closeSwitch[$form->isClose];
 //                $province = $form->areaSelected[0] ?? '';
 //                $city = $form->areaSelected[1] ?? '';
@@ -1928,7 +1933,7 @@ class UserController extends BaseController
     public function actionStatusAuditAdd()
     {
         if (Yii::$app->request->isPost) {
-            return parent::edit(UserStatusForm::class, '申请成功', 'add', ['add'], null, function ($form, $result) {
+            return parent::edit(UserStatusForm::class, Yii::t('ctx', 'successfully'), 'add', ['add'], null, function ($form, $result) {
                 $userInfo = Info::baseInfo($result->USER_ID);
                 // Log::adminHandle('申请修改' . $userInfo['USER_NAME'] . '状态为' . Yii::$app->params['userStatus'][$result->STATUS_VALUE]['label'], 1, $result->USER_ID, $userInfo['USER_NAME']);
             });
@@ -1988,7 +1993,7 @@ class UserController extends BaseController
         if ($formModel->load(Yii::$app->request->post(), '') && $result = $formModel->audit()) {
             $userInfo = Info::baseInfo($result->USER_ID);
             // Log::adminHandle('审核修改' . $userInfo['USER_NAME'] . '状态为' . Yii::$app->params['userStatus'][$result->STATUS_VALUE]['label'], 1, $result->USER_ID, $userInfo['USER_NAME']);
-            return static::notice('审核会员状态完成');
+            return static::notice(Yii::t('ctx', 'successfully'));
         }
         return static::notice(Form::formatErrorsForApi($formModel->getErrors()), 400);
     }
@@ -2020,7 +2025,7 @@ class UserController extends BaseController
     public function actionIsOperating()
     {
         if (Yii::$app->request->isPost) {
-            return parent::edit(UserStatusForm::class, '调整会员运作状态成功', 'operating', ['operating'], null, function ($form, $result) {
+            return parent::edit(UserStatusForm::class, Yii::t('ctx', 'successfully'), 'operating', ['operating'], null, function ($form, $result) {
                 /*$isOperating = $form->isOperating ? '运作' : '不运作';
                 if(is_array($result)){
                     foreach ($result as $value){
@@ -2041,7 +2046,7 @@ class UserController extends BaseController
     public function actionIsGroup()
     {
         if (Yii::$app->request->isPost) {
-            return parent::edit(UserGroupForm::class, '调整会员团队领导人成功', 'group', ['group'], null, function ($form, $result) {
+            return parent::edit(UserGroupForm::class, Yii::t('ctx', 'successfully'), 'group', ['group'], null, function ($form, $result) {
                 $isGroup = $form->isGroup ? '设为团队领导人' : '取消团队领导人';
                 if (is_array($result)) {
                     foreach ($result as $value) {
@@ -2062,7 +2067,7 @@ class UserController extends BaseController
     public function actionIsDec()
     {
         if (Yii::$app->request->isPost) {
-            return parent::edit(UserDecForm::class, '设置报单中心成功', 'isDec', ['isDec'], null, null);
+            return parent::edit(UserDecForm::class, Yii::t('ctx', 'successfully'), 'isDec', ['isDec'], null, null);
         }
     }
 
@@ -2074,7 +2079,7 @@ class UserController extends BaseController
     public function actionIsStudio()
     {
         if (Yii::$app->request->isPost) {
-            return parent::edit(UserDecForm::class, '设置工作室成功', 'isStudio', ['isStudio'], null, null);
+            return parent::edit(UserDecForm::class, Yii::t('ctx', 'successfully'), 'isStudio', ['isStudio'], null, null);
         }
     }
 
@@ -2086,7 +2091,7 @@ class UserController extends BaseController
     public function actionIsAtlas()
     {
         if (Yii::$app->request->isPost) {
-            return parent::edit(UserDecForm::class, '设置成功', 'isAtlas', ['isAtlas'], null, null);
+            return parent::edit(UserDecForm::class, Yii::t('ctx', 'successfully'), 'isAtlas', ['isAtlas'], null, null);
         }
     }
 
@@ -2098,7 +2103,7 @@ class UserController extends BaseController
     public function actionIsRecharge()
     {
         if (Yii::$app->request->isPost) {
-            return parent::edit(UserDecForm::class, '设置成功', 'isRecharge', ['isRecharge'], null, null);
+            return parent::edit(UserDecForm::class, Yii::t('ctx', 'successfully'), 'isRecharge', ['isRecharge'], null, null);
         }
     }
 
@@ -2131,7 +2136,7 @@ class UserController extends BaseController
     public function actionChangeTransferProp()
     {
         if (Yii::$app->request->isPost) {
-            return parent::edit(UserTransferPropForm::class, '调整会员转账/提现比例成功', 'change', ['change'], null, function ($form, $result) {
+            return parent::edit(UserTransferPropForm::class, Yii::t('ctx', 'successfully'), 'change', ['change'], null, function ($form, $result) {
                 /*$remark = $form->remark;
                 if (is_array($result)) {
                     foreach ($result as $value) {
@@ -2228,7 +2233,7 @@ class UserController extends BaseController
         $formModel = new RechargeForm();
         $formModel->scenario = 'addByAdmin';
         if ($formModel->load(Yii::$app->request->post(), '') && $result = $formModel->recharge()) {
-            return static::notice('充值成功');
+            return static::notice(Yii::t('ctx', 'successfully'));
         }
         return static::notice(Form::formatErrorsForApi($formModel->getErrors()), 400);
     }
@@ -2243,7 +2248,7 @@ class UserController extends BaseController
         $form = new BaUserBasicForm();
         $form->scenario = 'modifyPassword';
         if(Yii::$app->request->isPost && $form->load(Yii::$app->request->post(), '') && $result = $form->edit()){
-            return static::notice('Password modified successfully'); // 密码修改成功
+            return static::notice(Yii::t('ctx', 'successfully')); // 密码修改成功
         } else {
             return static::notice(Form::formatErrorsForApi($form->getErrors()), 400);
         }
@@ -2273,7 +2278,7 @@ class UserController extends BaseController
         $form = new BaUserBasicForm();
         $form->scenario = 'modifyProfile';
         if(Yii::$app->request->isPost && $form->load(Yii::$app->request->post(), '') && $result = $form->modifyProfile()){
-            return static::notice('Personal data modified successfully');//个人资料修改成功
+            return static::notice(Yii::t('ctx', 'successfully'));//个人资料修改成功
         } else {
             return static::notice(Form::formatErrorsForApi($form->getErrors()), 400);
         }
@@ -2283,7 +2288,7 @@ class UserController extends BaseController
         $form = new BaUserBasicForm();
         $form->scenario = 'modifyStatus';
         if(Yii::$app->request->isPost && $form->load(Yii::$app->request->post(), '') && $result = $form->modifyStatus()){
-            return static::notice('Member status modified successfully');//会员状态修改成功
+            return static::notice(Yii::t('ctx', 'successfully'));//会员状态修改成功
         } else {
             return static::notice(Form::formatErrorsForApi($form->getErrors()), 400);
         }
@@ -2298,7 +2303,7 @@ class UserController extends BaseController
         $form = new BaUserBasicForm();
         $form->scenario = 'isModifyPasswordStatus';
         if(Yii::$app->request->isPost && $form->load(Yii::$app->request->post(), '') && $result = $form->isModifyPasswordStatus()){
-            return static::notice('Status modified successfully');//状态修改成功
+            return static::notice(Yii::t('ctx', 'successfully'));//状态修改成功
         } else {
             return static::notice(Form::formatErrorsForApi($form->getErrors()), 400);
         }

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;
     }
-}
+}

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

@@ -51,14 +51,12 @@ class DecLevelList extends \common\libs\dataList\DataList implements DataListInt
                 'ID' => null,
                 'USER_ID' => null,
                 'USER_NAME' => [
-                    'header' => 'Member Code', // 会员编号
-                    'headerOther' => ['width' => '150'],
+                    'header' => Yii::t('ctx', 'memberCode'),
+                    'headerOther' => ['minWidth' => '120'],
                 ],
                 'FROM_DEC_LV_NAME' => [
-                    'header' => 'Level Before Modification', // 修改前级别
-//                    'headerOther' => [
-//                        'width' => '120',
-//                    ],
+                    'header' => Yii::t('ctx', 'levelBeforeModification'),
+                    'headerOther' => ['minWidth' => '110'],
                     'value' => function($row) use($decLevelConfig) {
                         return $decLevelConfig[$row['FROM_ID']]['LEVEL_NAME'];
                     },
@@ -67,10 +65,8 @@ class DecLevelList extends \common\libs\dataList\DataList implements DataListInt
                     ],
                 ],
                 'TO_DEC_LV_NAME' => [
-                    'header' => 'Modified Level', // 修改后级别
-//                    'headerOther' => [
-//                        'width' => '130',
-//                    ],
+                    'header' => Yii::t('ctx', 'modifiedLevel'),
+                    'headerOther' => ['minWidth' => '120'],
                     'value' => function($row) use($decLevelConfig) {
                         return isset($decLevelConfig[$row['TO_ID']])?$decLevelConfig[$row['TO_ID']]['LEVEL_NAME']:'';
                     },
@@ -79,17 +75,17 @@ class DecLevelList extends \common\libs\dataList\DataList implements DataListInt
                     ],
                 ],
                 'ADMIN_NAME' => [
-                    'header' => 'Operation Administrator', // 操作管理员
-//                    'headerOther' => ['width' => '120'],
+                    'header' => Yii::t('ctx', 'operationAdministrator'),
+                    'headerOther' => ['minWidth' => '100'],
                 ],
                 'CREATED_AT' => [
-                    'header' => 'Creation Time', // 创建时间
+                    'header' => Yii::t('ctx', 'createAt'),
                     'value' => function($row) {
                         return (new DateTime([
                             'value' => $row['CREATED_AT'],
                         ]))->result();
                     },
-//                    'headerOther' => ['width' => '170'],
+                    'headerOther' => ['minWidth' => '100'],
                 ],
             ];
         }
@@ -104,9 +100,9 @@ class DecLevelList extends \common\libs\dataList\DataList implements DataListInt
     {
         if(!$this->filterTypes){
             $this->filterTypes = [
-                'USER_NAME'=> ['isUserTable' => false,'name'=> 'Member Code'], // 会员编号
-                'CREATED_AT' => ['isUserTable' => false, 'name' => 'Creation Time', 'other' => 'date'], // 会员编号
-                'ADMIN_NAME' => ['isUserTable' => false, 'name' => 'Operation Administrator'], // 操作管理员
+                'USER_NAME'=> ['isUserTable' => false,'name'=> Yii::t('ctx', 'memberCode')],
+                'CREATED_AT' => ['isUserTable' => false, 'name' => Yii::t('ctx', 'createAt'), 'other' => 'date'],
+                'ADMIN_NAME' => ['isUserTable' => false, 'name' => Yii::t('ctx', 'operationAdministrator')],
             ];
         }
         return $this->filterTypes;

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

@@ -93,11 +93,11 @@ class IndexList extends \common\libs\dataList\DataList implements DataListInterf
                 'USER_ID' => null, // 这种传输方式主要是用于索引，因为过滤后的字段可能没有这种ID，但是一些功能的操作还需要用这种ID去关联，例如前台会员列表中的勾选批量状态管理，这里需要的就是USER_ID
                 'BTF_URL' => null,
                 'USER_NAME' => [
-                    'header' => 'Member Code', // 会员编号
+                    'header' => Yii::t('ctx', 'memberCode'),
                     'headerOther' => ['width' => '150'],
                 ],
                 'REAL_NAME' => [
-                    'header' => 'Member Name', // 会员姓名
+                    'header' => Yii::t('ctx', 'memberName'),
                     'headerOther' => [
                         'width' => '120',
                     ],
@@ -106,22 +106,27 @@ class IndexList extends \common\libs\dataList\DataList implements DataListInterf
                     ],
                 ],
                 'LOGIN_STATUS_NAME' => [
-                    'header' => 'Login Status', // 登录状态
+                    'header' => Yii::t('ctx', 'loginStatus'),
                     'value' => function($row) {
-                        return $row['ALLOW_LOGIN'] == 1 ? 'Allow Login': 'Prohibit Login'; // '允许登录' : '禁止登录'
+                        return $row['ALLOW_LOGIN'] == 1 ? Yii::t('ctx', 'allowLogin') : Yii::t('ctx', 'prohibitLogin');
                     },
                     'headerOther' => ['width' => '110'],
                 ],
                 'STATUS' => [
-                    'header' => 'Status', // 状态
+                    'header' => Yii::t('ctx', 'status'),
                     'value' => function($row) {
-                        return $row['STATUS'] == 1 ? 'Activate': 'Lock'; // '激活' : '锁定'
+                        return $row['STATUS'] == 1 ? Yii::t('ctx', 'activate') : Yii::t('ctx', 'lock');
                     },
                     'headerOther' => ['width' => '110'],
                 ],
-                'ALLOW_LOGIN' => ['header' => 'Filter Allow Login','hidden'=>true], // 筛选允许登录
+                'ALLOW_LOGIN' => [
+                    'header' => Yii::t('ctx', 'filterAllowLogin'),
+                    'value' => function($row) {
+                        return $row['ALLOW_LOGIN'] == 1 ? Yii::t('ctx', 'allowLogin') : Yii::t('ctx', 'prohibitLogin');
+                    },
+                    ],
                 'CREATED_AT' => [
-                    'header' => 'Joining Date', // 加入日期
+                    'header' => Yii::t('ctx', 'joiningDate'),
                     'value' => function($row) {
                         return (new DateTime([
                             'value' => $row['CREATED_AT'],
@@ -130,11 +135,11 @@ class IndexList extends \common\libs\dataList\DataList implements DataListInterf
                     'headerOther' => ['width' => '170'],
                 ],
                 'PERIOD_AT' => [
-                    'header' => 'Joining Period', // 加入期数
+                    'header' => Yii::t('ctx', 'joiningPeriod'),
                     'headerOther' => ['width' => '180'],
                 ],
                 'DEC_LV_NAME' => [
-                    'header' => 'Current Member Level', // 实时会员级别
+                    'header' => Yii::t('ctx', 'currentMemberLevel'),
                     'headerOther' => ['width' => '160'],
                     'value' => function($row) use($decLevelConfig) {
                         return $decLevelConfig[$row['DEC_LV']]['LEVEL_NAME'];
@@ -144,7 +149,7 @@ class IndexList extends \common\libs\dataList\DataList implements DataListInterf
                     ],
                 ],
                 'DEC_LV_UPDATED_AT' => [
-                    'header' => 'Current Adjustment Date', // 实时调整日期
+                    'header' => Yii::t('ctx', 'currentAdjustmentDate'),
                     'value' => function($row) {
                         return (new DateTime([
                             'value' => $row['DEC_LV_UPDATED_AT'],
@@ -153,7 +158,7 @@ class IndexList extends \common\libs\dataList\DataList implements DataListInterf
                     'headerOther' => ['width' => '180'],
                 ],
                 'LAST_DEC_LV_NAME' => [
-                    'header' => 'PC Member Level', // 结算时会员级别
+                    'header' => Yii::t('ctx', 'PCMemberLevel'),
                     'headerOther' => [
                         'width' => '140',
                     ],
@@ -169,7 +174,7 @@ class IndexList extends \common\libs\dataList\DataList implements DataListInterf
                     ],
                 ],
                 'EMP_LV_NAME' => [
-                    'header' => 'Highest Director', // 最高管理星级
+                    'header' => Yii::t('ctx', 'highestDirector'),
                     'headerOther' => [
                         'width' => '190',
                     ],
@@ -181,7 +186,7 @@ class IndexList extends \common\libs\dataList\DataList implements DataListInterf
                     ],
                 ],
                 'LAST_EMP_LV_NAME' => [
-                    'header' => 'Latest Director', // 最新管理星级
+                    'header' => Yii::t('ctx', 'latestDirector'),
                     'headerOther' => [
                         'width' => '190',
                     ],
@@ -193,7 +198,7 @@ class IndexList extends \common\libs\dataList\DataList implements DataListInterf
                     ],
                 ],
                 'CROWN_LV_NAME' => [
-                    'header' => 'Highest Crown ', // 最高皇冠星级
+                    'header' => Yii::t('ctx', 'highestCrown'),
                     'headerOther' => [
                         'width' => '180',
                     ],
@@ -205,7 +210,7 @@ class IndexList extends \common\libs\dataList\DataList implements DataListInterf
                     ],
                 ],
                 'LAST_CROWN_LV_NAME' => [
-                    'header' => 'Latest Crown', // 最新皇冠星级
+                    'header' => Yii::t('ctx', 'latestCrown'),
                     'headerOther' => [
                         'width' => '180',
                     ],
@@ -217,45 +222,45 @@ class IndexList extends \common\libs\dataList\DataList implements DataListInterf
                     ],
                 ],
                 'REC_USER_NAME' => [
-                    'header' => 'Recommendation No', // 推荐编号
+                    'header' => Yii::t('ctx', 'recommendationNo'),
                     'headerOther' => ['width' => '160'],
                 ],
                 'REC_REAL_NAME' => [
-                    'header' => 'Recommended Name', // 推荐姓名
+                    'header' => Yii::t('ctx', 'recommendedName'),
                     'headerOther' => ['width' => '160'],
                 ],
                 'CON_USER_NAME' => [
-                    'header' => 'Placement No', // 安置编号
+                    'header' => Yii::t('ctx', 'placementNo'),
                     'headerOther' => ['width' => '140'],
                 ],
                 'CON_REAL_NAME' => [
-                    'header' => 'Placement Name', // 安置姓名
+                    'header' => Yii::t('ctx', 'placementName'),
                     'headerOther' => ['width' => '140'],
                 ],
                 'RELATIVE_LOCATION' => [
-                    'header' => 'Resettlement Area', // 安置区域
+                    'header' => Yii::t('ctx', 'resettlementArea'),
                     'headerOther' => ['width' => '140'],
                 ],
                 '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'];
                     },
                     'headerOther' => ['width' => '180'],
                 ],
                 'DEC_USER_NAME' => [
-                    'header' => 'Stockist Code', // 所属报单中心编号
+                    'header' => Yii::t('ctx', 'stockistCode'),
                     'headerOther' => ['width' => '150'],
                 ],
                 'IS_DEC' => [
-                    'header' => 'Whether Stockist', // 是否报单中心
+                    'header' => Yii::t('ctx', 'whetherStockist'),
                     'value' => function($row) {
                         return (new YesNo([
                             'value' => $row['IS_DEC'],
@@ -271,7 +276,7 @@ class IndexList extends \common\libs\dataList\DataList implements DataListInterf
                     },
                 ],
                 'IS_ATLAS' => [
-                    'header' => 'Whether Chart Display', // 是否显示图谱
+                    'header' => Yii::t('ctx', 'whetherChartDisplay'),
                     'value' => function($row) {
                         return (new YesNo([
                             'value' => $row['IS_ATLAS'],
@@ -289,7 +294,7 @@ class IndexList extends \common\libs\dataList\DataList implements DataListInterf
                     },
                 ],
                 'IS_RECHARGE' => [
-                    'header' => 'Whether Recharge Display', // 是否显示充值
+                    'header' => Yii::t('ctx', 'whetherRechargeDisplay'),
                     'value' => function($row) {
                         return (new YesNo([
                             'value' => $row['IS_RECHARGE'],
@@ -307,28 +312,28 @@ class IndexList extends \common\libs\dataList\DataList implements DataListInterf
                     },
                 ],
                 'DEC_ROLE_NAME' => [
-                    'header' => 'Stockist Level', // 报单中心级别
+                    'header' => Yii::t('ctx', 'stockistLevel'),
                     'headerOther' => ['width' => '110'],
                     'value' => function($row) use($decRoleConfig) {
                         return $decRoleConfig[$row['DEC_ROLE_ID']]['ROLE_NAME'] ?? '';
                     },
                 ],
                 'OPEN_BANK_NAME' => [
-                    'header' => 'Bank Name', // 开户银行
+                    'header' => Yii::t('ctx', 'bankName'),
                     'headerOther' => ['width' => '110'],
                     'value' => function($row) use($openBankConfig) {
                         return $openBankConfig[$row['OPEN_BANK']]['BANK_NAME'] ?? '';
                     },
                 ],
                 'BANK_NO' => [
-                    'header' => 'Bank Account Number', // 银行帐号
+                    'header' => Yii::t('ctx', 'bankAccountNumber'),
                     'headerOther' => ['width' => '220'],
                     'value' => function($row) {
                         return "\t".$row['BANK_NO'];
                     },
                 ],
                 'AREA' => [
-                    'header' => 'Common Address', // 常用地址
+                    'header' => Yii::t('ctx', 'commonAddress'),
                     'value' => function($row) use($regionConfig) {
                         $province = $regionConfig[$row['PROVINCE']]['REGION_NAME'] ?? '';
                         $city = $regionConfig[$row['CITY']]['REGION_NAME'] ?? '';
@@ -346,9 +351,9 @@ class IndexList extends \common\libs\dataList\DataList implements DataListInterf
                     ],
                 ],
                 'ALLOW_TRANSFER' => [
-                    'header' => 'Enable "Transfer"', // 转账功能开启
+                    'header' => Yii::t('ctx', 'enableTransfer'),
                     'value' => function($row) {
-                        return $row['ALLOW_TRANSFER'] == 1 ? 'On': 'Off'; // '开启' : '关闭'
+                        return $row['ALLOW_TRANSFER'] == 1 ? Yii::t('ctx', 'on') : Yii::t('ctx', 'off');
                     },
                     'headerOther' => function($row) {
                         return [
@@ -374,42 +379,42 @@ class IndexList extends \common\libs\dataList\DataList implements DataListInterf
     {
         if(!$this->filterTypes){
             $this->filterTypes = [
-                'USER_NAME'=> ['name'=> 'Member code'], // 会员编号
-                'REAL_NAME'=> ['name'=> 'Member name'], // 会员姓名
+                'USER_NAME'=> ['name'=> Yii::t('ctx', 'memberCode')],
+                'REAL_NAME'=> ['name'=> Yii::t('ctx', 'memberName')],
 //                'ALLOW_LOGIN'=> ['name'=> '允许登录', 'other'=> 'yesOrNo'],
-                'CREATED_AT'=> ['name'=> 'Joining Date', 'other'=> 'date'], // 加入日期
-                'PERIOD_AT'=> ['name'=> 'Joining Period'], // 加入期数
-                'DEC_LV_NAME'=> ['name'=> 'Real time membership level', 'other'=> 'decLevel'], // 实时会员级别
+                'CREATED_AT'=> ['name'=> Yii::t('ctx', 'joiningDate'), 'other'=> 'date'],
+                'PERIOD_AT'=> ['name'=> Yii::t('ctx', 'joiningPeriod')],
+                'DEC_LV_NAME'=> ['name'=> Yii::t('ctx', 'currentMemberLevel'), 'other'=> 'decLevel'],
 //                'DEC_LV_UPDATED_AT'=> ['name'=> '实时调整日期', 'other'=> 'date'],
 //                'LAST_DEC_LV_NAME'=> ['name'=> '结算时会员级别', 'other'=> 'decLevel'],
-                'EMP_LV_NAME'=> ['name'=> 'Highest Director', 'other'=> 'empLevel'], // 最高管理星级
-                'LAST_EMP_LV_NAME'=> ['name'=> 'Latest Director', 'other'=> 'empLevel'], // 最新管理星级
-                'CROWN_LV_NAME'=> ['name'=> 'Highest Crown', 'other'=> 'crownLevel'], // 最高皇冠星级
-                'LAST_CROWN_LV_NAME'=> ['name'=> 'Latest Crown', 'other'=> 'crownLevel'], // 最新皇冠星级
+                'EMP_LV_NAME'=> ['name'=> Yii::t('ctx', 'highestDirector'), 'other'=> 'empLevel'],
+                'LAST_EMP_LV_NAME'=> ['name'=> Yii::t('ctx', 'latestDirector'), 'other'=> 'empLevel'],
+                'CROWN_LV_NAME'=> ['name'=> Yii::t('ctx', 'highestCrown'), 'other'=> 'crownLevel'],
+                'LAST_CROWN_LV_NAME'=> ['name'=> Yii::t('ctx', 'latestCrown'), 'other'=> 'crownLevel'],
 //                'HIGHEST_EMP_LV_NAME'=> ['name'=> '历史最高聘级', 'other'=> 'empLevel'],
 //                'HIGHEST_EMP_LV_PERIOD'=> ['name'=> '首次达到历史最高聘级的期数'],
-                'REC_USER_NAME'=> ['name'=> 'Recommendation No'],//推荐编号
-                'CON_USER_NAME'=> ['name'=> 'Placement No'],//安置编号
+                'REC_USER_NAME'=> ['name'=> Yii::t('ctx', 'recommendationNo')],
+                'CON_USER_NAME'=> ['name'=> Yii::t('ctx', 'placementNo')],
                 //'ID_TYPE'=> ['name'=> '证件类型', 'other'=> 'select', 'selectData'=> [['id'=> 0, 'name'=> '身份证']]],
-                'ID_CARD'=> ['name'=> 'Identification Number'],//证件号码
+//                'ID_CARD'=> ['name'=> 'Identification Number'],
 //                'SPOUSE_NAME'=> ['name'=> '配偶姓名'],
 //                'SPOUSE_IDCARD'=> ['name'=> '配偶身份证号'],
 //                'SYSTEM_NAME'=> ['name'=> '体系名称', 'other'=> 'systems'],
 //                'SUB_COM_NAME'=> ['name'=> '所属分公司', 'other'=> 'subCompany'],
-                'MOBILE'=> ['name'=> 'Phone Number'],//手机号码
+                'MOBILE'=> ['name'=> Yii::t('ctx', 'phoneNumber')],
 //                'TEL'=> ['name'=> '备用手机号码'],
-                'DEC_USER_NAME'=> ['name'=> 'Stockist Code'], // 所属报单中心编号
-                'IS_DEC'=> ['name'=> 'Stockist or not', 'other'=> 'yesOrNo'],//是否报单中心
-                'IS_STUDIO'=> ['name'=> 'Studio or not', 'other'=> 'yesOrNo'],//是否工作室
-                'DEC_ROLE_NAME'=> ['name'=> 'Stockist Level', 'other'=> 'decRole'],//报单中心级别
+                'DEC_USER_NAME'=> ['name'=> Yii::t('ctx', 'stockistCode')],
+                'IS_DEC'=> ['name'=> Yii::t('ctx', 'stockistOrNot'), 'other'=> 'yesOrNo'],
+//                'IS_STUDIO'=> ['name'=> 'Studio or not', 'other'=> 'yesOrNo'],//是否工作室
+                'DEC_ROLE_NAME'=> ['name'=> Yii::t('ctx', 'stockistLevel'), 'other'=> 'decRole'],
 //                'OPEN_BANK_NAME'=> ['name'=> '开户银行', 'other'=> 'banks'],
 //                'BANK_AREA'=> ['name'=> '银行地区', 'other'=> 'area'],
 //                'BANK_ADDRESS'=> ['name'=> '开户地址'],
 //                'BANK_NO'=> ['name'=> '银行账号'],
 //                'SEX'=> ['name'=> '性别', 'other'=> 'sex'],
 //                'NATION_NAME'=> ['name'=> '民族', 'other'=> 'nations'],
-                'AREA'=> ['name'=> 'Common address', 'other'=> 'area'],//常用地址
-                'STATUS'=> ['name'=> 'Active status', 'other'=> 'select', 'selectData'=> [['id'=> 0, 'name'=> 'locking'],['id'=> 1, 'name'=> 'activation']]],
+                'AREA'=> ['name'=> Yii::t('ctx', 'commonAddress'), 'other'=> 'area'],
+                'STATUS'=> ['name'=> Yii::t('ctx', 'activeStatus'), 'other'=> 'select', 'selectData'=> [['id'=> 0, 'name'=> Yii::t('ctx', 'locking')],['id'=> 1, 'name'=> Yii::t('ctx', 'activation')]]],
 //                'STATUS'=> ['name'=> '激活状态', 'other'=> 'select', 'selectData'=> [['id'=> 0, 'name'=> '锁定'],['id'=> 1, 'name'=> '激活']]],
 //                'ADDRESS'=> ['name'=> '身份证地址'],
 //                'IS_AUTO_WITHDRAW'=> [

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

@@ -61,53 +61,56 @@ class MoveList extends \common\libs\dataList\DataList implements DataListInterfa
                 'ID' => null,
                 'USER_ID' => null,
                 'MOVE_USER_NAME' => [
-                    'header' => 'Move Member', // 移动的会员
-                    'headerOther' => ['width' => '150'],
+                    'header' => Yii::t('ctx', 'moveMember'),
+                    'headerOther' => ['width' => '120'],
                 ],
                 'MOVE_REAL_NAME' => [
-                    'header' => 'Move Member Name', // 移动的会员名字
-                    'headerOther' => ['width' => '160'],
+                    'header' => Yii::t('ctx', 'moveMemberName'),
+                    'headerOther' => ['width' => '200'],
                     'valueOther' => [
                         'tag'=>['type'=>'success', 'size' => 'small', 'class'=>'no-border']
                     ],
                 ],
                 'FROM_USER_NAME' => [
-                    'header' => 'Uper Code Before Moving', // 移动前接点
-                    'headerOther' => ['width' => '190'],
+                    'header' => Yii::t('ctx', 'uperCodeBeforeMoving'),
+                    'headerOther' => ['width' => '120'],
                 ],
                 'TO_USER_NAME' => [
-                    'header' => 'Uper Code After Moving', // 移动后接点
-                    'headerOther' => ['width' => '170'],
+                    'header' => Yii::t('ctx', 'uperCodeAfterMoving'),
+                    'headerOther' => ['width' => '120'],
                 ],
                 'TYPE' => [
-                    'header' => 'Type Of Moving', // 移网类型
-                    'headerOther' => ['width' => '140'],
+                    'header' => Yii::t('ctx', 'typeOfMoving'),
+                    'headerOther' => ['width' => '120'],
                     'value' => function($row) {
-                        return $row['TYPE'] == UserMove::TYPE_NETWORK ? 'Placement Network':'Sponsor Network'; // '安置网络' : '开拓网络'
+                        return $row['TYPE'] == UserMove::TYPE_NETWORK ? Yii::t('ctx', 'placementNetwork') : Yii::t('ctx', 'sponsorNetwork');
                     },
                 ],
                 'LOCATION' => [
-                    'header' => 'Position', // 移动到位置
+                    'header' => Yii::t('ctx', 'position'),
                     'headerOther' => ['width' => '100'],
+                    'value' => function($row) {
+                        return $row['LOCATION'] == 1 ? Yii::t('ctx', 'I. Market') : Yii::t('ctx', 'II. Market');
+                    },
                 ],
                 'PERIOD_NUM' => [
-                    'header' => 'Period Of Moving', // 移动时的期数
+                    'header' => Yii::t('ctx', 'periodOfMoving'),
                     'headerOther' => ['width' => '130'],
                 ],
                 'IS_MOVING' => [
-                    'header' => 'Whether To Move', // 是否正在移动
+                    'header' => Yii::t('ctx', 'whetherToMove'),
                     'headerOther' => ['width' => '130'],
                 ],
                 'MOVE_PERCENT' => [
-                    'header' => 'Percentage', // 移动百分比
+                    'header' => Yii::t('ctx', 'percentage'),
                     'headerOther' => ['width' => '100'],
                 ],
                 'MOVE_ADMIN_NAME' => [
-                    'header' => 'Administrator Of Moving', // 移网管理员
+                    'header' => Yii::t('ctx', 'AdministratorOfMoving'),
                     'headerOther' => ['width' => '180'],
                 ],
                 'CREATED_AT' => [
-                    'header' => 'Joining Date', // 加入日期
+                    'header' => Yii::t('ctx', 'joiningDate'),
                     'value' => function($row) {
                         return (new DateTime([
                             'value' => $row['CREATED_AT'],
@@ -117,18 +120,18 @@ class MoveList extends \common\libs\dataList\DataList implements DataListInterfa
                 ],
                 'AUDIT_STATUS' => null,
                 'AUDIT_STATUS_NAME' => [
-                    'header' => 'Status', // 审核状态
+                    'header' => Yii::t('ctx', 'status'),
                     'headerOther' => ['width' => '100'],
                     'value' => function ($row) {
                         return UserMove::STATUS_NAME[$row['AUDIT_STATUS']];
                     },
                 ],
                 'AUDIT_ADMIN_NAME' => [
-                    'header' => 'Administrator Of Reviewing', // 审核管理员
-                    'headerOther' => ['width' => '190'],
+                    'header' => Yii::t('ctx', 'administratorOfReviewing'),
+                    'headerOther' => ['width' => '150'],
                 ],
                 'AUDITED_AT' => [
-                    'header' => 'Review time', // 审核时间
+                    'header' => Yii::t('ctx', 'reviewTime'),
                     'value' => function ($row) {
                         return (new DateTime([
                             'value' => $row['AUDITED_AT'],
@@ -149,13 +152,13 @@ class MoveList extends \common\libs\dataList\DataList implements DataListInterfa
     {
         if(!$this->filterTypes){
             $this->filterTypes = [
-                'MOVE_USER_NAME'=> ['isUserTable' => false,'name'=> 'Move Member Code'], // 移动的会员
-                'MOVE_REAL_NAME'=> ['isUserTable' => false,'name'=> 'Move Member Name'], // 移动的会员姓名
-                'filterStatus'=> ['isUserTable' => false,'name'=> 'Status'], // 审核状态
-                'PERIOD_NUM'=> ['isUserTable' => false,'name'=> 'Period Of Moving'], // 移动时的期数
-                'MOVE_ADMIN_NAME'=> ['isUserTable' => false,'name'=> 'Administrator Of Moving'], // 移网管理员
-                'AUDIT_ADMIN_NAME'=> ['isUserTable' => false,'name'=> 'Administrator Of Reviewing'], // 审核管理员
-                'AUDITED_AT' => ['isUserTable' => false, 'name' => 'Audit Time', 'other' => 'Review Time'], // 审核时间
+                'MOVE_USER_NAME'=> ['isUserTable' => false,'name'=> Yii::t('ctx', 'moveMember')],
+                'MOVE_REAL_NAME'=> ['isUserTable' => false,'name'=> Yii::t('ctx', 'moveMemberName')],
+                'filterStatus'=> ['isUserTable' => false,'name'=> Yii::t('ctx', 'status')],
+                'PERIOD_NUM'=> ['isUserTable' => false,'name'=> Yii::t('ctx', 'periodOfMoving')],
+                'MOVE_ADMIN_NAME'=> ['isUserTable' => false,'name'=> Yii::t('ctx', 'AdministratorOfMoving')], // 移网管理员
+                'AUDIT_ADMIN_NAME'=> ['isUserTable' => false,'name'=> Yii::t('ctx', 'administratorOfReviewing')], // 审核管理员
+                'AUDITED_AT' => ['isUserTable' => false, 'name' => Yii::t('ctx', 'reviewTime'), 'other' => 'Review Time'], // 审核时间
             ];
         }
         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>

backendEle/src/views/finance/withdraw.vue

@@ -4,10 +4,10 @@
       <el-tabs v-model="filterStatus" @tab-click="handleFilterStatusClick">
         <el-tab-pane label="All" name="-1" :lazy="true"></el-tab-pane> <!-- 全部 -->
         <el-tab-pane label="To be reviewed" name="0" :lazy="true"></el-tab-pane> <!-- 待审核 -->
-        <el-tab-pane label="Reviewed" name="2" :lazy="true"></el-tab-pane> <!-- 已审核 -->
+<!--        <el-tab-pane label="Reviewed" name="2" :lazy="true"></el-tab-pane> &lt;!&ndash; 已审核 &ndash;&gt;-->
         <el-tab-pane label="To be paid" name="3" :lazy="true"></el-tab-pane> <!-- 待付款 -->
         <el-tab-pane label="Paid" name="6" :lazy="true"></el-tab-pane> <!-- 已付款 -->
-        <el-tab-pane label="Payment failed" name="4" :lazy="true"></el-tab-pane> <!-- 付款失败 -->
+<!--        <el-tab-pane label="Payment failed" name="4" :lazy="true"></el-tab-pane> &lt;!&ndash; 付款失败 &ndash;&gt;-->
         <el-tab-pane label="Returned" name="7" :lazy="true"></el-tab-pane> <!-- 已退回 -->
       </el-tabs>
       <div class="filter-box">
@@ -33,7 +33,7 @@
         <el-table-column fixed="right" label="Action" width="180"> <!-- 操作 -->
           <template slot-scope="scope">
             <el-dropdown size="small" trigger="click"
-                         v-if="scope.row.AUDIT_STATUS!=='7' && (permission.hasPermission(`finance/withdraw-status`))">
+                         v-if="scope.row.AUDIT_STATUS!=='6' && scope.row.AUDIT_STATUS!=='7' && (permission.hasPermission(`finance/withdraw-status`))">
               <el-button type="primary" size="small" @click.stop="">
                 Action<i class="el-icon-arrow-down el-icon--right"></i>
               </el-button>
@@ -43,41 +43,46 @@
                 <!--v-show="(scope.row.AUDIT_STATUS==='0'||scope.row.AUDIT_STATUS==='1') && (permission.hasPermission(`finance/invoice-audit-add`)||permission.hasPermission(`finance/invoice-audit-edit`))">-->
                 <!--补录发票信息-->
                 <!--</el-dropdown-item>-->
-                <el-dropdown-item command="status"
-                                  @click.native="handleStatusShow(scope.row, 2, 'Are you sure to approve the current withdrawal?')"
-                                  v-show="scope.row.AUDIT_STATUS==='0' && permission.hasPermission(`finance/withdraw-status`)"> <!-- 确定对当前提现进行审核通过操作？ -->
-                  Approve <!-- 审核通过 -->
-                </el-dropdown-item>
-                <el-dropdown-item command="status"
-                                  @click.native="handleStatusShow(scope.row, 3, 'Are you sure to set the current withdrawal as payment action?')"
-                                  v-show="scope.row.AUDIT_STATUS === '2' && permission.hasPermission(`finance/withdraw-status`)"> <!-- 确定对当前提现进行设为待付款操作？ -->
-                  To be paid<!-- 设为待付款 -->
-                </el-dropdown-item>
+<!--                <el-dropdown-item command="status"-->
+<!--                                  @click.native="handleStatusShow(scope.row, 3, 'Are you sure to approve the current withdrawal?')"-->
+<!--                                  v-show="scope.row.AUDIT_STATUS==='0' && permission.hasPermission(`finance/withdraw-status`)"> &lt;!&ndash; 确定对当前提现进行审核通过操作？ &ndash;&gt;-->
+<!--                  Approve &lt;!&ndash; 审核通过 &ndash;&gt;-->
+<!--                </el-dropdown-item>-->
+<!--                <el-dropdown-item command="status"-->
+<!--                                  @click.native="handleStatusShow(scope.row, 3, 'Are you sure to set the current withdrawal as payment action?')"-->
+<!--                                  v-show="scope.row.AUDIT_STATUS === '0' && permission.hasPermission(`finance/withdraw-status`)"> &lt;!&ndash; 确定对当前提现进行设为待付款操作？ &ndash;&gt;-->
+<!--                  Approve&lt;!&ndash; 设为待付款 &ndash;&gt;-->
+<!--                </el-dropdown-item>-->
                 <el-dropdown-item command="status"
                                   @click.native="handleStatusShow(scope.row, 6, 'Are you sure to set the current withdrawal as paid?')"
-                                  v-show="scope.row.AUDIT_STATUS === '3' && permission.hasPermission(`finance/withdraw-status`)"> <!-- 确定对当前提现进行设为已付款操作 -->
-                  Paid<!--设为已付款-->
-                </el-dropdown-item>
-                <el-dropdown-item command="status"
-                                  @click.native="handleStatusShow(scope.row, 3, 'Are you sure to set the current withdrawal as payment action?？')"
-                                  v-show="scope.row.AUDIT_STATUS === '4' && permission.hasPermission(`finance/withdraw-status`)"> <!-- 确定对当前提现进行设为待付款操作？ -->
-                  To be paid<!-- 设为待付款 -->
+                                  v-show="scope.row.AUDIT_STATUS === '3' && permission.hasPermission(`finance/withdraw-status-pay`)"> <!-- 确定对当前提现进行设为已付款操作 -->
+                  Paid<!--付款-->
                 </el-dropdown-item>
                 <el-dropdown-item command="status"
-                                  @click.native="handleStatusShow(scope.row, 4, 'Are you sure to set payment failure for the current withdrawal?', 'Note')"
-                                  v-show="scope.row.AUDIT_STATUS === '6' && permission.hasPermission(`finance/withdraw-status`)"> <!-- 付款失败备注 --> <!-- 确定对当前提现进行设为付款失败操作？ -->
-                  Failed<!-- 设为付款失败 -->
+                                  @click.native="handleStatusShow(scope.row, 3, 'Are you sure to set the current withdrawal as approved?')"
+                                  v-show="scope.row.AUDIT_STATUS === '0' && permission.hasPermission(`finance/withdraw-status-audit`)"> <!-- 确定对当前提现进行设为已付款操作 -->
+                  Approve<!--审核通过-->
                 </el-dropdown-item>
+<!--                <el-dropdown-item command="status"-->
+<!--                                  @click.native="handleStatusShow(scope.row, 4, 'Are you sure to set payment failure for the current withdrawal?', 'Note')"-->
+<!--                                  v-show="scope.row.AUDIT_STATUS === '6' && permission.hasPermission(`finance/withdraw-status`)"> &lt;!&ndash; 付款失败备注 &ndash;&gt; &lt;!&ndash; 确定对当前提现进行设为付款失败操作？ &ndash;&gt;-->
+<!--                  Failed&lt;!&ndash; 设为付款失败 &ndash;&gt;-->
+<!--                </el-dropdown-item>-->
                 <el-dropdown-item command="status"
                                   @click.native="handleStatusShow(scope.row, 7, 'Determines that the current withdrawal is set to a withdrawal return operation?', 'Note on withdrawal return')"
-                                  v-show="scope.row.AUDIT_STATUS === '0' && permission.hasPermission(`finance/withdraw-status`)"> <!-- 确定对当前提现进行设为提现退回操作？ --> <!-- 提现退回备注 -->
-                  Return <!-- 设为提现退回 -->
+                                  v-show="(scope.row.AUDIT_STATUS === '0') && permission.hasPermission(`finance/withdraw-status-return`)"><!-- 提现退回备注 -->
+                  Return <!-- 该会员已提供发票，请确认是否处理提现退回 --> <!-- 设为提现退回 -->
                 </el-dropdown-item>
                 <el-dropdown-item command="status"
                                   @click.native="handleStatusShow(scope.row, 7, 'The member has provided the invoice, please confirm whether to process the withdrawal return?', 'Note on withdrawal return')"
-                                  v-show="(scope.row.AUDIT_STATUS === '1'||scope.row.AUDIT_STATUS === '2'||scope.row.AUDIT_STATUS === '3') && permission.hasPermission(`finance/withdraw-status`)"><!-- 提现退回备注 -->
+                                  v-show="(scope.row.AUDIT_STATUS === '1'||scope.row.AUDIT_STATUS === '2') && permission.hasPermission(`finance/withdraw-status-return`)"><!-- 提现退回备注 -->
                   Return <!-- 该会员已提供发票，请确认是否处理提现退回 --> <!-- 设为提现退回 -->
                 </el-dropdown-item>
+                <el-dropdown-item command="status"
+                                  @click.native="handleStatusShow(scope.row, 0, 'Are you sure to set the current withdrawal as canceled?', 'Note on withdrawal return')"
+                                  v-show="scope.row.AUDIT_STATUS === '3' && permission.hasPermission(`finance/withdraw-status-cancel`)"> <!-- 确定对当前提现进行设为提现退回操作？ --> <!-- 提现退回备注 -->
+                  Cancel <!-- 取消审核 -->
+                </el-dropdown-item>
               </el-dropdown-menu>
             </el-dropdown>
           </template>
@@ -86,27 +91,27 @@
       <div class="white-box-footer">
 
         <el-dropdown size="small" trigger="click" @command="handleMuli"
-                     v-if="filterStatus!=='-1' && filterStatus!=='7' && (permission.hasPermission(`finance/withdraw-status`))">
+                     v-if="filterStatus!=='-1' && filterStatus!=='6' && filterStatus!=='7' && (permission.hasPermission(`finance/withdraw-status`))">
           <el-button type="primary" size="small">
             Selected data<!--所选数据--><i class="el-icon-arrow-down el-icon--right"></i>
           </el-button>
           <el-dropdown-menu v-if="filterStatus==='0'" slot="dropdown">
-            <el-dropdown-item command="2">Batch audit passed</el-dropdown-item> <!-- 批量审核通过-->
-            <el-dropdown-item command="7">Batch return</el-dropdown-item> <!-- 批量退回 -->
-          </el-dropdown-menu>
-          <el-dropdown-menu v-else-if="filterStatus==='2'" slot="dropdown">
-            <el-dropdown-item command="3">Batch set to be paid</el-dropdown-item><!-- 批量设为待付款 -->
+            <el-dropdown-item command="3" v-show="permission.hasPermission(`finance/withdraw-status-audit`)">Batch audit passed</el-dropdown-item> <!-- 批量审核通过-->
+            <el-dropdown-item command="7" v-show="permission.hasPermission(`finance/withdraw-status-return`)">Batch return</el-dropdown-item> <!-- 批量退回 -->
           </el-dropdown-menu>
+<!--          <el-dropdown-menu v-else-if="filterStatus==='2'" slot="dropdown">-->
+<!--            <el-dropdown-item command="3">Batch set to be paid</el-dropdown-item>&lt;!&ndash; 批量设为待付款 &ndash;&gt;-->
+<!--          </el-dropdown-menu>-->
           <el-dropdown-menu v-else-if="filterStatus==='3'" slot="dropdown">
-            <el-dropdown-item command="6">Batch set paid</el-dropdown-item><!--批量设为已付款-->
-            <el-dropdown-item command="7">Batch return</el-dropdown-item><!--批量退回-->
-          </el-dropdown-menu>
-          <el-dropdown-menu v-else-if="filterStatus==='6'" slot="dropdown">
-            <el-dropdown-item command="4">Batch set payment failure</el-dropdown-item><!--批量设为付款失败-->
-          </el-dropdown-menu>
-          <el-dropdown-menu v-else-if="filterStatus==='4'" slot="dropdown">
-            <el-dropdown-item command="3">Batch set to be paid</el-dropdown-item><!-- 批量设为待付款 -->
+            <el-dropdown-item command="6" v-show="permission.hasPermission(`finance/withdraw-status-pay`)">Batch set paid</el-dropdown-item><!--批量设为已付款-->
+            <el-dropdown-item command="0" v-show="permission.hasPermission(`finance/withdraw-status-cancel`)">Batch return</el-dropdown-item><!--批量退回-->
           </el-dropdown-menu>
+<!--          <el-dropdown-menu v-else-if="filterStatus==='6'" slot="dropdown">-->
+<!--            <el-dropdown-item command="4">Batch set payment failure</el-dropdown-item>&lt;!&ndash;批量设为付款失败&ndash;&gt;-->
+<!--          </el-dropdown-menu>-->
+<!--          <el-dropdown-menu v-else-if="filterStatus==='4'" slot="dropdown">-->
+<!--            <el-dropdown-item command="3">Batch set to be paid</el-dropdown-item>&lt;!&ndash; 批量设为待付款 &ndash;&gt;-->
+<!--          </el-dropdown-menu>-->
         </el-dropdown>
 
         <el-button type="success" size="small" @click="handleExport"
@@ -127,7 +132,7 @@
             </el-form-item>
             <el-form-item label="注册类型">
               <el-select v-model="form.baseInfo.REG_TYPE" placeholder="请选择注册类型" :disabled="true">
-                <el-option v-for="(item,key) in regTypes" :label="item.TYPE_NAME" :value="item.ID"
+                <el-option v-for="(item, key) in regTypes" :label="item.TYPE_NAME" :value="item.ID"
                            :key="item.ID"></el-option>
               </el-select>
             </el-form-item>
@@ -159,7 +164,7 @@
                   type="warning" :closable="false">
           </el-alert>
           <el-form :model="auditForm" label-width="180px" style="width:500px;" v-loading="dialogAuditLoading">
-            <el-form-item label="Estimated date of payment" v-show="filterStatus==='2' || filterStatus==='4'"> <!-- 预计付款日期 -->
+            <el-form-item label="Estimated date of payment" v-show="planPayDateVisible"> <!-- 预计付款日期 -->
               <el-date-picker
                       v-model="auditForm.planPaidAt"
                       type="date"
@@ -219,7 +224,7 @@ export default {
       totalPages: 1,
       totalCount: 1,
       pageSize: 20,
-      pageSizes:  [1, 2, 5, 10, 20, 50, 100],
+      pageSizes: [1, 2, 5, 10, 20, 50, 100],
       tool: tool,
       permission: permission,
       regTypes: baseInfo.regTypes(),
@@ -229,6 +234,7 @@ export default {
       dialogAuditLoading: false,
       dialogAddInvoiceVisible: false,
       dialogAddInvoiceLoading: false,
+      planPayDateVisible: false,
       auditId: null,
       form: {
         id: null,
@@ -236,7 +242,7 @@ export default {
         amount: null,
         planPaidAt: null,
         paidAt: new Date(),
-        createRemark: null,
+        createRemark: null
       },
       invoiceForm: {
         id: null,
@@ -257,16 +263,16 @@ export default {
         sellerBank: null,
         itemName: null,
         invoiceRemark: null,
-        createRemark: null,
+        createRemark: null
       },
       pickerOptions0: {
-        disabledDate(time) {
-          return time.getTime() < Date.now();
+        disabledDate (time) {
+          return time.getTime() < Date.now()
         }
       },
       pickerOptions1: {
-        disabledDate(time) {
-          return time.getTime() < Date.now() - 8.64e7;
+        disabledDate (time) {
+          return time.getTime() < Date.now() - 8.64e7
         }
       },
       auditRemark: '',
@@ -276,19 +282,19 @@ export default {
         selectedIds: [],
         planPaidAt: null,
         createRemark: null,
-        withdrawAudit: '',
+        withdrawAudit: ''
       },
       auditTips: '',
       filterTypes: {},
       filterModel: {},
       excelForm: {
-        rowCount: '',
+        rowCount: ''
       },
-      filterStatus: '0',
+      filterStatus: '0'
     }
   },
   mounted () {
-    this.getData();
+    this.getData()
     // if (permission.hasPermission(`finance/withdraw-7`)) {
     //   this.activeName = 'seven'
     // }
@@ -322,7 +328,7 @@ export default {
           message: 'Select the record to operate on', // 请选择要操作的记录
           type: 'warning'
         })
-        return;
+        return
       }
       this.handleAudit(null, command)
     },
@@ -330,16 +336,16 @@ export default {
       let title = ''
       if (status === '2') {
         title = 'Be sure to pass the review？Note：'// 确定要通过审核？备注：
-      }else if(status === '3') {
+      } else if (status === '3') {
         title = 'Be sure to unpaid the review？Note：'// 确定要设为待付款？备注：
-      }else if(status === '4') {
+      } else if (status === '4') {
         title = 'Be sure to payment failure the review？Note：'// 确定要设为付款失败？备注：
-      }else if(status === '6') {
+      } else if (status === '6') {
         title = 'Be sure to paid the review？Note：'// 确定要设为已付款？备注：
-      }else if(status === '7') {
-        title = 'Be sure to return the review？Note：'//确定要设为已退回？备注：
+      } else if (status === '7') {
+        title = 'Be sure to return the review？Note：'// 确定要设为已退回？备注：
       }
-      this.handleStatusShow(row,status,title);
+      this.handleStatusShow(row, status, title)
     },
     handleExpand (row, event, column) {
       this.$refs.multipleTable.toggleRowExpansion(row)
@@ -389,7 +395,7 @@ export default {
     handleEdit () {
       this.dialogEditFormVisible = false
       this.$message({
-        message: 'Modifying data',//正在修改数据
+        message: 'Modifying data', // 正在修改数据
         type: 'info'
       })
       this.loading = true
@@ -403,14 +409,14 @@ export default {
       }).catch(response => {
       })
     },
-    handleStatusShow(row, status, title, remark = 'Remark') { // 备注
+    handleStatusShow (row, status, title, remark = 'Remark') { // 备注
       this.auditForm = {
         auditTips: '',
         auditStatus: null,
         selectedIds: [],
         planPaidAt: null,
         paidAt: new Date(),
-        remark: null,
+        remark: null
       }
       if (row === null) {
         for (let val of this.multipleSelection) {
@@ -421,7 +427,7 @@ export default {
       }
       if (this.auditForm.selectedIds.length === 0) {
         this.$message({
-          message: 'Select the record to operate on',// 请选择数据
+          message: 'Select the record to operate on', // 请选择数据
           type: 'warning'
         })
         return
@@ -430,6 +436,11 @@ export default {
       this.dialogAuditFormVisible = true
       this.auditForm.auditTips = title
       this.auditForm.auditStatus = status
+      if (status == '3') {
+        this.planPayDateVisible = true
+      } else {
+        this.planPayDateVisible = false
+      }
     },
     handleStatus () {
       network.postData('finance/mult-point', {opType: 2}).then(response => {
@@ -477,26 +488,26 @@ export default {
       }).catch(response => {
       })
     },
-    handleSelectionChange(val) {
+    handleSelectionChange (val) {
       this.multipleSelection = val
     },
-    handleCurrentChange(page) {
+    handleCurrentChange (page) {
       this.getData(page, this.pageSize)
     },
-    handleSizeChange(pageSize) {
+    handleSizeChange (pageSize) {
       this.getData(this.currentPage, pageSize)
     },
-    handleFilterStatusClick(tab, event) {
+    handleFilterStatusClick (tab, event) {
       filterHelper.clearFilterOption(this)
       this.getData()
     },
-    handleFilterUser(filterData) {
+    handleFilterUser (filterData) {
       filterHelper.handleFilterUser(this, filterData)
     },
-    handleFilter() {
+    handleFilter () {
       this.getData()
     },
-    getData(page, pageSize) {
+    getData (page, pageSize) {
       let filterData = this.filterModel
       filterData.filterStatus = this.filterStatus != '-1' ? `=,${this.filterStatus}` : ''
       let vueObj = this
@@ -505,9 +516,9 @@ export default {
         vueObj.filterTypes = response.filterTypes
       })
     },
-    onMessageCallback() {
+    onMessageCallback () {
       this.getData(this.currentPage, this.pageSize)
-    },
+    }
   }
 }
 </script>

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

@@ -48,13 +48,13 @@
                     <template slot="append">%</template>
                   </el-input>
                 </el-form-item>
-                <el-form-item label="US Price($)" p>
+                <el-form-item label="Member Price($)" p>
                     <el-input v-model="form.sellPriceStandard"></el-input>
                 </el-form-item>
-                <el-form-item label="Sales Price(₦)">
+                <el-form-item label="Member Price(₦)">
                     <el-input v-model="form.sellPrice"></el-input>
                 </el-form-item>
-                <el-form-item label="Market Price(₦)">
+                <el-form-item label="Retail Price(₦)">
                   <el-input v-model="form.marketPrice"></el-input>
                 </el-form-item>
                 <el-form-item label="Price BV" v-show="pvDisabled"><!-- 价格BV -->

backendEle/src/views/shop/index.vue

@@ -109,13 +109,13 @@
               <template slot="append">%</template>
             </el-input>
           </el-form-item>
-          <el-form-item label="US Price($)" p>
+          <el-form-item label="Member Price($)" p>
             <el-input v-model="form.sellPriceStandard"></el-input>
           </el-form-item>
-          <el-form-item label="Sales Price(₦)" p>
+          <el-form-item label="Member Price(₦)" p>
             <el-input v-model="form.sellPrice"></el-input>
           </el-form-item>
-          <el-form-item label="Market Price(₦)">
+          <el-form-item label="Retail Price(₦)">
             <el-input v-model="form.marketPrice"></el-input>
           </el-form-item>
           <el-form-item label="Price BV" v-show="pvDisabled"> <!-- 价格BV -->

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/app.php

@@ -28,6 +28,9 @@ return [
     'insufficientInventory' => 'Insufficient inventory',
     'soldOut' => 'Sold out',
     'productsDoesNotExists' => 'Products does not exists!',
+    'allowOnlyOne' => 'Only 1 can be purchased at a time',
+    'canNotBuy' => 'Please pay in EPP order',
+    'productsDoesSoldOut' => 'Products has sold out!',
     'cashDoesNotAdequate' => '余额不足，无法购买商品',
     'exchangePointDoesNotAdequate' => '兑换积分不足，无法购买商品',
     'travelPointDoesNotAdequate' => '旅游积分不足，无法购买商品',
@@ -199,8 +202,8 @@ return [
     'reportFormatIncorrect' => 'The format of the report data is incorrect',
     'memberNumberCanNotContainChineseCharacters' => 'Member number cannot contain Chinese characters',
     'pleaseSelectTheEntryLevel' => 'Please select the entry level',
-    'totalBVCanNotLessThanSelectedBV' => 'The total BV of self selected goods cannot be less than the BV of the selected entry level',
-    'totalBVCanNotLessThanNextSelectedLevelBV' => 'The total BV of self selected goods cannot exceed the BV value of the next level under the selected level',
+    'totalBVCanNotLessThanSelectedBV' => 'Please choose the correct Entry Level.',
+    'totalBVCanNotLessThanNextSelectedLevelBV' => 'Please choose the correct Entry Level.',
     'incorrectEntryType' => 'Incorrect entry type',
     'MembershipNumberFilledInitialPurchase' => 'Membership number must be filled in for initial purchase',
     'fillTheInstructorNumberTheMember' => 'For the first purchase, you must fill in the instructor number of the member',
@@ -303,4 +306,4 @@ return [
     'dataDoesNotExists' => 'The data does not exist',
 
 
-];
+];

common/messages/en-US/ctx.php

@@ -254,6 +254,92 @@ return [
     'shopOrderPayBV' => 'Pay BV',
 
     
+    #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' => '场景不存在',
@@ -276,98 +362,26 @@ return [
     'illegalRequest' => 'Illegal request',
     'invalidParameter' => 'Invalid Parameter',
     'dataDoesNotExists' => 'The data does not exist',
-    'memberName' => 'Member name',
-
-
-    /**【以下内容为会员端词条，如果管理端有相同词条，移入分割线之上使用即可，翻译完全部项目之后删除以下内容】
-     * 会员端翻译：Yii::t('app', 'addressId')
-     * 管理端翻译：Yii::t('ctx', 'addressId')
-     */
-    # 商城
-    'addressId' => 'Address',
-    'reconsume' => 'Reconsume',
-    'orderCode' => 'Order Code',
-    'orderDetail' => 'Order Detail',
-    'productCode' => 'Product Code',
-    'productName' => 'Product Name',
-    'productPrice' => 'Product Price',
-    'qty' => 'Qty',
-    'taxRate' => 'Tax Rate',
-    'totalTax' => 'Total Tax',
-    'totalAmount' => 'Total Amount',
-    'total' => 'Total',
-    'signature' => 'Signature',
-    'date' => 'Date',
-    'accountBalance' => 'Account Balance',
-    'travelBonus' => 'Travel Bonus',
-    'carFund' => 'Car Fund',
-    'villaFund' => 'Villa Fund',
-    'reconsumeSuccessfully' => '帮会员复消成功',
-    'reconsumeRemark' => '复销备注',
-    'standardProducts' => 'Standard Products',
-    'carFundProducts' => 'Car Fund Products',
-    'villaFundProducts' => 'Villa Fund Products',
-    'travelFundProducts' => 'Travel Fund Products',
-    'insufficientInventory' => 'Insufficient inventory',
-    'soldOut' => 'Sold out',
-    'productsDoesNotExists' => 'Products does not exists!',
-    'cashDoesNotAdequate' => '余额不足，无法购买商品',
-    'exchangePointDoesNotAdequate' => '兑换积分不足，无法购买商品',
-    'travelPointDoesNotAdequate' => '旅游积分不足，无法购买商品',
-    'carFundPointDoesNotAdequate' => '车奖积分不足，无法购买商品',
-    'villaPointDoesNotAdequate' => '房奖积分不足，无法购买商品',
-    'paymentInfoDoesNotExists' => '支付信息不存在',
-    'payAmountNotEqualOrderAmount' => '支付金额与订单金额不符',
-    'orderSn' => 'Order Code',
-    'expressCompany' => 'Express Company',
-    'orderTrackNo' => 'Track Code',
-    'remark' => 'Remark',
-    'orderType' => 'Order Type',
-    'payType' => 'Pay Type',
-    'productID' => 'Product ID',
-    'quantity' => 'Quantity',
-    'repeatSalesMemberNo' => 'UserName',
-    'consigneeNo' => 'Consignee',
-    'acceptMobile' => 'Accept Mobile',
-    'lgaName' => 'Lga Name',
-    'cityName' => 'City Name',
-    'detailAddress' => 'Address',
-    'shippingAddress' => 'shipping Address',
-
-    'orderDoesNotExist' => 'the order does not exist',
-    'orderHasBeenCancelCanNotDeliver ' => '订单已取消不能发货',
-    'orderHasBeenDeleteCanNotDeliver' => '订单已删除不能发货',
-    'orderPayStatusDoesNotSupportRefund' => '订单状态支付状态不支持退款',
-    'orderLogisticsStatusDoesNotSupportRefund' => '订单物流状态不支持退款',
-    'orderPayTypeDoesNotSupportRefund' => '订单支付方式不支持退款',
-    'paymentPasswordError' => 'The payment password is incorrect',
-    'shippingDoesNotExist' => 'the shipping address does not exist',
-    'payTypeError' => '支付方式错误',
-    'orderCanNotHasMoreClassification' => '订单不能包含多种商品分类',
-    'shopGoodClassificationError' => '商品分类错误',
-    'orderStatusTypeError' => '订单状态类型错误',
-    'orderStatusDoesNotChange' => '订单状态没有改变',
-    'orderHasBeenLogisticsStatusDoesNotChangedUnpaid' => '订单已经进入物流状态不能改为未支付',
-    'orderHasBeenInvalidCanNotProcess' => '订单已失效不能处理',
-    'orderCanNotBeenChangedLogistics' => '订单不能单独处理为物流状态',
-    'orderHasBeenFinishedCanNotCancel' => '订单已完成不能取消',
-    'orderHasBeenDeletedCanNotCancel' => '订单已删除不能取消',
-    'orderHasBeenFinishedCanNotDelete' => '订单已完成不能删除',
-    'flowTypeError' => '流水类型错误',
-    'flowCreateError' => '流水产生错误',
-    'doesNotYourSubMemberCanNotReconsume' => '不是您的伞下会员，不能为其复消',
-    'membersResellingBalancePayment' => 'Members reselling balance payment',
-    'membersExchangePointPayment' => '会员复销积分兑换',
-    'orderCanNotContainMultipleProductCategories' => 'Order cannot contain multiple product categories',
-
+    'operationAdministrator' => 'Operation Administrator',
+    'typeError' => 'Type error',
+    'contentError' => 'Content error',
+    'hideSuccessfully' => 'hide successfully',
+    'UnhideSuccessfully' => 'Unhide successfully',
 
     # 会员
     'memberCode' => 'Member Code',
     'memberName' => 'Member Name',
     'memberAddress' => 'Member Address',
     'memberPhone' => 'Member Phone',
+    'loginStatus' => 'Login Status',
+    'allowLogin' => 'Allow Login',
+    'prohibitLogin' => 'Prohibit Login',
+    'activate' => 'Activate',
+    'lock' => 'Lock',
+    'filterAllowLogin' => 'Filter Allow Login',
     'bankName' => 'Bank Name',
     'bankCode' => 'Bank Code',
+    'bankAccountNumber' => 'Bank Account Number',
     'admin' => 'Admin',
     'minCharge' => 'Min Charge',
     'maxCharge' => 'Max Charge',
@@ -416,7 +430,6 @@ return [
     'statusAt' => 'STATUS_AT',
     'verified' => 'VERIFIED',
     'verifiedAt' => 'VERIFIED_AT',
-    'allowLogin' => 'ALLOW_LOGIN',
     'notOperating' => 'NOT_OPERATING',
     'regFrom' => 'REG_FROM',
     'IDCardPrefix' => 'ID_CARD_PREFIX',
@@ -449,6 +462,141 @@ return [
     'isModifyPassword' => 'IS_MODIFY_PASSWORD',
     'isStudio' => 'IS_STUDIO',
     'email' => 'EMAIL',
+    'levelBeforeModification' => 'Level Before Modification',
+    'modifiedLevel' => 'Modified Level',
+
+    'moveMember' => 'Move Member',
+    'moveMemberName' => 'Move Member Name',
+    'uperCodeBeforeMoving' => 'Uper Code Before Moving',
+    'uperCodeAfterMoving' => 'Uper Code After Moving',
+    'typeOfMoving' => 'Type Of Moving',
+    'position' => 'Position',
+    'periodOfMoving' => 'Period Of Moving',
+    'whetherToMove' => 'Whether To Move',
+    'percentage' => 'Percentage',
+    'AdministratorOfMoving' => 'Administrator Of Moving',
+    'joiningDate' => 'Joining Date',
+    'joiningPeriod' => 'Joining Period',
+    'currentMemberLevel' => 'Current Member Level',
+    'currentAdjustmentDate' => 'Current Adjustment Date',
+    'PCMemberLevel' => 'PC Member Level',
+    'highestDirector' => 'Highest Director',
+    'latestDirector' => 'Latest Director',
+    'highestCrown' => 'Highest Crown',
+    'latestCrown' => 'Highest Crown',
+    'recommendationNo' => 'Recommendation No',
+    'recommendedName' => 'Recommended Name',
+    'placementNo' => 'Placement No',
+    'placementName' => 'Placement Name',
+    'resettlementArea' => 'Resettlement Area',
+    'phoneNumber' => 'Phone Number',
+    'alternatePhoneNumber' => 'Alternate Phone Number',
+    'stockistCode' => 'Stockist Code',
+    'whetherStockist' => 'Whether Stockist',
+    'stockistOrNot' => 'Stockist or not',
+    'whetherChartDisplay' => 'Whether Chart Display',
+    'whetherRechargeDisplay' => 'Whether Recharge Display',
+    'stockistLevel' => 'Stockist Level',
+    'commonAddress' => 'Common Address',
+    'enableTransfer' => 'Enable Transfer',
+    'activeStatus' => 'Active Status',
+    'locking' => 'Locking',
+    'activation' => 'Activation',
+    'on' => 'On',
+    'off' => 'Off',
+    'administratorOfReviewing' => 'Administrator Of Reviewing',
+    'reviewTime' => 'Review Time',
+    'I.Market' => 'I. Market',
+    'II.Market' => 'II. Market',
+
+    # 网络
+    'placementNetwork' => 'Placement Network',
+    'sponsorNetwork' => 'Sponsor Network',
+
+    /**【以下内容为会员端词条，如果管理端有相同词条，移入分割线之上使用即可，翻译完全部项目之后删除以下内容】
+     * 会员端翻译：Yii::t('app', 'addressId')
+     * 管理端翻译：Yii::t('ctx', 'addressId')
+     */
+    # 商城
+    'addressId' => 'Address',
+    'reconsume' => 'Reconsume',
+    'orderCode' => 'Order Code',
+    'orderDetail' => 'Order Detail',
+    'productCode' => 'Product Code',
+    'productName' => 'Product Name',
+    'productPrice' => 'Product Price',
+    'qty' => 'Qty',
+    'taxRate' => 'Tax Rate',
+    'totalTax' => 'Total Tax',
+    'totalAmount' => 'Total Amount',
+    'total' => 'Total',
+    'signature' => 'Signature',
+    'date' => 'Date',
+    'accountBalance' => 'Account Balance',
+    'travelBonus' => 'Travel Bonus',
+    'carFund' => 'Car Fund',
+    'villaFund' => 'Villa Fund',
+    'reconsumeSuccessfully' => '帮会员复消成功',
+    'reconsumeRemark' => '复销备注',
+    'standardProducts' => 'Standard Products',
+    'carFundProducts' => 'Car Fund Products',
+    'villaFundProducts' => 'Villa Fund Products',
+    'travelFundProducts' => 'Travel Fund Products',
+    'insufficientInventory' => 'Insufficient inventory',
+    'soldOut' => 'Sold out',
+    'productsDoesNotExists' => 'Products does not exists!',
+    'cashDoesNotAdequate' => '余额不足，无法购买商品',
+    'exchangePointDoesNotAdequate' => '兑换积分不足，无法购买商品',
+    'travelPointDoesNotAdequate' => '旅游积分不足，无法购买商品',
+    'carFundPointDoesNotAdequate' => '车奖积分不足，无法购买商品',
+    'villaPointDoesNotAdequate' => '房奖积分不足，无法购买商品',
+    'paymentInfoDoesNotExists' => '支付信息不存在',
+    'payAmountNotEqualOrderAmount' => '支付金额与订单金额不符',
+    'orderSn' => 'Order Code',
+    'expressCompany' => 'Express Company',
+    'orderTrackNo' => 'Track Code',
+    'remark' => 'Remark',
+    'orderType' => 'Order Type',
+    'payType' => 'Pay Type',
+    'productID' => 'Product ID',
+    'quantity' => 'Quantity',
+    'repeatSalesMemberNo' => 'UserName',
+    'consigneeNo' => 'Consignee',
+    'acceptMobile' => 'Accept Mobile',
+    'lgaName' => 'Lga Name',
+    'cityName' => 'City Name',
+    'detailAddress' => 'Address',
+    'shippingAddress' => 'shipping Address',
+
+    'orderDoesNotExist' => 'the order does not exist',
+    'orderHasBeenCancelCanNotDeliver ' => '订单已取消不能发货',
+    'orderHasBeenDeleteCanNotDeliver' => '订单已删除不能发货',
+    'orderPayStatusDoesNotSupportRefund' => '订单状态支付状态不支持退款',
+    'orderLogisticsStatusDoesNotSupportRefund' => '订单物流状态不支持退款',
+    'orderPayTypeDoesNotSupportRefund' => '订单支付方式不支持退款',
+    'paymentPasswordError' => 'The payment password is incorrect',
+    'shippingDoesNotExist' => 'the shipping address does not exist',
+    'payTypeError' => '支付方式错误',
+    'orderCanNotHasMoreClassification' => '订单不能包含多种商品分类',
+    'shopGoodClassificationError' => '商品分类错误',
+    'orderStatusTypeError' => '订单状态类型错误',
+    'orderStatusDoesNotChange' => '订单状态没有改变',
+    'orderHasBeenLogisticsStatusDoesNotChangedUnpaid' => '订单已经进入物流状态不能改为未支付',
+    'orderHasBeenInvalidCanNotProcess' => '订单已失效不能处理',
+    'orderCanNotBeenChangedLogistics' => '订单不能单独处理为物流状态',
+    'orderHasBeenFinishedCanNotCancel' => '订单已完成不能取消',
+    'orderHasBeenDeletedCanNotCancel' => '订单已删除不能取消',
+    'orderHasBeenFinishedCanNotDelete' => '订单已完成不能删除',
+    'flowTypeError' => '流水类型错误',
+    'flowCreateError' => '流水产生错误',
+    'doesNotYourSubMemberCanNotReconsume' => '不是您的伞下会员，不能为其复消',
+    'membersResellingBalancePayment' => 'Members reselling balance payment',
+    'membersExchangePointPayment' => '会员复销积分兑换',
+    'orderCanNotContainMultipleProductCategories' => 'Order cannot contain multiple product categories',
+
+
+    # 会员
+
 
     'fillingUpOfADeficit' => 'filling up of a deficit',
     'fullPayment' => 'full payment',
@@ -464,7 +612,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',
@@ -523,6 +671,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' => '开启关闭自动提现成功',
@@ -552,7 +783,7 @@ return [
 
     # 登录
     'refreshTokenFailed' => 'refresh token failed',
-    
+
     'accountDoesNotExist' => 'The account does not exist',
     'memberNameOrPasswordIncorrect' => 'The member name or password is incorrect',
     'abnormalMemberCode' => 'Abnormal member code',
@@ -572,4 +803,4 @@ return [
 
 
 
-];
+];

common/messages/zh-CN/app.php

@@ -28,6 +28,9 @@ return [
     'insufficientInventory' => '库存不足',
     'soldOut' => '已下架',
     'productsDoesNotExists' => '商品不存在',
+    'allowOnlyOne' => '分期商品每次只可购买1个',
+    'canNotBuy' => '分期商品请按顺序购买',
+    'productsDoesSoldOut' => '商品已下架',
     'cashDoesNotAdequate' => '余额不足，无法购买商品',
     'exchangePointDoesNotAdequate' => '兑换积分不足，无法购买商品',
     'travelPointDoesNotAdequate' => '旅游积分不足，无法购买商品',

common/messages/zh-CN/ctx.php

@@ -253,6 +253,90 @@ return [
     'shopOrderPaymentAmount' => '支付金额',
     'shopOrderPayBV' => '支付BV',
 
+    #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' => '场景不存在',
@@ -278,97 +362,23 @@ return [
     'illegalRequest' => '非法请求',
     'invalidParameter' => '无效参数',
     'dataDoesNotExists' => '数据不存在',
-    'memberName' => '会员姓名',
-
-
-    /**【以下内容为会员端词条，如果管理端有相同词条，移入分割线之上使用即可，翻译完全部项目之后删除以下内容】
-     * 会员端翻译：Yii::t('app', 'addressId')
-     * 管理端翻译：Yii::t('ctx', 'addressId')
-     */
-    # 商城
-    'addressId' => '收货地址',
-    'orderCode' => '订单号',
-    'orderDetail' => '订单详情',
-    'productCode' => '商品编号',
-    'productName' => '商品名字',
-    'productPrice' => '商品价格',
-    'qty' => '数量',
-    'taxRate' => '税率',
-    'totalTax' => '数额总计',
-    'totalAmount' => '总金额',
-    'total' => '总计',
-    'signature' => '签名',
-    'date' => '日期',
-    'accountBalance' => '账户余额',
-    'travelBonus' => '旅游积分',
-    'carFund' => '车奖积分',
-    'villaFund' => '房奖积分',
-    'reconsumeSuccessfully' => '帮会员复消成功',
-    'reconsume' => '帮会员复销',
-    'reconsumeRemark' => '复销备注',
-    'standardProducts' => '普通商品列表',
-    'carFundProducts' => '车奖积分商品',
-    'villaFundProducts' => '房奖积分商品',
-    'travelFundProducts' => '旅游积分商品',
-    'insufficientInventory' => '库存不足',
-    'soldOut' => '已下架',
-    'productsDoesNotExists' => '商品不存在',
-    'cashDoesNotAdequate' => '余额不足，无法购买商品',
-    'exchangePointDoesNotAdequate' => '兑换积分不足，无法购买商品',
-    'travelPointDoesNotAdequate' => '旅游积分不足，无法购买商品',
-    'carFundPointDoesNotAdequate' => '车奖积分不足，无法购买商品',
-    'villaPointDoesNotAdequate' => '房奖积分不足，无法购买商品',
-    'paymentInfoDoesNotExists' => '支付信息不存在',
-    'payAmountNotEqualOrderAmount' => '支付金额与订单金额不符',
-
-
-    'orderSn' => '订单号',
-    'expressCompany' => '快递公司',
-    'orderTrackNo' => '快递单号',
-    'remark' => '备注',
-    'orderType' => '订单类型',
-    'payType' => '支付方式',
-    'productID' => '商品ID',
-    'quantity' => '商品数量',
-    'repeatSalesMemberNo' => '复消会员编号',
-    'consignee' => '收货人',
-    'acceptMobile' => '收货电话',
-    'lgaName' => '地域',
-    'cityName' => '城市',
-    'detailAddress' => '详细地址',
-    'shippingAddress' => '收货地址',
-
-    'orderDoesNotExist' => '订单不存在',
-    'orderHasBeenCancelCanNotDeliver ' => '订单已取消不能发货',
-    'orderHasBeenDeleteCanNotDeliver' => '订单已删除不能发货',
-    'orderPayStatusDoesNotSupportRefund' => '订单状态支付状态不支持退款',
-    'orderLogisticsStatusDoesNotSupportRefund' => '订单物流状态不支持退款',
-    'orderPayTypeDoesNotSupportRefund' => '订单支付方式不支持退款',
-    'paymentPasswordError' => '支付密码不正确',
-    'shippingDoesNotExist' => '收货地址不存在',
-    'payTypeError' => '支付方式错误',
-    'orderCanNotHasMoreClassification' => '订单不能包含多种商品分类',
-    'shopGoodClassificationError' => '商品分类错误',
-    'orderStatusTypeError' => '订单状态类型错误',
-    'orderStatusDoesNotChange' => '订单状态没有改变',
-    'orderHasBeenLogisticsStatusDoesNotChangedUnpaid' => '订单已经进入物流状态不能改为未支付',
-    'orderHasBeenInvalidCanNotProcess' => '订单已失效不能处理',
-    'orderCanNotBeenChangedLogistics' => '订单不能单独处理为物流状态',
-    'orderHasBeenFinishedCanNotCancel' => '订单已完成不能取消',
-    'orderHasBeenDeletedCanNotCancel' => '订单已删除不能取消',
-    'orderHasBeenFinishedCanNotDelete' => '订单已完成不能删除',
-    'flowTypeError' => '流水类型错误',
-    'flowCreateError' => '流水产生错误',
-    'doesNotYourSubMemberCanNotReconsume' => '不是您的伞下会员，不能为其复消',
-    'orderCanNotContainMultipleProductCategories' => '订单不能包含多种商品分类',
-    'dataFormatError' => '数据格式错误',
+    'operationAdministrator' => '操作管理员',
+    'levelBeforeModification' => '修改前级别',
+    'modifiedLevel' => '修改后级别',
 
     # 会员
     'memberCode' => '会员编号',
     'memberName' => '会员名字',
     'memberAddress' => '收货地址',
+    'loginStatus' => '登录状态',
+    'allowLogin' => '允许登录',
+    'prohibitLogin' => '禁止登录',
+    'activate' => '激活',
+    'lock' => '锁定',
+    'filterAllowLogin' => '筛选允许登录',
     'bankName' => '银行名称',
     'bankCode' => '银行代码',
+    'bankAccountNumber' => '银行帐号',
     'admin' => '操作人',
     'minCharge' => '最低手续费',
     'maxCharge' => '最高手续费',
@@ -418,7 +428,6 @@ return [
     'statusAt' => '状态更改时间',
     'verified' => '是否认证',
     'verifiedAt' => '认证时间',
-    'allowLogin' => '允许登录',
     'notOperating' => '不运作',
     'regFrom' => '注册类型',
     'IDCardPrefix' => '身份证前缀',
@@ -452,6 +461,144 @@ return [
     'isStudio' => '是否是工作室',
     'email' => '电子邮箱',
 
+    'moveMember' => '移动的会员',
+    'moveMemberName' => '移动的会员名字',
+    'uperCodeBeforeMoving' => '移动前接点',
+    'uperCodeAfterMoving' => '移动后接点',
+    'typeOfMoving' => '移网类型',
+    'position' => '移动到位置',
+    'periodOfMoving' => '移动时的期数',
+    'whetherToMove' => '是否正在移动',
+    'percentage' => '移动百分比',
+    'AdministratorOfMoving' => '移网管理员',
+//    'joiningDate' => '加入日期',
+//    'joiningPeriod' => '加入期数',
+    'currentMemberLevel' => '实时会员级别',
+    'currentAdjustmentDate' => '实时调整日期',
+//    'PCMemberLevel' => '结算时会员级别',
+    'highestDirector' => '最高管理星级',
+//    'latestDirector' => '最新管理星级',
+    'highestCrown' => '最高皇冠星级',
+//    'latestCrown' => '最新皇冠星级',
+    'recommendationNo' => '推荐编号',
+    'recommendedName' => '推荐姓名',
+    'placementNo' => '安置编号',
+    'placementName' => '安置姓名',
+    'resettlementArea' => '安置区域',
+//    'phoneNumber' => '手机号码',
+//    'alternatePhoneNumber' => '备用手机号码',
+    'stockistCode' => '所属报单中心编号',
+//    'whetherStockist' => '是否报单中心',
+    'stockistOrNot' => '是否报单中心',
+    'whetherChartDisplay' => '是否显示图谱',
+    'whetherRechargeDisplay' => '是否显示充值',
+    'stockistLevel' => '报单中心级别',
+    'commonAddress' => '常用地址',
+    'enableTransfer' => '转账功能开启',
+    'activeStatus' => '激活状态',
+    'locking' => '锁定中',
+    'activation' => '已激活',
+    'on' => '开启',
+    'off' => '关闭',
+    'administratorOfReviewing' => '审核管理员',
+    'reviewTime' => '审核时间',
+    'I.Market' => '一市场',
+    'II.Market' => '二市场',
+
+    # 网络
+    'placementNetwork' => '安置网络',
+    'sponsorNetwork' => '开拓网络',
+    'typeError' => '类型错误',
+    'contentError' => '内容错误',
+    'hideSuccessfully' => '隐藏成功',
+    'UnhideSuccessfully' => '取消隐藏成功',
+
+
+    /**【以下内容为会员端词条，如果管理端有相同词条，移入分割线之上使用即可，翻译完全部项目之后删除以下内容】
+     * 会员端翻译：Yii::t('app', 'addressId')
+     * 管理端翻译：Yii::t('ctx', 'addressId')
+     */
+    # 商城
+    'addressId' => '收货地址',
+    'orderCode' => '订单号',
+    'orderDetail' => '订单详情',
+    'productCode' => '商品编号',
+    'productName' => '商品名字',
+    'productPrice' => '商品价格',
+    'qty' => '数量',
+    'taxRate' => '税率',
+    'totalTax' => '数额总计',
+    'totalAmount' => '总金额',
+    'total' => '总计',
+    'signature' => '签名',
+    'date' => '日期',
+    'accountBalance' => '账户余额',
+    'travelBonus' => '旅游积分',
+    'carFund' => '车奖积分',
+    'villaFund' => '房奖积分',
+    'reconsumeSuccessfully' => '帮会员复消成功',
+    'reconsume' => '帮会员复销',
+    'reconsumeRemark' => '复销备注',
+    'standardProducts' => '普通商品列表',
+    'carFundProducts' => '车奖积分商品',
+    'villaFundProducts' => '房奖积分商品',
+    'travelFundProducts' => '旅游积分商品',
+    'insufficientInventory' => '库存不足',
+    'soldOut' => '已下架',
+    'productsDoesNotExists' => '商品不存在',
+    'cashDoesNotAdequate' => '余额不足，无法购买商品',
+    'exchangePointDoesNotAdequate' => '兑换积分不足，无法购买商品',
+    'travelPointDoesNotAdequate' => '旅游积分不足，无法购买商品',
+    'carFundPointDoesNotAdequate' => '车奖积分不足，无法购买商品',
+    'villaPointDoesNotAdequate' => '房奖积分不足，无法购买商品',
+    'paymentInfoDoesNotExists' => '支付信息不存在',
+    'payAmountNotEqualOrderAmount' => '支付金额与订单金额不符',
+
+
+    'orderSn' => '订单号',
+    'expressCompany' => '快递公司',
+    'orderTrackNo' => '快递单号',
+    'remark' => '备注',
+    'orderType' => '订单类型',
+    'payType' => '支付方式',
+    'productID' => '商品ID',
+    'quantity' => '商品数量',
+    'repeatSalesMemberNo' => '复消会员编号',
+    'consignee' => '收货人',
+    'acceptMobile' => '收货电话',
+    'lgaName' => '地域',
+    'cityName' => '城市',
+    'detailAddress' => '详细地址',
+    'shippingAddress' => '收货地址',
+
+    'orderDoesNotExist' => '订单不存在',
+    'orderHasBeenCancelCanNotDeliver ' => '订单已取消不能发货',
+    'orderHasBeenDeleteCanNotDeliver' => '订单已删除不能发货',
+    'orderPayStatusDoesNotSupportRefund' => '订单状态支付状态不支持退款',
+    'orderLogisticsStatusDoesNotSupportRefund' => '订单物流状态不支持退款',
+    'orderPayTypeDoesNotSupportRefund' => '订单支付方式不支持退款',
+    'paymentPasswordError' => '支付密码不正确',
+    'shippingDoesNotExist' => '收货地址不存在',
+    'payTypeError' => '支付方式错误',
+    'orderCanNotHasMoreClassification' => '订单不能包含多种商品分类',
+    'shopGoodClassificationError' => '商品分类错误',
+    'orderStatusTypeError' => '订单状态类型错误',
+    'orderStatusDoesNotChange' => '订单状态没有改变',
+    'orderHasBeenLogisticsStatusDoesNotChangedUnpaid' => '订单已经进入物流状态不能改为未支付',
+    'orderHasBeenInvalidCanNotProcess' => '订单已失效不能处理',
+    'orderCanNotBeenChangedLogistics' => '订单不能单独处理为物流状态',
+    'orderHasBeenFinishedCanNotCancel' => '订单已完成不能取消',
+    'orderHasBeenDeletedCanNotCancel' => '订单已删除不能取消',
+    'orderHasBeenFinishedCanNotDelete' => '订单已完成不能删除',
+    'flowTypeError' => '流水类型错误',
+    'flowCreateError' => '流水产生错误',
+    'doesNotYourSubMemberCanNotReconsume' => '不是您的伞下会员，不能为其复消',
+    'orderCanNotContainMultipleProductCategories' => '订单不能包含多种商品分类',
+    'dataFormatError' => '数据格式错误',
+
+    # 会员
+
+
 
 
     'fillingUpOfADeficit' => '补差额',
@@ -468,7 +615,7 @@ return [
     'failedToGenerateMemberNumber' => '会员编号生成失败',
     'memberNumberDoesNotExist' => '会员编号不存在',
     'repeatSalesMemberNoDoesNotExist' => '复消会员编号不存在',
-    
+
     'memberDoesNotInSamePlacementNetwork' => '会员与当前用户不再同一安置网络内',
     'viewSubMembersMost' => '最多查看会员的前20层子会员',
     'upgradeMethodIncorrect' => '升级方式不正确，请联系客服人员',
@@ -527,6 +674,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' => '开启关闭自动提现成功',
@@ -561,7 +793,6 @@ return [
 
     # 登录
     'refreshTokenFailed' => '刷新token失败',
-    
     'wrongTransactionType' => '错误的交易类型',
     'accountDoesNotExist' => '账号不存在',
     'memberNameOrPasswordIncorrect' => '用户名或密码错误',
@@ -575,4 +806,4 @@ return [
 
 
 
-];
+];

common/models/DeclarationLevel.php

@@ -117,10 +117,10 @@ class DeclarationLevel extends \common\components\ActiveRecord
     // 获取下一级业绩数据
     public static function getNextDecPref($perf) {
         $data = static::find()
-        ->where('PERF>:PERF', 
+        ->where('PERF>:PERF',
             [
-                'PERF'=>$perf, 
-                
+                'PERF'=>$perf,
+
             ]
         )
         ->orderBy('PERF ASC')
@@ -133,10 +133,10 @@ class DeclarationLevel extends \common\components\ActiveRecord
 
     public static function getNextAll($perf){
         $data = static::find()
-        ->where('PERF>:PERF', 
+        ->where('PERF>:PERF',
             [
-                'PERF'=>$perf, 
-                
+                'PERF'=>$perf,
+
             ]
         )
         ->indexBy('ID')
@@ -257,4 +257,4 @@ class DeclarationLevel extends \common\components\ActiveRecord
         }
         return $data;
     }
-}
+}

common/models/Instalment.php

@@ -0,0 +1,55 @@
+<?php
+
+namespace common\models;
+
+use Yii;
+
+/**
+ * This is the model class for table "{{%ORDER}}".
+ *
+ * @property string $ID
+ * @property string $USER_ID 用户ID
+ * @property string $ORDER_TYPE 订单类型：BD, FX
+ * @property string $STAGE 分期阶段
+ * @property int $UPDATE_TIME 修改时间
+ */
+class Instalment extends \common\components\ActiveRecord
+{
+    /**
+     * {@inheritdoc}
+     */
+    public static function tableName()
+    {
+        return '{{%INSTALMENT}}';
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function rules()
+    {
+        return [
+        ];
+    }
+
+    /**
+     * @param $userId
+     * @return integer
+     */
+    public static function getStage($userId) {
+        $user = static::findOneAsArray("USER_ID = :USER_ID", [':USER_ID' => $userId]);
+        if(!$user){
+            return 0;
+        }
+        return $user['STAGE'];
+    }
+
+    public static function getInfo($userId) {
+        $userInfo = static::findOneAsArray("USER_ID = :USER_ID", [':USER_ID' => $userId]);
+        if(!$userInfo){
+            return [
+            ];
+        }
+        return $userInfo;
+    }
+}

common/models/UserMove.php

@@ -39,8 +39,8 @@ class UserMove extends \common\components\ActiveRecord
     const TYPE_RELATION = NetPoint::NET_TYPE_RELATION;
 
     const TYPE_NAME = [
-        self::TYPE_NETWORK => ['id' => self::TYPE_NETWORK, 'name' => 'Placement network',], // 安置网络
-        self::TYPE_RELATION => ['id' => self::TYPE_RELATION, 'name' => 'Sponsor network',], // 开拓网络
+        self::TYPE_NETWORK => ['id' => self::TYPE_NETWORK, 'name' => 'Placement network', 'label' => 'placementNetwork'], // 安置网络
+        self::TYPE_RELATION => ['id' => self::TYPE_RELATION, 'name' => 'Sponsor network', 'label' => 'sponsorNetwork'], // 开拓网络
     ];
 
     const STATUS_APPLIED = 0;       // 已申请

common/models/Withdraw.php

@@ -88,8 +88,8 @@ class Withdraw extends \common\components\ActiveRecord {
      */
     public function rules() {
         return [
-            [['USER_ID', 'P_MONTH', 'CREATED_AT', 'PLAN_PAID_AT'], 'required'],
-            [['WITHDRAW_PERIOD_NUM', 'WITHDRAW_YEAR', 'WITHDRAW_MONTH', 'IS_AUTO_WITHDRAW', 'BANK_PROVINCE', 'BANK_CITY', 'BANK_COUNTY', 'AUDIT_STATUS', 'CREATED_AT', 'UPDATED_AT', 'AUDITED_AT', 'PLAN_PAID_AT', 'PAID_AT', 'PAID_FAIL_AT', 'BACK_FAIL_AT', 'PAY_TYPE'], 'integer'],
+            [['USER_ID', 'P_MONTH', 'CREATED_AT',], 'required'],
+            [['WITHDRAW_PERIOD_NUM', 'WITHDRAW_YEAR', 'WITHDRAW_MONTH', 'IS_AUTO_WITHDRAW', 'BANK_PROVINCE', 'BANK_CITY', 'BANK_COUNTY', 'AUDIT_STATUS', 'CREATED_AT', 'UPDATED_AT', 'AUDITED_AT', 'PAID_AT', 'PAID_FAIL_AT', 'BACK_FAIL_AT', 'PAY_TYPE'], 'integer'],
             [['AMOUNT','FEES','REAL_AMOUNT'], 'number'],
             [['ID', 'SN', 'USER_ID', 'INVOICE_ID', 'OPEN_BANK', 'BANK_NO', 'UPDATE_ADMIN', 'AUDIT_ADMIN'], 'string', 'max' => 32],
             [['ID_CARD'], 'string', 'max' => 20],
@@ -346,42 +346,48 @@ class Withdraw extends \common\components\ActiveRecord {
             'newStatusName' => $statusName[$toStatus]
         ]);
         switch ($toStatus) {
-            //已审核
-            case Withdraw::STATUS_AUDITED:
-                if ($nowStatus == Withdraw::STATUS_APPLIED) {
+            // 取消审核
+            case Withdraw::STATUS_APPLIED; // 0 待审核 取消审核
+                if ($nowStatus == Withdraw::STATUS_WAIT_PAID) {
                     $msg = '';
                 }
                 break;
+            //已审核
+//            case Withdraw::STATUS_AUDITED: // 2 已审核
+//                if ($nowStatus == Withdraw::STATUS_APPLIED) {
+//                    $msg = '';
+//                }
+//                break;
             //待付款
-            case Withdraw::STATUS_WAIT_PAID:
-                if ($nowStatus == Withdraw::STATUS_AUDITED || $nowStatus == Withdraw::STATUS_PAID_FALSE) {
+            case Withdraw::STATUS_WAIT_PAID: // 3 待复核
+                if ($nowStatus == Withdraw::STATUS_APPLIED) {
                     $msg = '';
                 }
                 break;
             //已付款
-            case Withdraw::STATUS_PAID:
+            case Withdraw::STATUS_PAID: // 6 已付款
                 if ($nowStatus == Withdraw::STATUS_WAIT_PAID) {
                     $msg = '';
                 }
                 break;
             //付款失败
-            case Withdraw::STATUS_PAID_FALSE:
-                if ($nowStatus == Withdraw::STATUS_PAID) {
-                    $msg = '';
-                }
-                break;
+//            case Withdraw::STATUS_PAID_FALSE:
+//                if ($nowStatus == Withdraw::STATUS_PAID) {
+//                    $msg = '';
+//                }
+//                break;
             //提现退回
-            case Withdraw::STATUS_RETURN:
-                if ($nowStatus == Withdraw::STATUS_APPLIED  || $nowStatus == Withdraw::STATUS_AUDITED || Withdraw::STATUS_WAIT_PAID) {
-                    $msg = '';
-                }
-                break;
-            //审核拒绝
-            case Withdraw::STATUS_REFUSED:
+            case Withdraw::STATUS_RETURN: // 7 已退回
                 if ($nowStatus == Withdraw::STATUS_APPLIED) {
                     $msg = '';
                 }
                 break;
+            //审核拒绝
+//            case Withdraw::STATUS_REFUSED:
+//                if ($nowStatus == Withdraw::STATUS_APPLIED) {
+//                    $msg = '';
+//                }
+//                break;
             default:
         }
         return $msg;

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/ApproachDeclarationForm.php

@@ -28,6 +28,7 @@ use common\models\User;
 use common\models\UserInfo;
 use common\models\UserNetwork;
 use common\models\UserRelation;
+use common\models\Instalment;
 use Yii;
 use yii\base\Exception;
 
@@ -648,6 +649,7 @@ class ApproachDeclarationForm extends Model
                     $totalAmount = 0;
                     $totalAmountStandard = 0;
                     $totalPv = 0;
+                    $hasInstalment = 0;
                     $exchangeRate = floatval(Cache::getSystemConfig()['exchangeRate']['VALUE'] ?? 0); // 汇率
                     foreach ($this->goodsNum as $k => $v) {
                         if ($v) {
@@ -674,10 +676,16 @@ class ApproachDeclarationForm extends Model
                                     'TAX_RATE' => $goods['TAX_RATE'],
                                 ];
                             }
+                            if($goods['INSTALMENT']>0){
+                                $hasInstalment = $goods['INSTALMENT'];
+                            }
                         }
                     }
-                    if ($totalPv < $decLevel['PERF']) {
-                        throw new Exception(Yii::t('app', 'totalBVCanNotLessThanSelectedBV'));
+                    if($totalPv<$decLevel['PERF']){
+                        if ($hasInstalment && $decLevel['LEVEL_NAME'] == 'Elite'){
+                        }else{
+                            throw new Exception(Yii::t('app', 'totalBVCanNotLessThanSelectedBV'));
+                        }
                     }
                     foreach ($decLevelConfig as $key => $val) {
                         if ($totalPv >= $val['PERF']) {
@@ -685,7 +693,10 @@ class ApproachDeclarationForm extends Model
                         }
                     }
                     if ($this->decLv != $toDecLevel) {
-                        throw new Exception(Yii::t('app', 'totalBVCanNotLessThanNextSelectedLevelBV'));
+                        if ($hasInstalment && $decLevel['LEVEL_NAME'] == 'Elite'){
+                        }else{
+                            throw new Exception(Yii::t('app', 'totalBVCanNotLessThanNextSelectedLevelBV'));
+                        }
                     }
                     $this->_decAmount = $totalAmount;
                     $this->_decPv = $totalPv;
@@ -693,7 +704,7 @@ class ApproachDeclarationForm extends Model
                     $this->_standardAmount = $this->_decAmountStandard;
                 }
 
-                if (!($this->addUser($allData))) {
+                if (!($zcResult = $this->addUser($allData))) {
                     throw new Exception(Form::formatErrorsForApi($this->_userForm->getErrors()));
                 }
 
@@ -701,7 +712,11 @@ class ApproachDeclarationForm extends Model
                 if (!$decResult) {
                     throw new Exception(Form::formatErrorsForApi($decResult->getErrors()));
                 }
-
+                if($hasInstalment){
+                    if(!($instalmentResult = $this->insertInstalment($zcResult))) {
+                        throw new Exception(Form::formatErrorsForApi('h'));
+                    }
+                }
                 return $decResult;
             } catch (\Exception $e) {
 //                throw new Exception(Form::formatErrorsForApi($e->getFile() . ' ' . $e->getLine() . ' ' . $e->getMessage()));
@@ -923,4 +938,24 @@ class ApproachDeclarationForm extends Model
         return true;
     }
 
+    /**
+     * 添加会员分期付款记录
+     * @param $allData
+     * @return bool|UserInfo|null
+     * @throws \yii\db\Exception
+     */
+    public function insertInstalment($zcResult){
+        // 增加会员分期付款记录
+        $instalment = new Instalment();
+        $instalment->USER_ID = $zcResult->USER_ID;
+        $instalment->STAGE = 1;
+        $instalment->ORDER_TYPE = 'BD';
+        $instalment->UPDATE_TIME = time();
+
+        if (!$instalment->save()) {
+            throw new Exception(Form::formatErrorsForApi($instalment->getErrors()));
+        }
+        return $instalment;
+    }
+
 }

common/models/forms/ApproachDeclarationLoopForm.php

@@ -122,7 +122,7 @@ class ApproachDeclarationLoopForm extends Model
                 if (isset($value['packageId']) && $value['packageId']){
                     $packagedata = DeclarationPackage::findOneAsArray('ID=:ID', [':ID' => $value['packageId']]);
                     if (!$packagedata) {
-                        throw new Exception(Yii::t('app', 'productsDoesNotExists'));
+                        throw new Exception(Yii::t('app', 'productsDoesSoldOut'));
                     }
                     if($packagedata['STORE_NUMS']>0){
                         $data =  DeclarationPackage::find()->where(['ID'=> $packagedata['ID'] ])->one();
@@ -144,7 +144,15 @@ class ApproachDeclarationLoopForm extends Model
                     for ($i = 0; $i < count($value['goodsId']) ;$i++) {
                         $goods = ShopGoods::findOneAsArray('ID=:ID',[':ID'=> $value['goodsId'][$i]]);
                         if (!$goods) {
-                            throw new Exception(Yii::t('app', 'productsDoesNotExists'));
+                            throw new Exception(Yii::t('app', 'productsDoesSoldOut'));
+                        }
+                        if($goods['INSTALMENT']>0){ // 分期的商品
+                            if($value['goodsNum'][$i]>1){ // 只能购买一个
+                                throw new Exception(Yii::t('app', 'allowOnlyOne'));
+                            }
+                        }
+                        if($goods['INSTALMENT']>1){ // 不允许购买“非第一期”的商品
+                            throw new Exception(Yii::t('app', 'canNotBuy'));
                         }
                         if ($goods['STATUS'] == 1 ){
                             if($goods['STORE_NUMS'] >= $value['goodsNum'][$i]) {

common/models/forms/ApproachOrderForm.php

@@ -26,6 +26,7 @@ use common\models\Region;
 use common\models\ShopGoods;
 use common\models\User;
 use common\models\UserNetwork;
+use common\models\Instalment;
 use Yii;
 use yii\base\Exception;
 
@@ -410,12 +411,13 @@ class ApproachOrderForm extends Model
         $totalPv = 0;
         $totalAmountStandard = 0;
         $goodsType = ShopGoods::GOODS_TYPE;
+        $hasInstalment = 0;
         $exchangeRate = floatval(Cache::getSystemConfig()['exchangeRate']['VALUE'] ?? 0); // 汇率
         foreach ($this->goodsNum as $k => $v) {
             if ($v) {
                 $goods = ShopGoods::findOneAsArray('ID=:ID AND STATUS=1',[':ID'=> $ids[$k]]);
                 if (!$goods) {
-                    throw new Exception(Yii::t('app', 'productsDoesNotExists'));
+                    throw new Exception(Yii::t('app', 'productsDoesSoldOut'));
                 }
                 if($goods['STORE_NUMS']>0){
                     if ($goods['TYPE'] == 1 || $goods['TYPE'] == 2) {
@@ -452,6 +454,21 @@ class ApproachOrderForm extends Model
                         'EXCHANGE_RATE' => $exchangeRate,
                     ];
                 }
+                if($goods['INSTALMENT']>0){ // 如果有分期付款商品，检查用户的分期付款状态
+                    if($v>1){ // 不可以购买多个
+                        throw new Exception(Yii::t('app', 'allowOnlyOne'));
+                    }
+                    $loginUserId = \Yii::$app->user->id;
+                    $userStage = Instalment::getStage($loginUserId);
+                    if ($userStage==0 || $userStage == 3){
+
+                    }else{
+                        if($userStage + 1 != $goods['INSTALMENT']){ // 若用户分期阶段+1不等于商品的分期阶段，则报异常
+                            throw new Exception(Yii::t('app', 'canNotBuy'));
+                        }
+                    }
+                    $hasInstalment = $goods['INSTALMENT'];
+                }
             }
         }
 
@@ -479,6 +496,16 @@ class ApproachOrderForm extends Model
             if (!$orderResult = $this->addOrder()) {
                 throw new Exception(Form::formatErrorsForApi($orderResult->getErrors()));
             }
+            if ($hasInstalment){ // 如果有分期付款的商品，写入信息至分期付款表
+                $instalmentModel = Instalment::findOne(['USER_ID'=>$loginUserId]);
+                if(!$instalmentModel) {
+                    $instalmentModel = new Instalment();
+                }
+                $instalmentModel->USER_ID = $loginUserId;
+                $instalmentModel->STAGE = $hasInstalment;
+                $instalmentModel->UPDATE_TIME = time();
+                $instalmentModel->save();
+            }
 
             $transaction->commit();
 

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;

common/models/forms/BaApproachDeclarationLoopForm.php

@@ -121,7 +121,7 @@ class BaApproachDeclarationLoopForm extends Model
                 if (isset($value['packageId']) && $value['packageId']){
                     $packagedata = DeclarationPackage::findOneAsArray('ID=:ID', [':ID' => $value['packageId']]);
                     if (!$packagedata) {
-                        throw new Exception(Yii::t('app', 'productsDoesNotExists'));
+                        throw new Exception(Yii::t('app', 'productsDoesSoldOut'));
                     }
                     if($packagedata['STORE_NUMS']>0){
                         $data =  DeclarationPackage::find()->where(['ID'=> $packagedata['ID'] ])->one();

common/models/forms/BaApproachOrderForm.php

@@ -355,7 +355,7 @@ class BaApproachOrderForm extends Model
             if ($v) {
                 $goods = ShopGoods::findOneAsArray('ID = :ID AND STATUS = 1', [':ID' => $ids[$k]]);
                 if (!$goods) {
-                    throw new Exception(Yii::t('app', 'productsDoesNotExists'));
+                    throw new Exception(Yii::t('app', 'productsDoesSoldOut'));
                 }
                 if ($goods['STORE_NUMS'] > 0) {
                     if ($goods['TYPE'] == 1 || $goods['TYPE'] == 2) {

common/models/forms/BaDeclarationLoopForm.php

@@ -120,7 +120,7 @@ class BaDeclarationLoopForm extends Model
                     for ($i=0;$i<count($value['goodsId']);$i++){
                         $goods = ShopGoods::findOneAsArray('ID=:ID',[':ID'=> $value['goodsId'][$i]]);
                         if (!$goods) {
-                            throw new Exception(Yii::t('app', 'productsDoesNotExists'));
+                            throw new Exception(Yii::t('app', 'productsDoesSoldOut'));
                         }
                         if ($goods['STATUS'] == 1 ){
                             if($goods['STORE_NUMS'] >= $value['goodsNum'][$i]){

common/models/forms/DeclarationForm.php

@@ -25,6 +25,7 @@ use common\models\User;
 use common\models\UserInfo;
 use common\models\UserNetwork;
 use common\models\UserRelation;
+use common\models\Instalment;
 use Yii;
 use yii\base\Exception;
 
@@ -669,6 +670,7 @@ class DeclarationForm extends Model
                 $totalAmount = 0;
                 $totalAmountStandard = 0;
                 $totalPv = 0;
+                $hasInstalment = 0;
                 $exchangeRate = floatval(Cache::getSystemConfig()['exchangeRate']['VALUE'] ?? 0); // 汇率
                 foreach ($this->goodsNum as $k => $v) {
                     if ($v) {
@@ -703,17 +705,29 @@ class DeclarationForm extends Model
                             }
                             $data->update();
                         }
+                        if($goods['INSTALMENT']>0){
+                            $hasInstalment = $goods['INSTALMENT'];
+                        }
                     }
                 }
                 if($totalPv<$decLevel['PERF']){
-                    throw new Exception(Yii::t('app', 'totalBVCanNotLessThanSelectedBV'));
+                    if ($hasInstalment && $decLevel['LEVEL_NAME'] == 'Elite'){
+                    }else{
+                        throw new Exception(Yii::t('app', 'totalBVCanNotLessThanSelectedBV'));
+                    }
                 }
                 foreach ($decLevelConfig as $key=>$val){
                     if($totalPv>=$val['PERF']){
                         $toDecLevel = $key;
                     }
                 }
-                if($this->decLv!=$toDecLevel){
+                if ($this->decLv != $toDecLevel) {
+                    if ($hasInstalment && $decLevel['LEVEL_NAME'] == 'Elite'){
+                    }else{
+                        throw new Exception(Yii::t('app', 'totalBVCanNotLessThanNextSelectedLevelBV'));
+                    }
+                }
+                if ($hasInstalment && $decLevel['LEVEL_NAME'] == 'BA'){
                     throw new Exception(Yii::t('app', 'totalBVCanNotLessThanNextSelectedLevelBV'));
                 }
                 $this->_decAmount = $totalAmount;
@@ -733,6 +747,11 @@ class DeclarationForm extends Model
             if(!($decResult = $this->addDecOrder())) {
                 throw new Exception(Form::formatErrorsForApi($decResult->getErrors()));
             }
+            if($hasInstalment){
+                if(!($instalmentResult = $this->insertInstalment($zcResult))) {
+                    throw new Exception(Form::formatErrorsForApi('h'));
+                }
+            }
         }
         return true;
     }
@@ -957,4 +976,24 @@ class DeclarationForm extends Model
         return true;
     }
 
+    /**
+     * 添加会员分期付款记录
+     * @param $allData
+     * @return bool|UserInfo|null
+     * @throws \yii\db\Exception
+     */
+    public function insertInstalment($zcResult){
+        // 增加会员分期付款记录
+        $instalment = new Instalment();
+        $instalment->USER_ID = $zcResult->USER_ID;
+        $instalment->STAGE = 1;
+        $instalment->ORDER_TYPE = 'BD';
+        $instalment->UPDATE_TIME = time();
+
+        if (!$instalment->save()) {
+            throw new Exception(Form::formatErrorsForApi($instalment->getErrors()));
+        }
+        return $instalment;
+    }
+
 }

common/models/forms/DeclarationLoopForm.php

@@ -117,7 +117,6 @@ class DeclarationLoopForm extends Model
             $model->scenario = $this->scenario;
             $model->allData = $this->data;
             foreach ($this->data as $value){
-				
 				/**
                  * 2022-04-29
                  * York
@@ -127,7 +126,7 @@ class DeclarationLoopForm extends Model
 
                     $packagedata = DeclarationPackage::findOneAsArray('ID=:ID', [':ID' => $value['packageId']]);
                     if (!$packagedata) {
-                        throw new Exception(Yii::t('app', 'productsDoesNotExists'));
+                        throw new Exception(Yii::t('app', 'productsDoesSoldOut'));
                     }
                     //var_dump($packagedata['ID']);
                     if($packagedata['STORE_NUMS']<=0){
@@ -139,7 +138,15 @@ class DeclarationLoopForm extends Model
                     for ($i=0;$i<count($value['goodsId']);$i++){
                         $goods = ShopGoods::findOneAsArray('ID=:ID',[':ID'=> $value['goodsId'][$i]]);
                         if (!$goods) {
-                            throw new Exception(Yii::t('app', 'productsDoesNotExists'));
+                            throw new Exception(Yii::t('app', 'productsDoesSoldOut'));
+                        }
+                        if($goods['INSTALMENT']>0){ // 分期的商品
+                            if($value['goodsNum'][$i]>1){ // 只能购买一个
+                                throw new Exception(Yii::t('app', 'allowOnlyOne'));
+                            }
+                        }
+                        if($goods['INSTALMENT']>1){ // 不允许购买“非第一期”的商品
+                            throw new Exception(Yii::t('app', 'canNotBuy'));
                         }
                         if ($goods['STATUS'] == 1 ){
                             if($goods['STORE_NUMS'] < $value['goodsNum'][$i]){

common/models/forms/DeclarationUpgradeForm.php

@@ -22,6 +22,7 @@ use common\models\ShopGoods;
 use common\models\User;
 use common\models\UserInfo;
 use common\models\UserNetwork;
+use common\models\Instalment;
 use Yii;
 use yii\base\Exception;
 
@@ -58,7 +59,7 @@ class DeclarationUpgradeForm extends Model
     private $_orderGoods;
     private $_standardAmount;
     private $_decAmountStandard;
-    
+
     const TYPE_ZC = 'ZC';
     private $_userForm = null;
     // 全部的安置网上级
@@ -154,6 +155,7 @@ class DeclarationUpgradeForm extends Model
                 $totalAmount = 0;
                 $totalAmountStandard = 0;
                 $totalPv = 0;
+                $hasInstalment = 0;
                 $exchangeRate = floatval(Cache::getSystemConfig()['exchangeRate']['VALUE'] ?? 0); // 汇率
                 foreach ($this->goodsNum as $k => $v) {
                     if ($v) {
@@ -183,11 +185,30 @@ class DeclarationUpgradeForm extends Model
                                 'TAX_RATE' => $goods['TAX_RATE'],
                             ];
                         }
+                        if($goods['INSTALMENT']>0){ // 如果有分期付款商品，检查用户的分期付款状态
+                            if($v>1){ // 不可以购买多个
+                                throw new Exception(Yii::t('app', 'allowOnlyOne'));
+                            }
+
+                            $userStage = Instalment::getStage($userId);
+                            $userInstalmentInfo = Instalment::getInfo($userId);
+                            if (!$userInstalmentInfo){ // 如果没有分期付款记录
+                                throw new Exception(Yii::t('app', 'canNotBuy'));
+                            } else if ($userInstalmentInfo['ORDER_TYPE']!='BD' || $userStage == 3) { // 如果分期付款记录中，不是报单，或已是3
+                                throw new Exception(Yii::t('app', 'canNotBuy'));
+                            }
+                            if($userStage + 1 != $goods['INSTALMENT']){ // 若用户分期阶段+1不等于商品的分期阶段，则报异常
+                                throw new Exception(Yii::t('app', 'canNotBuy'));
+                            }
+                            $hasInstalment = $goods['INSTALMENT'];
+                        }
                     }
                 }
                 // 这里特殊是用户原报单PV之和+用户购买的商品总PV
                 $checkPv = $totalPv + $diffPerf;
-                if($checkPv < $decLevel['PERF']) {
+                if ($hasInstalment){ // 如果买了分期付款商品，则不判断总pv
+                    $allData['hasInstalment'] = 1;
+                }else if($checkPv < $decLevel['PERF']) {
                     throw new Exception(Yii::t('app', 'totalPVLessThan'), 400);
                 }
                 foreach ($decLevelConfig as $key=>$val){
@@ -214,6 +235,17 @@ class DeclarationUpgradeForm extends Model
             if(!($decResult = $this->addDecOrder($insertConId,$insertRecId, $baseInfo['DEC_LV'],$isObserve,$this->remark))) {
                 throw new Exception(Yii::t('app', 'failed'), 400);
             }
+            if ($hasInstalment){ // 如果有分期付款的商品，写入信息至分期付款表
+                $instalmentModel = Instalment::findOne(['USER_ID'=>$userId]);
+                if(!$instalmentModel) {
+                    $instalmentModel = new Instalment();
+                }
+                $instalmentModel->USER_ID = $userId;
+                $instalmentModel->STAGE = $hasInstalment;
+                $instalmentModel->ORDER_TYPE = 'BD';
+                $instalmentModel->UPDATE_TIME = time();
+                $instalmentModel->save();
+            }
         }
         return true;
     }
@@ -300,7 +332,7 @@ class DeclarationUpgradeForm extends Model
                 $transaction->rollBack();
                 throw new Exception(Form::formatErrorsForApi($orderModel->getErrors()));
             }
-			
+
             /**
              * 2022-05-10
              * York
@@ -377,7 +409,7 @@ class DeclarationUpgradeForm extends Model
         } catch(Exception $e) {
             $transaction->rollBack();
             throw new Exception($e->getMessage());
-            
+
             return false;
         }
 
@@ -431,7 +463,7 @@ class DeclarationUpgradeForm extends Model
     public function alreadyMaxDec($attribute) {
         $baseInfo = Info::baseInfoZhByUserName($this->insertUserName);
         $userDecId = $baseInfo['DEC_LV'];// 用户当前的级别
-        $maxPerfInfo = DeclarationLevel::getMaxDecPref(); 
+        $maxPerfInfo = DeclarationLevel::getMaxDecPref();
         $maxDecId = $maxPerfInfo['ID']; // 级别配置中最高级别ID
         if ($maxDecId == $userDecId) {
             $this->addError($attribute, 'It is already the highest level and no upgrade is required');//已是最高级别，无需升级
@@ -467,7 +499,7 @@ class DeclarationUpgradeForm extends Model
             }
         }
         unset($allParentUserIds);
-        
+
         return true;
     }
 
@@ -501,4 +533,4 @@ class DeclarationUpgradeForm extends Model
     //     return true;
     // }
 
-}
+}

common/models/forms/EmployLevelForm.php

@@ -131,9 +131,12 @@ class EmployLevelForm extends Model {
 //                    $empLevelModel->CF_PERCENT = $value['CF_PERCENT'];
 //                    $empLevelModel->LX_BASE_NUM = $value['LX_BASE_NUM'];
 //                    $empLevelModel->LX_PERCENT = $value['LX_PERCENT'];
-                    $empLevelModel->RX_PERCENT = $value['RX_PERCENT'];
-                    $empLevelModel->LEVEL_SCORE = $value['LEVEL_SCORE'];
-                    $empLevelModel->UPGRADE_SCORE = $value['UPGRADE_SCORE'];
+//                    $empLevelModel->RX_PERCENT = $value['RX_PERCENT'];
+//                    $empLevelModel->LEVEL_SCORE = $value['LEVEL_SCORE'];
+//                    $empLevelModel->UPGRADE_SCORE = $value['UPGRADE_SCORE'];
+                    $empLevelModel->ACHIEVE_MEMBER_NUM = $value['ACHIEVE_MEMBER_NUM'];
+                    $empLevelModel->ACHIEVE_PERF_PV = $value['ACHIEVE_PERF_PV'];
+                    $empLevelModel->ACHIEVE_PV = $value['ACHIEVE_PV'];
                     $empLevelModel->BS_PERCENT = $value['BS_PERCENT'];   // 蓝星奖比例
                     $empLevelModel->GARAGE_PERCENT = $value['GARAGE_PERCENT'];  // 车奖比例
                     $empLevelModel->TOURISM_PERCENT = $value['TOURISM_PERCENT'];  // 旅游奖比例

common/models/forms/OrderForm.php

@@ -11,6 +11,7 @@ use common\helpers\user\Cash;
 use common\helpers\user\Info;
 use common\libs\logging\operate\AdminOperate;
 use common\models\DealType;
+use common\models\Instalment;
 use common\models\Order;
 use common\models\OrderGoods;
 use common\models\Period;
@@ -227,7 +228,7 @@ class OrderForm extends Model
         // 一个订单只能包含一类商品
         $goods = ShopGoods::find()->select('ID,CATEGORY_TYPE')->where(['in', 'ID', $this->goodsId])->andWhere(['STATUS' => 1])->asArray()->all();
         if (!$goods) {
-            throw new Exception(Yii::t('app', 'productsDoesNotExists'));
+            throw new Exception(Yii::t('app', 'productsDoesSoldOut'));
             return;
         }
         $goodsCategoryType = array_unique(array_column($goods, 'CATEGORY_TYPE'));
@@ -463,12 +464,13 @@ class OrderForm extends Model
         $totalAmountStandard = 0;
         $goodsType = ShopGoods::GOODS_TYPE;
         $this->_remainPv = 0;
+        $hasInstalment = 0;
         $exchangeRate = floatval(Cache::getSystemConfig()['exchangeRate']['VALUE'] ?? 0); // 汇率
         foreach ($this->goodsNum as $k => $v) {
             if ($v) {
                 $goods = ShopGoods::findOneAsArray('ID=:ID AND STATUS=1',[':ID'=> $ids[$k]]);
                 if (!$goods) {
-                    throw new Exception(Yii::t('app', 'productsDoesNotExists'));
+                    throw new Exception(Yii::t('app', 'productsDoesSoldOut'));
                 }
                 if($goods['STORE_NUMS']>0){
                     if ($goods['TYPE'] == 1 || $goods['TYPE'] == 2) {
@@ -530,6 +532,26 @@ class OrderForm extends Model
                         'TAX_RATE' => $goods['TAX_RATE'],
                     ];
                 }
+                if($goods['INSTALMENT']>0){ // 如果有分期付款商品，检查用户的分期付款状态
+                    if($v>1){ // 不可以购买多个
+                        throw new Exception(Yii::t('app', 'allowOnlyOne'));
+                    }
+                    $loginUserId = \Yii::$app->user->id;
+                    $userStage = Instalment::getStage($loginUserId);
+                    $userInstalmentInfo = Instalment::getInfo($loginUserId);
+
+                    if ($userStage != 3){
+                        if($userInstalmentInfo){
+                            if($userInstalmentInfo['STAGE']>0 && $userInstalmentInfo['ORDER_TYPE']!='FX'){
+                                throw new Exception(Yii::t('app', 'canNotBuy'));
+                            }
+                        }
+                        if($userStage + 1 != $goods['INSTALMENT']){ // 若用户分期阶段+1不等于商品的分期阶段，则报异常
+                            throw new Exception(Yii::t('app', 'canNotBuy'));
+                        }
+                    }
+                    $hasInstalment = $goods['INSTALMENT'];
+                }
             }
         }
 
@@ -570,7 +592,7 @@ class OrderForm extends Model
                 if ($v){
                     $goods = ShopGoods::findOneAsArray('ID=:ID AND STATUS=1',[':ID'=> $ids[$k]]);
                     if (!$goods) {
-                        throw new Exception(Yii::t('app', 'productsDoesNotExists'));
+                        throw new Exception(Yii::t('app', 'productsDoesSoldOut'));
                     }
                     if ($goods['STORE_NUMS'] >= $this->goodsNum[$k]){
                         $data = ShopGoods::find()->where(['ID' => $ids[$k]])->one();
@@ -595,6 +617,17 @@ class OrderForm extends Model
             if (!$orderResult = $this->addOrder()) {
                 throw new Exception(Form::formatErrorsForApi($orderResult->getErrors()));
             }
+            if ($hasInstalment){ // 如果有分期付款的商品，写入信息至分期付款表
+                $instalmentModel = Instalment::findOne(['USER_ID'=>$loginUserId]);
+                if(!$instalmentModel) {
+                    $instalmentModel = new Instalment();
+                }
+                $instalmentModel->USER_ID = $loginUserId;
+                $instalmentModel->STAGE = $hasInstalment;
+                $instalmentModel->ORDER_TYPE = 'FX';
+                $instalmentModel->UPDATE_TIME = time();
+                $instalmentModel->save();
+            }
 
             $transaction->commit();
 
@@ -876,7 +909,7 @@ class OrderForm extends Model
                 if ($v){
                     $goods = ShopGoods::findOneAsArray('ID=:ID AND STATUS=1',[':ID'=> $ids[$k]]);
                     if (!$goods) {
-                        throw new Exception(Yii::t('app', 'productsDoesNotExists'));
+                        throw new Exception(Yii::t('app', 'productsDoesSoldOut'));
                     }
                     if ($goods['STORE_NUMS'] >= $this->goodsNum[$k]){
                         $data = ShopGoods::find()->where(['ID' => $ids[$k]])->one();

common/models/forms/UserForm.php

@@ -240,9 +240,12 @@ class UserForm extends Model
      */
     public function isMinDecLevel($attribute, $params){
         // 获取排序为2的报单级别
-        $decLevel = DeclarationLevel::getLevelFromSort(2);
+        $decLevel = DeclarationLevel::getLevelFromSort(1);
         if($this->zcPv < $decLevel['PERF']){
-            $this->addError($attribute, '注册'.$this->userName.'时，注册PV低于最低级别要求，不能报首购单');
+            if($this->allData['hasInstalment'] && $this->zcPv + 30 >= $decLevel['PERF']){
+            }else{
+                $this->addError($attribute, '注册'.$this->userName.'时，注册PV低于最低级别要求，不能报首购单');
+            }
         }
     }
 

frontendApi/config/menu.php

@@ -34,8 +34,8 @@ return [
 //            ['name'=>'Repeat sales products', 'class'=>'', 'icon'=>'', 'controller'=>'shop', 'action'=>'reconsume', 'routePath'=>'shop/reconsume', 'show'=>1,'allow'=>'studio'],//复消商品
 //            ['name'=>'申请退货', 'class'=>'', 'icon'=>'', 'controller'=>'shop', 'action'=>'order-backing-out', 'routePath'=>'shop/order-backing-out', 'show'=>1,],//申请退货
             ['name'=>'Order List', 'class'=>'', 'icon'=>'', 'controller'=>'shop', 'action'=>'order-list', 'routePath'=>'shop/order-list', 'show'=>1,],//订单列表
-            ['name'=>'Brand Ambassador', 'class'=>'', 'icon'=>'', 'controller'=>'user', 'action'=>'ba-dec', 'routePath'=>'user/ba-dec', 'show'=>1,'allow'=>'declarer',],
-            ['name'=>'BA Order List', 'class'=>'', 'icon'=>'', 'controller'=>'shop', 'action'=>'ba-dec-order-list', 'routePath'=>'shop/ba-dec-order-list', 'show'=>1,'allow'=>'declarer',],
+//            ['name'=>'Brand Ambassador', 'class'=>'', 'icon'=>'', 'controller'=>'user', 'action'=>'ba-dec', 'routePath'=>'user/ba-dec', 'show'=>1,'allow'=>'declarer',],
+//            ['name'=>'BA Order List', 'class'=>'', 'icon'=>'', 'controller'=>'shop', 'action'=>'ba-dec-order-list', 'routePath'=>'shop/ba-dec-order-list', 'show'=>1,'allow'=>'declarer',],
         ]
     ],
     'user'=>[
@@ -66,7 +66,7 @@ return [
         'child'=>[
             ['name'=>'Placement network', 'class'=>'', 'icon'=>'', 'controller'=>'atlas', 'action'=>'network', 'routePath'=>'atlas/network', 'show'=>1,],
             ['name'=>'Sponsor network', 'class'=>'', 'icon'=>'', 'controller'=>'atlas', 'action'=>'relation', 'routePath'=>'atlas/relation', 'show'=>1,],
-            ['name'=>'Brand Ambassador List', 'class'=>'', 'icon'=>'', 'controller'=>'atlas', 'action'=>'brand-ambassador-list', 'routePath'=>'atlas/brand-ambassador-list', 'show'=>1,],
+//            ['name'=>'Brand Ambassador List', 'class'=>'', 'icon'=>'', 'controller'=>'atlas', 'action'=>'brand-ambassador-list', 'routePath'=>'atlas/brand-ambassador-list', 'show'=>1,],
         ]
     ],
     'bonus'=>[

frontendApi/config/menuV2.php

@@ -30,8 +30,8 @@ return [
             ['name'=>'Welcome Pack Listing', 'class'=>'', 'icon'=>'', 'controller'=>'shop', 'action'=>'dec-order-list', 'routePath'=>'shop/dec-order-list', 'show'=>1, 'wiki' => 'welcomePackList',],//报单列表
             ['name'=>'Upgrade Management', 'class'=>'', 'icon'=>'', 'controller'=>'upgrade', 'action'=>'dec', 'routePath'=>'user/upgrade', 'show'=>1,'allow'=>'declarer', 'wiki' => 'memberUpgrade',],//升级管理
             ['name'=>'Order List', 'class'=>'', 'icon'=>'', 'controller'=>'shop', 'action'=>'order-list', 'routePath'=>'shop/order-list', 'show'=>1, 'wiki' => 'orderList',],//订单列表
-            ['name'=>'Brand Ambassador', 'class'=>'', 'icon'=>'', 'controller'=>'user', 'action'=>'ba-dec', 'routePath'=>'user/ba-dec', 'show'=>1,'allow'=>'declarer', 'wiki' => 'brandAmbassador',],// BA会员
-            ['name'=>'BA Order List', 'class'=>'', 'icon'=>'', 'controller'=>'shop', 'action'=>'ba-dec-order-list', 'routePath'=>'shop/ba-dec-order-list', 'show'=>1,'allow'=>'declarer', 'wiki' => 'BAOrderList',],// BA订单
+//            ['name'=>'Brand Ambassador', 'class'=>'', 'icon'=>'', 'controller'=>'user', 'action'=>'ba-dec', 'routePath'=>'user/ba-dec', 'show'=>1,'allow'=>'declarer', 'wiki' => 'brandAmbassador',],// BA会员
+//            ['name'=>'BA Order List', 'class'=>'', 'icon'=>'', 'controller'=>'shop', 'action'=>'ba-dec-order-list', 'routePath'=>'shop/ba-dec-order-list', 'show'=>1,'allow'=>'declarer', 'wiki' => 'BAOrderList',],// BA订单
         ]
     ],
     'user'=>[
@@ -60,7 +60,7 @@ return [
         'child'=>[
             ['name'=>'Placement Network', 'class'=>'', 'icon'=>'', 'controller'=>'atlas', 'action'=>'network', 'routePath'=>'atlas/network', 'show'=>1, 'wiki' => 'placementNetwork',],//安置网络
             ['name'=>'Sponsor Network', 'class'=>'', 'icon'=>'', 'controller'=>'atlas', 'action'=>'relation', 'routePath'=>'atlas/relation', 'show'=>1, 'wiki' => 'sponsorNetwork',],//推荐网路
-            ['name'=>'Brand Ambassador List', 'class'=>'', 'icon'=>'', 'controller'=>'atlas', 'action'=>'brand-ambassador-list', 'routePath'=>'atlas/brand-ambassador-list', 'show'=>1, 'wiki' => 'brandAmbassadorList',],// BA会员
+//            ['name'=>'Brand Ambassador List', 'class'=>'', 'icon'=>'', 'controller'=>'atlas', 'action'=>'brand-ambassador-list', 'routePath'=>'atlas/brand-ambassador-list', 'show'=>1, 'wiki' => 'brandAmbassadorList',],// BA会员
         ]
     ],
     'bonus'=>[

frontendApi/modules/v1/controllers/BonusController.php

@@ -228,7 +228,7 @@ class BonusController extends BaseController {
                 $condition.=' AND IS_INCR=1 AND DEAL_TYPE_IS_PRESET=0';
             }elseif ($dealType==2){//扣除
                 $condition.=' AND IS_INCR=0 AND DEAL_TYPE_IS_PRESET=0';
-            }else{
+            }else if ($walletType != 'cash') {
                 $condition.=' AND DEAL_TYPE_ID=:DEAL_TYPE';
                 $params[':DEAL_TYPE'] = $dealType;
             }

frontendApi/modules/v1/controllers/UserController.php

@@ -28,6 +28,7 @@ use common\models\forms\BaDeclarationLoopForm;
 use common\models\forms\UploadForm;
 use common\models\forms\UserBindForm;
 use common\models\forms\UserForm;
+use common\models\Instalment;
 use common\models\OpenBank;
 use common\models\ReceiveAddress;
 use common\models\Region;
@@ -239,7 +240,7 @@ class UserController extends BaseController {
         // 获取系统中的DEC 报单级别配置
         $decConfig = Cache::getDecLevelConfig();
         $userDecInfo = $decConfig[$userDecId]; // 会员的级别具体信息
-        $maxPerfInfo = DeclarationLevel::getMaxDecPref(); 
+        $maxPerfInfo = DeclarationLevel::getMaxDecPref();
         $maxDecId = $maxPerfInfo['ID']; // 级别配置中最高级别ID
         $observe = Config::getConfigByType('observe'); // 获取观察期配置信息
         $observeLimit = $observe['observePeriodLimit']['value']; // 月份限制
@@ -258,7 +259,7 @@ class UserController extends BaseController {
             'IS_OBSERVE' => $isObserve, // 是否是观察期  true为是观察期
             'IS_MAX' => $isMax, // 是否已是最大级别 最大级别不需要判断报单总PV是多少 只展示基本信息
         ];
-        
+
         // 如果是最高级别了,则无需升级
         if ($isMax) {
             return static::notice(['baseInfo' => $userInfo]);
@@ -286,15 +287,22 @@ class UserController extends BaseController {
             $userInfo['NEXT_PERF'] =  $nextLevelPerf;
             // 用户可选择的级别列表
             $userInfo['LEVEL_LIST'] = DeclarationLevel::getNextAll($levelPerf);// 用户可选择的级别列表
+            // 如果用户正处于报单分期中，则可以升级到Elite
+            $userInstalmentInfo = Instalment::getInfo($userId);
+            if($userInstalmentInfo){
+                if ($userInstalmentInfo['ORDER_TYPE']=='BD' && $userInstalmentInfo['STAGE'] < 3){
+                    $userInfo['LEVEL_LIST'] = DeclarationLevel::getNextAll(12);// 用户可选择的级别列表
+                }
+            }
             // 循环列表,补充升级所需要的补差
             foreach ($userInfo['LEVEL_LIST'] as &$v) {
                 $v['REPAIR_PV'] = $isObserve ? $v['PERF'] - $userInfo['NOW_PERF'] : $v['PERF'];
-            }   
+            }
         }
-        
+
         return static::notice(['baseInfo' => $userInfo]);
     }
-    
+
     // 会员升级管理
     public function actionUpgrade() {
         $isSwitchUpgrade = Config::find()
@@ -642,7 +650,7 @@ class UserController extends BaseController {
         }
         return static::notice(Yii::t('app', 'illegalRequest'), 400);
     }
-    
+
     /**
      * BA报单管理
      */
@@ -744,4 +752,4 @@ class UserController extends BaseController {
             return static::notice(Yii::t('app', 'memberNumberDoesNotExist'), 400);
         }
     }
-}
+}

frontendApi/modules/v1/models/LoginForm.php

@@ -178,17 +178,17 @@ class LoginForm extends Model
                     'BONUS_APP_CLIENT_ID' => $clientId,
                 ];
 
-                if (!$this->_whetherBA) {
+//                if (!$this->_whetherBA) {
                     if (!User::updateAll($update, 'ID=:ID', ['ID' => $this->_user['ID']])) {
                         $this->_updateFailTimes($transaction, Yii::t('app', 'memberAppDeviceInformationUpdateFailed'));
                         throw new Exception(Yii::t('app', 'memberAppDeviceInformationUpdateFailed'));
                     }
-                } else {
-                    if (!BaUser::updateAll($update, 'ID=:ID', ['ID' => $this->_user['ID']])) {
-                        $this->_updateFailTimes($transaction, Yii::t('app', 'memberAppDeviceInformationUpdateFailed'));
-                        throw new Exception(Yii::t('app', 'memberAppDeviceInformationUpdateFailed'));
-                    }
-                }
+//                } else {
+//                    if (!BaUser::updateAll($update, 'ID=:ID', ['ID' => $this->_user['ID']])) {
+//                        $this->_updateFailTimes($transaction, Yii::t('app', 'memberAppDeviceInformationUpdateFailed'));
+//                        throw new Exception(Yii::t('app', 'memberAppDeviceInformationUpdateFailed'));
+//                    }
+//                }
             }
 
 
@@ -200,11 +200,11 @@ class LoginForm extends Model
             // 把用户的登录时间存在操作时间里
             Yii::$app->tokenRedis->hset('user:timeOut', $this->_userInfo['USER_ID'], time());
 
-            if (!$this->_whetherBA) {
+//            if (!$this->_whetherBA) {
                 return Yii::$app->user->loginWithUAndP($this->_user);
-            } else {
-                return Yii::$app->brand->loginWithUAndP($this->_user);
-            }
+//            } else {
+//                return Yii::$app->brand->loginWithUAndP($this->_user);
+//            }
         }catch(\Exception $e){
             $transaction->rollBack();
 //            $this->setError($e->getFile() . '  ' . $e->getLine() . '  ' . $e->getMessage());