Toggle navigation
Toggle navigation
This project
Loading...
Sign in
Fedex
/
iClear-Connect-Pre-Clearance
Go to a project
Toggle navigation
Toggle navigation pinning
Projects
Groups
Snippets
Help
Project
Activity
Repository
Pipelines
Graphs
Issues
0
Merge Requests
0
Wiki
Snippets
Network
Create a new issue
Builds
Commits
Issue Boards
Authored by
jinhui.wang
2024-11-20 09:58:29 +0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
063e3dc90b4906648a155498df4c29aee8a274ec
063e3dc9
1 parent
fce16a90
接口增加,参数修改
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
7 additions
and
10 deletions
web/src/api/login.js
web/src/layout/components/Navbar.vue
web/src/store/getters.js
web/src/store/modules/user.js
web/src/views/fedexLogin/loginForm.vue
web/src/views/login.vue
web/src/api/login.js
View file @
063e3dc
...
...
@@ -33,7 +33,7 @@ export function getUserByAccNo(data) {
// 退出
export
function
logout
()
{
return
request
({
url
:
"/
icleartw/sysUser
/logout"
,
url
:
"/
manager-server/auth
/logout"
,
method
:
"post"
,
});
}
...
...
web/src/layout/components/Navbar.vue
View file @
063e3dc
...
...
@@ -27,8 +27,8 @@
<div class="userName register">
{{ userData.userName != null ? userData.userName : "" }}
<el-divider direction="vertical"></el-divider>
<span>{{ userData.type }}</span>
<
el-divider direction="vertical"></el-divider
>
<span>{{ userData.type
Name
}}</span>
<
!-- <el-divider direction="vertical"></el-divider> --
>
</div>
</div>
<div class="user-container" v-else>
...
...
web/src/store/getters.js
View file @
063e3dc
...
...
@@ -9,7 +9,6 @@ const getters = {
token
:
(
state
)
=>
state
.
user
.
token
,
avatar
:
(
state
)
=>
state
.
user
.
avatar
,
name
:
(
state
)
=>
state
.
user
.
name
,
id
:
(
state
)
=>
state
.
user
.
id
,
activePortName
:
(
state
)
=>
state
.
user
.
activePortName
,
portName
:
(
state
)
=>
state
.
user
.
portName
,
introduction
:
(
state
)
=>
state
.
user
.
introduction
,
...
...
web/src/store/modules/user.js
View file @
063e3dc
...
...
@@ -7,10 +7,10 @@ const user = {
token
:
getToken
(),
userData
:
{},
name
:
""
,
id
:
""
,
avatar
:
""
,
activePortName
:
""
,
appLoading
:
false
,
tableHeader
:
[],
},
mutations
:
{
...
...
@@ -23,9 +23,6 @@ const user = {
SET_NAME
:
(
state
,
name
)
=>
{
state
.
name
=
name
;
},
SET_ID
:
(
state
,
id
)
=>
{
state
.
id
=
id
;
},
SET_AVATAR
:
(
state
,
avatar
)
=>
{
state
.
avatar
=
avatar
;
},
...
...
web/src/views/fedexLogin/loginForm.vue
View file @
063e3dc
...
...
@@ -740,7 +740,7 @@ export default {
this.$store
.dispatch("Login", this.loginForm)
.then(() => {
this.$router.push({ name: "
declarationInput
" }).catch(() => {
this.$router.push({ name: "
WaybillInquiry
" }).catch(() => {
this.loading = false;
});
})
...
...
@@ -836,7 +836,7 @@ export default {
dangerouslyUseHTMLString: true,
type: "success",
}).then(() => {
location.href = "/I
cTw
/#/login";
location.href = "/I
mpPer
/#/login";
this.loginType = "login";
});
} else {
...
...
web/src/views/login.vue
View file @
063e3dc
...
...
@@ -243,6 +243,7 @@ export default {
fclInit().then((res) => {
if (res.code == 200) {
if (this.appEnv == "development" || this.appEnv == "staging") {
localStorage.setItem("impPreHost", location.origin);
this.fclLoginAddr = `http://192.168.1.251/time.html?replaceUrl=${
location.origin
}/ImpPer/#/redjrectLogin&loginUrl=/icleartw/auth/login&d=${new Date().getTime()}`;
...
...
Please
register
or
login
to post a comment