diff --git a/src/api/index.js b/src/api/index.js index de0364d..5e5dbcc 100644 --- a/src/api/index.js +++ b/src/api/index.js @@ -1,6 +1,6 @@ const api = { Login: '/auth/login/govH5/loginByPassword', - UserInfo: '/user/userinfo', + UserInfo: '/epmetuser/customerstaff/govH5/detail', Customerlist: '/epmetuser/customerstaff/customerlist' } diff --git a/src/api/user.js b/src/api/user.js index f07e406..f5b3d13 100644 --- a/src/api/user.js +++ b/src/api/user.js @@ -15,7 +15,7 @@ export function login(data) { export function getUserInfo(data) { return request({ url: api.UserInfo, - method: 'post', + method: 'get', data, }) } diff --git a/src/assets/css/index.less b/src/assets/css/index.less index 6572567..4fbb557 100644 --- a/src/assets/css/index.less +++ b/src/assets/css/index.less @@ -1,8 +1,8 @@ html, body #app { - color: @black; - background-color: @background-color; + color: #333333; + background-color: #f7f7f7; } #app { diff --git a/src/assets/css/mixin.scss b/src/assets/css/mixin.scss deleted file mode 100644 index 327b6d4..0000000 --- a/src/assets/css/mixin.scss +++ /dev/null @@ -1,36 +0,0 @@ -// mixin -// 清除浮动 -@mixin clearfix { - &:after { - content: ""; - display: table; - clear: both; - } -} - -// 多行隐藏 -@mixin textoverflow($clamp:1) { - display: block; - overflow: hidden; - text-overflow: ellipsis; - -o-text-overflow: ellipsis; - display: -webkit-box; - -webkit-line-clamp: $clamp; - /*! autoprefixer: ignore next */ - -webkit-box-orient: vertical; -} - -//flex box -@mixin flexbox($jc:space-between, $ai:center, $fd:row, $fw:nowrap) { - display: flex; - display: -webkit-flex; - flex: 1; - justify-content: $jc; - -webkit-justify-content: $jc; - align-items: $ai; - -webkit-align-items: $ai; - flex-direction: $fd; - -webkit-flex-direction: $fd; - flex-wrap: $fw; - -webkit-flex-wrap: $fw; -} diff --git a/src/assets/css/variables.scss b/src/assets/css/variables.scss deleted file mode 100644 index ee5a721..0000000 --- a/src/assets/css/variables.scss +++ /dev/null @@ -1,3 +0,0 @@ -// variables -$background-color: #f8f8f8; -$theme-color: #07b0b8; diff --git a/src/plugins/vant.js b/src/plugins/vant.js index 343ce83..15af4b7 100644 --- a/src/plugins/vant.js +++ b/src/plugins/vant.js @@ -24,7 +24,8 @@ import { List, ActionSheet, Checkbox, - CellGroup + CellGroup, + Form } from 'vant' Vue.use(Button) @@ -51,3 +52,4 @@ Vue.use(Button) .use(ActionSheet) .use(Checkbox) .use(CellGroup) + .use(Form) diff --git a/src/router/router.config.js b/src/router/router.config.js index 540e984..98051c6 100644 --- a/src/router/router.config.js +++ b/src/router/router.config.js @@ -5,11 +5,13 @@ export const constantRouterMap = [ { path: '/', + name:'login', component: () => import('@/views/login'), meta: { title: '登录', keepAlive: false } }, { path: '/mine', + name:'mine', component: () => import('@/views/mine'), meta: { title: '我的', keepAlive: false } } diff --git a/src/utils/request.js b/src/utils/request.js index 32d987e..d48dd3c 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -3,6 +3,7 @@ import store from '@/store' import { Toast } from 'vant' // 根据环境不同引入不同api地址 import { baseApi } from '@/config' +import router from '@/router' import { Tips } from '@/utils/index' // create an axios instance const service = axios.create({ @@ -15,8 +16,11 @@ const service = axios.create({ service.interceptors.request.use( config => { config.headers['source'] = process.env.NODE_ENV !== 'production' ? 'dev' : 'prod' + config.headers.client = 'web' + config.headers.app = 'gov' if (localStorage.getItem('token')) { config.headers['Token'] = localStorage.getItem('token') + config.headers['Authorization'] = localStorage.getItem('token') } config.baseURL = config.baseURL + '/' return config @@ -41,7 +45,7 @@ service.interceptors.response.use( let loginCode = [10007, 401, 10001, 10005, 10006] if (loginCode.includes(res.code)) { localStorage.removeItem('token') - router.replace('/login') + router.replace('/') } Tips.error(res.msg) return Promise.reject(res || 'error') @@ -54,7 +58,7 @@ service.interceptors.response.use( Dialog({ message: '登录过期，请重新登录' }).then(() => { localStorage.removeItem('token') router.replace( - '/login' + '/' ) }) } else { diff --git a/src/views/login/index.vue b/src/views/login/index.vue index 1f18753..38eeba5 100644 --- a/src/views/login/index.vue +++ b/src/views/login/index.vue @@ -1,14 +1,16 @@