Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
J
jinfa-platform
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
linweijiong
jinfa-platform
Commits
12d44049
Commit
12d44049
authored
Jul 03, 2021
by
前端-许佳敏
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: 修复在商城端退出登录后也能退出能力中心
parent
98e1af9d
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
16 additions
and
8 deletions
+16
-8
env.js
env.js
+3
-3
app.tsx
src/app.tsx
+2
-0
index.tsx
src/pages/commodity/products/index.tsx
+3
-2
index.tsx
...er/orderCollect/components/mergeOrderModalTable/index.tsx
+2
-1
auth.ts
src/utils/auth.ts
+6
-2
No files found.
env.js
View file @
12d44049
...
...
@@ -171,11 +171,11 @@ module.exports = {
ssh
:
JSON
.
stringify
({
user
:
"root"
,
// Password optional, prompted if none given
password
:
"
Shushangyun520
"
,
host
:
"10.0.
1.220
"
,
password
:
"
123456
"
,
host
:
"10.0.
0.17
"
,
port
:
22
,
localRoot
:
path
.
resolve
(
'./dist/'
),
remoteRoot
:
"/home/www/v2member/"
,
remoteRoot
:
"/home/www/v2
scm-
member/"
,
// include: ["*", "**/*"], // this would upload everything except dot files
include
:
[
"*"
],
// e.g. exclude sourcemaps, and ALL files in node_modules (including dot files)
...
...
src/app.tsx
View file @
12d44049
...
...
@@ -158,6 +158,8 @@ export function render(oldRender: Function) {
oldRender
()
})
}
else
{
removeAuth
()
removeRouters
()
oldRender
()
}
}
...
...
src/pages/commodity/products/index.tsx
View file @
12d44049
...
...
@@ -24,6 +24,7 @@ import NiceForm from '@/components/NiceForm'
import
{
createFormActions
,
FormEffectHooks
}
from
'@formily/antd'
import
{
useStateFilterSearchLinkageEffect
}
from
'@/formSchema/effects/useFilterSearch'
import
{
searchBrandOptionEffect
,
searchCustomerCategoryOptionEffect
}
from
'./effect'
import
{
getAuth
}
from
'@/utils/auth'
const
{
Option
}
=
Select
;
const
{
confirm
}
=
Modal
;
...
...
@@ -391,8 +392,8 @@ const Products: React.FC<{}> = () => {
// 判断上架之前是否有店铺 有即可以上下架
if
(
judgeShopRef
.
current
){
PublicApi
.
getTemplateWebMemberShopWebFindCurrMemberShop
({
memberId
:
JSON
.
parse
(
window
.
localStorage
.
getItem
(
'auth'
)
||
window
.
localStorage
.
getItem
(
'AUTH'
)
).
memberId
,
memberRoleId
:
JSON
.
parse
(
window
.
localStorage
.
getItem
(
'auth'
)
||
window
.
localStorage
.
getItem
(
'AUTH'
)
).
memberRoleId
memberId
:
getAuth
(
).
memberId
,
memberRoleId
:
getAuth
(
).
memberRoleId
}).
then
(
res
=>
{
if
(
res
.
data
.
id
){
setShopId
(
res
.
data
.
id
)
...
...
src/pages/transaction/purchaseOrder/orderCollect/components/mergeOrderModalTable/index.tsx
View file @
12d44049
...
...
@@ -14,6 +14,7 @@ import NestTable from '@/components/NestTable'
import
{
PublicApi
}
from
'@/services/api'
import
{
getUnitPriceTotal
}
from
'../../model/useProductTable'
import
{
usePageStatus
}
from
'@/hooks/usePageStatus'
import
{
getAuth
}
from
'@/utils/auth'
export
interface
MergeOrderModalTableProps
{
title
:
string
,
...
...
@@ -63,7 +64,7 @@ const MergeOrderModalTable:React.FC<MergeOrderModalTableProps> = (props) => {
const
getMergeOrderList
=
(
params
)
=>
{
setLoading
(
true
)
let
memberId
=
JSON
.
parse
(
localStorage
.
getItem
(
"auth"
)
||
localStorage
.
getItem
(
"AUTH"
))[
"memberId"
]
let
memberId
=
getAuth
().
memberId
PublicApi
.
getOrderMergeOrderList
({...
params
,
memberId
}).
then
(
res
=>
{
setDataSource
(
res
.
data
)
setLoading
(
false
)
...
...
src/utils/auth.ts
View file @
12d44049
...
...
@@ -48,12 +48,16 @@ export const setLocalAuth = (info: AuthInfo) => {
export
const
getAuth
=
():
AuthInfo
=>
{
try
{
// const localAuth: AuthInfo = getCookie('AUTH'
) as unknown as AuthInfo
const
cookieAuth
:
AuthInfo
=
getCookie
(
AUTH_KEY
)
as
unknown
as
AuthInfo
// return (localAuth || {}) as AuthInfo
if
(
!
cookieAuth
)
{
// cookie不存在 说明在其他商城端已退出登录
return
null
as
AuthInfo
}
const
localAuth
=
JSON
.
parse
(
window
.
localStorage
.
getItem
(
AUTH_KEY
))
return
(
localAuth
||
{}
)
as
AuthInfo
}
catch
(
error
)
{
return
{}
as
AuthInfo
return
null
as
AuthInfo
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment