喻文俊 3 лет назад
Родитель
Сommit
7c3dd58e5e

+ 1 - 1
src/main/resources/static/css/user-center/account/coupon.css

@@ -32,7 +32,7 @@ li{list-style:none}
     .coupon-list-cell .coupon-tags.none{background-color: #dbdbdb;color: #FFF;}
     .coupon-list-cell.used{background: url("/img/account/icon-coupon-uesb@2x.png") no-repeat;background-size: cover;}
     .coupon-list-cell.none{background: url("/img/account/icon-coupon-none@2x.png") no-repeat;background-size: cover;}
-    .empty{width: 100%;float: left;}
+    .empty{width: 100%;float: left;padding: 140px 0}
     .empty img{width: 180px;height: 180px;}
     .empty .msg{color: #999;}
 

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

@@ -317,24 +317,27 @@ var memberPage = new Vue({
 
         setBottomBtnsVisiable: function () {
             var _self = this;
-            if (isPC && _self.comboInfo.length > 0 && _self.vipInfo.vipFlag !== 1 && _self.showBottomBtns) {
-                setTimeout(function () {
+            setTimeout(function () {
+                if (isPC && _self.comboInfo.length > 0 && _self.vipInfo.vipFlag !== 1) {
                     $(window).scroll(function () {
                         var vipPackage = document.querySelector('#vipPackage').getBoundingClientRect();
                         var memberPage = document.querySelector('#memberPage').getBoundingClientRect();
                         var clientHeight = $(window).height();
+                        if(vipPackage.bottom < 185 ){
+                            _self.showBottomBtns = true;
+                        }
                         if (clientHeight - memberPage.bottom > 104) {
                             _self.showBottomBtns = true;
                             $('#pay-amount-bottom').addClass('absolute');
                         } else {
                             $('#pay-amount-bottom').removeClass('absolute');
-                            if (vipPackage.bottom > 0) {
+                            if (vipPackage.bottom > 185) {
                                 _self.showBottomBtns = false;
                             }
                         }
                     })
-                })
-            }
+                }
+            },200)
         }
     }
 });

+ 1 - 1
src/main/resources/templates/user-center/member/member-product.html

@@ -12,7 +12,7 @@
 <!-- 引用头部 -->
 <template th:replace="components/header"></template>
 <div id="memberProduct" v-cloak>
-    <div class="banner-box">
+    <div class="banner-box" v-if="bannerImage">
         <img :src="bannerImage"/>
     </div>
     <div class="container goods-list">

+ 2 - 8
src/main/resources/templates/user-center/member/member.html

@@ -81,7 +81,7 @@
                 </div>
                 <!--优惠券列表-->
                 <div class="section">
-                    <div class="section-title">专属特权<span>每月可领4个</span></div>
+                    <div class="section-title">专属优惠券<span>每月可领4个</span></div>
                     <div class="content coupon-list">
                         <template v-if="couponList.length > 0">
                             <div v-for="(item, index) in couponList" :key="index" :class="{'un-received':item.useStatus === 1}">
@@ -127,7 +127,7 @@
         </div>
     </div>
     <!--底部支付按钮 仅未开通和到期显示-->
-    <div class="pay-amount-bottom" id="pay-amount-bottom" v-if="comboInfo.length > 0 && vipInfo.vipFlag !== 1 && showBottomBtns">
+    <div class="pay-amount-bottom" id="pay-amount-bottom" v-if="showBottomBtns">
         <div>
             <div class="pay-btn plain" onclick="_czc.push(['_trackEvent','开通超级会员','超级会员','采美豆抵扣2','','Um_Event_RegisterSuperByBeansTwo'])">
                 <a href="javascript:void(0);" @click="payAction(2)">
@@ -174,12 +174,6 @@
             <span v-else>暂无可选套餐~</span>
         </div>
     </div>
-    <!--立即支付弹窗-->
-    <div class="payment-confirm-popup" v-if="showConfirmPopup">
-        <div class="popup-title">请在您新打开的页面上完成付款!<span class="close">&times;</span></div>
-        <div class="content">完成付款后请点击下面的按钮</div>
-        <div class="popup-btn"><a href="" class="confirm-btn">已完成支付</a></div>
-    </div>
 </div>
 
 <!-- 引入底部 -->