module-menu 0.2.10 → 0.2.12

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "module-menu",
-  "version": "0.2.10",
+  "version": "0.2.12",
   "description": "城市大数据平台公共头部及尾部",
   "main": "src/pages/index.jsx",
   "scripts": {

package/src/pages/ModuleMenu/index.jsx

@@ -72,7 +72,7 @@ const ModuleMenu = ({ sysName, stash }) => {
       Axios('get', '/admin/social/logoutUri', '', {})
         .then((res) => {
           if (res.data.code === 0) {
-            if (res.data.data !== '1') {
+            if (res.data.data.search('http') !== -1) {
               window.location.href = res.data.data;
             }
           } else {

package/src/pages/ModuleUser/index.jsx

@@ -24,7 +24,21 @@ const ModuleUser = ({ stash }) => {
   const handleClickmenu = (url) => {
     window.location.href = url;
   };
-
+  const handleClickSysManage = () => {
+    if (!stash) {
+      window.location.href = '/#/admin/user/index';
+    } else {
+      Axios('get', '/admin-api/system/auth/homePage', '', {})
+        .then((res) => {
+          if (res.data.code === 0) {
+            window.location.href = `/admin-ui${res.data.data.path}`;
+          } else {
+            message.warning(res.data.msg || '获取系统管理页面路由信息失败');
+          }
+        })
+        .catch((e) => console.log('e', e));
+    }
+  };
   const {
     PersonalCenterSrc,
     MessageCenterSrc,
@@ -139,7 +153,11 @@ const ModuleUser = ({ stash }) => {
       <Menu.Item
         key="personalCenter"
         onClick={() =>
-          handleClickmenu(!stash ? '/#/info/index' : '/admin-ui/user/profile')
+          handleClickmenu(
+            !stash
+              ? '/#/info/index'
+              : '/admin-ui/data-share-portal/personal/info',
+          )
         }
       >
         <img
@@ -147,19 +165,10 @@ const ModuleUser = ({ stash }) => {
           alt=""
           style={{ marginRight: '10px', marginTop: '-3px' }}
         />
-        <span>个人中心</span>
+        <span>{!stash ? '个人中心' : '用户中心'}</span>
       </Menu.Item>
       {isHaveSystemManagementPermission && (
-        <Menu.Item
-          key="systemManage"
-          onClick={() =>
-            handleClickmenu(
-              !stash
-                ? '/#/admin/user/index'
-                : '/admin-ui/bpm/manager/user-group',
-            )
-          }
-        >
+        <Menu.Item key="systemManage" onClick={handleClickSysManage}>
           <img
             src={SystemManageSrc}
             alt=""

package/src/pages/index.jsx

@@ -2,3 +2,4 @@ import ModuleMenu from './ModuleMenu';
 import ModuleUser from './ModuleUser';
 import Footer from './Footer';
 export { ModuleMenu, ModuleUser, Footer };
+// export default ModuleMenu;

package/src/pages/util/axios.js

@@ -4,7 +4,7 @@ import baseCof from './config';
 import getStore from './userInfo';
 import { checkToken} from './permessionUtils';
 
-let tokenValue='7112f7c33eb24011a97d88ceaa285b9e';
+let tokenValue='dfd39d55-4c49-4862-8400-46f2a57f25ac';
 // tokenInSessionStor存在为一体化，不存在为轻量级
 const tokenInSessionStor = window.sessionStorage.getItem('bigdata-access_token');
 const DEFAULT_LOGOUT_URL = tokenInSessionStor? '/#/login':'/admin-ui/login'
@@ -103,7 +103,7 @@ function Axios(method, api, params, map) {
   } else if (api === '/admin/social/logoutUri') {
     httpDefult = {
       method: method,
-      url: api,
+      url: `${baseCof.baseSever}${api}`,
       params: params,
       ...map,
     };