美博会活动优惠券

src/main/resources/config/dev/application-dev.yml

@@ -54,8 +54,8 @@ logging:
 caimei:
   siteEnv: 0 #网站环境，（2：正式环境，1：测试环境，0：开发环境）
   #spiServer: http://192.168.2.68:8008
-#  coreServer: https://core-b.caimei365.com
-  coreServer: http://192.168.2.67:18002
+  coreServer: https://core-b.caimei365.com
+#  coreServer: http://192.168.2.67:18002
   #coreServer: http://192.168.2.75:18002
   imageDomain: https://img-b.caimei365.com
   wwwDomain: http:localhost:8009

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

@@ -659,21 +659,24 @@
                                     <div class="coupon-list-time"> {{ coupon.startDate }} - {{ coupon.endDate }}</div>
                                 </div>
                                 <div class="coupon-list-ri">
-                                    <template v-if="coupon.moneyCouponFlag == 1">
-                                        <div class="buy" v-if="coupon.couponBtnType == 2" @click="toBuyCoupon(coupon)"
-                                             id="coupon-buy-coupon"
-                                             onclick="_czc.push(['_trackEvent','商品详情','优惠券购买按钮点击','优惠券购买按钮点击',1,'coupon-buy-coupon'])">
-                                            <p>￥{{ coupon.moneyCouponPrice }}</p>
-                                            <p>购买</p>
-                                        </div>
-                                    </template>
-                                    <template v-else>
-                                        <span class="none" v-if="coupon.couponBtnType == 0"
+                                    <template v-if="coupon.couponBtnType == 0">
+                                        <template v-if="coupon.moneyCouponFlag == 1">
+                                            <div class="buy" v-if="coupon.couponBtnType == 2" @click="toBuyCoupon(coupon)"
+                                                 id="coupon-buy-coupon"
+                                                 onclick="_czc.push(['_trackEvent','商品详情','优惠券购买按钮点击','优惠券购买按钮点击',1,'coupon-buy-coupon'])">
+                                                <p>￥{{ coupon.moneyCouponPrice }}</p>
+                                                <p>购买</p>
+                                            </div>
+                                        </template>
+                                        <template v-else>
+                                            <span class="none"
                                               @click="receiveCoupon(coupon)"
                                               id="coupon-receive"
-                                              onclick="_czc.push(['_trackEvent','商品详情','优惠券领取按钮点击','优惠券领取按钮点击',1,'coupon-receive'])">领取</span>
-                                        <span v-if="coupon.couponBtnType == 1">已领取</span>
+                                              onclick="_czc.push(['_trackEvent','商品详情','优惠券领取按钮点击','优惠券领取按钮点击',1,'coupon-receive'])">领取
+                                            </span>
+                                        </template>
                                     </template>
+                                    <span v-if="coupon.couponBtnType == 1">已领取</span>
                                 </div>
                                 <template v-if="coupon.moneyCouponFlag == 1">
                                     <div class="coupon-tags" v-if="coupon.moneyCouponType == 1">意向{{ coupon.couponType | TypeFormat }}</div>

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

@@ -259,19 +259,24 @@
                                 <div class="coupon-list-time"> {{ coupon.startDate }} - {{ coupon.endDate }} </div>
                             </div>
                             <div class="coupon-list-ri">
-                                <template v-if="coupon.moneyCouponFlag == 1">
-                                    <div class="buy" @click="toBuyCoupon(coupon)" id="coupon-buy-coupon"
-                                         onclick="_czc.push(['_trackEvent','机构购物车','优惠券购买按钮点击','优惠券购买按钮点击',1,'coupon-buy-coupon'])">
-                                        <p>￥{{ coupon.moneyCouponPrice }}</p>
-                                        <p>购买</p>
-                                    </div>
-                                </template>
-                                <template>
-                                    <span class="none" v-if="coupon.couponBtnType == 0" @click="receiveCoupon(coupon)"
-                                          id="coupon-receive"
-                                          onclick="_czc.push(['_trackEvent','机构购物车','优惠券领取按钮点击','优惠券领取按钮点击',1,'coupon-receive'])">领取</span>
-                                    <span v-if="coupon.couponBtnType == 1">已领取</span>
+                                <template v-if="coupon.couponBtnType == 0">
+                                    <template v-if="coupon.moneyCouponFlag == 1">
+                                        <div class="buy" v-if="coupon.couponBtnType == 2" @click="toBuyCoupon(coupon)"
+                                             id="coupon-buy-coupon"
+                                             onclick="_czc.push(['_trackEvent','商品详情','优惠券购买按钮点击','优惠券购买按钮点击',1,'coupon-buy-coupon'])">
+                                            <p>￥{{ coupon.moneyCouponPrice }}</p>
+                                            <p>购买</p>
+                                        </div>
+                                    </template>
+                                    <template v-else>
+                                            <span class="none"
+                                                  @click="receiveCoupon(coupon)"
+                                                  id="coupon-receive"
+                                                  onclick="_czc.push(['_trackEvent','商品详情','优惠券领取按钮点击','优惠券领取按钮点击',1,'coupon-receive'])">领取
+                                            </span>
+                                    </template>
                                 </template>
+                                <span v-if="coupon.couponBtnType == 1">已领取</span>
                             </div>
                             <template v-if="coupon.moneyCouponFlag == 1">
                                 <div class="coupon-tags" v-if="coupon.moneyCouponType == 1">意向{{ coupon.couponType | TypeFormat }}</div>