微服务联调,修改注册登录， 机构资料修改

src/main/resources/static/js/account/register-club.js

@@ -21,22 +21,22 @@ var registerPage = new Vue({
             password2:''
         },
         clubUpgradeUser: {
-            userID:'',
-            clubID:'',
-            contractEmail1:'',
+            userId:'',
+            clubId:'',
+            contractEmail:'',
             name:'',
-            sname:'',
+            shortName:'',
             socialCreditCode:'',
-            mainPros:[],
-            businessLicenseImage:'',
-            headpic:'',
-            medicalPracticeLicenseImg:'',
-            firstClubType:'',
+            mainProduct:[],
+            businessLicense:'',
+            shopPhoto:'',
+            medicalPracticeLicense:'',
+            firstClubType:0,
             secondClubType:0,
             department:'',
-            provinceID :'',
-            cityID : '',
-            townID : '',
+            provinceId :'',
+            cityId : '',
+            townId : '',
         },
         userMainPros:[],
         formData:new FormData(),
@@ -44,9 +44,9 @@ var registerPage = new Vue({
         isAgree:false,
         isShowAgree:false,
         mentuzCampNullList:[
-            {value:'1',name:'整形'},
-            {value:'2',name:'轻医美'},
-            {value:'3',name:'皮肤科'},
+            {value:1,name:'整形'},
+            {value:2,name:'轻医美'},
+            {value:3,name:'皮肤科'},
         ],
         medicaCampNullList: [
             {name:'美容'},
@@ -183,7 +183,7 @@ var registerPage = new Vue({
             if (_self.loginLoading) { return false; }
             this.$nextTick(function() {
                 if (!pass) {return false;}
-                if(!_self.clubUpgradeUser.businessLicenseImage){
+                if(!_self.clubUpgradeUser.businessLicense){
                     $('#formbusinessLicenseImage').parent().addClass("error").find('.checked').removeClass("show");
                     $('#formbusinessLicenseImage').siblings('.errTips').text('请上传营业执照图片').addClass("show");
                 }
@@ -192,7 +192,7 @@ var registerPage = new Vue({
                     $('#firstClubType').siblings('.errTips').text('请选择机构类型').addClass("show");
                     return  false;
                 }
-                _self.clubUpgradeUser.mainPros = _self.userMainPros.join("/");
+                _self.clubUpgradeUser.mainProduct = _self.userMainPros.join("/");
                 _self.loginLoading = true;
                 UserApi.ClubUpgrade(_self.clubUpgradeUser,function (response) {
                     if(response.code === 0){
@@ -212,8 +212,8 @@ var registerPage = new Vue({
             var params =  {mobileOrEmail: _self.clubUser.phone,password: _self.clubUser.password};
             UserApi.PostLoginAccount(params,function(response){
                 if(response.code === 0){
-                    _self.clubUpgradeUser.userID =  response.data.userId;
-                    _self.clubUpgradeUser.clubID =  response.data.clubId;
+                    _self.clubUpgradeUser.userId =  response.data.userId;
+                    _self.clubUpgradeUser.clubId =  response.data.clubId;
                     _self.userData = {
                         account: response.data.account,
                         email: response.data.email,
@@ -297,8 +297,8 @@ var registerPage = new Vue({
             var file = inputDOM.files;
             _this.formData.append('file', file[0]);
             PublicApi.uploadimg(_this.formData,function(response){
-                _this.clubUpgradeUser.businessLicenseImage = response.data;
-                $('#formbusinessLicenseImage').parent().removeClass("error");
+                _this.clubUpgradeUser.businessLicense = response.data;
+                $('#formbusinessLicense').parent().removeClass("error");
                 $('#formbusinessLicenseImage').siblings('.errTips').removeClass("show");
                 event.target.value = '';
             });
@@ -309,7 +309,7 @@ var registerPage = new Vue({
             var file = inputDOM.files;
             _this.formData.append('file', file[0]);
             PublicApi.uploadimg(_this.formData,function(response){
-                _this.clubUpgradeUser.headpic = response.data;
+                _this.clubUpgradeUser.shopPhoto = response.data;
                 event.target.value = '';
             });
         },
@@ -319,18 +319,18 @@ var registerPage = new Vue({
             var file = inputDOM.files;
             _this.formData.append('file', file[0]);
             PublicApi.uploadimg(_this.formData,function(response){
-                _this.clubUpgradeUser.medicalPracticeLicenseImg = response.data;
+                _this.clubUpgradeUser.medicalPracticeLicense = response.data;
                 event.target.value = '';
             });
         },
         deleteBusinessImage:function(){//清楚营业执照图片
-            this.clubUpgradeUser.businessLicenseImage = '';
+            this.clubUpgradeUser.businessLicense = '';
         },
         deleteMentuzImage:function(){//清楚门头照图片
-            this.clubUpgradeUser.headpic = '';
+            this.clubUpgradeUser.shopPhoto = '';
         },
         deleteMedicalImage:function(){//清楚资质照图片
-            this.clubUpgradeUser.medicalPracticeLicenseImg = '';
+            this.clubUpgradeUser.medicalPracticeLicense = '';
         },
         setStorages:function(data){//存储本地数据
             localStorage.setItem('userInfo',JSON.stringify(data));
@@ -367,11 +367,11 @@ var registerPage = new Vue({
         ChangeProvince:function () {//选择省份
             var _this = this;
             _this.addressfrom.province = event.target.value;
-            _this.clubUpgradeUser.provinceID = event.target.value;
+            _this.clubUpgradeUser.provinceId = event.target.value;
             if(_this.addressfrom.province==''){//省为请选择时市区初始化
                 _this.cityArray=[];
                 _this.townArray=[];
-                _this.clubUpgradeUser.townID=''
+                _this.clubUpgradeUser.townId=''
             }else {
                 _this.ChangeGetcity();
             }
@@ -382,7 +382,7 @@ var registerPage = new Vue({
                 if(response.code == 0 ){
                     _this.cityArray = response.data;
                     _this.addressfrom.city = event.target.value;
-                    _this.clubUpgradeUser.cityID = event.target.value;
+                    _this.clubUpgradeUser.cityId = event.target.value;
                     if(_this.addressfrom.city==''){
                         _this.townArray=[];
                     }else {
@@ -398,8 +398,8 @@ var registerPage = new Vue({
             PublicApi.GetTown({ cityId: _this.addressfrom.city },function(response){
                 if(response.code == 0 ){
                     _this.townArray = response.data;
-                    _this.clubUpgradeUser.townID = event.target.value;
-                    console.log(_this.clubUpgradeUser.townID)
+                    _this.clubUpgradeUser.townId = event.target.value;
+                    console.log(_this.clubUpgradeUser.townId)
                 }else{
                     CAIMEI.Alert(response.msg,'确定',false);
                 }

src/main/resources/templates/account/register-club.html

@@ -73,7 +73,7 @@
             <form>
                 <div class="formLine">
                     <p><em>*</em>邮箱(<span>邮箱可用作登录账号，请使用公司邮箱或法人邮箱</span>)：</p>
-                    <input type="text" v-model.trim="clubUpgradeUser.contractEmail1" placeholder="请输入邮箱地址" :rule="rule.email" maxlength="32" @blur="blurHandle($event)" needverify>
+                    <input type="text" v-model.trim="clubUpgradeUser.contractEmail" placeholder="请输入邮箱地址" :rule="rule.email" maxlength="32" @blur="blurHandle($event)" needverify>
                     <i class="checked icon mIcon"></i>
                     <span class="errTips icon mIcon" tips="请输入正确的邮箱地址"></span>
                 </div>
@@ -85,7 +85,7 @@
                 </div>
                 <div class="formLine">
                     <p>机构简称：</p>
-                    <input type="text" v-model.trim="clubUpgradeUser.sname" placeholder="请输入机构简称" maxlength="10" >
+                    <input type="text" v-model.trim="clubUpgradeUser.shortName" placeholder="请输入机构简称" maxlength="10" >
                 </div>
                 <div class="formLine">
                     <p><em>*</em>联系地址：</p>
@@ -108,13 +108,13 @@
                 </div>
                 <div class="formLine">
                     <p>营业执照编号：</p>
-                    <input type="text" v-model.trim="clubUpgradeUser.socialCreditCode" placeholder="请输入统一社会信用代码" maxlength="20">
+                    <input type="text" v-model.trim="clubUpgradeUser.socialCreditCode" placeholder="请输入统一社会信用代码" maxlength="18">
                 </div>
                 <div class="formLine clear">
                     <div class="form-upload">
                         <p><em>*</em>营业执照图片：</p>
-                        <div class="form-upload-image" v-if="clubUpgradeUser.businessLicenseImage!=''">
-                            <img class="upload-img" :src="clubUpgradeUser.businessLicenseImage" alt="" id="businessLicenseImage" @click="showViewerImageFn()">
+                        <div class="form-upload-image" v-if="clubUpgradeUser.businessLicense!=''">
+                            <img class="upload-img" :src="clubUpgradeUser.businessLicense" alt="" id="businessLicenseImage" @click="showViewerImageFn()">
                             <i class="icon mIcon" @click="deleteBusinessImage()"></i>
                         </div>
                         <div class="formLine-file" v-else id="formbusinessLicenseImage">
@@ -131,8 +131,8 @@
                 <div class="formLine clear">
                     <div class="form-upload">
                         <p>门头照：</p>
-                        <div class="form-upload-image" v-if="clubUpgradeUser.headpic!=''">
-                            <img class="upload-img" :src="clubUpgradeUser.headpic" alt="" id="uploadMentuzImage" @click="showViewerImageFn1()">
+                        <div class="form-upload-image" v-if="clubUpgradeUser.shopPhoto!=''">
+                            <img class="upload-img" :src="clubUpgradeUser.shopPhoto" alt="" id="uploadMentuzImage" @click="showViewerImageFn1()">
                             <i class="icon mIcon" @click="deleteMentuzImage()"></i>
                         </div>
                         <div class="formLine-file" v-else>