代码优化

src/main/resources/static/css/pay/caimei-pay.css

@@ -25,7 +25,7 @@
     .pay-svip{margin-top:24px}
     .pay-svip+.pay-method .method-title{background:#F5F5F5 !important}
     .pay-svip .pay-svip-title{padding:0 0 16px 16px;font-size:16px;font-weight:400;color:#2D3036}
-    .pay-svip .content{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;width:1184px;height:78px;padding-left:112px;padding-right:24px;-webkit-box-sizing:border-box;box-sizing:border-box;background:url(https://static.caimei365.com/app/img/svip/pc-cm-svip-bg-03.png) no-repeat center;background-size:1184px 78px}
+    .pay-svip .content{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;width:1184px;height:78px;padding-left:112px;padding-right:24px;-webkit-box-sizing:border-box;box-sizing:border-box;background:url(/img/member/pc-cm-svip-bg-03.png) no-repeat center;background-size:1184px 78px}
     .pay-svip .pay-svip-detail{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start;-webkit-box-align:end;-ms-flex-align:end;align-items:flex-end}
     .pay-svip .pay-svip-detail .tit{font-size:16px;font-weight:400;color:#4E4539;padding-bottom:4px}
     .pay-svip .pay-svip-detail .pay-amount{margin-left:18px;font-size:28px;font-weight:bold;color:#4E4539}

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

@@ -40,7 +40,7 @@ input::-webkit-outer-spin-button {
     .pay-svip{margin-top:24px}
     .pay-svip+.pay-method .method-title{background:#F5F5F5 !important}
     .pay-svip .pay-svip-title{padding:0 0 16px 16px;font-size:16px;font-weight:400;color:#2D3036}
-    .pay-svip .content{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;width:1184px;height:78px;padding-left:112px;padding-right:24px;-webkit-box-sizing:border-box;box-sizing:border-box;background:url(https://static.caimei365.com/app/img/svip/pc-cm-svip-bg-03.png) no-repeat center;background-size:1184px 78px}
+    .pay-svip .content{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;width:1184px;height:78px;padding-left:112px;padding-right:24px;-webkit-box-sizing:border-box;box-sizing:border-box;background:url(/img/member/pc-cm-svip-bg-03.png) no-repeat center;background-size:1184px 78px}
     .pay-svip .pay-svip-detail{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start;-webkit-box-align:end;-ms-flex-align:end;align-items:flex-end}
     .pay-svip .pay-svip-detail .tit{font-size:16px;font-weight:400;color:#4E4539;padding-bottom:4px}
     .pay-svip .pay-svip-detail .pay-amount{margin-left:18px;font-size:28px;font-weight:bold;color:#4E4539}
@@ -138,7 +138,7 @@ input::-webkit-outer-spin-button {
     .pay-title .pay-input input{outline:none;box-sizing:border-box;width:100%;height:7vw;line-height:5vw;padding:1vw 0;text-indent:1.2em;font-size:3.4vw;text-align:left;background-color:#ffffff;border-radius:2px;border:solid 1px #b8bfca}
     .pay-svip{padding-top:4vw;background:#fff}
     .pay-svip .pay-svip-title{padding:0 0 2.7vw 3.3vw;font-size:3.7vw;font-weight:400;color:#2D3036}
-    .pay-svip .content{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;width:100vw;height:20.6vw;padding-left:17vw;padding-right:3.2vw;-webkit-box-sizing:border-box;box-sizing:border-box;background:url(https://static.caimei365.com/app/img/svip/h5-cm-svip-bg-03.png) no-repeat center;background-size:100vw 20.6vw}
+    .pay-svip .content{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;width:100vw;height:20.6vw;padding-left:17vw;padding-right:3.2vw;-webkit-box-sizing:border-box;box-sizing:border-box;background:url(/img/member/h5-cm-svip-bg-03.png) no-repeat center;background-size:100vw 20.6vw}
     .pay-svip .pay-svip-detail{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start;-webkit-box-align:end;-ms-flex-align:end;align-items:flex-end}
     .pay-svip .pay-svip-detail .tit{font-size:2.6vw;font-weight:400;color:#4E4539;padding-bottom:0.4vw}
     .pay-svip .pay-svip-detail .pay-amount{margin-left:1.7vw;font-size:5.6vw;font-weight:bold;color:#4E4539}

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

@@ -2,7 +2,7 @@
 .cm-text-ellipsis-2{overflow:hidden;-o-text-overflow:ellipsis;text-overflow:ellipsis;display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:2}
 /*pc端样式*/
 @media screen and (min-width:768px){
-#memberPage{position: relative;margin-bottom: 105px;}
+#memberPage{position: relative;/*margin-bottom: 105px;*/}
 .right{width:968px;overflow:hidden}
 .section .section-title{padding:30px 20px 12px;font-size:16px;font-weight:400;color:#22272E}
 .section .section-title span{font-size: 14px;color: #E4AA43;margin-left: 8px}
@@ -10,7 +10,7 @@
 .section .section-title a:hover{ color: #E4AA43}
 .section .content{padding:30px 24px;-webkit-box-sizing:border-box;box-sizing:border-box;background:#fff;-webkit-box-shadow:0px 3px 6px rgba(0,0,0,0.07);box-shadow:0px 3px 6px rgba(0,0,0,0.07)}
 /*会标标记*/
-.vip-bar{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;width:968px;height:68px;-webkit-box-sizing:border-box;box-sizing:border-box;padding-left:104px;padding-right:24px;line-height:68px;background:url(https://static.caimei365.com/app/img/svip/pc-cm-svip-bg-02.png) no-repeat center;background-size:968px 68px;font-weight:400}
+.vip-bar{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;width:968px;height:68px;-webkit-box-sizing:border-box;box-sizing:border-box;padding-left:104px;padding-right:24px;line-height:68px;background:url(/img/member/pc-cm-svip-bg-02.png) no-repeat center;background-size:968px 68px;font-weight:400}
 .vip-bar>div>span:first-child{font-size:16px;line-height:21px;color:#55331D}
 .vip-bar>div>span:last-child{font-size:14px;color:#55331D;opacity:1;margin-left:16px}
 .vip-bar>div>span.error{color:#FF2A2A}
@@ -41,8 +41,8 @@
 .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}
-.coupon-list>div{position:relative;width:219px;height:96px;padding-left:24px;-webkit-box-sizing:border-box;box-sizing:border-box;background:url(https://static.caimei365.com/app/img/svip/pc-cm-svip-coupon-unable.png) no-repeat center;background-size:219px 96px}
-.coupon-list>div.un-received{background-image:url(https://static.caimei365.com/app/img/svip/pc-cm-svip-coupon-able.png)}
+.coupon-list>div{position:relative;width:219px;height:96px;padding-left:24px;-webkit-box-sizing:border-box;box-sizing:border-box;background:url(/img/member/pc-cm-svip-coupon-unable.png) no-repeat center;background-size:219px 96px}
+.coupon-list>div.un-received{background-image:url(/img/member/pc-cm-svip-coupon-able.png)}
 .coupon-list>div .type{position:absolute;left:0;top:0;z-index:9;width:46px;height:18px;font-size:12px;text-align:center;line-height:18px;background:#E4AA43;border-radius:2px 0px 2px 0px}
 .coupon-list>div .amount{padding-top:20px;font-size:26px;font-weight:bold;color:#55331D}
 .coupon-list>div .amount>i{font-size:14px;font-weight:400;color:#55331D;font-style:unset}
@@ -74,7 +74,7 @@
 
 /*底部支付按钮*/
 .pay-amount-bottom a:hover{color:unset}
-.pay-amount-bottom{position:absolute;bottom:-104px;width:100%;background:#fff}
+.pay-amount-bottom{position:fixed;bottom:0;width:100%;background:#fff;z-index: 9999;}
 .pay-amount-bottom>div{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:end;-ms-flex-pack:end;justify-content:flex-end;-webkit-box-align:center;-ms-flex-align:center;align-items:center;width:1184px;height:72px;margin:0 auto}
 .pay-amount-bottom .pay-btn{width:336px;height:50px;background:-webkit-gradient(linear,left top,right top,from(#FEE9BA),to(#F0CB72));background:-o-linear-gradient(left,#FEE9BA 0%,#F0CB72 100%);background:linear-gradient(90deg,#FEE9BA 0%,#F0CB72 100%);border-radius:2px;-webkit-box-sizing:border-box;box-sizing:border-box;font-size:16px;font-weight:500;line-height:22px;margin-left:15px}
 .pay-amount-bottom .pay-btn.plain{border:1px solid #F0CB72;background:#fff}
@@ -106,7 +106,7 @@
 .section .section-title a{font-size: 3.2vw;color: #E4AA43;float: right;margin-right: 3.3vw}
 .section .content{-webkit-box-sizing:border-box;box-sizing:border-box}
 /*会员标记*/
-.vip-bar{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between;width:100vw;height:20.6vw;-webkit-box-sizing:border-box;box-sizing:border-box;padding-left:17.1vw;padding-right:3.3vw;background:url(https://static.caimei365.com/app/img/svip/h5-cm-svip-bg-02.png) no-repeat center;background-size:100vw 20.6vw;font-weight:400}
+.vip-bar{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between;width:100vw;height:20.6vw;-webkit-box-sizing:border-box;box-sizing:border-box;padding-left:17.1vw;padding-right:3.3vw;background:url(/img/member/h5-cm-svip-bg-02.png) no-repeat center;background-size:100vw 20.6vw;font-weight:400}
 .vip-bar .row2,.vip-bar .right-box{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:start;-ms-flex-align:start;align-items:flex-start;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column}
 .vip-bar .left-box span:first-child{font-size:3.4vw;color:#55331D}
 .vip-bar .left-box span:last-child{font-size:3vw;color:#55331D;opacity:1;margin-top:2.4vw}
@@ -138,8 +138,8 @@
 .service-list>div .sub-tit{font-size:2.8vw;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;-ms-flex-wrap:wrap;flex-wrap:wrap;-webkit-box-align:center;-ms-flex-align:center;align-items:center;-webkit-box-sizing:border-box;box-sizing:border-box;padding:0 3.3vw}
-.coupon-list>div{position:relative;width:45vw;height:19.8vw;padding-left:4.9vw;margin-bottom:3.4vw;-webkit-box-sizing:border-box;box-sizing:border-box;background:url(https://static.caimei365.com/app/img/svip/pc-cm-svip-coupon-unable.png) no-repeat center;background-size:45vw 19.8vw}
-.coupon-list>div.un-received{background-image:url(https://static.caimei365.com/app/img/svip/pc-cm-svip-coupon-able.png)}
+.coupon-list>div{position:relative;width:45vw;height:19.8vw;padding-left:4.9vw;margin-bottom:3.4vw;-webkit-box-sizing:border-box;box-sizing:border-box;background:url(/img/member/pc-cm-svip-coupon-unable.png) no-repeat center;background-size:45vw 19.8vw}
+.coupon-list>div.un-received{background-image:url(/img/member/pc-cm-svip-coupon-able.png)}
 .coupon-list>div .type{position:absolute;left:0;top:0;z-index:9;width:11vw;height:3.9vw;font-size:2.4vw;text-align:center;line-height:3.9vw;background:#E4AA43;border-radius:2px 0px 2px 0px}
 .coupon-list>div .amount{padding-top:3.6vw;font-size:5.2vw;font-weight:bold;color:#55331D}
 .coupon-list>div .amount>i{font-size:2.8vw;font-weight:400;color:#55331D;font-style:unset}

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

@@ -5,7 +5,7 @@
 .right{width:968px;overflow:hidden}
 .pageWrap{width: 968px}
 /*会标标记*/
-.vip-bar{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;width:968px;height:68px;-webkit-box-sizing:border-box;box-sizing:border-box;padding-left:104px;padding-right:24px;line-height:68px;background:url(https://static.caimei365.com/app/img/svip/pc-cm-svip-bg-02.png) no-repeat center;background-size:968px 68px;font-weight:400}
+.vip-bar{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;width:968px;height:68px;-webkit-box-sizing:border-box;box-sizing:border-box;padding-left:104px;padding-right:24px;line-height:68px;background:url(/img/member/pc-cm-svip-bg-02.png) no-repeat center;background-size:968px 68px;font-weight:400}
 .vip-bar>div>span:first-child{font-size:16px;line-height:21px;color:#55331D}
 .vip-bar>div>span:last-child{font-size:14px;color:#55331D;opacity:1;margin-left:16px}
 .vip-bar>div>span.error{color:#FF2A2A}
@@ -42,7 +42,7 @@
 /*h5*/
 @media screen and (max-width:768px){
 /*会员标记*/
-.vip-bar{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between;width:100vw;height:20.6vw;-webkit-box-sizing:border-box;box-sizing:border-box;padding-left:17.1vw;padding-right:3.3vw;background:url(https://static.caimei365.com/app/img/svip/h5-cm-svip-bg-02.png) no-repeat center;background-size:100vw 20.6vw;font-weight:400}
+.vip-bar{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between;width:100vw;height:20.6vw;-webkit-box-sizing:border-box;box-sizing:border-box;padding-left:17.1vw;padding-right:3.3vw;background:url(/img/member/h5-cm-svip-bg-02.png) no-repeat center;background-size:100vw 20.6vw;font-weight:400}
 .vip-bar .row2,.vip-bar .right-box{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:start;-ms-flex-align:start;align-items:flex-start;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column}
 .vip-bar .left-box span:first-child{font-size:3.4vw;color:#55331D}
 .vip-bar .left-box span:last-child{font-size:3vw;color:#55331D;opacity:1;margin-top:2.4vw}

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

@@ -434,7 +434,8 @@ var payContainer = new Vue({
                     params = {
                         unpaidAmount:_self.payAmount,
                         vipId:_self.comboInfo.id,
-                        payType:_self.payInfo.payType
+                        payType:_self.payInfo.payType,
+                        userId: GLOBAL_USER_ID
                     }
                 }else{
                     params = {

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

@@ -60,6 +60,7 @@ var memberPage = new Vue({
         showMask: false, // 遮罩层
         showRenewPopup: false, // 续费弹窗
         showConfirmPopup: false, // 支付确认弹窗
+        showBottomBtns: false,
         // 优惠券列表
         couponList: [],
         comboCurrent: 0,  // 当前选择的套餐
@@ -90,6 +91,8 @@ var memberPage = new Vue({
         this.fetchSuperPackage();
         this.initCenter();
         this.getSvipProductList();
+        this.setBottomBtnsVisiable();
+
     },
     methods: {
         // 是否显示vip标签价格
@@ -227,6 +230,9 @@ var memberPage = new Vue({
         // 领取专属优惠券
         receiveCoupon: function (id) {
             var _self = this;
+            if(_self.vipInfo.vipFlag !== 1){
+               return CAIMEI.dialog('请先开通会员', false);
+            }
             ProductApi.ReceiveCoupon({
                 userId: GLOBAL_USER_ID,
                 couponId: id,
@@ -316,5 +322,23 @@ var memberPage = new Vue({
                 return '￥' + price;
             }
         },
+
+        setBottomBtnsVisiable: function () {
+            var _self = this;
+            if (isPC) {
+                setTimeout(function () {
+                    $(window).scroll(function () {
+                        if ($(this).scrollTop() >= 200) {
+                            _self.showBottomBtns = true;
+                            $('body').css('padding-bottom', '72px')
+                        } else {
+                            _self.showBottomBtns = false;
+                            $('body').css('padding-bottom', '0')
+                        }
+                    })
+                })
+            }
+        }
+
     }
 });

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

@@ -243,7 +243,7 @@
                            onclick="_czc.push(['_trackEvent','商品详情','点击','升级查看价格','','Um_Event_ProductUpgrade'])">升级会员查看价格</a>
                     </div>
                     <div class="btnBox"
-                         v-else-if="(priceObj.priceFlag==0 && priceObj.userIdentity!=3) || (priceObj.priceFlag==2 && priceObj.userIdentity==2)">
+                         v-else-if="(priceObj.priceFlag==0 && priceObj.userIdentity!=3) || (priceObj.priceFlag==2 && priceObj.userIdentity==2) || GLOBAL_VIP_FLAG === 1">
                         <a href="javascript:void(0);" class="cart icon" @click='addShopCart()' v-if="!isNoneDisabled"
                            onclick="_czc.push(['_trackEvent','商品详情','点击','加入购物车','','Um_Event_ProductAddCart'])">加入购物车</a>
                         <a href="javascript:void(0);" class="buy" @click="buyNowSubmit()" v-if="!isNoneDisabled"

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

@@ -67,9 +67,9 @@
                     <div class="section-title">专属特权</div>
                     <div class="content service-list">
                         <div v-for="(item, index) in serviceList" :key="index">
-                            <img :src="'https://static.caimei365.com/app/img/svip/pc-cm-svip-icon' + (index + 1) + '.png'"
+                            <img :src="'/img/member/pc-cm-svip-icon' + (index + 1) + '.png'"
                                  v-if="isPC"/>
-                            <img :src="'https://static.caimei365.com/app/img/svip/h5-cm-svip-icon' + (index + 1) + '.png'"
+                            <img :src="'/img/member/h5-cm-svip-icon' + (index + 1) + '.png'"
                                  v-else/>
                             <span class="tit" v-html="item.name"></span>
                             <span class="sub-tit" v-html="item.subTitle"></span>
@@ -81,7 +81,7 @@
                     <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.getFlag}">
+                            <div v-for="(item, index) in couponList" :key="index" class="un-received">
                                 <span class="type" v-html="item.typeText"></span>
                                 <div class="amount"><i>￥</i>{{ item.couponAmount }}</div>
                                 <div class="condition">满{{ item.touchPrice }}可用</div>
@@ -123,7 +123,7 @@
         </div>
     </div>
     <!--底部支付按钮 仅未开通和到期显示-->
-    <div class="pay-amount-bottom" v-if="vipInfo.vipFlag !== 1">
+    <div class="pay-amount-bottom" v-if="vipInfo.vipFlag !== 1 && showBottomBtns">
         <div>
             <div class="pay-btn plain">
                 <a href="javascript:void(0);" @click="payAction(1)">