Merge branch 'v4.7.0dev' of https://gitee.com/ZhongBangKeJi/CRMEB into v4.7.0dev

crmeb/app/adminapi/controller/Common.php

@@ -346,6 +346,7 @@ class Common extends AuthController
             $pid = $item->getData('pid');
             $data[$key] = json_decode($item, true);
             $data[$key]['pid'] = $pid;
+            $data[$key]['menu_path'] = '/' . config('app.admin_prefix', 'admin') . $item['menu_path'];
             if (in_array($item->id, $counts)) {
                 $data[$key]['type'] = 1;
             } else {

crmeb/app/services/system/SystemMenusServices.php

@@ -51,8 +51,11 @@ class SystemMenusServices extends BaseServices
     {
         $data = [];
         foreach ($menusList as $item) {
-            $data[] = $item->getData();
+            $item = $item->getData();
+            $item['menu_path'] = '/' . config('app.admin_prefix', 'admin') . $item['menu_path'];
+            $data[] = $item;
         }
+
         return $data;
     }
 

crmeb/app/services/user/UserServices.php

@@ -1632,7 +1632,7 @@ class UserServices extends BaseServices
                 $check = true;
             }
         }
-        if ($userInfo['uid'] == $spreadUid || $userInfo['spread_uid'] == $userSpreadUid) $check = false;
+        if ($userInfo['uid'] == $spreadUid || $userInfo['uid'] == $userSpreadUid) $check = false;
         if ($check) {
             $spreadInfo = $this->dao->get($spreadUid, ['division_id', 'agent_id', 'staff_id']);
             $data = [];

crmeb/config/app.php

@@ -47,5 +47,5 @@ return [
     // 没有开启消息队列命令或者定时任务命令的提醒开关
     'console_remind'   => true,
     // admin路由前缀
-    'admin_prefix'     => 'administration',
+    'admin_prefix'     => 'admin',
 ];