Merge branch 'developer' into developerA

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: 'ldm', 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: 'ldm', 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,7 +39,7 @@ var activeApp = (function () {
         },
         mounted: function mounted() {
             this.pageLoaded();
-            this.showCouponEntry = true
+            // this.showCouponEntry = true 优惠券弹窗入口2
         }
         ,
         created: function created() {
@@ -271,7 +271,7 @@ var activeApp = (function () {
             ,
             // 优惠券入口
             handleToggleCoupon: function handleToggleCoupon(flag){
-                this.showCouponEntry = flag;
+                // this.showCouponEntry = flag;
                 this.isActive = false;
             },
             //    初始化用户信息

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

@@ -687,7 +687,15 @@ var productDetail = new Vue({
                     let couponRecordId = response.data.couponRecordId
                     window.location.href = '/pay/caimei-paycash.html?pageType=3&couponId='+coupon.couponId+'&couponRecordId='+couponRecordId;
                 }else{
-                    CAIMEI.Alert(response.msg, '确定', false);
+                    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);
+                    }
                 }
             })
         },

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

@@ -539,7 +539,15 @@ var shoppingCart = new Vue({
                     let couponRecordId = response.data.couponRecordId
                     window.location.href = '/pay/caimei-paycash.html?pageType=3&couponId='+coupon.couponId+'&couponRecordId='+couponRecordId;
                 }else{
-                    CAIMEI.Alert(response.msg, '确定', false);
+                    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);
+                    }
                 }
             })
         },

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

@@ -234,8 +234,8 @@ var shoppingConfirm = new Vue({
                 if(r.code === 0 && r.data){
                     _self.confirmParam.payInfo.postageFlag = _self.hanldPostageFlag = r.data.postageFlag;
                     _self.userBeans = r.data.userBeans;
-                    _self.confirmParam.payInfo.postage = _self.hanldPostage = (r.data.postageFlag=== 1 ? r.data.postage : 0);
-                    _self.hanldShouldPayFee = _self.totalPrice + _self.confirmParam.payInfo.postage - _self.couponAmount;
+                    _self.hanldPostage = (r.data.postageFlag=== 1 ? r.data.postage : 0);
+                    _self.hanldShouldPayFee = _self.totalPrice + _self.hanldPostage - _self.couponAmount;
                     switch ( _self.confirmParam.payInfo.postageFlag) {
                         case 1:
                             if( _self.userBeans > 0 ){
@@ -527,7 +527,7 @@ var shoppingConfirm = new Vue({
             var _self = this;
             if(this.balance.userMoney>0){
                 this.$nextTick(function() {
-                    var total = _self.totalPrice +_self.confirmParam.payInfo.postage - _self.couponAmount; // 订单总金额 + 邮费金额
+                    var total = _self.totalPrice + _self.hanldPostage - _self.couponAmount; // 订单总金额 + 邮费金额
                     if(_self.balance.flag){
                         _self.confirmParam.payInfo.balancePayFlag = 1;
                         if(_self.balance.userMoney >= total){ // 全部抵扣
@@ -571,7 +571,7 @@ var shoppingConfirm = new Vue({
         },
         changeDeductibleFreight: function(){//选择采美豆抵扣邮费
             var _self = this;
-            var total = _self.totalPrice +_self.confirmParam.payInfo.postage - _self.couponAmount;
+            var total = _self.totalPrice + _self.hanldPostage - _self.couponAmount;
             if(_self.balance.isFreight){//判断是否勾选运费
                 if(_self.confirmParam.payInfo.postageFlag == 1){//有邮费
                     _self.confirmParam.payInfo.userBeans = _self.freightBeansMoney*100;
@@ -590,7 +590,7 @@ var shoppingConfirm = new Vue({
                                 console.log('有勾选余额抵扣部分抵',_self.hanldShouldPayFee)
                             }
                         }else{
-                            _self.hanldShouldPayFee = ((_self.totalPrice*100 +_self.confirmParam.payInfo.postage*100 - _self.freightBeansMoney*100)/100) - _self.couponAmount;
+                            _self.hanldShouldPayFee = ((_self.totalPrice*100 + _self.hanldPostage*100 - _self.freightBeansMoney*100)/100) - _self.couponAmount;
                             console.log('无余额抵扣',_self.hanldShouldPayFee)
                         }
                     }
@@ -635,7 +635,7 @@ var shoppingConfirm = new Vue({
                         console.log('余额部分抵未勾选采美豆抵扣',_self.hanldShouldPayFee)
                     }
                 }else{
-                    _self.hanldShouldPayFee = (_self.totalPrice +_self.confirmParam.payInfo.postage) - _self.couponAmount;
+                    _self.hanldShouldPayFee = (_self.totalPrice + _self.hanldPostage) - _self.couponAmount;
                 }
             }
         },
@@ -730,8 +730,7 @@ var shoppingConfirm = new Vue({
                 _self.orderInvoice.type = parseInt(_self.orderInvoice.type)
                 _self.confirmParam.orderInvoice = _self.orderInvoice;
             }
-            var hanldPostageFlag =
-                _self.confirmParam.payInfo.postage = parseInt(_self.hanldPostage).toFixed(2);
+            _self.confirmParam.payInfo.postage = parseInt(_self.hanldPostage).toFixed(2);
             _self.confirmParam.payInfo.postageFlag = parseInt(_self.hanldPostageFlag);
             _self.confirmParam.payInfo.orderShouldPayFee = parseFloat(_self.hanldShouldPayFee).toFixed(2);
             _self.confirmParam.payInfo = JSON.stringify(_self.confirmParam.payInfo);

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

@@ -112,7 +112,15 @@ var orderPage = new Vue({
                         let couponRecordId = response.data.couponRecordId
                         window.location.href = '/pay/caimei-paycash.html?pageType=3&couponId='+coupon.couponId+'&couponRecordId='+couponRecordId;
                     }else{
-                        CAIMEI.Alert(response.msg, '确定', false);
+                        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);
+                        }
                     }
                 })
             }

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

@@ -52,7 +52,7 @@
                             >
                                 <span>{{floorData.floorContent.displayDate2 | tabTime}}</span>
                             </div>
-                            <div
+                            <div    v-if="floorData.floorContent.templateType !== '25'"
                                     class="cm-tab"
                                     :class="{on:currentVideoSwiper(floorData.floorContent.templateType,index) === 2}"
                                     @click="handleTabClick(floorData.floorContent.templateType,index, 2)"
@@ -770,17 +770,22 @@
             </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)" style="cursor: pointer">
 <!--            <a href="/product-6898.html" id="conpun" target="_blank" onclick="_czc.push(['_trackEvent','云上美博会','优惠券弹窗点击','优惠券弹窗点击',1,'conpun'])"><span class="btn btn1"></span></a>-->

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>
                             <!-- 医美 -->