Commit 3df74669 authored by liucheng's avatar liucheng

Merge branch 'dev' into 'master'

''

See merge request !65
parents 68a38407 8a918b87
This source diff could not be displayed because it is too large. You can view the blob instead.
...@@ -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')
......
...@@ -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'
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment