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

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

@@ -54,8 +54,8 @@ logging:
 caimei:
   siteEnv: 0 #网站环境，（2：正式环境，1：测试环境，0：开发环境）
   #spiServer: http://192.168.2.68:8008
-#  coreServer: https://core-b.caimei365.com
-  coreServer: http://192.168.2.67:18002
+  coreServer: https://core-b.caimei365.com
+#  coreServer: http://192.168.2.67:18002
   #coreServer: http://192.168.2.75:18002
   imageDomain: https://img-b.caimei365.com
   wwwDomain: http:localhost:8009

src/main/resources/static/css/activity/beautyTopic.css

@@ -331,7 +331,8 @@ a{color:#333;text-decoration:none}
 .cm-btn-box .cm-toggle-btn.down::after{background-position-x:-96px}
 .cm-btn-box .cm-toggle-btn.up::after{background-position-x:-125px}
 .cm-float-container{position:fixed;z-index:999;bottom:12%;right:15px}
-.cm-float-container .cm-slide{position:relative;width:12vw;height:12vw;margin:0.8vw 0;border-radius:6px;-webkit-transition:all 0.2s;-o-transition:all 0.2s;transition:all 0.2s;cursor:pointer}
+.cm-float-container .cm-regexp{ background: #fff; font-size: 2.4vw;line-height: 1.4;display: flex;justify-content: center;align-items: center;text-align: center;color: #666;}
+.cm-float-container .cm-regexp,.cm-float-container .cm-slide{position:relative;width:12vw;height:12vw;margin:0.8vw 0;border-radius:6px;-webkit-transition:all 0.2s;-o-transition:all 0.2s;transition:all 0.2s;cursor:pointer}
 .cm-float-container .cm-slide .cm-toggle-btn{top:0;right:0;position:absolute;width:100%;height:100%}
 .cm-float-container .cm-slide:hover .cm-tooltop{display:block}
 .cm-float-container .cm-slide:hover .cm-toggle-btn{width:150%}
@@ -678,7 +679,9 @@ a{color:#333;text-decoration:none}
 .cm-btn-box .cm-toggle-btn:hover.down::after{background-position-x:-150px}
 .cm-btn-box .cm-toggle-btn:hover.up::after{background-position-x:-180px}
 .cm-float-container{position:fixed;z-index:999;bottom:12%;right:15px}
-.cm-float-container .cm-slide{position:relative;width:64px;height:64px;margin:6px 0;border-radius:6px;-webkit-transition:all 0.2s;-o-transition:all 0.2s;transition:all 0.2s;cursor:pointer}
+.cm-float-container .cm-regexp{display: flex;justify-content: center;align-items: center;text-align: center; background: #fff;font-size: 14px;color: #666;line-height: 1.4}
+.cm-float-container .cm-regexp:hover{ color: #fff; background:#ff5c00 }
+.cm-float-container .cm-regexp,.cm-float-container .cm-slide{position:relative;width:64px;height:64px;margin:6px 0;border-radius:6px;-webkit-transition:all 0.2s;-o-transition:all 0.2s;transition:all 0.2s;cursor:pointer}
 .cm-float-container .cm-slide .cm-toggle-btn{top:0;right:0;position:absolute;width:100%;height:100%}
 .cm-float-container .cm-slide:hover .cm-tooltop{display:block}
 .cm-float-container .cm-slide:hover .cm-toggle-btn{width:150%}
@@ -705,10 +708,9 @@ a{color:#333;text-decoration:none}
 .cm-entry .cm-icon-content .btn{display: block;width: 60px;height: 60px;background: #666;position: absolute;right: 40px;z-index: 999;cursor: pointer;opacity: 0;}
 .cm-entry .cm-icon-content .btn1{top: 122px;}
 .cm-entry .cm-icon-content .btn2{top: 250px;}
-.banner-container{position:relative;height:480px;background:pink;overflow:hidden}
-.banner-container .banner{position:absolute;top:50%;left:50%;-webkit-transform:translate(-50%,-50%);-ms-transform:translate(-50%,-50%);transform:translate(-50%,-50%)}
-.banner-container .cm-container{height:100%}
-.banner-container img{display:block;min-width:1920px;}
+.banner-container{display: flex;justify-content: center; height:480px;background:pink;width: 100%;overflow: hidden;}
+.banner-container .banner{ height: 480px;}
+.banner-container .banner img{display: block;min-width: 1920px}
 .cm-to-top{width:64px;height:64px;position:fixed;z-index:999;bottom:5%;right:15px;border-radius:6px;text-align:center;background:#fff;cursor:pointer;-webkit-transition:all 0.2s;-o-transition:all 0.2s;transition:all 0.2s}
 .cm-to-top .cm-icon-bar{display:block;margin:0 auto;-webkit-transition:all 0.2s;-o-transition:all 0.2s;transition:all 0.2s}
 .cm-to-top .cm-icon-bar:nth-child(1){width:28px;height:4px;background:#999999;margin-top:20px}

src/main/resources/static/css/product/detail.h5.css

@@ -7,7 +7,7 @@ li{list-style:none}
 .productBox .imageBox{width:100%;height:100vw;position:relative}
 #swiperImage .swiper-wrapper .swiper-slide{position:relative;zoom:1;vertical-align:middle;width:100%;overflow:hidden;text-align:center}
 #swiperImage .swiper-wrapper img{width:auto;height:100vw;display:block}
-#swiperImage .swiper-wrapper .swiper-slide .cm-product-cover-tag{position:absolute;top: 3vw;right: 3vw;width: 15.9vw;height: 5.5vw;background: url(/img/activity/cm_cover_bg_h5.png) no-repeat center;background-size: 15.9vw;text-align: center;color: #fff;line-height: 5.5vw;font-size: 2vw;}
+#swiperImage .swiper-wrapper .swiper-slide .cm-product-cover-tag{position:absolute;top: 0;right: 3vw;width: 15.9vw;height: 10.5vw;background: url(/img/activity/cm_cover_bg_h5.png) no-repeat center;background-size: 15.9vw;text-align: center;color: #fff;line-height: 5.5vw;font-size: 2vw;}
 .productBox .detailBox{box-sizing:border-box;padding:0 3.3vw;overflow:hidden;position: relative;}
 .productBox .detailBox .crumbs{height:8vw;line-height:8vw;font-size:3.1vw;overflow:hidden;color:#93979F}
 .productBox .detailBox .crumbs a{color:#93979F}

src/main/resources/static/css/product/detail.pc.css

@@ -9,7 +9,7 @@ li{list-style:none;}
 .productBox img{width:100%;height:100%;display:block}
 .productBox .bigImage{position:relative; width:452px;height:452px;background:#F3F7FE;border: 1px solid #e4e4e4;}
 .productBox .bigImage .mask{display:none;position:absolute;left:0;top:0;width:215px;height:215px;border:1px solid #aaa;background:rgba(255,208,22,.4);opacity:.5;filter:alpha(opacity:50);cursor:move}
-.productBox .bigImage .cm-product-cover-tag{position:absolute;top: 10px;right: 10px;width: 75px;height: 27px;background: url(/img/activity/cm_cover_bg_pc.png) no-repeat center;background-size: 75px;text-align: center;color: #fff;line-height: 27px;font-size: 12px;}
+.productBox .bigImage .cm-product-cover-tag{position:absolute;top: 0;right: 15px;width: 75px;height: 49px;background: url(/img/activity/cm_cover_bg_pc.png) no-repeat center;background-size: 75px;text-align: center;color: #fff;line-height: 27px;font-size: 12px;}
 .productBox .smallImage{height:79px;padding-top:14px;overflow:hidden}
 .productBox .smallImage ul{width:452px}
 .productBox .smallImage li{float:left;box-sizing:border-box;width:79px;height:79px;margin-left:14px;background:#F3F7FE;opacity:.5;-moz-transition:.5s;-webkit-transition:.5s;transition:.5s}

src/main/resources/static/css/product/qualityauthorize.css

@@ -70,7 +70,7 @@ ul{margin:0;padding:0;list-style-type:none}
 .not-found {height: calc(100vh - 80px); display: flex;justify-content: center;align-items: center;flex-direction: column;}
 .not-found img{}
 .not-found p{font-size: 20px;color: #a8a8a8;padding: 60px;text-align: center;}
-.qrCodeImage{ width: 160px; position: fixed;right: 0 ; bottom: 80px;padding: 15px;border-radius: 4px; background: #fff;}
+.qrCodeImage{ width: 160px; position: fixed;right: 0 ;z-index: 99; bottom: 80px;padding: 15px;border-radius: 4px; background: #fff;}
 .qrCodeImage img{ width: 100%; display: block;}
 .qrCodeImage .foot-text{text-align: center;font-size: 14px;line-height: 1.4}
 .qrCodeImage .closeHandle{ display: block;font-size: 26px;position: absolute;left: 0;top: -10px; color: #666;cursor: pointer}
@@ -121,7 +121,7 @@ ul{margin:0;padding:0;list-style-type:none}
 .not-found{width:100vw;padding-top: 40vw;text-align: center}
 .not-found img{width: 30vw}
 .not-found p{font-size: 4vw;margin-top: 6vw;color: #a8a8a8}
-.qrCodeImage{position: fixed;padding: 2vw; bottom: 30vw;right: 1vw; width: 30vw; background: #fff;box-shadow: -2px 2px 4px rgba(0,0,0,.05);border-radius: 4px; }
+.qrCodeImage{position: fixed;z-index: 99;padding: 2vw; bottom: 30vw;right: 1vw; width: 30vw; background: #fff;box-shadow: -2px 2px 4px rgba(0,0,0,.05);border-radius: 4px; }
 .qrCodeImage img{ width: 100%;  display: block;}
 .qrCodeImage .foot-text{text-align: center;font-size: 3vw;line-height: 1.4}
 .qrCodeImage .closeHandle{ display: block;font-size: 6vw;position: absolute;left: 0;top: -2vw; color: #666;cursor: pointer}

src/main/resources/static/js/activity/attestation.js

@@ -1,6 +1,4 @@
-;
-var orderPage = new Vue({
-    el: "#attestation",
+new Vue({
     data: {
         popupVisiable: false,
         twoData:[
@@ -11,33 +9,31 @@ var orderPage = new Vue({
         ],
         //认证通合作伙伴
         suppileData:[
-            { logo:'/img/activity/attestation/1.jpg', appId: 'wxdef0c3c369ff7013', name: '上海品辉医疗科技有限公司官方授权', title: '上海品辉医疗科技有限公司'},
-            { logo:'/img/activity/attestation/2.jpg', appId: '', name: '认证通', title: '科医人医疗激光设备贸易公司'},
-            { logo:'/img/activity/attestation/3.jpg', appId: '', name: '认证通', title: '广州埃墨莉素生物科技有限公司'},
+            { logo:'/img/activity/attestation/1.jpg', appId: 'wxdef0c3c369ff7013', name: '上海品辉医疗科技有限公司官方授权', title: '上海品辉医疗科技有限公司', type: 'home'},
+            { logo:'/img/activity/attestation/2.jpg', appId: '', name: '认证通', title: '科医人医疗激光设备贸易公司', type: 'home'},
+            { logo:'/img/activity/attestation/3.jpg', appId: 'licheng', name: '认证通', title: '广州埃墨莉素生物科技有限公司', type: 'home'},
         ],
         // 认证通快捷入口
         firstEntryList: [
-            // { logo: '/img/activity/attestation/1.jpg', appId: 'wxdef0c3c369ff7013', name: '品辉机构认证', title: '品辉机构认证' },
-            { logo: '/img/activity/attestation/shuishu.jpg', appId: 'wxdef0c3c369ff7013', name: '水素水设备认证', title: '水素水设备认证' },
+             // { logo: '/img/activity/attestation/1.jpg', appId: 'wxdef0c3c369ff7013', name: '品辉机构认证', title: '品辉机构认证' },
+            { logo: '/img/activity/attestation/shuishu.jpg', appId: 'wxdef0c3c369ff7013', name: '水素水设备认证', title: '水素水设备认证', type: 'device' },
             // { logo: '/img/activity/attestation/3.jpg', appId: '', name: 'LDM机构认证', title: 'LDM机构认证' },
-            { logo: '/img/activity/attestation/3.jpg', appId: '', name: 'LDM设备认证', title: 'LDM设备认证' },
+            { logo: '/img/activity/attestation/3.jpg', appId: 'licheng', name: 'LDM设备认证', title: 'LDM设备认证' , type: 'club'},
         ]
-    },
-    computed: {
-
     },
     methods: {
-        handleClick: function(data){
-            if(!data.appId) {
+        handleClick: function (data, type) {
+            if (!data.appId) {
                 this.popupVisiable = true;
-                return
-            };
-            window.localStorage.setItem('approveAppId', data.appId);
-            window.localStorage.setItem('approveIframeName', data.name);
-            window.open('/approve-iframe.html');
+                return false
+            }
+            if (data.type === 'device') {
+                window.open(`https://zp.caimei365.com/#/approve/device?appId=${data.appId}`);
+            } else if(data.type === 'club'){
+                window.open(`https://zp.caimei365.com/#/approve/club?appId=${data.appId}`);
+            } else {
+                window.open(`https://zp.caimei365.com/#/home?appId=${data.appId}`);
+            }
         }
-    },
-    mounted: function () {
-
     }
-});
+}).$mount('#attestation');

src/main/resources/static/js/activity/beautyTopic.js

@@ -39,6 +39,7 @@ var activeApp = (function () {
         },
         mounted: function mounted() {
             this.pageLoaded();
+            // this.showCouponEntry = true 优惠券弹窗入口2
         }
         ,
         created: function created() {
@@ -247,7 +248,9 @@ var activeApp = (function () {
                         utils.responsive('.aspect', 'scalc');
                         that.isLoading = false;
                         clearInterval(timer);
-                        $('img[data-original]').lazyload();
+                        that.$nextTick(()=>{
+                            $('img[data-original]').lazyload();
+                        });
                         console.log('页面图片初始化完成...');
                     }
                 }, 500);
@@ -268,7 +271,7 @@ var activeApp = (function () {
             ,
             // 优惠券入口
             handleToggleCoupon: function handleToggleCoupon(flag){
-                this.showCouponEntry = flag;
+                // this.showCouponEntry = flag;
                 this.isActive = false;
             },
             //    初始化用户信息

src/main/resources/static/js/activity/beautyTopic/mixin.js

@@ -59,6 +59,7 @@ var showMoreMixin = function () {
 				this.countMap[key].action = !this.countMap[key].action;
 				setTimeout(function () {
 					utils.responsive('.aspect', 'scalc');
+					$('img[data-original]').lazyload();
 				});
 			}
 		}

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

@@ -76,6 +76,30 @@ var PayApi = {
                 callback(res);
             });
         },
+        PayOrderPayCouponCheck: function (params, callback) {//查询微信支付优惠券是否已完成支付
+            Http.AjaxService({
+                url:'/order/pay/coupon/check',
+                type:'GET',
+                data:params,
+                json:true,
+                isHost:true
+            })
+            .then(function(res){
+                callback(res);
+            });
+        },
+        PayOrderPayVipCheck: function (params, callback) {//查询微信支付超级会员是否已完成支付
+            Http.AjaxService({
+                url:'/order/pay/vip/check',
+                type:'GET',
+                data:params,
+                json:true,
+                isHost:true
+            })
+            .then(function(res){
+                callback(res);
+            });
+        },
         PayOrderFindOrderStatus: function (params, callback) {//查询判断是否已完成支付
             Http.AjaxService({
                 url:'/order/pay/result/json',
@@ -236,5 +260,18 @@ var PayApi = {
                 .then(function(res){
                     callback(res);
                 });
-        }
+        },
+        // 微信支付认证通会员
+        PayAuthVipMiniWxPay: function(params, callback){ // 微信支付认证通会员
+            Http.AjaxService({
+                url:'/order/pay/auth/vip/wechat',
+                type:'POST',
+                data:params,
+                json:false,
+                isHost:true
+            })
+            .then(function(res){
+                callback(res);
+            });
+        },
 };

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

@@ -311,6 +311,23 @@ var ProductApi = {
                 callback(res);
             });
         },
+        /**
+         * @优惠券-生成购买优惠券记录Id
+         * @param:userId 用户userId
+         * @param:couponId 优惠券Id
+         */
+        createCouponRecord:function (params, callback) {//获取促销活动详情
+            Http.AjaxService({
+                url:'/order/pay/coupon/record',
+                type:'post',
+                data:params,
+                json:false,
+                isHost:true
+            })
+            .then(function(res){
+                callback(res);
+            });
+        },
         /**
          * @优惠券-兑换优惠券
          * @param:userId 用户userId

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

@@ -53,6 +53,7 @@ var payContainer = new Vue({
         is_Wechat_bowcr:false,
         comboInfo: null, //选中的svip套餐信息
         vipRecordId: undefined,
+        couponRecordId:undefined,
         couponId:undefined,
         userId:0
     },
@@ -521,28 +522,36 @@ var payContainer = new Vue({
         },
         RefreshBody:function(){//刷新页面
             var _self = this;
-            // 验证支付（支付会员）
-            if(_self.pageType == 2){
-                PayApi.PayOrderFindOrderStatus({mbOrderId:_self.mbOrderId},function(response){
-                    _self.isPayAlert = false;
-                    var data = response.data.data;
-                    if(data.status === '1'){
-                        _self.windowLocationHref('success');
-                    }else{
-                        _self.windowLocationHref('error');
-                    }
-                });
-                return;
-            }
+
             if(_self.payInfo.payBankNum == 'WEIXIN'){
-                PayApi.PayOrderPayWhetherSuccess({orderId: _self.payInfo.payOrderId, paySuccessCounter:_self.paySuccessCounter},function(response){
-                    _self.isPayAlert = false;
-                    if(response.code === 0){
-                        _self.windowLocationHref('success');
-                    }else{
-                        _self.windowLocationHref('error');
-                    }
-                });
+                if( _self.pageType == '2' ){ // 验证支付（支付会员）
+                    PayApi.PayOrderPayVipCheck({recordId : _self.vipRecordId},function(response){
+                        // console.log(response);
+                        if(response.code === 0){
+                            _self.windowLocationHref('success');
+                        }else{
+                            _self.windowLocationHref('error');
+                        }
+                    });
+                }else if(_self.pageType == '3'){ // 验证支付（优惠券）
+                    PayApi.PayOrderPayCouponCheck({ couponRecordId: _self.couponRecordId },function(response){
+                        // console.log(response);
+                        if(response.code === 0){
+                            _self.windowLocationHref('success');
+                        }else{
+                            _self.windowLocationHref('error');
+                        }
+                    });
+                }else{
+                    PayApi.PayOrderPayWhetherSuccess({orderId: _self.payInfo.payOrderId, paySuccessCounter:_self.paySuccessCounter},function(response){
+                        _self.isPayAlert = false;
+                        if(response.code === 0){
+                            _self.windowLocationHref('success');
+                        }else{
+                            _self.windowLocationHref('error');
+                        }
+                    });
+                }
             }else{
                 PayApi.PayOrderFindOrderStatus({mbOrderId:_self.mbOrderId},function(response){
                     _self.isPayAlert = false;
@@ -561,6 +570,8 @@ var payContainer = new Vue({
                 window.location.href = '/pay/success.html?pageType=second&type='+state+'&payAmount='+_self.payAmount;
             }else if(_self.pageType === '2'){
                 window.location.href = '/pay/success.html?pageType=vip&type='+state+'&payAmount='+_self.payAmount;
+            }else if(_self.pageType === '3') {
+                window.location.href = '/pay/success.html?pageType=coupon&type=' + state + '&payAmount=' + _self.couponInfo.moneyCouponPrice;
             }else{
                 window.location.href = '/pay/success.html?pageType=www&type='+state+'&payAmount='+_self.payAmount;
             }
@@ -681,6 +692,7 @@ var payContainer = new Vue({
                 returnUrl: 'https://www.caimei365.com/pay/success.html?pageType=www&type=success&payAmount='+_self.couponInfo.moneyCouponPrice,
                 userType: _self.payInfo.payUserType,
                 couponId: _self.couponId,
+                couponRecordId:_self.couponRecordId,
                 userId:_self.userId,
                 source:2 //支付来源 1 小程序 2 WWW
             };
@@ -711,9 +723,10 @@ var payContainer = new Vue({
             if (!isPC) {
                 var orderInfo = {//普通订单微信二维码参数
                     pageType: 3,
-                    vipId: this.comboInfo.id,
-                    vipRecordId: this.vipRecordId,
-                    payAmount: this.payAmount
+                    payAmount: this.couponInfo.moneyCouponPrice,
+                    couponRecordId:this.couponRecordId,
+                    couponId: this.couponId,
+                    userId : this.userId
                 };
                 this.payInfo.payMobileUrl = "https://open.weixin.qq.com/connect/oauth2/authorize?appid=wx91c4152b60ca91a3&redirect_uri=https://www.caimei365.com/pay/wechatpay.html&response_type=code&scope=snsapi_base&state=" + JSON.stringify(orderInfo) + "#wechat_redirect";
                 location.href = this.payInfo.payMobileUrl;
@@ -723,6 +736,7 @@ var payContainer = new Vue({
                     amount: this.couponInfo.moneyCouponPrice,
                     url: this.payInfo.payMobileUrl,
                     couponId:this.couponId,
+                    couponRecordId:this.couponRecordId,
                     userId:this.userId
                 };
                 CAIMEI.Storage.setItem('payData', JSON.stringify(this.payInfo.payData));
@@ -738,6 +752,7 @@ var payContainer = new Vue({
                 returnUrl: 'https://www.caimei365.com/',
                 couponId: _self.couponInfo.couponId,
                 userId:_self.userId,
+                couponRecordId:_self.couponRecordId,
                 source:2 //支付来源 1 小程序 2 WWW
             };
             PayApi.PayCouponMiniAliPay(params, function(response){
@@ -788,6 +803,7 @@ var payContainer = new Vue({
             this.getBankList();
         } else if(this.pageType === '3') {// 支付优惠券
             this.couponId = parseInt(CAIMEI.getUrlParam('couponId'));
+            this.couponRecordId = parseInt(CAIMEI.getUrlParam('couponRecordId'));
             this.initCouponDetail(this.couponId);
             this.PayOrderOnLineSwitch();
             this.getBankList();

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

@@ -28,6 +28,8 @@ var payContainer = new Vue({
         pageType:'',//页面跳转类型
         productID:'',//商品ID
         duration: 0, // 购买的会员期限
+        mbOrderId:0,
+        couponRecordId:0,
         vipId: null, // vip套餐id
         vipRecordId: undefined,
         couponId:0,
@@ -134,6 +136,7 @@ var payContainer = new Vue({
                     pageType: 3,
                     payAmount: _self.payAmount,
                     couponId: _self.couponId,
+                    couponRecordId:_self.couponRecordId,
                     userId : _self.userId
                 };
             } else {
@@ -168,21 +171,54 @@ var payContainer = new Vue({
         setTimerWechatPay:function () {//定时任务查询微信支付结果
             var _self = this;
             var timer;
-            PayApi.PayOrderPayWhetherSuccess({orderId: _self.payInfo.payOrderId, paySuccessCounter:_self.paySuccessCounter},function(response){
-                // console.log(response);
-                if(response.code === 0){
-                    CAIMEI.dialog('支付成功');
-                    clearTimeout(timer); //清理定时任务
-                    setTimeout(function(){
-                        window.location.href = '/index.html';
-                    },2000);
+            if(_self.pageType === '2'){//超级会员支付结果
+                PayApi.PayOrderPayVipCheck({recordId : _self.vipRecordId},function(response){
+                    // console.log(response);
+                    if(response.code === 0){
+                        CAIMEI.dialog('支付成功');
+                        clearTimeout(timer); //清理定时任务
+                        setTimeout(function(){
+                            window.location.href = '/index.html';
+                        },2000);
 
-                }else{
-                    timer = setTimeout(function(){
-                        _self.setTimerWechatPay()
-                    }, 1000*10);
-                }
-            });
+                    }else{
+                        timer = setTimeout(function(){
+                            _self.setTimerWechatPay()
+                        }, 1000*10);
+                    }
+                });
+            }else if(_self.pageType === '3'){//优惠券支付结果
+                PayApi.PayOrderPayCouponCheck({ couponRecordId: _self.couponRecordId },function(response){
+                    // console.log(response);
+                    if(response.code === 0){
+                        CAIMEI.dialog('支付成功');
+                        clearTimeout(timer); //清理定时任务
+                        setTimeout(function(){
+                            window.location.href = '/index.html';
+                        },2000);
+                    }else{
+                        timer = setTimeout(function(){
+                            _self.setTimerWechatPay()
+                        }, 1000*10);
+                    }
+                });
+            }else{
+                PayApi.PayOrderPayWhetherSuccess({orderId: _self.payInfo.payOrderId, paySuccessCounter:_self.paySuccessCounter},function(response){
+                    // console.log(response);
+                    if(response.code === 0){
+                        CAIMEI.dialog('支付成功');
+                        clearTimeout(timer); //清理定时任务
+                        setTimeout(function(){
+                            window.location.href = '/index.html';
+                        },2000);
+
+                    }else{
+                        timer = setTimeout(function(){
+                            _self.setTimerWechatPay()
+                        }, 1000*10);
+                    }
+                });
+            }
         },
         setTimerAliPay:function () {//定时任务查询支付宝支付结果
             var _self = this;
@@ -234,6 +270,7 @@ var payContainer = new Vue({
         }else if(_self.pageType === '3'){
             _self.payInfo.payType = payData.type;
             _self.payAmount = _self.payableAmount = payData.amount;
+            _self.couponRecordId = payData.couponRecordId;
             _self.payInfo.payMobileUrl = payData.url;
             _self.couponId = payData.couponId;
             _self.userId = payData.userId;

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

@@ -60,6 +60,15 @@ var payContainer = new Vue({
                         _self.openLink = '/user/member.html';
                     }
                     break;
+                case 'coupon':
+                    if (_self.payFlag) {
+                        _self.linkText = '采美商城首页';
+                        _self.openLink = '/index.html';
+                    } else {
+                        _self.linkText = '优惠券列表';
+                        _self.openLink = '/user/coupon.html';
+                    }
+                    break;
                 default:
                     _self.linkText = '采美商城首页';
                     _self.openLink = '/index.html';

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

@@ -14,6 +14,7 @@ var payContainer = new Vue({
         vipId: null, // vip套餐id
         vipRecordId: undefined,
         couponId: undefined,//优惠券Id
+        couponRecordId:undefined,//优惠券记录Id
         userId : undefined //购买优惠券的用户Id
     },
     computed: {
@@ -29,11 +30,12 @@ var payContainer = new Vue({
             _this.isRequest = true;
             if( _this.pageType == 1){
                 _this.productId = _this.state.productId;
-            }else if(_this.pageType == 2){
+            }else if(_this.pageType == 2 || _this.pageType == 4){
                 _this.vipId = _this.state.vipId;
                 _this.vipRecordId = _this.state.vipRecordId;
             }else if(_this.pageType == 3){
                 _this.couponId = _this.state.couponId;
+                _this.couponRecordId = _this.state.couponRecordId;
                 _this.userId = _this.state.userId;
             }else{
                 _this.orderID = _this.state.orderID;
@@ -44,8 +46,10 @@ var payContainer = new Vue({
                 this.WxRequestsecondHandPay();
             } else if (this.pageType == 2) {
                 this.WxRequestPaymentVipFn();
-            } if (this.pageType == 2) {
+            } else if (this.pageType == 3) {
                 this.WxRequestPaymentCouponFn();
+            } else if (this.pageType === 4){
+                this.WxRequestPaymentAuthVipFn();
             } else {
                 this.WxRequestPaymentFn();
             }
@@ -81,6 +85,36 @@ var payContainer = new Vue({
                 }
             });
         },
+        WxRequestPaymentAuthVipFn: function(){
+            var _this = this;
+            var params = {
+                code: _this.wechatcode,
+                state: _this.rand(1000, 9999),
+                vipId: _this.vipId,
+                vipRecordId: _this.vipRecordId,
+                returnUrl: 'https://www.caimei365.com/',
+            };
+            PayApi.PayAuthVipMiniWxPay(params,function(response){
+                if(response.code == 0){
+                    var PayInfo = JSON.parse(response.data.data.payInfo);
+                    if (typeof WeixinJSBridge == "undefined"){
+                        if( document.addEventListener ){
+                            document.addEventListener('WeixinJSBridgeReady', onBridgeReady, false);
+                        }else if (document.attachEvent){
+                            document.attachEvent('WeixinJSBridgeReady', onBridgeReady);
+                            document.attachEvent('onWeixinJSBridgeReady', onBridgeReady);
+                        }
+                    }else{
+                        _this.onBridgeReady(PayInfo);
+                    }
+                }else{
+                     CAIMEI.dialog("支付链接已失效,请重新扫码支付");
+                    setTimeout(function(){
+                        WeixinJSBridge.call('closeWindow');
+                    },3000);
+                }
+            });
+        },
         // 优惠券支付
         WxRequestPaymentCouponFn: function(){
             var _this = this;
@@ -89,6 +123,7 @@ var payContainer = new Vue({
                 state: _this.rand(1000, 9999),
                 userId: _this.userId,
                 couponId: _this.couponId,
+                couponRecordId:_this.couponRecordId,
                 returnUrl: 'https://www.caimei365.com/',
                 source:2 //支付来源 1 小程序 2 WWW
             };

src/main/resources/static/js/product/detail.js

@@ -681,7 +681,23 @@ var productDetail = new Vue({
             window.location.href = '/shopping/confirm.html?type=3';
         },
         toBuyCoupon:function (coupon) {// 点击购买按钮事件处理
-            window.location.href = '/pay/caimei-paycash.html?pageType=3&couponId='+coupon.couponId;
+            var _self = this;
+            ProductApi.createCouponRecord({userId:_self.listQuery.userId, couponId:coupon.couponId}, function (response) {
+                if(response.code == 0){
+                    let couponRecordId = response.data.couponRecordId
+                    window.location.href = '/pay/caimei-paycash.html?pageType=3&couponId='+coupon.couponId+'&couponRecordId='+couponRecordId;
+                }else{
+                    if(response.code == -1){//个人机构不能购买
+                        CAIMEI.Alert('该优惠券仅限医美机构购买，请升级为医美机构后再次购买。', '去升级', true, function(){
+                            window.location.href = "/user/setting/upgrade.html";
+                        });
+                    }else if(response.code == -2){//会员机构不是医美机构不能购买
+                        CAIMEI.dialog('该优惠券仅限医美机构购买',false,function () {});
+                    }else{
+                        CAIMEI.Alert(response.msg, '确定', false);
+                    }
+                }
+            })
         },
         showSupportingMore:function () {
             var _self = this;

src/main/resources/static/js/shopping/cart.js

@@ -533,7 +533,23 @@ var shoppingCart = new Vue({
             })
         },
         toBuyCoupon:function (coupon) {// 点击购买按钮事件处理
-            window.location.href = '/pay/caimei-paycash.html?pageType=3&couponId='+coupon.couponId;
+            var _self = this;
+            ProductApi.createCouponRecord({userId:_self.userId, couponId:coupon.couponId}, function (response) {
+                if(response.code == 0){
+                    let couponRecordId = response.data.couponRecordId
+                    window.location.href = '/pay/caimei-paycash.html?pageType=3&couponId='+coupon.couponId+'&couponRecordId='+couponRecordId;
+                }else{
+                    if(response.code == -1){//个人机构不能购买
+                        CAIMEI.Alert('该优惠券仅限医美机构购买，请升级为医美机构后再次购买。', '去升级', true, function(){
+                            window.location.href = "/user/setting/upgrade.html";
+                        });
+                    }else if(response.code == -2){//会员机构不是医美机构不能购买
+                        CAIMEI.dialog('该优惠券仅限医美机构购买',false,function () {});
+                    }else{
+                        CAIMEI.Alert(response.msg, '确定', false);
+                    }
+                }
+            })
         },
         queryCouponTabs:function (value){
             var _self = this;

src/main/resources/static/js/user-center/account/coupon-collection.js

@@ -103,7 +103,27 @@ var orderPage = new Vue({
             })
         },
         toBuyCoupon:function (coupon) {// 点击购买按钮事件处理
-            window.location.href = '/pay/caimei-paycash.html?pageType=3&couponId='+coupon.couponId;
+            var  _self = this;
+            if(this.listQuery.userId == 0){
+                window.location.href='/login.html';
+            }else{
+                ProductApi.createCouponRecord({userId:_self.listQuery.userId, couponId:coupon.couponId}, function (response) {
+                    if(response.code == 0){
+                        let couponRecordId = response.data.couponRecordId
+                        window.location.href = '/pay/caimei-paycash.html?pageType=3&couponId='+coupon.couponId+'&couponRecordId='+couponRecordId;
+                    }else{
+                        if(response.code == -1){//个人机构不能购买
+                            CAIMEI.Alert('该优惠券仅限医美机构购买，请升级为医美机构后再次购买。', '去升级', true, function(){
+                                window.location.href = "/user/setting/upgrade.html";
+                            });
+                        }else if(response.code == -2){//会员机构不是医美机构不能购买
+                            CAIMEI.dialog('该优惠券仅限医美机构购买',false,function () {});
+                        }else{
+                            CAIMEI.Alert(response.msg, '确定', false);
+                        }
+                    }
+                })
+            }
         },
         receiveCoupon:function(coupon){// 点击领取按钮事件处理
             var  _self = this;

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

@@ -146,6 +146,9 @@
                     <p id="firstClubType"><em>*</em>机构类型：</p>
                     <label class="diyBox" @click="handleChangeType(1)"><input type="radio" name="firstShopType" v-model="clubUpgradeUser.firstClubType" value="1"  @change="ChangeFirstClubType"><i class="icon mIcon">医美</i></label>
                     <label class="diyBox" @click="handleChangeType(2)"><input type="radio" name="firstShopType" v-model="clubUpgradeUser.firstClubType" value="2" checked  @change="ChangeFirstClubType"><i class="icon mIcon">生美</i></label>
+                    <label class="diyBox" @click="handleChangeType(3)"><input type="radio" name="firstShopType" v-model="clubUpgradeUser.firstClubType" value="3" checked  @change="ChangeFirstClubType"><i class="icon mIcon">项目公司</i></label>
+                    <label class="diyBox" @click="handleChangeType(4)"><input type="radio" name="firstShopType" v-model="clubUpgradeUser.firstClubType" value="4" checked  @change="ChangeFirstClubType"><i class="icon mIcon">个人</i></label>
+                    <label class="diyBox" @click="handleChangeType(5)"><input type="radio" name="firstShopType" v-model="clubUpgradeUser.firstClubType" value="5" checked  @change="ChangeFirstClubType"><i class="icon mIcon">其他</i></label>
                     <span class="errTips icon mIcon" tips="请选择公司类型"></span>
                 </div>
                 <!-- 医美 -->

src/main/resources/templates/activity/attestation.html

@@ -14,7 +14,7 @@
 
 <!-- 商品列表 -->
 <div id="attestation" >
-    <!-- banner   -->
+<!-- banner   -->
     <div class="section_banner">
         <h1>认证通</h1>
         <p>一款专业的正品认证SaaS软件系统</p>
@@ -26,7 +26,7 @@
                     <h1>认证通快捷入口</h1>
                 </div>
                 <div class="section_content clear">
-                    <div class="section_li" v-for="(data , index) in firstEntryList" @click="handleClick(data)">
+                    <div class="section_li" v-for="(data , index) in firstEntryList" @click="handleClick(data,1)">
                         <img class="logo" :src="data.logo" >
                         <div class="name" v-text="data.title"></div>
                     </div>
@@ -39,7 +39,7 @@
                     <h1>他们都在用认证通<span>（排名不分先后顺序）</span></h1>
                 </div>
                 <div class="section_content clear">
-                    <div class="section_li" v-for="(data , index) in suppileData" @click="handleClick(data)">
+                    <div class="section_li" v-for="(data , index) in suppileData" @click="handleClick(data,2)">
                         <img class="logo" :src="data.logo" >
                         <div class="content">
                             <span class="icon-marks"></span>
@@ -254,7 +254,6 @@
                 </div>
             </div>
         </div>
-
     </div>
     <div class="section-tel">
         <div class="box code">

src/main/resources/templates/activity/beautyTopic.html

@@ -16,14 +16,10 @@
 <div id="app">
     <!-- 大图 -->
     <div class="banner-container">
-        <div class="cm-container cm-relative">
-            <div class="banner">
-                <a :href="pageInfo && pageInfo.headLink">
-                    <img :src="pageInfo && pageInfo.crmHeadImage" alt="" v-if="isMobile"/>
-                    <img :src="pageInfo && pageInfo.headImage" alt="" v-else/>
-                </a>
-            </div>
-        </div>
+        <a :href="pageInfo && pageInfo.headLink" class="banner">
+            <img :src="pageInfo && pageInfo.crmHeadImage" alt="" v-if="isMobile"/>
+            <img :src="pageInfo && pageInfo.headImage" alt="" v-else/>
+        </a>
     </div>
     <template v-for="(floorData,index) in floorList">
         <div class="cm-floor">
@@ -253,7 +249,7 @@
                                                 <div class="cm-prodcut-price h24">
                                                     <div class="pro-price cm-clearfix" v-if="pros.listType == 1">
                                                         <template v-if="GLOBAL_USER_ID && GLOBAL_USER_ID>0">
-                                                            <template v-if="pros.product.productCategory != 1">
+                                                            <template v-if="pros.product.productCategory == 1">
                                                                 <!-- 样式1 价格未公开-->
                                                                 <template v-if="pros.product.priceFlag == 1">
                                                                     <div class="price-tag cm-left">
@@ -737,61 +733,73 @@
     </template>
     <!-- 侧边浮窗 -->
     <div class="cm-float-container" v-if="activityEntryVisiable || contactVisiable">
-        <div class="cm-slide" v-show="activityEntryVisiable">
-            <div class="cm-toggle-btn" @click="handleToggleActive(true)"></div>
-        </div>
-        <template v-if="contactVisiable">
-            <div class="cm-slide">
-                <div class="cm-toggle-btn"></div>
-                <div class="cm-tooltop">
-                    <div class="cm-tooltop-content cm-tooltop-1">
-                        <div class="cm-item">展会咨询电话：15338897365</div>
-                        <i></i>
-                        <div class="cm-item">客服咨询电话：15338851365</div>
-                    </div>
-                </div>
+        <a class="cm-regexp" href="/help/1038.html" target="_blank">优惠券<br />规则</a>
+        <div>
+            <div class="cm-slide" v-show="activityEntryVisiable">
+                <div class="cm-toggle-btn" @click="handleToggleActive(true)"></div>
             </div>
-            <div class="cm-slide">
-                <div class="cm-toggle-btn"></div>
-                <div class="cm-tooltop cm-mobile-tooltop">
-                    <div class="cm-tooltop-content cm-tooltop-2 cm-clearfix">
-                        <div class="cm-item cm-left">
-                            <img width="108" height="108"
-                                 src="https://static.caimei365.com/app/img/icon2/cm_wechat_02.png" alt=""/>
-                            <span>展会咨询微信</span>
+            <template v-if="contactVisiable">
+                <div class="cm-slide">
+                    <div class="cm-toggle-btn"></div>
+                    <div class="cm-tooltop">
+                        <div class="cm-tooltop-content cm-tooltop-1">
+                            <div class="cm-item">展会咨询电话：15338897365</div>
+                            <i></i>
+                            <div class="cm-item">客服咨询电话：15338851365</div>
                         </div>
-                        <div class="cm-left line"></div>
-                        <div class="cm-item cm-left">
-                            <img width="108" height="108" src="https://static.caimei365.com/app/img/icon2/cm_wechat_01.png" alt=""/>
-                            <span>客服咨询微信</span>
+                    </div>
+                </div>
+                <div class="cm-slide">
+                    <div class="cm-toggle-btn"></div>
+                    <div class="cm-tooltop cm-mobile-tooltop">
+                        <div class="cm-tooltop-content cm-tooltop-2 cm-clearfix">
+                            <div class="cm-item cm-left">
+                                <img width="108" height="108"
+                                     src="https://static.caimei365.com/app/img/icon2/cm_wechat_02.png" alt=""/>
+                                <span>展会咨询微信</span>
+                            </div>
+                            <div class="cm-left line"></div>
+                            <div class="cm-item cm-left">
+                                <img width="108" height="108"
+                                     src="https://static.caimei365.com/app/img/icon2/cm_wechat_01.png" alt=""/>
+                                <span>客服咨询微信</span>
+                            </div>
                         </div>
                     </div>
                 </div>
-            </div>
-        </template>
+            </template>
+        </div>
     </div>
-    <!-- 获取入口图标 -->
+    <!-- 活动弹窗入口1 -->
     <div class="cm-entry" v-show="activityEntryVisiable && isActive">
         <div id="cm-icon-content" class="cm-icon-content" onclick="_czc.push(['_trackEvent','云上美博会','红包弹窗点击','红包弹窗点击',1,'cm-icon-content'])">
             <span class="cm-close" @click="handleToggleActive(false)"></span>
-            <div @click="handleToggleCoupon(true)" style="cursor: pointer">
-                <img src="/img/activity/pc_entry.png" alt="" v-if="!isMobile"/>
-                <img src="/img/activity/h5_entry.png" alt="" v-else/>
+            <div @click="handleToggleCoupon(false)" style="cursor: pointer">
+                <a href="/user/coupon-collection.html" target="_blank">
+                    <img src="https://static.caimei365.com/app/img/icon2/coupon-entry-h5.png" alt="" v-if="!isMobile"/>
+                    <img src="https://static.caimei365.com/app/img/icon2/coupon-entry-pc.png" alt="" v-else/>
+                </a>
+<!--                <img src="/img/activity/pc_entry.png" alt="" v-if="!isMobile"/>-->
+<!--                <img src="/img/activity/h5_entry.png" alt="" v-else/>-->
             </div>
         </div>
     </div>
 
+    <!-- 活动弹窗入口2 -->
     <div class="cm-entry" v-show="showCouponEntry">
-        <div class="cm-icon-content" @click="handleToggleCoupon(false)">
-            <a href="/product-6898.html" id="conpun" target="_blank" onclick="_czc.push(['_trackEvent','云上美博会','优惠券弹窗点击','优惠券弹窗点击',1,'conpun'])"><span class="btn btn1"></span></a>
-            <a href="/product/couponExp.html" id="conpunDetail" target="_blank" onclick="_czc.push(['_trackEvent','云上美博会','优惠券说明弹窗点击','优惠券说明弹窗点击',1,'conpunDetail'])"><span class="btn btn2"></span></a>
-            <span class="cm-close" @click="handleToggleCoupon(false)"></span>
-            <img src="https://static.caimei365.com/app/img/icon2/coupon-entry-h5.png" alt="" v-if="!isMobile"/>
-            <img src="https://static.caimei365.com/app/img/icon2/coupon-entry-pc.png" alt="" v-else/>
+        <div class="cm-icon-content" @click="handleToggleCoupon(false)" style="cursor: pointer">
+<!--            <a href="/product-6898.html" id="conpun" target="_blank" onclick="_czc.push(['_trackEvent','云上美博会','优惠券弹窗点击','优惠券弹窗点击',1,'conpun'])"><span class="btn btn1"></span></a>-->
+<!--            <a href="/product/couponExp.html" id="conpunDetail" target="_blank" onclick="_czc.push(['_trackEvent','云上美博会','优惠券说明弹窗点击','优惠券说明弹窗点击',1,'conpunDetail'])"><span class="btn btn2"></span></a>-->
+                <span class="cm-close" @click.stop="handleToggleCoupon(false)"></span>
+<!--            <img src="https://static.caimei365.com/app/img/icon2/coupon-entry-h5.png" alt="" v-if="!isMobile"/>-->
+<!--            <img src="https://static.caimei365.com/app/img/icon2/coupon-entry-pc.png" alt="" v-else/>-->
+                <a href="/user/coupon-collection.html" target="_blank">
+                    <img src="https://static.caimei365.com/app/img/icon2/coupon-entry-h5.png" alt="" v-if="!isMobile"/>
+                    <img src="https://static.caimei365.com/app/img/icon2/coupon-entry-pc.png" alt="" v-else/>
+                </a>
         </div>
     </div>
 
-
     <!-- 返回顶部 -->
     <div class="cm-to-top" id="cm-to-top" v-show="showScrollTop">
         <span class="cm-icon-bar"></span>
@@ -803,7 +811,7 @@
     <!--  底部  -->
     <div class="cm-footer">
         <img src="/img/activity/pc_bottom.png" alt=""/>
-        <p>——&nbsp;&nbsp;深圳市采美信息技术有限公司提供技术支持&nbsp;&nbsp;——</p>
+        <p>——&nbsp;&nbsp;由采美网提供技术支持&nbsp;&nbsp;——</p>
     </div>
 </div>
 <!-- 引入js文件 -->

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

@@ -109,17 +109,17 @@
                                                 </template>
                                                 <template v-else>
                                                     <!--可见价格-->
-                                                    <template v-if="(pros.priceFlag==0 && pros.userIdentity!=3) || pros.userIdentity==2 || (pros.userIdentity==3 && pros.shopID==GLOBAL_SHOP_ID)">
+                                                    <template v-if="(pros.priceFlag==0 && pros.userIdentity!=3) || pros.userIdentity==2 || (pros.userIdentity==3 && pros.shopId==GLOBAL_SHOP_ID)">
                                                         <div class="main_price_text" v-if="pros.productCategory == 1">
                                                             <div class="price_text_tag">
 <!--																<p class="couponTag" v-if="pros.couponsLogo">优惠券</p>-->
                                                                 <p class="listTag" v-if="pros.actStatus==1">
                                                                     {{pros.promotions.name}}
-                                                                    <span v-if="pros.priceFlag != 1">:￥{{pros.retailPrice | NumFormat}}</span>
+                                                                    <span v-if="pros.priceFlag != 1">:￥{{pros.originalPrice | NumFormat}}</span>
                                                                 </p>
                                                             </div>
                                                             <div class="main_price_show" :class="PromotionsFormat(pros.promotions) ? 'none' : ''">
-                                                                ￥{{ (PromotionsFormat(pros.promotions) ? pros.price : pros.retailPrice ) | NumFormat  }}
+                                                                ￥{{ (PromotionsFormat(pros.promotions) ? pros.originalPrice : pros.price ) | NumFormat  }}
                                                             </div>
                                                         </div>
                                                     </template>
@@ -152,7 +152,7 @@
                                                 </div>
                                                 <div class="main_price_text" v-else>
                                                     <div class="price_text_tag"></div>
-                                                    <div class="main_price_show">￥{{ pros.retailPrice | NumFormat  }}</div>
+                                                    <div class="main_price_show">￥{{ pros.originalPrice | NumFormat  }}</div>
                                                 </div>
                                             </template>
                                         </template>

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

@@ -26,13 +26,15 @@
                 <div v-if="isPC" class="bigImage">
                     <img :src="images[0]">
                     <span class="mask"></span>
-                    <span class="cm-product-cover-tag" v-if="isPC && pcActType === 1">云上美博会</span>
+<!--                    <span class="cm-product-cover-tag" v-if="isPC && pcActType === 1">云上美博会</span>-->
+                    <span class="cm-product-cover-tag" v-if="isPC && pcActType === 1"></span>
                 </div>
                 <div id="swiperImage" class="smallImage swiper-container">
                     <ul class="swiper-wrapper clear">
                         <li class="swiper-slide mfc" v-for="img in images">
                             <img :src="img">
-                            <span class="cm-product-cover-tag" v-if="!isPC && pcActType === 1">云上美博会</span>
+<!--                            <span class="cm-product-cover-tag" v-if="!isPC && pcActType === 1">云上美博会</span>-->
+                            <span class="cm-product-cover-tag" v-if="!isPC && pcActType === 1"></span>
                         </li>
                     </ul>
                     <div class="swiper-pagination mfc"></div>
@@ -659,21 +661,24 @@
                                     <div class="coupon-list-time"> {{ coupon.startDate }} - {{ coupon.endDate }}</div>
                                 </div>
                                 <div class="coupon-list-ri">
-                                    <template v-if="coupon.moneyCouponFlag == 1">
-                                        <div class="buy" v-if="coupon.couponBtnType == 2" @click="toBuyCoupon(coupon)"
-                                             id="coupon-buy-coupon"
-                                             onclick="_czc.push(['_trackEvent','商品详情','优惠券购买按钮点击','优惠券购买按钮点击',1,'coupon-buy-coupon'])">
-                                            <p>￥{{ coupon.moneyCouponPrice }}</p>
-                                            <p>购买</p>
-                                        </div>
-                                    </template>
-                                    <template v-else>
-                                        <span class="none" v-if="coupon.couponBtnType == 0"
+                                    <template v-if="coupon.couponBtnType == 0">
+                                        <template v-if="coupon.moneyCouponFlag == 1">
+                                            <div class="buy" @click="toBuyCoupon(coupon)"
+                                                 id="coupon-buy-coupon"
+                                                 onclick="_czc.push(['_trackEvent','商品详情','优惠券购买按钮点击','优惠券购买按钮点击',1,'coupon-buy-coupon'])">
+                                                <p>￥{{ coupon.moneyCouponPrice }}</p>
+                                                <p>购买</p>
+                                            </div>
+                                        </template>
+                                        <template v-else>
+                                            <span class="none"
                                               @click="receiveCoupon(coupon)"
                                               id="coupon-receive"
-                                              onclick="_czc.push(['_trackEvent','商品详情','优惠券领取按钮点击','优惠券领取按钮点击',1,'coupon-receive'])">领取</span>
-                                        <span v-if="coupon.couponBtnType == 1">已领取</span>
+                                              onclick="_czc.push(['_trackEvent','商品详情','优惠券领取按钮点击','优惠券领取按钮点击',1,'coupon-receive'])">领取
+                                            </span>
+                                        </template>
                                     </template>
+                                    <span v-if="coupon.couponBtnType == 1">已领取</span>
                                 </div>
                                 <template v-if="coupon.moneyCouponFlag == 1">
                                     <div class="coupon-tags" v-if="coupon.moneyCouponType == 1">意向{{ coupon.couponType | TypeFormat }}</div>

src/main/resources/templates/shopping/cart.html

@@ -259,19 +259,24 @@
                                 <div class="coupon-list-time"> {{ coupon.startDate }} - {{ coupon.endDate }} </div>
                             </div>
                             <div class="coupon-list-ri">
-                                <template v-if="coupon.moneyCouponFlag == 1">
-                                    <div class="buy" @click="toBuyCoupon(coupon)" id="coupon-buy-coupon"
-                                         onclick="_czc.push(['_trackEvent','机构购物车','优惠券购买按钮点击','优惠券购买按钮点击',1,'coupon-buy-coupon'])">
-                                        <p>￥{{ coupon.moneyCouponPrice }}</p>
-                                        <p>购买</p>
-                                    </div>
-                                </template>
-                                <template>
-                                    <span class="none" v-if="coupon.couponBtnType == 0" @click="receiveCoupon(coupon)"
-                                          id="coupon-receive"
-                                          onclick="_czc.push(['_trackEvent','机构购物车','优惠券领取按钮点击','优惠券领取按钮点击',1,'coupon-receive'])">领取</span>
-                                    <span v-if="coupon.couponBtnType == 1">已领取</span>
+                                <template v-if="coupon.couponBtnType == 0">
+                                    <template v-if="coupon.moneyCouponFlag == 1">
+                                        <div class="buy" @click="toBuyCoupon(coupon)"
+                                             id="coupon-buy-coupon"
+                                             onclick="_czc.push(['_trackEvent','商品详情','优惠券购买按钮点击','优惠券购买按钮点击',1,'coupon-buy-coupon'])">
+                                            <p>￥{{ coupon.moneyCouponPrice }}</p>
+                                            <p>购买</p>
+                                        </div>
+                                    </template>
+                                    <template v-else>
+                                            <span class="none"
+                                                  @click="receiveCoupon(coupon)"
+                                                  id="coupon-receive"
+                                                  onclick="_czc.push(['_trackEvent','商品详情','优惠券领取按钮点击','优惠券领取按钮点击',1,'coupon-receive'])">领取
+                                            </span>
+                                    </template>
                                 </template>
+                                <span v-if="coupon.couponBtnType == 1">已领取</span>
                             </div>
                             <template v-if="coupon.moneyCouponFlag == 1">
                                 <div class="coupon-tags" v-if="coupon.moneyCouponType == 1">意向{{ coupon.couponType | TypeFormat }}</div>

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

@@ -117,6 +117,9 @@
                                 <p id="firstClubType"><em>*</em>机构类型：</p>
                                 <label class="diyBox" @click="handleChangeType(1)"><input type="radio" name="firstShopType" v-model="clubUpgradeUser.firstClubType" value="1"><i class="icon mIcon">医美</i></label>
                                 <label class="diyBox" @click="handleChangeType(2)"><input type="radio" name="firstShopType" v-model="clubUpgradeUser.firstClubType" value="2" checked><i class="icon mIcon">生美</i></label>
+                                <label class="diyBox" @click="handleChangeType(3)"><input type="radio" name="firstShopType" v-model="clubUpgradeUser.firstClubType" value="3" checked><i class="icon mIcon">项目公司</i></label>
+                                <label class="diyBox" @click="handleChangeType(4)"><input type="radio" name="firstShopType" v-model="clubUpgradeUser.firstClubType" value="4" checked><i class="icon mIcon">个人</i></label>
+                                <label class="diyBox" @click="handleChangeType(5)"><input type="radio" name="firstShopType" v-model="clubUpgradeUser.firstClubType" value="5" checked><i class="icon mIcon">其他</i></label>
                                 <span class="errTips icon mIcon" tips="" :class="typeflag?'show':''">请选择公司类型</span>
                             </div>
                             <!-- 医美 -->

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

@@ -110,6 +110,9 @@
                                 <p><em>*</em>机构类型：</p>
                                 <label class="diyBox" @click="handleChangeType(1)"><input type="radio" name="firstShopType" v-model="clubUpgradeUser.firstClubType" value="1" ><i class="icon mIcon">医美</i></label>
                                 <label class="diyBox" @click="handleChangeType(2)"><input type="radio" name="firstShopType" v-model="clubUpgradeUser.firstClubType" value="2" checked><i class="icon mIcon">生美</i></label>
+                                <label class="diyBox" @click="handleChangeType(3)"><input type="radio" name="firstShopType" v-model="clubUpgradeUser.firstClubType" value="3" checked><i class="icon mIcon">项目公司</i></label>
+                                <label class="diyBox" @click="handleChangeType(4)"><input type="radio" name="firstShopType" v-model="clubUpgradeUser.firstClubType" value="4" checked><i class="icon mIcon">个人</i></label>
+                                <label class="diyBox" @click="handleChangeType(5)"><input type="radio" name="firstShopType" v-model="clubUpgradeUser.firstClubType" value="5" checked><i class="icon mIcon">其他</i></label>
                                 <span class="errTips icon mIcon" tips="" :class="typeflag?'show':''">请选择公司类型</span>
                             </div>
                             <!-- 医美 -->