github
/
halo-admin
mirror of https://github.com/halo-dev/halo-admin
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'master' of https://gitlab.com/halo_dev/halo-admin

pull/9/head
ruibaby 2019-04-29 20:27:58 +08:00
parent b77988ba50 54e9372d79
commit cca8e17e91
2 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/views/system/Installation.vue
View File

@ -275,7 +275,7 @@ export default {
} }
// Handle migration // Handle migration
if (this.migrationFile) { if (this.migrationData) {
recoveryApi.migrate(this.migrationData).then(response => { recoveryApi.migrate(this.migrationData).then(response => {
this.$log.debug('Migrated successfullly') this.$log.debug('Migrated successfullly')
this.$message.success('数据迁移成功') this.$message.success('数据迁移成功')

16
src/views/user/Login.vue
View File

@ -9,7 +9,13 @@
class="animated fadeInUp" class="animated fadeInUp"
:style="{'animation-delay': '0.1s'}" :style="{'animation-delay': '0.1s'}"
> >
<a-input placeholder="用户名/邮箱"></a-input> <a-input placeholder="用户名/邮箱">
<a-icon
slot="prefix"
type="user"
style="color: rgba(0,0,0,.25)"
/>
</a-input>
</a-form-item> </a-form-item>
<a-form-item <a-form-item
class="animated fadeInUp" class="animated fadeInUp"
@ -18,7 +24,13 @@
<a-input <a-input
type="password" type="password"
placeholder="密码" placeholder="密码"
></a-input> >
<a-icon
slot="prefix"
type="lock"
style="color: rgba(0,0,0,.25)"
/>
</a-input>
</a-form-item> </a-form-item>
<a-form-item <a-form-item
class="animated fadeInUp" class="animated fadeInUp"