diff --git a/library/LibModels/Wap/Home/CartData.php b/library/LibModels/Wap/Home/CartData.php index 75fd6af..901be31 100644 --- a/library/LibModels/Wap/Home/CartData.php +++ b/library/LibModels/Wap/Home/CartData.php @@ -500,7 +500,7 @@ class CartData } $param['use_yoho_coin'] = $useYohoCoin; $param['client_secret'] = Sign::getSign($param); - return Yohobuy::get(API_URL, $param); + return Yohobuy::get('http://192.168.102.205:8080/gateway/', $param); } /** diff --git a/template/m.yohobuy.com/actions/cart/index/tickets-confirm.phtml b/template/m.yohobuy.com/actions/cart/index/tickets-confirm.phtml index d19b354..3d0d9cc 100644 --- a/template/m.yohobuy.com/actions/cart/index/tickets-confirm.phtml +++ b/template/m.yohobuy.com/actions/cart/index/tickets-confirm.phtml @@ -78,6 +78,19 @@ 您需要支付:<span>¥{{price}}</span> <a href="javascript:;" id="ticketsConfirm">确认</a> </div> + <!--有货币使用弹框提示--> + <div class="yoho-coin-help-dialog-bg hide"></div> + <div class="yoho-coin-help-dialog hide"> + <div class="yoho-coin-title">有货币使用条件:</div> + <div class="yoho-coin-content"> + <p>1.订单金额大于20元(含)</p> + <p>2.有货币数量大于{{yohoCoinCompute.yoho_coin_pay_rule.num_limit}}个(含)</p> + <p>3.有货币支付不得超过每笔订单应付金额的{{yohoCoinCompute.yoho_coin_pay_rule.max_pay_rate_desc}}</p> + <p>备注:使用有货币数量为{{yohoCoinCompute.yoho_coin_pay_rule.num_limit}}的整数倍,100有货币抵1元。</p> + </div> + <div class="yoho-coin-footer">知道了</div> + </div> + <input type="hidden" name="ticketsPage" id="ticketsPage" value="1"> <input type="hidden" name="productSku" id="productSku" value="{{productSku}}"> <input type="hidden" name="buyNumber" id="buyNumber" value="{{buyNumber}}"> diff --git a/yohobuy/m.yohobuy.com/application/models/Index/Cart.php b/yohobuy/m.yohobuy.com/application/models/Index/Cart.php index 17515f1..588aa21 100644 --- a/yohobuy/m.yohobuy.com/application/models/Index/Cart.php +++ b/yohobuy/m.yohobuy.com/application/models/Index/Cart.php @@ -1189,7 +1189,7 @@ class CartModel $price = $data['data']['shopping_cart_data']['last_order_amount']; $result['price'] = Helpers::transPrice($price, true); // 有货币 - $result['yohoCoinCompute'] = self::yohoCoinCompute($compute['data']['shopping_cart_data']); + $result['yohoCoinCompute'] = self::yohoCoinCompute($data['data']['shopping_cart_data']); return $result; }