From 41d8c0095f87fa2540782324bd5e68ac94969f33 Mon Sep 17 00:00:00 2001
From: Bi Kai <kai.bi@yoho.cn>
Date: Mon, 14 Dec 2015 11:05:41 +0800
Subject: [PATCH] 修改输入优惠券号码直接使用
---
static/js/shopping-cart/select-coupon.js | 49 ++++++++++++++++++++++++-------------------------
template/m.yohobuy.com/actions/index/shoppingCart/select-coupon.phtml | 4 ++--
yohobuy/m.yohobuy.com/application/controllers/ShoppingCart.php | 6 +++---
3 files changed, 29 insertions(+), 30 deletions(-)
diff --git a/static/js/shopping-cart/select-coupon.js b/static/js/shopping-cart/select-coupon.js
index ac31c0a..94d57ce 100644
--- a/static/js/shopping-cart/select-coupon.js
+++ b/static/js/shopping-cart/select-coupon.js
@@ -16,17 +16,17 @@ ellipsis.init();
$('#search-coupon').on('submit', function() {
$.ajax({
method: 'POST',
- url: '',
+ url: '/shoppingCart/coupon',
data: $(this).serialize()
}).then(function(res) {
- if (res.avaliable) {
- $('#coupon-list').html(conponTmpl({
- coupons: res.coupons
- }));
- $('#coupon-list-not').html('');
+ if (res.code === 200) {
+ tip.show('优惠券可用');
+ window.location.href = '/shoppingCart/orderEnsure?coupon_code=' + res.data.coupon_code;
} else {
tip.show(res.msg);
}
+ }).fail(function() {
+ tip.show('网络错误');
});
return false;
});
@@ -36,23 +36,23 @@ function getCouponHandle(coupons) {
// 后端需要返回一个 coupons 列表，如下
// notAvailable 表示不可用的优惠券
- coupons = [{
- money: '99',
- coupon_name: '满XX-减去吴悠右腿有益于有2222',
- couponValidity: '20150129-20150430',
- coupon_id: '22222'
- }, {
- money: '99',
- coupon_name: '满XX-减去吴悠右腿有益于有2222',
- couponValidity: '20150129-20150430',
- coupon_id: '2222233'
- }, {
- money: '99',
- coupon_name: 'NONO满XX-减去吴悠右腿有益于有2222',
- couponValidity: '20150129-20150430',
- coupon_id: '2222233',
- notAvailable: 1
- }];
+ // coupons = [{
+ // money: '99',
+ // coupon_name: '满XX-减去吴悠右腿有益于有2222',
+ // couponValidity: '20150129-20150430',
+ // coupon_id: '22222'
+ // }, {
+ // money: '99',
+ // coupon_name: '满XX-减去吴悠右腿有益于有2222',
+ // couponValidity: '20150129-20150430',
+ // coupon_id: '2222233'
+ // }, {
+ // money: '99',
+ // coupon_name: 'NONO满XX-减去吴悠右腿有益于有2222',
+ // couponValidity: '20150129-20150430',
+ // coupon_id: '2222233',
+ // notAvailable: 1
+ // }];
// coupons 是个列表，如果不是列表，可能是服务器错误，这次翻页加载不算
if (!$.isArray(coupons)) {
@@ -106,9 +106,8 @@ function getCouponDate() {
$.ajax({
type: 'POST',
url: '/home/couponData',
- dataType: 'html',
+ dataType: 'json',
data: {
- statuss: status,
page: page
}
}).then(getCouponHandle).fail(function() {
diff --git a/template/m.yohobuy.com/actions/index/shoppingCart/select-coupon.phtml b/template/m.yohobuy.com/actions/index/shoppingCart/select-coupon.phtml
index 84c4092..20c139a 100644
--- a/template/m.yohobuy.com/actions/index/shoppingCart/select-coupon.phtml
+++ b/template/m.yohobuy.com/actions/index/shoppingCart/select-coupon.phtml
@@ -1,7 +1,7 @@
{{> layout/header}}
<div class="yoho-page select-coupon-page my-coupon-page">
<form id="search-coupon" method="POST" action="">
- <input type="text" name="coupon-code" value="" placeholder="输入优惠券码">
+ <input type="text" name="couponCode" value="" placeholder="输入优惠券码">
<button type="submit" class="submit">确定</button>
</form>
<div id="coupon-list" class="coupon-list"></div>
@@ -11,7 +11,7 @@
<script id="tmpl-coupon" type="text/tmpl">
\{{#coupons}}
\{{^ notAvailable}}
- <a class="employ-main" href="/shoppingCart/orderEnsure?coupon_id={{ coupon_id}}">
+ <a class="employ-main" href="/shoppingCart/orderEnsure?coupon_code={{ coupon_code}}">
<span>\{{ money}}</span>
<p class="coupon-name">\{{ coupon_name}}</p>
<p>有效期：\{{ couponValidity}}</p>
diff --git a/yohobuy/m.yohobuy.com/application/controllers/ShoppingCart.php b/yohobuy/m.yohobuy.com/application/controllers/ShoppingCart.php
index 577eca5..ce0246f 100644
--- a/yohobuy/m.yohobuy.com/application/controllers/ShoppingCart.php
+++ b/yohobuy/m.yohobuy.com/application/controllers/ShoppingCart.php
@@ -33,7 +33,7 @@ class ShoppingCartController extends AbstractAction
/**
* 加入购物车
- *
+ *
* @param string productSku 商品的SKU
* @param int buyNumber 购买数量
* @param int promotionId 促销ID, 加价购有关
@@ -53,10 +53,10 @@ class ShoppingCartController extends AbstractAction
$promotionId = $this->post('promotionId', 0);
$isEdit = $this->post('isEdit', 0);
$uid = $this->getUid(true);
-
+
// 执行加入购物车操作
$result = CartModel::addToCart($productSku, $buyNumber, $goodsType, $isEdit, $promotionId, $uid, $shoppingKey);
-
+
// 设置加入购物车凭证到客户端浏览器
if (isset($result['data']['shopping_key'])) {
$this->setCookie('_spk', $shoppingKey);
--
libgit2 0.24.0