Skip to content

Commit d310d2f

Browse files
committed
fix: login enter submit, username user-select:none
1 parent 10dc997 commit d310d2f

File tree

3 files changed

+84
-81
lines changed

3 files changed

+84
-81
lines changed

src/components/page/GlobalLayout.vue

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -551,6 +551,11 @@
551551
}
552552
553553
// 外置的样式控制
554+
.user-dropdown-menu {
555+
span {
556+
user-select: none;
557+
}
558+
}
554559
.user-dropdown-menu-wrapper.ant-dropdown-menu {
555560
padding: 4px 0;
556561

src/components/tools/UserMenu.vue

Lines changed: 75 additions & 79 deletions
Original file line numberDiff line numberDiff line change
@@ -1,79 +1,75 @@
1-
<template>
2-
<div class="user-wrapper">
3-
<span class="action">
4-
<a-icon type="question-circle-o"></a-icon>
5-
</span>
6-
<header-notice class="action"/>
7-
<a-dropdown>
8-
<span class="action ant-dropdown-link user-dropdown-menu">
9-
<a-avatar class="avatar" size="small" :src="avatar()"/>
10-
<span>{{ nickname() }}</span>
11-
</span>
12-
<a-menu slot="overlay" class="user-dropdown-menu-wrapper">
13-
<a-menu-item key="0">
14-
<router-link :to="{ name: 'center' }">
15-
<a-icon type="user"/>
16-
<span>个人中心</span>
17-
</router-link>
18-
</a-menu-item>
19-
<a-menu-item key="1">
20-
<router-link :to="{ name: 'settings' }">
21-
<a-icon type="setting"/>
22-
<span>账户设置</span>
23-
</router-link>
24-
</a-menu-item>
25-
<a-menu-item key="2" disabled>
26-
<a-icon type="setting"/>
27-
<span>测试</span>
28-
</a-menu-item>
29-
<a-menu-divider/>
30-
<a-menu-item key="3">
31-
<a href="javascript:;" @click="handleLogout">
32-
<a-icon type="logout"/>
33-
<span>退出登录</span>
34-
</a>
35-
</a-menu-item>
36-
</a-menu>
37-
</a-dropdown>
38-
</div>
39-
</template>
40-
41-
<script>
42-
import HeaderNotice from './HeaderNotice'
43-
import { mapActions, mapGetters } from 'vuex'
44-
45-
export default {
46-
name: 'UserMenu',
47-
components: {
48-
HeaderNotice
49-
},
50-
methods: {
51-
...mapActions(['Logout']),
52-
...mapGetters(['nickname', 'avatar']),
53-
handleLogout() {
54-
const that = this
55-
56-
this.$confirm({
57-
title: '提示',
58-
content: '真的要注销登录吗 ?',
59-
onOk() {
60-
return that.Logout({}).then(() => {
61-
window.location.reload()
62-
}).catch(err => {
63-
that.$message.error({
64-
title: '错误',
65-
description: err.message
66-
})
67-
})
68-
},
69-
onCancel() {
70-
},
71-
})
72-
},
73-
}
74-
}
75-
</script>
76-
77-
<style scoped>
78-
79-
</style>
1+
<template>
2+
<div class="user-wrapper">
3+
<span class="action">
4+
<a-icon type="question-circle-o"></a-icon>
5+
</span>
6+
<header-notice class="action"/>
7+
<a-dropdown>
8+
<span class="action ant-dropdown-link user-dropdown-menu">
9+
<a-avatar class="avatar" size="small" :src="avatar()"/>
10+
<span>{{ nickname() }}</span>
11+
</span>
12+
<a-menu slot="overlay" class="user-dropdown-menu-wrapper">
13+
<a-menu-item key="0">
14+
<router-link :to="{ name: 'center' }">
15+
<a-icon type="user"/>
16+
<span>个人中心</span>
17+
</router-link>
18+
</a-menu-item>
19+
<a-menu-item key="1">
20+
<router-link :to="{ name: 'settings' }">
21+
<a-icon type="setting"/>
22+
<span>账户设置</span>
23+
</router-link>
24+
</a-menu-item>
25+
<a-menu-item key="2" disabled>
26+
<a-icon type="setting"/>
27+
<span>测试</span>
28+
</a-menu-item>
29+
<a-menu-divider/>
30+
<a-menu-item key="3">
31+
<a href="javascript:;" @click="handleLogout">
32+
<a-icon type="logout"/>
33+
<span>退出登录</span>
34+
</a>
35+
</a-menu-item>
36+
</a-menu>
37+
</a-dropdown>
38+
</div>
39+
</template>
40+
41+
<script>
42+
import HeaderNotice from './HeaderNotice'
43+
import { mapActions, mapGetters } from 'vuex'
44+
45+
export default {
46+
name: 'UserMenu',
47+
components: {
48+
HeaderNotice
49+
},
50+
methods: {
51+
...mapActions(['Logout']),
52+
...mapGetters(['nickname', 'avatar']),
53+
handleLogout() {
54+
const that = this
55+
56+
this.$confirm({
57+
title: '提示',
58+
content: '真的要注销登录吗 ?',
59+
onOk() {
60+
return that.Logout({}).then(() => {
61+
window.location.reload()
62+
}).catch(err => {
63+
that.$message.error({
64+
title: '错误',
65+
description: err.message
66+
})
67+
})
68+
},
69+
onCancel() {
70+
},
71+
})
72+
},
73+
}
74+
}
75+
</script>

src/views/user/Login.vue

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
class="user-layout-login"
66
ref="formLogin"
77
:form="form"
8+
@submit="handleSubmit"
89
>
910
<a-tabs
1011
:activeKey="customActiveKey"
@@ -82,10 +83,10 @@
8283
<a-button
8384
size="large"
8485
type="primary"
86+
htmlType="submit"
8587
class="login-button"
8688
:loading="state.loginBtn"
8789
:disabled="state.loginBtn"
88-
@click.stop.prevent="handleSubmit"
8990
>确定</a-button>
9091
</a-form-item>
9192

@@ -169,7 +170,8 @@ export default {
169170
this.customActiveKey = key
170171
// this.form.resetFields()
171172
},
172-
handleSubmit() {
173+
handleSubmit(e) {
174+
e.preventDefault()
173175
const {
174176
form: { validateFields },
175177
state,

0 commit comments

Comments
 (0)