diff --git a/src/common/constant.ts b/src/common/constant.ts index bd290ea..d061333 100644 --- a/src/common/constant.ts +++ b/src/common/constant.ts @@ -1,4 +1,4 @@ -// export const BASE_URL = CURRENT_BASE_URL +export const BASE_URL = CURRENT_BASE_URL // export const BASE_URL = `http://192.168.0.75:50001/lymarket` // export const BASE_URL = `http://192.168.0.89:50001/lymarket` // export const BASE_URL = `http://10.0.0.5:50001/lymarket` @@ -15,7 +15,7 @@ // export const BASE_URL = `http://192.168.1.7:50002/lymarket` // 添 // export const BASE_URL = `http://192.168.1.42:50002/lymarket` // 杰 // export const BASE_URL = `http://192.168.1.95:40001/lymarket` // 华 -export const BASE_URL = 'http://192.168.1.28:50002/lymarket' // 婷 +// export const BASE_URL = 'http://192.168.1.28:50002/lymarket' // 婷 // CDN // 生成密钥 diff --git a/src/pages/user/index.module.scss b/src/pages/user/index.module.scss index 55d2cd3..f61ebe5 100644 --- a/src/pages/user/index.module.scss +++ b/src/pages/user/index.module.scss @@ -53,7 +53,7 @@ page{ border-radius: 16px; background-color: #f6f6f6; margin-top: 20px; - padding: 15px; + padding: 10px 15px; } .username { display: block; @@ -70,7 +70,7 @@ page{ .userTitle { color: #626262; font-weight: 600; - font-size: $font_size_medium; + font-size: $font_size; margin-left: 20px; } .grid-container{ diff --git a/src/pages/user/index.tsx b/src/pages/user/index.tsx index 4dfcb56..167646e 100644 --- a/src/pages/user/index.tsx +++ b/src/pages/user/index.tsx @@ -180,11 +180,13 @@ const UserInfo: FC = () => { - + {/* 部门 */} + {userInfo.userInfo.department_name} - + {/* 职责 */} + {userInfo.userInfo.duty_name} { diff --git a/src/reducers/userInfo.ts b/src/reducers/userInfo.ts index 7493051..36fdbfc 100644 --- a/src/reducers/userInfo.ts +++ b/src/reducers/userInfo.ts @@ -6,6 +6,7 @@ export type UserParam = { department_code?: string department_id?: string department_name?: string + duty_name?: string physical_warehouse?: number physical_warehouse_name?: string token?: string