Merge branch 'master' of http://git.sjzkeji.com/panghu/school_webUser

pages-address/edit-add.vue

@@ -116,15 +116,13 @@
 				getAddressDorm({school_id:this.fromData.school_id}).then((res)=>{
 					if(res.code === 1){
 						this.builList = res.data.map(obj =>{
-							const {dorm_id,name} = obj;
-							return {value:dorm_id + '',text:name};
+							const {dorm_id,name,type_str} = obj;
+							return {value:dorm_id + '',text:name + '('+ type_str +')'};
 						});
 					}
 				})
 			},
 			save() {
-				console.log(this.fromData);
-				return
 				if(this.isAJAX){
 					return
 				}