Merge remote-tracking branch 'origin/developerB' into developerB

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

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

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

@@ -679,83 +679,85 @@
             </div>
         </div>
         <!--优惠券弹窗-->
-        <div class="coupon-popup" v-show="isShowPopup" :class="isShowPopup ? 'show' : 'hide'">
-            <div class="coupon-popup-model-content">
-                <div class="title"><p>优惠券</p><i class="icon mIcon" @click="hidePopup"></i></div>
-                <div class="coupon-popup-main">
-                    <div class="coupon-popup-tabs">
-                        <div class="popup-tabs-cell" :class="currentTab == 1 ? 'active' : ''"
-                             @click="queryCouponTabs(1)"><span>未领取</span></div>
-                        <div class="popup-tabs-cell" :class="currentTab == 2 ? 'active' : ''"
-                             @click="queryCouponTabs(2)"><span>已领取</span></div>
-                    </div>
-                    <div class="coupon-popup-content">
-                        <div class="empty" v-if="isCouponEmpty">
-                            <img src="/img/account/icon-coupon-empty@2x.png">
-                            <div class="msg"><p>暂无可领的优惠券</p></div>
+        <template v-if="GLOBAL_USER_ID>0">
+            <div class="coupon-popup" v-show="isShowPopup" :class="isShowPopup ? 'show' : 'hide'">
+                <div class="coupon-popup-model-content">
+                    <div class="title"><p>优惠券</p><i class="icon mIcon" @click="hidePopup"></i></div>
+                    <div class="coupon-popup-main">
+                        <div class="coupon-popup-tabs">
+                            <div class="popup-tabs-cell" :class="currentTab == 1 ? 'active' : ''"
+                                 @click="queryCouponTabs(1)"><span>未领取</span></div>
+                            <div class="popup-tabs-cell" :class="currentTab == 2 ? 'active' : ''"
+                                 @click="queryCouponTabs(2)"><span>已领取</span></div>
                         </div>
-                        <div class="coupon-popup-scroll" v-else>
-                            <div class="coupon-list-cell" v-for="(coupon, index) in productCouponList" :key="index"
-                                 :class="currentTab == 2 ? 'none' : ''">
-                                <div class="coupon-list-le">
-                                    <div class="coupon-list-money">
-                                        <p>￥<span class="maxMoney">{{ coupon.couponAmount }}</span><span
-                                                class="minMoney">满{{ coupon.touchPrice }}可用</span></p>
-                                    </div>
-                                    <div class="coupon-list-name">
-                                        <p v-if="coupon.couponType == 0">
-                                            {{ coupon.productType && coupon.productType == 1 ? '全商城商品通用' : '仅可购买指定商品' }}
-                                        </p>
-                                        <p v-if="coupon.couponType == 1">
-                                            {{ coupon.categoryType == 1 ? '仅限购买产品类商品' : '仅限购买仪器类商品' }}
-                                        </p>
-                                        <p v-if="coupon.couponType == 3">仅限购买店铺【{{ coupon.shopName }}】的商品</p>
-                                        <p v-if="coupon.couponType == 4 || coupon.couponType == 2">全商城商品通用</p>
+                        <div class="coupon-popup-content">
+                            <div class="empty" v-if="isCouponEmpty">
+                                <img src="/img/account/icon-coupon-empty@2x.png">
+                                <div class="msg"><p>暂无可领的优惠券</p></div>
+                            </div>
+                            <div class="coupon-popup-scroll" v-else>
+                                <div class="coupon-list-cell" v-for="(coupon, index) in productCouponList" :key="index"
+                                     :class="currentTab == 2 ? 'none' : ''">
+                                    <div class="coupon-list-le">
+                                        <div class="coupon-list-money">
+                                            <p>￥<span class="maxMoney">{{ coupon.couponAmount }}</span><span
+                                                    class="minMoney">满{{ coupon.touchPrice }}可用</span></p>
+                                        </div>
+                                        <div class="coupon-list-name">
+                                            <p v-if="coupon.couponType == 0">
+                                                {{ coupon.productType && coupon.productType == 1 ? '全商城商品通用' : '仅可购买指定商品' }}
+                                            </p>
+                                            <p v-if="coupon.couponType == 1">
+                                                {{ coupon.categoryType == 1 ? '仅限购买产品类商品' : '仅限购买仪器类商品' }}
+                                            </p>
+                                            <p v-if="coupon.couponType == 3">仅限购买店铺【{{ coupon.shopName }}】的商品</p>
+                                            <p v-if="coupon.couponType == 4 || coupon.couponType == 2">全商城商品通用</p>
+                                        </div>
+                                        <div class="coupon-list-time"> {{ coupon.startDate }} - {{ coupon.endDate }}</div>
                                     </div>
-                                    <div class="coupon-list-time"> {{ coupon.startDate }} - {{ coupon.endDate }}</div>
-                                </div>
-                                <div class="coupon-list-ri">
+                                    <div class="coupon-list-ri">
 
-                                    <template v-if="coupon.couponBtnType == 0">
-                                        <template v-if="coupon.couponPayWay == 2">
-                                            <div class="buy" @click="toDeductCoupon(coupon)"
-                                                 id="coupon-exchange-coupon"
-                                                 onclick="_czc.push(['_trackEvent','商品详情','优惠券采美豆兑换','优惠券兑换按钮点击',1,'coupon-exchange-coupon'])">
-                                                <p>{{ coupon.moneyCouponPrice }}采美豆</p>
-                                                <p>兑换</p>
-                                            </div>
-                                        </template>
-                                        <template v-else-if="coupon.couponPayWay == 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 v-else>
+                                        <template v-if="coupon.couponBtnType == 0">
+                                            <template v-if="coupon.couponPayWay == 2">
+                                                <div class="buy" @click="toDeductCoupon(coupon)"
+                                                     id="coupon-exchange-coupon"
+                                                     onclick="_czc.push(['_trackEvent','商品详情','优惠券采美豆兑换','优惠券兑换按钮点击',1,'coupon-exchange-coupon'])">
+                                                    <p>{{ coupon.moneyCouponPrice }}采美豆</p>
+                                                    <p>兑换</p>
+                                                </div>
+                                            </template>
+                                            <template v-else-if="coupon.couponPayWay == 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 v-else>
                                             <span class="none"
-                                              @click="receiveCoupon(coupon)"
-                                              id="coupon-receive"
-                                              onclick="_czc.push(['_trackEvent','商品详情','优惠券领取按钮点击','优惠券领取按钮点击',1,'coupon-receive'])">领取
+                                                  @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>
+                                        <div class="coupon-tags"  v-else>定向{{ coupon.couponType | TypeFormat }}</div>
+                                    </template>
+                                    <template v-else>
+                                        <div class="coupon-tags">{{ coupon.couponType | TypeFormat }}</div>
                                     </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>
-                                    <div class="coupon-tags"  v-else>定向{{ coupon.couponType | TypeFormat }}</div>
-                                </template>
-                                <template v-else>
-                                    <div class="coupon-tags">{{ coupon.couponType | TypeFormat }}</div>
-                                </template>
                             </div>
                         </div>
                     </div>
                 </div>
             </div>
-        </div>
+        </template>
     </div>
 </div>