Commit 37bc98239709e29b1455aa3f33a0caa508a9a5a8
1 parent
41afef47
feat: update 课题组信息显示优化
Showing
3 changed files
with
8 additions
and
4 deletions
src/access.ts
@@ -11,7 +11,7 @@ export default (initialState: API.UserInfo) => { | @@ -11,7 +11,7 @@ export default (initialState: API.UserInfo) => { | ||
11 | return { | 11 | return { |
12 | canReadAdmin: canReadAdmin, | 12 | canReadAdmin: canReadAdmin, |
13 | canReadProcure: canReadProcure, | 13 | canReadProcure: canReadProcure, |
14 | - canReadLinda: username === 'Linda' || username === '吴量', | 14 | + canReadLinda: username === 'Linda', |
15 | canReadAdminAndFinance: canReadFinance || canReadAdmin, | 15 | canReadAdminAndFinance: canReadFinance || canReadAdmin, |
16 | canReadSales: canReadSales, | 16 | canReadSales: canReadSales, |
17 | canReadAdminAndFinanceAndSales: | 17 | canReadAdminAndFinanceAndSales: |
src/pages/Order/index.tsx
@@ -768,7 +768,7 @@ const OrderPage = () => { | @@ -768,7 +768,7 @@ const OrderPage = () => { | ||
768 | key={index} | 768 | key={index} |
769 | onConfirm={() => { | 769 | onConfirm={() => { |
770 | window.open( | 770 | window.open( |
771 | - '/onlinePreview?url=' + | 771 | + '/previewApi/onlinePreview?url=' + |
772 | encodeURIComponent(Base64.encode(item.url)), | 772 | encodeURIComponent(Base64.encode(item.url)), |
773 | ); | 773 | ); |
774 | }} | 774 | }} |
src/pages/ResearchGroup/index.tsx
@@ -158,7 +158,11 @@ const PrepaidPage = () => { | @@ -158,7 +158,11 @@ const PrepaidPage = () => { | ||
158 | <div>名称:</div> | 158 | <div>名称:</div> |
159 | </Col> | 159 | </Col> |
160 | <Col span={14}> | 160 | <Col span={14}> |
161 | - <div>{accountInfo.realName}</div> | 161 | + <div> |
162 | + {accountInfo.realName === '' | ||
163 | + ? '用户' | ||
164 | + : accountInfo.realName} | ||
165 | + </div> | ||
162 | </Col> | 166 | </Col> |
163 | </Row> | 167 | </Row> |
164 | <Row gutter={4}> | 168 | <Row gutter={4}> |
@@ -196,7 +200,7 @@ const PrepaidPage = () => { | @@ -196,7 +200,7 @@ const PrepaidPage = () => { | ||
196 | loadAccountInfo(accountId, accountPhone); | 200 | loadAccountInfo(accountId, accountPhone); |
197 | }} | 201 | }} |
198 | > | 202 | > |
199 | - {accountName} | 203 | + {accountName === '' ? '用户' : accountName} |
200 | </Tag> | 204 | </Tag> |
201 | </Popconfirm> | 205 | </Popconfirm> |
202 | ); | 206 | ); |