diff --git a/library/Api/Yohobuy.php b/library/Api/Yohobuy.php index 5e54b9b..f7fd7fd 100644 --- a/library/Api/Yohobuy.php +++ b/library/Api/Yohobuy.php @@ -23,15 +23,15 @@ class Yohobuy // const SERVICE_URL = 'http://service.api.yohobuy.com/'; // const YOHOBUY_URL = 'http://www.yohobuy.com/'; - const API_URL = 'http://apih5.yoho.cn/'; - const API_URL2 = 'http://apih5.yoho.cn/'; - const SERVICE_URL = 'http://serviceh5.yoho.cn/'; - const YOHOBUY_URL = 'http://www.yohobuy.com/'; +// const API_URL = 'http://apih5.yoho.cn/'; +// const API_URL2 = 'http://apih5.yoho.cn/'; +// const SERVICE_URL = 'http://serviceh5.yoho.cn/'; +// const YOHOBUY_URL = 'http://www.yohobuy.com/'; // /* 测试环境 */ -// const API_URL = 'http://testapi.yoho.cn:28078/'; -// const SERVICE_URL = 'http://testservice.yoho.cn:28077/'; -// const YOHOBUY_URL = 'http://www.yohobuy.com/'; + const API_URL = 'http://testapi.yoho.cn:28078/'; + const SERVICE_URL = 'http://testservice.yoho.cn:28077/'; + const YOHOBUY_URL = 'http://www.yohobuy.com/'; /** * 私钥列表 diff --git a/library/Plugin/Helpers.php b/library/Plugin/Helpers.php index 002dc69..334a258 100644 --- a/library/Plugin/Helpers.php +++ b/library/Plugin/Helpers.php @@ -591,6 +591,7 @@ class Helpers } elseif ($value['goods_type'] == 'gift' && !isset($value['isAdvanceBuy'])) { $oneGoods['isGift'] = true; } elseif ($value['goods_type'] == 'price_gift') { + $oneGoods['showCheckbox'] = true; $oneGoods['isAdvanceBuy'] = true; } else { $oneGoods['showCheckbox'] = true; @@ -631,7 +632,7 @@ class Helpers $oneGoods['id'] = $single['product_skn']; $oneGoods['name'] = $single['product_name']; $oneGoods['thumb'] = !empty($single['goods_images']) ? Images::getImageUrl($single['goods_images'], 120, 160) : ''; - $oneGoods['price'] = self::transPrice($single['sales_price']); + $oneGoods['price'] = self::transPrice($single['last_price']); $oneGoods['marketPrice'] = self::transPrice($single['market_price']); $oneGoods['count'] = $single['storage_number']; diff --git a/static/js/cart/select-coupon.js b/static/js/cart/select-coupon.js index 3dc98fa..0298e16 100644 --- a/static/js/cart/select-coupon.js +++ b/static/js/cart/select-coupon.js @@ -16,6 +16,7 @@ var page = 1, isGetData; var conponTmpl = Handlebars.compile($('#tmpl-coupon').html()), + conponNotAvaliableTmpl = Handlebars.compile($('#tmpl-coupon-not-avaliable').html()), $newCoupon = $('#new-coupon'); var winH = $(window).height(); @@ -137,14 +138,13 @@ function getCouponHandle(coupons) { coupons: coupons })); - // 产品说,暂时不做不可使用的优惠券 - // if (notAvailableCoupons.length) { - // $('.not-avaliable-coupon-line').show(); - // } - // $('#coupon-list-not').append(conponNotAvaliableTmpl({ - // notAvailableCoupons: notAvailableCoupons - // })); + if (notAvailableCoupons.length) { + $('.not-avaliable-coupon-line').show(); + } + $('#coupon-list-not').append(conponNotAvaliableTmpl({ + notAvailableCoupons: notAvailableCoupons + })); window.rePosFooter(); } diff --git a/template/m.yohobuy.com/partials/cart/cart-content.phtml b/template/m.yohobuy.com/partials/cart/cart-content.phtml index 2e2eb87..4650abc 100644 --- a/template/m.yohobuy.com/partials/cart/cart-content.phtml +++ b/template/m.yohobuy.com/partials/cart/cart-content.phtml @@ -13,7 +13,7 @@ <ul class="freebie-and-advance-buy"> {{# freebie}} <li class="freebie"> - <a href="/cart/index/gift?cartType="> + <a href="/cart/index/gift?cartType={{cartType}}"> <span class="iconfont"></span> 赠品 <span class="count">{{count}}</span> @@ -23,7 +23,7 @@ {{/ freebie}} {{#if advanceBuy}} <li class="advance-buy"> - <a href="/cart/index/advanceBuy?cartType="> + <a href="/cart/index/advanceBuy?cartType={{cartType}}"> <span class="iconfont"></span> 加价购 <span class="count">{{advanceBuyCount}}</span>