v1.3 版本发布,代码同步后端v1.3版本

This commit is contained in:
郑杰
2018-12-31 17:07:02 +08:00
parent 7f2e4ed3f9
commit c97e401918
38 changed files with 1338 additions and 40 deletions

View File

@@ -0,0 +1,172 @@
<template>
<div class="app-container">
<div id="content-main" :style="'width:'+width">
<el-card shadow="never" class="box-card user-info">
<div class="avatar-content">
<el-upload
:show-file-list="false"
:on-success="handleSuccess"
:on-error="handleError"
:headers="headers"
:action="updateAvatarApi"
class="avatar-uploader">
<img v-if="avatar" :src="avatar" title="点击上传头像" class="avatar">
<i v-else class="el-icon-plus avatar-uploader-icon"/>
</el-upload>
</div>
<div class="user-info-content">
<div>登录账号{{ name }}</div>
<div>注册时间{{ createTime }}</div>
<div>账号状态<span style="color: #909399">正常</span></div>
</div>
</el-card>
<el-card shadow="never" class="box-card reset-pass">
<h4 class="account-label-icon">登录密码</h4>
<updatePass/>
<p>安全性高的密码可使账号更安全建议设置同时包含字母数字符号的密码</p>
</el-card>
<el-card shadow="never" class="box-card reset-email">
<h4 class="account-label-icon">邮箱验证</h4>
<updateEmail :email="email"/>
<p>你的邮箱{{ formatEmail(email) }} </p>
<h4>绑定邮箱可用于</h4>
<ul>
<li>安全管理密码重置与修改</li>
<li>账号使用使用邮箱登录系统</li>
<li>站内通知站内信接收</li>
</ul>
</el-card>
</div>
</div>
</template>
<script>
import { mapGetters } from 'vuex'
import { regEmail } from '@/utils/index'
import updatePass from './center/updatePass'
import updateEmail from './center/updateEmail'
import { getToken } from '@/utils/auth'
import store from '@/store'
export default {
name: 'Center',
components: { updatePass, updateEmail },
data() {
return {
width: document.documentElement.clientWidth - 180 + 'px;',
headers: {
'Authorization': 'Bearer ' + getToken()
}
}
},
computed: {
...mapGetters([
'avatar',
'name',
'email',
'createTime',
'updateAvatarApi'
])
},
methods: {
formatEmail(mail) {
return regEmail(mail)
},
handleSuccess(response, file, fileList) {
this.$notify({
title: '头像修改成功',
type: 'success',
duration: 2500
})
store.dispatch('GetInfo').then(() => {})
},
// 监听上传失败
handleError(e, file, fileList) {
const msg = JSON.parse(e.message)
this.$notify({
title: msg.message,
type: 'error',
duration: 2500
})
}
}
}
</script>
<style rel="stylesheet/scss" lang="scss">
.box-card{
border: 0px;
border-bottom: 1px solid #ECEDFE;
border-radius: unset;
h4{
height: 26px;
margin: 0 0 7px;
line-height: 26px;
font-size: 1.1rem;
font-weight: 500;
color: #444242;
display: inline-block;
}
p{
font-family: Lantinghei;
font-size: 90%;
color: #747474;
}
ul{
padding: 0;
margin: 7px 0 0;
list-style: none;
font-size: 80%;
}
li {
float: left;
margin: 0 30px 10px 0!important;
}
li:before {
width: 8px;
height: 8px;
background-color: #52acd9;
color: #52acd9;
display: inline-block;
border-radius: 50%;
margin-right: 5px;
content: '';
box-sizing: border-box;
}
}
.user-info{
height: 170px;
}
.reset-email{
border-bottom: 0px;
}
.avatar-content, .user-info-content {
float: left;
}
.user-info-content{
font-family: Lantinghei;
position: relative;
font-size: 14px;
margin: 25px;
div{
margin-bottom: 15px;
}
}
.avatar-uploader-icon {
font-size: 28px;
width: 120px;
height: 120px;
line-height: 120px;
text-align: center;
}
.avatar {
width: 120px;
height: 120px;
display: block;
border-radius: 50%;
}
</style>

View File

@@ -0,0 +1,150 @@
<template>
<div style="display: inline-block">
<el-button size="mini" class="button" type="info" @click="dialog = true">修改</el-button>
<el-dialog :visible.sync="dialog" :title="title" width="475px" @close="cancel">
<el-form ref="form" :model="form" :rules="rules" size="small" label-width="88px">
<el-form-item label="新邮箱" prop="email">
<el-input v-model="form.email" auto-complete="on" style="width: 200px;"/>
<el-button :loading="codeLoading" :disabled="isDisabled" size="small" @click="sendCode">{{ buttonName }}</el-button>
</el-form-item>
<el-form-item label="验证码" prop="code">
<el-input v-model="form.code" style="width: 320px;"/>
</el-form-item>
<el-form-item label="当前密码" prop="pass">
<el-input v-model="form.pass" type="password" style="width: 320px;"/>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="text" @click="cancel">取消</el-button>
<el-button :loading="loading" type="primary" @click="doSubmit">确认</el-button>
</div>
</el-dialog>
</div>
</template>
<script>
import store from '@/store'
import { md5 } from '@/utils/md5'
import { validatEmail } from '@/utils/validate'
import { validPass, updateEmail } from '@/api/user'
import { resetEmail } from '@/api/code'
export default {
props: {
email: {
type: String,
required: true
}
},
data() {
const validatePass = (rule, value, callback) => {
validPass(md5(value)).then(res => {
if (res.status === 200) {
callback()
} else {
callback(new Error('密码错误,请重新输入'))
}
})
}
const validMail = (rule, value, callback) => {
if (value === '') {
callback(new Error('新邮箱不能为空'))
} else if (value === this.email) {
callback(new Error('新邮箱不能与旧邮箱相同'))
} else if (validatEmail(value)) {
callback()
} else {
callback(new Error('邮箱格式错误'))
}
}
return {
loading: false, dialog: false, title: '修改邮箱', form: { pass: '', email: '', code: '' },
user: { email: '', password: '' }, codeLoading: false,
codeData: { type: 'email', value: '' },
buttonName: '获取验证码', isDisabled: false, time: 60,
rules: {
pass: [
{ required: true, validator: validatePass, trigger: 'blur' }
],
email: [
{ required: true, validator: validMail, trigger: 'blur' }
],
code: [
{ required: true, message: '验证码不能为空', trigger: 'blur' }
]
}
}
},
methods: {
cancel() {
this.resetForm()
},
sendCode() {
if (this.form.email && this.form.email !== this.email) {
this.codeLoading = true
this.buttonName = '验证码发送中'
this.codeData.value = this.form.email
const _this = this
resetEmail(this.codeData).then(res => {
this.$message({
showClose: true,
message: '发送成功有效期5分钟',
type: 'success'
})
this.codeLoading = false
this.isDisabled = true
this.buttonName = this.time-- + '秒后重新发送'
this.timer = window.setInterval(function() {
_this.buttonName = _this.time + '秒后重新发送'
--_this.time
if (_this.time < 0) {
_this.buttonName = '重新发送'
_this.time = 60
_this.isDisabled = false
clearInterval(this.timer)
}
}, 1000)
}).catch(err => {
this.codeLoading = false
console.log(err.response.data.message)
})
}
},
doSubmit() {
this.$refs['form'].validate((valid) => {
if (valid) {
this.loading = true
this.user = { email: this.form.email, password: md5(this.form.pass) }
updateEmail(this.form.code, this.user).then(res => {
this.loading = false
this.resetForm()
this.$notify({
title: '邮箱修改成功',
type: 'success',
duration: 1500
})
store.dispatch('GetInfo').then(() => {})
}).catch(err => {
this.loading = false
console.log(err.response.data.message)
})
} else {
return false
}
})
},
resetForm() {
this.dialog = false
this.$refs['form'].resetFields()
clearInterval(this.timer)
this.time = 60
this.buttonName = '获取验证码'
this.isDisabled = false
this.form = { pass: '', email: '', code: '' }
}
}
}
</script>
<style scoped>
</style>

View File

@@ -0,0 +1,102 @@
<template>
<div style="display: inline-block">
<el-button size="mini" class="button" type="info" @click="dialog = true">修改</el-button>
<el-dialog :visible.sync="dialog" :title="title" width="500px" @close="cancel">
<el-form ref="form" :model="form" :rules="rules" size="small" label-width="88px">
<el-form-item label="旧密码" prop="oldPass">
<el-input v-model="form.oldPass" type="password" auto-complete="on" style="width: 370px;"/>
</el-form-item>
<el-form-item label="新密码" prop="newPass">
<el-input v-model="form.newPass" type="password" auto-complete="on" style="width: 370px;"/>
</el-form-item>
<el-form-item label="确认密码" prop="confirmPass">
<el-input v-model="form.confirmPass" type="password" auto-complete="on" style="width: 370px;"/>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="text" @click="cancel">取消</el-button>
<el-button :loading="loading" type="primary" @click="doSubmit">确认</el-button>
</div>
</el-dialog>
</div>
</template>
<script>
import store from '@/store'
import { md5 } from '@/utils/md5'
import { validPass, updatePass } from '@/api/user'
export default {
data() {
const validatePass = (rule, value, callback) => {
validPass(md5(value)).then(res => {
if (res.status === 200) {
callback()
} else {
callback(new Error('旧密码错误,请检查'))
}
})
}
const confirmPass = (rule, value, callback) => {
if (this.form.newPass !== value) {
callback(new Error('两次输入的密码不一致'))
} else {
callback()
}
}
return {
loading: false, dialog: false, title: '修改密码', form: { oldPass: '', newPass: '', confirmPass: '' },
rules: {
oldPass: [
{ required: true, validator: validatePass, trigger: 'blur' }
],
newPass: [
{ required: true, message: '请输入新密码', trigger: 'blur' },
{ min: 6, max: 20, message: '长度在 6 到 20 个字符', trigger: 'blur' }
],
confirmPass: [
{ required: true, validator: confirmPass, trigger: 'blur' }
]
}
}
},
methods: {
cancel() {
this.resetForm()
},
doSubmit() {
this.$refs['form'].validate((valid) => {
if (valid) {
this.loading = true
updatePass(md5(this.form.confirmPass)).then(res => {
this.resetForm()
this.$notify({
title: '密码修改成功,请重新登录',
type: 'success',
duration: 1500
})
setTimeout(() => {
store.dispatch('LogOut').then(() => {
location.reload() // 为了重新实例化vue-router对象 避免bug
})
}, 1500)
}).catch(err => {
this.loading = false
console.log(err.response.data.message)
})
} else {
return false
}
})
},
resetForm() {
this.dialog = false
this.$refs['form'].resetFields()
this.form = { oldPass: '', newPass: '', confirmPass: '' }
}
}
}
</script>
<style scoped>
</style>