Browse Source

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

zhangl 1 năm trước cách đây
mục cha
commit
c07e7e1f44

+ 3 - 3
backendApi/config/menu.php

@@ -167,9 +167,9 @@ return [
             ['name'=>'开拓网络列表', 'class'=>'', 'icon'=>'', 'controller'=>'atlas', 'action'=>'relation-list', 'routePath'=>'atlas/relation-list', 'show'=>0,],
             ['name'=>'开拓网络列表导出', 'class'=>'', 'icon'=>'', 'controller'=>'atlas', 'action'=>'relation-list-export', 'routePath'=>'atlas/relation-list-export', 'show'=>0,],
 //            ['name'=>'Placement network', 'class'=>'', 'icon'=>'', 'controller'=>'atlas', 'action'=>'network-opt', 'routePath'=>'atlas/network-opt', 'show'=>1, 'wiki' => 'placementNetwork'],//安置网络
-            ['name'=>'安置网络图', 'class'=>'', 'icon'=>'', 'controller'=>'atlas', 'action'=>'network', 'routePath'=>'atlas/network', 'show'=>0,],
-            ['name'=>'安置网络列表', 'class'=>'', 'icon'=>'', 'controller'=>'atlas', 'action'=>'network-list', 'routePath'=>'atlas/network-list', 'show'=>0,],
-            ['name'=>'安置网络列表导出', 'class'=>'', 'icon'=>'', 'controller'=>'atlas', 'action'=>'network-list-export', 'routePath'=>'atlas/network-list-export', 'show'=>0,],
+//            ['name'=>'安置网络图', 'class'=>'', 'icon'=>'', 'controller'=>'atlas', 'action'=>'network', 'routePath'=>'atlas/network', 'show'=>0,],
+//            ['name'=>'安置网络列表', 'class'=>'', 'icon'=>'', 'controller'=>'atlas', 'action'=>'network-list', 'routePath'=>'atlas/network-list', 'show'=>0,],
+//            ['name'=>'安置网络列表导出', 'class'=>'', 'icon'=>'', 'controller'=>'atlas', 'action'=>'network-list-export', 'routePath'=>'atlas/network-list-export', 'show'=>0,],
 //            ['name'=>'Placement Network Ex', 'class'=>'', 'icon'=>'', 'controller'=>'atlas', 'action'=>'network-ex', 'routePath'=>'atlas/relation-list', 'show'=>1, 'wiki' => 'placementNetworkEx',],//安置网络ex
             ['name'=>'Sponsor Network Ex', 'class'=>'', 'icon'=>'', 'controller'=>'atlas', 'action'=>'relation-ex', 'routePath'=>'atlas/network-list', 'show'=>1, 'wiki' => 'sponsorNetworkEx',],//推荐网路ex
         ]

+ 1 - 1
frontendApi/modules/v1/controllers/UserController.php

@@ -727,7 +727,7 @@ class UserController extends BaseController {
             */
             $userId, function ($parent) use ($actualId, $periodNum) {
             $parentUser = CalcCache::getUserInfo($parent['PARENT_UID'], $periodNum);
-            if ($parentUser['ID'] == $actualId) {
+            if ($parentUser['USER_ID'] == $actualId) {
                 return self::LOOP_FINISH;
             }