Merge remote-tracking branch 'remotes/origin/developer' into developerB

# Conflicts:
#	src/main/resources/config/dev/application-dev.yml
#	src/main/resources/static/js/common/ajax.service.js
#	src/main/resources/templates/product/qualityauthorize.html

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/beta/application-beta.yml

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

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

@@ -53,7 +53,9 @@ logging:
 # 服务域名
 caimei:
   siteEnv: 0 #网站环境，（2：正式环境，1：测试环境，0：开发环境）
-  spiServer: http://192.168.2.81:8008
+  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/config/prod/application-prod.yml

@@ -50,6 +50,7 @@ logging:
 caimei:
   siteEnv: 2 #网站环境，（2：正式环境，1：测试环境，0：开发环境）
   spiServer: https://spi.caimei365.com
+  coreServer: https://core.caimei365.com
   imageDomain: https://img.caimei365.com
   wwwDomain: https://www.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}$)',
@@ -43,12 +44,12 @@ var bindPage = new Vue({
                             account: response.data.account,
                             email: response.data.email,
                             phone: response.data.bindMobile,
-                            name: response.data.name,
+                            name: response.data.name ? response.data.name : response.data.userName,
                             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
@@ -68,7 +69,6 @@ var bindPage = new Vue({
                 }
             });
         },
-
         getMobileImage:function() {//获取图形验证码
             var _self = this;
             var mobile = verifyCheack('.mobileOrEmail');
@@ -91,13 +91,18 @@ var bindPage = new Vue({
         },
         getMobileCodeFn:function(){//机构注册获取注册短信验证码
             var _self = this;
+            if(_self.imageCode == ''){
+                CAIMEI.dialog('请输入图形验证码',false,function () {});
+                return
+            }
             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 +150,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

@@ -24,6 +24,11 @@ var loginPage = new Vue({
             permission: '',
             token: ''
         },
+        applyUse:{
+            clubId: '',
+            shopId: '',
+            token:'',
+        },
         isWeChat: false,
         text:'',
         stautsfalse:false,
@@ -38,8 +43,7 @@ var loginPage = new Vue({
         },
         information:function(){
             window.location.href='/supplier/information.html';
-            this.setStorages( this.userData);
-
+            this.SetSoragesInfo( this.applyUse);
         },
         toQrCodeLogin: function(){//切换微信登录二维码
             var _self = this;
@@ -49,9 +53,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 +66,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 +96,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);
                         // 登录成功页面跳转
@@ -114,20 +119,35 @@ var loginPage = new Vue({
                             location.href="/index.html";
                         }
                     }else if(response.code == -4){
-                        window.location.href = '/bind.html';
+                        _self.userData = {
+                            account: response.data.account,
+                            email: response.data.email,
+                            phone: response.data.bindMobile,
+                            name: response.data.name ? response.data.name : response.data.userName,
+                            userName: response.data.userName,
+                            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,
+                            unionId:response.data.unionId
+                        };
+                        _self.setStorages( _self.userData);
+                        setTimeout(function(){
+                            window.location.href = '/bind.html';
+                        },1000);
                     }else if(response.code == '-3'){//审核未通过
                         _self.text ='您的供应商账号审核未通过，原因：图片模糊，营业执照错误，审核人员在后台填写的内容';
                         _self.stautsfalse = true;
                         _self.infofalse = true;
-                        _self.userData = {
-                            userId: response.data.userID,
-                            spId: response.data.serviceProviderID,
-                            clubId: response.data.clubID,
-                            shopId: response.data.shopID,
-                            userIdentity: response.data.userIdentity,
-                            permission: response.data.userPermission,
+                        _self.applyUse = {
+                            userId: response.data.userId,
+                            shopId: response.data.shopId,
                             token: response.data.token
                         };
+                        console.log(_self.applyUse);
                     }else if(response.code == '-2'){
                         _self.stautsfalse = true;
                         _self.text ='您的供应商账号正在加速审核中，审核通过后即可登录';
@@ -142,7 +162,7 @@ var loginPage = new Vue({
             if (this.isWeChat) {
                 // 微信浏览器自动授权登录
                 var urlForWeChat = 'https://www.caimei365.com/we_chat/redirect_uri.html';
-                $.get(spiServer+'/user/authorizationLink?mode=2&redirectUri='+urlForWeChat, function(r){
+                $.get(coreServer+'/user/login/auth/link?mode=2&redirectUri='+urlForWeChat, function(r){
                     if(r.code===0 && r.data){
                         setBaseCookie("weChatAutoLogin", 2);
                         window.location.href = r.data;
@@ -175,7 +195,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 +205,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
@@ -210,13 +230,9 @@ var loginPage = new Vue({
                         _self.text =response.msg;
                         _self.stautsfalse = true;
                         _self.infofalse = true;
-                        _self.userData = {
-                            userId: response.data.userID,
-                            spId: response.data.serviceProviderID,
-                            clubId: response.data.clubID,
-                            shopId: response.data.shopID,
-                            userIdentity: response.data.userIdentity,
-                            permission: response.data.userPermission,
+                        _self.applyUse = {
+                            userId: response.data.userId,
+                            shopId: response.data.shopId,
                             token: response.data.token
                         };
                     }else if(response.code == '-2'){
@@ -228,6 +244,9 @@ var loginPage = new Vue({
                 });
             });
         },
+        SetSoragesInfo:function(data){
+            localStorage.setItem('APPLY_INFO',JSON.stringify(data));
+        },
         setStorages:function(data){//存储本地数据
             localStorage.setItem('userInfo',JSON.stringify(data));
         }

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

@@ -21,22 +21,22 @@ var registerPage = new Vue({
             password2:''
         },
         clubUpgradeUser: {
-            userID:'',
-            clubID:'',
-            contractEmail1:'',
+            userId:'',
+            clubId:'',
+            contractEmail:'',
             name:'',
-            sname:'',
+            shortName:'',
             socialCreditCode:'',
-            mainPros:[],
-            businessLicenseImage:'',
-            headpic:'',
-            medicalPracticeLicenseImg:'',
-            firstClubType:'',
+            mainProduct:[],
+            businessLicense:'',
+            shopPhoto:'',
+            medicalPracticeLicense:'',
+            firstClubType:0,
             secondClubType:0,
             department:'',
-            provinceID :'',
-            cityID : '',
-            townID : '',
+            provinceId :'',
+            cityId : '',
+            townId : '',
         },
         userMainPros:[],
         formData:new FormData(),
@@ -44,9 +44,9 @@ var registerPage = new Vue({
         isAgree:false,
         isShowAgree:false,
         mentuzCampNullList:[
-            {value:'1',name:'整形'},
-            {value:'2',name:'轻医美'},
-            {value:'3',name:'皮肤科'},
+            {value:1,name:'整形'},
+            {value:2,name:'轻医美'},
+            {value:3,name:'皮肤科'},
         ],
         medicaCampNullList: [
             {name:'美容'},
@@ -101,8 +101,8 @@ var registerPage = new Vue({
                         bindMobile : _self.clubUser.phone,
                         password : _self.clubUser.password,
                         passWordConfirm : _self.clubUser.password2,
-                        activationCode : _self.clubUser.code,
-                        isAgreed :  _self.isAgreed,
+                        smsCode : _self.clubUser.code,
+                        isAgreed :  _self.isAgreed
                 };
                 _self.loginLoading = true;
                 UserApi.ClubRegister(params,function (response) {
@@ -141,8 +141,13 @@ var registerPage = new Vue({
         },
         getMobileCodeFn:function(){//机构注册获取注册短信验证码
             var _self = this;
+            if(_self.imageCode == ''){
+                CAIMEI.dialog('请输入图形验证码',false,function () {});
+                return
+            }
             var params = {
                     mobile:_self.clubUser.phone,
+                    isCheckCaptcha:0,
                     imgCode:_self.imageCode,
                     token:_self.codeImageToken,
                     activateCodeType:2,
@@ -182,16 +187,32 @@ var registerPage = new Vue({
             if (_self.loginLoading) { return false; }
             this.$nextTick(function() {
                 if (!pass) {return false;}
-                if(!_self.clubUpgradeUser.businessLicenseImage){
+                if(_self.clubUpgradeUser.cityId == ''){
+                    CAIMEI.dialog('请选择市级地区',false);
+                    return ;
+                }
+                if(_self.clubUpgradeUser.townId == ''){
+                    CAIMEI.dialog('请选择具体地区',false);
+                    return ;
+                }
+                if(!_self.clubUpgradeUser.businessLicense){
                     $('#formbusinessLicenseImage').parent().addClass("error").find('.checked').removeClass("show");
                     $('#formbusinessLicenseImage').siblings('.errTips').text('请上传营业执照图片').addClass("show");
+                    return  false;
                 }
                 if(!_self.clubUpgradeUser.firstClubType){
                     $('#firstClubType').parent().addClass("error");
                     $('#firstClubType').siblings('.errTips').text('请选择机构类型').addClass("show");
                     return  false;
                 }
-                _self.clubUpgradeUser.mainPros = _self.userMainPros.join("/");
+                if(Number(_self.clubUpgradeUser.firstClubType) == 1){
+                    if(!_self.clubUpgradeUser.medicalPracticeLicense){
+                        $('#formmedicalPracticeLicenseImage').parent().addClass("error").find('.checked').removeClass("show");
+                        $('#formmedicalPracticeLicenseImage').siblings('.errTips').text('请上传资质证书图片').addClass("show");
+                        return  false;
+                    }
+                }
+                _self.clubUpgradeUser.mainProduct = _self.userMainPros.join("/");
                 _self.loginLoading = true;
                 UserApi.ClubUpgrade(_self.clubUpgradeUser,function (response) {
                     if(response.code === 0){
@@ -208,21 +229,21 @@ 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;
-                    _self.clubUpgradeUser.clubID =  response.data.clubID;
+                    _self.clubUpgradeUser.userId =  response.data.userId;
+                    _self.clubUpgradeUser.clubId =  response.data.clubId;
                     _self.userData = {
                         account: response.data.account,
                         email: response.data.email,
                         phone: response.data.bindMobile,
-                        name: response.data.name,
+                        name: response.data.name ? response.data.name : response.data.userName,
                         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
@@ -296,8 +317,8 @@ var registerPage = new Vue({
             var file = inputDOM.files;
             _this.formData.append('file', file[0]);
             PublicApi.uploadimg(_this.formData,function(response){
-                _this.clubUpgradeUser.businessLicenseImage = response.data;
-                $('#formbusinessLicenseImage').parent().removeClass("error");
+                _this.clubUpgradeUser.businessLicense = response.data;
+                $('#formbusinessLicense').parent().removeClass("error");
                 $('#formbusinessLicenseImage').siblings('.errTips').removeClass("show");
                 event.target.value = '';
             });
@@ -308,7 +329,7 @@ var registerPage = new Vue({
             var file = inputDOM.files;
             _this.formData.append('file', file[0]);
             PublicApi.uploadimg(_this.formData,function(response){
-                _this.clubUpgradeUser.headpic = response.data;
+                _this.clubUpgradeUser.shopPhoto = response.data;
                 event.target.value = '';
             });
         },
@@ -318,18 +339,18 @@ var registerPage = new Vue({
             var file = inputDOM.files;
             _this.formData.append('file', file[0]);
             PublicApi.uploadimg(_this.formData,function(response){
-                _this.clubUpgradeUser.medicalPracticeLicenseImg = response.data;
+                _this.clubUpgradeUser.medicalPracticeLicense = response.data;
                 event.target.value = '';
             });
         },
         deleteBusinessImage:function(){//清楚营业执照图片
-            this.clubUpgradeUser.businessLicenseImage = '';
+            this.clubUpgradeUser.businessLicense = '';
         },
         deleteMentuzImage:function(){//清楚门头照图片
-            this.clubUpgradeUser.headpic = '';
+            this.clubUpgradeUser.shopPhoto = '';
         },
         deleteMedicalImage:function(){//清楚资质照图片
-            this.clubUpgradeUser.medicalPracticeLicenseImg = '';
+            this.clubUpgradeUser.medicalPracticeLicense = '';
         },
         setStorages:function(data){//存储本地数据
             localStorage.setItem('userInfo',JSON.stringify(data));
@@ -366,11 +387,11 @@ var registerPage = new Vue({
         ChangeProvince:function () {//选择省份
             var _this = this;
             _this.addressfrom.province = event.target.value;
-            _this.clubUpgradeUser.provinceID = event.target.value;
+            _this.clubUpgradeUser.provinceId = event.target.value;
             if(_this.addressfrom.province==''){//省为请选择时市区初始化
                 _this.cityArray=[];
                 _this.townArray=[];
-                _this.clubUpgradeUser.townID=''
+                _this.clubUpgradeUser.townId=''
             }else {
                 _this.ChangeGetcity();
             }
@@ -381,7 +402,7 @@ var registerPage = new Vue({
                 if(response.code == 0 ){
                     _this.cityArray = response.data;
                     _this.addressfrom.city = event.target.value;
-                    _this.clubUpgradeUser.cityID = event.target.value;
+                    _this.clubUpgradeUser.cityId = event.target.value;
                     if(_this.addressfrom.city==''){
                         _this.townArray=[];
                     }else {
@@ -397,8 +418,8 @@ var registerPage = new Vue({
             PublicApi.GetTown({ cityId: _this.addressfrom.city },function(response){
                 if(response.code == 0 ){
                     _this.townArray = response.data;
-                    _this.clubUpgradeUser.townID = event.target.value;
-                    console.log(_this.clubUpgradeUser.townID)
+                    _this.clubUpgradeUser.townId = event.target.value;
+                    console.log(_this.clubUpgradeUser.townId)
                 }else{
                     CAIMEI.Alert(response.msg,'确定',false);
                 }

src/main/resources/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:'',
+            contractEmail:'',
             name:'',
-            sname:'',
+            shortName:'',
             socialCreditCode:'',
-            businessLicenseImage:'',
-            provinceID :'',
-            cityID : '',
-            townID : '',
+            businessLicense:'',
+            provinceId :'',
+            cityId : '',
+            townId : '',
             address:'',
             firstShopType:'',
             secondShopType: '',
-            mainpro:'',
-            isAgreed:1,
+            mainProduct:'',
+            isAgreed:1
         },
         isAgree:true,
         isShowAgree:false,
@@ -57,34 +57,34 @@ 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;
                     _this.supplierUser.name = shop.name;
                     _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.contractEmail = shop.contractEmail;
+                    _this.supplierUser.shortName = shop.shortName;
+                    _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);
                 }
@@ -282,11 +282,9 @@ var registerPage = new Vue({
     },
     mounted: function () {
         var _self = this;
-        if(globalUserData) {
-            _self.supplierUser.userID = globalUserData.userId;
-            _self.supplierUser.shopID = globalUserData.shopId;
-        }
-        _self.infoData = JSON.parse(CAIMEI.Storage.getItem('userInfo'));
+        _self.infoData = JSON.parse(CAIMEI.Storage.getItem('APPLY_INFO'));
+        _self.supplierUser.userId =  _self.infoData.userId;
+        _self.supplierUser.shopId =  _self.infoData.shopId;
         _self.shopInfo();
         _self.GetProvinceFn();
     }

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,7 +12,9 @@
 var Http = {
         AjaxService : function(option){
             var NODE_ENV_BASE_URL = $("#spiServer").val();
-            console.log(NODE_ENV_BASE_URL);
+            if(option.isHost){
+                NODE_ENV_BASE_URL = $("#coreServer").val();
+            }
             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', 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/shop/apply', 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/dashboard.js

@@ -7,6 +7,7 @@
         formData:new FormData(),
         goodImage:'',
         shopinfo:{},
+        userInfo:{},
         promotions:{},
         rankingList:[],
         titleSshow:false,
@@ -24,6 +25,7 @@
                      _this.homeData = res.data;
                      _this.goodImage = _this.homeData.user.image;
                      _this.shopinfo = res.data.shop;
+                     _this.userInfo = res.data.user;
                      _this.promotions = res.data.promotions;
                      _this.rankingList = res.data.salesRankingList;
                      if (res.data.unReadMessageCount>99){

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

@@ -6,16 +6,16 @@
          loginLoading: false,
          isRequset:true,
         params:{
-            userID:'',
-            shopID:'',
-            townID:'',
-            provinceID: '',//省id
-            cityID: '',
+            userId:'',
+            shopId:'',
+            townId:'',
+            provinceId: '',//省id
+            cityId: '',
             address:'',
             name:'',//公司名称
-            sname:'',//公司简称
+            shortName:'',//公司简称
             linkMan:'',//联系人
-            email:'',//
+            contractEmail:'',//
             contractPhone:'',//固定电话
             fax:'',//传真
             legalPerson:'',//法人代表
@@ -29,24 +29,24 @@
             cityID: '',
         },
         params2:{
-            userID:'',
-            shopID:'',
+            userId:'',
+            shopId:'',
             firstShopType:'',//公司类型 1医疗  2非医疗
             secondShopType:'',//医疗下的二级分类
-            medicalPracticeLicenseImg1:'',//资质
-            mainpro:'',//主营产品
+            medicalPracticeLicense:'',//资质
+            mainProduct:'',//主营产品
             businessScope:'',//经营内容
-            info:'',//公司介绍
-            productDesc:'',//主打说明
+            shopDesc:'',//公司介绍
+            mainProductDesc:'',//主打说明
         },
         params3:{
             socialCreditCode:'',//营业执照编号
-            businessLicenseImage:'',//营业执照
+            businessLicense:'',//营业执照
             logo:'',//公司logo
             productionLicence:'',//生产
             hygienicLicense:'',//卫生
             taxLicense:'',//税务
-            certificateHonor:'',//荣誉
+            honorCertification:'',//荣誉
             productCertification:'',//产品
 
         },
@@ -118,19 +118,20 @@
     },
          shopInfo:function(){
             var _this = this;
-             SupplierApi.shopInfo({userId:_this.params.userID},function(res){
+            console.log()
+             SupplierApi.shopInfo({userId:_this.params.userId},function(res){
                 if(res.code==0){
                     _this.isRequset=false;
                     var shop = res.data.shop;
                     var user = res.data.user;
                     _this.params.name = shop.name;
-                    _this.params.sname = shop.sname;
+                    _this.params.shortName = shop.shortName;
                     _this.params.linkMan = shop.linkMan;
-                    _this.params.email = user.email;
+                    _this.params.contractEmail = user.contractEmail;
                     _this.params.address = shop.provincialAddress;
-                    _this.params.provinceID = shop.provinceID;
-                    _this.params.cityID = shop.cityID;
-                    _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;
@@ -141,20 +142,21 @@
                     // _this.shopScope = _this.setNewScope(shop.businessScope);
                     _this.params2.firstShopType = shop.firstShopType;
                     _this.params2.secondShopType = shop.secondShopType;
-                    _this.params2.medicalPracticeLicenseImg1 = shop.medicalPracticeLicenseImg1;
-                    _this.params2.info = shop.info;
-                    _this.params2.productDesc = shop.productDesc;
+                    _this.params2.medicalPracticeLicense = shop.medicalPracticeLicense;
+                    _this.params2.shopDesc = shop.shopDesc;
+                    _this.params2.mainProductDesc = shop.mainProductDesc;
                     _this.params3.socialCreditCode = shop.socialCreditCode;
-                    _this.params3.businessLicenseImage = shop.businessLicenseImage;
+                    _this.params3.businessLicense = shop.businessLicense;
                     _this.params3.logo = shop.logo;
                     _this.params3.productionLicence = shop.productionLicence;
                     _this.params3.hygienicLicense = shop.hygienicLicense;
                     _this.params3.taxLicense = shop.taxLicense;
-                    _this.params3.certificateHonor = shop.hygienicLicense;
-                    _this.HonorImagesList = res.data.certificateHonor;
-                    _this.productImagesList = res.data.productCertification;
-                    if(shop.mainpro != "" && shop.mainpro != null){
-							_this.mentuzCampNullList =  _this.setNewMainpro(shop.mainpro);
+                    _this.params3.honorCertification = shop.honorCertification;
+                    _this.params3.productCertification = shop.productCertification;
+                    _this.HonorImagesList = shop.honorCertification;
+                    _this.productImagesList = shop.productCertification;
+                    if(shop.mainpro != "" && shop.mainProduct != null){
+							_this.mentuzCampNullList =  _this.setNewMainpro(shop.mainProduct);
                             _this.mentuzCampNullList.forEach(function (item) {
                                 if(item.checked){
                                 _this.shopMainPros.push(item.name)
@@ -169,10 +171,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();
                     }
                 }
@@ -206,13 +208,12 @@
                 if(_self.tabCurrentIndex==1){
                     params = _self.params;
                 }else if(_self.tabCurrentIndex==2){
-                    _self.params2.mainpro = _self.shopMainPros.join("/");
+                    _self.params2.mainProduct = _self.shopMainPros.join("/");
                     _self.params2.businessScope = _self.shopScope.join("/");
                     params = _self.params2
                 }else if(_self.tabCurrentIndex==3){
                     params = _self.params3
                 }
-                console.log(params)
               SupplierApi.modifiedData(params,function (res) {
                      console.log(res)
                       if(res.code === 0){
@@ -263,7 +264,7 @@
             var file = inputDOM.files;
             _this.formData.append('file', file[0]);
             PublicApi.uploadimg(_this.formData,function(response){
-                _this.params2.medicalPracticeLicenseImg1 = response.data;
+                _this.params2.medicalPracticeLicense = response.data;
                 event.target.value = '';
             });
         },
@@ -273,7 +274,7 @@
             var file = inputDOM.files;
             _this.formData.append('file', file[0]);
             PublicApi.uploadimg(_this.formData,function(response){
-                _this.params3.businessLicenseImage = response.data;
+                _this.params3.businessLicense = response.data;
                 event.target.value = '';
             });
         },
@@ -324,7 +325,7 @@
             _this.formData.append('file', file[0]);
             PublicApi.uploadimg(_this.formData,function(response){
                _this.HonorImagesList.push(response.data);
-               _this.params3.certificateHonor =_this.HonorImagesList.toString()+',';
+               _this.params3.honorCertification =_this.HonorImagesList.toString()+',';
                 event.target.value = '';
             });
         },
@@ -352,15 +353,15 @@
             this.params3.logo = '';
         },
          deleteBusinessImage:function(){//删除营业执照图片
-            this.params3.businessLicenseImage = '';
+            this.params3.businessLicense = '';
         },
          deleteMedicalImage:function(){//删除医疗执照图片
-            this.params2.medicalPracticeLicenseImg1 = '';
+            this.params2.medicalPracticeLicense = '';
         },
         removeGoodsImagesFn: function(index){//删除荣誉图片
             var _this = this;
             _this.HonorImagesList.splice(index,1);
-            _this.params3.certificateHonor =_this.HonorImagesList.toString()+',';
+            _this.params3.honorCertification =_this.HonorImagesList.toString()+',';
          },
         removeproductImagesFn: function(index){//删除产品图片
             var _this = this;
@@ -373,42 +374,43 @@
         },
         checkedFn:function (index) {
             this.tabCurrentIndex = index;
+            console.log( this.tabCurrentIndex);
         },
          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 +435,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(),
@@ -69,9 +69,9 @@ var informationPage = new Vue({
         cityArray:[],
         townArray:[],
         addressfrom: {
-            provinceID: '',//省id
-            cityID: '',//市ID
-            townID: '',//地区ID
+            provinceId: '',//省id
+            cityId: '',//市ID
+            townId: '',//地区ID
             name:'请选择'
         },
         rule:{
@@ -95,32 +95,50 @@ 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.clubUpgradeUser.firstClubType = data.club.firstClubType;
-                    _self.clubUpgradeUser.secondClubType = data.club.secondClubType;
-                    _self.clubUpgradeUser.address = data.club.address;
-                    _self.userMainPros = _self.setNewMainpro(data.club.mainpro);
-                    console.log(_self.userMainPros);
+                    _self.bindMobile = data.user.bindMobile ? data.user.bindMobile : '';
+                    _self.userIdentity = data.user.userIdentity ? data.user.userIdentity : '';
+                    _self.addressfrom.clubId = data.user.clubId;
+                    _self.addressfrom.userId = data.user.userId;
+                    _self.addressfrom.contractEmail = data.user.contractEmail ? data.user.contractEmail : '';
+                    _self.addressfrom.provinceId = data.club.provinceId ? data.club.provinceId : 0;
+                    _self.addressfrom.cityId = data.club.cityId ? data.club.cityId : null;
+                    _self.addressfrom.townId = data.club.townId ? data.club.townId : null;
+                    _self.clubUpgradeUser.provinceId = data.club.provinceId ? data.club.provinceId : null;
+                    _self.clubUpgradeUser.cityId = data.club.cityId ? data.club.cityId : null;
+                    _self.clubUpgradeUser.townId= data.club.townId ? data.club.townId : null;
+                    _self.clubUpgradeUser.shopPhoto = data.club.shopPhoto ? data.club.shopPhoto : null;
+                    _self.clubUpgradeUser.businessLicense = data.club.businessLicense ? data.club.businessLicense : null;
+                    _self.clubUpgradeUser.firstClubType = data.club.firstClubType ? data.club.firstClubType : null;
+                    _self.clubUpgradeUser.secondClubType = data.club.secondClubType ? data.club.secondClubType :null;
+                    _self.clubUpgradeUser.address = data.club.address ? data.club.address : null;
+                    console.log('1111111111111111111');
+                    if( _self.clubUpgradeUser.firstClubType == 1){
+                        if(data.club.mainProduct){
+                            _self.userMainPros = _self.setNewMainpro(data.club.mainProduct);
+                            _self.medicaCampNullList = _self.setNewMainProduct(_self.userMainPros);
+                            console.log(_self.userMainPros)
+                        }else{
+                            _self.userMainPros = _self.medicaCampNullList;
+                        }
+                    }else{
+                        if(data.club.mainProduct){
+                            _self.userMainPros = _self.setNewMainpro(data.club.mainProduct);
+                            _self.mentuzCampNullList = _self.setNewMainProduct(_self.userMainPros);
+                            console.log(_self.userMainPros)
+                        }else{
+                            _self.userMainPros = _self.mentuzCampNullList;
+                        }
+                    }
                     _self.GetProvinceFn();
-                    _self.GetCtiyFn();
-                    _self.GetTownFn();
+                    if( _self.addressfrom.townId){
+                        _self.GetCtiyFn();
+                        _self.GetTownFn();
+                    }
                 }else{
                     CAIMEI.Alert(response.msg,'确定',false);
                 }
@@ -131,89 +149,89 @@ var informationPage = new Vue({
             var params ={};
             var pass = verifyForm();
              if (!pass) {return false;}
-             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){
-                _self.businessflag = true;
-                     setTimeout(function () {
-                            _self.businessflag = false;
-                        },2000)
-                return;
-            }
-             if(_self.clubUpgradeUser.firstClubType==''||_self.clubUpgradeUser.firstClubType==null){
-               _self.typeflag = true;
-               setTimeout(function () {
-                    _self.typeflag = false;
-                },2000)
-               return;
-            }
-            if(_self.clubUpgradeUser.firstClubType==1){
-                if(_self.clubUpgradeUser.secondClubType==''||_self.clubUpgradeUser.secondClubType==null){
-                    _self.secondtypeflag = true;
+            if(_self.userIdentity === 2) {
+                if (_self.clubUpgradeUser.townId == 0 || _self.clubUpgradeUser.address == '') {
+                    _self.flagshow = true;
                     setTimeout(function () {
-                    _self.secondtypeflag = false;
-                },2000)
+                        _self.flagshow = false;
+                    }, 2000)
                     return;
-            }
-            if(_self.userMainPros==''){
-                      _self.mproflag = true;
-                     setTimeout(function () {
-                        _self.mproflag = false;
-                    },2000)
-                     return;
                 }
-         }
-            if(_self.clubUpgradeUser.firstClubType==2){
-                if(_self.userMainPros ==''){
-                    _self.userMainProflag = true;
-                 setTimeout(function () {
-                    _self.userMainProflag = false;
-                },2000)
-                     return;
+                if (_self.clubUpgradeUser.businessLicense == '' || _self.clubUpgradeUser.businessLicense == null) {
+                    _self.businessflag = true;
+                    setTimeout(function () {
+                        _self.businessflag = false;
+                    }, 2000)
+                    return;
                 }
-            }
-            if (_self.loginLoading) { return false; }
-            this.$nextTick(function() {
-                _self.clubUpgradeUser.mainPros = _self.userMainPros.join("/");
-                if(_self.userIdentity === 4){
-                    params = {
-                        userID:_self.clubUpgradeUser.userID,
-                        clubID:_self.clubUpgradeUser.clubID,					//会所ID
-                        linkMan1:_self.clubUpgradeUser.linkMan1,
-                        fax:_self.clubUpgradeUser.fax,
-                        contractPhone:_self.clubUpgradeUser.contractPhone,
-                        info : _self.clubUpgradeUser.info,
+                if (_self.clubUpgradeUser.firstClubType == '' || _self.clubUpgradeUser.firstClubType == null) {
+                    _self.typeflag = true;
+                    setTimeout(function () {
+                        _self.typeflag = false;
+                    }, 2000);
+                    return;
+                }
+                if (_self.clubUpgradeUser.firstClubType == 1) {
+                    if (_self.clubUpgradeUser.secondClubType == '' || _self.clubUpgradeUser.secondClubType == null) {
+                        _self.secondtypeflag = true;
+                        setTimeout(function () {
+                            _self.secondtypeflag = false;
+                        }, 2000);
+                        return;
                     }
-                }else{
-                    params 	= {
-                        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,
-                        address:_self.clubUpgradeUser.address,
-                        socialCreditCode:_self.clubUpgradeUser.socialCreditCode,
-                        businessLicenseImage:_self.clubUpgradeUser.businessLicenseImage,
-                        headpic:_self.clubUpgradeUser.headpic,
-                        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,
-                        fax:_self.clubUpgradeUser.fax,
-                        contractPhone:_self.clubUpgradeUser.contractPhone,
-                        info : _self.clubUpgradeUser.info,
+                    if (_self.userMainPros == '') {
+                        _self.mproflag = true;
+                        setTimeout(function () {
+                            _self.mproflag = false;
+                        }, 2000);
+                        return;
+                    }
+                }
+                if (_self.clubUpgradeUser.firstClubType == 2) {
+                    if (_self.userMainPros == '') {
+                        _self.userMainProflag = true;
+                        setTimeout(function () {
+                            _self.userMainProflag = false;
+                        }, 2000);
+                        return;
                     }
                 }
+                _self.clubUpgradeUser.mainProduct = _self.userMainPros.join("/");
+                params = {
+                    userId: _self.clubUpgradeUser.userId,
+                    clubId: _self.clubUpgradeUser.clubId,				//会所Id
+                    name: _self.clubUpgradeUser.name,
+                    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,
+                    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,				//科室
+                    medicalPracticeLicense: _self.clubUpgradeUser.medicalPracticeLicense,//资质图片
+                    mainProduct: _self.clubUpgradeUser.mainProduct,
+                    fax: _self.clubUpgradeUser.fax,
+                    contractPhone: _self.clubUpgradeUser.contractPhone,
+                    profile: _self.clubUpgradeUser.profile
+                }
+            }else{
+                params = {
+                    userId:_self.clubUpgradeUser.userId,
+                    clubId:_self.clubUpgradeUser.clubId,					//会所Id
+                    linkMan:_self.clubUpgradeUser.linkMan,
+                    fax:_self.clubUpgradeUser.fax,
+                    contractPhone:_self.clubUpgradeUser.contractPhone,
+                    profile : _self.clubUpgradeUser.profile,
+                }
+            }
+            if (_self.loginLoading) { return false; }
+            this.$nextTick(function() {
                 _self.loginLoading = true;
                 UserApi.UpdateModifiedData(params,function (response) {
                     if(response.code === 0){
@@ -228,11 +246,25 @@ var informationPage = new Vue({
                 });
             });
         },
+        setNewMainProduct:function(arr){
+            var Array = [];
+            if(arr){
+                arr.forEach(function(item){
+                    var obj ={
+                        name:item,
+                    };
+                    Array.push(obj);
+                });
+            }
+            return Array
+        },
         setNewMainpro:function(arr){//回显处理主营内容
             var newArr = [];
-            arr.split('/').forEach(function(item){
-                newArr.push(item);
-            });
+            if(arr){
+                arr.split('/').forEach(function(item){
+                    newArr.push(item);
+                });
+            }
             return newArr
         },
         mainProAdd: function(){//添加主营
@@ -240,7 +272,8 @@ var informationPage = new Vue({
             if (_self.mainProEdit.length>0) {
                 if (_self.mainPros.indexOf(_self.mainProEdit)<0){
                     var obj = {name:_self.mainProEdit};
-                    if(_self.clubUpgradeUser.firstClubType === '0'){
+                    console.log(obj);
+                    if(_self.clubUpgradeUser.firstClubType === 2){
                         if(_self.checkedArray(_self.mainProEdit,_self.mentuzCampNullList)){
                             CAIMEI.dialog('主营内容已存在!',false);
                         }else {
@@ -274,7 +307,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 +317,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 +327,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 +363,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 +388,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 +402,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 +412,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,26 +5,25 @@ var upgradePage = new Vue({
         isRequset:true,
         loginLoading: false,
         clubUpgradeUser: {
-            userID:'',
-            clubID:'',
-            contractEmail1:'',
+            userId:'',
+            clubId:'',
+            contractEmail:'',
             name:'',
-            sname:'',
+            shortName:'',
             socialCreditCode:'',
-            mainpro:[],
-            businessLicenseImage:'',
-            headpic:'',
-            medicalPracticeLicenseImg:'',
-            firstClubType:'',
+            mainProduct:[],
+            businessLicense:'',
+            shopPhoto:'',
+            medicalPracticeLicense:'',
+            firstClubType:1,
             secondClubType:0,
             department:'',
-            provinceID :'',
-            cityID : '',
-            townID : '',
-            address:'',
+            provinceId :'',
+            cityId : '',
+            townId : '',
+            address:''
         },
         userMainPros:[],
-
         formData:new FormData(),
         mentuzCampNullList:[
             {value:'1',name:'整形'},
@@ -72,38 +71,59 @@ 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);
-                    console.log(_self.userMainPros);
-                    if(data.club.provinceID ==null){
-                         _self.clubUpgradeUser.provinceID = 0;
+                    if( _self.clubUpgradeUser.firstClubType == 1){
+                        if(data.club.mainProduct){
+                            _self.userMainPros = _self.setNewMainpro(data.club.mainProduct);
+                            _self.medicaCampNullList = _self.setNewMainProduct(_self.userMainPros);
+                            console.log(_self.userMainPros)
+                        }else{
+                            _self.userMainPros = _self.medicaCampNullList;
+                        }
+                    }else{
+                        if(data.club.mainProduct){
+                            _self.userMainPros = _self.setNewMainpro(data.club.mainProduct);
+                            _self.mentuzCampNullList = _self.setNewMainProduct(_self.userMainPros);
+                            console.log(_self.userMainPros)
+                        }else{
+                            _self.userMainPros = _self.mentuzCampNullList;
+                        }
+                    }
+                    if( _self.clubUpgradeUser.contractEmail){
+                        _self.clubUpgradeUser.name = data.club.name;
+                    }else{
+                        _self.clubUpgradeUser.name = '';
+                    }
+                    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 +133,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,28 +181,27 @@ 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,
-                        firstClubType:_self.clubUpgradeUser.firstClubType, //机构类型分类 医美:0和生美:1
-                        secondClubType:_self.clubUpgradeUser.secondClubType,	//机构类型二级分类 诊所:1,门诊:2,医院:3
+                        businessLicense:_self.clubUpgradeUser.businessLicense,
+                        shopPhoto:_self.clubUpgradeUser.shopPhoto,
+                        firstClubType:Number(_self.clubUpgradeUser.firstClubType), //机构类型分类 医美:0和生美:1
+                        secondClubType:Number(_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;
                     UserApi.ClubUpgrade(params,function (response) {
                         if(response.code === 0){
@@ -200,15 +219,25 @@ var upgradePage = new Vue({
         clubLoginIndex:function(){// 跳过升级直接去个人中心
             window.location.href = '/user/dashboard.html';
         },
+        setNewMainProduct:function(arr){
+            var Array = [];
+            if(arr){
+                arr.forEach(function(item){
+                    var obj ={
+                        name:item,
+                    };
+                    Array.push(obj);
+                });
+            }
+            return Array
+        },
         setNewMainpro:function(arr){//回显处理主营内容
             var newArr = [];
-            console.log(arr);
-            if (arr!=null){
-                 arr.split('/').forEach(function(item){
-                newArr.push(item);
-            });
+                if (arr!=null){
+                     arr.split('/').forEach(function(item){
+                    newArr.push(item);
+                });
             }
-
             return newArr
         },
         mainProAdd: function(){
@@ -216,17 +245,17 @@ var upgradePage = new Vue({
             if (_self.mainProEdit.length>0) {
                 if (_self.mainPros.indexOf(_self.mainProEdit)<0){
                     var obj = {name:_self.mainProEdit};
-                    if(_self.clubUpgradeUser.firstClubType === '0'){
-                        if(_self.checkedArray(_self.mainProEdit,_self.mentuzCampNullList)){
+                    if(Number(_self.clubUpgradeUser.firstClubType) == 1){
+                        if(_self.checkedArray(_self.mainProEdit,_self.medicaCampNullList)){
                             CAIMEI.dialog('主营内容已存在!',false);
                         }else {
-                            _self.mentuzCampNullList.push(obj);
+                            _self.medicaCampNullList.push(obj);
                         }
                     }else{
-                        if(_self.checkedArray(_self.mainProEdit,_self.medicaCampNullList)){
+                        if(_self.checkedArray(_self.mainProEdit,_self.mentuzCampNullList)){
                             CAIMEI.dialog('主营内容已存在!',false);
                         }else {
-                            _self.medicaCampNullList.push(obj);
+                            _self.mentuzCampNullList.push(obj);
                         }
                     }
                 }
@@ -250,7 +279,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 +289,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 +299,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 +371,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 +425,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-club.html

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

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

@@ -33,26 +33,26 @@
                     </div>
                     <div class="formLine">
                         <p>邮箱(<span>邮箱可用作登录账号，请使用公司邮箱或法人邮箱</span>)：</p>
-                        <input type="text" v-model.trim="supplierUser.email" placeholder="请输入邮箱地址" maxlength="40">
+                        <input type="text" v-model.trim="supplierUser.contractEmail" placeholder="请输入邮箱地址" maxlength="40">
                         <span class="errTips"></span>
                     </div>
                     <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">
                         <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

@@ -35,7 +35,7 @@
                 </li>
                 <li v-if="loginStatus" id="mGlobalMenu" @click="hideGlobalMenu()">
                     <a class="cTab" href="javascript:void(0);" v-if="userIdentity == 3" v-text="userData.name"></a>
-                    <a class="cTab" href="javascript:void(0);" v-else v-text="userData.userName"></a>
+                    <a class="cTab" href="javascript:void(0);" v-else v-text="userData.name"></a>
                     <div class="cShow" v-if="userIdentity == 4 || userIdentity == 2">
                         <a href="/user/dashboard.html">我的采美</a>
                         <a href="/user/setting/information.html">机构资料</a>
@@ -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

@@ -1,105 +1,175 @@
 <!DOCTYPE html>
 <html lang="zh-CN" xmlns:th="https://www.thymeleaf.org" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
       xsi:schemaLocation="https://www.thymeleaf.org ">
-<head><title>采美365网--采美正品联盟-正品授权-官方防伪网站</title>
+<head>
+    <title>采美365网--采美正品联盟-正品授权-官方防伪网站</title>
     <template th:replace="components/head-link"></template>
     <link th:href="@{/css/product/qualityauthorize.css(v=${version})}" rel="stylesheet" type="text/css">
 </head>
 <body>
-<input type="hidden" th:value="${spiServer}" id="spiServer">
-<input type="hidden" th:value="${agent}" id="userAgent">
-<div class="container" id="qualityAuthorize">
-    <template v-if="parameters">
-        <!-- 顶部logo区域 -->
-        <div class="container-header clear">
-            <div class="header-top">
-                <div class="inner">
-                    <div class="logo"><img src="/img/quality/icon-logo.png" alt=""></div>
+<!--美博会专题-->
+<div class="container" id="qualityAuthorize" v-cloak>
+    <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>
+        <div class="header-bottom" v-if="isPC">
+            <div class="inner">
+                <div class="logo">
+                    <a href="/index.html">
+                        <img src="/img/base/logo.png" alt="">
+                    </a>
                 </div>
-            </div>
-        </div>
-        <!-- 顶部logo区域end-->
-        <!-- 主体内容区域 -->
-        <div class="container-content">
-            <div class="container-main fl-clear">
-                <!-- 图片区域 -->
-                <div class="img-box">
-                    <img class="product-img" :src="parameters.image">
-                    <div class="origin-logo-box"><img class="product-brand" :src="parameters.authLogo"></div>
-                    <img class="product-authorize" src="/img/quality/pro-authorization.png">
-                    <img class="sq-book" @click="showSqBookModal" v-show="!isShowSqBookModal" :src="parameters.certificateImage">
-                </div>
-                <!-- 商品介绍区域 -->
-                <div class="product-desc">
-                <!-- 商品介绍区域 -->
-                    <h3>{{parameters.name}}</h3>
-                    <div class="pink-box">
-                        <div class="item-row"><span>品牌：{{parameters.brandName}}</span></div>
-                        <div class="fl-clear">
-                        <span class="fl-left">产地：{{parameters.productionPlace}}</span>
-                        <a class="fl-right" target="_blank" :href="parameters.securityLink" v-if="parameters.securityLink">防伪官网>></a></div>
+                <div class="header-right">
+                    <div class="header-nav">
+                        <a href="javascript:void(0)">
+                            <i class="icon icon-nav"></i>
+                            采美商城
+                        </a>
+                        <div class="header-nav-tabs">
+                            <div class="item-nav" v-for="(item, index) in tabsList"  :class="current==index?'addImg':''" :key="index">
+                                <a href="javascript:void(0)">{{ item.text }}</a>
+                            </div>
+                        </div>
                     </div>
-                    <!-- 代理声明区域-->
-                    <div class="default-box" v-if="parameters.agentFlag === 1">
-                        <div class="item-row"><span class="dls">代理商：</span><span>{{parameters.agentName}}</span></div>
-                        <div class="item-row statement">
-                        <!-- 链接 -->
-                        <a :href="parameters.statementLink" v-if="parameters.statementType === 2">代理声明</a>
-                        <!-- 弹窗 -->
-                        <a href="#" @click.prevent="openStatementDialog(1)" v-else>代理声明</a></div>
+                    <div class="header-use">
+                        <a href="javascript:void(0)">个人中心</a>
                     </div>
-                    <p>该仪器由{{parameters.agentName ? parameters.agentName : parameters.brandName}}授予{{parameters.authParty}}正品拥有</p>
-                    <div class="pink-box sn-number">
-                        <div class="item-row"><span>SN码：{{parameters.snCode | snCode}}</span></div>
+                </div>
+            </div>
+        </div>
+        <div class="header-bottom" v-if="!isPC">
+            <div class="bottom_nav">
+                <i class="mIcon icon_nav"></i>
+                <div class="header-nav-tabs">
+                    <div class="item-nav" v-for="(item, index) in tabsList"  :class="current==index?'addImg':''" :key="index">
+                        <a href="javascript:void(0)">{{ item.text }}</a>
                     </div>
                 </div>
             </div>
-            <div class="product-params">
-                <div class="title"><span>产品参数</span></div>
-                <!-- 手机端布局 -->
-                <table class="params mobile">
-                    <tbody>
-                    <tr v-for="(item , index) in parameters.paramList" :key="index">
-                        <td>{{item.name}}</td>
-                        <td>{{item.content}}</td>
-                    </tr>
-                    </tbody>
-                </table>
-                <!-- 电脑端布局 -->
-                <ul class="pc-params pc fl-clear">
-                    <li class="fl-clear" v-for="(item,index) in parameters.paramList" :key="index">
-                        <div class="p-title">{{item.name}}：</div>
-                        <div class="p-content">{{item.content}}</div>
-                    </li>
-                </ul>
+            <div class="bottom_logo">
+                <a href="/index.html">
+                    <img src="/img/base/logo.png" alt="">
+                </a>
+            </div>
+            <div class="bottom_use">
+                <i class="mIcon icon_nav"></i>
             </div>
         </div>
-        <!-- 底部声明 -->
-        <div class="footer">
-            <p><a href="#" @click.prevent="openStatementDialog">采美声明</a>&nbsp;|&nbsp;由采美信息技术提供技术支持</p>
-        </div>
-        <div class="footer-mobile">
-            <p><a href="#" @click.prevent="openStatementDialog">采美声明</a></p>
-            <p>— 由采美信息技术提供技术支持 —</p>
+        <div class="header-bottom-msg" v-if="!isPC">
+            <i class="mIcon icon-msg"></i>
+            <p>请仔细比对仪器上的序列号与SN码是否一致，您也可前往官方防伪网站查看更多信息。</p>
         </div>
-        <!--声明对话框-->
-        <div class="statementModel" v-show="showStatement" style="display: none">
-            <div class="model"><i class="close" @click="closeStatementModel"></i>
-                <!-- 标题 -->
-                <div class="title">代理声明</div>
-                <!-- 内容 -->
-                <div class="content">{{statementContent}}</div>
+    </div>
+    <div class="container-content clear">
+        <div class="inner">
+            <div class="content-top">
+                <div class="content-top-left">
+                    <div class="content-logo">
+                        <img src="/img/quality/logo.png" alt="">
+                    </div>
+                    <div class="content-mssg">
+                        <div class="mssg-name">上海品辉医疗正品授权</div>
+                        <div class="mssg-labels">
+                            <span>正品联盟成员</span>
+                        </div>
+                    </div>
+                </div>
+                <div class="content-top-right" v-if="isPC">
+                    <div class="content-button">
+                        <a href="javascript:void(0)">查看下一个(0)</a>
+                    </div>
+                </div>
+            </div>
+            <div class="content-bottom">
+                <div class="preview-banner clearfix" id="imgShown" >
+                    <div class="preview-banner-big bigImage" v-if="isPC">
+                        <img class="preview-img" :src="previewBigimage" >
+                        <span class="mask"></span>
+                    </div>
+                    <div class="preview-banner-small" id="CM____pic_thumb" v-if="isPC">
+                        <ul class="preview-thumb-ul">
+                            <li class="item" v-for="(item, index) in previewThumb"  :class="current==index?'addImg':''" :key="index" :data-src="item" @click="ImgList(item,index)">
+                                <img :src="item">
+                            </li>
+                        </ul>
+                    </div>
+                    <div class="CM____pic_thumb swiper-container" id="swiperImage"  v-else>
+                        <ul class="swiper-wrapper clear preview-thumb-ul">
+                            <li class="swiper-slide mfc"v-for="(item, index) in previewThumb" :class="current==index?'addImg':''" :key="index" :data-src="item" @click="ImgList(item,index)">
+                                <img :src="item">
+                            </li>
+                        </ul>
+                        <div class="swiper-pagination mfc"></div>
+                    </div>
+                    <div class="preview-box" id="mag" v-if="isPC">
+                        <div class="bigitem">
+                            <img id="magnifierImg" :src="previewBigimage"/>
+                        </div>
+                    </div>
+                </div>
+                <div class="preview-info">
+                    <div class="preview-info-title">
+                        <div class="title-label">
+                            <p>该仪器由西安柏恩美业有限公司购买</p>
+                            <img class="icon-author" src="/img/quality/icon-author.png" alt="" v-if="isPC">
+                            <img class="icon-author" src="/img/quality/icon-h5-author.png" alt="" v-if="!isPC">
+                        </div>
+                        <div class="title-name">M22 AOPT超光子王者之冠</div>
+                        <div class="title-p">
+                            <span class="label">SN码：</span>
+                            <span class="labal">V2**********9678</span>
+                        </div>
+                        <div class="title-w">
+                            <img class="title-w-bao" src="/img/quality/icon-bao.png" alt="" v-if="isPC">
+                            <img class="title-w-bao" src="/img/quality/icon-h5-bao.png" alt="" v-if="!isPC">
+                            <a href="javascript:void(0)">官方防伪网站</a>
+                        </div>
+                    </div>
+                    <div class="preview-info-details">
+                        <div class="details-p">
+                            <span class="label">型号：</span>
+                            <span class="labal">R100E</span>
+                        </div>
+                        <div class="details-p">
+                            <span class="label">品牌：</span>
+                            <span class="labal">上海品辉</span>
+                        </div>
+                        <div class="details-p">
+                            <span class="label">出厂年月：</span>
+                            <span class="labal">2017年12月6日</span>
+                        </div>
+                        <div class="details-p">
+                            <span class="label">产品尺寸：</span>
+                            <span class="labal">长*宽*高 30*29.5*12.5</span>
+                        </div>
+                        <div class="details-p">
+                            <span class="label">能量源：</span>
+                            <span class="labal">激光</span>
+                        </div>
+                        <div class="details-p">
+                            <span class="label">波长：</span>
+                            <span class="labal">515-1565nm</span>
+                        </div>
+                    </div>
+                    <div class="preview-info-msg" v-if="isPC">
+                        <div class="info-msg">
+                            <i class="icon icon-msg"></i>
+                            请仔细比对仪器上的序列号与SN码是否一致，您也可前往官方防伪网站查看更多信息。
+                        </div>
+                    </div>
+                    <div class="preview-button" v-if="!isPC">
+                        <a href="javascript:void(0)">查看下一个(0)</a>
+                    </div>
+                </div>
             </div>
         </div>
-        <div class="float-zplm"><a target="_blank" href="#"><img src="/img/quality/float-img.png"></a></div>
+    </div>
+</div>
 
-        <!--授权图模态框-->
-        <div class="sq-book-modal" @click="hideSqBookModal" v-show="isShowSqBookModal">
-            <img :src="parameters.certificateImage">
-        </div>
-    </template>
-</div><!-- 引入底部 -->
+<!-- 引入底部 -->
 <template th:replace="components/foot-link"></template>
+<script charset="utf-8" type="text/javascript" src="/lib/magnifier.js"></script>
 <script charset="utf-8" type="text/javascript" th:src="@{/js/common/serviceapi/product.service.js(v=${version})}"></script>
 <script charset="utf-8" type="text/javascript" th:src="@{/js/product/qualityauthorize.js(v=${version})}"></script>
 </body>

src/main/resources/templates/supplier-center/dashboard.html

@@ -58,7 +58,7 @@
                                     </div>
                               </span>
                         </div>
-                        <p class="username">用户名：{{shopinfo.name}}</p>
+                        <p class="username">用户名：{{userInfo.name}}</p>
                         <span class="perfect" v-if="homeData.dataIntegrity!='100%'" @click="perfect">立即完善</span>
                         <span class="ziliao">资料完整度：<span>{{homeData.dataIntegrity}}</span></span>
                     </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/supplier-center/setting/information.html

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

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>
@@ -79,13 +79,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 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>
@@ -116,7 +116,7 @@
                                 <p id="firstClubType"><em>*</em>机构类型：</p>
                                 <label class="diyBox"><input type="radio" name="firstShopType" v-model="clubUpgradeUser.firstClubType" value="1"><i class="icon mIcon">医美</i></label>
                                 <label class="diyBox"><input type="radio" name="firstShopType" v-model="clubUpgradeUser.firstClubType" value="2" checked><i class="icon mIcon">生美</i></label>
-                                <span class="errTips icon mIcon" tips="请选择公司类型"></span>
+                                <span class="errTips icon mIcon" tips="" :class="typeflag?'show':''">请选择公司类型</span>
                             </div>
                             <div v-show="clubUpgradeUser.firstClubType == 1" class="formLine">
                                 <label class="diyBox second"><input type="radio" name="secondClubType" v-model="clubUpgradeUser.secondClubType" value="1" checked><i class="icon mIcon">诊所</i></label>
@@ -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>
@@ -155,7 +155,7 @@
                                     </label>
                                 </p>
                                 <p class="business">
-                                    <input type="text" placeholder="请输入其他自定义品项目" v-model.trim="mainProEdit">
+                                    <input type="text" placeholder="请输入其他自定义品项目" v-model.trim="mainProEdit" maxlength="6">
                                     <a href="javascript:void(0);" @click="mainProAdd()">确认添加</a>
                                 </p>
                                 <span class="errTips icon mIcon" tips="" :class="mproflag?'show':''">请选择或添加主营产品</span>
@@ -169,7 +169,7 @@
                                     </label>
                                 </p>
                                 <p class="business">
-                                    <input type="text" placeholder="请输入其他自定义品项目" v-model.trim="mainProEdit">
+                                    <input type="text" placeholder="请输入其他自定义品项目" v-model.trim="mainProEdit" maxlength="6">
                                     <a href="javascript:void(0);" @click="mainProAdd()">确认添加</a>
                                 </p>
                                 <span class="errTips icon mIcon" tips="" :class="userMainProflag?'show':''">请选择或添加主营产品</span>
@@ -187,7 +187,7 @@
                         <div class="formLine">
                             <p>公司介绍：</p>
                             <div class="address info">
-                                <textarea placeholder="请输入公司的简介，最多500字！" maxlength="500"  v-model="clubUpgradeUser.info"></textarea>
+                                <textarea placeholder="请输入公司的简介，最多500字！" maxlength="500"  v-model="clubUpgradeUser.profile"></textarea>
                             </div>
                         </div>
                         <div class="subLine">

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">
@@ -15,7 +15,7 @@
     var wx_code = getUrlParam('code');
     var wx_state = getUrlParam('state');
     var userData = '';
-    $.get(spiServer+'/user/authorizationLogin?code='+wx_code+'&state='+wx_state+'&mode='+wx_mode, function(r){
+    $.get(spiServer+'/user/login/auth/website?code='+wx_code+'&state='+wx_state+'&mode='+wx_mode, function(r){
         if(r.code===0){
             console.log(r.data);
             userData = {
@@ -24,10 +24,10 @@
                 phone: r.data.bindMobile,
                 name: r.data.name,
                 userName: r.data.userName,
-                userId: r.data.userID,
-                spId: r.data.serviceProviderID,
-                clubId: r.data.clubID,
-                shopId: r.data.shopID,
+                userId: r.data.userId,
+                spId: r.data.serviceProviderId,
+                clubId: r.data.clubId,
+                shopId: r.data.shopId,
                 userIdentity: r.data.userIdentity,
                 permission: r.data.userPermission,
                 token: r.data.token