kevin_zhangl 2 лет назад
Родитель
Сommit
71826eae6b

+ 2 - 1
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,],

+ 51 - 46
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);
         }

+ 13 - 17
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;

+ 57 - 52
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'=> [

+ 31 - 28
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;

+ 143 - 84
common/messages/en-US/ctx.php

@@ -100,97 +100,22 @@ return [
     'illegalRequest' => 'Illegal request',
     'invalidParameter' => 'Invalid Parameter',
     'dataDoesNotExists' => 'The data does not exist',
-
-
-    /**【以下内容为会员端词条,如果管理端有相同词条,移入分割线之上使用即可,翻译完全部项目之后删除以下内容】
-     * 会员端翻译: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',
 
     # 会员
     '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',
@@ -239,7 +164,6 @@ return [
     'statusAt' => 'STATUS_AT',
     'verified' => 'VERIFIED',
     'verifiedAt' => 'VERIFIED_AT',
-    'allowLogin' => 'ALLOW_LOGIN',
     'notOperating' => 'NOT_OPERATING',
     'regFrom' => 'REG_FROM',
     'IDCardPrefix' => 'ID_CARD_PREFIX',
@@ -272,6 +196,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',

+ 144 - 84
common/messages/zh-CN/ctx.php

@@ -102,96 +102,23 @@ return [
     'illegalRequest' => '非法请求',
     'invalidParameter' => '无效参数',
     'dataDoesNotExists' => '数据不存在',
-
-
-    /**【以下内容为会员端词条,如果管理端有相同词条,移入分割线之上使用即可,翻译完全部项目之后删除以下内容】
-     * 会员端翻译: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' => '最高手续费',
@@ -241,7 +168,6 @@ return [
     'statusAt' => '状态更改时间',
     'verified' => '是否认证',
     'verifiedAt' => '认证时间',
-    'allowLogin' => '允许登录',
     'notOperating' => '不运作',
     'regFrom' => '注册类型',
     'IDCardPrefix' => '身份证前缀',
@@ -275,6 +201,140 @@ 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' => '开拓网络',
+
+
+    /**【以下内容为会员端词条,如果管理端有相同词条,移入分割线之上使用即可,翻译完全部项目之后删除以下内容】
+     * 会员端翻译: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' => '补差额',

+ 2 - 2
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;       // 已申请