Merge branch 'master' into test

This commit is contained in:
zyy 2020-06-30 17:03:54 +08:00
commit e6f635ed72

View File

@ -11,7 +11,7 @@
<div>
<div class="form_box">
<div class="title">{{ $t('global.compellation') }}:</div>
<div class="content">
<div class="content_box_info">
<div v-show="nameShow" class="show_box">
<span>{{ userInfo.name }}</span>
<i class="el-icon-edit" @click="switcherName" />
@ -43,7 +43,7 @@
</div>
<div class="form_box">
<div class="title">{{ $t('global.nickName') }}:</div>
<div class="content">
<div class="content_box_info">
<div v-show="nickNameShow" class="show_box">
<span>{{ userInfo.nickname }}</span>
<i class="el-icon-edit" @click="switcherNickname" />
@ -75,7 +75,7 @@
</div>
<div class="form_box">
<div class="title">{{ $t('global.mobile') }}:</div>
<div class="content">
<div class="content_box_info">
<div v-show="mobileShow" class="show_box">
<span>{{ geTel(userInfo.mobile) }}</span>
<i class="el-icon-edit" @click="switcherMobile" />
@ -133,7 +133,7 @@
</div>
<div class="form_box">
<div class="title">{{ $t('global.email') }}:</div>
<div class="content">
<div class="content_box_info">
<div v-show="emailShow" class="show_box">
<span>{{ userInfo.email }}</span>
<i class="el-icon-edit" @click="switcherEmail" />
@ -182,7 +182,7 @@
</div>
<div class="form_box">
<div class="title">{{ $t('global.passWord') }}:</div>
<div class="content">
<div class="content_box_info">
<div v-show="passwordShow" class="show_box">
<span>******</span>
<i class="el-icon-edit" @click="switcherPassWord" />
@ -238,7 +238,7 @@
</div>
<div v-if="!wmOpenId" class="form_box">
<div class="title">绑定微信:</div>
<div class="content">
<div class="content_box_info">
<el-button v-if="!binding&&!bindSuccess" type="primary" size="small" style="position: absolute;" @click="generateBindQrCode">生成微信二维码</el-button>
<div v-if="binding && !bindSuccess" class="login-code-box" @click="generateBindQrCode">
<qrcode-vue
@ -644,7 +644,7 @@ export default {
line-height: 28px;
float: left;
}
.content {
.content_box_info {
width: calc(100% - 80px);
float: left;
margin: 0;