diff --git a/.env.development b/.env.development index 8dd7aef..d3fe22d 100644 --- a/.env.development +++ b/.env.development @@ -1,4 +1,4 @@ VITE_NOW_TYPE = 'dist' -# VITE_BASE_URL = 'http://192.168.1.7:8324' -VITE_BASE_URL = 'https://crmeb-test.shop.lihaink.cn' \ No newline at end of file +VITE_BASE_URL = 'http://192.168.1.10:8546' +# VITE_BASE_URL = 'https://erp.lihaink.cn' \ No newline at end of file diff --git a/src/api/user.js b/src/api/user.js index 4197980..8a0de44 100644 --- a/src/api/user.js +++ b/src/api/user.js @@ -10,7 +10,7 @@ export function captchaApi() { * @description 登录 */ export function login(data) { - return request.post(`auth/login`, data) + return request.post(`/login/account`, data) } /** diff --git a/src/layout/myHeader.vue b/src/layout/myHeader.vue index 255f10a..54680c0 100644 --- a/src/layout/myHeader.vue +++ b/src/layout/myHeader.vue @@ -8,15 +8,7 @@ import { useRouter } from 'vue-router' const userStore = useUserStore(); const merInfo = ref({}); -merInfo.value = userStore.userInfo.mer_info; -const service = ref({}); -service.value = userStore.userInfo.service; - -const getInfo = () => { - info().then((res) => { - merInfo.value = res.data; - }); -}; +merInfo.value = userStore.userInfo; const router = useRouter(); const onLogout = () => { @@ -32,7 +24,6 @@ const onLogout = () => { }); } -// getInfo();