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

src/main/resources/static/css/user-center/member/member-page.css

@@ -34,10 +34,10 @@
 .combo-list .pay-btn > a{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center;-webkit-box-align:center;-ms-flex-align:center;align-items:center;width:100%;height:100%;color:inherit}
 .combo-list .pay-btn > a:hover{color:unset}
 /*特权服务*/
-.service-list{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between;-webkit-box-align:center;-ms-flex-align:center;align-items:center}
+.service-list{margin-top: 15px;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between;-webkit-box-align:center;-ms-flex-align:center;align-items:center}
 .service-list>div{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center;-webkit-box-align:center;-ms-flex-align:center;align-items:center;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column}
 .service-list>div img{display:block;width:64px;height:64px}
-.service-list>div .tit{font-size:16px;font-weight:400;color:#333333;padding:16px 0 8px}
+.service-list>div .tit{font-size:16px;font-weight:400;color:#333333;padding:8px 0 8px}
 .service-list>div .sub-tit{font-size:14px;font-weight:400;color:#B8BFCA}
 /*优惠券*/
 .coupon-list{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between;-webkit-box-align:center;-ms-flex-align:center;align-items:center}
@@ -147,6 +147,7 @@
 .combo-list .pay-btn > a:hover{color:unset}
 /*特权服务*/
 .service-list{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:space-evenly;-ms-flex-pack:space-evenly;justify-content:space-evenly;-webkit-box-align:center;-ms-flex-align:center;align-items:center;-ms-flex-wrap:wrap;flex-wrap:wrap}
+.service-list.two{display: block;}
 .service-list>div{width:25%;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center;-webkit-box-align:center;-ms-flex-align:center;align-items:center;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column;margin-bottom:4.8vw}
 .service-list>div img{display:block;width:11.8vw;height:11.8vw}
 .service-list>div .tit{font-size:3.2vw;font-weight:400;color:#333333;padding:2.4vw 0 1.2vw}

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

@@ -30,6 +30,7 @@ var registerPage = new Vue({
             socialCreditCode:'',
             mainProduct:[],
             businessLicense:'',
+            linkManIdentity:0,
             shopPhoto:'',
             medicalPracticeLicense:'',
             firstClubType:0,
@@ -78,7 +79,8 @@ var registerPage = new Vue({
             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: "^(?![0-9]+$)(?![a-zA-Z]+$)[0-9A-Za-z]{8,16}$"
         },
-        medicalPracticeLicenseFlag: false
+        medicalPracticeLicenseFlag: false,
+        userName:''
     },
     computed: {
 
@@ -199,7 +201,13 @@ var registerPage = new Vue({
             var pass = verifyForm();
             if (_self.loginLoading) { return false; }
             this.$nextTick(function() {
-                if (!pass) {return false;}
+                if (!pass) { this.scrollIntoView(); return false;}
+                if(_self.clubUpgradeUser.linkManIdentity === 0){
+                    $('#userNameType').parent().addClass("error");
+                    $('#userNameType').siblings('.errTips').text('请选择联系人身份').addClass("show");
+                    _self.scrollIntoView();
+                    return  false;
+                }
                 if(_self.clubUpgradeUser.cityId == ''){
                     CAIMEI.dialog('请选择市级地区',false);
                     return ;
@@ -230,11 +238,13 @@ var registerPage = new Vue({
                         return  false;
                     }
                 }
-                if(_self.userMainPros.length === 0){
-                    $('#business').siblings('.errTips').text('请选择或添加主营产品').addClass("show");
-                    return false;
+                if(Number(_self.clubUpgradeUser.firstClubType) === 1 || Number(_self.clubUpgradeUser.firstClubType) === 2){
+                    if(_self.userMainPros.length === 0){
+                        $('#business').siblings('.errTips').text('请选择或添加主营产品').addClass("show");
+                        return false;
+                    }
+                    _self.clubUpgradeUser.mainProduct = _self.userMainPros.join("/");
                 }
-                _self.clubUpgradeUser.mainProduct = _self.userMainPros.join("/");
                 _self.loginLoading = true;
                 UserApi.ClubUpgrade(_self.clubUpgradeUser,function (response) {
                     if(response.code === 0){
@@ -256,6 +266,7 @@ var registerPage = new Vue({
                 if(response.code === 0){
                     _self.clubUpgradeUser.userId =  response.data.userId;
                     _self.clubUpgradeUser.clubId =  response.data.clubId;
+                    _self.userName = response.data.userName;
                     _self.userData = {
                         account: response.data.account,
                         email: response.data.email,
@@ -280,6 +291,10 @@ var registerPage = new Vue({
             $('#secondShopType').parent().removeClass("error");
             $('#firstClubType').siblings('.errTips').removeClass("show");
         },
+        changeUserNameType:function(event){
+            $('#userNameType').parent().removeClass("error");
+            $('#userNameType').siblings('.errTips').removeClass("show");
+        },
         refreshCodeImage:function(){
             this.getMobileImage()
         },
@@ -458,6 +473,9 @@ var registerPage = new Vue({
         showViewerImageFn2:function(){//预览资质图片
             var viewer = new Viewer(document.getElementById('medicalPracticeLicenseImg'));
         },
+        scrollIntoView: function(){
+            document.getElementById('registerPage').scrollIntoView({block: 'start', behavior: 'smooth'});
+        },
     },
     created: function () {
 

src/main/resources/static/js/pay/caimei-hlbpay.js

@@ -60,7 +60,8 @@ var payContainer = new Vue({
         vipRecordId: undefined,
         couponRecordId:undefined,
         couponId:undefined,
-        userId:0
+        userId:0,
+        orderId:0
     },
     filters: {
         NumFormat:function(value) {
@@ -106,6 +107,7 @@ var payContainer = new Vue({
                     _self.payInfo.payAmount = (data.shopOrder.realPay - data.shopOrder.receiptAmount).toFixed(2);
                     _self.discernReceiptList = data.discernReceipt;// 支付记录
                     _self.payInfo.obligation = data.shopOrder.obligation;
+                    _self.orderId =  data.shopOrder.orderId;// 主订单Id
                     _self.obligation =  data.shopOrder.obligation;// 待付金额
                     _self.payableAmount =  data.shopOrder.realPay;
                     _self.receiptAmount =  data.shopOrder.receiptAmount;
@@ -142,8 +144,8 @@ var payContainer = new Vue({
                             CAIMEI.dialog('支付系统遇到点小问题，请稍后重试', false);
                             return;
                         }
-                        CAIMEI.Alert('线上支付功能正在维护中，请前往订单详情页面查看线下转账方式后进行付款','确定',true,function(){
-                            window.location.href='/user/order/detail.html?orderId='+_self.payInfo.shopOrderId;
+                        CAIMEI.Alert('线上支付功能正在维护中，请前往查看线下转账方式进行付款','确定',true,function(){
+                            window.location.href= '/pay/caimei-payunder.html?orderId='+_self.orderId;
                         });
                     }
                 }else{

src/main/resources/static/js/user-center/member/memberPage.js

@@ -8,7 +8,7 @@ var serviceList = [
     },
     {
         name: '专属优惠券',
-        subTitle: '每月可领',
+        subTitle: '每季度可领',
         pcIcon:'/img/member/pc-cm-svip-icon2.png',
         h5Icon:'/img/member/h5-cm-svip-icon2.png'
     },
@@ -37,8 +37,8 @@ var serviceList = [
         h5Icon:'/img/member/h5-cm-svip-icon5.png'
     },
     {
-        name: '快速发货',
-        subTitle: '会员加速',
+        name: '新品试用',
+        subTitle: '新品可优先试用',
         pcIcon:'/img/member/pc-cm-svip-icon6.png',
         h5Icon:'/img/member/h5-cm-svip-icon6.png'
     },
@@ -48,16 +48,22 @@ var serviceList = [
         pcIcon:'/img/member/pc-cm-svip-icon7.png',
         h5Icon:'/img/member/h5-cm-svip-icon7.png'
     }
+
 ];
 var memberPage = new Vue({
     el: '#memberPage',
     mixins: [cmSysVitaMixins],
     data: {
         serviceList: serviceList, // 服务列表
-        comboInfo: [
-            {duration:12,price:1800},
-            {duration:3,price:600}
-        ], // svip套餐信息
+        serviceList2: [
+            {
+                name: '分期付',
+                subTitle: '热门商品分期付',
+                pcIcon:'/img/member/pc-cm-svip-icon8.png',
+                h5Icon:'/img/member/h5-cm-svip-icon8.png'
+            }
+        ], // 服务列表
+        comboInfo: [], // svip套餐信息
         showMask: false, // 遮罩层
         showRenewPopup: false, // 续费弹窗
         showConfirmPopup: false, // 支付确认弹窗
@@ -91,7 +97,7 @@ var memberPage = new Vue({
         },
     },
     mounted: function () {
-        // this.fetchSuperPackage();
+        this.fetchSuperPackage();
         this.initCenter();
         this.getSvipProductList();
         this.setBottomBtnsVisiable();

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

@@ -42,7 +42,8 @@ var informationPage = new Vue({
             mainProduct:[],             //主营内容
             fax:'',                 //传真
             contractPhone:'',       //固定电话
-            profile : ''               //公司简介
+            profile : '',               //公司简介
+            linkManIdentity:0         //联系人身份
         },
         userMainPros:[],
         formData:new FormData(),
@@ -107,7 +108,7 @@ var informationPage = new Vue({
         infoInformationData:function(){
             var _self = this;
             UserApi.GetApplicationData({userId:_self.userId},function (response) {
-                if(response.code == 0){
+                if(response.code === 0){
                     var data = response.data;
                     _self.isRequset = false;
                     _self.clubUpgradeUser = data.club;
@@ -119,6 +120,7 @@ var informationPage = new Vue({
                     _self.addressfrom.provinceId = data.club.provinceId ? data.club.provinceId : 0;
                     _self.addressfrom.cityId = data.club.cityId ? data.club.cityId : '';
                     _self.addressfrom.townId = data.club.townId ? data.club.townId : '';
+                    _self.clubUpgradeUser.linkManIdentity = data.club.linkManIdentity ? data.club.linkManIdentity : 0;
                     _self.clubUpgradeUser.provinceId = data.club.provinceId ? data.club.provinceId : '';
                     _self.clubUpgradeUser.cityId = data.club.cityId ? data.club.cityId : '';
                     _self.clubUpgradeUser.townId= data.club.townId ? data.club.townId : '';
@@ -128,7 +130,7 @@ var informationPage = new Vue({
                     _self.clubUpgradeUser.secondClubType = data.club.secondClubType ? data.club.secondClubType :'';
                     _self.clubUpgradeUser.address = data.club.address ? data.club.address : null;
                     _self.firstClubType = _self.clubUpgradeUser.firstClubType;
-                    if( _self.clubUpgradeUser.firstClubType == 1){
+                    if( _self.clubUpgradeUser.firstClubType === 1){
                         if(data.club.mainProduct){
                             _self.userMainPros = _self.setNewMainpro(data.club.mainProduct);
                             _self.medicaCampNullList = _self.setNewMainProduct(_self.userMainPros);
@@ -161,6 +163,12 @@ var informationPage = new Vue({
             var pass = verifyForm();
             if (!pass) {return false;}
             if(_self.userIdentity === 2) {
+                if(!_self.clubUpgradeUser.linkManIdentity){
+                    $('#userNameType').parent().addClass("error");
+                    $('#userNameType').siblings('.errTips').text('请选择联系人身份').addClass("show");
+                    _self.scrollIntoView();
+                    return  false;
+                }
                 if (_self.clubUpgradeUser.townId == 0 || _self.clubUpgradeUser.address == '') {
                     _self.flagshow = true;
                     setTimeout(function () {
@@ -220,6 +228,7 @@ var informationPage = new Vue({
                     clubId: _self.clubUpgradeUser.clubId,				//会所Id
                     name: _self.clubUpgradeUser.name,
                     linkMan: _self.clubUpgradeUser.linkMan,
+                    linkManIdentity: _self.clubUpgradeUser.linkManIdentity,
                     shortName: _self.clubUpgradeUser.shortName,
                     contractEmail: _self.clubUpgradeUser.contractEmail,
                     provinceId: _self.clubUpgradeUser.provinceId,
@@ -450,6 +459,13 @@ var informationPage = new Vue({
         showViewerImageFn2:function(){//预览资质图片
             var viewer = new Viewer(document.getElementById('medicalPracticeLicenseImg'));
         },
+        changeUserNameType:function(event){
+            $('#userNameType').parent().removeClass("error");
+            $('#userNameType').siblings('.errTips').removeClass("show");
+        },
+        scrollIntoView: function(){
+            document.getElementById('informationPage').scrollIntoView({block: 'start', behavior: 'smooth'});
+        },
     },
     mounted: function () {
         var _self = this;

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

@@ -21,7 +21,8 @@ var upgradePage = new Vue({
             provinceId :'',
             cityId : '',
             townId : '',
-            address:''
+            address:'',
+            linkManIdentity:0
         },
         userMainPros:[],
         formData:new FormData(),
@@ -65,7 +66,8 @@ var upgradePage = new Vue({
         secondtypeflag:false,
         mproflag:false,
         userMainProflag:false,
-        medicalPracticeLicenseFlag: false
+        medicalPracticeLicenseFlag: false,
+        userName:''
     },
     computed: {
 
@@ -79,15 +81,17 @@ var upgradePage = new Vue({
         infoInformationData:function(){//机构资料初始化
             var _self = this;
             UserApi.GetApplicationData({userId:_self.clubUpgradeUser.userId},function (response) {
-                if(response.code == 0){
+                if(response.code === 0){
                     var data = response.data;
                     _self.isRequset = false;
                     _self.clubUpgradeUser = data.club;
                     _self.userIdentity = data.user.userIdentity;
+                    _self.userName = data.user.userName;
                     _self.clubUpgradeUser.clubId = data.user.clubId;
                     _self.clubUpgradeUser.userId = data.user.userId;
                     _self.clubUpgradeUser.contractEmail = data.club.contractEmail;
                     _self.clubUpgradeUser.provinceId = data.club.provinceId;
+                    _self.clubUpgradeUser.linkManIdentity = data.club.linkManIdentity ? data.club.linkManIdentity : 0;
                     _self.clubUpgradeUser.cityId = data.club.cityId;
                     _self.clubUpgradeUser.townId= data.club.townId;
                     _self.clubUpgradeUser.shopPhoto = data.club.shopPhoto;
@@ -95,14 +99,14 @@ var upgradePage = new Vue({
                     _self.clubUpgradeUser.firstClubType = data.club.firstClubType;
                     _self.clubUpgradeUser.secondClubType = data.club.secondClubType;
                     _self.clubUpgradeUser.address = data.club.address;
-                    if( _self.clubUpgradeUser.firstClubType == 1){
+                    if( _self.clubUpgradeUser.firstClubType === 1){
                         if(data.club.mainProduct){
                             _self.userMainPros = _self.setNewMainpro(data.club.mainProduct);
                             _self.medicaCampNullList = _self.setNewMainProduct(_self.userMainPros);
                         }else{
                             _self.userMainPros = _self.medicaCampNullList;
                         }
-                    }else if(_self.clubUpgradeUser.firstClubType == 2){
+                    }else if(_self.clubUpgradeUser.firstClubType === 2){
                         if(data.club.mainProduct){
                             _self.userMainPros = _self.setNewMainpro(data.club.mainProduct);
                             _self.mentuzCampNullList = _self.setNewMainProduct(_self.userMainPros);
@@ -118,12 +122,12 @@ var upgradePage = new Vue({
                     if(data.club.provinceId ==null){
                          _self.clubUpgradeUser.provinceId = 0;
                      }
-                    if(data.club.cityId!=''&&data.club.cityId!=null){
+                    if(data.club.cityId!==''&&data.club.cityId!=null){
                         _self.getcity();
                     }else {
                          _self.clubUpgradeUser.cityId = 0
                     }
-                    if(data.club.townId!=''&&data.club.townId!=null){
+                    if(data.club.townId!==''&&data.club.townId!=null){
                         _self.getcTown();
                     }else {
                          _self.clubUpgradeUser.townId = 0
@@ -136,11 +140,18 @@ var upgradePage = new Vue({
         SubComfirUpgradeFn:function() {//升级会员机构
             var _self = this;
             var pass = verifyForm();
-            if (!pass) {return false;}
+            if (!pass) { this.scrollIntoView(); return false;}
+            if(!_self.clubUpgradeUser.linkManIdentity){
+                $('#userNameType').parent().addClass("error");
+                $('#userNameType').siblings('.errTips').text('请选择联系人身份').addClass("show");
+                _self.scrollIntoView();
+                return  false;
+            }
             if(_self.clubUpgradeUser.townId==0||_self.clubUpgradeUser.address==''){
                 _self.flagshow = true;
                 setTimeout(function () {
                     _self.flagshow = false;
+                    _self.scrollIntoView();
                 },2000)
                 return;
             }
@@ -198,6 +209,7 @@ var upgradePage = new Vue({
                     clubId:_self.clubUpgradeUser.clubId,				//会所Id
                     name:_self.clubUpgradeUser.name,
                     linkMan:_self.clubUpgradeUser.linkMan,
+                    linkManIdentity:_self.clubUpgradeUser.linkManIdentity,
                     shortName:_self.clubUpgradeUser.shortName,
                     contractEmail:_self.clubUpgradeUser.contractEmail,
                     provinceId:_self.clubUpgradeUser.provinceId,
@@ -420,6 +432,10 @@ var upgradePage = new Vue({
                 }
             })
         },
+        changeUserNameType:function(event){
+            $('#userNameType').parent().removeClass("error");
+            $('#userNameType').siblings('.errTips').removeClass("show");
+        },
         showViewerImageFn:function(){//预览营业执照图片
             var viewer = new Viewer(document.getElementById('businessLicenseImage'));
         },
@@ -429,6 +445,9 @@ var upgradePage = new Vue({
         showViewerImageFn2:function(){//预览资质图片
             var viewer = new Viewer(document.getElementById('medicalPracticeLicenseImg'));
         },
+        scrollIntoView: function(){
+            document.getElementById('upgradePage').scrollIntoView({block: 'start', behavior: 'smooth'});
+        },
     },
     created: function () {
 

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

@@ -72,6 +72,17 @@
         <div class="registerClub clear">
             <!--机构注册表单-->
             <form>
+                <div class="formLine">
+                    <p style="padding-left: 8px">联系人：{{ userName }}</p>
+                </div>
+                <div class="formLine">
+                    <p id="userNameType"><em>*</em>联系人身份：</p>
+                    <label class="diyBox second"><input type="radio" name="linkManIdentity" v-model="clubUpgradeUser.linkManIdentity" value="1"  @change="changeUserNameType"><i class="icon mIcon">老板</i></label>
+                    <label class="diyBox second"><input type="radio" name="linkManIdentity" v-model="clubUpgradeUser.linkManIdentity" value="2" checked  @change="changeUserNameType"><i class="icon mIcon">采购</i></label>
+                    <label class="diyBox second"><input type="radio" name="linkManIdentity" v-model="clubUpgradeUser.linkManIdentity" value="3" checked  @change="changeUserNameType"><i class="icon mIcon">运营</i></label>
+                    <label class="diyBox second"><input type="radio" name="linkManIdentity" v-model="clubUpgradeUser.linkManIdentity" value="4" checked  @change="changeUserNameType"><i class="icon mIcon">其他</i></label>
+                    <span class="errTips icon mIcon" tips="请选择联系人身份"></span>
+                </div>
                 <div class="formLine">
                     <p><em>*</em>邮箱<span>(邮箱可用作登录账号，请使用公司邮箱或法人邮箱)</span>：</p>
                     <input type="text" v-model.trim="clubUpgradeUser.contractEmail" placeholder="请输入邮箱地址" :rule="rule.email" maxlength="32" @blur="blurHandle($event)" needverify>

src/main/resources/templates/user-center/member/member.html

@@ -49,26 +49,24 @@
                                     </div>
                                 </template>
                             </div>
-                            <div>
-                                <p class="copy-p">使用微信扫描二维码，联系采美客服进行购买</p>
-                            </div>
-                            <div>
-                                <div class="wechat-image">
-                                    <img src="/img/base/Wecha.png" alt="">
-                                </div>
-                            </div>
+<!--                            <div><p class="copy-p">使用微信扫描二维码，联系采美客服进行购买</p></div>-->
 <!--                            <div>-->
-<!--                                <div class="pay-btn" onclick="_czc.push(['_trackEvent','开通超级会员','超级会员','支付1','','Um_Event_RegisterSuperPayOne'])">-->
-<!--                                    <a href="javascript:void(0);" @click="payAction(1, 1)">-->
-<!--                                        立即支付{{ comboInfo[currentIndex].price }}元开通-->
-<!--                                    </a>-->
-<!--                                </div>-->
-<!--                                <div class="pay-btn plain" onclick="_czc.push(['_trackEvent','开通超级会员','超级会员','采美豆抵扣1','','Um_Event_RegisterSuperByBeansOne'])">-->
-<!--                                    <a href="javascript:void(0);" @click="payAction(2, 1)">-->
-<!--                                        或抵扣{{ comboInfo[currentIndex].price * comboInfo[currentIndex].proportion }}个采美豆开通-->
-<!--                                    </a>-->
+<!--                                <div class="wechat-image">-->
+<!--                                    <img src="/img/base/Wecha.png" alt="">-->
 <!--                                </div>-->
 <!--                            </div>-->
+                            <div>
+                                <div class="pay-btn" onclick="_czc.push(['_trackEvent','开通超级会员','超级会员','支付1','','Um_Event_RegisterSuperPayOne'])">
+                                    <a href="javascript:void(0);" @click="payAction(1, 1)">
+                                        立即支付{{ comboInfo[currentIndex].price }}元开通
+                                    </a>
+                                </div>
+                                <div class="pay-btn plain" onclick="_czc.push(['_trackEvent','开通超级会员','超级会员','采美豆抵扣1','','Um_Event_RegisterSuperByBeansOne'])">
+                                    <a href="javascript:void(0);" @click="payAction(2, 1)">
+                                        或抵扣{{ comboInfo[currentIndex].price * comboInfo[currentIndex].proportion }}个采美豆开通
+                                    </a>
+                                </div>
+                            </div>
                         </template>
                         <span v-else>暂无可选套餐~</span>
                     </div>
@@ -76,20 +74,33 @@
                 <!--服务列表-->
                 <div class="section">
                     <div class="section-title">专属特权</div>
-                    <div class="content service-list">
-                        <div v-for="(item, index) in serviceList" :key="index">
-                            <img :src="item.pcIcon"
-                                 v-if="isPC"/>
-                            <img :src="item.h5Icon"
-                                 v-else/>
-                            <span class="tit" v-html="item.name"></span>
-                            <span class="sub-tit" v-html="item.subTitle"></span>
+                    <div class="content">
+                        <div class="service-list">
+                            <div v-for="(item, index) in serviceList" :key="index">
+                                <img :src="item.pcIcon"
+                                     v-if="isPC"/>
+                                <img :src="item.h5Icon"
+                                     v-else/>
+                                <span class="tit" v-html="item.name"></span>
+                                <span class="sub-tit" v-html="item.subTitle"></span>
+                            </div>
+                        </div>
+                        <div class="service-list two">
+                            <div v-for="(item, index) in serviceList2" :key="index">
+                                <img :src="item.pcIcon"
+                                     v-if="isPC"/>
+                                <img :src="item.h5Icon"
+                                     v-else/>
+                                <span class="tit" v-html="item.name"></span>
+                                <span class="sub-tit" v-html="item.subTitle"></span>
+                                <span class="sub-tit">（年卡专享）</span>
+                            </div>
                         </div>
                     </div>
                 </div>
                 <!--优惠券列表-->
                 <div class="section" v-if="couponList.length > 0">
-                    <div class="section-title">专属优惠券<span>每月可领4个</span></div>
+                    <div class="section-title">专属优惠券<span>每三个月可领4张</span></div>
                     <div class="content coupon-list">
                         <template v-if="couponList.length > 0">
                             <div v-for="(item, index) in couponList" :key="index" :class="{'un-received':item.useStatus === 1}">
@@ -146,20 +157,20 @@
         </div>
     </div>
     <!--底部支付按钮 仅未开通和到期显示-->
-<!--    <div class="pay-amount-bottom" id="pay-amount-bottom" v-if="showBottomBtns">-->
-<!--        <div>-->
-<!--            <div class="pay-btn plain" onclick="_czc.push(['_trackEvent','开通超级会员','超级会员','采美豆抵扣2','','Um_Event_RegisterSuperByBeansTwo'])">-->
-<!--                <a href="javascript:void(0);" @click="payAction(2, 2)">-->
-<!--                    抵扣{{ comboInfo[currentIndex].price * comboInfo[currentIndex].proportion }}个采美豆开通-->
-<!--                </a>-->
-<!--            </div>-->
-<!--            <div class="pay-btn" onclick="_czc.push(['_trackEvent','开通超级会员','超级会员','支付2','','Um_Event_RegisterSuperPayTwo'])">-->
-<!--                <a href="javascript:void(0);" @click="payAction(1, 2)">-->
-<!--                    立即支付{{ comboInfo[currentIndex].price }}元开通-->
-<!--                </a>-->
-<!--            </div>-->
-<!--        </div>-->
-<!--    </div>-->
+    <div class="pay-amount-bottom" id="pay-amount-bottom" v-if="showBottomBtns">
+        <div>
+            <div class="pay-btn plain" onclick="_czc.push(['_trackEvent','开通超级会员','超级会员','采美豆抵扣2','','Um_Event_RegisterSuperByBeansTwo'])">
+                <a href="javascript:void(0);" @click="payAction(2, 2)">
+                    抵扣{{ comboInfo[currentIndex].price * comboInfo[currentIndex].proportion }}个采美豆开通
+                </a>
+            </div>
+            <div class="pay-btn" onclick="_czc.push(['_trackEvent','开通超级会员','超级会员','支付2','','Um_Event_RegisterSuperPayTwo'])">
+                <a href="javascript:void(0);" @click="payAction(1, 2)">
+                    立即支付{{ comboInfo[currentIndex].price }}元开通
+                </a>
+            </div>
+        </div>
+    </div>
     <!--遮罩-->
     <div class="mask" v-if="showMask"></div>
     <!--续费弹窗-->

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

@@ -42,6 +42,14 @@
                         </div>
                         <template v-if="userIdentity === 2">
                             <div class="title">升级信息</div>
+                            <div class="formLine">
+                                <p id="userNameType"><em>*</em>联系人身份：</p>
+                                <label class="diyBox second"><input type="radio" name="linkManIdentity" v-model="clubUpgradeUser.linkManIdentity" value="1"  @change="changeUserNameType"><i class="icon mIcon">老板</i></label>
+                                <label class="diyBox second"><input type="radio" name="linkManIdentity" v-model="clubUpgradeUser.linkManIdentity" value="2" checked  @change="changeUserNameType"><i class="icon mIcon">采购</i></label>
+                                <label class="diyBox second"><input type="radio" name="linkManIdentity" v-model="clubUpgradeUser.linkManIdentity" value="3" checked  @change="changeUserNameType"><i class="icon mIcon">运营</i></label>
+                                <label class="diyBox second"><input type="radio" name="linkManIdentity" v-model="clubUpgradeUser.linkManIdentity" value="4" checked  @change="changeUserNameType"><i class="icon mIcon">其他</i></label>
+                                <span class="errTips icon mIcon" tips="请选择联系人身份"></span>
+                            </div>
                             <div class="formLine">
                                 <p><em>*</em>机构名称<span>(示例：深圳市美丽人生医疗美容有限公司)</span>：</p>
                                 <input type="text" v-model.trim="clubUpgradeUser.name" placeholder="请与营业执照的注册名称保持一致" :rule="rule.name" maxlength="30" @blur="blurHandle($event)" needverify>

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

@@ -33,6 +33,17 @@
                     <div class="title-tips"><p>补充以下详细信息即可升级为资质机构，享受更多更好的服务</p></div>
                     <div class="registerClub clear">
                         <form>
+                            <div class="formLine">
+                                <p style="padding-left: 8px">联系人：{{ userName }}</p>
+                            </div>
+                            <div class="formLine">
+                                <p id="userNameType"><em>*</em>联系人身份：</p>
+                                <label class="diyBox second"><input type="radio" name="linkManIdentity" v-model="clubUpgradeUser.linkManIdentity" value="1"  @change="changeUserNameType"><i class="icon mIcon">老板</i></label>
+                                <label class="diyBox second"><input type="radio" name="linkManIdentity" v-model="clubUpgradeUser.linkManIdentity" value="2" checked  @change="changeUserNameType"><i class="icon mIcon">采购</i></label>
+                                <label class="diyBox second"><input type="radio" name="linkManIdentity" v-model="clubUpgradeUser.linkManIdentity" value="3" checked  @change="changeUserNameType"><i class="icon mIcon">运营</i></label>
+                                <label class="diyBox second"><input type="radio" name="linkManIdentity" v-model="clubUpgradeUser.linkManIdentity" value="4" checked  @change="changeUserNameType"><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="clubUpgradeUser.contractEmail" placeholder="请输入邮箱地址" :rule="rule.email" maxlength="50" @blur="blurHandle($event)" needverify>