Merge branch 'developer' into developerB

pages/login/information.vue

@@ -432,6 +432,36 @@
 						}
 						this.mainProduct = mainproList.join('/')
 					}
+					if( this.contractEmail == ''){
+						this.$util.msg('请输入邮箱地址',2000);
+						return
+					}
+					if( !this.$reg.isEmail(this.contractEmail)){
+						this.$util.msg('请输入正确的邮箱地址',2000);
+						return
+					}
+					if( this.name == ''){
+						this.$util.msg('请输入机构名称',2000);
+						return
+					}
+					if( this.addressData.townId == ''){
+						this.$util.msg('请选择机构地址',2000);
+						return
+					}
+					if( this.addressData.addressDetail == ''){
+						this.$util.msg('请填写机构详细地址',2000);
+						return
+					}
+					if( this.businessLicense == ''){
+						this.$util.msg('请上传您的营业执照',2000);
+						return
+					}
+					if(this.firstClubType!=0){
+						if(this.mainProduct == ''){
+							this.$util.msg('请选择住机构主营内容',2000);
+							return
+						}
+					}
 					params 	= {
 							userId:this.userId,
 							clubId:this.clubId,					//会所ID