no message
This commit is contained in:
parent
486b562e1d
commit
a63c0010c7
4
resources/js/main.js
vendored
4
resources/js/main.js
vendored
@ -411,9 +411,9 @@
|
|||||||
$A.triggerUserInfoListener({});
|
$A.triggerUserInfoListener({});
|
||||||
let from = window.location.pathname == '/' ? '' : encodeURIComponent(window.location.href);
|
let from = window.location.pathname == '/' ? '' : encodeURIComponent(window.location.href);
|
||||||
if (typeof $A.app === "object") {
|
if (typeof $A.app === "object") {
|
||||||
$A.app.goForward({path: '/login', query: from ? {from: from} : {}}, true);
|
$A.app.goForward({path: '/users/login', query: from ? {from: from} : {}}, true);
|
||||||
} else {
|
} else {
|
||||||
window.location.replace($A.webUrl('login') + (from ? ('?from=' + from) : ''));
|
window.location.replace($A.webUrl('users/login') + (from ? ('?from=' + from) : ''));
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
|
@ -11,7 +11,7 @@ export default {
|
|||||||
if (this.usrLogin) {
|
if (this.usrLogin) {
|
||||||
this.goForward({path: '/dashboard'}, true);
|
this.goForward({path: '/dashboard'}, true);
|
||||||
} else {
|
} else {
|
||||||
this.goForward({path: '/login'}, true);
|
this.goForward({path: '/users/login'}, true);
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
deactivated() {
|
deactivated() {
|
||||||
|
@ -1,7 +1,16 @@
|
|||||||
<template>
|
<template>
|
||||||
<div>project-detail</div>
|
<div class="project-detail">
|
||||||
|
<PageTitle>{{ $L('项目面板') }}</PageTitle>
|
||||||
|
project-detail
|
||||||
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
|
<style lang="scss" scoped>
|
||||||
|
.project-detail {
|
||||||
|
background: #00A77D;
|
||||||
|
}
|
||||||
|
</style>
|
||||||
|
|
||||||
<script>
|
<script>
|
||||||
export default {
|
export default {
|
||||||
data() {
|
data() {
|
||||||
|
10
resources/js/routes.js
vendored
10
resources/js/routes.js
vendored
@ -4,11 +4,6 @@ export default [
|
|||||||
path: '/',
|
path: '/',
|
||||||
component: resolve => require(['./pages/index.vue'], resolve)
|
component: resolve => require(['./pages/index.vue'], resolve)
|
||||||
},
|
},
|
||||||
{
|
|
||||||
name: 'login',
|
|
||||||
path: '/login',
|
|
||||||
component: resolve => require(['./pages/login/index.vue'], resolve),
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
name: 'dashboard',
|
name: 'dashboard',
|
||||||
path: '/dashboard',
|
path: '/dashboard',
|
||||||
@ -19,6 +14,11 @@ export default [
|
|||||||
path: '/project/:id',
|
path: '/project/:id',
|
||||||
component: resolve => require(['./pages/project/detail.vue'], resolve),
|
component: resolve => require(['./pages/project/detail.vue'], resolve),
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
name: 'users-login',
|
||||||
|
path: '/users/login',
|
||||||
|
component: resolve => require(['./pages/users/login.vue'], resolve),
|
||||||
|
},
|
||||||
{
|
{
|
||||||
name: '404',
|
name: '404',
|
||||||
path: '*',
|
path: '*',
|
||||||
|
Loading…
x
Reference in New Issue
Block a user