Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
X
xichonght
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
1
Issues
1
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
zhangdishen
xichonght
Commits
3df74669
Commit
3df74669
authored
Aug 27, 2019
by
liucheng
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'dev' into 'master'
'' See merge request
!65
parents
68a38407
8a918b87
Changes
3
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
2463 additions
and
2482 deletions
+2463
-2482
package-lock.json
xichongSys/package-lock.json
+2459
-2478
index.js
xichongSys/src/router/index.js
+4
-3
global.js
xichongSys/src/utils/global.js
+0
-1
No files found.
xichongSys/package-lock.json
View file @
3df74669
This diff is collapsed.
Click to expand it.
xichongSys/src/router/index.js
View file @
3df74669
...
@@ -36,6 +36,7 @@ import treatmentApplicationAudit from "@/views/Myvue/treatmentApplicationAudit";
...
@@ -36,6 +36,7 @@ import treatmentApplicationAudit from "@/views/Myvue/treatmentApplicationAudit";
import
drcbzx
from
"@/views/Myvue/drcbzx"
;
import
drcbzx
from
"@/views/Myvue/drcbzx"
;
import
drbjbf
from
"@/views/Myvue/drbjbf"
;
import
drbjbf
from
"@/views/Myvue/drbjbf"
;
import
drtsyw
from
"@/views/Myvue/drtsyw"
;
import
drtsyw
from
"@/views/Myvue/drtsyw"
;
import
authRecordphone
from
"@/views/Myvue/authRecordphone"
;
Vue
.
use
(
Router
)
Vue
.
use
(
Router
)
...
@@ -210,13 +211,13 @@ const router = new Router({
...
@@ -210,13 +211,13 @@ const router = new Router({
})
})
router
.
beforeEach
((
to
,
from
,
next
)
=>
{
router
.
beforeEach
((
to
,
from
,
next
)
=>
{
// 登录界面登录成功之后,会把用户信息保存在会话
// 登录界面登录成功之后,会把用户信息保存在会话
// 存在时间为会话生命周期,页面关闭即失效。
// 存在时间为会话生命周期,页面关闭即失效。
if
(
localStorage
.
getItem
(
"token"
)){
if
(
localStorage
.
getItem
(
"token"
)){
Cookies
.
set
(
'token'
,
localStorage
.
getItem
(
"token"
))
Cookies
.
set
(
'token'
,
localStorage
.
getItem
(
"token"
))
}
}
let
token
=
Cookies
.
get
(
'token'
)
let
token
=
Cookies
.
get
(
'token'
)
let
userName
=
sessionStorage
.
getItem
(
'user'
)
let
userName
=
sessionStorage
.
getItem
(
'user'
)
...
...
xichongSys/src/utils/global.js
View file @
3df74669
...
@@ -7,7 +7,6 @@
...
@@ -7,7 +7,6 @@
// 后台管理系统服务器地址
// 后台管理系统服务器地址
// export const baseUrl2 = 'http://xclc.rensheju.com'
// export const baseUrl2 = 'http://xclc.rensheju.com'
// //export const baseUrl = 'http://xc.rensheju.com'
// //export const baseUrl = 'http://xc.rensheju.com'
export
const
baseUrl
=
'http://172.16.10.33:9002'
export
const
baseUrl2
=
'http://xclc.rensheju.com'
export
const
baseUrl2
=
'http://xclc.rensheju.com'
export
const
baseUrl
=
'http://xc.rensheju.com'
export
const
baseUrl
=
'http://xc.rensheju.com'
//export const baseUrl = 'http://172.16.10.33:9003'
//export const baseUrl = 'http://172.16.10.33:9003'
...
...
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