kevin_zhangl 3 лет назад
Родитель
Сommit
b5b0340434
2 измененных файлов с 9 добавлено и 4 удалено
  1. 4 4
      common/models/User.php
  2. 5 0
      frontendApi/modules/v1/controllers/SiteController.php

+ 4 - 4
common/models/User.php

@@ -360,15 +360,15 @@ class User extends \common\components\ActiveRecord
             'DEC_ROLE_ID' => $userInfo['DEC_ROLE_ID'],
             'OPEN_BANK' => $userInfo['OPEN_BANK'],
             'BANK_ADDRESS' => $userInfo['BANK_ADDRESS'],
-            'DEC_LV' => $userInfo['DEC_LV'],
-            'EMP_LV' => $userInfo['EMP_LV'],
-            'CROWN_LV' => $userInfo['CROWN_LV'],
+            'DEC_LV' => $userInfo['DEC_LV'] ?? DeclarationLevel::getDefaultLevelId(),
+            'EMP_LV' => $userInfo['EMP_LV'] ?? EmployLevel::getDefaultLevelId(),
+            'CROWN_LV' => $userInfo['CROWN_LV'] ?? StarCrownLevel::getDefaultLevelId(),
             'PROVINCE' => $userInfo['PROVINCE'],
             'CITY' => $userInfo['CITY'],
             'COUNTY' => $userInfo['COUNTY'],
             'BANK_NO' => $userInfo['BANK_NO'],
 //            'BANK_NO' => Tool::hideBankNo($userInfo['BANK_NO']),
-            'EMAIL' => $userInfo['EMAIL'],
+            'EMAIL' => $userInfo['EMAIL'] ?? '',
         ];
     }
 

+ 5 - 0
frontendApi/modules/v1/controllers/SiteController.php

@@ -16,6 +16,7 @@ use common\models\ArticleCategory;
 use common\models\BaUser;
 use common\models\DecOrder;
 use common\models\DecRole;
+use common\models\Period;
 use Yii;
 use frontendApi\modules\v1\models\User;
 
@@ -109,6 +110,8 @@ class SiteController extends BaseController
         $decLevels = Cache::getDecLevelConfig();
         // 聘级
         $empLevels = Cache::getEmpLevelConfig();
+        // 皇冠星级
+        $crownLevels = Cache::getStarCrownLevelConfig();
         // 菜单
         $menu = require Yii::getAlias('@frontendApi/config/menu.php');
         // 获取全部文章分类
@@ -125,8 +128,10 @@ class SiteController extends BaseController
         return [
             'decLevels' => $decLevels,
             'empLevels' => $empLevels,
+            'crownLevels' => $crownLevels,
             'menu' => $menu,
             'daysDiff' => $daysDiff,
+            'periodNum' => Period::instance()->getNowPeriodNum(),
             'shopWalletType' => $shopWalletType,
             'whetherBA' => false,
         ];