提交 d1a80b50 authored 作者: lihuihui's avatar lihuihui

修改bug

上级 f9b445a8
...@@ -3,7 +3,7 @@ module.exports = { ...@@ -3,7 +3,7 @@ module.exports = {
url: 'http://dev.ezijing.com:4006/api', url: 'http://dev.ezijing.com:4006/api',
// apiBaseURL: '//demo-login.ezijing.com/' // apiBaseURL: '//demo-login.ezijing.com/'
others: { others: {
url: '/app/learn/course' url: '/login/is-login'
}, },
webpack: { webpack: {
externals: { externals: {
......
...@@ -3,7 +3,7 @@ module.exports = { ...@@ -3,7 +3,7 @@ module.exports = {
DesDir: '../server/client-dist', DesDir: '../server/client-dist',
apiBaseURL: '/api', apiBaseURL: '/api',
others: { others: {
url: '/app/learn/course' url: '/login/is-login'
}, },
webpack: { webpack: {
externals: { externals: {
......
...@@ -3,7 +3,7 @@ module.exports = { ...@@ -3,7 +3,7 @@ module.exports = {
DesDir: '../server/client-dist', DesDir: '../server/client-dist',
apiBaseURL: '/api', apiBaseURL: '/api',
others: { others: {
url: '/app/learn/course' url: '/login/is-login'
}, },
isUploadStatic: false, isUploadStatic: false,
webpack: { webpack: {
......
...@@ -29,7 +29,7 @@ export default class Before { ...@@ -29,7 +29,7 @@ export default class Before {
window.G.UserInfo = res window.G.UserInfo = res
return true return true
}).catch(res => { }).catch(res => {
if (res.code !== 80201) { if (res.code !== 0) {
Message({ type: 'error', message: res.message }) Message({ type: 'error', message: res.message })
} }
return false return false
......
...@@ -12,6 +12,7 @@ export default class LoginAction extends BaseACTION { ...@@ -12,6 +12,7 @@ export default class LoginAction extends BaseACTION {
userLogin (obj) { userLogin (obj) {
return Login.userLogin(obj).then(res => { return Login.userLogin(obj).then(res => {
if (res && res.url === undefined) { if (res && res.url === undefined) {
console.log(webConf.others.url)
res.url = webConf.others.url || '' res.url = webConf.others.url || ''
} }
return res return res
......
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
<img src="../../assets/images/login-tit3.png" alt="" class="txt3"> <img src="../../assets/images/login-tit3.png" alt="" class="txt3">
</div> </div>
<div class="login-modules"> <div class="login-modules">
<normal-login :attr="loginUrl"> <normal-login>
<div class="text" slot="text"> <div class="text" slot="text">
<span class="code-login"> <span class="code-login">
<template v-if="query.rd"> <template v-if="query.rd">
...@@ -46,7 +46,7 @@ ...@@ -46,7 +46,7 @@
<img src="../../assets/images/login-tit3.png" alt="" class="tit3"> <img src="../../assets/images/login-tit3.png" alt="" class="tit3">
</div> </div>
<div class="mlogin-modules"> <div class="mlogin-modules">
<normal-login :attr="loginUrl"> <normal-login>
<div class="text" slot="text"> <div class="text" slot="text">
<span class="code-login"> <span class="code-login">
<template v-if="query.rd"> <template v-if="query.rd">
......
<template>
<div>
</div>
</template>
<script>
export default {
created() {
if (/Android|webOS|iPhone|iPod|BlackBerry/i.test(navigator.userAgent)) {
this.$router.push('/mobile/list')
} else {
this.$router.push('/app/tips/learning-tips')
}
}
}
</script>
<style lang="scss" scoped>
</style>
...@@ -69,14 +69,15 @@ export default { ...@@ -69,14 +69,15 @@ export default {
methods: { methods: {
/* 退出登录 - 跳转方法 */ /* 退出登录 - 跳转方法 */
logout() { logout() {
cAction.Others.outLogin() this.$router.push({ path: '/login/index' })
.then(str => { // cAction.Others.outLogin()
window.G.UserInfo = {} // .then(str => {
this.$router.push({ path: '/login/index' }) // window.G.UserInfo = {}
}) // this.$router.push({ path: '/login/index' })
.catch(e => { // })
this.$message.error(e.message) // .catch(e => {
}) // this.$message.error(e.message)
// })
}, },
getNewLiveMsg() { getNewLiveMsg() {
// 获取最新直播提醒 // 获取最新直播提醒
......
export default [ export default [
{ path: '/', redirect: '/app/tips/examina-tips' }, { path: '/', redirect: '/login/is-login' },
{ {
path: '/login/index', path: '/login/index',
name: 'login-normal', name: 'login-normal',
...@@ -18,6 +18,12 @@ export default [ ...@@ -18,6 +18,12 @@ export default [
component: () => import('@/pages/login/forget.vue'), component: () => import('@/pages/login/forget.vue'),
props: (route) => ({ query: route.query, params: route.params }) props: (route) => ({ query: route.query, params: route.params })
}, },
{
path: '/login/is-login',
name: 'login-isLogin',
component: () => import('@/pages/login/isLogin.vue'),
props: (route) => ({ query: route.query, params: route.params })
},
/* App 内登录页面未找到时 - 指向 */ /* App 内登录页面未找到时 - 指向 */
{ path: '/login/*', redirect: '/login/index' }, { path: '/login/*', redirect: '/login/index' },
/* 学习系统 - 登录后,进入页面 */ /* 学习系统 - 登录后,进入页面 */
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论