Merge remote-tracking branch 'remotes/origin/test'
This commit is contained in:
commit
c7bf1094dd
@ -236,14 +236,14 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="form_box">
|
<!--<div class="form_box">-->
|
||||||
<div class="title">单位:</div>
|
<!--<div class="title">单位:</div>-->
|
||||||
<div class="content_box_info">
|
<!--<div class="content_box_info">-->
|
||||||
<div v-show="companyShow" class="show_box">
|
<!--<div v-show="companyShow" class="show_box">-->
|
||||||
<span>{{ handleCompany(userInfo.companyId) }}</span>
|
<!--<span>{{ handleCompany(userInfo.companyId) }}</span>-->
|
||||||
</div>
|
<!--</div>-->
|
||||||
</div>
|
<!--</div>-->
|
||||||
</div>
|
<!--</div>-->
|
||||||
<div v-if="!wmOpenId" class="form_box">
|
<div v-if="!wmOpenId" class="form_box">
|
||||||
<div class="title">绑定微信:</div>
|
<div class="title">绑定微信:</div>
|
||||||
<div class="content_box_info">
|
<div class="content_box_info">
|
||||||
@ -398,11 +398,11 @@ export default {
|
|||||||
.catch(error => {
|
.catch(error => {
|
||||||
console.log(error, '请求个人信息失败');
|
console.log(error, '请求个人信息失败');
|
||||||
});
|
});
|
||||||
getCompanyList().then(resp => {
|
// getCompanyList().then(resp => {
|
||||||
this.companyList = resp.data;
|
// this.companyList = resp.data;
|
||||||
}).catch((error) => {
|
// }).catch((error) => {
|
||||||
console.log(error, '获取公司列表信息失败');
|
// console.log(error, '获取公司列表信息失败');
|
||||||
});
|
// });
|
||||||
},
|
},
|
||||||
doClose() {
|
doClose() {
|
||||||
this.visible = false;
|
this.visible = false;
|
||||||
@ -464,15 +464,15 @@ export default {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
handleCompany(companyId) {
|
// handleCompany(companyId) {
|
||||||
let name = '';
|
// let name = '';
|
||||||
this.companyList.forEach(item => {
|
// this.companyList.forEach(item => {
|
||||||
if (item.id == companyId) {
|
// if (item.id == companyId) {
|
||||||
name = item.name;
|
// name = item.name;
|
||||||
}
|
// }
|
||||||
});
|
// });
|
||||||
return name;
|
// return name;
|
||||||
},
|
// },
|
||||||
switcherMobile() {
|
switcherMobile() {
|
||||||
// this.editInfo.mobile = this.userInfo.mobile;
|
// this.editInfo.mobile = this.userInfo.mobile;
|
||||||
this.mobileShow = !this.mobileShow;
|
this.mobileShow = !this.mobileShow;
|
||||||
|
Loading…
Reference in New Issue
Block a user