注册

src/main/resources/static/css/account/register.css

@@ -6,7 +6,7 @@ li{list-style:none}
 @media screen and (min-width:768px){
 body{background: #FFF url(/img/account/register.png) no-repeat center 84px;background-attachment: fixed;}
 footer .footTop{display:none;}
-.registerClub{padding: 20px 0;}
+.registerClub{padding: 20px 0 100px 0;}
 .selectAccount{width:1184px;height:558px;text-align:center;margin:0 auto;}
 .selectAccount .title{height:42px;font-size:32px;line-height:42px;font-weight:bold;color:#22272e;padding-top:102px}
 .selectAccount .cont{margin-top:44px}

src/main/resources/static/css/base/base.h5.css

@@ -21,6 +21,25 @@
 .jqSelect select::-ms-expand{display:none;}
 .jqSelect:before{content:'\276F';font-weight:normal;position:absolute;right:3vw;top:0;transform:rotate(90deg);font-size:3.6vw;color:#4A4F58}
 .mFixed{position:fixed;bottom:0;left:0;width:100%;height:100%;margin:0 auto;z-index:50;overflow-y:scroll;background-color:#FFF;-webkit-overflow-scrolling:touch}
+/*短信图形验证弹窗统一样式*/
+.content-model{width: 100%;height: 100%;background: rgba(0,0,0,.3);position: fixed;top: 0;left: 0;display: none;}
+.content-model.active{display: block;}
+.content-model .model-main{width: 63.8vw;height: 63.5vw;position: absolute;top: 50%;left: 50%;transform: translate(-50%,-50%);border-radius: 0.2vw;background: #FFFFFF;-webkit-box-shadow: 0 0.2vw 0.6vw rgba(0,0,0,0.2);box-shadow: 0 0.2vw 0.6vw rgba(0,0,0,0.2);}
+.content-model .model-title{width: 100%;box-sizing: border-box;height: 10.9vw;padding: 0 2.7vw;border: solid 1px #efefef;position: relative;}
+.content-model .model-title p{width: 100%;line-height: 10.9vw;font-size: 3.4vw;color: #333333;text-align: center;}
+.content-model .model-title .mIcon{display: block;width: 5vw;height: 5vw;position: absolute;right: 2.5vw;top: 2.5vw;z-index: 999;cursor: pointer;}
+.content-model .model-title .mIcon:before{width: 5vw;height: 5vw;background-position:-84.5vw -53.5vw;}
+.content-model .model-content{width: 100%;height: 52.4vw;box-sizing: border-box;padding:2.7vw;}
+.content-model .model-content .model-form{width: 100%;height:auto;float: left;}
+.content-model .model-content .model-form .input{box-sizing: border-box;width: 58.4vw;height: 9.6vw;line-height: 6vw; outline: none;float: left;border: 1px solid #b8bfca;border-radius: 0.2vw;padding:1.8vw 1vw;font-size: 3.4vw;}
+.content-model .model-content .model-form .image{width: 30.7vw;height: 10.7vw;float: left;border-radius: 0.2vw;margin-top: 4.3vw;}
+.content-model .model-content .model-form .image img{width: 100%;height:10.7vw;display: block;border-radius: 0.2vw;}
+.content-model .model-content .model-form .refresh{height:10.7vw;float: left;margin-top: 4.3vw;}
+.content-model .model-content .model-form .refresh .mIcon{display: block;width: 4vw;height: 4vw;float: left;margin: 3.3vw 2vw 0 4vw;cursor: pointer;}
+.content-model .model-content .model-form .refresh .mIcon:before{width: 4vw;height: 4vw;background-position:-1.2vw -62.5vw;}
+.content-model .model-content .model-form .refresh span{width:auto;height:10.7vw;display: block;float: left;line-height: 10.7vw;font-size: 3.4vw;margin-left: 2vw;}
+.content-model .model-content .model-button{width: 100%;height: 9.9vw;float: left;margin-top: 11vw;}
+.content-model .model-content .model-button .button{width: 100%;height: 9.9vw;border-radius: .2vw;background-color: #e15616;text-align: center;line-height:9.9vw;font-size: 3.4vw;color: #FFFFFF;cursor: pointer;}
 /* 头部 */
 .baseHeadCenter{box-sizing:border-box;width:100%;height:26.8vw;padding:0 2vw;position:relative;background:#FFF}
 .baseHeadCenter .logo,.classifyBox .logo{width:23.8vw;height:5.9vw;padding:3.75vw 0;position:absolute;top:0;left:50%;margin-left:-11.9vw}

src/main/resources/static/css/base/base.pc.css

@@ -33,6 +33,26 @@ header{box-shadow: 0 2px 10px #ebecef;}
     position: absolute;
     top: 35px
 }
+/*短信图形验证弹窗统一样式*/
+.content-model{width: 100%;height: 100%;background: rgba(0,0,0,.3);position: fixed;top: 0;left: 0;display: none;}
+.content-model.active{display: block;}
+.content-model .model-main{width: 338px;height: 194px;position: absolute;top: 50%;left: 50%;transform: translate(-50%,-50%);border-radius: 3px;background: #FFFFFF;-webkit-box-shadow: 0 2px 6px rgba(0,0,0,0.2);box-shadow: 0 2px 6px rgba(0,0,0,0.2);}
+.content-model .model-title{width: 100%;box-sizing: border-box;height: 42px;padding: 0 16px;border: solid 1px #efefef;position: relative;}
+.content-model .model-title p{width: 100%;line-height: 42px;font-size: 14px;color: #333333;text-align: center;}
+.content-model .model-title .icon{display: block;width: 16px;height: 16px;position: absolute;right: 13px;top: 13px;z-index: 999;cursor: pointer;}
+.content-model .model-title .icon:before{width: 16px;height: 16px;background-position:-315px -2px;}
+.content-model .model-content{width: 100%;height: 128px;box-sizing: border-box;padding: 16px 12px;}
+.content-model .model-content .model-form{width: 100%;height: 48px;float: left;}
+.content-model .model-content .model-form .input{width: 134px;height: 46px;outline: none;float: left;border: 1px solid #b8bfca;border-radius: 2px;padding: 0 10px;font-size: 14px;}
+.content-model .model-content .model-form .image{width: 120px;height: 48px;float: left;margin-left: 10px;border-radius: 2px;}
+.content-model .model-content .model-form .image img{width: 100%;height: 47px;display: block;border-radius: 2px;}
+.content-model .model-content .model-form .refresh{width: 16px;height: 47px;float: left;}
+.content-model .model-content .model-form .refresh .icon{display: block;width: 16px;height: 16px;float: left;margin: 17px 0 0 10px;cursor: pointer;}
+.content-model .model-content .model-form .refresh .icon:before{width: 16px;height: 16px;background-position:-210px -375px;}
+.content-model .model-content .model-form .refresh span{display: none;}
+.content-model .model-content .model-button{width: 100%;height: 32px;float: left;margin-top: 32px;}
+.content-model .model-content .model-button .button{width: 120px;height: 32px;border-radius: 2px;background-color: #e15616;text-align: center;line-height: 32px;font-size: 14px;float: right;color: #FFFFFF;cursor: pointer;}
+
 
 /* 头部 */
 .baseHeadTop{width:100%;font-size:14px;background:#FBFBFB}

src/main/resources/static/css/base/form.css

@@ -6,7 +6,7 @@
 @media screen and (min-width:768px){
 .formLine{padding-bottom:5px;font-size:14px;position:relative}
 .formLine input,.formLine select{box-sizing:border-box;width:100%;height:36px;line-height:34px;text-indent:1.2em;background-color:#FFF;border:1px solid #b8bfca;border-radius:2px}
-.formLine textarea{width:100%;height:114px;box-sizing:border-box;border:solid 1px #b8bfca;padding:10px 16px;line-height:20px;resize: none;border-radius: 2px;outline: none;}
+.formLine textarea{width:100%;height:114px;margin-top: 20px; box-sizing:border-box;border:solid 1px #b8bfca;padding:10px 16px;line-height:20px;resize: none;border-radius: 2px;outline: none;}
 .formLine select{width:154px}
 .formLine.error input{border-color:#f94b4b}
 .formLine input:focus{border-color:#ffe6dc;}
@@ -50,6 +50,10 @@
 .formLine .diyBox input:checked + i{border-color:#e15616;color:#e15616}
 .formLine .diyBox input:checked + i:before{display:block}
 
+
+
+
+
 }
 
 /**
@@ -66,7 +70,7 @@
 .formLine p em{font-style:normal;color:#f94b4b;margin:0 1vw}
 .formLine p span{color:#ffb496;}
 .formLine .checked{position:absolute;width:4.4vw;height:4.4vw;top:13.6vw;right:3.6vw;display:none}
-.formLine .checked:before{width:4.4vw;height:4.4vw;background-position:22.5% 32.1%}
+.formLine .checked:before{width:4.4vw;height:4.4vw;background-position:-18vw -10vw;}
 .formLine .errTips{display:block;height:4.4vw;line-height:4.4vw;white-space:nowrap;color:red;font-size:3vw;text-align:left;visibility:hidden}
 .formLine .checked.show{display:block}
 .formLine .errTips.show{visibility:visible}
@@ -78,10 +82,11 @@
 .subLine{text-align:center;font-size:3.1vw;padding-top:5vw;}
 .subLine p input{margin-right:1vw;}
 .subLine p a{color:#1890f9}
-.subLine .btn{display:block;margin:5vw auto;width:100%;height:11.2vw;line-height:11.2vw;background-color:#e15616;border-radius:2px;text-align:center;font-size:1.8vw;color:#FFF}
-.subLine .iconfont{width:16px;height: 16px;display: block;background:url(/img/base/icon_m.png) no-repeat;float: left;margin-right: 5vm;cursor: pointer;}
-.subLine .icon-weigouxuan{background-position: -236px 0;}
-.subLine .icon-gouxuan{background-position: -210px 0;}
+.subLine .btn{display:block;margin:5vw auto;width:100%;height:11.2vw;line-height:11.2vw;background-color:#e15616;border-radius:.2vw;text-align:center;font-size:3.4vw;color:#FFF}
+.subLine .iconfont{width:4vw;height: 4vw;display: block;background:url(/img/base/icon_m.png) no-repeat;float: left;margin-right: 1vw;cursor: pointer;background-size: 100vw;}
+.subLine .icon-weigouxuan{background-position: -10vw -54.1vw;}
+.subLine .icon-gouxuan{background-position: -1vw -54.1vw;}
+.subLine .errTips{display:block;height:4.4vw;line-height:4.4vw;white-space:nowrap;color:red;font-size:3vw;text-align:left;}
 
 .formLine .address{text-align:justify;line-height:0}
 .formLine .diyBox{width:34vw;height:11.2vw;line-height:11.2vw;margin-right: 2.5vw;margin-bottom: 2.5vw;box-sizing:border-box;text-align:center;display:inline-block;float: left;}

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

@@ -1,7 +1,8 @@
 var registerPage = new Vue({
     el: "#registerPage",
     data: {
-        showTabContentIndex:1,
+        loginLoading: false,
+        showTabContentIndex:2,
         showSupplierConfirm:true,
         advisoryStatus: false,
         showClass:'',
@@ -9,6 +10,10 @@ var registerPage = new Vue({
         mobileCodeText:'获取验证码',
         mobilTime:null,
         isMobileDisabled:false,
+        isCodeModel:false,
+        codeImagePath:'https://dss2.bdstatic.com/8_V1bjqh_Q23odCf/pacific/1819816496.jpg',
+        codeImageToken:'',
+        imageCode:'',
         advisory:{
             name: '',
             phone: ''
@@ -21,22 +26,24 @@ var registerPage = new Vue({
             password2:''
         },
         clubUpgradeUser: {
+            userID:'',
+            clubID:'',
+            contractEmail1:'',
             name:'',
-            phone:'',
-            code:'',
+            sname:'',
+            socialCreditCode:'',
             mainPros:[],
             businessLicenseImage:'',
-            uploadMentuzImage:'',
-            uploadMedicalImage:'',
-            businessLicense:'',
-            secondShopType:'',
-            firstShopType:'',
-            department:5,
+            headpic:'',
+            medicalPracticeLicenseImg:'',
+            firstClubType:'',
+            secondClubType:0,
+            department:'',
             provinceID :'',
             cityID : '',
             townID : '',
-            address :'',
         },
+        userMainPros:[],
         formData:new FormData(),
         isAgreed:0,
         isAgree:false,
@@ -79,19 +86,165 @@ var registerPage = new Vue({
 
     },
     methods: {
+        clubRegister: function(){ //机构注册提交
+            var _self = this;
+            var pass = verifyForm();
+            if (_self.loginLoading) { return false; }
+            this.$nextTick(function() {
+                if (!pass) {return false;}
+                if (!_self.isAgree){
+                    _self.isShowAgree = true;
+                    return;
+                }
+                var params = {
+                        userName : _self.clubUser.name,
+                        bindMobile : _self.clubUser.phone,
+                        password : _self.clubUser.password,
+                        passWordConfirm : _self.clubUser.password2,
+                        activationCode : _self.clubUser.code,
+                        isAgreed :  _self.isAgreed,
+                };
+                _self.loginLoading = true;
+                UserApi.ClubRegister(params,function (response) {
+                    if(response.code === 0){
+                        CAIMEI.dialog('注册成功！',true,function () {
+                            _self.showTabContentIndex = 2;
+                            _self.loginLoading = false;
+                            _self.clubLogin();
+                        });
+                    } else {
+                        CAIMEI.Alert(response.msg,'确定',false);
+                        _self.loginLoading = false;
+                    }
+                });
+            });
+        },
+        getMobileImage:function() {//获取图形验证码
+            var _self = this;
+            var pass = verifyCheack('.massageBtn');
+            if (_self.isMobileDisabled) { return false; }
+            this.$nextTick(function() {
+                if (!pass) {
+                    return false;
+                }
+                PublicApi.getImgVerifyCode({platformType: 0},function(response){
+                    if(response.code == 0){
+                        _self.imageCode = '';
+                        _self.codeImagePath = response.data.baseImage;
+                        _self.codeImageToken = response.data.token;
+                        _self.isCodeModel = true;
+                    }else{
+                        CAIMEI.Alert(response.msg,'确定',false);
+                    }
+                })
+            });
+        },
+        getMobileCodeFn:function(){//机构注册获取注册短信验证码
+            var _self = this;
+            var params = {
+                    mobile:_self.clubUser.phone,
+                    imgCode:_self.imageCode,
+                    token:_self.codeImageToken,
+                    activateCodeType:2,
+                    platformType:0
+                };
+            _self.isMobileDisabled = true;
+            UserApi.getRegisterMobileCode(params,function (response) {
+                if(response.code == 0){
+                    _self.isCodeModel = false;
+                    CAIMEI.dialog('验证短信已发送',false,function () {});
+                    var TIME_COUNT = 60;
+                    if (!_self.mobilTime) {
+                        _self.mobilCount = TIME_COUNT;
+                        _self.isMobileDisabled = true;
+                        _self.mobilTime = setInterval(function(){
+                        if (_self.mobilCount > 1 && _self.mobilCount <= TIME_COUNT) {
+                            _self.mobilCount--;
+                            _self.mobileCodeText = _self.mobilCount +'s重新发送';
+                        } else {
+                            _self.isMobileDisabled = false;
+                            clearInterval(_self.mobilTime);
+                            _self.mobilTime = null;
+                            _self.mobileCodeText = '获取验证码';
+                        }
+                    },1000)
+                    }
+                }else{
+                    CAIMEI.Alert(response.msg,'确定',false);
+                    _self.isMobileDisabled = false;
+                    _self.isCodeModel = false;
+                }
+            })
+        },
+        clubUpgrade:function() {//升级会员机构
+            var _self = this;
+            var pass = verifyForm();
+            if (_self.loginLoading) { return false; }
+            this.$nextTick(function() {
+                if (!pass) {return false;}
+                _self.clubUpgradeUser.mainPros = _self.userMainPros.join("/");
+                console.log(_self.clubUpgradeUser.mainPros);
+                UserApi.ClubUpgrade(_self.clubUpgradeUser,function (response) {
+                    if(response.code === 0){
+                        CAIMEI.Alert('您的升级申请已提交审核','确定',true,function () {
+                            _self.clubLoginIndex();
+                        });
+                    } else {
+                        CAIMEI.Alert(response.msg,'确定',false);
+                    }
+                });
+            });
+        },
+        clubLogin: function () { // 登录
+            var _self = this;
+            var params =  {mobileOrEmail: _self.clubUser.phone,password: _self.clubUser.password,source: 'www'};
+            UserApi.PostLoginAccount(params,function(response){
+                if(response.code === 0){
+                    _self.clubUpgradeUser.userID =  response.data.userID;
+                    _self.clubUpgradeUser.clubID =  response.data.clubID;
+                    _self.userData = {
+                        account: response.data.account,
+                        email: response.data.email,
+                        phone: response.data.bindMobile,
+                        name: response.data.name,
+                        userName: response.data.userName,
+                        userId: response.data.userID,
+                        spId: response.data.serviceProviderID,
+                        clubId: response.data.clubID,
+                        shopId: response.data.shopID,
+                        identity: response.data.userIdentity,
+                        permission: response.data.userPermission,
+                        token: response.data.token
+                    };
+                    _self.setStorages( _self.userData);
+                } else {// 登录失败
+                    alertInfo(response.msg);
+                }
+            });
+        },
+        refreshCodeImage:function(){
+            this.getMobileImage()
+        },
+        closeCodeModel:function(){
+            this.isCodeModel = false;
+        },
+        clubLoginIndex:function(){// 跳过升级直接去个人中心
+            window.location.href = '/user/dashboard.html';
+        },
         mainProAdd: function(){
             var _self = this;
             if (_self.mainProEdit.length>0) {
                 if (_self.mainPros.indexOf(_self.mainProEdit)<0){
                     var obj = {name:_self.mainProEdit};
-                    if(_self.clubUpgradeUser.firstShopType == 1){
+                    if(_self.clubUpgradeUser.firstClubType === '0'){
                         if(_self.checkedArray(_self.mainProEdit,_self.mentuzCampNullList)){
                             CAIMEI.dialog('主营内容已存在!',false);
                         }else {
+
                             _self.mentuzCampNullList.push(obj);
                         }
                     }else{
-                        if(_self.checkedArray(_self.mainProEdit,_this.medicaCampNullList)){
+                        if(_self.checkedArray(_self.mainProEdit,_self.medicaCampNullList)){
                             CAIMEI.dialog('主营内容已存在!',false);
                         }else {
                             _self.medicaCampNullList.push(obj);
@@ -161,7 +314,7 @@ var registerPage = new Vue({
             var file = inputDOM.files;
             _this.formData.append('file', file[0]);
             PublicApi.uploadimg(_this.formData,function(response){
-                _this.clubUpgradeUser.uploadMentuzImage = response.data;
+                _this.clubUpgradeUser.headpic = response.data;
                 event.target.value = '';
             });
         },
@@ -171,7 +324,7 @@ var registerPage = new Vue({
             var file = inputDOM.files;
             _this.formData.append('file', file[0]);
             PublicApi.uploadimg(_this.formData,function(response){
-                _this.clubUpgradeUser.uploadMedicalImage = response.data;
+                _this.clubUpgradeUser.medicalPracticeLicenseImg = response.data;
                 event.target.value = '';
             });
         },
@@ -179,77 +332,13 @@ var registerPage = new Vue({
             this.clubUpgradeUser.businessLicenseImage = '';
         },
         deleteMentuzImage:function(){//清楚门头照图片
-            this.clubUpgradeUser.uploadMentuzImage = '';
+            this.clubUpgradeUser.headpic = '';
         },
         deleteMedicalImage:function(){//清楚资质照图片
-            this.clubUpgradeUser.uploadMedicalImage = '';
+            this.clubUpgradeUser.medicalPracticeLicenseImg = '';
         },
-        clubRegister: function(){ //机构注册提交
-            var _self = this;
-            var pass = verifyForm();
-            if (this.loginLoading) { return false; }
-            this.$nextTick(function() {
-                if (!pass) {return false;}
-                if (!_self.isAgree){
-                    _self.isShowAgree = true;
-                    return;
-                }
-                var params = {
-                        userName : _self.clubUser.name,
-                        bindMobile : _self.clubUser.phone,
-                        password : _self.clubUser.password,
-                        passWordConfirm : _self.clubUser.password2,
-                        activationCode : _self.clubUser.code,
-                        isAgreed :  _self.isAgreed,
-                };
-                UserApi.ClubRegister(params,function (response) {
-                    if(response.code === 0){
-                        CAIMEI.dialog('注册成功！',true,function () {
-                            _self.showTabContentIndex = 2;
-                        });
-                    } else {
-                        CAIMEI.Alert(response.msg,'确定',false);
-                    }
-                });
-            });
-        },
-        getMobileCodeFn:function(){//机构注册获取注册短信验证码
-            var _self = this;
-            var pass = verifyCheack('.massageBtn');
-            if (this.loginLoading) { return false; }
-            this.$nextTick(function() {
-                if (!pass) {return false;};
-                var params = {
-                        mobile:this.clubUser.phone,
-                        activateCodeType:2,
-                        platformType:2
-                    };
-                _self.isMobileDisabled = true;
-                UserApi.getRegisterMobileCode(params,function (response) {
-                    if(response.code == 0){
-                        CAIMEI.dialog('验证短信已发送',false,function () {});
-                        var TIME_COUNT = 60;
-                        if (!_self.mobilTime) {
-                            _self.mobilCount = TIME_COUNT;
-                            _self.isMobileDisabled = true;
-                            _self.mobilTime = setInterval(function(){
-                            if (_self.mobilCount > 1 && _self.mobilCount <= TIME_COUNT) {
-                                _self.mobilCount--;
-                                _self.mobileCodeText = _self.mobilCount +'s重新发送';
-                            } else {
-                                _self.isMobileDisabled = false;
-                                clearInterval(_self.mobilTime);
-                                _self.mobilTime = null;
-                                _self.mobileCodeText = '获取验证码'
-                            }
-                        },1000)
-                        }
-                    }else{
-                        CAIMEI.Alert(response.msg,'确定',false);
-                        _self.isMobileDisabled = false;
-                    }
-                })
-            });
+        setStorages:function(data){//存储本地数据
+            localStorage.setItem('userInfo',JSON.stringify(data));
         },
         showVadvisory:function(){
             var _self = this;
@@ -328,7 +417,7 @@ var registerPage = new Vue({
             var viewer = new Viewer(document.getElementById('uploadMentuzImage'));
         },
         showViewerImageFn2:function(){//预览资质图片
-            var viewer = new Viewer(document.getElementById('uploadMedicalImage'));
+            var viewer = new Viewer(document.getElementById('medicalPracticeLicenseImg'));
         },
     },
     created: function () {

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

@@ -8,41 +8,48 @@ var registerPage = new Vue({
         mobileCodeText:'获取验证码',
         mobilTime:null,
         isMobileDisabled:false,
+        isCodeModel:false,
+        codeImagePath:'',
+        codeImageToken:'',
+        imageCode:'',
         supplierUser: {
-            phone:'',
-            code:'',
+            bindMobile:'',
+            mobileCode:'',
             password:'',
-            password2:'',
-            shopName:'',
-            name:'',
+            passWordConfirm:'',
+            linkMan:'',
             email:'',
-            shopAbbr:'',
+            name:'',
+            sname:'',
+            socialCreditCode:'',
+            businessLicenseImage:'',
+            provinceID :'',
+            cityID : '',
+            townID : '',
+            address:'',
             firstShopType:'2',
             secondShopType: '',
-            mainPros: [],
-            businessLicense:'',
-            businessLicenseImage:''
+            mainpro:'',
+            isAgreed:0,
         },
-        isAgreed:0,
         isAgree:false,
         isShowAgree:false,
         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'},
+            {value:'1',name:'产品'},
+            {value:'2',name:'仪器'},
+            {value:'3',name:'服务'}
         ],
-        mainPros: ['产品','仪器','服务','整形'],
+        userMainPros: [],
+        formData:new FormData(),
         mainProEdit: '',
+        ProvinceList:[],
+        cityArray:[],
+        townArray:[],
+        addressfrom: {
+            province: '',//省id
+            city: '',
+            town: ''
+        },
         rule:{
             name: '^[a-zA-Z\\u4e00-\\u9fa5]{2,}$',
             phone: '^\\d{6,12}$',
@@ -56,51 +63,20 @@ var registerPage = new Vue({
 
     },
     methods: {
-        mainProAdd: function(){
-            if (this.mainProEdit.length>0) {
-                if (this.mainPros.indexOf(this.mainProEdit)<0){
-                    this.mainPros.push(this.mainProEdit)
-                }
-            }
-        },
-        showPassword: function(event) {
-            var el = event.currentTarget;
-            var pwdEle = $(el).siblings('input');
-            if(pwdEle.attr('type') === 'password') {
-                $(el).addClass('on');
-                pwdEle.attr('type','text');
-            } else {
-                $(el).removeClass('on');
-                pwdEle.attr('type','password');
-            }
-        },
-        // 失去焦点校验
-        blurHandle: function(event) {
-            var el = event.currentTarget;
-            verifyHandle(el);
-        },
         supplierRegister: function(){//供应商注册提交
             var _self = this;
             var pass = verifyForm();
-            if (this.loginLoading) { return false; }
+            if (_self.loginLoading) { return false; }
             this.$nextTick(function() {
                 if (!pass) {return false;}
                 if (!_self.isAgree){
                     _self.isShowAgree = true;
                     return;
                 }
-                var params = {
-                    userName : _self.clubUser.name,
-                    bindMobile : _self.clubUser.phone,
-                    password : _self.clubUser.password,
-                    passWordConfirm : _self.clubUser.password2,
-                    activationCode : _self.clubUser.code,
-                    isAgreed :  _self.isAgreed,
-                };
-                UserApi.ClubRegister(params,function (response) {
+                UserApi.SupplierRgister(_self.supplierUser,function (response) {
                     if(response.code === 0){
-                        dialog('注册成功！',function () {
-
+                        CAIMEI.Alert('您的资料已提交成功，系统将在1-2个工作日内进行审核~','知道了',true,function () {
+                            window.location.href = '/index.html';
                         });
                     } else {
                         alertInfo(response.msg);
@@ -108,57 +84,181 @@ var registerPage = new Vue({
                 });
             });
         },
-        getMobileCodeFn:function(){//机构注册获取注册短信验证码
+        getMobileImage:function() {//获取图形验证码
             var _self = this;
             var pass = verifyCheack('.massageBtn');
-            if (this.loginLoading) { return false; }
+            if (_self.isMobileDisabled) { return false; }
             this.$nextTick(function() {
-                if (!pass) {return false;};
-                var params = {
-                        mobile:this.clubUser.phone,
-                        activateCodeType:2,
-                        platformType:2
-                    };
-                _self.isMobileDisabled = true;
-                UserApi.getRegisterMobileCode(params,function (response) {
+                if (!pass) {
+                    return false;
+                }
+                PublicApi.getImgVerifyCode({platformType: 0},function(response){
                     if(response.code == 0){
-                        alertInfo('验证短信已发送');
-                        var TIME_COUNT = 60;
-                        if (!_self.mobilTime) {
-                            _self.mobilCount = TIME_COUNT;
-                            _self.isMobileDisabled = true;
-                            _self.mobilTime = setInterval(function(){
+                        _self.imageCode = '';
+                        _self.codeImagePath = response.data.baseImage;
+                        _self.codeImageToken = response.data.token;
+                        _self.isCodeModel = true;
+                    }else{
+                        CAIMEI.Alert(response.msg,'确定',false);
+
+                    }
+                })
+            });
+        },
+        getMobileCodeFn:function(){//机构注册获取注册短信验证码
+            var _self = this;
+            var params = {
+                    mobile:_self.supplierUser.bindMobile,
+                    imgCode:_self.imageCode,
+                    token:_self.codeImageToken,
+                    activateCodeType:3,
+                    platformType:0
+                };
+            _self.isMobileDisabled = true;
+            UserApi.getRegisterMobileCode(params,function (response) {
+                if(response.code == 0){
+                    _self.isCodeModel = false;
+                    CAIMEI.dialog('验证短信已发送',false,function () {});
+                    var TIME_COUNT = 60;
+                    if (!_self.mobilTime) {
+                        _self.mobilCount = TIME_COUNT;
+                        _self.isMobileDisabled = true;
+                        _self.mobilTime = setInterval(function(){
                             if (_self.mobilCount > 1 && _self.mobilCount <= TIME_COUNT) {
                                 _self.mobilCount--;
                                 _self.mobileCodeText = _self.mobilCount +'s重新发送';
                             } else {
                                 _self.isMobileDisabled = false;
-                                clearInterval(this.mobilTime);
+                                clearInterval(_self.mobilTime);
                                 _self.mobilTime = null;
-                                _self.mobileCodeText = '获取验证码'
+                                _self.mobileCodeText = '获取验证码';
                             }
                         },1000)
-                        }
-                    }else{
-                        alertInfo(response.msg);
-                        _self.isMobileDisabled = false;
                     }
-                })
+                }else{
+                    CAIMEI.Alert(response.msg,'确定',false);
+                    _self.isMobileDisabled = false;
+                    _self.isCodeModel = false;
+                }
+            })
+        },
+        refreshCodeImage:function(){
+            this.getMobileImage()
+        },
+        closeCodeModel:function(){
+            this.isCodeModel = false;
+        },
+        GetProvinceFn: function(){//获取全部省份
+            var _this = this;
+            PublicApi.GetProvince({},function(response){
+                if(response.code == 0){
+                    _this.ProvinceList =response.data;
+                }else{
+                    CAIMEI.Alert(response.msg,'确定',false);
+                }
+            })
+        },
+        uploadBusinessLicenseImageFn: function(event){//上传营业执照
+            var _this = this;
+            var inputDOM = _this.$refs.businessLicenseImage;
+            var file = inputDOM.files;
+            _this.formData.append('file', file[0]);
+            PublicApi.uploadimg(_this.formData,function(response){
+                _this.supplierUser.businessLicenseImage = response.data;
+                event.target.value = '';
             });
         },
-        showSupplier:function () {
+        deleteBusinessImage:function(){//清楚营业执照图片
+            this.supplierUser.businessLicenseImage = '';
+        },
+        ChangeProvince:function () {//选择省份
+            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=''
+            }else {
+                _this.ChangeGetcity();
+            }
+        },
+        ChangeGetcity:function(event){//加载市
+            var _this = this;
+            PublicApi.GetCity({ provinceId: _this.addressfrom.province },function(response){
+                if(response.code == 0 ){
+                    _this.cityArray = response.data;
+                    _this.addressfrom.city = event.target.value;
+                    _this.supplierUser.cityID = event.target.value;
+                    if(_this.addressfrom.city==''){
+                        _this.townArray=[];
+                    }else {
+                        _this.ChangeGetcTown();
+                    }
+                }else{
+                    CAIMEI.Alert(response.msg,'确定',false);
+                }
+            })
+        },
+        ChangeGetcTown:function(event){//选择地区
+            var _this = this;
+            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)
+                }else{
+                    CAIMEI.Alert(response.msg,'确定',false);
+                }
+            })
+        },
+        mainProAdd: function(){//添加主营内容
+            var _self = this;
+            if (_self.mainProEdit.length>0) {
+                var obj = {name:_self.mainProEdit};
+                if(_self.checkedArray(_self.mainProEdit,_self.mentuzCampNullList)){
+                    CAIMEI.dialog('主营内容已存在!',false);
+                }else {
+                    _self.mentuzCampNullList.push(obj);
+                }
+            }
+        },
+        checkedArray:function(content,arr){//判断主营内容是否已存在
+            for(var i in arr){
+                if(arr[i].name == content){
+                    return true;
+                }
+            }
+            return false;
+        },
+        showPassword: function(event) {//密码眼睛切换
+            var el = event.currentTarget;
+            var pwdEle = $(el).siblings('input');
+            if(pwdEle.attr('type') === 'password') {
+                $(el).addClass('on');
+                pwdEle.attr('type','text');
+            } else {
+                $(el).removeClass('on');
+                pwdEle.attr('type','password');
+            }
+        },
+        blurHandle: function(event) { // 失去焦点校验
+            var el = event.currentTarget;
+            verifyHandle(el);
+        },
+        showSupplier:function () {//同意
             var _self = this;
             _self.showSupplierConfirm = false;
         },
-        checkedIsAgreeFn:function () {
+        checkedIsAgreeFn:function () {//勾选协议
             var _self = this;
             _self.isAgree = !_self.isAgree;
             if (_self.isAgree){
                 _self.isShowAgree = false;
-                _self.isAgreed = 1;
+                _self.supplierUser.isAgreed = 1;
             }else{
                 _self.isShowAgree = true;
-                _self.isAgreed = 0;
+                _self.supplierUser.isAgreed = 0;
             }
         }
     },
@@ -167,5 +267,6 @@ var registerPage = new Vue({
     },
     mounted: function () {
         var _self = this;
+        _self.GetProvinceFn();
     }
 });

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

@@ -17,7 +17,7 @@ var UserApi = {
                 });
         },
         ToWechatPolling : function (params,callback) {//扫码登录轮询
-            Http.AjaxService({ url:'/user/polling', type:'get', data:params, json:false})
+            Http.AjaxService({ url:'user/polling', type:'get', data:params, json:false})
                 .then(function(res){
                     callback(res)
                 });
@@ -28,8 +28,8 @@ var UserApi = {
                     callback(res);
                 });
         },
-        getRegisterMobileCode: function (params, callback) {//机构注册
-            Http.AjaxService({ url:'/club/captcha', type:'get', data:params, json:false})
+        getRegisterMobileCode: function (params, callback) {//机构注册获取短信验证码
+            Http.AjaxService({ url:'/user/activateCodeByReg', type:'get', data:params, json:false})
                 .then(function(res){
                     callback(res);
                 });

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

@@ -8,77 +8,75 @@ var PublicApi = {
             Http.uploadImage({ url:'/formData/MultiPictareaddData',data:params},callback)
         },
         GetProvince:function(params,callback){ //获取省份信息
-            Http.AjaxService({ url:'/club/province', type:'get', data:params, json:false, mask:false,replace:false})
+            Http.AjaxService({ url:'/club/province', type:'get', data:params, json:false})
                 .then(function(res){
                     callback(res)
                 });
         },
         GetCity:function(params,callback){ //获取区分信息
-            Http.AjaxService({ url:'/club/city', type:'get', data:params, json:true, mask:false,replace:false})
+            Http.AjaxService({ url:'/club/city', type:'get', data:params, json:true})
                 .then(function(res){
                     callback(res)
                 });
         },
         GetTown:function(params,callback){ //获取市信息
-            Http.AjaxService({ url:'/club/town', type:'get', data:params, json:true, mask:false,replace:false})
+            Http.AjaxService({ url:'/club/town', type:'get', data:params, json:true})
                 .then(function(res){
                     callback(res)
                 });
         },
         GetFirstClassFication:function(params,callback){ //获取一级分类
-            Http.AjaxService({ url:'/supplier/primaryClassification', type:'get', data:params, json:true, mask:false,replace:false})
+            Http.AjaxService({ url:'/supplier/primaryClassification', type:'get', data:params, json:true})
             .then(function(res){
                 callback(res)
             });
         },
         GetTwoClassFication:function(params,callback){ //获取二级分类
-            Http.AjaxService({ url:'/supplier/secondaryClassification', type:'get', data:params, json:true, mask:false,replace:false})
+            Http.AjaxService({ url:'/supplier/secondaryClassification', type:'get', data:params, json:true})
             .then(function(res){
                 callback(res)
             });
         },
         GetThreeClassFication:function(params,callback){ //获取三级分类
-            Http.AjaxService({ url:'/supplier/threeLevelClassification', type:'get', data:params, json:true, mask:false,replace:false})
+            Http.AjaxService({ url:'/supplier/threeLevelClassification', type:'get', data:params, json:true})
             .then(function(res){
                 callback(res)
             });
         },
         addCart : function (params,callback) { //加入购物车
-            Http.AjaxService({ url:'/shoppingCart/addCart', type:'post', data:params, json:false, mask:true,replace:true})
+            Http.AjaxService({ url:'/shoppingCart/addCart', type:'post', data:params, json:false})
             .then(function(res){
                 callback(res)
             });
         },
         getImgVerifyCode : function (params,callback){ //获取图形验证图形
-            Http.AjaxService({ url:'/user/getImgVerifyCode', type:'get', data:{platformType:0}, json:true, mask:false,replace:false})
+            Http.AjaxService({ url:'/user/getImgVerifyCode', type:'get', data:params, json:true})
             .then(function(res){
                 if (res.code == 0) {
-                    params.$img.attr("src",res.data.baseImage);
-                    params.$token.val(res.data.token);
                     callback(res);
                 }
             });
         },
         getMobileSMScode : function (params,callback){//直接获取手机短信验证码
-            Http.AjaxService({ url:'/user/activateCodeByReg', type:'get', data:params, json:true, mask:false,replace:false})
+            Http.AjaxService({ url:'/user/activateCodeByReg', type:'get', data:params, json:true})
             .then(function(res){
                 callback(res);
             });
         },
         getNoteSMScode : function (params,callback){//绑定机构运营人员获取短信验证码
-            Http.AjaxService({ url:'/user/note', type:'get', data:params, json:true, mask:false,replace:false})
+            Http.AjaxService({ url:'/user/note', type:'get', data:params, json:true})
             .then(function(res){
                 callback(res);
             });
         },
         getEmailSMScode : function (params,callback) { //获取邮箱短信验证码
-            Http.AjaxService({ url:'/user/mailbox', type:'get', data:params, json:true, mask:false,replace:false})
+            Http.AjaxService({ url:'/user/mailbox', type:'get', data:params, json:true})
             .then(function(res){
                 callback(res);
             });
         },
         getClubMobileCode : function (params,callback) { //获取手机短信验证码
-            Http.AjaxService({ url:'/club/modifyPhoneNumber', type:'get', data:params, json:true, mask:false,replace:true})
+            Http.AjaxService({ url:'/club/modifyPhoneNumber', type:'get', data:params, json:true})
             .then(function(res){
                 callback(res);
             });
@@ -124,133 +122,133 @@ var PublicApi = {
             }
         },
         findCompanyPwd : function(params,callback) {//用户找回密码
-            Http.AjaxService({ url:'/user/findCompanyPwd', type:'post', data:params, json:true, mask:true,replace:false})
+            Http.AjaxService({ url:'/user/findCompanyPwd', type:'post', data:params, json:true})
             .then(function(res){
                 callback(res);
             });
         },
         clubChangeMobile:function(params,callback){//更换手机号
-            Http.AjaxService({ url:'/club/changeMobile', type:'post', data:params, json:true, mask:true,replace:true})
+            Http.AjaxService({ url:'/club/changeMobile', type:'post', data:params, json:true})
             .then(function(res){
                 callback(res);
             });
         },
         editCompanyInfo : function (params,callback) {//获取要修改的企业信息
-            Http.AjaxService({ url:'/user/club/applicationData', type:'get', data:params, json:true, mask:true,replace:true})
+            Http.AjaxService({ url:'/user/club/applicationData', type:'get', data:params, json:true})
             .then(function(res){
                 callback(res);
             });
         },
         updateCompanyInfo : function (params,callback) {//提交机构修改申请信息
-            Http.AjaxService({ url:'/user/club/updateCompanyInfo', type:'post', data:params, json:true, mask:true,replace:false})
+            Http.AjaxService({ url:'/user/club/updateCompanyInfo', type:'post', data:params, json:true})
             .then(function(res){
                 callback(res);
             });
         },
         modifiedData : function (params,callback) {//提交个人中心修改机构信息
-            Http.AjaxService({ url:'/operation/modifiedData', type:'post', data:params, json:false, mask:true,replace:true})
+            Http.AjaxService({ url:'/operation/modifiedData', type:'post', data:params, json:false})
             .then(function(res){
                 callback(res);
             });
         },
         bindIngUseEmail : function(params,callback) { //未绑定邮箱账户绑定邮箱
-            Http.AjaxService({ url:'/user/binding', type:'post', data:params, json:true, mask:true,replace:false})
+            Http.AjaxService({ url:'/user/binding', type:'post', data:params, json:true})
             .then(function(res){
                 callback(res)
             });
         },
         getOperationList : function (params,callback) { //获取机构运营人员列表
-            Http.AjaxService({ url:'/user/bindOrganization', type:'post', data:params, json:false, mask:true,replace:true})
+            Http.AjaxService({ url:'/user/bindOrganization', type:'post', data:params, json:false})
             .then(function(res){
                 callback(res)
             });
         },
         addOperation : function (params,callback) { //机构员工管理添加运营人员
-            Http.AjaxService({ url:'/operation/add', type:'post', data:params, json:false, mask:true,replace:true})
+            Http.AjaxService({ url:'/operation/add', type:'post', data:params, json:false})
             .then(function(res){
                 callback(res)
             });
         },
         deleteOperation : function (params,callback) { //机构员工管理删除运营人员
-            Http.AjaxService({ url:'/operation/delete', type:'post', data:params, json:false, mask:true,replace:true})
+            Http.AjaxService({ url:'/operation/delete', type:'post', data:params, json:false})
             .then(function(res){
                 callback(res)
             });
         },
         updateInvitationCode : function (params,callback) { //机构员工管理更新邀请码
-            Http.AjaxService({ url:'/operation/updateInvitationCode', type:'post', data:params, json:false, mask:true,replace:true})
+            Http.AjaxService({ url:'/operation/updateInvitationCode', type:'post', data:params, json:false})
             .then(function(res){
                 callback(res)
             });
         },
         queryShoppingCartList:function(params,callback){ //购物车数据列表
-            Http.AjaxService({ url:'/shoppingCart/shoppingInfo', type:'get', data:params, json:false, mask:true,replace:true})
+            Http.AjaxService({ url:'/shoppingCart/shoppingInfo', type:'get', data:params, json:false})
             .then(function(res){
                 callback(res)
             });
         },
         shoppingCartUpdate:function(params,callback){//更新商品增减
-            Http.AjaxService({ url:'/shoppingCart/update', type:'post', data:params, json:false, mask:true,replace:true})
+            Http.AjaxService({ url:'/shoppingCart/update', type:'post', data:params, json:false})
             .then(function(res){
                 callback(res)
             });
         },
         shoppingCartDelete:function(params,callback) {//删除购物车商品
-            Http.AjaxService({ url:'/shoppingCart/delete', type:'post', data:params, json:false, mask:true,replace:true})
+            Http.AjaxService({ url:'/shoppingCart/delete', type:'post', data:params, json:false})
             .then(function(res){
                 callback(res)
             });
         },
         queryOrderConfirmInfo:function(params,callback){ //购物车数据列表
-            Http.AjaxService({ url:'/order/confirm', type:'get', data:params, json:true, mask:true,replace:true})
+            Http.AjaxService({ url:'/order/confirm', type:'get', data:params, json:true})
             .then(function(res){
                 callback(res)
             });
         },
         queryAddressList:function(params,callback){ //地址列表
-            Http.AjaxService({ url:'/personalCenter/findAddress', type:'get', data:params, json:true, mask:true,replace:true})
+            Http.AjaxService({ url:'/personalCenter/findAddress', type:'get', data:params, json:true})
             .then(function(res){
                 callback(res)
             });
         },
         deleteNewAddress:function(params,callback){ //删除地址
-            Http.AjaxService({ url:'/personalCenter/deleteAddress', type:'get', data:params, json:true, mask:true,replace:true})
+            Http.AjaxService({ url:'/personalCenter/deleteAddress', type:'get', data:params, json:true})
             .then(function(res){
                 callback(res)
             });
         },
         addNewAddress:function(params,callback) {//保存地址
-            Http.AjaxService({ url:'/personalCenter/saveAddress', type:'post', data:params, json:false, mask:true,replace:true})
+            Http.AjaxService({ url:'/personalCenter/saveAddress', type:'post', data:params, json:false})
             .then(function(res){
                 callback(res)
             });
         },
         defaultAddress:function(params,callback) {//设为默认地址
-            Http.AjaxService({ url:'/personalCenter/defaultAddress', type:'post', data:params, json:false, mask:true,replace:true})
+            Http.AjaxService({ url:'/personalCenter/defaultAddress', type:'post', data:params, json:false})
             .then(function(res){
                 callback(res)
             });
         },
         getOrderPostage:function(params,callback){ //获取邮费信息
-            Http.AjaxService({ url:'/order/postage', type:'get', data:params, json:true, mask:false,replace:true})
+            Http.AjaxService({ url:'/order/postage', type:'get', data:params, json:true})
             .then(function(res){
                 callback(res)
             });
         },
         getFindInvoice:function(params,callback){ //获取发票信息
-            Http.AjaxService({ url:'/personalCenter/findInvoice', type:'get', data:params, json:true, mask:false,replace:true})
+            Http.AjaxService({ url:'/personalCenter/findInvoice', type:'get', data:params, json:true})
             .then(function(res){
                 callback(res)
             });
         },
         confirmOrder:function (params,callback) {//提交订单
-            Http.AjaxService({ url:'/order/submit', type:'post', data:params, json:false, mask:true,replace:true})
+            Http.AjaxService({ url:'/order/submit', type:'post', data:params, json:false})
             .then(function(res){
                 callback(res)
             });
         },
         updateInvoice:function (params,callback) {//保存发票信息
-            Http.AjaxService({ url:'/personalCenter/invoice', type:'post', data:params, json:false, mask:true,replace:true})
+            Http.AjaxService({ url:'/personalCenter/invoice', type:'post', data:params, json:false})
             .then(function(res){
                 callback(res)
             });

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

@@ -25,13 +25,13 @@
                 <form>
                     <div class="formLine">
                         <p><em>*</em>姓名：</p>
-                        <input type="text" v-model.trim="advisory.name" placeholder="请输入您的姓名" :rule="rule.name" maxlength="50" @blur="blurHandle($event)" unselectable="on" needverify>
+                        <input type="text" v-model.trim="advisory.name" placeholder="请输入您的姓名" :rule="rule.name" maxlength="6" @blur="blurHandle($event)" unselectable="on" needverify>
                         <i class="checked icon mIcon"></i>
                         <span class="errTips icon mIcon" tips="请输入正确的联系人姓名"></span>
                     </div>
                     <div class="formLine">
                         <p><em>*</em>手机号：</p>
-                        <input type="text" v-model.trim="advisory.phone" placeholder="请输入您的常用手机号" :rule="rule.phone" maxlength="12" @blur="blurHandle($event)" needverify>
+                        <input type="text" v-model.trim="advisory.phone" placeholder="请输入您的常用手机号" :rule="rule.phone" maxlength="11" @blur="blurHandle($event)" needverify>
                         <i class="checked icon mIcon"></i>
                         <span class="errTips icon mIcon" tips="请输入有效电话号码"></span>
                     </div>
@@ -44,13 +44,13 @@
             <form>
                 <div class="formLine">
                     <p><em>*</em>联系人：</p>
-                    <input type="text" v-model.trim="clubUser.name" placeholder="请输入联系人姓名" :rule="rule.name" maxlength="50" @blur="blurHandle($event)" needverify>
+                    <input type="text" v-model.trim="clubUser.name" placeholder="请输入联系人姓名" :rule="rule.name" maxlength="6" @blur="blurHandle($event)" needverify>
                     <i class="checked icon mIcon"></i>
                     <span class="errTips icon mIcon" tips="请输入正确的联系人姓名"></span>
                 </div>
                 <div class="formLine" >
                     <p><em>*</em>手机号(<span>手机号可用作登录账号</span>)：</p>
-                    <input  class="massageBtn"  type="text" v-model.trim="clubUser.phone" placeholder="请输入您的常用手机号" :rule="rule.phone" maxlength="12" @blur="blurHandle($event)" needverify>
+                    <input  class="massageBtn"  type="text" v-model.trim="clubUser.phone" placeholder="请输入您的常用手机号" :rule="rule.phone" maxlength="11" @blur="blurHandle($event)" needverify>
                     <i class="checked icon mIcon"></i>
                     <span class="errTips icon mIcon" tips="请输入有效电话号码"></span>
                 </div>
@@ -59,18 +59,18 @@
                     <input type="text" v-model.trim="clubUser.code" 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="getMobileCodeFn" :class="[isMobileDisabled  ? 'disabled' : '']">{{ mobileCodeText }}</a>
+                    <a class="getCode" href="javascript:void(0);" @click="getMobileImage" :class="[isMobileDisabled  ? 'disabled' : '']">{{ mobileCodeText }}</a>
                 </div>
                 <div class="formLine">
                     <p><em>*</em>登录密码：</p>
-                    <input type="password" v-model.trim="clubUser.password" autocomplete="off" placeholder="请输入8-16位数字和字母组合" :rule="rule.password" maxlength="16" @blur="blurHandle($event)" needverify>
+                    <input type="password" v-model.trim="clubUser.password" autocomplete="new-password" placeholder="请输入8-16位数字和字母组合" :rule="rule.password" maxlength="32" @blur="blurHandle($event)" needverify>
                     <i class="checked icon mIcon"></i>
                     <span class="errTips icon mIcon" tips="8-16位数字或字母或字符"></span>
                     <i class="icon showPwd" @click="showPassword($event)"></i>
                 </div>
                 <div class="formLine">
                     <p><em>*</em>确认密码：</p>
-                    <input type="password" v-model.trim="clubUser.password2" placeholder="请再次确认密码" :rule="rule.password" maxlength="16" @blur="blurHandle($event)" needverify>
+                    <input type="password" v-model.trim="clubUser.password2" autocomplete="new-password" placeholder="请再次确认密码" :rule="rule.password" maxlength="32" @blur="blurHandle($event)" needverify>
                     <i class="checked icon mIcon"></i>
                     <span class="errTips icon mIcon" tips="8-16位数字或字母或字符"></span>
                     <i class="icon showPwd" @click="showPassword($event)"></i>
@@ -81,7 +81,7 @@
                         我已阅读并同意<a href="javascript:void(0);">《机构协议》</a><a href="javascript:void(0);">《用户协议》</a>及<a href="javascript:void(0);">《隐私权政策》</a>
                     </p>
                     <span class="errTips icon mIcon show" v-if="isShowAgree">请阅读并同意协议</span>
-                    <button class="btn" type="button" @click="clubRegister()">注册</button>
+                    <div class="btn"  @click="clubRegister()">注册</div>
                 </div>
             </form>
         </div>
@@ -94,19 +94,19 @@
             <form>
                 <div class="formLine">
                     <p><em>*</em>邮箱(<span>邮箱可用作登录账号，请使用公司邮箱或法人邮箱</span>)：</p>
-                    <input type="text" v-model.trim="clubUpgradeUser.name" placeholder="请输入邮箱地址" :rule="rule.name" maxlength="50" @blur="blurHandle($event)" needverify>
+                    <input type="text" v-model.trim="clubUpgradeUser.contractEmail1" 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><em>*</em>机构名称：</p>
-                    <input type="text" v-model.trim="clubUpgradeUser.name" placeholder="请与营业执照的注册名称保持一致" :rule="rule.name" maxlength="50" @blur="blurHandle($event)" needverify>
+                    <input type="text" v-model.trim="clubUpgradeUser.name" placeholder="请与营业执照的注册名称保持一致" :rule="rule.name" maxlength="30" @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.name" placeholder="请输入机构简称" :rule="rule.name" maxlength="50" needverify>
+                    <input type="text" v-model.trim="clubUpgradeUser.sname" placeholder="请输入机构简称" maxlength="10" >
                 </div>
                 <div class="formLine">
                     <p><em>*</em>联系地址：</p>
@@ -123,16 +123,14 @@
                             <option value="" >请选择</option>
                             <option v-for="(item ,index) in townArray" :key="index" :value="item.townID"  >{{item.name}}</option>
                         </select>
-                        <textarea placeholder="建议您如实填写详细地址，例如：街道名称，门牌号码，楼层和房间号等信息" v-model="clubUpgradeUser.address"></textarea>
+                        <textarea placeholder="建议您如实填写详细地址，例如：街道名称，门牌号码，楼层和房间号等信息"  v-model="clubUpgradeUser.address"></textarea>
                     </div>
                     <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.businessLicense" placeholder="请输入统一社会信用代码" :rule="rule.license" maxlength="50" @blur="blurHandle($event)" needverify>
-                    <i class="checked icon mIcon"></i>
-                    <span class="errTips icon mIcon" tips="请输入正确的统一社会信用代码"></span>
+                    <p>营业执照编号：</p>
+                    <input type="text" v-model.trim="clubUpgradeUser.socialCreditCode" placeholder="请输入统一社会信用代码" maxlength="18">
                 </div>
                 <div class="formLine clear">
                     <div class="form-upload">
@@ -155,8 +153,8 @@
                 <div class="formLine clear">
                     <div class="form-upload">
                         <p>门头照：</p>
-                        <div class="form-upload-image" v-if="clubUpgradeUser.uploadMentuzImage!=''">
-                            <img class="upload-img" :src="clubUpgradeUser.uploadMentuzImage" alt="" id="uploadMentuzImage" @click="showViewerImageFn1()">
+                        <div class="form-upload-image" v-if="clubUpgradeUser.headpic!=''">
+                            <img class="upload-img" :src="clubUpgradeUser.headpic" alt="" id="uploadMentuzImage" @click="showViewerImageFn1()">
                             <i class="icon mIcon" @click="deleteMentuzImage()"></i>
                         </div>
                         <div class="formLine-file" v-else>
@@ -167,21 +165,21 @@
                 </div>
                 <div class="formLine">
                     <p><em>*</em>机构类型：</p>
-                    <label class="diyBox"><input type="radio" name="firstShopType" v-model="clubUpgradeUser.firstShopType" value="1" ><i class="icon mIcon">医美</i></label>
-                    <label class="diyBox"><input type="radio" name="firstShopType" v-model="clubUpgradeUser.firstShopType" value="2" checked><i class="icon mIcon">生美</i></label>
+                    <label class="diyBox"><input type="radio" name="firstShopType" v-model="clubUpgradeUser.firstClubType" value="0" ><i class="icon mIcon">医美</i></label>
+                    <label class="diyBox"><input type="radio" name="firstShopType" v-model="clubUpgradeUser.firstClubType" value="1" checked><i class="icon mIcon">生美</i></label>
                     <span class="errTips icon mIcon" tips="请选择公司类型"></span>
                 </div>
-                <div v-show="clubUpgradeUser.firstShopType == 1" class="formLine">
-                    <label class="diyBox second"><input type="radio" name="department" v-model="clubUpgradeUser.department" value="1" checked><i class="icon mIcon">诊所</i></label>
-                    <label class="diyBox second"><input type="radio" name="department" v-model="clubUpgradeUser.department" value="2" ><i class="icon mIcon">门诊</i></label>
-                    <label class="diyBox second"><input type="radio" name="department" v-model="clubUpgradeUser.department" value="3" ><i class="icon mIcon">医院</i></label>
+                <div v-show="clubUpgradeUser.firstClubType == 0" class="formLine">
+                    <label class="diyBox second"><input type="radio" name="secondClubType" v-model="clubUpgradeUser.secondClubType" value="1" checked><i class="icon mIcon">诊所</i></label>
+                    <label class="diyBox second"><input type="radio" name="secondClubType" v-model="clubUpgradeUser.secondClubType" value="2" ><i class="icon mIcon">门诊</i></label>
+                    <label class="diyBox second"><input type="radio" name="secondClubType" v-model="clubUpgradeUser.secondClubType" value="3" ><i class="icon mIcon">医院</i></label>
                     <span class="errTips icon mIcon" tips="请选择公司类型"></span>
                 </div>
-                <div v-show="clubUpgradeUser.firstShopType == 1" class="formLine">
+                <div v-show="clubUpgradeUser.firstClubType == 0" class="formLine">
                     <div class="form-upload">
                         <p>资质：</p>
-                        <div class="form-upload-image" v-if="clubUpgradeUser.uploadMedicalImage!=''">
-                            <img class="upload-img" :src="clubUpgradeUser.uploadMedicalImage" alt="" id="uploadMedicalImage" @click="showViewerImageFn2()">
+                        <div class="form-upload-image" v-if="clubUpgradeUser.medicalPracticeLicenseImg!=''">
+                            <img class="upload-img" :src="clubUpgradeUser.medicalPracticeLicenseImg" alt="" id="medicalPracticeLicenseImg" @click="showViewerImageFn2()">
                             <i class="icon mIcon" @click="deleteMedicalImage()"></i>
                         </div>
                         <div class="formLine-file" v-else>
@@ -195,15 +193,15 @@
                         <div class="wen-tips">点击图片可放大图片</div>
                     </div>
                 </div>
-                <div v-if="clubUpgradeUser.department == 2 || clubUpgradeUser.department == 3" class="formLine">
+                <div v-if="clubUpgradeUser.secondClubType == 2 || clubUpgradeUser.secondClubType == 3" class="formLine">
                     <p>科室：</p>
-                    <input type="text" v-model.trim="clubUpgradeUser.name" placeholder="请填写您所经营的科室,用逗号隔开.(至少三个)" :rule="rule.name" maxlength="50">
+                    <input type="text" v-model.trim="clubUpgradeUser.department" placeholder="请填写您所经营的科室,用逗号隔开.(至少三个)" maxlength="50">
                 </div>
-                <div class="formLine clear" v-if="clubUpgradeUser.firstShopType == 1">
+                <div class="formLine clear" v-if="clubUpgradeUser.firstClubType == 0">
                     <p><em>*</em>主营内容：</p>
                     <p class="business clear">
                         <label v-for="pro in mentuzCampNullList" class="diyBox second" >
-                            <input type="checkbox" name="secondShopType" v-model="clubUpgradeUser.mainPros" :value="pro.name" >
+                            <input type="checkbox" name="secondClubType" v-model="userMainPros" :value="pro.name" >
                             <i class="icon mIcon">{{pro.name}}</i>
                         </label>
                     </p>
@@ -213,11 +211,11 @@
                     </p>
                     <span class="errTips icon mIcon" tips="请选择或添加主营产品"></span>
                 </div>
-                <div class="formLine clear" v-if="clubUpgradeUser.firstShopType == 2">
+                <div class="formLine clear" v-if="clubUpgradeUser.firstClubType == 1">
                     <p><em>*</em>主营内容：</p>
                     <p class="business clear">
                         <label v-for="pro in medicaCampNullList" class="diyBox second">
-                            <input type="checkbox" name="secondShopType" v-model="clubUpgradeUser.mainPros" :value="pro.name" >
+                            <input type="checkbox" name="secondClubType" v-model="userMainPros" :value="pro.name" >
                             <i class="icon mIcon">{{pro.name}}</i>
                         </label>
                     </p>
@@ -228,12 +226,30 @@
                     <span class="errTips icon mIcon" tips="请选择或添加主营产品"></span>
                 </div>
                 <div class="subLine">
-                    <button class="btn-upgrade none" type="button" @click="clubLogin()">先跳过,以后再升级</button>
-                    <button class="btn-upgrade" type="button" @click="clubRegister()">确认升级并提交审核</button>
+                    <button class="btn-upgrade none" type="button" @click="clubLoginIndex()">先跳过,以后再升级</button>
+                    <button class="btn-upgrade" type="button" @click="clubUpgrade()">确认升级并提交审核</button>
                 </div>
             </form>
         </div>
     </div>
+    <div class="content-model"  :class="isCodeModel ? 'active' : ''">
+        <div class="model-main">
+            <div class="model-title"><p>获取短信验证码</p><i class="icon mIcon icon-close"  @click="closeCodeModel"></i></div>
+            <div class="model-content">
+                <div class="model-form">
+                    <input class="input" type="text" placeholder="请输入图形验证码" v-model="imageCode" maxlength="4">
+                    <div class="image"><img :src="codeImagePath" alt=""></div>
+                    <div class="refresh" @click="refreshCodeImage">
+                        <i class="icon mIcon"></i>
+                        <span>刷新</span>
+                    </div>
+                </div>
+                <div class="model-button">
+                    <div class="button"  @click="getMobileCodeFn">获取短信验证码</div>
+                </div>
+            </div>
+        </div>
+    </div>
 </div>
 
 <!-- 引入底部 -->

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

@@ -32,33 +32,33 @@
         </div>
         <div v-else>
             <div class="title">欢迎供应商入驻</div>
-            <div class="registerShop">
+            <div class="registerShop clear">
                 <!--供应商注册表单-->
                 <form>
                     <h6 class="tit">账户信息</h6>
                     <div class="formLine">
                         <p><em>*</em>手机号(<span>手机号可用作登录账号</span>)：</p>
-                        <input type="text" v-model.trim="supplierUser.phone" placeholder="请输入您的常用手机号" :rule="rule.phone" maxlength="12" @blur="blurHandle($event)" needverify>
+                        <input class="massageBtn"  type="text" v-model.trim="supplierUser.bindMobile" placeholder="请输入您的常用手机号" :rule="rule.phone" maxlength="11" @blur="blurHandle($event)" needverify>
                         <i class="checked icon mIcon"></i>
                         <span class="errTips icon mIcon" tips="请输入有效电话号码"></span>
                     </div>
                     <div class="formLine code">
                         <p><em>*</em>短信验证码：</p>
-                        <input type="text" v-model.trim="supplierUser.code" placeholder="请输入短信验证码" :rule="rule.code" maxlength="12" @blur="blurHandle($event)" needverify>
+                        <input type="text" v-model.trim="supplierUser.mobileCode" 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);">获取短信验证码</a>
+                        <a class="getCode" href="javascript:void(0);" @click="getMobileImage">获取短信验证码</a>
                     </div>
                     <div class="formLine">
                         <p><em>*</em>登录密码：</p>
-                        <input type="password" v-model.trim="supplierUser.password" placeholder="请输入8-16位数字和字母组合" :rule="rule.password" maxlength="16" @blur="blurHandle($event)" needverify>
+                        <input type="password" v-model.trim="supplierUser.password" autocomplete="new-password" placeholder="请输入8-16位数字和字母组合" :rule="rule.password" maxlength="32" @blur="blurHandle($event)" needverify>
                         <i class="checked icon mIcon"></i>
                         <span class="errTips icon mIcon" tips="8-16位数字或字母或字符"></span>
                         <i class="icon showPwd" @click="showPassword($event)"></i>
                     </div>
                     <div class="formLine">
                         <p><em>*</em>确认密码：</p>
-                        <input type="password" v-model.trim="supplierUser.password2" placeholder="请再次确认密码" :rule="rule.password" maxlength="16" @blur="blurHandle($event)" needverify>
+                        <input type="password" v-model.trim="supplierUser.passWordConfirm" autocomplete="new-password" placeholder="请再次确认密码" :rule="rule.password" maxlength="32" @blur="blurHandle($event)" needverify>
                         <i class="checked icon mIcon"></i>
                         <span class="errTips icon mIcon" tips="8-16位数字或字母或字符"></span>
                         <i class="icon showPwd" @click="showPassword($event)"></i>
@@ -66,67 +66,61 @@
                     <h6 class="tit">基本信息</h6>
                     <div class="formLine">
                         <p><em>*</em>公司名称：</p>
-                        <input type="text" v-model.trim="supplierUser.shopName" placeholder="请与营业执照的注册名称保持一致" :rule="rule.name" maxlength="50" @blur="blurHandle($event)" needverify>
+                        <input type="text" v-model.trim="supplierUser.name" placeholder="请与营业执照的注册名称保持一致" :rule="rule.name" maxlength="30" @blur="blurHandle($event)" needverify>
                         <i class="checked icon mIcon"></i>
                         <span class="errTips icon mIcon" tips="请输入正确的公司名称"></span>
                     </div>
                     <div class="formLine">
                         <p><em>*</em>联系人：</p>
-                        <input type="text" v-model.trim="supplierUser.name" placeholder="请输入联系人姓名" :rule="rule.name" maxlength="50" @blur="blurHandle($event)" needverify>
+                        <input type="text" v-model.trim="supplierUser.linkMan" placeholder="请输入联系人姓名" :rule="rule.name" maxlength="10" @blur="blurHandle($event)" needverify>
                         <i class="checked icon mIcon"></i>
                         <span class="errTips icon mIcon" tips="请输入正确的联系人姓名"></span>
                     </div>
                     <div class="formLine">
                         <p>邮箱(<span>邮箱可用作登录账号，请使用公司邮箱或法人邮箱</span>)：</p>
-                        <input type="text" v-model.trim="supplierUser.email" placeholder="请输入邮箱地址" maxlength="50">
+                        <input type="text" v-model.trim="supplierUser.email" placeholder="请输入邮箱地址" maxlength="40">
                         <span class="errTips"></span>
                     </div>
                     <h6 class="tit">详细信息</h6>
                     <div class="formLine">
                         <p>公司简称：</p>
-                        <input type="text" v-model.trim="supplierUser.shopAbbr" placeholder="请输入公司简称" maxlength="50">
+                        <input type="text" v-model.trim="supplierUser.sname" placeholder="请输入公司简称" maxlength="10">
                         <span class="errTips"></span>
                     </div>
                     <div class="formLine">
                         <p><em>*</em>联系地址：</p>
-                        <div class="address">
-                            <select><option value="">请选择</option></select>
-                            <select><option value="">请选择</option></select>
-                            <select><option value="">请选择</option></select>
-                            <textarea placeholder="建议您如实填写详细收货地址，例如：街道名称，门牌号码，楼层和房间号等信息"></textarea>
-                        </div>
+                        <select name="provinceID" id="cProvince" @change="ChangeProvince">
+                            <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)" >
+                            <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)">
+                            <option value="">请选择</option>
+                            <option v-for="(item ,index) in townArray" :key="index" :value="item.townID"  >{{item.name}}</option>
+                        </select>
+                        <textarea placeholder="建议您如实填写详细地址，例如：街道名称，门牌号码，楼层和房间号等信息"  v-model="supplierUser.address"></textarea>
                         <i class="checked icon mIcon"></i>
                         <span class="errTips icon mIcon" tips="请输入正确的联系地址"></span>
                     </div>
                     <div class="formLine">
-                        <p><em>*</em>公司类型：</p>
-                        <label class="diyBox"><input type="radio" name="firstShopType" v-model="supplierUser.firstShopType" value="1" ><i class="icon mIcon">医疗</i></label>
-                        <label class="diyBox"><input type="radio" name="firstShopType" v-model="supplierUser.firstShopType" value="2" checked><i class="icon mIcon">非医疗</i></label>
-                        <span class="errTips icon mIcon mIcon" tips="请选择公司类型"></span>
-                    </div>
-                    <div v-show="supplierUser.firstShopType == 1" class="formLine">
-                        <p><em>*</em>医疗类型：</p>
-                        <label class="diyBox second"><input type="radio" name="secondShopType" v-model="supplierUser.secondShopType" value="1" ><i class="icon mIcon">一类器械</i></label>
-                        <label class="diyBox second"><input type="radio" name="secondShopType" v-model="supplierUser.secondShopType" value="2" checked><i class="icon mIcon">二类器械</i></label>
-                        <label class="diyBox second"><input type="radio" name="secondShopType" v-model="supplierUser.secondShopType" value="3" ><i class="icon mIcon">三类器械</i></label>
-                        <label class="diyBox second"><input type="radio" name="secondShopType" v-model="supplierUser.secondShopType" value="4" checked><i class="icon mIcon">其他</i></label>
-                        <span class="errTips icon mIcon" tips="请选择公司类型"></span>
-                    </div>
-                    <div class="formLine">
-                        <p><em>*</em>营业执照：</p>
-                        <input type="text" v-model.trim="supplierUser.businessLicense" placeholder="请输入统一社会信用代码" :rule="rule.license" maxlength="50" @blur="blurHandle($event)" needverify>
+                        <p><em>*</em>营业执照编号：</p>
+                        <input type="text" v-model.trim="supplierUser.socialCreditCode" placeholder="请输入统一社会信用代码" :rule="rule.license" maxlength="19" @blur="blurHandle($event)" needverify>
                         <i class="checked icon mIcon"></i>
                         <span class="errTips icon mIcon" tips="请输入正确的统一社会信用代码"></span>
                     </div>
                     <div class="formLine clear">
                         <div class="form-upload">
                             <p><em>*</em>营业执照图片：</p>
-                            <div v-if="supplierUser.businessLicenseImage!=''">
-                                <img :src="supplierUser.businessLicenseImage" alt="">
+                            <div class="form-upload-image" v-if="supplierUser.businessLicenseImage!=''">
+                                <img class="upload-img" :src="supplierUser.businessLicenseImage" alt="" id="businessLicenseImage" @click="showViewerImageFn()">
+                                <i class="icon mIcon" @click="deleteBusinessImage()"></i>
                             </div>
                             <div class="formLine-file" v-else>
-                                <input class="file" type="file" v-model="supplierUser.businessLicenseImage">
-                                <i class="icon file-biss"></i>
+                                <input ref="businessLicenseImage" class="file" type="file" accept="image/png,image/jpeg,image/gif,image/jpg"  @change="uploadBusinessLicenseImageFn">
+                                <i class="icon mIcon file-biss"></i>
                             </div>
                             <span class="errTips icon mIcon"></span>
                         </div>
@@ -135,26 +129,56 @@
                             <div class="wen-tips">点击图片可放大图片</div>
                         </div>
                     </div>
+                    <div class="formLine">
+                        <p><em>*</em>公司类型：</p>
+                        <label class="diyBox"><input type="radio" name="firstShopType" v-model="supplierUser.firstShopType" value="1" ><i class="icon mIcon">医疗</i></label>
+                        <label class="diyBox"><input type="radio" name="firstShopType" v-model="supplierUser.firstShopType" value="2" checked><i class="icon mIcon">非医疗</i></label>
+                        <span class="errTips icon mIcon mIcon" tips="请选择公司类型"></span>
+                    </div>
+                    <div v-if="supplierUser.firstShopType == 1" class="formLine">
+                        <p><em>*</em>医疗类型：</p>
+                        <label class="diyBox second"><input type="radio" name="secondShopType" v-model="supplierUser.secondShopType" value="1" ><i class="icon mIcon">一类器械</i></label>
+                        <label class="diyBox second"><input type="radio" name="secondShopType" v-model="supplierUser.secondShopType" value="2" checked><i class="icon mIcon">二类器械</i></label>
+                        <label class="diyBox second"><input type="radio" name="secondShopType" v-model="supplierUser.secondShopType" value="3" ><i class="icon mIcon">三类器械</i></label>
+                        <label class="diyBox second"><input type="radio" name="secondShopType" v-model="supplierUser.secondShopType" value="4" checked><i class="icon mIcon">其他</i></label>
+                        <span class="errTips icon mIcon" tips="请选择公司类型"></span>
+                    </div>
                     <div class="formLine">
                         <p><em>*</em>主营产品：</p>
                         <p class="business">
-<!--                            <div class="diyBox second" v-for="pro in mainPros">-->
-<!--                        -->
-<!--                            </div>-->
-                            <label v-for="pro in mainPros" class="diyBox second"><input type="checkbox" name="secondShopType" v-model="supplierUser.mainPros" :value="pro" ><i class="icon mIcon">{{pro}}</i></label>
+                            <label v-for="pro in mentuzCampNullList" class="diyBox second"><input type="checkbox" name="secondShopType" v-model="userMainPros" :value="pro.name" ><i class="icon mIcon">{{pro.name}}</i></label>
                             <input type="text" placeholder="请输入其他自定义品项目" v-model.trim="mainProEdit">
                             <a href="javascript:void(0);" @click="mainProAdd()">确认添加</a>
                         </p>
                         <span class="errTips icon mIcon" tips="请选择或添加主营产品"></span>
                     </div>
                     <div class="subLine">
-                        <p><input type="checkbox">我已阅读并同意<a href="javascript:void(0);">《供应商协议》</a><a href="javascript:void(0);">《用户协议》</a>及<a href="javascript:void(0);">《隐私权政策》</a></p>
-                        <button class="btn" type="button" @click="supplierRegister()">同意并提交审核</button>
+                        <p>
+                            <span class="iconfont icon-weigouxuan" :class="isAgree ? 'icon-gouxuan' : 'icon-weigouxuan' " @click="checkedIsAgreeFn"></span>
+                            我已阅读并同意<a href="javascript:void(0);">《供应商协议》</a><a href="javascript:void(0);">《用户协议》</a>及<a href="javascript:void(0);">《隐私权政策》</a>
+                        </p>
+                        <span class="errTips icon mIcon show" v-if="isShowAgree">请阅读并同意协议</span>
+                        <div class="btn"  @click="supplierRegister()">同意并提交审核</div>
                     </div>
                 </form>
             </div>
         </div>
     </div>
+    <div class="content-model"  :class="isCodeModel ? 'active' : ''">
+        <div class="model-main">
+            <div class="model-title"><p>获取短信验证码</p><i class="icon mIcon icon-close"  @click="closeCodeModel"></i> </div>
+            <div class="model-content">
+                <div class="model-form">
+                    <input class="input" type="text" placeholder="请输入图形验证码" maxlength="4" v-model="imageCode">
+                    <div class="image"><img :src="codeImagePath" alt=""></div>
+                    <div class="refresh" @click="refreshCodeImage"><i class="icon mIcon"></i></div>
+                </div>
+                <div class="model-button">
+                    <div class="button"  @click="getMobileCodeFn">获取短信验证码</div>
+                </div>
+            </div>
+        </div>
+    </div>
 </div>
 
 <!-- 引入底部 -->