From 225795f56ea96c69f9d27c1501dca4334764bb85 Mon Sep 17 00:00:00 2001
From: xuan <w1359774872@gmail.com>
Date: Mon, 14 Nov 2022 18:37:23 +0800
Subject: [PATCH] =?UTF-8?q?=F0=9F=8E=88=20perf(=E6=88=91=E7=9A=84):=20?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=98=BE=E7=A4=BA=E7=94=A8=E6=88=B7=E8=81=8C?=
 =?UTF-8?q?=E8=B4=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/common/constant.ts           | 4 ++--
 src/pages/user/index.module.scss | 4 ++--
 src/pages/user/index.tsx         | 6 ++++--
 src/reducers/userInfo.ts         | 1 +
 4 files changed, 9 insertions(+), 6 deletions(-)

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 = () => {
           </View>
         </View>
         <View className={styles.bottomBar}>
-          <Tag type='primary' size='normal' circle>
+          {/* 部门 */}
+          <Tag type='primary' size='small' circle customStyle={{padding: '8px 5px'}}>
             {userInfo.userInfo.department_name}
           </Tag>
           <Divider direction='vertical'></Divider>
-          <Text className={styles.userTitle}></Text>
+          {/* 职责 */}
+          <Text className={styles.userTitle}>{userInfo.userInfo.duty_name}</Text>
         </View>
       </LayoutBlock>
       {
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