Merge remote-tracking branch 'origin/master'

src/projects/business/views/Master/Property/Contact.vue

@@ -13,7 +13,7 @@
 						{{mod.name}}
 					</div>
 					<a :href="'tel:'+mod.telephone">
-						{{mod.telephone}}{{mod.subTelephone?'转分机号'+mod.subTelephone:''}}
+						{{mod.telephone}}{{mod.subTelephone?'转分机'+mod.subTelephone:''}}
 						<span class="iconfont icon-dianhua1"></span>
 					</a>
 				</li>
@@ -62,8 +62,7 @@
 				API_Property.companyContactsList().then(response => {
 					this.isLoading = false;
  					this.list=response.list;
-
-				}).catch(error => {
+ 				}).catch(error => {
 					this.isLoading = false;
 					mui.toast(error);
 				})