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

src/main/resources/config/dev/application-dev.yml

@@ -54,8 +54,8 @@ logging:
 caimei:
   siteEnv: 0 #网站环境，（2：正式环境，1：测试环境，0：开发环境）
   spiServer: https://spi-b.caimei365.com
-#  coreServer: https://core-b.caimei365.com
-  coreServer: http://192.168.2.75:18002
+  coreServer: https://core-b.caimei365.com
+#  coreServer: http://192.168.2.75:18002
   imageDomain: https://img-b.caimei365.com
   wwwDomain: https://www-b.caimei365.com
 

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

@@ -212,18 +212,18 @@ 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,
                         phone: response.data.bindMobile,
                         name: response.data.name,
                         userName: response.data.userName,
-                        userId: response.data.userID,
-                        spId: response.data.serviceProviderID,
-                        clubId: response.data.clubID,
-                        shopId: response.data.shopID,
+                        userId: response.data.userId,
+                        spId: response.data.serviceProviderId,
+                        clubId: response.data.clubId,
+                        shopId: response.data.shopId,
                         userIdentity: response.data.userIdentity,
                         permission: response.data.userPermission,
                         token: response.data.token

src/main/resources/static/js/common/ajax.service.js

@@ -12,11 +12,9 @@
 var Http = {
         AjaxService : function(option){
             var NODE_ENV_BASE_URL = $("#spiServer").val();
-            console.log(option.isHost);
             if(option.isHost){
                 NODE_ENV_BASE_URL = $("#coreServer").val();
             }
-            console.log(NODE_ENV_BASE_URL);
             var REV_TOKEN_ENV = '',REV_TOKEN_USERID='';
             var GET_LOGIN_STAUS = JSON.parse(window.localStorage.getItem("userInfo"));
             if (GET_LOGIN_STAUS != null) {

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

@@ -69,9 +69,9 @@ var informationPage = new Vue({
         cityArray:[],
         townArray:[],
         addressfrom: {
-            provinceID: '',//省id
-            cityID: '',//市ID
-            townID: '',//地区ID
+            provinceId: '',//省id
+            cityId: '',//市ID
+            townId: '',//地区ID
             name:'请选择'
         },
         rule:{
@@ -117,10 +117,11 @@ var informationPage = new Vue({
                     _self.clubUpgradeUser.secondClubType = data.club.secondClubType;
                     _self.clubUpgradeUser.address = data.club.address;
                     _self.userMainPros = _self.setNewMainpro(data.club.mainProduct);
-                    console.log(_self.userMainPros);
                     _self.GetProvinceFn();
-                    _self.GetCtiyFn();
-                    _self.GetTownFn();
+                    if( _self.addressfrom.townId){
+                        _self.GetCtiyFn();
+                        _self.GetTownFn();
+                    }
                 }else{
                     CAIMEI.Alert(response.msg,'确定',false);
                 }
@@ -177,6 +178,7 @@ var informationPage = new Vue({
                      return;
                 }
             }
+            console.log('22222222222');
             if (_self.loginLoading) { return false; }
             this.$nextTick(function() {
                 _self.clubUpgradeUser.mainProduct = _self.userMainPros.join("/");
@@ -230,9 +232,11 @@ var informationPage = new Vue({
         },
         setNewMainpro:function(arr){//回显处理主营内容
             var newArr = [];
-            arr.split('/').forEach(function(item){
-                newArr.push(item);
-            });
+            if(arr){
+                arr.split('/').forEach(function(item){
+                    newArr.push(item);
+                });
+            }
             return newArr
         },
         mainProAdd: function(){//添加主营

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

@@ -79,7 +79,7 @@
                             </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">
@@ -116,7 +116,7 @@
                                 <p id="firstClubType"><em>*</em>机构类型：</p>
                                 <label class="diyBox"><input type="radio" name="firstShopType" v-model="clubUpgradeUser.firstClubType" value="1"><i class="icon mIcon">医美</i></label>
                                 <label class="diyBox"><input type="radio" name="firstShopType" v-model="clubUpgradeUser.firstClubType" value="2" checked><i class="icon mIcon">生美</i></label>
-                                <span class="errTips icon mIcon" tips="请选择公司类型"></span>
+                                <span class="errTips icon mIcon" tips="" :class="typeflag?'show':''">请选择公司类型</span>
                             </div>
                             <div v-show="clubUpgradeUser.firstClubType == 1" class="formLine">
                                 <label class="diyBox second"><input type="radio" name="secondClubType" v-model="clubUpgradeUser.secondClubType" value="1" checked><i class="icon mIcon">诊所</i></label>