Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
Y
ybf
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
xulili
ybf
Commits
33734adf
Commit
33734adf
authored
Jan 15, 2020
by
xd
Browse files
Options
Browse Files
Download
Plain Diff
冲突
parents
0a450523
0149d807
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
14 additions
and
2 deletions
+14
-2
index.js
ybf_admin/src/router/index.js
+1
-1
page.vue
ybf_admin/src/views/system/login/page.vue
+2
-1
home.vue
ybf_wx/src/views/home.vue
+11
-0
No files found.
ybf_admin/src/router/index.js
View file @
33734adf
...
...
@@ -32,7 +32,7 @@ const router = new VueRouter({
* 路由拦截
* 权限验证
*/
router
.
beforeEach
(
async
(
to
,
from
,
next
)
=>
{
router
.
beforeEach
(
async
(
to
,
from
,
next
)
=>
{
// 确认已经加载多标签页数据 https://github.com/d2-projects/d2-admin/issues/201
await
store
.
dispatch
(
'd2admin/page/isLoaded'
)
// 确认已经加载组件尺寸设置 https://github.com/d2-projects/d2-admin/issues/198
...
...
ybf_admin/src/views/system/login/page.vue
View file @
33734adf
...
...
@@ -159,7 +159,8 @@ export default {
.
then
(()
=>
{
// 重定向对象不存在则返回顶层路径
// this.$router.replace(this.$route.query.redirect || '/homeMain')
this
.
$router
.
replace
(
this
.
$route
.
query
.
redirect
||
'/homeMain'
)
// this.$router.replace(this.$route.query.redirect || '/homeMain')
this
.
$router
.
replace
(
this
.
$route
.
query
.
redirect
||
'/home/main'
)
})
}
else
{
// 登录表单校验失败
...
...
ybf_wx/src/views/home.vue
View file @
33734adf
...
...
@@ -17,8 +17,10 @@
</div>
</div>
</div>
<button
class=
"testButton"
>
Test
</button>
</div>
<div
class=
"menus"
>
<div
class=
"menu"
@
click=
"buttonMainMarketingClick"
>
精准营销
</div>
<div
class=
"menu activeMenu"
@
click=
"buttonSingleMarketingClick"
>
一对一营销侧边栏
</div>
...
...
@@ -184,3 +186,12 @@ export default {
color
:
lightcoral
;
}
</
style
>
<
style
scoped
>
.testButton
{
border
:
1px
solid
gray
;
width
:
140px
;
font-size
:
14px
;
}
</
style
>
\ No newline at end of file
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment