微服务联调

src/main/java/com/caimei/www/controller/BaseController.java

@@ -20,6 +20,8 @@ import java.util.List;
  */
 @Controller
 public class BaseController {
+	@Value("${caimei.coreServer}")
+	private String coreServer;
 	@Value("${caimei.spiServer}")
     private String spiServer;
     /** 打包时间 */
@@ -54,6 +56,7 @@ public class BaseController {
 	    // 静态文件版本号
 	    model.addAttribute("version", buildTime);
 		// spi服务器地址
+		model.addAttribute("coreServer", coreServer);
 		model.addAttribute("spiServer", spiServer);
 		// 搜索热门关键字
 		List<String> searchHotWord = baseService.getSearchHotWord();

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

@@ -54,6 +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
   imageDomain: https://img-b.caimei365.com
   wwwDomain: https://www-b.caimei365.com
 

src/main/resources/static/js/account/bind.js

@@ -15,7 +15,8 @@ var bindPage = new Vue({
             password : '',
             mobile : '',
             linkName :'',
-            verificationCode :'',
+            smsCode :'',
+            unionId:'',
         },
         rule:{
             mobileOrEmail: '(^([\\w-\\.]+)@((\\[[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}\\.)|(([\\w-]+\\.)+))([a-zA-Z]{2,4}|[0-9]{1,3})(\\]?)$)|(^\\d{6,12}$)',
@@ -68,7 +69,6 @@ var bindPage = new Vue({
                 }
             });
         },
-
         getMobileImage:function() {//获取图形验证码
             var _self = this;
             var mobile = verifyCheack('.mobileOrEmail');
@@ -92,12 +92,13 @@ var bindPage = new Vue({
         getMobileCodeFn:function(){//机构注册获取注册短信验证码
             var _self = this;
             var params = {
-                    mobileOrEmail: _self.user.mobileOrEmail,
-                    mobile:_self.user.mobile,
+                    mobile: _self.user.mobile,
+                    bindMobile: _self.user.mobileOrEmail,
+                    platformType:0,
+                    isCheckCaptcha:0,
                     imgCode:_self.imageCode,
-                    token:_self.codeImageToken,
-                    platformType:0
-             };
+                    token:_self.codeImageToken
+            };
             _self.isMobileDisabled = true;
             UserApi.getNoteSMScode(params,function (response) {
                 if(response.code == 0){
@@ -145,5 +146,8 @@ var bindPage = new Vue({
     },
     mounted: function () {
         var _self = this;
+        if(globalUserData){
+            this.user.unionId = globalUserData.unionId;
+        }
     }
 });

src/main/resources/static/js/account/forget.js

@@ -114,6 +114,7 @@ var registerPage = new Vue({
             var params = {
                     mobile:_self.phonePwd.mobileOrEmail,
                     imgCode:_self.imageCode,
+                    isCheckCaptcha:0,
                     token:_self.codeImageToken,
                     activateCodeType:1,
                     platformType:0

src/main/resources/static/js/account/login.js

@@ -39,7 +39,6 @@ var loginPage = new Vue({
         information:function(){
             window.location.href='/supplier/information.html';
             this.setStorages( this.userData);
-
         },
         toQrCodeLogin: function(){//切换微信登录二维码
             var _self = this;
@@ -49,9 +48,9 @@ var loginPage = new Vue({
                 var wxLogin = new WxLogin({
                         self_redirect: true,
                         id: "qrCodeWrap",
-                        appid: response.data.AppId,
+                        appid: response.data.appId,
                         scope: 'snsapi_login',
-                        redirect_uri: response.data.redirect_uri,
+                        redirect_uri: response.data.redirectUri,
                         state: response.data.state,
                         style: "black",
                         href: "https://www.caimei365.com/css/base/base.pc.css"
@@ -62,7 +61,7 @@ var loginPage = new Vue({
                         clearInterval(timeClock);
                     };
                 },1000);
-                _self.getWrchatStatusData({uuid:response.data.state})
+                _self.getWrchatStatusData({state:response.data.state})
             });
         },
         getWrchatStatusData:function(params){//轮询查询用户是否扫描过二维码登录
@@ -92,13 +91,14 @@ var loginPage = new Vue({
                             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
+                            token: response.data.token,
+                            unionId:response.data.unionId
                         };
                         _self.setStorages( _self.userData);
                         // 登录成功页面跳转
@@ -120,10 +120,10 @@ var loginPage = new Vue({
                         _self.stautsfalse = true;
                         _self.infofalse = true;
                         _self.userData = {
-                            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
@@ -175,7 +175,7 @@ var loginPage = new Vue({
             this.$nextTick(function(){
                 if (!pass) { return false; }
                 _self.loginLoading = true;
-                var params =  {mobileOrEmail: _self.loginAccount,password: _self.loginPassword,source: 'www'};
+                var params =  {mobileOrEmail: _self.loginAccount,password: _self.loginPassword};
                 UserApi.PostLoginAccount(params,function(response){
                     _self.loginLoading = false;
                     if(response.code === 0){
@@ -185,10 +185,10 @@ var loginPage = new Vue({
                             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
@@ -211,14 +211,15 @@ var loginPage = new Vue({
                         _self.stautsfalse = true;
                         _self.infofalse = true;
                         _self.userData = {
-                            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
                         };
+                        console.log(_self.userData)
                     }else if(response.code == '-2'){
                         _self.stautsfalse = true;
                         _self.text =response.msg;

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

@@ -101,7 +101,7 @@ var registerPage = new Vue({
                         bindMobile : _self.clubUser.phone,
                         password : _self.clubUser.password,
                         passWordConfirm : _self.clubUser.password2,
-                        activationCode : _self.clubUser.code,
+                        smsCode : _self.clubUser.code,
                         isAgreed :  _self.isAgreed,
                 };
                 _self.loginLoading = true;
@@ -143,6 +143,7 @@ var registerPage = new Vue({
             var _self = this;
             var params = {
                     mobile:_self.clubUser.phone,
+                    isCheckCaptcha:0,
                     imgCode:_self.imageCode,
                     token:_self.codeImageToken,
                     activateCodeType:2,
@@ -208,7 +209,7 @@ var registerPage = new Vue({
         },
         clubLogin: function () { // 登录
             var _self = this;
-            var params =  {mobileOrEmail: _self.clubUser.phone,password: _self.clubUser.password,source: 'www'};
+            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;

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

@@ -16,23 +16,24 @@ var registerPage = new Vue({
         supplierUser: {
             source:0,
             bindMobile:'',
-            mobileCode:'',
+            smsCode:'',
             password:'',
             passWordConfirm:'',
             linkMan:'',
             email:'',
             name:'',
-            sname:'',
+            shortName:'',
             socialCreditCode:'',
-            businessLicenseImage:'',
-            provinceID :'',
-            cityID : '',
-            townID : '',
+            businessLicense:'',
+            provinceId :'',
+            cityId : '',
+            townId : '',
             address:'',
             firstShopType:'',
             secondShopType: '',
-            mainpro:'',
+            mainProduct:'',
             isAgreed:0,
+            whichStep:0
         },
         isAgree:false,
         isShowAgree:false,
@@ -79,7 +80,7 @@ var registerPage = new Vue({
                     CAIMEI.dialog('两次密码输入不一致',false,function () {});
                     return;
                 }
-                if(!_self.supplierUser.businessLicenseImage){
+                if(!_self.supplierUser.businessLicense){
                     $('#formbusinessLicenseImage').parent().addClass("error").find('.checked').removeClass("show");
                     $('#formbusinessLicenseImage').siblings('.errTips').text('请上传营业执照图片').addClass("show");
                 }
@@ -94,6 +95,7 @@ var registerPage = new Vue({
                     return  false;
                 }
                 _self.loginLoading = true;
+                _self.supplierUser.mainProduct = _self.userMainPros.join("/");
                 UserApi.SupplierRgister(_self.supplierUser,function (response) {
                     if(response.code === 0){
                         CAIMEI.Alert('您的资料已提交成功，系统将在1-2个工作日内进行审核~','知道了',true,function () {
@@ -133,6 +135,7 @@ var registerPage = new Vue({
             var params = {
                     mobile:_self.supplierUser.bindMobile,
                     imgCode:_self.imageCode,
+                    isCheckCaptcha:0,
                     token:_self.codeImageToken,
                     activateCodeType:3,
                     platformType:0
@@ -195,23 +198,23 @@ var registerPage = new Vue({
             var file = inputDOM.files;
             _this.formData.append('file', file[0]);
             PublicApi.uploadimg(_this.formData,function(response){
-                _this.supplierUser.businessLicenseImage = response.data;
+                _this.supplierUser.businessLicense = response.data;
                 $('#formbusinessLicenseImage').parent().removeClass("error");
                 $('#formbusinessLicenseImage').siblings('.errTips').removeClass("show");
                 event.target.value = '';
             });
         },
         deleteBusinessImage:function(){//清楚营业执照图片
-            this.supplierUser.businessLicenseImage = '';
+            this.supplierUser.businessLicense = '';
         },
-        ChangeProvince:function () {//选择省份
+        ChangeProvince:function (event) {//选择省份
             var _this = this;
             _this.addressfrom.province = event.target.value;
             _this.supplierUser.provinceID = event.target.value;
             if(_this.addressfrom.province==''){//省为请选择时市区初始化
                 _this.cityArray=[];
                 _this.townArray=[];
-                _this.supplierUser.townID=''
+                _this.supplierUser.townId=''
             }else {
                 _this.ChangeGetcity();
             }
@@ -222,7 +225,7 @@ var registerPage = new Vue({
                 if(response.code == 0 ){
                     _this.cityArray = response.data;
                     _this.addressfrom.city = event.target.value;
-                    _this.supplierUser.cityID = event.target.value;
+                    _this.supplierUser.cityId = event.target.value;
                     if(_this.addressfrom.city==''){
                         _this.townArray=[];
                     }else {
@@ -238,8 +241,8 @@ var registerPage = new Vue({
             PublicApi.GetTown({ cityId: _this.addressfrom.city },function(response){
                 if(response.code == 0 ){
                     _this.townArray = response.data;
-                    _this.supplierUser.townID = event.target.value;
-                    console.log(_this.supplierUser.townID)
+                    _this.supplierUser.townId = event.target.value;
+                    console.log(_this.supplierUser.townId)
                 }else{
                     CAIMEI.Alert(response.msg,'确定',false);
                 }

src/main/resources/static/js/account/supplier-information.js

@@ -5,22 +5,22 @@ var registerPage = new Vue({
         loginLoading:false,
         showSupplierConfirm:true,
         supplierUser: {
-            userID:0,
-            shopID:0,
+            userId:0,
+            shopId:0,
             linkMan:'',
             email:'',
             name:'',
             sname:'',
             socialCreditCode:'',
-            businessLicenseImage:'',
-            provinceID :'',
-            cityID : '',
-            townID : '',
+            businessLicense:'',
+            provinceId :'',
+            cityId : '',
+            townId : '',
             address:'',
             firstShopType:'',
             secondShopType: '',
-            mainpro:'',
-            isAgreed:1,
+            mainProduct:'',
+            isAgreed:1
         },
         isAgree:true,
         isShowAgree:false,
@@ -57,7 +57,7 @@ var registerPage = new Vue({
     methods: {
         shopInfo:function(){
             var _this = this;
-            SupplierApi.shopInfo({userId:_this.supplierUser.userID},function(res){
+            SupplierApi.shopInfo({userId:_this.supplierUser.userId},function(res){
                 if(res.code==0){
                     var shop = res.data.shop;
                     var user = res.data.user;
@@ -65,26 +65,26 @@ var registerPage = new Vue({
                     _this.supplierUser.linkMan = shop.linkMan;
                     _this.supplierUser.email = user.email;
                     _this.supplierUser.sname = shop.sname;
-                    _this.supplierUser.provinceID = shop.provinceID;
-                    _this.supplierUser.cityID = shop.cityID;
-                    _this.supplierUser.townID = shop.townID;
+                    _this.supplierUser.provinceId = shop.provinceId;
+                    _this.supplierUser.cityId = shop.cityId;
+                    _this.supplierUser.townId= shop.townId;
                     _this.supplierUser.address = shop.address;
                     _this.supplierUser.socialCreditCode = shop.socialCreditCode;
-                    _this.supplierUser.businessLicenseImage =  shop.businessLicenseImage;
+                    _this.supplierUser.businessLicense =  shop.businessLicense;
                     _this.supplierUser.firstShopType =  shop.firstShopType;
                     _this.supplierUser.secondShopType = shop.secondShopType;
-                    if(shop.mainpro != "" && shop.mainpro != null){
-							_this.mentuzCampNullList =  _this.setNewMainpro(shop.mainpro);
+                    if(shop.mainProduct != "" && shop.mainProduct != null){
+							_this.mentuzCampNullList =  _this.setNewMainpro(shop.mainProduct);
                             _this.mentuzCampNullList.forEach(function (item) {
                                 if(item.checked){
                                 _this.shopMainPros.push(item.name)
                                 }
                              })
 						}
-                    if(shop.cityID!=''&&shop.cityID!=null){
+                    if(shop.cityId!=''&&shop.cityId!=null){
                         _this.ChangeGetcity()
                     }
-                    if(shop.townID!=''&&shop.townID!=null){
+                    if(shop.townId!=''&&shop.townId!=null){
                         _this.ChangeGetcTown();
                     }
                 }else{
@@ -103,14 +103,14 @@ var registerPage = new Vue({
                     _self.isShowAgree = true;
                     return;
                 }
-                if(_self.supplierUser.townID == 0 || _self.supplierUser.address==''){
+                if(_self.supplierUser.townId == 0 || _self.supplierUser.address==''){
                     _self.flagshow = true;
                     setTimeout(function () {
                         _self.flagshow = false;
                     },2000)
                      return  false;
                 }
-                if(_self.supplierUser.businessLicenseImage==''||_self.supplierUser.businessLicenseImage==null){
+                if(_self.supplierUser.businessLicense==''||_self.supplierUser.businessLicense==null){
                     $('#formbusinessLicenseImage').parent().addClass("error").find('.checked').removeClass("show");
                     $('#formbusinessLicenseImage').siblings('.errTips').text('请上传营业执照图片').addClass("show");
                     return  false;
@@ -126,7 +126,7 @@ var registerPage = new Vue({
                     return  false;
                 }
                 _self.loginLoading = true;
-                _self.supplierUser.mainpro = _self.shopMainPros.join("/");
+                _self.supplierUser.mainProduct = _self.shopMainPros.join("/");
                 UserApi.UpdateCompanyInfo(_self.supplierUser,function (response) {
                     if(response.code === 0){
                         CAIMEI.Alert('您的资料已提交成功，系统将在1-2个工作日内进行审核~','知道了',true,function () {
@@ -176,26 +176,26 @@ var registerPage = new Vue({
         },
         ChangeProvince:function () {
            var _this = this;
-           if (_this.supplierUser.provinceID!=0){
-                _this.supplierUser.provinceID = event.target.value;
+           if (_this.supplierUser.provinceId!=0){
+                _this.supplierUser.provinceId = event.target.value;
                 _this.ChangeGetcity();
-                 _this.supplierUser.cityID = 0;
+                 _this.supplierUser.cityId = 0;
            }else {
                 _this.cityArray=[];
                 _this.townArray=[];
-                _this.supplierUser.townID=0;
-                _this.supplierUser.cityID = 0;
+                _this.supplierUser.townId=0;
+                _this.supplierUser.cityId = 0;
            }
         },
         ChangeGetcity:function(event){//加载市
             var _this = this;
-            PublicApi.GetCity({ provinceId: _this.supplierUser.provinceID },function(response){
+            PublicApi.GetCity({ provinceId: _this.supplierUser.provinceId },function(response){
                 if(response.code == 0 ){
                     _this.cityArray = response.data;
-                    _this.supplierUser.cityID = event.target.value;
-                    if(_this.supplierUser.cityID==0){
+                    _this.supplierUser.cityId = event.target.value;
+                    if(_this.supplierUser.cityId==0){
                         _this.townArray=[];
-                         _this.supplierUser.townID = 0;
+                         _this.supplierUser.townId = 0;
                     }else {
                         _this.ChangeGetcTown();
                     }
@@ -206,11 +206,11 @@ var registerPage = new Vue({
         },
         ChangeGetcTown:function(event){//选择地区
             var _this = this;
-            PublicApi.GetTown({ cityId: _this.supplierUser.cityID },function(response){
+            PublicApi.GetTown({ cityId: _this.supplierUser.cityId },function(response){
                 if(response.code == 0 ){
                     _this.townArray = response.data;
-                    _this.supplierUser.townID = event.target.value;
-                    console.log(_this.supplierUser.townID)
+                    _this.supplierUser.townId = event.target.value;
+                    console.log(_this.supplierUser.townId)
                 }else{
                     CAIMEI.Alert(response.msg,'确定',false);
                 }
@@ -283,8 +283,8 @@ var registerPage = new Vue({
     mounted: function () {
         var _self = this;
         if(globalUserData) {
-            _self.supplierUser.userID = globalUserData.userId;
-            _self.supplierUser.shopID = globalUserData.shopId;
+            _self.supplierUser.userId = globalUserData.userId;
+            _self.supplierUser.shopId = globalUserData.shopId;
         }
         _self.infoData = JSON.parse(CAIMEI.Storage.getItem('userInfo'));
         _self.shopInfo();

src/main/resources/static/js/account/upgrade.js

@@ -1,59 +0,0 @@
-var upgradePage = new Vue({
-    el: "#upgradePage",
-    data: {
-        clubUser: {
-            name:'',
-            phone:'',
-            code:'',
-            address:'',
-            mainPros:'',
-            businessLicenseImage:'',
-            businessLicense:'',
-            secondShopType:'',
-            firstShopType:'',
-            department:''
-        },
-        mentuzCampNullList:[
-            {value:'1',name:'整形'},
-            {value:'2',name:'轻医美'},
-            {value:'3',name:'皮肤科'},
-        ],
-        medicaCampNullList: [
-            {value:'1',name:'美容'},
-            {value:'2',name:'美体'},
-            {value:'3',name:'美发'},
-            {value:'4',name:'皮肤管理'},
-            {value:'5',name:'光电'},
-            {value:'6',name:'综合类'},
-            {value:'7',name:'中医养生'},
-            {value:'8',name:'spa'},
-        ],
-        mainProEdit: '',
-        rule:{
-            name: '^[a-zA-Z\\u4e00-\\u9fa5]{2,}$',
-            phone: '^\\d{6,12}$',
-            code: '^\\d{6}$',
-            license: '^[a-zA-Z0-9_]{18}$',
-            email: '^(([^<>()\\[\\]\\\\.,;:\\s@&quot;]+(\\.[^<>()\\[\\]\\\\.,;:\\s@&quot;]+)*)|(&quot;.+&quot;))@((\\[[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}])|(([a-zA-Z\\-0-9]+\\.)+[a-zA-Z]{2,}))$',
-            password: "^[^\\u4e00-\\u9fa5]{8,16}$"
-        },
-    },
-    computed: {
-
-    },
-    methods: {
-        getMobileCodeFn:function(){
-
-        },
-        blurHandle: function(event) { // 失去焦点校验
-            var el = event.currentTarget;
-            verifyHandle(el);
-        },
-    },
-    created: function () {
-
-    },
-    mounted: function () {
-        var _self = this;
-    }
-});

src/main/resources/static/js/base.js

@@ -1,3 +1,4 @@
+var coreServer = $("#coreServer").val();
 var spiServer = $("#spiServer").val();
 var isPC = ($(window).width()>768);
 var globalUserData = '';

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

@@ -12,6 +12,11 @@
 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/common/serviceapi/supplier.service.js

@@ -128,7 +128,7 @@ var SupplierApi = {
                 });
         },
         shopInfo: function (params, callback) {//资料信息 回显数据
-            Http.AjaxService({ url:'/supplier/shopInfo', type:'GET', data:params, json:false })
+            Http.AjaxService({ url:'/user/shop/info', type:'GET', data:params, json:false , isHost:true})
                 .then(function(res){
                     callback(res);
                 });
@@ -158,7 +158,7 @@ var SupplierApi = {
                 });
         },
          modifiedData: function (params, callback) {//资料信息提交
-            Http.AjaxService({ url:'/supplier/modifiedData', type:'post', data:params, json:false })
+            Http.AjaxService({ url:'/user/shop/info/update', type:'post', data:params, json:false, isHost:true })
                 .then(function(res){
                     callback(res);
                 });

src/main/resources/static/js/common/serviceapi/user.service.js

@@ -5,43 +5,49 @@
  */
 var UserApi = {
         PostLoginAccount : function (params,callback) {//新系统登录
-            Http.AjaxService({ url:'/user/login', type:'post', data:params, json:false})
+            Http.AjaxService({ url:'/user/login/password', type:'post', data:params, json:false, isHost:true})
                 .then(function(res){
                     callback(res)
                 });
         },
         ToWechatLogin : function (params,callback) {//获取扫码登录参数
-            Http.AjaxService({ url:'/user/toWechatLogin', type:'get', data:params, json:false})
+            Http.AjaxService({ url:'/user/login/auth/parameters', type:'get', data:params, json:false, isHost:true})
                 .then(function(res){
                     callback(res)
                 });
         },
         ToWechatPolling : function (params,callback) {//扫码登录轮询
-            Http.AjaxService({ url:'/user/polling', type:'get', data:params, json:false})
+            Http.AjaxService({ url:'/user/login/auth/scan/result', type:'get', data:params, json:false, isHost:true})
                 .then(function(res){
                     callback(res)
                 });
         },
         ClubRegister: function (params, callback) {//机构注册
-            Http.AjaxService({ url:'/club/common', type:'post', data:params, json:false})
+            Http.AjaxService({ url:'/user/register/club', type:'post', data:params, json:false, isHost:true})
                 .then(function(res){
                     callback(res);
                 });
         },
+        SupplierRgister:function(params, callback){//供应商注册
+            Http.AjaxService({url: '/user/register/shop/applets', type: 'post', data: params, json: false, isHost:true})
+                .then(function (res) {
+                    callback(res)
+                });
+        },
         getRegisterMobileCode: function (params, callback) {//机构注册获取短信验证码
-            Http.AjaxService({ url:'/user/activateCodeByReg', type:'get', data:params, json:false})
+            Http.AjaxService({ url:'/user/sms/code', type:'get', data:params, json:false, isHost:true})
                 .then(function(res){
                     callback(res);
                 });
         },
         getNoteSMScode : function (params,callback){//绑定机构运营人员获取短信验证码
-            Http.AjaxService({ url:'/user/note', type:'get', data:params, json:true})
+            Http.AjaxService({ url:'/user/sms/bind', type:'get', data:params, json:true, isHost:true})
                 .then(function(res){
                     callback(res);
                 });
         },
-        ClubUpgrade : function(params,callback) {//机构注册升级信息
-            Http.AjaxService({ url:'/club/upgrade', type:'post', data:params, json:false})
+        ClubUpgrade : function(params,callback) {//机构升级会员信息
+            Http.AjaxService({ url:'/user/register/club/upgrade', type:'post', data:params, json:false, isHost:true})
             .then(function(res){
                 callback(res);
             });
@@ -95,23 +101,17 @@ var UserApi = {
             });
         },
         GetApplicationData : function(params,callback) {//查询机构资料信息
-            Http.AjaxService({ url:'/user/club/applicationData', type:'GET', data:params, json:false})
+            Http.AjaxService({ url:'/user/club/info', type:'GET', data:params, json:false, isHost:true})
             .then(function(res){
                 callback(res);
             });
         },
         UpdateModifiedData: function(params,callback) {//查询机构资料信息
-            Http.AjaxService({ url:'/operation/modifiedData', type:'POST', data:params, json:false})
+            Http.AjaxService({ url:'/user/club/info/update', type:'POST', data:params, json:false, isHost:true})
             .then(function(res){
                 callback(res);
             });
         },
-        SupplierRgister:function(params, callback){//供应商注册
-            Http.AjaxService({url: '/supplier/register', type: 'post', data: params, json: false})
-            .then(function (res) {
-                callback(res)
-            });
-        },
         SupplierShopInfo:function(params, callback){//供应商修改申请信息查询
             Http.AjaxService({url: '/supplier/shopInfo', type: 'get', data: params, json: false})
             .then(function (res) {
@@ -119,13 +119,13 @@ var UserApi = {
             });
         },
         UpdateCompanyInfo: function (params, callback) {//供应商修改申请信息保存
-            Http.AjaxService({ url:'/supplier/updateCompanyInfo', type:'post', data:params, json:false})
+            Http.AjaxService({ url:'/user/register/apply/update', type:'post', data:params, json:false, isHost:true})
             .then(function(res){
                 callback(res);
             });
         },
         BindOrganization : function(params,callback) {//扫码微信绑定机构
-            Http.AjaxService({ url:'/user/bindOrganization', type:'post', data:params, json:false})
+            Http.AjaxService({ url:'/user/login/auth/scan/bind', type:'post', data:params, json:false, isHost:true})
             .then(function(res){
                 callback(res)
             });
@@ -136,4 +136,5 @@ var UserApi = {
                 callback(res)
             });
         },
+
 };

src/main/resources/static/js/common/serviceapi/utils.service.js

@@ -80,7 +80,7 @@ var PublicApi = {
             });
         },
         getImgVerifyCode : function (params,callback){ //获取图形验证图形
-            Http.AjaxService({ url:'/user/getImgVerifyCode', type:'get', data:params, json:true})
+            Http.AjaxService({ url:'/user/captcha', type:'get', data:params, json:true, isHost:true})
             .then(function(res){
                 if (res.code == 0) {
                     callback(res);

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

@@ -6,11 +6,11 @@
          loginLoading: false,
          isRequset:true,
         params:{
-            userID:'',
-            shopID:'',
-            townID:'',
-            provinceID: '',//省id
-            cityID: '',
+            userId:'',
+            shopId:'',
+            townId:'',
+            provinceId: '',//省id
+            cityId: '',
             address:'',
             name:'',//公司名称
             sname:'',//公司简称
@@ -29,8 +29,8 @@
             cityID: '',
         },
         params2:{
-            userID:'',
-            shopID:'',
+            userId:'',
+            shopId:'',
             firstShopType:'',//公司类型 1医疗  2非医疗
             secondShopType:'',//医疗下的二级分类
             medicalPracticeLicenseImg1:'',//资质
@@ -128,9 +128,9 @@
                     _this.params.linkMan = shop.linkMan;
                     _this.params.email = user.email;
                     _this.params.address = shop.provincialAddress;
-                    _this.params.provinceID = shop.provinceID;
-                    _this.params.cityID = shop.cityID;
-                    _this.params.townID = shop.townID;
+                    _this.params.provinceId = shop.provinceId;
+                    _this.params.cityId = shop.cityId;
+                    _this.params.townId = shop.townId;
                     _this.params.contractPhone = shop.contractPhone;
                     _this.params.fax = shop.fax;
                     _this.params.legalPerson = shop.legalPerson;
@@ -169,10 +169,10 @@
                                 }
                              })
 						}
-                    if(shop.cityID!=''&&shop.cityID!=null){
+                    if(shop.cityId!=''&&shop.cityId!=null){
                         _this.getcity()
                     }
-                    if(shop.townID!=''&&shop.townID!=null){
+                    if(shop.townId!=''&&shop.townId!=null){
                         _this.getcTown();
                     }
                 }
@@ -212,7 +212,6 @@
                 }else if(_self.tabCurrentIndex==3){
                     params = _self.params3
                 }
-                console.log(params)
               SupplierApi.modifiedData(params,function (res) {
                      console.log(res)
                       if(res.code === 0){
@@ -376,39 +375,39 @@
         },
          province:function () {
            var _this = this;
-           _this.params.provinceID = event.target.value;
-            if(_this.params.provinceID==0){//省为请选择时市区初始化
+           _this.params.provinceId = event.target.value;
+            if(_this.params.provinceId==0){//省为请选择时市区初始化
                 _this.cityArray=[];
                 _this.townArray=[];
-                _this.params.townID=0;
-                _this.params.cityID = 0;
+                _this.params.townId=0;
+                _this.params.cityId = 0;
             }else {
               _this.getcity();
-              _this.params.cityID = 0;
+              _this.params.cityId = 0;
             }
         },
         getcity:function(event){//加载市
            var _this = this;
-            PublicApi.GetCity({ provinceId: _this.params.provinceID },function(response){
+            PublicApi.GetCity({ provinceId: _this.params.provinceId },function(response){
                  if(response.code == 0 ){
                     _this.cityArray = response.data;
-                     _this.params.cityID = event.target.value;
-                     if(_this.params.cityID==0){
+                     _this.params.cityId = event.target.value;
+                     if(_this.params.cityId==0){
                            _this.townArray=[];
-                           _this.params.townID = 0;
+                           _this.params.townId = 0;
                      }else {
                          _this.getcTown();
-                          _this.params.townID = 0;
+                          _this.params.townId = 0;
                      }
                 }
             })
         },
          getcTown:function(event){
             var _this = this;
-            PublicApi.GetTown({cityId:_this.params.cityID},function(response){
+            PublicApi.GetTown({cityId:_this.params.cityId},function(response){
                 if(response.code == 0 ){
                     _this.townArray = response.data;
-                    _this.params.townID = event.target.value;
+                    _this.params.townId = event.target.value;
                 }else{
                     CAIMEI.Alert(response.msg, '确定', false);
                 }
@@ -433,12 +432,12 @@
     mounted:function () {
     var _self=this;
         if(globalUserData){
-              _self.params.userID = globalUserData.userId;
-              _self.params.shopID = globalUserData.shopId;
-              _self.params2.userID = globalUserData.userId;
-              _self.params2.shopID = globalUserData.shopId;
-              _self.params3.userID = globalUserData.userId;
-              _self.params3.shopID = globalUserData.shopId;
+              _self.params.userId = globalUserData.userId;
+              _self.params.shopId = globalUserData.shopId;
+              _self.params2.userId = globalUserData.userId;
+              _self.params2.shopId = globalUserData.shopId;
+              _self.params3.userId = globalUserData.userId;
+              _self.params3.shopId = globalUserData.shopId;
           };
           _self.shopInfo();
         PublicApi.GetProvince({},function(response){ //省份

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

@@ -117,6 +117,7 @@ var passwordPage = new Vue({
             var params = {
                     mobile:_self.phonePwd.mobileOrEmail,
                     imgCode:_self.imageCode,
+                    isCheckCaptcha:0,
                     token:_self.codeImageToken,
                     activateCodeType:1,
                     platformType:0

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

@@ -20,28 +20,28 @@ var informationPage = new Vue({
         bindMobile:'',
         userIdentity:'',
         clubUpgradeUser: {
-            userID:0,
-            clubID:0,					//会所ID
+            userId:0,
+            clubId:0,					//会所Id
             name:'',                    //机构名称
-            linkMan1:'',                //联系人
-            contractEmail1:'',          //邮箱
-            sname:'',                   //机构简称
-            provinceID:0,               //省ID
-            cityID:0,                   //市ID
-            townID:0,                   //区ID
+            linkMan:'',                //联系人
+            contractEmail:'',          //邮箱
+            shortName:'',                   //机构简称
+            provinceId:0,               //省Id
+            cityId:0,                   //市Id
+            townId:0,                   //区Id
             address:'',                 //地址
             socialCreditCode:'',        //营业执照编号
-            businessLicenseImage:'',    //营业执照图片
-            headpic:'',                 //门头照
+            businessLicense:'',    //营业执照图片
+            shopPhoto:'',                 //门头照
             firstClubType:'', //机构类型分类 医美:0和生美:1
             secondClubType:'',		//机构类型二级分类 诊所:1,门诊:2,医院:3
             department:'',			//科室
-            medicalPracticeLicenseImg:'',//资质图片
+            medicalPracticeLicense:'',//资质图片
             isAgreed:0,				//是否勾选协议
-            mainpro:[],             //主营内容
+            mainProduct:[],             //主营内容
             fax:'',                 //传真
             contractPhone:'',       //固定电话
-            info : ''               //公司简介
+            profile : ''               //公司简介
         },
         userMainPros:[],
         formData:new FormData(),
@@ -95,28 +95,28 @@ var informationPage = new Vue({
     methods: {
         infoInformationData:function(){
             var _self = this;
-            UserApi.GetApplicationData({userID:_self.userId},function (response) {
+            UserApi.GetApplicationData({userId:_self.userId},function (response) {
                 if(response.code == 0){
                     var data = response.data;
                     _self.isRequset = false;
                     _self.clubUpgradeUser = data.club;
                     _self.bindMobile = data.user.bindMobile;
                     _self.userIdentity = data.user.userIdentity;
-                    _self.addressfrom.clubID = data.user.clubID;
-                    _self.addressfrom.userID = data.user.userID;
-                    _self.addressfrom.contractEmail1 = data.user.contractEmail1;
-                    _self.addressfrom.provinceID = data.club.provinceID;
-                    _self.addressfrom.cityID = data.club.cityID;
-                    _self.addressfrom.townID = data.club.townID;
-                    _self.clubUpgradeUser.provinceID = data.club.provinceID;
-                    _self.clubUpgradeUser.cityID = data.club.cityID;
-                    _self.clubUpgradeUser.townID= data.club.townID;
-                    _self.clubUpgradeUser.headpic = data.club.headpic;
-                    _self.clubUpgradeUser.businessLicenseImage = data.club.businessLicenseImage;
+                    _self.addressfrom.clubId = data.user.clubId;
+                    _self.addressfrom.userId = data.user.userId;
+                    _self.addressfrom.contractEmail = data.user.contractEmail;
+                    _self.addressfrom.provinceId = data.club.provinceId;
+                    _self.addressfrom.cityId = data.club.cityId;
+                    _self.addressfrom.townId = data.club.townId;
+                    _self.clubUpgradeUser.provinceId = data.club.provinceId;
+                    _self.clubUpgradeUser.cityId = data.club.cityId;
+                    _self.clubUpgradeUser.townId= data.club.townId;
+                    _self.clubUpgradeUser.shopPhoto = data.club.shopPhoto;
+                    _self.clubUpgradeUser.businessLicense = data.club.businessLicense;
                     _self.clubUpgradeUser.firstClubType = data.club.firstClubType;
                     _self.clubUpgradeUser.secondClubType = data.club.secondClubType;
                     _self.clubUpgradeUser.address = data.club.address;
-                    _self.userMainPros = _self.setNewMainpro(data.club.mainpro);
+                    _self.userMainPros = _self.setNewMainpro(data.club.mainProduct);
                     console.log(_self.userMainPros);
                     _self.GetProvinceFn();
                     _self.GetCtiyFn();
@@ -131,14 +131,14 @@ var informationPage = new Vue({
             var params ={};
             var pass = verifyForm();
              if (!pass) {return false;}
-             if(_self.clubUpgradeUser.townID==0 || _self.clubUpgradeUser.address==''){
+             if(_self.clubUpgradeUser.townId==0 || _self.clubUpgradeUser.address==''){
                 _self.flagshow = true;
                 setTimeout(function () {
                     _self.flagshow = false;
                 },2000)
                 return;
             }
-             if(_self.clubUpgradeUser.businessLicenseImage==''||_self.clubUpgradeUser.businessLicenseImage==null){
+             if(_self.clubUpgradeUser.businessLicense==''||_self.clubUpgradeUser.businessLicense==null){
                 _self.businessflag = true;
                      setTimeout(function () {
                             _self.businessflag = false;
@@ -179,39 +179,39 @@ var informationPage = new Vue({
             }
             if (_self.loginLoading) { return false; }
             this.$nextTick(function() {
-                _self.clubUpgradeUser.mainPros = _self.userMainPros.join("/");
+                _self.clubUpgradeUser.mainProduct = _self.userMainPros.join("/");
                 if(_self.userIdentity === 4){
                     params = {
-                        userID:_self.clubUpgradeUser.userID,
-                        clubID:_self.clubUpgradeUser.clubID,					//会所ID
-                        linkMan1:_self.clubUpgradeUser.linkMan1,
+                        userId:_self.clubUpgradeUser.userId,
+                        clubId:_self.clubUpgradeUser.clubId,					//会所Id
+                        linkMan:_self.clubUpgradeUser.linkMan,
                         fax:_self.clubUpgradeUser.fax,
                         contractPhone:_self.clubUpgradeUser.contractPhone,
-                        info : _self.clubUpgradeUser.info,
+                        profile : _self.clubUpgradeUser.profile,
                     }
                 }else{
                     params 	= {
-                        userID:_self.clubUpgradeUser.userID,
-                        clubID:_self.clubUpgradeUser.clubID,				//会所ID
+                        userId:_self.clubUpgradeUser.userId,
+                        clubId:_self.clubUpgradeUser.clubId,				//会所Id
                         name:_self.clubUpgradeUser.name,
-                        linkMan1:_self.clubUpgradeUser.linkMan1,
-                        sname:_self.clubUpgradeUser.sname,
-                        contractEmail1:_self.clubUpgradeUser.contractEmail1,
-                        provinceID:_self.clubUpgradeUser.provinceID,
-                        cityID:_self.clubUpgradeUser.cityID,
-                        townID:_self.clubUpgradeUser.townID,
+                        linkMan:_self.clubUpgradeUser.linkMan,
+                        shortName:_self.clubUpgradeUser.shortName,
+                        contractEmail:_self.clubUpgradeUser.contractEmail,
+                        provinceId:_self.clubUpgradeUser.provinceId,
+                        cityId:_self.clubUpgradeUser.cityId,
+                        townId:_self.clubUpgradeUser.townId,
                         address:_self.clubUpgradeUser.address,
                         socialCreditCode:_self.clubUpgradeUser.socialCreditCode,
-                        businessLicenseImage:_self.clubUpgradeUser.businessLicenseImage,
-                        headpic:_self.clubUpgradeUser.headpic,
+                        businessLicense:_self.clubUpgradeUser.businessLicense,
+                        shopPhoto:_self.clubUpgradeUser.shopPhoto,
                         firstClubType:_self.clubUpgradeUser.firstClubType, //机构类型分类 医美:0和生美:1
                         secondClubType:_self.clubUpgradeUser.secondClubType,	//机构类型二级分类 诊所:1,门诊:2,医院:3
                         department:_self.clubUpgradeUser.department,				//科室
-                        medicalPracticeLicenseImg:_self.clubUpgradeUser.medicalPracticeLicenseImg,//资质图片
-                        mainpro:_self.clubUpgradeUser.mainpro,
+                        medicalPracticeLicense:_self.clubUpgradeUser.medicalPracticeLicense,//资质图片
+                        mainProduct:_self.clubUpgradeUser.mainProduct,
                         fax:_self.clubUpgradeUser.fax,
                         contractPhone:_self.clubUpgradeUser.contractPhone,
-                        info : _self.clubUpgradeUser.info,
+                        profile : _self.clubUpgradeUser.profile,
                     }
                 }
                 _self.loginLoading = true;
@@ -274,7 +274,7 @@ var informationPage = new Vue({
             var file = inputDOM.files;
             _self.formData.append('file', file[0]);
             PublicApi.uploadimg(_self.formData,function(response){
-                _self.clubUpgradeUser.businessLicenseImage = response.data;
+                _self.clubUpgradeUser.businessLicense = response.data;
                 event.target.value = '';
             });
         },
@@ -284,7 +284,7 @@ var informationPage = new Vue({
             var file = inputDOM.files;
             _self.formData.append('file', file[0]);
             PublicApi.uploadimg(_self.formData,function(response){
-                _self.clubUpgradeUser.headpic = response.data;
+                _self.clubUpgradeUser.shopPhoto = response.data;
                 event.target.value = '';
             });
         },
@@ -294,18 +294,18 @@ var informationPage = new Vue({
             var file = inputDOM.files;
             _self.formData.append('file', file[0]);
             PublicApi.uploadimg(_self.formData,function(response){
-                _self.clubUpgradeUser.medicalPracticeLicenseImg = response.data;
+                _self.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 = '';
         },
         checkedIsAgreeFn:function () {
             var _self = this;
@@ -330,24 +330,24 @@ var informationPage = new Vue({
         },
         ChangeProvince:function () {//选择省份
             var _self = this;
-            _self.addressfrom.provinceID = event.target.value;
-            _self.clubUpgradeUser.provinceID = event.target.value;
-            if(_self.addressfrom.provinceID==''){//省为请选择时市区初始化
+            _self.addressfrom.provinceId = event.target.value;
+            _self.clubUpgradeUser.provinceId = event.target.value;
+            if(_self.addressfrom.provinceId==''){//省为请选择时市区初始化
                 _self.cityArray=[];
                 _self.townArray=[];
-                _self.clubUpgradeUser.townID='';
-                _self.clubUpgradeUser.cityID='';
+                _self.clubUpgradeUser.townId='';
+                _self.clubUpgradeUser.cityId='';
             }else {
-                 _self.clubUpgradeUser.townID='';
-                 _self.clubUpgradeUser.cityID='';
+                 _self.clubUpgradeUser.townId='';
+                 _self.clubUpgradeUser.cityId='';
                 _self.GetCtiyFn();
             }
         },
         ChangeGetcity:function(event){//加载市
             var _self = this;
-            _self.addressfrom.cityID = event.target.value;
-            _self.clubUpgradeUser.cityID = event.target.value;
-            if(_self.addressfrom.cityID==''){
+            _self.addressfrom.cityId = event.target.value;
+            _self.clubUpgradeUser.cityId = event.target.value;
+            if(_self.addressfrom.cityId==''){
                 _self.townArray=[];
             }else {
                 _self.GetTownFn();
@@ -355,7 +355,7 @@ var informationPage = new Vue({
         },
         ChangeGetcTown:function(event){//选择地区
             var _self = this;
-            _self.clubUpgradeUser.townID = event.target.value;
+            _self.clubUpgradeUser.townId = event.target.value;
         },
         GetProvinceFn: function(){//获取全部省份
             var _self = this;
@@ -369,7 +369,7 @@ var informationPage = new Vue({
         },
         GetCtiyFn: function(){//获取市
             var _self = this;
-            PublicApi.GetCity({ provinceId: _self.addressfrom.provinceID },function(response){
+            PublicApi.GetCity({ provinceId: _self.addressfrom.provinceId },function(response){
                 if(response.code == 0 ){
                     _self.cityArray = response.data;
                 }else{
@@ -379,7 +379,7 @@ var informationPage = new Vue({
         },
         GetTownFn: function(){//获取区
             var _self = this;
-            PublicApi.GetTown({ cityId: _self.addressfrom.cityID },function(response){
+            PublicApi.GetTown({ cityId: _self.addressfrom.cityId },function(response){
                 if(response.code == 0 ){
                     _self.townArray = response.data;
                 }else{

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

@@ -117,6 +117,7 @@ var passwordPage = new Vue({
             var params = {
                     mobile:_self.phonePwd.mobileOrEmail,
                     imgCode:_self.imageCode,
+                    isCheckCaptcha:0,
                     token:_self.codeImageToken,
                     activateCodeType:1,
                     platformType:2

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

@@ -5,23 +5,23 @@ var upgradePage = new Vue({
         isRequset:true,
         loginLoading: false,
         clubUpgradeUser: {
-            userID:'',
-            clubID:'',
-            contractEmail1:'',
+            userId:'',
+            clubId:'',
+            contractEmail:'',
             name:'',
-            sname:'',
+            shortName:'',
             socialCreditCode:'',
-            mainpro:[],
-            businessLicenseImage:'',
-            headpic:'',
-            medicalPracticeLicenseImg:'',
+            mainProduct:[],
+            businessLicense:'',
+            shopPhoto:'',
+            medicalPracticeLicense:'',
             firstClubType:'',
             secondClubType:0,
             department:'',
-            provinceID :'',
-            cityID : '',
-            townID : '',
-            address:'',
+            provinceId :'',
+            cityId : '',
+            townId : '',
+            address:''
         },
         userMainPros:[],
 
@@ -72,37 +72,37 @@ var upgradePage = new Vue({
     methods: {
         infoInformationData:function(){//机构资料初始化
             var _self = this;
-            UserApi.GetApplicationData({userID:_self.clubUpgradeUser.userID},function (response) {
+            UserApi.GetApplicationData({userId:_self.clubUpgradeUser.userId},function (response) {
                 if(response.code == 0){
                     var data = response.data;
                     _self.isRequset = false;
                     _self.clubUpgradeUser = data.club;
                     _self.userIdentity = data.user.userIdentity;
-                    _self.clubUpgradeUser.clubID = data.user.clubID;
-                    _self.clubUpgradeUser.userID = data.user.userID;
-                    _self.clubUpgradeUser.contractEmail1 = data.club.contractEmail1;
-                    _self.clubUpgradeUser.provinceID = data.club.provinceID;
-                    _self.clubUpgradeUser.cityID = data.club.cityID;
-                    _self.clubUpgradeUser.townID= data.club.townID;
-                    _self.clubUpgradeUser.headpic = data.club.headpic;
-                    _self.clubUpgradeUser.businessLicenseImage = data.club.businessLicenseImage;
+                    _self.clubUpgradeUser.clubId = data.user.clubId;
+                    _self.clubUpgradeUser.userId = data.user.userId;
+                    _self.clubUpgradeUser.contractEmail = data.club.contractEmail;
+                    _self.clubUpgradeUser.provinceId = data.club.provinceId;
+                    _self.clubUpgradeUser.cityId = data.club.cityId;
+                    _self.clubUpgradeUser.townId= data.club.townId;
+                    _self.clubUpgradeUser.shopPhoto = data.club.shopPhoto;
+                    _self.clubUpgradeUser.businessLicense = data.club.businessLicense;
                     _self.clubUpgradeUser.firstClubType = data.club.firstClubType;
                     _self.clubUpgradeUser.secondClubType = data.club.secondClubType;
                     _self.clubUpgradeUser.address = data.club.address;
-                     _self.userMainPros = _self.setNewMainpro(data.club.mainpro);
+                     _self.userMainPros = _self.setNewMainpro(data.club.mainProduct);
                     console.log(_self.userMainPros);
-                    if(data.club.provinceID ==null){
-                         _self.clubUpgradeUser.provinceID = 0;
+                    if(data.club.provinceId ==null){
+                         _self.clubUpgradeUser.provinceId = 0;
                      }
-                    if(data.club.cityID!=''&&data.club.cityID!=null){
+                    if(data.club.cityId!=''&&data.club.cityId!=null){
                         _self.getcity();
                     }else {
-                         _self.clubUpgradeUser.cityID = 0
+                         _self.clubUpgradeUser.cityId = 0
                     }
-                    if(data.club.townID!=''&&data.club.townID!=null){
+                    if(data.club.townId!=''&&data.club.townId!=null){
                         _self.getcTown();
                     }else {
-                         _self.clubUpgradeUser.townID = 0
+                         _self.clubUpgradeUser.townId = 0
                     }
                 }else{
                     CAIMEI.Alert(response.msg,'确定',false);
@@ -113,14 +113,14 @@ var upgradePage = new Vue({
             var _self = this;
             var pass = verifyForm();
             if (!pass) {return false;}
-            if(_self.clubUpgradeUser.townID==0||_self.clubUpgradeUser.address==''){
+            if(_self.clubUpgradeUser.townId==0||_self.clubUpgradeUser.address==''){
                 _self.flagshow = true;
                 setTimeout(function () {
                     _self.flagshow = false;
                 },2000)
                 return;
             }
-             if(_self.clubUpgradeUser.businessLicenseImage==''||_self.clubUpgradeUser.businessLicenseImage==null){
+             if(_self.clubUpgradeUser.businessLicense==''||_self.clubUpgradeUser.businessLicense==null){
                 _self.businessflag = true;
                      setTimeout(function () {
                             _self.businessflag = false;
@@ -161,26 +161,26 @@ var upgradePage = new Vue({
             }
                 if (_self.loginLoading) { return false; }
                 this.$nextTick(function() {
-                    _self.clubUpgradeUser.mainpro = _self.userMainPros.join("/");
+                    _self.clubUpgradeUser.mainProduct = _self.userMainPros.join("/");
                 var  params= {
-                        userID:_self.clubUpgradeUser.userID,
-                        clubID:_self.clubUpgradeUser.clubID,				//会所ID
+                        userId:_self.clubUpgradeUser.userId,
+                        clubId:_self.clubUpgradeUser.clubId,				//会所Id
                         name:_self.clubUpgradeUser.name,
-                        linkMan1:_self.clubUpgradeUser.linkMan1,
-                        sname:_self.clubUpgradeUser.sname,
-                        contractEmail1:_self.clubUpgradeUser.contractEmail1,
-                        provinceID:_self.clubUpgradeUser.provinceID,
-                        cityID:_self.clubUpgradeUser.cityID,
-                        townID:_self.clubUpgradeUser.townID,
+                        linkMan:_self.clubUpgradeUser.linkMan,
+                        shortName:_self.clubUpgradeUser.shortName,
+                        contractEmail:_self.clubUpgradeUser.contractEmail,
+                        provinceId:_self.clubUpgradeUser.provinceId,
+                        cityId:_self.clubUpgradeUser.cityId,
+                        townId:_self.clubUpgradeUser.townId,
                         address:_self.clubUpgradeUser.address,
                         socialCreditCode:_self.clubUpgradeUser.socialCreditCode,
-                        businessLicenseImage:_self.clubUpgradeUser.businessLicenseImage,
-                        headpic:_self.clubUpgradeUser.headpic,
+                        businessLicense:_self.clubUpgradeUser.businessLicense,
+                        shopPhoto:_self.clubUpgradeUser.shopPhoto,
                         firstClubType:_self.clubUpgradeUser.firstClubType, //机构类型分类 医美:0和生美:1
                         secondClubType:_self.clubUpgradeUser.secondClubType,	//机构类型二级分类 诊所:1,门诊:2,医院:3
                         department:_self.clubUpgradeUser.department,				//科室
-                        medicalPracticeLicenseImg:_self.clubUpgradeUser.medicalPracticeLicenseImg,//资质图片
-                        mainpro:_self.clubUpgradeUser.mainpro,
+                        medicalPracticeLicense:_self.clubUpgradeUser.medicalPracticeLicense,//资质图片
+                        mainProduct:_self.clubUpgradeUser.mainProduct,
                     };
                      console.log(params)
                     _self.loginLoading = true;
@@ -250,7 +250,7 @@ var upgradePage = new Vue({
             var file = inputDOM.files;
             _this.formData.append('file', file[0]);
             PublicApi.uploadimg(_this.formData,function(response){
-                _this.clubUpgradeUser.businessLicenseImage = response.data;
+                _this.clubUpgradeUser.businessLicense = response.data;
                 event.target.value = '';
             });
         },
@@ -260,7 +260,7 @@ var upgradePage = 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 = '';
             });
         },
@@ -270,18 +270,18 @@ var upgradePage = 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 = '';
         },
         // GetProvinceFn: function(){//获取全部省份
         //     var _this = this;
@@ -342,39 +342,39 @@ var upgradePage = new Vue({
         // },
         province:function () {
            var _this = this;
-           _this.clubUpgradeUser.provinceID = event.target.value;
-            if(_this.clubUpgradeUser.provinceID==0){//省为请选择时市区初始化
+           _this.clubUpgradeUser.provinceId = event.target.value;
+            if(_this.clubUpgradeUser.provinceId==0){//省为请选择时市区初始化
                 _this.cityArray=[];
                 _this.townArray=[];
-                _this.clubUpgradeUser.townID=0;
-                _this.clubUpgradeUser.cityID = 0;
+                _this.clubUpgradeUser.townId=0;
+                _this.clubUpgradeUser.cityId = 0;
             }else {
               _this.getcity();
-              _this.clubUpgradeUser.cityID = 0;
+              _this.clubUpgradeUser.cityId = 0;
             }
         },
         getcity:function(event){//加载市
            var _this = this;
-            PublicApi.GetCity({ provinceId: _this.clubUpgradeUser.provinceID },function(response){
+            PublicApi.GetCity({ provinceId: _this.clubUpgradeUser.provinceId },function(response){
                  if(response.code == 0 ){
                     _this.cityArray = response.data;
-                     _this.clubUpgradeUser.cityID = event.target.value;
-                     if(_this.clubUpgradeUser.cityID==0){
+                     _this.clubUpgradeUser.cityId = event.target.value;
+                     if(_this.clubUpgradeUser.cityId==0){
                            _this.townArray=[];
-                           _this.clubUpgradeUser.townID = 0;
+                           _this.clubUpgradeUser.townId = 0;
                      }else {
                          _this.getcTown();
-                          _this.clubUpgradeUser.townID = 0;
+                          _this.clubUpgradeUser.townId = 0;
                      }
                 }
             })
         },
          getcTown:function(event){
             var _this = this;
-            PublicApi.GetTown({cityId:_this.clubUpgradeUser.cityID},function(response){
+            PublicApi.GetTown({cityId:_this.clubUpgradeUser.cityId},function(response){
                 if(response.code == 0 ){
                     _this.townArray = response.data;
-                    _this.clubUpgradeUser.townID = event.target.value;
+                    _this.clubUpgradeUser.townId = event.target.value;
                 }else{
                     CAIMEI.Alert(response.msg, '确定', false);
                 }
@@ -396,8 +396,8 @@ var upgradePage = new Vue({
     mounted: function () {
         var _self = this;
         if(globalUserData){
-            _self.clubUpgradeUser.userID = globalUserData.userId;
-            _self.clubUpgradeUser.clubID = globalUserData.clubId;
+            _self.clubUpgradeUser.userId = globalUserData.userId;
+            _self.clubUpgradeUser.clubId = globalUserData.clubId;
             _self.infoInformationData();
         }
         PublicApi.GetProvince({},function(response){ //省份

src/main/resources/templates/account/bind.html

@@ -20,7 +20,7 @@
         </div>
         <div class="registerClub clear">
             <form>
-                <div class="title">机构账号</div>
+                <div class="title">公司账号</div>
                 <div class="formLine">
                     <p><em>*</em>账号：</p>
                     <input class="mobileOrEmail" type="text" v-model.trim="user.mobileOrEmail" placeholder="请输入邮箱/手机号" :rule="rule.mobileOrEmail" maxlength="50" @blur="blurHandle($event)" needverify>
@@ -48,7 +48,7 @@
                 </div>
                 <div class="formLine code">
                     <p><em>*</em>短信验证码：</p>
-                    <input type="text" v-model.trim="user.verificationCode" autocomplete="off" placeholder="请输入短信验证码" :rule="rule.code"  maxlength="6" @blur="blurHandle($event)" needverify>
+                    <input type="text" v-model.trim="user.smsCode" autocomplete="off" placeholder="请输入短信验证码" :rule="rule.code"  maxlength="6" @blur="blurHandle($event)" needverify>
                     <i class="checked icon mIcon"></i>
                     <span class="errTips icon mIcon" tips="请输入有效短信验证码"></span>
                     <a class="getCode" href="javascript:void(0);" @click="getMobileImage" :class="[isMobileDisabled  ? 'disabled' : '']">{{ mobileCodeText }}</a>

src/main/resources/templates/account/components/header.html

@@ -10,6 +10,6 @@
             <p class="accountLogin">已有账号？请直接<a href="/login.html">登录</a></p>
         </div>
     </div>
-    <input type="hidden" th:value="${spiServer}" id="spiServer">
+    <input type="hidden" th:value="${spiServer}" id="spiServer"><input type="hidden" th:value="${coreServer}" id="coreServer">
     <input type="hidden" th:value="${agent}" id="userAgent">
 </header>

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

@@ -43,7 +43,7 @@
                     </div>
                     <div class="formLine code">
                         <p><em>*</em>短信验证码：</p>
-                        <input type="text" v-model.trim="supplierUser.mobileCode" placeholder="请输入短信验证码" :rule="rule.code" maxlength="6" @blur="blurHandle($event)" needverify>
+                        <input type="text" v-model.trim="supplierUser.smsCode" placeholder="请输入短信验证码" :rule="rule.code" maxlength="6" @blur="blurHandle($event)" needverify>
                         <i class="checked icon mIcon"></i>
                         <span class="errTips icon mIcon" tips="请输入有效短信验证码"></span>
                         <a class="getCode" href="javascript:void(0);" @click="getMobileImage" :class="[isMobileDisabled  ? 'disabled' : '']">{{mobileCodeText}}</a>
@@ -83,7 +83,7 @@
                     <h6 class="tit">详细信息</h6>
                     <div class="formLine">
                         <p>公司简称：</p>
-                        <input type="text" v-model.trim="supplierUser.sname" placeholder="请输入公司简称" maxlength="10">
+                        <input type="text" v-model.trim="supplierUser.shortName" placeholder="请输入公司简称" maxlength="10">
                         <span class="errTips"></span>
                     </div>
                     <div class="formLine">
@@ -113,8 +113,8 @@
                     <div class="formLine clear">
                         <div class="form-upload">
                             <p><em>*</em>营业执照图片：</p>
-                            <div class="form-upload-image" v-if="supplierUser.businessLicenseImage!=''">
-                                <img class="upload-img" :src="supplierUser.businessLicenseImage" alt="" id="businessLicenseImage" @click="showViewerImageFn()">
+                            <div class="form-upload-image" v-if="supplierUser.businessLicense!=''">
+                                <img class="upload-img" :src="supplierUser.businessLicense" alt="" id="businessLicenseImage" @click="showViewerImageFn()">
                                 <i class="icon mIcon" @click="deleteBusinessImage()"></i>
                             </div>
                             <div class="formLine-file" v-else id="formbusinessLicenseImage">

src/main/resources/templates/account/supplier-information.html

@@ -44,15 +44,15 @@
                     </div>
                     <div class="formLine">
                         <p><em>*</em>联系地址：</p>
-                        <select name="provinceID" id="cProvince" @change="ChangeProvince"  v-model="supplierUser.provinceID">
+                        <select name="provinceID" id="cProvince" @change="ChangeProvince"  v-model="supplierUser.provinceId">
                             <option value="0">请选择</option>
                             <option v-for="(item ,index) in ProvinceList" :key="index" :value='item.provinceID'>{{item.name}}</option>
                         </select>
-                        <select name="cityID" id="cCity" @change="ChangeGetcity($event)" v-model="supplierUser.cityID">
+                        <select name="cityID" id="cCity" @change="ChangeGetcity($event)" v-model="supplierUser.cityId">
                             <option value="0">请选择</option>
                             <option v-for="(item ,index) in cityArray" :key="index" :value="item.cityID" >{{item.name}}</option>
                         </select>
-                        <select name="townID" id="cTown" @change="ChangeGetcTown($event)" v-model="supplierUser.townID">
+                        <select name="townID" id="cTown" @change="ChangeGetcTown($event)" v-model="supplierUser.townId">
                             <option value="0">请选择</option>
                             <option v-for="(item ,index) in townArray" :key="index" :value="item.townID"  >{{item.name}}</option>
                         </select>
@@ -69,8 +69,8 @@
                     <div class="formLine clear">
                         <div class="form-upload">
                             <p><em>*</em>营业执照图片：</p>
-                            <div class="form-upload-image" v-if="supplierUser.businessLicenseImage!=''&&supplierUser.businessLicenseImage!=null">
-                                <img class="upload-img" :src="supplierUser.businessLicenseImage" alt="" id="businessLicenseImage" @click="showViewerImageFn()">
+                            <div class="form-upload-image" v-if="supplierUser.businessLicense!=''&&supplierUser.businessLicense!=null">
+                                <img class="upload-img" :src="supplierUser.businessLicense" alt="" id="businessLicenseImage" @click="showViewerImageFn()">
                                 <i class="icon mIcon" @click="deleteBusinessImage()"></i>
                             </div>
                             <div class="formLine-file" v-else id="formbusinessLicenseImage">

src/main/resources/templates/article/components/article-header.html

@@ -22,6 +22,6 @@
     </div>
     <input type="hidden" th:value="${labelId}" id="labelId">
     <input type="hidden" th:value="${typeId}" id="typeId">
-    <input type="hidden" th:value="${spiServer}" id="spiServer">
+    <input type="hidden" th:value="${spiServer}" id="spiServer"><input type="hidden" th:value="${coreServer}" id="coreServer">
     <input type="hidden" th:value="${agent}" id="userAgent">
 </header>

src/main/resources/templates/components/header.html

@@ -195,6 +195,6 @@
             </div>
         </div>
     </div>
-    <input type="hidden" th:value="${spiServer}" id="spiServer">
+    <input type="hidden" th:value="${spiServer}" id="spiServer"><input type="hidden" th:value="${coreServer}" id="coreServer">
     <input type="hidden" th:value="${agent}" id="userAgent">
 </header>

src/main/resources/templates/document/details.html

@@ -24,7 +24,7 @@
                 </div>
             </div>
         </div>
-        <input type="hidden" th:value="${spiServer}" id="spiServer">
+        <input type="hidden" th:value="${spiServer}" id="spiServer"><input type="hidden" th:value="${coreServer}" id="coreServer">
         <input type="hidden" th:value="${agent}" id="userAgent">
     </div>
     <div class="document-content">

src/main/resources/templates/document/list.html

@@ -23,7 +23,7 @@
                 </div>
             </div>
         </div>
-        <input type="hidden" th:value="${spiServer}" id="spiServer">
+        <input type="hidden" th:value="${spiServer}" id="spiServer"><input type="hidden" th:value="${coreServer}" id="coreServer">
         <input type="hidden" th:value="${agent}" id="userAgent">
     </div>
     <div class="document-content clear">

src/main/resources/templates/document/login.html

@@ -17,7 +17,7 @@
                 <span>采美资料库</span>
             </div>
         </div>
-        <input type="hidden" th:value="${spiServer}" id="spiServer">
+        <input type="hidden" th:value="${spiServer}" id="spiServer"><input type="hidden" th:value="${coreServer}" id="coreServer">
         <input type="hidden" th:value="${agent}" id="userAgent">
     </header>
     <div class="login-contailer">

src/main/resources/templates/document/more-content.html

@@ -23,7 +23,7 @@
                 </div>
             </div>
         </div>
-        <input type="hidden" th:value="${spiServer}" id="spiServer">
+        <input type="hidden" th:value="${spiServer}" id="spiServer"><input type="hidden" th:value="${coreServer}" id="coreServer">
         <input type="hidden" th:value="${agent}" id="userAgent">
     </div>
     <div class="document-content">

src/main/resources/templates/pay/caimei-pay.html

@@ -10,7 +10,7 @@
     <div class="inner clear">
         <div class="logo"><a href="/index.html"><img src="/img/base/index_logo.png" alt=""></a></div>
         <div class="text">生美/医美采购服务平台</div>
-        <input type="hidden" th:value="${spiServer}" id="spiServer">
+        <input type="hidden" th:value="${spiServer}" id="spiServer"><input type="hidden" th:value="${coreServer}" id="coreServer">
         <input type="hidden" th:value="${agent}" id="userAgent">
     </div>
 </div>

src/main/resources/templates/pay/caimei-paymobile.html

@@ -10,7 +10,7 @@
     <div class="inner clear">
         <div class="logo"><a href="/index.html"><img src="/img/base/index_logo.png" alt=""></a></div>
         <div class="text">收银台</div>
-        <input type="hidden" th:value="${spiServer}" id="spiServer">
+        <input type="hidden" th:value="${spiServer}" id="spiServer"><input type="hidden" th:value="${coreServer}" id="coreServer">
         <input type="hidden" th:value="${agent}" id="userAgent">
     </div>
 </div>

src/main/resources/templates/pay/caimei-starspay.html

@@ -10,7 +10,7 @@
     <div class="inner clear">
         <div class="logo"><a href="/index.html"><img src="/img/base/index_logo.png" alt=""></a></div>
         <div class="text">生美/医美采购服务平台</div>
-        <input type="hidden" th:value="${spiServer}" id="spiServer">
+        <input type="hidden" th:value="${spiServer}" id="spiServer"><input type="hidden" th:value="${coreServer}" id="coreServer">
         <input type="hidden" th:value="${agent}" id="userAgent">
     </div>
 </div>

src/main/resources/templates/pay/caimei-success.html

@@ -12,7 +12,7 @@
     <div class="inner clear">
         <div class="logo"><a href="/index.html"><img src="/img/base/index_logo.png" alt=""></a></div>
         <div class="text">收银台</div>
-        <input type="hidden" th:value="${spiServer}" id="spiServer">
+        <input type="hidden" th:value="${spiServer}" id="spiServer"><input type="hidden" th:value="${coreServer}" id="coreServer">
         <input type="hidden" th:value="${agent}" id="userAgent">
     </div>
 </div>

src/main/resources/templates/pay/caimei-wechatpay.html

@@ -9,7 +9,7 @@
 <body>
 <!-- 引用头部 -->
 <div class="head-wrap">
-    <input type="hidden" th:value="${spiServer}" id="spiServer">
+    <input type="hidden" th:value="${spiServer}" id="spiServer"><input type="hidden" th:value="${coreServer}" id="coreServer">
     <input type="hidden" th:value="${agent}" id="userAgent">
 </div>
 <div class="pay-container  clearfix" id="payContainer" :class="isRequest? 'active' : ''">

src/main/resources/templates/product/qualityauthorize.html

@@ -9,7 +9,7 @@
 <body>
 <!--美博会专题-->
 <div class="container" id="qualityAuthorize" v-cloak>
-    <input type="hidden" th:value="${spiServer}" id="spiServer">
+    <input type="hidden" th:value="${spiServer}" id="spiServer"><input type="hidden" th:value="${coreServer}" id="coreServer">
     <input type="hidden" th:value="${agent}" id="userAgent">
     <div class="container-header clear">
         <div class="header-top" v-if="isPC">采美正品联盟</div>

src/main/resources/templates/supplier-center/order/sales-list.html

@@ -10,7 +10,7 @@
 <body>
 <!-- 引用头部 -->
 <div>
-    <input type="hidden" th:value="${spiServer}" id="spiServer">
+    <input type="hidden" th:value="${spiServer}" id="spiServer"><input type="hidden" th:value="${coreServer}" id="coreServer">
     <input type="hidden" th:value="${agent}" id="userAgent">
 </div>
 <!-- 我的采美 -->

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

@@ -32,7 +32,7 @@
                         <div class="title">注册信息</div>
                         <div class="formLine">
                             <p><em>*</em>联系人：</p>
-                            <input type="text" v-model.trim="clubUpgradeUser.linkMan1" placeholder="请输入联系人姓名" :rule="rule.name" maxlength="6" @blur="blurHandle($event)" needverify>
+                            <input type="text" v-model.trim="clubUpgradeUser.linkMan" placeholder="请输入联系人姓名" :rule="rule.name" maxlength="6" @blur="blurHandle($event)" needverify>
                             <i class="checked icon mIcon"></i>
                             <span class="errTips icon mIcon" tips="请输入正确的联系人姓名"></span>
                         </div>
@@ -49,26 +49,26 @@
                             </div>
                             <div class="formLine">
                                 <p><em>*</em>邮箱：</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>
                             <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>
                                 <div class="address">
-                                    <select name="provinceID" id="cProvince" @change="ChangeProvince" v-model="clubUpgradeUser.provinceID">
+                                    <select name="provinceID" id="cProvince" @change="ChangeProvince" v-model="clubUpgradeUser.provinceId">
                                         <option value="" >请选择</option>
                                         <option v-for="(item ,index) in ProvinceList" :key="index" :value='item.provinceID' >{{item.name}}</option>
                                     </select>
-                                    <select name="cityID" id="cCity" @change="ChangeGetcity($event)" v-model="clubUpgradeUser.cityID">
+                                    <select name="cityID" id="cCity" @change="ChangeGetcity($event)" v-model="clubUpgradeUser.cityId">
                                         <option value="" >请选择</option>
                                         <option v-for="(item ,index) in cityArray" :key="index" :value="item.cityID" >{{item.name}}</option>
                                     </select>
-                                    <select name="townID" id="cTown" @change="ChangeGetcTown($event)" v-model="clubUpgradeUser.townID">
+                                    <select name="townID" id="cTown" @change="ChangeGetcTown($event)" v-model="clubUpgradeUser.townId">
                                         <option value="" >请选择</option>
                                         <option v-for="(item ,index) in townArray" :key="index" :value="item.townID"  >{{item.name}}</option>
                                     </select>
@@ -84,8 +84,8 @@
                             <div class="formLine clear">
                                 <div class="form-upload">
                                     <p><em>*</em>营业执照图片：</p>
-                                    <div class="form-upload-image" v-if="clubUpgradeUser.businessLicenseImage!=''&&clubUpgradeUser.businessLicenseImage!=null">
-                                        <img class="upload-img" :src="clubUpgradeUser.businessLicenseImage" alt="" id="businessLicenseImage" @click="showViewerImageFn()">
+                                    <div class="form-upload-image" v-if="clubUpgradeUser.businessLicense!=''&&clubUpgradeUser.businessLicense!=null">
+                                        <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">
@@ -102,8 +102,8 @@
                             <div class="formLine clear">
                                 <div class="form-upload">
                                     <p>门头照：</p>
-                                    <div class="form-upload-image" v-if="clubUpgradeUser.headpic!=''&&clubUpgradeUser.headpic!=null">
-                                        <img class="upload-img" :src="clubUpgradeUser.headpic" alt="" id="uploadMentuzImage" @click="showViewerImageFn1()">
+                                    <div class="form-upload-image" v-if="clubUpgradeUser.shopPhoto!=''&&clubUpgradeUser.shopPhoto!=null">
+                                        <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>
@@ -127,8 +127,8 @@
                             <div v-show="clubUpgradeUser.firstClubType == 1" class="formLine">
                                 <div class="form-upload">
                                     <p>资质：</p>
-                                    <div class="form-upload-image" v-if="clubUpgradeUser.medicalPracticeLicenseImg!=''&&clubUpgradeUser.medicalPracticeLicenseImg!=null">
-                                        <img class="upload-img" :src="clubUpgradeUser.medicalPracticeLicenseImg" alt="" id="medicalPracticeLicenseImg" @click="showViewerImageFn2()">
+                                    <div class="form-upload-image" v-if="clubUpgradeUser.medicalPracticeLicense!=''&&clubUpgradeUser.medicalPracticeLicense!=null">
+                                        <img class="upload-img" :src="clubUpgradeUser.medicalPracticeLicense" alt="" id="medicalPracticeLicenseImg" @click="showViewerImageFn2()">
                                         <i class="icon mIcon" @click="deleteMedicalImage()"></i>
                                     </div>
                                     <div class="formLine-file" v-else>

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

@@ -34,7 +34,7 @@
                         <form>
                             <div class="formLine">
                                 <p><em>*</em>邮箱：</p>
-                                <input type="text" v-model.trim="clubUpgradeUser.contractEmail1" placeholder="请输入邮箱地址" :rule="rule.email" maxlength="50" @blur="blurHandle($event)" needverify>
+                                <input type="text" v-model.trim="clubUpgradeUser.contractEmail" placeholder="请输入邮箱地址" :rule="rule.email" maxlength="50" @blur="blurHandle($event)" needverify>
                                 <i class="checked icon mIcon"></i>
                                 <span class="errTips icon mIcon" tips="请输入正确的邮箱地址"></span>
                             </div>
@@ -46,20 +46,20 @@
                             </div>
                             <div class="formLine">
                                 <p>机构简称：</p>
-                                <input type="text" v-model.trim="clubUpgradeUser.sname" placeholder="请输入机构简称" :rule="rule.name" maxlength="50" needverify>
+                                <input type="text" v-model.trim="clubUpgradeUser.shortName" placeholder="请输入机构简称" :rule="rule.name" maxlength="50" needverify>
                             </div>
                             <div class="formLine">
                                 <p><em>*</em>联系地址：</p>
                                 <div class="address">
-                                    <select name="provinceID" id="cProvince" @change="province" v-model="clubUpgradeUser.provinceID">
+                                    <select name="provinceID" id="cProvince" @change="province" v-model="clubUpgradeUser.provinceId">
                                         <option value="0" >请选择</option>
                                         <option v-for="(item ,index) in provinceArray" :key="index" :value='item.provinceID' >{{item.name}}</option>
                                     </select>
-                                    <select name="cityID" id="cCity" @change="getcity($event)" v-model="clubUpgradeUser.cityID">
+                                    <select name="cityID" id="cCity" @change="getcity($event)" v-model="clubUpgradeUser.cityId">
                                         <option value="0" >请选择</option>
                                         <option v-for="(item ,index) in cityArray" :key="index" :value="item.cityID" >{{item.name}}</option>
                                     </select>
-                                    <select name="townID" id="cTown" @change="getcTown($event)" v-model="clubUpgradeUser.townID">
+                                    <select name="townID" id="cTown" @change="getcTown($event)" v-model="clubUpgradeUser.townId">
                                         <option value="0" >请选择</option>
                                         <option v-for="(item ,index) in townArray" :key="index" :value="item.townID"  >{{item.name}}</option>
                                     </select>
@@ -70,13 +70,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!=''&&clubUpgradeUser.businessLicenseImage!=null">
-                                        <img class="upload-img" :src="clubUpgradeUser.businessLicenseImage" alt="" id="businessLicenseImage" @click="showViewerImageFn()">
+                                    <div class="form-upload-image" v-if="clubUpgradeUser.businessLicense!=''&&clubUpgradeUser.businessLicense!=null">
+                                        <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>
@@ -93,8 +93,8 @@
                             <div class="formLine clear">
                                 <div class="form-upload">
                                     <p>门头照：</p>
-                                    <div class="form-upload-image" v-if="clubUpgradeUser.headpic!='' && clubUpgradeUser.headpic!=null">
-                                        <img class="upload-img" :src="clubUpgradeUser.headpic" alt="" id="uploadMentuzImage" @click="showViewerImageFn1()">
+                                    <div class="form-upload-image" v-if="clubUpgradeUser.shopPhoto!='' && clubUpgradeUser.shopPhoto!=null">
+                                        <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>
@@ -118,8 +118,8 @@
                             <div v-show="clubUpgradeUser.firstClubType == 1" class="formLine">
                                 <div class="form-upload">
                                     <p>资质：</p>
-                                    <div class="form-upload-image" v-if="clubUpgradeUser.medicalPracticeLicenseImg!=''&&clubUpgradeUser.medicalPracticeLicenseImg!=null">
-                                        <img class="upload-img" :src="clubUpgradeUser.medicalPracticeLicenseImg" alt="" id="medicalPracticeLicenseImg" @click="showViewerImageFn2()">
+                                    <div class="form-upload-image" v-if="clubUpgradeUser.medicalPracticeLicense!=''&&clubUpgradeUser.medicalPracticeLicense!=null">
+                                        <img class="upload-img" :src="clubUpgradeUser.medicalPracticeLicense" alt="" id="medicalPracticeLicenseImg" @click="showViewerImageFn2()">
                                         <i class="icon mIcon" @click="deleteMedicalImage()"></i>
                                     </div>
                                     <div class="formLine-file" v-else>

src/main/resources/templates/we_chat/redirect_uri.html

@@ -6,7 +6,7 @@
     <template th:replace="components/head-link"></template>
 </head>
 <body>
-<input type="hidden" th:value="${spiServer}" id="spiServer">
+<input type="hidden" th:value="${spiServer}" id="spiServer"><input type="hidden" th:value="${coreServer}" id="coreServer">
 <input type="hidden" th:value="${agent}" id="userAgent">
 <template th:replace="components/foot-link"></template>
 <script charset="utf-8" type="text/javascript">