diff --git a/.env.development b/.env.development index d259db0..0636b47 100644 --- a/.env.development +++ b/.env.development @@ -8,5 +8,5 @@ VUE_APP_BASE_API = '/api' # VUE_APP_URL = "http://jianguan.yyundong.com/shgfapi" -VUE_APP_URL = "http://192.168.2.104:7201" +VUE_APP_URL = "http://192.168.2.110:7201" ##VUE_APP_URL = "http://8.130.39.13:8112" diff --git a/src/api/user.js b/src/api/user.js index 3a36b7c..0f6bb26 100644 --- a/src/api/user.js +++ b/src/api/user.js @@ -5,7 +5,7 @@ import qs from 'qs' // 登录 export function doLogin(data) { return request({ - url: '/gf/sys/doLogin', + url: '/sysuser/doLogin', method: 'post', data: data, headers: { 'Content-Type': 'application/json' } diff --git a/src/assets/home/bj.jpg b/src/assets/home/bj.jpg index 209287a..914ac4c 100644 Binary files a/src/assets/home/bj.jpg and b/src/assets/home/bj.jpg differ diff --git a/src/assets/home/bj.png b/src/assets/home/bj.png index 020531b..d8e3497 100644 Binary files a/src/assets/home/bj.png and b/src/assets/home/bj.png differ diff --git a/src/assets/loginImg/logo.png b/src/assets/loginImg/logo.png index 346b6ae..d9c4a41 100644 Binary files a/src/assets/loginImg/logo.png and b/src/assets/loginImg/logo.png differ diff --git a/src/router/index.js b/src/router/index.js index 097abd7..5ba88f8 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -12,14 +12,45 @@ import codemenu from './modules/codemenu' export const constantRoutes = [ { path: '/', - redirect: 'userInfo' + redirect: 'login' }, { - path: '/index', - component: () => import('@/views/userInfo/index.vue'), - name: 'index' + path: '/login', + component: () => import('@/views/login/login.vue'), + name: 'login' }, + + + // { + // path: '/', + // redirect: 'userInfo/index' + // }, + // { + // path: '/index', + // component: () => import('@/views/userInfo/index.vue'), + // name: 'index' + + // }, + + { + path: '/index', + component: Layout, + redirect: '/index', + children: [{ + path: '/index', + component: () => + import('@/views/index.vue'), + name: 'index', + meta: { + title: '主页', + noCache: true, + affix: true + } + }] + }, + + { path: '/userInfo', component: Layout, diff --git a/src/views/login/login.vue b/src/views/login/login.vue index 0d15482..873224d 100644 --- a/src/views/login/login.vue +++ b/src/views/login/login.vue @@ -1,9 +1,9 @@