Commit 50feec824b9eb9cf85f304a8525941dbd05c91dd

Authored by zhongnanhuang
2 parents c1d9386f 16c76793

merge branch 'znh-small' into znh

src/pages/Order/constant.ts
@@ -120,6 +120,7 @@ export const SALES_CODE_OPTIONS = [ @@ -120,6 +120,7 @@ export const SALES_CODE_OPTIONS = [
120 { label: 'HQ-6_smile', value: 'HQ-6_smile' }, 120 { label: 'HQ-6_smile', value: 'HQ-6_smile' },
121 { label: 'HQ-7_Yvonne', value: 'HQ-7_Yvonne' }, 121 { label: 'HQ-7_Yvonne', value: 'HQ-7_Yvonne' },
122 { label: 'HQ-8_Daniel', value: 'HQ-8_Daniel' }, 122 { label: 'HQ-8_Daniel', value: 'HQ-8_Daniel' },
  123 + { label: 'HQ-9_Wendy', value: 'HQ-9_Wendy' },
123 { label: 'W_strong', value: 'W_strong' }, 124 { label: 'W_strong', value: 'W_strong' },
124 { label: 'W-1_Alice', value: 'W-1_Alice' }, 125 { label: 'W-1_Alice', value: 'W-1_Alice' },
125 { label: 'W-2_Demi', value: 'W-2_Demi' }, 126 { label: 'W-2_Demi', value: 'W-2_Demi' },
@@ -145,6 +146,7 @@ export const SALES_CODE_OPTIONS = [ @@ -145,6 +146,7 @@ export const SALES_CODE_OPTIONS = [
145 { label: 'GW-4_Lynn', value: 'GW-4_Lynn' }, 146 { label: 'GW-4_Lynn', value: 'GW-4_Lynn' },
146 { label: 'GW-6_smile', value: 'GW-6_smile' }, 147 { label: 'GW-6_smile', value: 'GW-6_smile' },
147 { label: 'GW-7_Yvonne', value: 'GW-7_Yvonne' }, 148 { label: 'GW-7_Yvonne', value: 'GW-7_Yvonne' },
  149 + { label: 'GW-9_Wendy', value: 'GW-9_Wendy' },
148 { label: 'W-9_Jack', value: 'W-9_Jack' }, 150 { label: 'W-9_Jack', value: 'W-9_Jack' },
149 { label: 'W-8_Andy', value: 'W-8_Andy' }, 151 { label: 'W-8_Andy', value: 'W-8_Andy' },
150 { label: 'CQ_Peter', value: 'CQ_Peter' }, 152 { label: 'CQ_Peter', value: 'CQ_Peter' },
src/utils/user.ts 0 → 100644
  1 +/**
  2 + *
  3 + * @returns 获取本地用户信息
  4 + */
  5 +export const getUserInfo = () => {
  6 + let localUserInfo = localStorage.getItem('userInfo');
  7 +
  8 + if (localUserInfo === null || localUserInfo === undefined) {
  9 + localUserInfo = '';
  10 + }
  11 + const userInfo = JSON.parse(localUserInfo);
  12 +
  13 + return userInfo;
  14 +};