fixed confilct. code review by BiKai

@@ -23,15 +23,15 @@ class Yohobuy
 //     const SERVICE_URL = 'http://service.api.yohobuy.com/';
 //     const SERVICE_URL = 'http://service.api.yohobuy.com/';
 //     const YOHOBUY_URL = 'http://www.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/';
 
 
     /**
     /**
      * 私钥列表
      * 私钥列表

@@ -591,6 +591,7 @@ class Helpers
             } elseif ($value['goods_type'] == 'gift' && !isset($value['isAdvanceBuy'])) {
             } elseif ($value['goods_type'] == 'gift' && !isset($value['isAdvanceBuy'])) {
                 $oneGoods['isGift'] = true;
                 $oneGoods['isGift'] = true;
             } elseif ($value['goods_type'] == 'price_gift') {
             } elseif ($value['goods_type'] == 'price_gift') {
+                $oneGoods['showCheckbox'] = true;
                 $oneGoods['isAdvanceBuy'] = true;
                 $oneGoods['isAdvanceBuy'] = true;
             } else {
             } else {
                 $oneGoods['showCheckbox'] = true;
                 $oneGoods['showCheckbox'] = true;
@@ -631,7 +632,7 @@ class Helpers
                 $oneGoods['id'] = $single['product_skn'];
                 $oneGoods['id'] = $single['product_skn'];
                 $oneGoods['name'] = $single['product_name'];
                 $oneGoods['name'] = $single['product_name'];
                 $oneGoods['thumb'] = !empty($single['goods_images']) ? Images::getImageUrl($single['goods_images'], 120, 160) : '';
                 $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['marketPrice'] = self::transPrice($single['market_price']);
                 $oneGoods['count'] = $single['storage_number'];
                 $oneGoods['count'] = $single['storage_number'];
 
 

@@ -16,6 +16,7 @@ var page = 1,
     isGetData;
     isGetData;
 
 
 var conponTmpl = Handlebars.compile($('#tmpl-coupon').html()),
 var conponTmpl = Handlebars.compile($('#tmpl-coupon').html()),
+    conponNotAvaliableTmpl = Handlebars.compile($('#tmpl-coupon-not-avaliable').html()),
     $newCoupon = $('#new-coupon');
     $newCoupon = $('#new-coupon');
 
 
 var winH = $(window).height();
 var winH = $(window).height();
@@ -137,14 +138,13 @@ function getCouponHandle(coupons) {
         coupons: 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();
     window.rePosFooter();
 
 
 }
 }

@@ -13,7 +13,7 @@
     <ul class="freebie-and-advance-buy">
     <ul class="freebie-and-advance-buy">
         {{# freebie}}
         {{# freebie}}
             <li class="freebie">
             <li class="freebie">
-                <a href="/cart/index/gift?cartType=">
+                <a href="/cart/index/gift?cartType={{cartType}}">
                 <span class="iconfont">&#xe620;</span>
                 <span class="iconfont">&#xe620;</span>
                 赠品
                 赠品
                     <span class="count">{{count}}</span>
                     <span class="count">{{count}}</span>
@@ -23,7 +23,7 @@
         {{/ freebie}}
         {{/ freebie}}
         {{#if advanceBuy}}
         {{#if advanceBuy}}
             <li class="advance-buy">
             <li class="advance-buy">
-                <a href="/cart/index/advanceBuy?cartType=">
+                <a href="/cart/index/advanceBuy?cartType={{cartType}}">
                 <span class="iconfont">&#xe61b;</span>
                 <span class="iconfont">&#xe61b;</span>
                 加价购
                 加价购
                     <span class="count">{{advanceBuyCount}}</span>
                     <span class="count">{{advanceBuyCount}}</span>