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

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

@@ -63,7 +63,7 @@ footer{display:none}
 .loginForm h2{font-size:3.1vw;font-weight:normal;line-height:5.4vw;color:#627386}
 .loginForm form{width:93.4vw;margin:54vw auto 0}
 .loginForm .formLine{height:16.4vw;padding:0;}
-.loginForm input{height:11.6vw;line-height:11.6vw;}
+.loginForm input{height:11.2vw;line-height:6vw;padding: 2.6vw 0;box-sizing: border-box;}
 .loginForm .checked{top:3.6vw;right:3.6vw;}
 .loginForm .forget{text-align:right;color:#4a4f58;font-size:3.4vw;line-height:3.4vw;margin-bottom:4.8vw}
 .loginForm .submit .btn{display:inline-block;box-sizing:border-box;width:100%;height:11.2vw;line-height:11.2vw;background-color:#ffe6dc;border-radius:2px;border:solid 1px #e15616;text-align:center;color:#e15616;font-size:3.4vw;margin-bottom:4.8vw}

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

@@ -35,6 +35,7 @@ footer .footTop{display:none;}
 .formLine .formLine-file .file-biss{background: url("/img/account/icon-bisse.png") no-repeat;}
 .formLine .formLine-file .file-door{background: url("/img/account/icon-door.png") no-repeat;}
 .formLine .formLine-file .file-zizhi{background: url("/img/account/icon-zizhi.png") no-repeat;}
+
 .signAccount{width:498px;margin:0 auto;min-height: 900px;}
 .signAccount .title{height:42px;line-height:42px;font-weight:bold;font-size:32px;color:#22272e;text-align:center;padding:30px}
 .signAccount .advisory{height:38px;position:relative;display:inline-block;margin-bottom:20px;cursor:pointer;}
@@ -58,7 +59,6 @@ footer .footTop{display:none;}
 .formLine .business{height:auto;position:relative}
 .formLine .business input[type="text"] {width: 350px;display: block;float: left;margin-right: 15px;}
 .formLine .business a {display: block;float: left; width: 92px;height: 32px;line-height: 34px;font-size: 14px;color: #e15616;background-color: #ffe6dc;border-radius: 2px;border: solid 1px #e15616;text-align: center;}
-.subLine-p{text-align: center;cursor: pointer;text-decoration: underline;color: #2D93CA;margin: 20px 0;}
 .supplierConfirm{width: 100%;height: 100%;position: fixed;top:0;left:0;z-index: 999;background: rgba(0,0,0,.3);}
 
 
@@ -107,9 +107,21 @@ footer{display:none}
 .advisoryInfo .formLine p{line-height:8vw}
 .advisoryInfo .info{margin-bottom:3vw;color:#1890f9;font-size:3.1vw}
 .advisoryInfo .btn{display:block;width:46vw;height:9.8vw;line-height:9.8vw;margin:3vw auto 0;font-size:3.4vw;background-color:#ffe6dc;border-radius:2px;border:solid 1px #e15616;color:#e15616;text-align:center}
-
-
-
-
+.formLine .form-upload{width: 36vw;height: auto;float: left;margin-right: 4vw;}
+.formLine .formLine-file{width: 36vw;height: 25.3vw;position: relative;}
+.formLine .form-upload-tips{width: 4.8vw;height: 25.3vw;float: left;position: relative;}
+.formLine .form-upload-tips .mIcon{width: 4.8vw;height: 4.8vw;float: left;display: block;margin-top: 10vw;}
+.formLine .form-upload-tips .mIcon:before{width: 4.8vw;height: 4.8vw;background-position:-76.6vw -1.2vw;}
+.formLine .form-upload-tips .wen-tips{width: 36vw;height: 9.2vw;line-height: 9.2vw;text-align: center;color: #FFF;font-size: 2.4vw; background-color: #1890f9;box-shadow: 0px 3px 6px 0px rgba(24, 144, 249, 0.17); position: absolute;bottom: 0;left: -1vw;border-radius: 3px;display: none;}
+.formLine .form-upload-tips .wen-tips:before{content: ''; width: 0px;height: 0px;border-width: 8px;border-style: solid;border-color: transparent transparent #1890f9 transparent;position: absolute;top: -15px;left: 5px;}
+.formLine .form-upload-tips:hover .wen-tips{display: block;}
+.formLine .file{width: 36vw;height: 25.3vw;opacity: 0;position: absolute;top: 0;left: 0;z-index: 999;cursor: pointer;}
+.formLine .formLine-file .mIcon{width: 36vw;height: 25.3vw;display: block;}
+.formLine .formLine-file .file-biss{background: url("/img/account/icon-bisse.png") no-repeat;background-size: cover;}
+.formLine .formLine-file .file-door{background: url("/img/account/icon-door.png") no-repeat;background-size: cover;}
+.formLine .formLine-file .file-zizhi{background: url("/img/account/icon-zizhi.png") no-repeat;background-size: cover;}
+.subLine{margin-top:2vw;float: left;}
+.subLine .btn-upgrade {cursor: pointer;display: block;width: 93.4vw;height: 11.2vw;line-height: 50px;background-color: #e15616;border-radius: 0.2vw;text-align: center;font-size: 3.4vw;color: #FFF;float: left;margin-bottom: 2.8vw;}
+.subLine .btn-upgrade.none{border: 1px solid #E15616;background-color: #ffe6dc;box-shadow: 0px 3px 6px 0px rgba(249, 75, 75, 0.17);color: #e15616;}
 
 }

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

@@ -57,7 +57,7 @@
 */
 @media screen and (max-width:768px){
 .formLine{width:100%;position:relative;font-size:3.4vw;}
-.formLine input,.formLine select{box-sizing:border-box;width:100%;height:11.2vw;line-height:11.2vw;text-indent:1.2em;font-size:3.4vw;text-align:left;background-color:#ffffff;border-radius:2px;border:solid 1px #b8bfca;}
+.formLine input,.formLine select{box-sizing:border-box;width:100%;height:11.2vw;line-height:6vw;padding: 2.6vw 0;text-indent:1.2em;font-size:3.4vw;text-align:left;background-color:#ffffff;border-radius:2px;border:solid 1px #b8bfca;}
 .formLine textarea{display:inline-block;width:100%;height:42.4vw;box-sizing:border-box;border:solid 1px #b8bfca;padding:3vw;line-height:5vw;margin-top:2.7vw;}
 .formLine select {width: 29.5vw;}
 .formLine.error input{border-color:#f94b4b}
@@ -70,7 +70,7 @@
 .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}
-.formLine .errTips:before{width:4.4vw;height:4.4vw;background-position:33% 32.1%;vertical-align:top}
+.formLine .errTips:before{width:4.4vw;height:4.4vw;background-position:-26.2vw -9.2vw;vertical-align:top}
 .formLine .showPwd{display:none;}
 .formLine.code input{width:57.4vw}
 .formLine.code .checked{right:auto;left:50vw;}
@@ -87,7 +87,7 @@
 .formLine .diyBox{width:34vw;height:11.2vw;line-height:11.2vw;margin-right: 1.5vw;box-sizing:border-box;text-align:center;display:inline-block}
 .formLine .diyBox.second{width:20vw;}
 .formLine .diyBox input{display:none}
-.formLine .diyBox i:before{position:absolute;right:0;bottom:0;display:none;width:6vw;height:6vw;background-position: 38% 18.5%;}
+.formLine .diyBox i:before{position:absolute;right:0;bottom:0;display:none;width:6vw;height:6vw;background-position:-75vw -7.8vw;}
 .formLine .diyBox input:checked + i{border-color:#e15616;color:#e15616}
 .formLine .diyBox input:checked + i:before{display:block}
 

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

@@ -25,7 +25,7 @@ var registerPage = new Vue({
             phone:'',
             code:'',
             address:'',
-            mainPros:'',
+            mainPros:[],
             businessLicenseImage:'',
             businessLicense:'',
             secondShopType:'',
@@ -56,11 +56,11 @@ var registerPage = new Vue({
             {value:'3',name:'皮肤科'},
         ],
         medicaCampNullList: [
-            {value:'1',name:'美容'},
-            {value:'2',name:'美体'},
-            {value:'3',name:'美发'},
-            {value:'4',name:'皮肤管理'},
-            {value:'5',name:'光电'},
+            {name:'美容'},
+            {name:'美体'},
+            {name:'美发'},
+            {name:'皮肤管理'},
+            {name:'光电'},
             {value:'6',name:'综合类'},
             {value:'7',name:'中医养生'},
             {value:'8',name:'spa'},
@@ -81,9 +81,15 @@ var registerPage = new Vue({
     },
     methods: {
         mainProAdd: function(){
-            if (this.mainProEdit.length>0) {
-                if (this.mainPros.indexOf(this.mainProEdit)<0){
-                    this.mainPros.push(this.mainProEdit)
+            var _self = this;
+
+            if (_self.mainProEdit.length>0) {
+                if (_self.mainPros.indexOf(_self.mainProEdit)<0){
+                    if(_self.clubUpgradeUser.firstShopType == 1){
+                        _self.mentuzCampNullList.push(_self.mainProEdit);
+                    }else{
+                        _self.medicaCampNullList.push(_self.mainProEdit);
+                    }
                 }
             }
         },
@@ -154,18 +160,6 @@ var registerPage = new Vue({
                 });
             });
         },
-
-        supplierRegister: function(){//供应商注册提交
-            alertInfo('供应商注册');
-            console.log(JSON.stringify(this.supplierUser));
-        },
-        clickTab:function(index){
-            var _self = this;
-            _self.showTabContentIndex = index;
-            if(index == 2){
-                _self.showSupplierConfirm = true;
-            }
-        },
         getMobileCodeFn:function(){//机构注册获取注册短信验证码
             var _self = this;
             var pass = verifyCheack('.massageBtn');
@@ -204,10 +198,6 @@ var registerPage = new Vue({
                 })
             });
         },
-        showSupplier:function () {
-            var _self = this;
-            _self.showSupplierConfirm = false;
-        },
         showVadvisory:function(){
             var _self = this;
             _self.showClass = 'active';

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

@@ -3,35 +3,11 @@ var registerPage = new Vue({
     data: {
         showTabContentIndex:2,
         showSupplierConfirm:true,
-        advisoryStatus: false,
         showClass:'',
         mobilCount:0,
         mobileCodeText:'获取验证码',
         mobilTime:null,
         isMobileDisabled:false,
-        advisory:{
-            name: '',
-            phone: ''
-        },
-        clubUser: {
-            name:'',
-            phone:'',
-            code:'',
-            password:'',
-            password2:''
-        },
-        clubUpgradeUser: {
-            name:'',
-            phone:'',
-            code:'',
-            address:'',
-            mainPros:'',
-            businessLicenseImage:'',
-            businessLicense:'',
-            secondShopType:'',
-            firstShopType:'',
-            department:5
-        },
         supplierUser: {
             phone:'',
             code:'',
@@ -103,29 +79,7 @@ var registerPage = new Vue({
             var el = event.currentTarget;
             verifyHandle(el);
         },
-        postAdvisory: function(){//机构入驻咨询提交
-            var _self = this;
-            $('.advisoryInfo').find("[needverify]:visible").each(function (index, ele) {
-                if (!$(ele).siblings('.checked').hasClass("show")) {
-                    verifyHandle(ele);
-                }
-            });
-            var pass = ($('.errTips.show:visible').length === 0);
-            if (_self.advisoryStatus) { return false; }
-            this.$nextTick(function(){
-                if (!pass) { return false; }
-                _self.advisoryStatus = true;
-                UserApi.quickConsultation({name: _self.advisory.name,mobile: _self.advisory.phone},function (response) {
-                    _self.advisoryStatus = false;
-                    if(response.code === 0){
-                        alertInfo("您的信息已提交成功,采美工作人员会第一时间联系您");
-                    } else {
-                        alertInfo(response.msg);
-                    }
-                });
-            });
-        },
-        clubRegister: function(){ //机构注册提交
+        supplierRegister: function(){//供应商注册提交
             var _self = this;
             var pass = verifyForm();
             if (this.loginLoading) { return false; }
@@ -136,12 +90,12 @@ var registerPage = new Vue({
                     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,
+                    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){
@@ -154,18 +108,6 @@ var registerPage = new Vue({
                 });
             });
         },
-
-        supplierRegister: function(){//供应商注册提交
-            alertInfo('供应商注册');
-            console.log(JSON.stringify(this.supplierUser));
-        },
-        clickTab:function(index){
-            var _self = this;
-            _self.showTabContentIndex = index;
-            if(index == 2){
-                _self.showSupplierConfirm = true;
-            }
-        },
         getMobileCodeFn:function(){//机构注册获取注册短信验证码
             var _self = this;
             var pass = verifyCheack('.massageBtn');
@@ -208,14 +150,6 @@ var registerPage = new Vue({
             var _self = this;
             _self.showSupplierConfirm = false;
         },
-        showVadvisory:function(){
-            var _self = this;
-            _self.showClass = 'active';
-        },
-        closeVadvisory:function () {
-            var _self = this;
-            _self.showClass = '';
-        },
         checkedIsAgreeFn:function () {
             var _self = this;
             _self.isAgree = !_self.isAgree;
@@ -227,7 +161,6 @@ var registerPage = new Vue({
                 _self.isAgreed = 0;
             }
         }
-
     },
     created: function () {
 

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

@@ -1,237 +1,23 @@
 var registerPage = new Vue({
     el: "#registerPage",
     data: {
-        showTabContentIndex:2,
-        showSupplierConfirm:true,
-        advisoryStatus: false,
-        showClass:'',
-        mobilCount:0,
-        mobileCodeText:'获取验证码',
-        mobilTime:null,
-        isMobileDisabled:false,
-        advisory:{
-            name: '',
-            phone: ''
-        },
-        clubUser: {
-            name:'',
-            phone:'',
-            code:'',
-            password:'',
-            password2:''
-        },
-        clubUpgradeUser: {
-            name:'',
-            phone:'',
-            code:'',
-            address:'',
-            mainPros:'',
-            businessLicenseImage:'',
-            businessLicense:'',
-            secondShopType:'',
-            firstShopType:'',
-            department:5
-        },
-        supplierUser: {
-            phone:'',
-            code:'',
-            password:'',
-            password2:'',
-            shopName:'',
-            name:'',
-            email:'',
-            shopAbbr:'',
-            firstShopType:'2',
-            secondShopType: '',
-            mainPros: [],
-            businessLicense:'',
-            businessLicenseImage:''
-        },
-        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'},
-        ],
-        mainPros: ['产品','仪器','服务','整形'],
-        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: {
-        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);
-        },
-        postAdvisory: function(){//机构入驻咨询提交
-            var _self = this;
-            $('.advisoryInfo').find("[needverify]:visible").each(function (index, ele) {
-                if (!$(ele).siblings('.checked').hasClass("show")) {
-                    verifyHandle(ele);
-                }
-            });
-            var pass = ($('.errTips.show:visible').length === 0);
-            if (_self.advisoryStatus) { return false; }
-            this.$nextTick(function(){
-                if (!pass) { return false; }
-                _self.advisoryStatus = true;
-                UserApi.quickConsultation({name: _self.advisory.name,mobile: _self.advisory.phone},function (response) {
-                    _self.advisoryStatus = false;
-                    if(response.code === 0){
-                        alertInfo("您的信息已提交成功,采美工作人员会第一时间联系您");
-                    } else {
-                        alertInfo(response.msg);
-                    }
-                });
-            });
-        },
-        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){
-                        dialog('注册成功！',function () {
-
-                        });
-                    } else {
-                        alertInfo(response.msg);
-                    }
-                });
-            });
-        },
-
-        supplierRegister: function(){//供应商注册提交
-            alertInfo('供应商注册');
-            console.log(JSON.stringify(this.supplierUser));
-        },
         clickTab:function(index){
             var _self = this;
             switch (index) {
                 case 1:
-                    window.location.href = '/register-club.html';
+                    window.location.href = '/club/register.html';
                     break;
                 case 2:
-                    window.location.href = '/register-supplier.html';
+                    window.location.href = '/supplier/register.html';
                     break;
             }
-        },
-        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){
-                        alertInfo('验证短信已发送');
-                        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);
-                                _self.mobilTime = null;
-                                _self.mobileCodeText = '获取验证码'
-                            }
-                        },1000)
-                        }
-                    }else{
-                        alertInfo(response.msg);
-                        _self.isMobileDisabled = false;
-                    }
-                })
-            });
-        },
-        showSupplier:function () {
-            var _self = this;
-            _self.showSupplierConfirm = false;
-        },
-        showVadvisory:function(){
-            var _self = this;
-            _self.showClass = 'active';
-        },
-        closeVadvisory:function () {
-            var _self = this;
-            _self.showClass = '';
-        },
-        checkedIsAgreeFn:function () {
-            var _self = this;
-            _self.isAgree = !_self.isAgree;
-            if (_self.isAgree){
-                _self.isShowAgree = false;
-                _self.isAgreed = 1;
-            }else{
-                _self.isShowAgree = true;
-                _self.isAgreed = 0;
-            }
         }
-
     },
     created: function () {
 

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

@@ -13,7 +13,7 @@
 
 <!-- 注册账号 -->
 <div id="registerPage">
-    <div class="signAccount" v-show="showTabContentIndex == 1">
+    <div class="signAccount clear" v-show="showTabContentIndex == 1">
         <div class="title">欢迎机构入驻</div>
         <div class="advisory" >
             <span v-if="isPC" class="icon">入驻咨询</span>
@@ -25,7 +25,7 @@
                 <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)" needverify>
+                        <input type="text" v-model.trim="advisory.name" placeholder="请输入您的姓名" :rule="rule.name" maxlength="50" @blur="blurHandle($event)" unselectable="on" needverify>
                         <i class="checked icon mIcon"></i>
                         <span class="errTips icon mIcon" tips="请输入正确的联系人姓名"></span>
                     </div>
@@ -82,12 +82,11 @@
                     </p>
                     <span class="errTips icon mIcon show" v-if="isShowAgree">请阅读并同意协议</span>
                     <button class="btn" type="button" @click="clubRegister()">注册</button>
-                    <p class="subLine-p" @click="clickTab(2)">我是供应商,去入驻 ></p>
                 </div>
             </form>
         </div>
     </div>
-    <div class="signAccount upgrade" v-show="showTabContentIndex == 2">
+    <div class="signAccount upgrade clear" v-show="showTabContentIndex == 2">
         <div class="title">升级会员机构</div>
         <div class="title-tips"><p>补充以下详细信息即可升级为会员机构，享受更多更好的服务</p></div>
         <div class="registerClub clear">
@@ -134,10 +133,16 @@
                         </div>
                         <div class="formLine-file" v-else>
                             <input class="file" type="file" v-model="clubUpgradeUser.businessLicenseImage">
-                            <i class="icon file-biss"></i>
+                            <i class="icon mIcon file-biss"></i>
                         </div>
                         <span class="errTips icon mIcon"></span>
                     </div>
+                    <div class="form-upload-tips">
+                        <i class="icon mIcon icon-wen"></i>
+                        <div class="wen-tips">点击图片可放大图片</div>
+                    </div>
+                </div>
+                <div class="formLine clear">
                     <div class="form-upload">
                         <p>门头照：</p>
                         <div v-if="clubUpgradeUser.businessLicenseImage!=''">
@@ -145,26 +150,21 @@
                         </div>
                         <div class="formLine-file" v-else>
                             <input class="file" type="file" v-model="clubUpgradeUser.businessLicenseImage">
-                            <i class="icon file-door"></i>
+                            <i class="icon mIcon file-door"></i>
                         </div>
-                        <span class="errTips icon mIcon"></span>
-                    </div>
-                    <div class="form-upload-tips">
-                        <i class="icon icon-wen"></i>
-                        <div class="wen-tips">点击图片可放大图片</div>
                     </div>
                 </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>
-                    <span class="errTips icon mIcon mIcon" tips="请选择公司类型"></span>
+                    <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>
-                    <span class="errTips icon mIcon mIcon" tips="请选择公司类型"></span>
+                    <span class="errTips icon mIcon" tips="请选择公司类型"></span>
                 </div>
                 <div v-show="clubUpgradeUser.firstShopType == 1" class="formLine">
                     <div class="form-upload">
@@ -174,7 +174,7 @@
                         </div>
                         <div class="formLine-file" v-else>
                             <input class="file" type="file" v-model="clubUpgradeUser.businessLicenseImage">
-                            <i class="icon file-zizhi"></i>
+                            <i class="icon mIcon file-zizhi"></i>
                         </div>
                         <span class="errTips icon mIcon"></span>
                     </div>
@@ -183,23 +183,29 @@
                         <div class="wen-tips">点击图片可放大图片</div>
                     </div>
                 </div>
-                <div v-show="clubUpgradeUser.department == 2 || clubUpgradeUser.department == 3" class="formLine">
+                <div v-if="clubUpgradeUser.department == 2 || clubUpgradeUser.department == 3" class="formLine">
                     <p>科室：</p>
                     <input type="text" v-model.trim="clubUpgradeUser.name" placeholder="请填写您所经营的科室,用逗号隔开.(至少三个)" :rule="rule.name" maxlength="50">
                 </div>
-                <div class="formLine clear" v-show="clubUpgradeUser.firstShopType == 1">
+                <div class="formLine clear" v-if="clubUpgradeUser.firstShopType == 1">
                     <p><em>*</em>主营内容：</p>
                     <p class="business">
-                        <label v-for="pro in mentuzCampNullList" class="diyBox second"><input type="checkbox" name="secondShopType" v-model="clubUpgradeUser.mainPros" :value="pro" ><i class="icon mIcon">{{pro.name}}</i></label>
+                        <label v-for="pro in mentuzCampNullList" class="diyBox second" >
+                            <input type="checkbox" name="secondShopType" v-model="clubUpgradeUser.mainPros" :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="formLine clear" v-show="clubUpgradeUser.firstShopType == 2">
+                <div class="formLine clear" v-if="clubUpgradeUser.firstShopType == 2">
                     <p><em>*</em>主营内容：</p>
                     <p class="business">
-                        <label v-for="pro in medicaCampNullList" class="diyBox second"><input type="checkbox" name="secondShopType" v-model="clubUpgradeUser.mainPros" :value="pro" ><i class="icon mIcon">{{pro.name}}</i></label>
+                        <label v-for="pro in medicaCampNullList" class="diyBox second">
+                            <input type="checkbox" name="secondShopType" v-model="clubUpgradeUser.mainPros" :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>

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

@@ -13,7 +13,7 @@
 
 <!-- 注册账号 -->
 <div id="registerPage">
-    <div class="signAccount" >
+    <div class="signAccount clear" >
         <div class="supplierConfirm" v-if="showSupplierConfirm">
             <div class="cont">
                 <h3>供应商注册需知</h3>
@@ -118,14 +118,29 @@
                         <i class="checked icon mIcon"></i>
                         <span class="errTips icon mIcon" tips="请输入正确的统一社会信用代码"></span>
                     </div>
-                    <div class="formLine">
-                        <p><em>*</em>营业执照图片：</p>
-                        <input type="file" v-model="supplierUser.businessLicenseImage">
-                        <span class="errTips icon mIcon"></span>
+                    <div class="formLine clear">
+                        <div class="form-upload">
+                            <p><em>*</em>营业执照图片：</p>
+                            <div v-if="supplierUser.businessLicenseImage!=''">
+                                <img :src="supplierUser.businessLicenseImage" alt="">
+                            </div>
+                            <div class="formLine-file" v-else>
+                                <input class="file" type="file" v-model="supplierUser.businessLicenseImage">
+                                <i class="icon file-biss"></i>
+                            </div>
+                            <span class="errTips icon mIcon"></span>
+                        </div>
+                        <div class="form-upload-tips">
+                            <i class="icon icon-wen"></i>
+                            <div class="wen-tips">点击图片可放大图片</div>
+                        </div>
                     </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>
                             <input type="text" placeholder="请输入其他自定义品项目" v-model.trim="mainProEdit">
                             <a href="javascript:void(0);" @click="mainProAdd()">确认添加</a>
@@ -135,7 +150,6 @@
                     <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 class="subLine-p" @click="clickTab(1)">我是机构,去入驻 ></p>
                     </div>
                 </form>
             </div>

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

@@ -13,7 +13,7 @@
 
 <!-- 注册账号 -->
 <div id="registerPage">
-    <div class="selectAccount" v-show="showTabContentIndex == 0">
+    <div class="selectAccount">
         <div class="title">请选择注册的账号类型</div>
         <div class="cont">
             <span class="a"><img src="/img/account/club.png" @click="clickTab(1)">机构</span>