Procházet zdrojové kódy

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

zhangl před 1 rokem
rodič
revize
108977d539
1 změnil soubory, kde provedl 18 přidání a 18 odebrání
  1. 18 18
      backendApi/modules/v1/models/lists/user/IndexList.php

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

@@ -39,7 +39,7 @@ class IndexList extends \common\libs\dataList\DataList implements DataListInterf
         $this->condition .= '';
         $this->listData = User::lists($this->condition, $this->params, [
             'select' => 'U.*,
-                UI.USER_ID, UI.ZC_PV, UI.CON_UID, UI.CON_UID_ACTUAL, UI.REC_UID, UI.CON_NUM, UI.REC_NUM, UI.NETWORK_DEEP, 
+                UI.USER_ID, UI.ZC_PV, UI.CON_UID, UI.REC_UID_ACTUAL, UI.REC_UID, UI.CON_NUM, UI.REC_NUM, UI.NETWORK_DEEP, 
                 UI.RELATION_DEEP, UI.SYSTEM_ID, UI.IS_GROUP_LEADER, UI.IS_SYSTEM_LEADER, UI.IS_TEAM, UI.IS_BIND, 
                 UI.IS_TEAM_MAIN, UI.IS_BIND_MAIN, UI.IS_AUTO_WITHDRAW, UI.CLOSE_LOGIN, UI.REG_TYPE, UI.SHOULD_REG_TYPE, 
                 UI.REG_NAME, UI.CREDIT_CODE, UI.PREMISES, UI.LEGAL_PERSON, UI.REG_EXPIRES, UI.STORE_TYPE, UI.INVOICE_BALANCE, 
@@ -81,9 +81,9 @@ class IndexList extends \common\libs\dataList\DataList implements DataListInterf
                 $this->listData['list'][$key]['BTF_URL'] = null;
             }
 
-            $conActual = User::getBaseInfo($value['CON_UID_ACTUAL']);
-            $this->listData['list'][$key]['CON_USER_NAME_ACTUAL'] = $conActual['USER_NAME'] ?? '';
-            $this->listData['list'][$key]['CON_REAL_NAME_ACTUAL'] = $conActual['REAL_NAME'] ?? '';
+            $conActual = User::getBaseInfo($value['REC_UID_ACTUAL']);
+            $this->listData['list'][$key]['REC_USER_NAME_ACTUAL'] = $conActual['USER_NAME'] ?? '';
+            $this->listData['list'][$key]['REC_REAL_NAME_ACTUAL'] = $conActual['REAL_NAME'] ?? '';
         }
     }
 
@@ -236,30 +236,30 @@ class IndexList extends \common\libs\dataList\DataList implements DataListInterf
                         'tag'=>['type'=>'warning', 'size' => 'small', 'class'=>'no-border']
                     ],
                 ],
-//                'REC_USER_NAME' => [
-//                    'header' => Yii::t('ctx', 'recommendationNo'),
-//                    'headerOther' => ['width' => '160'],
-//                ],
-//                'REC_REAL_NAME' => [
-//                    'header' => Yii::t('ctx', 'recommendedName'),
-//                    'headerOther' => ['width' => '160'],
-//                ],
-                'CON_USER_NAME_ACTUAL' => [
+                'REC_USER_NAME_ACTUAL' => [
                     'header' => Yii::t('ctx', 'recommendationNo'),
                     'headerOther' => ['width' => '140'],
                 ],
-                'CON_REAL_NAME_ACTUAL' => [
+                'REC_REAL_NAME_ACTUAL' => [
                     'header' => Yii::t('ctx', 'recommendedName'),
                     'headerOther' => ['width' => '140'],
                 ],
-                'CON_USER_NAME' => [
+                'REC_USER_NAME' => [
                     'header' => Yii::t('ctx', 'placementNo'),
-                    'headerOther' => ['width' => '140'],
+                    'headerOther' => ['width' => '160'],
                 ],
-                'CON_REAL_NAME' => [
+                'REC_REAL_NAME' => [
                     'header' => Yii::t('ctx', 'placementName'),
-                    'headerOther' => ['width' => '140'],
+                    'headerOther' => ['width' => '160'],
                 ],
+//                'CON_USER_NAME' => [
+//                    'header' => Yii::t('ctx', 'placementNo'),
+//                    'headerOther' => ['width' => '140'],
+//                ],
+//                'CON_REAL_NAME' => [
+//                    'header' => Yii::t('ctx', 'placementName'),
+//                    'headerOther' => ['width' => '140'],
+//                ],
 //                'RELATIVE_LOCATION' => [
 //                    'header' => Yii::t('ctx', 'resettlementArea'),
 //                    'headerOther' => ['width' => '140'],