feat: NG-15: 新会员注册时增加国家与语言选项.

backendApi/config/menu.php

@@ -298,7 +298,7 @@ return [
 //            ['name'=>'Score-month', 'class'=>'', 'icon'=>'', 'controller'=>'bonus', 'action'=>'score-month', 'routePath'=>'bonus/score-month', 'show'=>1,],//月积分
             ['name'=>'月积分导出', 'class'=>'', 'icon'=>'', 'controller'=>'bonus', 'action'=>'score-month-export', 'routePath'=>'bonus/score-month-export', 'show'=>0,],
             ['name'=>'自动提现', 'class'=>'', 'icon'=>'', 'controller'=>'bonus', 'action'=>'auto-withdraw', 'routePath'=>'bonus/auto-withdraw', 'show'=>0,],
-            ['name'=>'Adjust Performance', 'class'=>'', 'icon'=>'', 'controller'=>'bonus', 'action'=>'perf-adjustment', 'routePath'=>'bonus/perf-adjustment', 'show'=>1, 'wiki' => 'adjustPerformance'],//调整业绩
+//            ['name'=>'Adjust Performance', 'class'=>'', 'icon'=>'', 'controller'=>'bonus', 'action'=>'perf-adjustment', 'routePath'=>'bonus/perf-adjustment', 'show'=>1, 'wiki' => 'adjustPerformance'],//调整业绩
         ]
     ],
     /*'report'=>[

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

@@ -120,50 +120,50 @@ class PerfMonthList extends \common\libs\dataList\DataList implements DataListIn
                         ]))->result();
                     },
                 ],
-                'VIP_PV_1L_ZC' => [
-                    'header' => Yii::t('ctx', 'LNewMarketEntryPerformance'), // 一市场新增报单业绩
-                    'headerOther' => [
-                        'width' => '240',
-                    ],
-                    'value' => function($row) {
-                        return (new Price([
-                            'value' => $row['VIP_PV_1L_ZC'],
-                        ]))->result();
-                    },
-                ],
-                'VIP_PV_2L_ZC' => [
-                    'header' =>  Yii::t('ctx', 'RNewMarketEntryPerformance'), // 二市场新增报单业绩
-                    'headerOther' => [
-                        'width' => '240',
-                    ],
-                    'value' => function($row) {
-                        return (new Price([
-                            'value' => $row['VIP_PV_2L_ZC'],
-                        ]))->result();
-                    },
-                ],
-                'VIP_SURPLUS_1L_ZC' => [
-                    'header' => Yii::t('ctx', 'LMarketMonthlyRemainingDeclarationPerformance'), // 一市场月剩余报单业绩
-                    'headerOther' => [
-                        'width' => '370',
-                    ],
-                    'value' => function($row) {
-                        return (new Price([
-                            'value' => $row['VIP_SURPLUS_1L_ZC'],
-                        ]))->result();
-                    },
-                ],
-                'VIP_SURPLUS_2L_ZC' => [
-                    'header' =>  Yii::t('ctx', 'RMarketMonthlyRemainingDeclarationPerformance'), // 二市场月剩余报单业绩
-                    'headerOther' => [
-                        'width' => '370',
-                    ],
-                    'value' => function($row) {
-                        return (new Price([
-                            'value' => $row['VIP_SURPLUS_2L_ZC'],
-                        ]))->result();
-                    },
-                ],
+//                'VIP_PV_1L_ZC' => [
+//                    'header' => Yii::t('ctx', 'LNewMarketEntryPerformance'), // 一市场新增报单业绩
+//                    'headerOther' => [
+//                        'width' => '240',
+//                    ],
+//                    'value' => function($row) {
+//                        return (new Price([
+//                            'value' => $row['VIP_PV_1L_ZC'],
+//                        ]))->result();
+//                    },
+//                ],
+//                'VIP_PV_2L_ZC' => [
+//                    'header' =>  Yii::t('ctx', 'RNewMarketEntryPerformance'), // 二市场新增报单业绩
+//                    'headerOther' => [
+//                        'width' => '240',
+//                    ],
+//                    'value' => function($row) {
+//                        return (new Price([
+//                            'value' => $row['VIP_PV_2L_ZC'],
+//                        ]))->result();
+//                    },
+//                ],
+//                'VIP_SURPLUS_1L_ZC' => [
+//                    'header' => Yii::t('ctx', 'LMarketMonthlyRemainingDeclarationPerformance'), // 一市场月剩余报单业绩
+//                    'headerOther' => [
+//                        'width' => '370',
+//                    ],
+//                    'value' => function($row) {
+//                        return (new Price([
+//                            'value' => $row['VIP_SURPLUS_1L_ZC'],
+//                        ]))->result();
+//                    },
+//                ],
+//                'VIP_SURPLUS_2L_ZC' => [
+//                    'header' =>  Yii::t('ctx', 'RMarketMonthlyRemainingDeclarationPerformance'), // 二市场月剩余报单业绩
+//                    'headerOther' => [
+//                        'width' => '370',
+//                    ],
+//                    'value' => function($row) {
+//                        return (new Price([
+//                            'value' => $row['VIP_SURPLUS_2L_ZC'],
+//                        ]))->result();
+//                    },
+//                ],
                 'PV_PSS' => [
                     'header' => Yii::t('ctx', 'monthlyNewTeamPerformance'), // 月新增团队业绩
                     'headerOther' => [

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

@@ -106,144 +106,144 @@ class PerfPeriodList extends \common\libs\dataList\DataList implements DataListI
                         ]))->result();
                     },
                 ],
-                'PV_1L' => [
-                    'header' =>  Yii::t('ctx', 'LNewMarketPerformance'), // 一市场新增业绩
-                    'headerOther' => [
-                        'width' => '200',
-                    ],
-                    'value' => function($row) {
-                        return (new Price([
-                            'value' => $row['PV_1L'],
-                        ]))->result();
-                    },
-                ],
-                'PV_1L_ZC' => [
-                    'header' => Yii::t('ctx', 'LNewPerformanceOfMarketEntry'), // 一市场报单新增业绩
-                    'headerOther' => [
-                        'width' => '250',
-                    ],
-                    'value' => function($row) {
-                        return (new Price([
-                            'value' => $row['PV_1L_ZC'],
-                        ]))->result();
-                    },
-                ],
-                'PV_1L_FX' => [
-                    'header' => Yii::t('ctx', 'LNewPerformanceOfMarketReCancellation'), // 一市场复消新增业绩
-                    'headerOther' => [
-                        'width' => '320',
-                    ],
-                    'value' => function($row) {
-                        return (new Price([
-                            'value' => $row['PV_1L_FX'],
-                        ]))->result();
-                    },
-                ],
-                'PV_2L' => [
-                    'header' => Yii::t('ctx', 'RNewMarketPerformance'), // 二市场新增业绩
-                    'headerOther' => [
-                        'width' => '200',
-                    ],
-                    'value' => function($row) {
-                        return (new Price([
-                            'value' => $row['PV_2L'],
-                        ]))->result();
-                    },
-                ],
-                'PV_2L_ZC' => [
-                    'header' => Yii::t('ctx', 'RNewPerformanceOfMarketEntry'), // 二市场报单新增业绩
-                    'headerOther' => [
-                        'width' => '260',
-                    ],
-                    'value' => function($row) {
-                        return (new Price([
-                            'value' => $row['PV_2L_ZC'],
-                        ]))->result();
-                    },
-                ],
-                'PV_2L_FX' => [
-                    'header' => Yii::t('ctx', 'RNewPerformanceOfMarketReCancellation'), // 二市场复消新增业绩
-                    'headerOther' => [
-                        'width' => '320',
-                    ],
-                    'value' => function($row) {
-                        return (new Price([
-                            'value' => $row['PV_2L_FX'],
-                        ]))->result();
-                    },
-                ],
-                'SURPLUS_1L' => [
-                    'header' => Yii::t('ctx', 'LMarketBalancePerformance'), // 一市场结余业绩
-                    'value' => function($row) {
-                        return (new Price([
-                            'value' => $row['SURPLUS_1L'],
-                        ]))->result();
-                    },
-                    'headerOther' => [
-                        'width' => '220',
-                        'prop'=>'SURPLUS_1L',
-                    ],
-                ],
-                'SURPLUS_2L' => [
-                    'header' => Yii::t('ctx', 'RMarketBalancePerformance'), // 二市场结余业绩
-                    'value' => function($row) {
-                        return (new Price([
-                            'value' => $row['SURPLUS_2L'],
-                        ]))->result();
-                    },
-                    'headerOther' => [
-                        'width' => '220',
-                        'prop'=>'SURPLUS_2L',
-                    ],
-                ],
-                'SURPLUS_1L_ZC' => [
-                    'header' =>  Yii::t('ctx', 'LMarketEntryBalancePerformance'), // 一市场报单结余业绩
-                    'value' => function($row) {
-                        return (new Price([
-                            'value' => $row['SURPLUS_1L_ZC'],
-                        ]))->result();
-                    },
-                    'headerOther' => [
-                        'width' => '260',
-                        'prop'=>'SURPLUS_1L_ZC',
-                    ],
-                ],
-                'SURPLUS_2L_ZC' => [
-                    'header' => Yii::t('ctx', 'RMarketEntryBalancePerformance'), // 二市场报单结余业绩
-                    'value' => function($row) {
-                        return (new Price([
-                            'value' => $row['SURPLUS_2L_ZC'],
-                        ]))->result();
-                    },
-                    'headerOther' => [
-                        'width' => '260',
-                        'prop'=>'SURPLUS_2L_ZC',
-                    ],
-                ],
-                'SURPLUS_1L_FX' => [
-                    'header' => Yii::t('ctx', 'LMarketReconditioningBalancePerformance'), // 一市场复消结余业绩
-                    'value' => function($row) {
-                        return (new Price([
-                            'value' => $row['SURPLUS_1L_FX'],
-                        ]))->result();
-                    },
-                    'headerOther' => [
-                        'width' => '320',
-                        'prop'=>'SURPLUS_1L_FX',
-                    ],
-                ],
-                'SURPLUS_2L_FX' => [
-                    'header' =>Yii::t('ctx', 'RMarketReCancellationBalancePerformance'), // 二市场复消结余业绩
-                    'value' => function($row) {
-                        return (new Price([
-                            'value' => $row['SURPLUS_2L_FX'],
-                        ]))->result();
-                    },
-                    'headerOther' => [
-                        'width' => '330',
-                        'prop'=>'SURPLUS_2L_FX',
-                    ],
-                ],
+//                'PV_1L' => [
+//                    'header' =>  Yii::t('ctx', 'LNewMarketPerformance'), // 一市场新增业绩
+//                    'headerOther' => [
+//                        'width' => '200',
+//                    ],
+//                    'value' => function($row) {
+//                        return (new Price([
+//                            'value' => $row['PV_1L'],
+//                        ]))->result();
+//                    },
+//                ],
+//                'PV_1L_ZC' => [
+//                    'header' => Yii::t('ctx', 'LNewPerformanceOfMarketEntry'), // 一市场报单新增业绩
+//                    'headerOther' => [
+//                        'width' => '250',
+//                    ],
+//                    'value' => function($row) {
+//                        return (new Price([
+//                            'value' => $row['PV_1L_ZC'],
+//                        ]))->result();
+//                    },
+//                ],
+//                'PV_1L_FX' => [
+//                    'header' => Yii::t('ctx', 'LNewPerformanceOfMarketReCancellation'), // 一市场复消新增业绩
+//                    'headerOther' => [
+//                        'width' => '320',
+//                    ],
+//                    'value' => function($row) {
+//                        return (new Price([
+//                            'value' => $row['PV_1L_FX'],
+//                        ]))->result();
+//                    },
+//                ],
+//                'PV_2L' => [
+//                    'header' => Yii::t('ctx', 'RNewMarketPerformance'), // 二市场新增业绩
+//                    'headerOther' => [
+//                        'width' => '200',
+//                    ],
+//                    'value' => function($row) {
+//                        return (new Price([
+//                            'value' => $row['PV_2L'],
+//                        ]))->result();
+//                    },
+//                ],
+//                'PV_2L_ZC' => [
+//                    'header' => Yii::t('ctx', 'RNewPerformanceOfMarketEntry'), // 二市场报单新增业绩
+//                    'headerOther' => [
+//                        'width' => '260',
+//                    ],
+//                    'value' => function($row) {
+//                        return (new Price([
+//                            'value' => $row['PV_2L_ZC'],
+//                        ]))->result();
+//                    },
+//                ],
+//                'PV_2L_FX' => [
+//                    'header' => Yii::t('ctx', 'RNewPerformanceOfMarketReCancellation'), // 二市场复消新增业绩
+//                    'headerOther' => [
+//                        'width' => '320',
+//                    ],
+//                    'value' => function($row) {
+//                        return (new Price([
+//                            'value' => $row['PV_2L_FX'],
+//                        ]))->result();
+//                    },
+//                ],
+//                'SURPLUS_1L' => [
+//                    'header' => Yii::t('ctx', 'LMarketBalancePerformance'), // 一市场结余业绩
+//                    'value' => function($row) {
+//                        return (new Price([
+//                            'value' => $row['SURPLUS_1L'],
+//                        ]))->result();
+//                    },
+//                    'headerOther' => [
+//                        'width' => '220',
+//                        'prop'=>'SURPLUS_1L',
+//                    ],
+//                ],
+//                'SURPLUS_2L' => [
+//                    'header' => Yii::t('ctx', 'RMarketBalancePerformance'), // 二市场结余业绩
+//                    'value' => function($row) {
+//                        return (new Price([
+//                            'value' => $row['SURPLUS_2L'],
+//                        ]))->result();
+//                    },
+//                    'headerOther' => [
+//                        'width' => '220',
+//                        'prop'=>'SURPLUS_2L',
+//                    ],
+//                ],
+//                'SURPLUS_1L_ZC' => [
+//                    'header' =>  Yii::t('ctx', 'LMarketEntryBalancePerformance'), // 一市场报单结余业绩
+//                    'value' => function($row) {
+//                        return (new Price([
+//                            'value' => $row['SURPLUS_1L_ZC'],
+//                        ]))->result();
+//                    },
+//                    'headerOther' => [
+//                        'width' => '260',
+//                        'prop'=>'SURPLUS_1L_ZC',
+//                    ],
+//                ],
+//                'SURPLUS_2L_ZC' => [
+//                    'header' => Yii::t('ctx', 'RMarketEntryBalancePerformance'), // 二市场报单结余业绩
+//                    'value' => function($row) {
+//                        return (new Price([
+//                            'value' => $row['SURPLUS_2L_ZC'],
+//                        ]))->result();
+//                    },
+//                    'headerOther' => [
+//                        'width' => '260',
+//                        'prop'=>'SURPLUS_2L_ZC',
+//                    ],
+//                ],
+//                'SURPLUS_1L_FX' => [
+//                    'header' => Yii::t('ctx', 'LMarketReconditioningBalancePerformance'), // 一市场复消结余业绩
+//                    'value' => function($row) {
+//                        return (new Price([
+//                            'value' => $row['SURPLUS_1L_FX'],
+//                        ]))->result();
+//                    },
+//                    'headerOther' => [
+//                        'width' => '320',
+//                        'prop'=>'SURPLUS_1L_FX',
+//                    ],
+//                ],
+//                'SURPLUS_2L_FX' => [
+//                    'header' =>Yii::t('ctx', 'RMarketReCancellationBalancePerformance'), // 二市场复消结余业绩
+//                    'value' => function($row) {
+//                        return (new Price([
+//                            'value' => $row['SURPLUS_2L_FX'],
+//                        ]))->result();
+//                    },
+//                    'headerOther' => [
+//                        'width' => '330',
+//                        'prop'=>'SURPLUS_2L_FX',
+//                    ],
+//                ],
                 'PV_PSS' => [
                     'header' => Yii::t('ctx', 'teamPerformance'), // 团队业绩
                     'headerOther' => [

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

@@ -71,28 +71,28 @@ class UserPerfList extends \common\libs\dataList\DataList implements DataListInt
                         ]))->result();
                     },
                 ],
-                'SURPLUS_1L' => [
-                    'header' => Yii::t('ctx', 'remainderLeftLeg'), // 一市场剩余业绩
-                    'headerOther' => [
-                        'width' => '240',
-                    ],
-                    'value' => function($row) {
-                        return (new Price([
-                            'value' => $row['SURPLUS_1L'],
-                        ]))->result();
-                    },
-                ],
-                'SURPLUS_2L' => [
-                    'header' => Yii::t('ctx', 'remainderRightLeg'), // 二市场剩余业绩
-                    'headerOther' => [
-                        'width' => '240',
-                    ],
-                    'value' => function($row) {
-                        return (new Price([
-                            'value' => $row['SURPLUS_2L'],
-                        ]))->result();
-                    },
-                ],
+//                'SURPLUS_1L' => [
+//                    'header' => Yii::t('ctx', 'remainderLeftLeg'), // 一市场剩余业绩
+//                    'headerOther' => [
+//                        'width' => '240',
+//                    ],
+//                    'value' => function($row) {
+//                        return (new Price([
+//                            'value' => $row['SURPLUS_1L'],
+//                        ]))->result();
+//                    },
+//                ],
+//                'SURPLUS_2L' => [
+//                    'header' => Yii::t('ctx', 'remainderRightLeg'), // 二市场剩余业绩
+//                    'headerOther' => [
+//                        'width' => '240',
+//                    ],
+//                    'value' => function($row) {
+//                        return (new Price([
+//                            'value' => $row['SURPLUS_2L'],
+//                        ]))->result();
+//                    },
+//                ],
                 'PV_PSS_TOTAL' => [
                     'header' => Yii::t('ctx', 'cumulativeTeamPerformance'), // 累计团队业绩
                     'headerOther' => [

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

@@ -79,20 +79,20 @@ class MoveList extends \common\libs\dataList\DataList implements DataListInterfa
                     'header' => Yii::t('ctx', 'uperCodeAfterMoving'),
                     'headerOther' => ['width' => '120'],
                 ],
-                'TYPE' => [
-                    'header' => Yii::t('ctx', 'typeOfMoving'),
-                    'headerOther' => ['width' => '120'],
-                    'value' => function($row) {
-                        return $row['TYPE'] == UserMove::TYPE_NETWORK ? Yii::t('ctx', 'placementNetwork') : Yii::t('ctx', 'sponsorNetwork');
-                    },
-                ],
-                'LOCATION' => [
-                    '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');
-                    },
-                ],
+//                'TYPE' => [
+//                    'header' => Yii::t('ctx', 'typeOfMoving'),
+//                    'headerOther' => ['width' => '120'],
+//                    'value' => function($row) {
+//                        return $row['TYPE'] == UserMove::TYPE_NETWORK ? Yii::t('ctx', 'placementNetwork') : Yii::t('ctx', 'sponsorNetwork');
+//                    },
+//                ],
+//                'LOCATION' => [
+//                    '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' => Yii::t('ctx', 'periodOfMoving'),
                     'headerOther' => ['width' => '130'],