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

src/main/resources/static/js/supplier-center/setting/information.js

@@ -13,9 +13,9 @@
             cityId: '',
             address:'',
             name:'',//公司名称
-            sname:'',//公司简称
+            shortName:'',//公司简称
             linkMan:'',//联系人
-            email:'',//
+            contractEmail:'',//
             contractPhone:'',//固定电话
             fax:'',//传真
             legalPerson:'',//法人代表
@@ -33,15 +33,15 @@
             shopId:'',
             firstShopType:'',//公司类型 1医疗  2非医疗
             secondShopType:'',//医疗下的二级分类
-            medicalPracticeLicenseImg1:'',//资质
-            mainpro:'',//主营产品
+            medicalPracticeLicense:'',//资质
+            mainProduct:'',//主营产品
             businessScope:'',//经营内容
-            info:'',//公司介绍
-            productDesc:'',//主打说明
+            shopDesc:'',//公司介绍
+            mainProductDesc:'',//主打说明
         },
         params3:{
             socialCreditCode:'',//营业执照编号
-            businessLicenseImage:'',//营业执照
+            businessLicense:'',//营业执照
             logo:'',//公司logo
             productionLicence:'',//生产
             hygienicLicense:'',//卫生
@@ -125,9 +125,9 @@
                     var shop = res.data.shop;
                     var user = res.data.user;
                     _this.params.name = shop.name;
-                    _this.params.sname = shop.sname;
+                    _this.params.shortName = shop.shortName;
                     _this.params.linkMan = shop.linkMan;
-                    _this.params.email = user.email;
+                    _this.params.contractEmail = user.contractEmail;
                     _this.params.address = shop.provincialAddress;
                     _this.params.provinceId = shop.provinceId;
                     _this.params.cityId = shop.cityId;
@@ -142,20 +142,20 @@
                     // _this.shopScope = _this.setNewScope(shop.businessScope);
                     _this.params2.firstShopType = shop.firstShopType;
                     _this.params2.secondShopType = shop.secondShopType;
-                    _this.params2.medicalPracticeLicenseImg1 = shop.medicalPracticeLicenseImg1;
-                    _this.params2.info = shop.info;
-                    _this.params2.productDesc = shop.productDesc;
+                    _this.params2.medicalPracticeLicense = shop.medicalPracticeLicense;
+                    _this.params2.shopDesc = shop.shopDesc;
+                    _this.params2.mainProductDesc = shop.mainProductDesc;
                     _this.params3.socialCreditCode = shop.socialCreditCode;
-                    _this.params3.businessLicenseImage = shop.businessLicenseImage;
+                    _this.params3.businessLicense = shop.businessLicense;
                     _this.params3.logo = shop.logo;
                     _this.params3.productionLicence = shop.productionLicence;
                     _this.params3.hygienicLicense = shop.hygienicLicense;
                     _this.params3.taxLicense = shop.taxLicense;
                     _this.params3.certificateHonor = shop.hygienicLicense;
-                    _this.HonorImagesList = res.data.certificateHonor;
-                    _this.productImagesList = res.data.productCertification;
-                    if(shop.mainpro != "" && shop.mainpro != null){
-							_this.mentuzCampNullList =  _this.setNewMainpro(shop.mainpro);
+                    _this.HonorImagesList = shop.honorCertification;
+                    _this.productImagesList = shop.productCertification;
+                    if(shop.mainpro != "" && shop.mainProduct != null){
+							_this.mentuzCampNullList =  _this.setNewMainpro(shop.mainProduct);
                             _this.mentuzCampNullList.forEach(function (item) {
                                 if(item.checked){
                                 _this.shopMainPros.push(item.name)
@@ -207,7 +207,7 @@
                 if(_self.tabCurrentIndex==1){
                     params = _self.params;
                 }else if(_self.tabCurrentIndex==2){
-                    _self.params2.mainpro = _self.shopMainPros.join("/");
+                    _self.params2.mainProduct = _self.shopMainPros.join("/");
                     _self.params2.businessScope = _self.shopScope.join("/");
                     params = _self.params2
                 }else if(_self.tabCurrentIndex==3){
@@ -263,7 +263,7 @@
             var file = inputDOM.files;
             _this.formData.append('file', file[0]);
             PublicApi.uploadimg(_this.formData,function(response){
-                _this.params2.medicalPracticeLicenseImg1 = response.data;
+                _this.params2.medicalPracticeLicense = response.data;
                 event.target.value = '';
             });
         },
@@ -273,7 +273,7 @@
             var file = inputDOM.files;
             _this.formData.append('file', file[0]);
             PublicApi.uploadimg(_this.formData,function(response){
-                _this.params3.businessLicenseImage = response.data;
+                _this.params3.businessLicense = response.data;
                 event.target.value = '';
             });
         },
@@ -352,10 +352,10 @@
             this.params3.logo = '';
         },
          deleteBusinessImage:function(){//删除营业执照图片
-            this.params3.businessLicenseImage = '';
+            this.params3.businessLicense = '';
         },
          deleteMedicalImage:function(){//删除医疗执照图片
-            this.params2.medicalPracticeLicenseImg1 = '';
+            this.params2.medicalPracticeLicense = '';
         },
         removeGoodsImagesFn: function(index){//删除荣誉图片
             var _this = this;
@@ -373,6 +373,7 @@
         },
         checkedFn:function (index) {
             this.tabCurrentIndex = index;
+            console.log( this.tabCurrentIndex);
         },
          province:function () {
            var _this = this;

src/main/resources/templates/supplier-center/setting/information.html

@@ -48,20 +48,20 @@
                             </div>
                             <div class="formLine rightTxt" >
                                 <p>公司简称：</p>
-                                <input  class="massageBtn"  type="text" v-model.trim="params.sname"  placeholder="请与营业执照的注册名称保持一致"  maxlength="10" >
+                                <input  class="massageBtn"  type="text" v-model.trim="params.shortName"  placeholder="请与营业执照的注册名称保持一致"  maxlength="10" >
                                 <span class="errTips"></span>
                             </div>
                             <div class="formLine" >
                                 <p><em>*</em>公司地址：</p>
-                                 <select name="provinceID" id="cProvince" @change="province" v-model="params.provinceID">
+                                 <select name="provinceID" id="cProvince" @change="province" v-model="params.provinceId">
                                      <option value="0">请选择</option>
                                      <option v-for="item in provinceArray" :value="item.provinceID">{{item.name}}</option>
                                  </select>
-                                 <select name="cityID" id="cityID" @change="getcity($event)" v-model="params.cityID">
+                                 <select name="cityID" id="cityID" @change="getcity($event)" v-model="params.cityId">
                                      <option value="0"  selected="">请选择</option>
                                      <option v-for="(item ,index) in cityArray" :key="index" :value="item.cityID">{{item.name}}</option>
                                  </select>
-                                 <select name="townID" id="townID" @change="getcTown($event)" v-model="params.townID">
+                                 <select name="townID" id="townID" @change="getcTown($event)" v-model="params.townId">
                                      <option value="0">请选择</option>
                                      <option v-for="(item ,index) in townArray" :key="index" :value="item.townID" >{{item.name}}</option>
                                  </select>
@@ -77,7 +77,7 @@
                             </div>
                             <div class="formLine rightTxt">
                                 <p>邮箱(<span>邮箱可用作登录账号，请使用公司邮箱或法人邮箱</span>)：</p>
-                                <input type="text" v-model.trim="params.email" placeholder="请输入邮箱地址" maxlength="40">
+                                <input type="text" v-model.trim="params.contractEmail" placeholder="请输入邮箱地址" maxlength="40">
                                 <span class="errTips"></span>
                             </div>
                             <div class="formLine rightTxt">
@@ -139,8 +139,8 @@
                             <div class="formLine clear" v-if="params2.secondShopType == 3">
                                 <div class="form-upload">
                                     <p><em>*</em>资质：</p>
-                                    <div class="form-upload-image" id="uploadImage" v-if="params2.medicalPracticeLicenseImg1!=''">
-                                        <img class="upload-img" :src="params2.medicalPracticeLicenseImg1" alt="" id="medicalPracticeLicenseImg1" @click="showViewerbigImage()">
+                                    <div class="form-upload-image" id="uploadImage" v-if="params2.medicalPracticeLicense!=''">
+                                        <img class="upload-img" :src="params2.medicalPracticeLicense" alt="" id="medicalPracticeLicenseImg1" @click="showViewerbigImage()">
                                         <i class="icon mIcon" @click="deleteMedicalImage()"></i>
                                     </div>
                                     <div class="formLine-file" v-else>
@@ -178,13 +178,13 @@
                             </div>
                              <div class="formLine info">
                                  <p><em>*</em>公司介绍：</p>
-                                 <textarea placeholder="公司简介会在公司介绍页面展示，有助于机构更好的了解您， 建议从个人规模、代理产品、机构服务、荣誉资质这4方面进行介绍"  v-model="params2.info" name="info"  maxlength="2000"></textarea>
+                                 <textarea placeholder="公司简介会在公司介绍页面展示，有助于机构更好的了解您， 建议从个人规模、代理产品、机构服务、荣誉资质这4方面进行介绍"  v-model="params2.shopDesc" name="info"  maxlength="2000"></textarea>
                                  <i class="checked icon mIcon"></i>
                                  <span class="errTips icon mIcon" tips="请填写公司介绍"></span>
                              </div>
                              <div class="formLine info">
                                  <p><em>*</em>主打系列商品说明：</p>
-                                 <textarea placeholder="请输入主打系列商品说明"  v-model="params2.productDesc" name="info" maxlength="500"></textarea>
+                                 <textarea placeholder="请输入主打系列商品说明"  v-model="params2.mainProductDesc" name="info" maxlength="500"></textarea>
                                  <i class="checked icon mIcon"></i>
                                  <span class="errTips icon mIcon" tips="请填写公司介绍"></span>
                              </div>
@@ -207,8 +207,8 @@
                              <div class="formLine clear" >
                                 <div class="form-upload" id="businessImage">
                                     <p><em>*</em>营业执照图片：</p>
-                                    <div class="form-upload-image" v-if="params3.businessLicenseImage!=''&&params3.businessLicenseImage!=null">
-                                        <img class="upload-img" :src="params3.businessLicenseImage" alt="" id="businessLicenseImage" @click="showViewerImageFn()">
+                                    <div class="form-upload-image" v-if="params3.businessLicense!=''&&params3.businessLicense!=null">
+                                        <img class="upload-img" :src="params3.businessLicense" alt="" id="businessLicenseImage" @click="showViewerImageFn()">
                                         <i class="icon mIcon" @click="deleteBusinessImage()"></i>
                                     </div>
                                     <div class="formLine-file" v-else >
@@ -269,7 +269,7 @@
                             <div class="formLine clear" >
                                 <p><em>*</em>荣誉证书：</p>
                                 <div class="form-upload list" id="HonorImages">
-                                    <div class="form-upload-image"  v-for="(item, index) in HonorImagesList" :key="index">
+                                    <div class="form-upload-image" v-for="(item, index) in HonorImagesList" :key="index" >
                                         <img class="upload-img" :src="item" :data-image="item" alt="" id="Honor" @click="showViewerImageFn5()">
                                         <i class="icon mIcon" @click="removeGoodsImagesFn(index)"></i>
                                     </div>
@@ -283,7 +283,7 @@
                             <div class="formLine clear" >
                                 <p><em>*</em>产品证书：</p>
                                 <div class="form-upload list" id="productImages">
-                                    <div class="form-upload-image"  v-for="(item, index) in productImagesList" :key="index">
+                                    <div class="form-upload-image"v-for="(item, index) in productImagesList" :key="index" >
                                         <img class="upload-img" :src="item" :data-image="item" alt="" id="product" @click="showViewerImageFn6()">
                                         <i class="icon mIcon" @click="removeproductImagesFn(index)"></i>
                                     </div>