美博会价值优惠券功能

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

@@ -37,6 +37,7 @@ input::-webkit-outer-spin-button {
     .pay-title .pay-input .input-text{font-size: 18px;color: #333333;}
     .pay-title .pay-input .input-text span{font-size: 14px;}
     .pay-title .pay-input .input{width: 215px;height: 34px;display: inline-block;font-size: 14px;line-height: 34px;padding: 0 10px;border: 1px solid #EBEBEB;border-radius: 5px;}
+    /*超级会员*/
     .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}
@@ -46,6 +47,13 @@ input::-webkit-outer-spin-button {
     .pay-svip .pay-svip-detail .pay-amount{margin-left:18px;font-size:28px;font-weight:bold;color:#4E4539}
     .pay-svip .pay-svip-detail .pay-amount > span{font-size:12px;vertical-align:0}
     .pay-svip .svip-indent{padding-top:24px;font-size:16px;font-weight:bold;color:#4E4539}
+    /*优惠券*/
+    .pay-coupontitle{line-height: 72px;font-size: 24px;width: 100%;box-sizing: border-box;padding: 0 16px;font-weight: bold;}
+    .pay-coupon{width: 100%;height: 118px;box-sizing: border-box;padding: 16px;background: #FFFFFF;}
+    .pay-coupon .pay-coupon-title{width: 100%;line-height: 24px;font-size: 18px;color: #333333;margin-bottom: 16px;}
+    .pay-coupon .pay-coupon-title span{color: #E15621;}
+    .pay-coupon .pay-coupon-content{font-size: 24px;color: #333333;line-height: 32px;}
+    .pay-coupon .pay-coupon-content span{color: #F94B4B;font-weight: bold;}
     .pay-ment{width: 100%;height: auto;float: left;background: #FFFFFF;margin-top: 7px;box-shadow: 0px 3px 6px 0px rgba(0, 0, 0, 0.07);}
     .pay-ment .pay-record{width: 100%;height: auto;float: left;background: #FFFFFF;padding: 10px 0;box-sizing:border-box;}
     .pay-ment .pay-record .record-title{width: 100%;padding: 0 20px;background: #FFFFFF;line-height: 44px;font-size: 16px;color: #333333;text-align: left;box-sizing:border-box;}

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

@@ -125,15 +125,17 @@ li{list-style:none}
 .coupon-popup .coupon-popup-content .empty .msg{color: #999;font-size: 3vw;}
 .coupon-popup .coupon-popup-scroll{width:100%;height:100%;box-sizing:border-box;float:left;overflow:hidden;overflow-y:auto}
 .coupon-popup .coupon-list-cell{width: 93.1vw;height: 33vw;float: left;margin: 0 0 2.4vw 0;position: relative;border-radius: 1vw;}
-.coupon-popup .coupon-list-cell .coupon-list-le{width: 77.6vw;height: 33vw;float: left;box-sizing: border-box;padding: 6.8vw 3.7vw 3.3vw 3.7vw;}
+.coupon-popup .coupon-list-cell .coupon-list-le{width: 70.5vw;height: 33vw;float: left;box-sizing: border-box;padding: 6.8vw 3.7vw 3.3vw 3.7vw;}
 .coupon-popup .coupon-list-cell .coupon-list-money{width: 100%;height:10vw;line-height: 10vw;color: #f94b4b;font-size: 3vw;text-align: left; }
 .coupon-popup .coupon-list-cell .coupon-list-money .maxMoney{font-size: 7.2vw;margin-right: 2.4vw;}
 .coupon-popup .coupon-list-cell .coupon-list-money.none, .coupon-list-cell .coupon-list-name.none, .coupon-list-cell .coupon-list-time.none{color: #FFF;}
 .coupon-popup .coupon-list-cell .coupon-list-name{width: 100%;height: 4.8vw;line-height: 4.8vw;color: #333333;font-size: 3.4vw;text-align: left;margin-top: 4vw;}
 .coupon-popup .coupon-list-cell .coupon-list-time{width: 100%;height: 4.8vw;line-height: 4.8vw;color: #999999;font-size: 2.4vw;text-align: left;}
-.coupon-popup .coupon-list-cell .coupon-list-ri{width: 15.5vw;height: 33vw;float: left;box-sizing: border-box;font-size:3.4vw;color: #FFF;cursor: pointer;}
-.coupon-popup .coupon-list-cell .coupon-list-ri span{display: block;width: 100%;height: 100%;box-sizing: border-box;padding: 9.5vw 6vw;}
-.coupon-popup .coupon-list-cell .coupon-list-ri span.none{padding: 11.8vw 6vw;}
+.coupon-popup .coupon-list-cell .coupon-list-ri{width: 22.5vw;height: 33vw;float: left;box-sizing: border-box;font-size:3.4vw;color: #FFF;cursor: pointer;}
+.coupon-popup .coupon-list-cell .coupon-list-ri .buy{width: 100%;height: 100%;box-sizing: border-box;padding: 12vw 0 0 0;text-align: center;}
+.coupon-popup .coupon-list-cell .coupon-list-ri .buy p{font-size: 3.4vw;}
+.coupon-popup .coupon-list-cell .coupon-list-ri span{display: block;width: 100%;height: 100%;box-sizing: border-box;padding: 9.5vw 9.5vw;}
+.coupon-popup .coupon-list-cell .coupon-list-ri span.none{padding: 11.8vw 9.5vw;}
 .coupon-popup .coupon-list-cell .coupon-tags{height: 4.8vw;line-height: 4.8vw;text-align: center;background-color: #f94b4b;color: #FFF;border-radius: 1.6vw 0 1.6vw 0;position: absolute;top: 0;left: 0;padding: 0 1.5vw;font-size: 3vw;}
 .coupon-popup .coupon-list-cell{background: url("/img/account/icon-coupon-uesb@h52x.png") no-repeat;background-size: cover;}
 .coupon-popup .coupon-list-cell.none{background: url("/img/account/icon-coupon-received@h52x.png") no-repeat;background-size: cover;}

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

@@ -236,14 +236,16 @@ input::-webkit-outer-spin-button,input::-webkit-inner-spin-button{-webkit-appear
 .coupon-popup .coupon-popup-scroll{width:100%;height:100%;box-sizing:border-box;padding:0 45px;float:left;overflow:hidden;overflow-y:auto}
 .coupon-popup .coupon-list-cell{width: 369px;height: 148px;float: left;margin-bottom:24px;position: relative;background: url("/img/account/icon-coupon-uesb@2x.png") no-repeat;background-size: cover;}
 .coupon-popup .coupon-list-cell.none{background: url("/img/account/icon-coupon-received@2x.png") no-repeat;background-size: cover;}
-.coupon-popup .coupon-list-cell .coupon-list-le{width: 299px;height: 148px;float: left;box-sizing: border-box;padding: 24px 14px 12px 14px;}
+.coupon-popup .coupon-list-cell .coupon-list-le{width: 260px;height: 148px;float: left;box-sizing: border-box;padding: 24px 14px 12px 14px;}
 .coupon-popup .coupon-list-cell .coupon-list-money{width: 100%;height: 56px;line-height: 56px;color: #f94b4b;font-size: 14px;text-align: left;}
 .coupon-popup .coupon-list-cell .coupon-list-money .maxMoney{font-size: 40px;margin-right: 8px;}
 .coupon-popup .coupon-list-cell .coupon-list-name{width: 100%;height: 22px;line-height: 22px;color: #333333;font-size: 14px;text-align: left;margin-top: 13px;}
 .coupon-popup .coupon-list-cell .coupon-list-time{width: 100%;height: 22px;line-height: 22px;color: #999999;font-size: 12px;text-align: left;}
-.coupon-popup .coupon-list-cell .coupon-list-ri{width: 70px;height: 148px;float: left;box-sizing: border-box;font-size: 16px;color: #FFF;cursor: pointer;}
-.coupon-popup .coupon-list-cell .coupon-list-ri span{display:block;padding: 45px 27px;color: #FFFFFF;}
-.coupon-popup .coupon-list-cell .coupon-list-ri span.none{padding: 54px 27px;color: #FFFFFF;}
+.coupon-popup .coupon-list-cell .coupon-list-ri{width: 109px;height: 148px;float: left;box-sizing: border-box;font-size: 16px;color: #FFF;cursor: pointer;}
+.coupon-popup .coupon-list-cell .coupon-list-ri .buy{width: 100%;height: 100%;box-sizing: border-box;padding: 58px 0 0 0;text-align: center;}
+.coupon-popup .coupon-list-cell .coupon-list-ri .buy p{font-size: 16px;}
+.coupon-popup .coupon-list-cell .coupon-list-ri span{display:block;padding: 45px 47px;color: #FFFFFF;}
+.coupon-popup .coupon-list-cell .coupon-list-ri span.none{padding: 54px 47px;color: #FFFFFF;}
 .coupon-popup .coupon-list-cell .coupon-tags{height: 24px;line-height: 24px;text-align: center;border-radius: 8px 0 8px 0;position: absolute;top: 0;left: 0;padding: 0 10px;background-color: #f94b4b;color: #FFF;}
 
 /*资料样式*/

src/main/resources/static/css/shopping/shopping.css

@@ -83,15 +83,15 @@ li{list-style:none}
     /*优惠券选择*/
     .couponWrap{width: 100%;min-height: 200px;box-sizing: border-box;padding: 32px 16px 10px 16px;background: #FFF;box-shadow: 0px 3px 6px 0px rgba(0, 0, 0, 0.07);margin-bottom: 32px;float: left;}
     .couponWrap .coupon-list-cell{width: 369px;height: 148px;float: left;cursor: pointer;margin-bottom:24px;margin-right: 15px;position: relative;background: url("/img/account/icon-coupon-uesb@2x.png") no-repeat;background-size: cover;}
-    .couponWrap .coupon-list-cell .coupon-list-le{width: 299px;height: 148px;float: left;box-sizing: border-box;padding: 24px 14px 12px 14px;position: relative;}
+    .couponWrap .coupon-list-cell .coupon-list-le{width: 260px;height: 148px;float: left;box-sizing: border-box;padding: 24px 14px 12px 14px;position: relative;}
     .couponWrap .coupon-list-cell .coupon-list-le .coupon-list-checked{position: absolute;right: 16px;top: 16px;width: 16px;height: 16px;background: url("/img/cart/icon_weigouxuan@2x.png") no-repeat;background-size: cover;}
     .couponWrap .coupon-list-cell .coupon-list-le .coupon-list-checked.checked{background: url("/img/cart/icon_yixuanze@2x.png") no-repeat;background-size: cover;}
     .couponWrap .coupon-list-cell .coupon-list-money{width: 100%;height: 56px;line-height: 56px;color: #f94b4b;font-size: 14px;text-align: left;}
     .couponWrap .coupon-list-cell .coupon-list-money .maxMoney{font-size: 40px;margin-right: 8px;}
     .couponWrap .coupon-list-cell .coupon-list-name{width: 100%;height: 22px;line-height: 22px;color: #333333;font-size: 14px;text-align: left;margin-top: 13px;}
     .couponWrap .coupon-list-cell .coupon-list-time{width: 100%;height: 22px;line-height: 22px;color: #999999;font-size: 12px;text-align: left;}
-    .couponWrap .coupon-list-cell .coupon-list-ri{width: 70px;height: 148px;float: left;box-sizing: border-box;padding: 54px 27px;font-size: 16px;color: #FFF;cursor: pointer;}
-    .couponWrap .coupon-list-cell .coupon-list-ri.none{padding: 45px 27px;}
+    .couponWrap .coupon-list-cell .coupon-list-ri{width: 109px;height: 148px;float: left;box-sizing: border-box;padding: 54px 47px;font-size: 16px;color: #FFF;cursor: pointer;}
+    .couponWrap .coupon-list-cell .coupon-list-ri.none{padding: 45px 47px;}
     .couponWrap .coupon-list-cell .coupon-tags{height: 24px;line-height: 24px;text-align: center;border-radius: 8px 0 8px 0;position: absolute;top: 0;left: 0;padding: 0 10px;background-color: #f94b4b;color: #FFF;}
 
     /* 底部结算 */
@@ -225,13 +225,16 @@ li{list-style:none}
     .coupon-popup .coupon-popup-scroll{width:100%;height:100%;box-sizing:border-box;padding:0 45px;float:left;overflow:hidden;overflow-y:auto}
     .coupon-popup .coupon-list-cell{width: 369px;height: 148px;float: left;margin-bottom:24px;position: relative;background: url("/img/account/icon-coupon-uesb@2x.png") no-repeat;background-size: cover;}
     .coupon-popup .coupon-list-cell.none{background: url("/img/account/icon-coupon-received@2x.png") no-repeat;background-size: cover;}
-    .coupon-popup .coupon-list-cell .coupon-list-le{width: 299px;height: 148px;float: left;box-sizing: border-box;padding: 24px 14px 12px 14px;}
+    .coupon-popup .coupon-list-cell .coupon-list-le{width: 260px;height: 148px;float: left;box-sizing: border-box;padding: 24px 14px 12px 14px;}
     .coupon-popup .coupon-list-cell .coupon-list-money{width: 100%;height: 56px;line-height: 56px;color: #f94b4b;font-size: 14px;text-align: left;}
     .coupon-popup .coupon-list-cell .coupon-list-money .maxMoney{font-size: 40px;margin-right: 8px;}
     .coupon-popup .coupon-list-cell .coupon-list-name{width: 100%;height: 22px;line-height: 22px;color: #333333;font-size: 14px;text-align: left;margin-top: 13px;}
     .coupon-popup .coupon-list-cell .coupon-list-time{width: 100%;height: 22px;line-height: 22px;color: #999999;font-size: 12px;text-align: left;}
-    .coupon-popup .coupon-list-cell .coupon-list-ri{width: 70px;height: 148px;float: left;box-sizing: border-box;padding: 54px 27px;font-size: 16px;color: #FFF;cursor: pointer;}
-    .coupon-popup .coupon-list-cell .coupon-list-ri.none{padding: 45px 27px;}
+    .coupon-popup .coupon-list-cell .coupon-list-ri{width: 109px;height: 148px;float: left;box-sizing: border-box;font-size: 16px;color: #FFF;cursor: pointer;}
+    .coupon-popup .coupon-list-cell .coupon-list-ri .buy{width: 100%;height: 100%;box-sizing: border-box;padding: 58px 0 0 0;text-align: center;}
+    .coupon-popup .coupon-list-cell .coupon-list-ri .buy p{font-size: 16px;}
+    .coupon-popup .coupon-list-cell .coupon-list-ri span{display: block;width: 100%;height: 100%;box-sizing: border-box;padding: 45px 47px;}
+    .coupon-popup .coupon-list-cell .coupon-list-ri span.none{padding: 45px 47px;}
     .coupon-popup .coupon-list-cell .coupon-tags{height: 24px;line-height: 24px;text-align: center;border-radius: 8px 0 8px 0;position: absolute;top: 0;left: 0;padding: 0 10px;background-color: #f94b4b;color: #FFF;}
     /*会员标签*/
     .listWrap .cartItem .priceTag .svip-tag{width:100%;height:22px;letter-spacing:0}
@@ -327,7 +330,7 @@ li{list-style:none}
     /*优惠券*/
     .couponWrap{width: 100%;box-sizing: border-box;padding: 4.8vw 3.2vw 2vw 3.2vw;background: #FFF;box-shadow: 0px 3px 6px 0px rgba(0, 0, 0, 0.07);margin-bottom: 4.8vw;float: left;}
     .couponWrap .coupon-list-cell{width: 93.1vw;height: 33vw;float: left;margin: 0 0 2.4vw 0;position: relative;border-radius: 1vw;}
-    .couponWrap .coupon-list-cell .coupon-list-le{width: 77.6vw;height: 33vw;float: left;box-sizing: border-box;padding: 6.8vw 3.7vw 3.3vw 3.7vw;position: relative;}
+    .couponWrap .coupon-list-cell .coupon-list-le{width: 70.5vw;height: 33vw;float: left;box-sizing: border-box;padding: 6.8vw 3.7vw 3.3vw 3.7vw;position: relative;}
     .couponWrap .coupon-list-cell .coupon-list-le .coupon-list-checked{position: absolute;right: 4vw;top: 4vw;width: 3.6vw;height: 3.6vw;background: url("/img/cart/icon_weigouxuan@2x.png") no-repeat;background-size: cover;}
     .couponWrap .coupon-list-cell .coupon-list-le .coupon-list-checked.checked{background: url("/img/cart/icon_yixuanze@2x.png") no-repeat;background-size: cover;}
     .couponWrap .coupon-list-cell .coupon-list-money{width: 100%;height:10vw;line-height: 10vw;color: #f94b4b;font-size: 3vw;text-align: left; }
@@ -335,9 +338,7 @@ li{list-style:none}
     .couponWrap .coupon-list-cell .coupon-list-money.none, .coupon-list-cell .coupon-list-name.none, .coupon-list-cell .coupon-list-time.none{color: #FFF;}
     .couponWrap .coupon-list-cell .coupon-list-name{width: 100%;height: 4.8vw;line-height: 4.8vw;color: #333333;font-size: 3.4vw;text-align: left;margin-top: 4vw;}
     .couponWrap .coupon-list-cell .coupon-list-time{width: 100%;height: 4.8vw;line-height: 4.8vw;color: #999999;font-size: 2.4vw;text-align: left;}
-    .coupon-popup .coupon-list-cell .coupon-list-ri{width: 70px;height: 148px;float: left;box-sizing: border-box;font-size: 16px;color: #FFF;cursor: pointer;}
-    .coupon-popup .coupon-list-cell .coupon-list-ri span{display:block;padding: 45px 27px;color: #FFFFFF;}
-    .coupon-popup .coupon-list-cell .coupon-list-ri span.none{padding: 54px 27px;color: #FFFFFF;}
+    .couponWrap .coupon-list-cell .coupon-list-ri{width: 22.5vw;height: 33vw;float: left;box-sizing: border-box;font-size:3.4vw;color: #FFF;cursor: pointer;padding: 9.5vw 9.5vw;}
     .couponWrap .coupon-list-cell .coupon-tags{height: 4.8vw;line-height: 4.8vw;text-align: center;background-color: #f94b4b;color: #FFF;border-radius: 1.6vw 0 1.6vw 0;position: absolute;top: 0;left: 0;padding: 0 1.5vw;font-size: 3vw;}
     .couponWrap .coupon-list-cell{background: url("/img/account/icon-coupon-uesb@h52x.png") no-repeat;background-size: cover;}
 
@@ -435,15 +436,17 @@ li{list-style:none}
     .coupon-popup .coupon-popup-content .empty .msg{color: #999;font-size: 3vw;}
     .coupon-popup .coupon-popup-scroll{width:100%;height:100%;box-sizing:border-box;float:left;overflow:hidden;overflow-y:auto}
     .coupon-popup .coupon-list-cell{width: 93.1vw;height: 33vw;float: left;margin: 0 0 2.4vw 0;position: relative;border-radius: 1vw;}
-    .coupon-popup .coupon-list-cell .coupon-list-le{width: 77.6vw;height: 33vw;float: left;box-sizing: border-box;padding: 6.8vw 3.7vw 3.3vw 3.7vw;}
+    .coupon-popup .coupon-list-cell .coupon-list-le{width: 70.5vw;height: 33vw;float: left;box-sizing: border-box;padding: 6.8vw 3.7vw 3.3vw 3.7vw;}
     .coupon-popup .coupon-list-cell .coupon-list-money{width: 100%;height:10vw;line-height: 10vw;color: #f94b4b;font-size: 3vw;text-align: left; }
     .coupon-popup .coupon-list-cell .coupon-list-money .maxMoney{font-size: 7.2vw;margin-right: 2.4vw;}
     .coupon-popup .coupon-list-cell .coupon-list-money.none, .coupon-list-cell .coupon-list-name.none, .coupon-list-cell .coupon-list-time.none{color: #FFF;}
     .coupon-popup .coupon-list-cell .coupon-list-name{width: 100%;height: 4.8vw;line-height: 4.8vw;color: #333333;font-size: 3.4vw;text-align: left;margin-top: 4vw;}
     .coupon-popup .coupon-list-cell .coupon-list-time{width: 100%;height: 4.8vw;line-height: 4.8vw;color: #999999;font-size: 2.4vw;text-align: left;}
-    .coupon-popup .coupon-list-cell .coupon-list-ri{width: 15.5vw;height: 33vw;float: left;box-sizing: border-box;font-size:3.4vw;color: #FFF;cursor: pointer;}
-    .coupon-popup .coupon-list-cell .coupon-list-ri span{display: block;width: 100%;height: 100%;box-sizing: border-box;padding: 9.5vw 6vw;}
-    .coupon-popup .coupon-list-cell .coupon-list-ri span.none{padding: 11.8vw 6vw;}
+    .coupon-popup .coupon-list-cell .coupon-list-ri{width: 22.5vw;height: 33vw;float: left;box-sizing: border-box;font-size:3.4vw;color: #FFF;cursor: pointer;}
+    .coupon-popup .coupon-list-cell .coupon-list-ri .buy{width: 100%;height: 100%;box-sizing: border-box;padding: 12vw 0 0 0;text-align: center;}
+    .coupon-popup .coupon-list-cell .coupon-list-ri .buy p{font-size: 3.4vw;}
+    .coupon-popup .coupon-list-cell .coupon-list-ri span{display: block;width: 100%;height: 100%;box-sizing: border-box;padding: 9.5vw 9.5vw;}
+    .coupon-popup .coupon-list-cell .coupon-list-ri span.none{padding: 11.8vw 9.5vw;}
     .coupon-popup .coupon-list-cell .coupon-tags{height: 4.8vw;line-height: 4.8vw;text-align: center;background-color: #f94b4b;color: #FFF;border-radius: 1.6vw 0 1.6vw 0;position: absolute;top: 0;left: 0;padding: 0 1.5vw;font-size: 3vw;}
     .coupon-popup .coupon-list-cell{background: url("/img/account/icon-coupon-uesb@h52x.png") no-repeat;background-size: cover;}
     .coupon-popup .coupon-list-cell.none{background: url("/img/account/icon-coupon-received@h52x.png") no-repeat;background-size: cover;}

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

@@ -14,14 +14,16 @@ li{list-style:none}
     .coupon-content-list{width: 100%;height: auto;box-sizing: border-box;padding:24px 13px 7px 13px;}
     .coupon-list-cell{width: 369px;height: 148px;float: left;margin: 0 24px 17px 0;position: relative;background: url("/img/account/icon-coupon-uesb@2x.png") no-repeat;background-size: cover;}
     .coupon-list-cell:nth-child(3n){margin-right: 0;}
-    .coupon-list-cell .coupon-list-le{width: 299px;height: 148px;float: left;box-sizing: border-box;padding: 24px 14px 12px 14px;}
+    .coupon-list-cell .coupon-list-le{width: 260px;height: 148px;float: left;box-sizing: border-box;padding: 24px 14px 12px 14px;}
     .coupon-list-cell .coupon-list-money{width: 100%;height: 56px;line-height: 56px;color: #f94b4b;font-size: 14px;text-align: left;}
     .coupon-list-cell .coupon-list-money .maxMoney{font-size: 40px;margin-right: 8px;}
     .coupon-list-cell .coupon-list-name{width: 100%;height: 22px;line-height: 22px;color: #333333;font-size: 14px;text-align: left;margin-top: 13px;}
     .coupon-list-cell .coupon-list-time{width: 100%;height: 22px;line-height: 22px;color: #999999;font-size: 12px;text-align: left;}
-    .coupon-list-cell .coupon-list-ri{width: 70px;height: 148px;float: left;box-sizing: border-box;font-size: 16px;color: #FFF;cursor: pointer;}
-    .coupon-list-cell .coupon-list-ri span{display: block;width: 100%;height: 100%;box-sizing: border-box;padding: 45px 27px;}
-    .coupon-list-cell .coupon-list-ri span.none{padding: 54px 27px;}
+    .coupon-list-cell .coupon-list-ri{width: 109px;height: 148px;float: left;box-sizing: border-box;font-size: 16px;color: #FFF;cursor: pointer;}
+    .coupon-list-cell .coupon-list-ri .buy{width: 100%;height: 100%;box-sizing: border-box;padding: 58px 0 0 0;text-align: center;}
+    .coupon-list-cell .coupon-list-ri .buy p{font-size: 16px;}
+    .coupon-list-cell .coupon-list-ri span{display: block;width: 100%;height: 100%;box-sizing: border-box;padding: 45px 47px;}
+    .coupon-list-cell .coupon-list-ri span.none{padding: 54px 47px;}
     .coupon-list-cell .coupon-tags{height: 24px;line-height: 24px;text-align: center;border-radius: 8px 0 8px 0;position: absolute;top: 0;left: 0;padding: 0 10px;background-color: #f94b4b;color: #FFF;}
     .empty{width: 100%;float: left;}
     .empty img{width: 180px;height: 180px;}
@@ -37,15 +39,17 @@ li{list-style:none}
     .coupon-container{width: 100%;min-height: 500px;background-color: #FFFFFF;}
     .coupon-content-list{width: 100%;height: auto;box-sizing: border-box;padding:3.45vw;}
     .coupon-list-cell{width: 93.1vw;height: 33vw;float: left;margin: 0 0 2.4vw 0;position: relative;border-radius: 1vw;}
-    .coupon-list-cell .coupon-list-le{width: 77.6vw;height: 33vw;float: left;box-sizing: border-box;padding: 6.8vw 3.7vw 3.3vw 3.7vw;}
+    .coupon-list-cell .coupon-list-le{width: 70.5vw;height: 33vw;float: left;box-sizing: border-box;padding: 6.8vw 3.7vw 3.3vw 3.7vw;}
     .coupon-list-cell .coupon-list-money{width: 100%;height:10vw;line-height: 10vw;color: #f94b4b;font-size: 3vw;text-align: left; }
     .coupon-list-cell .coupon-list-money .maxMoney{font-size: 7.2vw;margin-right: 2.4vw;}
     .coupon-list-cell .coupon-list-money.none, .coupon-list-cell .coupon-list-name.none, .coupon-list-cell .coupon-list-time.none{color: #FFF;}
     .coupon-list-cell .coupon-list-name{width: 100%;height: 4.8vw;line-height: 4.8vw;color: #333333;font-size: 3.4vw;text-align: left;margin-top: 4vw;}
     .coupon-list-cell .coupon-list-time{width: 100%;height: 4.8vw;line-height: 4.8vw;color: #999999;font-size: 2.4vw;text-align: left;}
-    .coupon-list-cell .coupon-list-ri{width: 15.5vw;height: 33vw;float: left;box-sizing: border-box;font-size:3.4vw;color: #FFF;cursor: pointer;}
-    .coupon-list-cell .coupon-list-ri span{display: block;width: 100%;height: 100%;box-sizing: border-box;padding: 9.5vw 6vw;}
-    .coupon-list-cell .coupon-list-ri span.none{padding: 11.8vw 6vw;}
+    .coupon-list-cell .coupon-list-ri{width: 22.5vw;height: 33vw;float: left;box-sizing: border-box;font-size:3.4vw;color: #FFF;cursor: pointer;}
+    .coupon-list-cell .coupon-list-ri .buy{width: 100%;height: 100%;box-sizing: border-box;padding: 12vw 0 0 0;text-align: center;}
+    .coupon-list-cell .coupon-list-ri .buy p{font-size: 3.4vw;}
+    .coupon-list-cell .coupon-list-ri span{display: block;width: 100%;height: 100%;box-sizing: border-box;padding: 9.5vw 9.5vw;font-size: 4vw;}
+    .coupon-list-cell .coupon-list-ri span.none{padding: 11.8vw 9.5vw;}
     .coupon-list-cell .coupon-tags{height: 4.8vw;line-height: 4.8vw;text-align: center;background-color: #f94b4b;color: #FFF;border-radius: 1.6vw 0 1.6vw 0;position: absolute;top: 0;left: 0;padding: 0 1.5vw;font-size: 3vw;}
     .coupon-list-cell{background: url("/img/account/icon-coupon-uesb@h52x.png") no-repeat;background-size: cover;}
     .empty{width: 100%;float: left;}

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

@@ -19,13 +19,13 @@ li{list-style:none}
     .coupon-content-tabs .time-btn a:hover{color: #E15621;}
     .coupon-content-list{width: 100%;height: auto;box-sizing: border-box;padding:24px 147px 24px 24px;}
     .coupon-list-cell{width: 369px;height: 148px;float: left;margin: 0 24px 24px 0;position: relative;}
-    .coupon-list-cell .coupon-list-le{width: 299px;height: 148px;float: left;box-sizing: border-box;padding: 24px 14px 12px 14px;}
+    .coupon-list-cell .coupon-list-le{width: 260px;height: 148px;float: left;box-sizing: border-box;padding: 24px 14px 12px 14px;}
     .coupon-list-cell .coupon-list-money{width: 100%;height: 56px;line-height: 56px;color: #f94b4b;font-size: 14px;text-align: left;}
     .coupon-list-cell .coupon-list-money .maxMoney{font-size: 40px;margin-right: 8px;}
     .coupon-list-cell .coupon-list-money.none, .coupon-list-cell .coupon-list-name.none, .coupon-list-cell .coupon-list-time.none{color: #FFF;}
     .coupon-list-cell .coupon-list-name{width: 100%;height: 22px;line-height: 22px;color: #333333;font-size: 14px;text-align: left;margin-top: 13px;}
     .coupon-list-cell .coupon-list-time{width: 100%;height: 22px;line-height: 22px;color: #999999;font-size: 12px;text-align: left;}
-    .coupon-list-cell .coupon-list-ri{width: 70px;height: 148px;float: left;box-sizing: border-box;padding: 45px 27px;font-size: 16px;color: #FFF;cursor: pointer;}
+    .coupon-list-cell .coupon-list-ri{width: 109px;height: 148px;float: left;box-sizing: border-box;padding: 45px 47px;font-size: 16px;color: #FFF;cursor: pointer;}
     .coupon-list-cell .coupon-list-ri.none{cursor: default;}
     .coupon-list-cell .coupon-tags{height: 24px;line-height: 24px;text-align: center;border-radius: 8px 0 8px 0;position: absolute;top: 0;left: 0;padding: 0 10px;}
     .coupon-list-cell .coupon-tags.used{background-color: #f94b4b;color: #FFF;}
@@ -53,13 +53,13 @@ li{list-style:none}
     .coupon-content-tabs .time-btn a:hover{color: #E15621;}
     .coupon-content-list{width: 100%;height: auto;box-sizing: border-box;padding:3.45vw;}
     .coupon-list-cell{width: 93.1vw;height: 33vw;float: left;margin: 0 0 2.4vw 0;position: relative;border-radius: 1vw;}
-    .coupon-list-cell .coupon-list-le{width: 77.6vw;height: 33vw;float: left;box-sizing: border-box;padding: 6.8vw 3.7vw 3.3vw 3.7vw;}
+    .coupon-list-cell .coupon-list-le{width: 70.5vw;height: 33vw;float: left;box-sizing: border-box;padding: 6.8vw 3.7vw 3.3vw 3.7vw;}
     .coupon-list-cell .coupon-list-money{width: 100%;height:10vw;line-height: 10vw;color: #f94b4b;font-size: 3vw;text-align: left; }
     .coupon-list-cell .coupon-list-money .maxMoney{font-size: 7.2vw;margin-right: 2.4vw;}
     .coupon-list-cell .coupon-list-money.none, .coupon-list-cell .coupon-list-name.none, .coupon-list-cell .coupon-list-time.none{color: #FFF;}
     .coupon-list-cell .coupon-list-name{width: 100%;height: 4.8vw;line-height: 4.8vw;color: #333333;font-size: 3.4vw;text-align: left;margin-top: 4vw;}
     .coupon-list-cell .coupon-list-time{width: 100%;height: 4.8vw;line-height: 4.8vw;color: #999999;font-size: 2.4vw;text-align: left;}
-    .coupon-list-cell .coupon-list-ri{width: 15.5vw;height: 33vw;float: left;box-sizing: border-box;padding: 9.5vw 6vw;font-size:3.4vw;color: #FFF;cursor: pointer;}
+    .coupon-list-cell .coupon-list-ri{width: 22.5vw;height: 33vw;float: left;box-sizing: border-box;padding: 9.5vw 9.5vw;font-size:3.4vw;color: #FFF;cursor: pointer;}
     .coupon-list-cell .coupon-list-ri.none{cursor: default;}
     .coupon-list-cell .coupon-tags{height: 4.8vw;line-height: 4.8vw;text-align: center;border-radius: 1.6vw 0 1.6vw 0;position: absolute;top: 0;left: 0;padding: 0 1.5vw;font-size: 3vw;}
     .coupon-list-cell .coupon-tags.used{background-color: #f94b4b;color: #FFF;}

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

@@ -15,6 +15,11 @@ var payContainer = new Vue({
             payUserType:'ENTERPRISE',
             payType:'',
         },
+        couponInfo:{
+            price:10000,
+            touchPrice:20000,
+            couponAmount:10000
+        },
         bankListData:[],
         methodTab:['线上支付','转账支付'],
         mobileData:[
@@ -52,6 +57,7 @@ var payContainer = new Vue({
         is_Wechat_bowcr:false,
         comboInfo: null, //选中的svip套餐信息
         vipRecordId: undefined,
+        couponId:undefined
     },
     filters: {
         NumFormat:function(value) {
@@ -652,31 +658,35 @@ var payContainer = new Vue({
     mounted: function () {
         var _self = this;
         // 判断当前支付是订单支付
-        _self.pageType = CAIMEI.getUrlParam('pageType');
-        _self.vipRecordId = parseInt(CAIMEI.getUrlParam('vipRecordId'));
-        if (_self.pageType === '1') {//二手
-            _self.productID = CAIMEI.getUrlParam('productID');
-            _self.payAmount = _self.toFixedFn(100);
-            _self.isRequest = true;
-            _self.payStatusText = '';
-        } else if (_self.pageType === '2') { // 支付会员
+        this.pageType = CAIMEI.getUrlParam('pageType');
+        if (this.pageType === '1') {//二手
+            this.productID = CAIMEI.getUrlParam('productID');
+            this.payAmount = _self.toFixedFn(100);
+            this.isRequest = true;
+            this.payStatusText = '';
+        } else if (this.pageType === '2') { // 支付会员
+            this.vipRecordId = parseInt(CAIMEI.getUrlParam('vipRecordId'));
             this.PayOrderOnLineSwitch();
             // 从本地获取选中的svip套餐信息后删除本地信息
             this.comboInfo = JSON.parse(CAIMEI.Storage.getItem('comboInfo'));
             // CAIMEI.Storage.removeItem('comboInfo');
             // 设置支付金额
-            this.payAmount = _self.toFixedFn(this.comboInfo.price);
+            this.payAmount = this.toFixedFn(this.comboInfo.price);
             // 获取银行列表
             this.getBankList();
-        } else {
+        } else if(this.pageType === '3') {// 支付优惠券
+            this.couponId = parseInt(CAIMEI.getUrlParam('couponId'));
+            this.PayOrderOnLineSwitch();
+            this.getBankList();
+        }else{
             var HrefType = CAIMEI.getUrlParam('type');
             if (HrefType == 'payfirm') {
-                _self.payInfo.payOrderId = CAIMEI.getUrlParam('orderId');
-                _self.orderIdentificationId = '#' + _self.payInfo.payOrderId + '#';
+                this.payInfo.payOrderId = CAIMEI.getUrlParam('orderId');
+                this.orderIdentificationId = '#' + this.payInfo.payOrderId + '#';
             } else {
                 var data = JSON.parse(localStorage.getItem("confirmOrderInfo"));
-                _self.payInfo.payOrderId = data.data.orderId;
-                _self.orderIdentificationId = '#' + _self.payInfo.payOrderId + '#';
+                this.payInfo.payOrderId = data.data.orderId;
+                this.orderIdentificationId = '#' + this.payInfo.payOrderId + '#';
             }
             // 获取银行列表
             this.getBankList();
@@ -685,13 +695,13 @@ var payContainer = new Vue({
         }
         var viewer = window.navigator.userAgent.toLowerCase();
         if(viewer.match(/MicroMessenger/i) == 'micromessenger'){
-            _self.is_Wechat_bowcr = true;
-            _self.payInfo.payBankNum = 'WEIXIN';
-            _self.mobileTabIndex = 1;
+            this.is_Wechat_bowcr = true;
+            this.payInfo.payBankNum = 'WEIXIN';
+            this.mobileTabIndex = 1;
         }else{
-            _self.is_Wechat_bowcr = false;
-            _self.payInfo.payBankNum = 'ALIPAY';
-            _self.mobileTabIndex = 0;
+            this.is_Wechat_bowcr = false;
+            this.payInfo.payBankNum = 'ALIPAY';
+            this.mobileTabIndex = 0;
         }
     }
 });

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

@@ -102,6 +102,9 @@ var orderPage = new Vue({
                 }
             })
         },
+        toBuyCoupon:function (coupon) {// 点击购买按钮事件处理
+            window.location.href = '/pay/caimei-paycash.html?pageType=3&couponId='+coupon.couponId;
+        },
         receiveCoupon:function(coupon){// 点击领取按钮事件处理
             var  _self = this;
             console.log(coupon)

src/main/resources/templates/pay/caimei-paycash.html

@@ -11,7 +11,7 @@
 <!-- 引用头部 -->
 <template th:replace="components/header"></template>
 <div id="payContainer" class="pay-container clear" v-cloak>
-    <div class="wrap" v-if="pageType !== '2'">
+    <div class="wrap" v-if="pageType !== '2' && pageType !== '3'">
         <div class="pageTitle">
             <div class="step">
                 <span class="prev">我的购物车</span>
@@ -44,6 +44,14 @@
                     </div>
                 </div>
             </template>
+            <!--购买优惠券-->
+            <template v-else-if="pageType === '3'">
+                <div class="pay-coupontitle">收银台</div>
+                <div class="pay-coupon">
+                    <div class="pay-coupon-title">购买优惠券 <span>(满￥100000减10000)</span></div>
+                    <div class="pay-coupon-content">待付金额：<span>￥{{ couponInfo.price | NumFormat }}</span></div>
+                </div>
+            </template>
             <!--普通订单-->
             <template v-else>
                 <div class="pay-title">
@@ -66,7 +74,7 @@
                     </div>
                 </div>
             </template>
-            <div class="pay-ment"  v-if="pageType != '1' && pageType != '2'">
+            <div class="pay-ment"  v-if="pageType != '1' && pageType != '2' && pageType != '3'">
                 <div class="pay-record">
                     <div class="record-title">支付记录</div>
                     <div class="record-content clear" id="discernReceipt">
@@ -87,7 +95,7 @@
                 </div>
                 <div class="method-content">
                     <div class="payment" id="mobilePayment" v-if="tabIndex === 0">
-                        <div class="payment-title" v-if="pageType !== '2'">{{payStatusText}}</div>
+                        <div class="payment-title" v-if="pageType !== '2' && pageType != '3'">{{payStatusText}}</div>
                         <div class="pay-bank">
                             <div class="bank-list" id="mobileContent">
                                 <a v-if="!is_Wechat_bowcr" href="javascript:void(0);" class="bank-a mIcon" @click="checkMobilePay(0,'ALIPAY')" :class="{ active: mobileTabIndex === 0 }">
@@ -121,7 +129,7 @@
                                 </a>
                             </div>
                         </div>
-                        <template v-if="pageType != '1'">
+                        <template v-if="pageType != '1' && pageType != '3'">
                             <div class="pay-link" v-if="mobileTabIndex === 2 || mobileTabIndex === 3">
                                 <p v-if="isPC">若您在公司的职位无法直接使用网银付款，请点击右侧“复制支付链接”按钮，将该链接发送给公司财务人员进行网银付款</p>
                                 <a href="javascript:void(0);" id="copyLink" @click="copyLinkPaySubmitFn">复制支付链接</a>

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

@@ -659,8 +659,12 @@
                                     <div class="coupon-list-time"> {{ coupon.startDate }} - {{ coupon.endDate }}</div>
                                 </div>
                                 <div class="coupon-list-ri">
-                                    <span class="none" v-if="currentTab == 1" @click="receiveCoupon(coupon)">领取</span>
-                                    <span v-if="currentTab == 2">已领取</span>
+                                    <div class="buy" v-if="coupon.couponBtnType == 2" @click="toBuyCoupon(coupon)">
+                                        <p>￥10000</p>
+                                        <p>购买</p>
+                                    </div>
+                                    <span class="none" v-if="coupon.couponBtnType == 0" @click="receiveCoupon(coupon)">领取</span>
+                                    <span v-if="coupon.couponBtnType == 1">已领取</span>
                                 </div>
                                 <div class="coupon-tags">{{ coupon.couponType | TypeFormat }}</div>
                             </div>

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

@@ -256,8 +256,12 @@
                                 <div class="coupon-list-time"> {{ coupon.startDate }} - {{ coupon.endDate }} </div>
                             </div>
                             <div class="coupon-list-ri">
-                                <span class="none" v-if="currentTab == 1" @click="receiveCoupon(coupon)">领取</span>
-                                <span v-if="currentTab == 2">已领取</span>
+                                <div class="buy" v-if="coupon.couponBtnType == 2" @click="toBuyCoupon(coupon)">
+                                    <p>￥10000</p>
+                                    <p>购买</p>
+                                </div>
+                                <span class="none" v-if="coupon.couponBtnType == 0" @click="receiveCoupon(coupon)">领取</span>
+                                <span v-if="coupon.couponBtnType == 1">已领取</span>
                             </div>
                             <div class="coupon-tags">{{ coupon.couponType | TypeFormat }}</div>
                         </div>

src/main/resources/templates/user-center/account/coupon-collection.html

@@ -43,6 +43,10 @@
                 <div class="coupon-list-time"> {{ coupon.startDate }} - {{ coupon.endDate }}</div>
               </div>
               <div class="coupon-list-ri">
+                <div class="buy" v-if="coupon.couponBtnType == 2" @click="toBuyCoupon(coupon)">
+                  <p>￥10000</p>
+                  <p>购买</p>
+                </div>
                 <span class="none" v-if="coupon.couponBtnType == 0" @click="receiveCoupon(coupon)">领取</span>
                 <span v-if="coupon.couponBtnType == 1" @click="toUseCoupon(coupon)">去使用</span>
               </div>