优惠券详情

src/main/resources/static/css/account/register.css

@@ -153,7 +153,7 @@ footer{display:none}
 .formLine .formLine-file .file-door{background: url("/img/account/icon-door.png") no-repeat;background-size: cover;}
 .formLine .formLine-file .file-zizhi{background: url("/img/account/icon-zizhi.png") no-repeat;background-size: cover;}
 .subLine{margin-top:2vw;float: left;}
-.subLine .btn-upgrade {cursor: pointer;display: block;width: 93.4vw;height: 11.2vw;line-height: 50px;background-color: #FF5B00;border-radius: 5.2vw;text-align: center;font-size: 3.4vw;color: #FFF;float: left;margin-bottom: 2.8vw;}
+.subLine .btn-upgrade {cursor: pointer;display: block;width: 93.4vw;height: 11.2vw;line-height: 11.2vw;background-color: #FF5B00;border-radius: 5.2vw;text-align: center;font-size: 3.4vw;color: #FFF;float: left;margin-bottom: 2.8vw;}
 .subLine .btn-upgrade.none{border: 1px solid #FF5B00;background-color: #ffe6dc;box-shadow: 0px 3px 6px 0px rgba(249, 75, 75, 0.17);color: #FF5B00;}
 .subLine .btn-upgrade.disabled{background-color: #999999;}
 .purchase{font-size: 3.8vw;background: #fff;margin: 2.7vw auto;text-align: center}

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

@@ -297,7 +297,7 @@ input::-webkit-outer-spin-button {
     .payment-transfer .label .label-c{color:#1890f9;font-size:3.1vw}
     .payment-transfer .label>p .red{color:#FF5B00}
     .payment-transfer .copy{display:inline-block;height:6.4vw;line-height:6.4vw;padding:0 3vw;background-image:linear-gradient(214deg,#ff2929 0%,#ff6d1b 100%);border-radius:2px;color:#FFF;margin-left:2vw}
-    .pay-button a{display:block;width:93.4vw;height:11.2vw;line-height:11.2vw;font-size:3.7vw;text-align:center;border-radius:5.6vw;border:1px solid #FF5B00;margin:0 auto 2.6vw auto;color:#FFF;background:#FF5B00}
+    .pay-button a{display:block;width:93.4vw;height:12vw;line-height:12vw;font-size:3.7vw;text-align:center;border-radius:3vw;border:1px solid #FF5B00;margin:0 auto 2.6vw auto;color:#FFF;background:linear-gradient(90deg, #FF9300 0%, #FF5B00 100%);}
     .jconfirm .jconfirm-box div.jconfirm-closeIcon{display: none !important;}
     /*  快捷支付弹窗  */
     .model-cards-popup{width:100%;height:100%;position:fixed;top:0;left:0;background-color:rgba(0,0,0,.4);z-index: 99999;}
@@ -313,7 +313,7 @@ input::-webkit-outer-spin-button {
     .model-content .content .list.current{border-color: #FF2A2A;}
     .model-content .content .list.current:before{content: '';width: 20px;height: 20px;position: absolute;bottom: 0;right: -2px;background: url("/img/base/icon.png")-210px -252px no-repeat;}
     .model-content .button{width: 100%;height: 11vw;float: left;margin-top: 4.8vw;}
-    .model-content .button .button-btn{display: block;width: 60vw;height: 11vw;border-radius: 5.5vw; margin: 0 auto;box-sizing: border-box;border: 1px solid #FF5B00;background: #FF5B00;line-height: 11vw;text-align: center;font-size: 14px;color: #FFFFFF;}
+    .model-content .button .button-btn{display: block;width: 60vw;height: 11vw;border-radius: 3vw; margin: 0 auto;box-sizing: border-box;border: 1px solid #FF5B00;background: #FF5B00;line-height: 11vw;text-align: center;font-size: 14px;color: #FFFFFF;}
     .model-content .button .button-btn.disabled{border: 1px solid #B8BFCA;background: #B8BFCA;color: #FFFFFF;}
     .model-content .content .content-labe{width: 100%;height: 8vw;line-height: 8vw;float: left;font-size: 3.4vw;color: #333333;font-weight: bold;}
     .model-content .content .content-labe.sen{margin-top: 3vw;}
@@ -336,13 +336,13 @@ input::-webkit-outer-spin-button {
     .model-content .content .content-form .form-label{width: 100%;height: 10vw;float: left;line-height: 10vw;text-align: left;font-size: 3.4vw;color: #666666;font-weight: bold;}
     .model-content .content .content-form .form-label.card{width: auto;}
     .model-content .content .content-form .form-label span{color: #F94B4B;}
-    .model-content .content .content-form .form-input{width: 100%;height: 10vw;float: left;color: #F94B4B;box-sizing: border-box;padding: 0 3vw;border:1px solid #B8BFCA;border-radius: 5vw;}
-    .model-content .content .content-form .form-input input{width: 100%;height:9vw;float: left;line-height: 9vw;font-size: 3.4vw;color: #333333;border: none;font-style: normal;}
+    .model-content .content .content-form .form-input{width: 100%;height: 12vw;float: left;color: #F94B4B;box-sizing: border-box;padding: 1vw 3vw;border:1px solid #B8BFCA;border-radius: 3vw;}
+    .model-content .content .content-form .form-input input{width: 100%;height:100%;float: left;line-height: 12vw;font-size: 3.4vw;color: #333333;border: none;font-style: normal;}
     .model-content .content .content-form .form-input.code{ width: 54.8vw; }
     .model-content .content .content-form .form-btn{width: 26vw;height: 10vw;float: left;margin-left: 20px;}
     .model-content .content .content-form .form-btn a{display: block;width: 100%;height: 10vw;box-sizing: border-box;background: #FF5B00;line-height: 10vw;text-align: center;font-size: 3.4vw;color: #FFFFFF;}
     .model-content .content .content-form .form-btn a.disabled{background: #B8BFCA;color: #FFFFFF;}
-    .model-content .content .content-form .form-text{ line-height: 6vw; font-size: 3.4vw;color: #333333;float: left; }
+    .model-content .content .content-form .form-text{ line-height:10vw; font-size: 3.4vw;color: #333333;float: left; }
     /* 快捷支付短信弹窗 */
     .pay-alert-content{width: 100%;height: 100%;position: fixed;top: 0;left: 0;background: rgba(0,0,0,0.3);z-index: 9999;}
     .pay-alert-content .pay-alert{width: 100%;height: 100vw;background: #FFFFFF;position: fixed;left: 0;bottom: 0;z-index: 9998;}

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

@@ -4,15 +4,16 @@ li{list-style:none}
  * PC端
  */
 @media screen and (min-width:768px){
+    #beansPage .wrap{ width: 400px;}
     .coupon-title{width: 1184px;margin: 0 auto;box-sizing: border-box;height: 60px;padding: 0 24px;padding-top: 16px;line-height: 44px;}
     .coupon-title .coupon-name{float: left;font-size: 16px;color: #4a4f58;font-weight: bold;}
     .coupon-title .coupon-name-use{float: right;font-size: 14px;color: #627386;cursor: pointer;}
     .coupon-title .coupon-name-use:hover{color: #E15621;}
     .pageWrap{width: 968px;}
     .navLayout{min-height: 500px;}
-    .coupon-container{width: 100%;min-height: 600px;background-color: #FFFFFF;}
-    .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-container{width: 100%;min-height: 600px;background-color: #FFFFFF;border-radius: 8px;}
+    .coupon-content-list{width: 100%;height: auto;box-sizing: border-box;padding:24px 13px 7px 13px;margin-top: 20px;}
+    .coupon-list-cell{width: 369px;height: 148px;margin: 0 auto;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: 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;}
@@ -25,6 +26,7 @@ li{list-style:none}
     .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;}
+    .coupon-button{ width: 100%;height: 58px;cursor: pointer; border-radius: 8px; line-height: 58px;display: flex;margin: 0 auto;justify-content: center;background: linear-gradient(90deg, #FF9300 0%, #FF5B00 100%);color: #FFFFFF;font-size: 18px;font-weight: 600;margin-top: 50px;  }
     .empty{width: 100%;float: left;}
     .empty img{width: 180px;height: 180px;}
 }
@@ -41,20 +43,21 @@ li{list-style:none}
     .coupon-title .coupon-name-use{float: right;font-size: 3vw;color: #627386;cursor: pointer;}
     .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{width: 93.1vw;height: 33vw;margin: 0 0 2.4vw 0;position: relative;border-radius: 1vw;}
     .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{width: 100%;height:10vw;line-height: 10vw;color: #f94b4b;font-size: 3.4vw;text-align: left; }
+    .coupon-list-cell .coupon-list-money .maxMoney{font-size: 7.2vw;margin-right: 2.4vw;font-weight: 600;}
     .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: 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 .buy p{font-size: 4.4vw;font-weight: 600;}
     .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;}
+    .coupon-button{ width: 100%;height: 13vw;cursor: pointer; border-radius: 3vw; line-height: 13vw;display: flex;margin: 0 auto;justify-content: center;background: linear-gradient(90deg, #FF9300 0%, #FF5B00 100%);color: #FFFFFF;font-size: 4vw;font-weight: 600;margin-top: 14vw;  }
     .empty{width: 100%;float: left;}
     .empty img{width: 36vw;height: 36vw;}
 

src/main/resources/static/js/account/register-club.js

@@ -310,13 +310,19 @@
             this.isCodeModel = false;
         },
         clubLoginIndex:function(){// 跳过升级直接去个人中心
+            const loginBeforePath = getBaseCookie("loginBeforePath");
             const partnerShopId = CAIMEI.Storage.getItem('partnerShopId')
             if(partnerShopId){
                 CAIMEI.Storage.removeItem('partnerShopId')
                 CAIMEI.Storage.removeItem('partnerId')
                 window.location.href=`/supplier-${partnerShopId}.html`
             }else{
-                window.location.href = '/user/dashboard.html';
+                if (loginBeforePath && loginBeforePath!=='undefined' && loginBeforePath.indexOf('.html')>0) {
+                    delBaseCookie("loginBeforePath");
+                    window.location.href = loginBeforePath;
+                }else{
+                    window.location.href = '/user/dashboard.html';
+                }
             }
         },
         mainProAdd: function(){

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

@@ -40,13 +40,12 @@
               </div>
               <div class="coupon-list-ri">
                 <template v-if="coupon.couponPayWay === 1">
-                  <div class="buy" @click="toBuyCoupon(coupon)" id="coupon-buy-coupon">
+                  <div class="buy" id="coupon-buy-coupon">
                     <p>￥{{ coupon.moneyCouponPrice }}</p>
-                    <p>购买</p>
                   </div>
                 </template>
                 <template v-else>
-                  <span class="none" @click="receiveCoupon(coupon)" id="coupon-receive">领取</span>
+                  <span class="none" id="coupon-receive"></span>
                 </template>
               </div>
               <template v-if="coupon.moneyCouponFlag == 1">
@@ -57,6 +56,12 @@
                 <div class="coupon-tags">{{ coupon.couponType | TypeFormat }}</div>
               </template>
             </div>
+            <div class="coupon-button" @click="toBuyCoupon(coupon)" v-if="coupon.couponPayWay === 1">
+              <span>立即购买</span>
+            </div>
+            <div class="coupon-button" @click="receiveCoupon(coupon)" v-else>
+              <span>立即领取</span>
+            </div>
           </div>
           <div v-else class="empty">
             <img src="/img/account/icon-coupon-empty@2x.png">