Merge remote-tracking branch 'remotes/origin/test'

This commit is contained in:
joylink_cuiweidong 2020-12-03 09:23:28 +08:00
commit c7bf1094dd

View File

@ -236,14 +236,14 @@
</div>
</div>
</div>
<div class="form_box">
<div class="title">单位:</div>
<div class="content_box_info">
<div v-show="companyShow" class="show_box">
<span>{{ handleCompany(userInfo.companyId) }}</span>
</div>
</div>
</div>
<!--<div class="form_box">-->
<!--<div class="title">单位:</div>-->
<!--<div class="content_box_info">-->
<!--<div v-show="companyShow" class="show_box">-->
<!--<span>{{ handleCompany(userInfo.companyId) }}</span>-->
<!--</div>-->
<!--</div>-->
<!--</div>-->
<div v-if="!wmOpenId" class="form_box">
<div class="title">绑定微信:</div>
<div class="content_box_info">
@ -398,11 +398,11 @@ export default {
.catch(error => {
console.log(error, '请求个人信息失败');
});
getCompanyList().then(resp => {
this.companyList = resp.data;
}).catch((error) => {
console.log(error, '获取公司列表信息失败');
});
// getCompanyList().then(resp => {
// this.companyList = resp.data;
// }).catch((error) => {
// console.log(error, '');
// });
},
doClose() {
this.visible = false;
@ -464,15 +464,15 @@ export default {
}
}
},
handleCompany(companyId) {
let name = '';
this.companyList.forEach(item => {
if (item.id == companyId) {
name = item.name;
}
});
return name;
},
// handleCompany(companyId) {
// let name = '';
// this.companyList.forEach(item => {
// if (item.id == companyId) {
// name = item.name;
// }
// });
// return name;
// },
switcherMobile() {
// this.editInfo.mobile = this.userInfo.mobile;
this.mobileShow = !this.mobileShow;