Quellcode durchsuchen

feat: 修改菜单栏上计量图标

lanjianrong vor 3 Jahren
Ursprung
Commit
f57c87f8ed

+ 1 - 1
src/components/Menu/api.ts

@@ -1,6 +1,6 @@
 import request from "@/utils/common/request"
 
 export async function apiLogout() {
-  const { data } = await request.post('/api/login/out')
+  const { data } = await request.get('/api/login/out')
   return data
 }

+ 4 - 1
src/components/Menu/index.tsx

@@ -7,6 +7,7 @@ import { Button, Dropdown, Menu, Tooltip } from "antd"
 import { observer } from 'mobx-react'
 import React from 'react'
 import { Link } from "react-router-dom"
+import SvgIcon from '../SvgIcon'
 import styles from './index.module.scss'
 import './index.scss'
 import MenuItem from './MenuItem'
@@ -49,7 +50,9 @@ const NavSider: React.FC<iMenuProps> = (props) => {
           }
           {
             userStore.userInfo.jlAuth ? <Tooltip placement='right' title='计量支付'>
-              <a style={{ fontSize: 27, color: '#7786ab', cursor: 'pointer' }} onClick={redirectToJL}>JL</a>
+              <a>
+              <SvgIcon type={'xxh-jl_logo'} style={{ fontSize: 27, color: '#7786ab', cursor: 'pointer' }} onClick={redirectToJL}/>
+              </a>
             </Tooltip> : null
           }
         </div>

+ 1 - 1
src/components/SvgIcon/index.tsx

@@ -1,5 +1,5 @@
 import { createFromIconfontCN } from '@ant-design/icons'
 const SvgIcon = createFromIconfontCN({
-  scriptUrl: '//at.alicdn.com/t/font_2224180_48rc3v3sgp4.js'
+  scriptUrl: '//at.alicdn.com/t/font_2224180_trlxv65aom.js'
 })
 export default SvgIcon

+ 4 - 6
src/store/mobx/user/index.ts

@@ -73,12 +73,10 @@ class UserState {
   }
 
   @action async logout() {
-    const { code = -1 } = await apiLogout()
-    if (code === consts.RET_CODE.SUCCESS) {
-      await delUserInfo()
-      this.userInfo = this.initUserState
-      history.push('/login')
-    }
+    await apiLogout()
+    delUserInfo()
+    this.userInfo = this.initUserState
+    history.push('/login')
   }
 
   @action check() {

+ 14 - 4
src/utils/common/request.ts

@@ -42,11 +42,21 @@ service.interceptors.request.use(
     request.cancelToken = new axios.CancelToken(func => {
       pending.push({ url: request.url, method: request.method, params: request.params, data: request.data, cancel: func })
     })
-    if (request?.method !== 'get') {
-      request.headers['X-CSRF-Token'] = storage.get('csrf_token')
+    let csrf_token
+    try {
+      csrf_token  = storage.get('csrf_token')
+    } catch (error) {
+      throw new Error('csrf_token不存在')
+      
+    }
+    
+    if (request?.method !== 'get' && csrf_token) {
+      request.headers['X-CSRF-Token'] = csrf_token
+    }
+    const bidsectionId = tenderStore.bid
+    if (bidsectionId) {
+      request.headers['bidsectionId'] = tenderStore.bid
     }
-
-    request.headers['bidsectionId'] = tenderStore.bid
     return Promise.resolve(request)
   },
   err => {