Merge branch 'master' into featrue/payNotifyUrl
Showing
26 changed files
with
282 additions
and
105 deletions
@@ -118,7 +118,9 @@ class SearchData | @@ -118,7 +118,9 @@ class SearchData | ||
118 | // return 'http://101.200.31.165/yohosearch/brand/list.json'; | 118 | // return 'http://101.200.31.165/yohosearch/brand/list.json'; |
119 | // return 'http://182.92.99.119:8080/yohosearch/brand/list.json'; | 119 | // return 'http://182.92.99.119:8080/yohosearch/brand/list.json'; |
120 | } | 120 | } |
121 | - return 'http://101.200.31.165/yohosearch/search.json'; | 121 | + return 'http://192.168.102.216:8087/yohosearch/search.json'; |
122 | +// return 'http://192.168.10.64:8080/yohosearch/search.json'; | ||
123 | +// return 'http://101.200.31.165/yohosearch/search.json'; | ||
122 | //return 'http://101.200.31.165/yohosearch/search.json'; | 124 | //return 'http://101.200.31.165/yohosearch/search.json'; |
123 | // return 'http://182.92.99.119:8080/yohosearch/search.json'; | 125 | // return 'http://182.92.99.119:8080/yohosearch/search.json'; |
124 | } | 126 | } |
1 | {{> layout/header}} | 1 | {{> layout/header}} |
2 | <div class="pay-notice-page yoho-page"> | 2 | <div class="pay-notice-page yoho-page"> |
3 | {{# payNotice}} | 3 | {{# payNotice}} |
4 | - <h1> | ||
5 | - <i class="ok-icon"></i> | ||
6 | - <span class="font-red">恭喜您,购买完成!</span> | ||
7 | - 您已成功支付 | ||
8 | - <span class="font-red">{{pay}}</span> | ||
9 | - 元! | ||
10 | - </h1> | 4 | + <h1> |
5 | + <i class="ok-icon"></i> | ||
6 | + <span class="font-red">恭喜您,购买完成!</span> | ||
7 | + 您已成功支付 | ||
8 | + <span class="font-red">{{pay}}</span> | ||
9 | + 元! | ||
10 | + </h1> | ||
11 | 11 | ||
12 | - <div class="order-info"> | ||
13 | - <ul class="order-table-header table-row"> | ||
14 | - <li class="order-num">订单号</li> | ||
15 | - <li>实际支付金额</li> | ||
16 | - <li>支付方式</li> | ||
17 | - <li>获得YOHO币</li> | ||
18 | - <li>获得VIP累计金额</li> | ||
19 | - </ul> | ||
20 | - <ul class="table-row"> | ||
21 | - <li class="order-num"> | ||
22 | - <a class="notice-link" href="{{checkOrderUrl}}">{{orderNum}}</a> | ||
23 | - </li> | ||
24 | - <li class="pay font-red">{{pay}}</li> | ||
25 | - <li class="pay-mode">{{payMode}}</li> | ||
26 | - <li class="yoho-coin"> | ||
27 | - <em class="font-red">{{currency}}</em> | ||
28 | - <a class="notice-link" href="{{yohoCoinUrl}}">YOHO币能做什么</a> | ||
29 | - </li> | ||
30 | - <li class="vip"> | ||
31 | - <em class="font-red">{{vipSum}}</em> | ||
32 | - <a class="notice-link" href="{{vipUrl}}">查看VIP特权</a> | ||
33 | - </li> | ||
34 | - </ul> | ||
35 | - </div> | 12 | + <div class="order-info"> |
13 | + <ul class="order-table-header table-row"> | ||
14 | + <li class="order-num">订单号</li> | ||
15 | + <li>实际支付金额</li> | ||
16 | + <li>支付方式</li> | ||
17 | + <li>获得YOHO币</li> | ||
18 | + <li>获得VIP累计金额</li> | ||
19 | + </ul> | ||
20 | + <ul class="table-row"> | ||
21 | + <li class="order-num"> | ||
22 | + <a class="notice-link" href="{{checkOrderUrl}}">{{orderNum}}</a> | ||
23 | + </li> | ||
24 | + <li class="pay font-red">{{pay}}</li> | ||
25 | + <li class="pay-mode">{{payMode}}</li> | ||
26 | + <li class="yoho-coin"> | ||
27 | + <em class="font-red">{{currency}}</em> | ||
28 | + <a class="notice-link" href="{{yohoCoinUrl}}">YOHO币能做什么</a> | ||
29 | + </li> | ||
30 | + <li class="vip"> | ||
31 | + <em class="font-red">{{vipSum}}</em> | ||
32 | + <a class="notice-link" href="{{vipUrl}}">查看VIP特权</a> | ||
33 | + </li> | ||
34 | + </ul> | ||
35 | + </div> | ||
36 | 36 | ||
37 | - <div class="notice-tip"> | ||
38 | - 1.每天15:00以前成功付款的订单将在当天发货,15:00-00:00成功付款的订单将在第二天发货。<br> | ||
39 | - 2.当订单发货后,您可以登录<a href="{{ordersUrl}}" class="notice-link" target="_blank">订单中心</a>查询快递发货详情。<br> | ||
40 | - 3.有货网支持"开箱验货"和"15天退换货保障"收货后请当面验货,如果发现商品有任何问题请致电客服电话400-889-9646,<a href="{{returnGoodsUrl}}" class="notice-link" target="_blank">退换货政策</a><br> | ||
41 | - 4.VIP金额的累计,将在您订单签收15天后积累到您的账户,请您知悉。<br> | ||
42 | - 5.购买商品及参与促销活动赠送的YOHO币,将在您订单签收7天后积累到您的账户,您可以在个人中心-我的YOHO币中查看。<br> | ||
43 | - <b style="color:#c00;">6.尊敬的用户:近期为网络诈骗高发期,有货郑重声明,不会以任何形式索取客户的账户信息或引导转账,敬请提高警惕,谨防诈骗。</b> | ||
44 | - </div> | 37 | + <div class="notice-tip"> |
38 | + 1.每天15:00以前成功付款的订单将在当天发货,15:00-00:00成功付款的订单将在第二天发货。<br> | ||
39 | + 2.当订单发货后,您可以登录<a href="{{ordersUrl}}" class="notice-link" target="_blank">订单中心</a>查询快递发货详情。<br> | ||
40 | + 3.有货网支持"开箱验货"和"15天退换货保障"收货后请当面验货,如果发现商品有任何问题请致电客服电话400-889-9646,<a href="{{returnGoodsUrl}}" class="notice-link" | ||
41 | + target="_blank">退换货政策</a><br> | ||
42 | + 4.VIP金额的累计,将在您订单签收15天后积累到您的账户,请您知悉。<br> | ||
43 | + 5.购买商品及参与促销活动赠送的YOHO币,将在您订单签收7天后积累到您的账户,您可以在个人中心-我的YOHO币中查看。<br> | ||
44 | + <b style="color:#c00;">6.尊敬的用户:近期为网络诈骗高发期,有货郑重声明,不会以任何形式索取客户的账户信息或引导转账,敬请提高警惕,谨防诈骗。</b> | ||
45 | + </div> | ||
45 | 46 | ||
46 | - <p class="btns"> | ||
47 | - <a class="check-order" href="{{checkOrderUrl}}">查看订单</a> | ||
48 | - <a class="return-home" href="{{returnHomeUrl}}">返回首页</a> | ||
49 | - </p> | 47 | + <p class="btns"> |
48 | + <a class="check-order" href="{{checkOrderUrl}}">查看订单</a> | ||
49 | + <a class="return-home" href="{{returnHomeUrl}}">返回首页</a> | ||
50 | + </p> | ||
50 | 51 | ||
51 | - {{#if devEnv}} | ||
52 | - <img class="notice-img" src="http://webstatic.dev.yohobuy.com/img/pay/notice.jpg"> | ||
53 | - {{^}} | ||
54 | - <img class="notice-img" src="http://cdn.yoho.cn/yohobuy/assets/img/pay/notice.jpg"> | ||
55 | - {{/if}} | 52 | + {{#if devEnv}} |
53 | + <img class="notice-img" src="http://webstatic.dev.yohobuy.com/img/pay/notice.jpg"> | ||
54 | + {{^}} | ||
55 | + <img class="notice-img" src="http://cdn.yoho.cn/yohobuy/assets/img/pay/notice.jpg"> | ||
56 | + {{/if}} | ||
56 | {{/ payNotice}} | 57 | {{/ payNotice}} |
57 | </div> | 58 | </div> |
59 | +{{> pay/pay-analysis}} | ||
58 | {{> layout/footer}} | 60 | {{> layout/footer}} |
@@ -2,7 +2,6 @@ | @@ -2,7 +2,6 @@ | ||
2 | <div class="shopping-pay-page yoho-page clearfix"> | 2 | <div class="shopping-pay-page yoho-page clearfix"> |
3 | {{# shoppingpay}} | 3 | {{# shoppingpay}} |
4 | <div class="pay-page"> | 4 | <div class="pay-page"> |
5 | - | ||
6 | <div class="pay-title"> | 5 | <div class="pay-title"> |
7 | <div class="step4"></div> | 6 | <div class="step4"></div> |
8 | <ul> | 7 | <ul> |
@@ -11,14 +10,12 @@ | @@ -11,14 +10,12 @@ | ||
11 | <li class="end"><span>付款,完成购买</span></li> | 10 | <li class="end"><span>付款,完成购买</span></li> |
12 | </ul> | 11 | </ul> |
13 | </div> | 12 | </div> |
14 | - | ||
15 | <div class="cart-pay"> | 13 | <div class="cart-pay"> |
16 | <h2>您的订单已成功,现在就去付款吧~</h2> | 14 | <h2>您的订单已成功,现在就去付款吧~</h2> |
17 | <h3>您的订单号:<strong class="order-num">{{orderNum}}</strong> 应付金额:<strong>{{count}}</strong>元 | 15 | <h3>您的订单号:<strong class="order-num">{{orderNum}}</strong> 应付金额:<strong>{{count}}</strong>元 |
18 | 支付方式:{{paymentType}} 送货时间:{{deliveryType}}</h3> | 16 | 支付方式:{{paymentType}} 送货时间:{{deliveryType}}</h3> |
19 | <h4>{{userName}},如果2小时内您无法完成付款,系统会将您的订单取消。</h4> | 17 | <h4>{{userName}},如果2小时内您无法完成付款,系统会将您的订单取消。</h4> |
20 | </div> | 18 | </div> |
21 | - | ||
22 | <div class="wrapper"> | 19 | <div class="wrapper"> |
23 | <div class="pay-way"> | 20 | <div class="pay-way"> |
24 | <span class="word">使用:</span> | 21 | <span class="word">使用:</span> |
@@ -77,12 +74,11 @@ | @@ -77,12 +74,11 @@ | ||
77 | <a href="#" class="close">x</a> | 74 | <a href="#" class="close">x</a> |
78 | </div> | 75 | </div> |
79 | </div> | 76 | </div> |
80 | - | ||
81 | - {{/ shoppingpay}} | ||
82 | - | ||
83 | </div> | 77 | </div> |
78 | + {{/ shoppingpay}} | ||
79 | +</div> | ||
84 | 80 | ||
85 | - {{# shoppingpay}} | 81 | +{{# shoppingpay}} |
86 | <!-- Google Code for 下单成功 Conversion Page --> | 82 | <!-- Google Code for 下单成功 Conversion Page --> |
87 | <script type="text/javascript"> | 83 | <script type="text/javascript"> |
88 | /* <![CDATA[ */ | 84 | /* <![CDATA[ */ |
@@ -150,6 +146,9 @@ | @@ -150,6 +146,9 @@ | ||
150 | 146 | ||
151 | {{> shopping/box-analysis}} | 147 | {{> shopping/box-analysis}} |
152 | {{> shopping/box-buy-analysis}} | 148 | {{> shopping/box-buy-analysis}} |
153 | - {{/ shoppingpay}} | 149 | +{{/ shoppingpay}} |
150 | + | ||
151 | +{{!-- 品有统计代码 --}} | ||
152 | +{{> shopping/pinyou-analysis}} | ||
154 | 153 | ||
155 | - {{> layout/footer}} | 154 | +{{> layout/footer}} |
@@ -25,4 +25,11 @@ | @@ -25,4 +25,11 @@ | ||
25 | __custom['sku_list'] = '{{skuList}}'; | 25 | __custom['sku_list'] = '{{skuList}}'; |
26 | </script> | 26 | </script> |
27 | {{/shoppingpay}} | 27 | {{/shoppingpay}} |
28 | + | ||
29 | +{{!-- 品有统计代码 --}} | ||
30 | +{{> shopping/pinyou-analysis}} | ||
31 | + | ||
32 | +{{!-- criteo统计代码 --}} | ||
33 | +{{> pay/pay-analysis}} | ||
34 | + | ||
28 | {{> layout/footer}} | 35 | {{> layout/footer}} |
1 | +<script> | ||
2 | + (function() { | ||
3 | + var hm = document.createElement("script"); | ||
4 | + hm.src = "http://static.criteo.net/js/ld/ld.js"; | ||
5 | + hm.async = 1; | ||
6 | + var s = document.getElementsByTagName("script")[0]; | ||
7 | + s.parentNode.insertBefore(hm, s); | ||
8 | + var u = _ozuid || ""; | ||
9 | + u = (u == 0) ? "" : u; | ||
10 | + window.criteo_q = window.criteo_q || []; | ||
11 | + window.criteo_q.push({event: "setAccount", account: 16184 },{event: "setCustomerId", id: u},{event: "setSiteType", type: "d" },{event: "viewHome" }); | ||
12 | + })(); | ||
13 | +</script> |
@@ -39,17 +39,6 @@ var _gaq = _gaq || []; | @@ -39,17 +39,6 @@ var _gaq = _gaq || []; | ||
39 | var s = document.getElementsByTagName("script")[0]; | 39 | var s = document.getElementsByTagName("script")[0]; |
40 | s.parentNode.insertBefore(hm, s); | 40 | s.parentNode.insertBefore(hm, s); |
41 | })(); | 41 | })(); |
42 | - (function() { | ||
43 | - var hm = document.createElement("script"); | ||
44 | - hm.src = "http://static.criteo.net/js/ld/ld.js"; | ||
45 | - hm.async = 1; | ||
46 | - var s = document.getElementsByTagName("script")[0]; | ||
47 | - s.parentNode.insertBefore(hm, s); | ||
48 | - var u = _ozuid || ""; | ||
49 | - u = (u == 0) ? "" : u; | ||
50 | - window.criteo_q = window.criteo_q || []; | ||
51 | - window.criteo_q.push({event: "setAccount", account: 16184 },{event: "setCustomerId", id: u},{event: "setSiteType", type: "d" },{event: "viewHome" }); | ||
52 | - })(); | ||
53 | } | 42 | } |
54 | if (window.addEventListener) { | 43 | if (window.addEventListener) { |
55 | window.addEventListener('load', async_load, false); | 44 | window.addEventListener('load', async_load, false); |
1 | +{{# criteo}} | ||
2 | +<script type="text/javascript" src="//static.criteo.net/js/ld/ld.js" async="true"></script> | ||
3 | +<script type="text/javascript"> | ||
4 | +window.criteo_q = window.criteo_q || []; | ||
5 | +window.criteo_q.push( | ||
6 | + { event: "setAccount", account: [16184] }, | ||
7 | + { event: "setSiteType", type: "d" }, | ||
8 | + { event: "trackTransaction" , id: "{{orderNum}}", item: [ | ||
9 | + {{#each items}} | ||
10 | + { id: "{{product_id}}", price: "{{goods_price}}", quantity: "{{buy_number}}"} | ||
11 | + {{#unless @last}} | ||
12 | + , | ||
13 | + {{/unless}} | ||
14 | + {{/each}} | ||
15 | + ]} | ||
16 | +); | ||
17 | +</script> | ||
18 | +{{/ criteo}} |
1 | +{{# criteo}} | ||
2 | +<script type="text/javascript" src="//static.criteo.net/js/ld/ld.js" async="true"></script> | ||
3 | +<script type="text/javascript"> | ||
4 | + window.criteo_q = window.criteo_q || []; | ||
5 | + window.criteo_q.push( | ||
6 | + { event: "setAccount", account: [16184] }, | ||
7 | + { event: "setSiteType", type: "d" }, | ||
8 | + { event: "viewList", item: [{{#each skn}}"{{.}}"{{#unless @last}},{{/unless}}{{/each}}]} | ||
9 | + ); | ||
10 | +</script> | ||
11 | +{{/ criteo}} |
1 | +{{# pinyou}} | ||
2 | +<script> | ||
3 | +!function(w,d,e){ | ||
4 | +var _orderno='{{orderNum}}'; | ||
5 | +var _money='{{count}}'; | ||
6 | +var _productList='{{productList}}'; | ||
7 | +var b=location.href,c=d.referrer,f,s,g=d.cookie,h=g.match(/(^|;)\s*ipycookie=([^;]*)/),i=g.match(/(^|;)\s*ipysession=([^;]*)/);if (w.parent!=w){f=b;b=c;c=f;};u='//stats.ipinyou.com/cvt?a='+e('MC.2z.Rg-AQqSqQi2GykX12LUxI0')+'&c='+e(h?h[2]:'')+'&s='+e(i?i[2].match(/jump\%3D(\d+)/)[1]:'')+'&u='+e(b)+'&r='+e(c)+'&rd='+(new Date()).getTime()+'&OrderNo='+e(_orderno)+'&Money='+e(_money)+'&ProductList='+e(_productList)+'&e='; | ||
8 | +function _(){if(!d.body){setTimeout(_(),100);}else{s= d.createElement('script');s.src = u;d.body.insertBefore(s,d.body.firstChild);}}_(); | ||
9 | +}(window,document,encodeURIComponent); | ||
10 | +</script> | ||
11 | +{{/ pinyou}} |
@@ -65,6 +65,32 @@ class PayModel | @@ -65,6 +65,32 @@ class PayModel | ||
65 | $result['orderNum'] = $orderCode; | 65 | $result['orderNum'] = $orderCode; |
66 | $result['count'] = $order['payment_amount']; | 66 | $result['count'] = $order['payment_amount']; |
67 | $result['paymentType'] = ($order['payment_type'] == 1 ? '在线支付' : '货到付款'); | 67 | $result['paymentType'] = ($order['payment_type'] == 1 ? '在线支付' : '货到付款'); |
68 | + // 订单商品(用于订单统计) | ||
69 | + $result['orderGoods'] = $order['order_goods']; | ||
70 | + | ||
71 | + //统计成交的skn | ||
72 | + $sknList = array(); | ||
73 | + $skuList = array(); | ||
74 | + $goodsData = array(); | ||
75 | + $pinyouGoodsArr = array(); | ||
76 | + foreach ($order['order_goods'] as $val) { | ||
77 | + $sknList[] = $val['product_skn']; | ||
78 | + $skuList[] = $val['product_sku']; | ||
79 | + $goodsData[] = array( | ||
80 | + 'goods_name' => $val['product_name'], | ||
81 | + 'product_sku' => $val['product_sku'], | ||
82 | + 'price' => $val['goods_price'], | ||
83 | + 'number' => $val['buy_number'] | ||
84 | + ); | ||
85 | + $pinyouGoodsArr[] = $val['product_id'] . ',' . $val['buy_number']; | ||
86 | + } | ||
87 | + $result['goodsData'] = $goodsData; | ||
88 | + // skn列表 | ||
89 | + $result['sknList'] = implode(',', $sknList); | ||
90 | + // sku列表 | ||
91 | + $result['skuList'] = implode(',', $skuList); | ||
92 | + // 品友统计需要的商品数据 | ||
93 | + $result['pinyouGoods'] = implode(';', $pinyouGoodsArr); | ||
68 | 94 | ||
69 | // 货到付款的情况 | 95 | // 货到付款的情况 |
70 | if ($order['payment_type'] == 2) { | 96 | if ($order['payment_type'] == 2) { |
@@ -87,26 +113,6 @@ class PayModel | @@ -87,26 +113,6 @@ class PayModel | ||
87 | } | 113 | } |
88 | 114 | ||
89 | $result['deliveryType'] =isset($order['delivery_time']) ? $order['delivery_time'] : ''; | 115 | $result['deliveryType'] =isset($order['delivery_time']) ? $order['delivery_time'] : ''; |
90 | - | ||
91 | - //统计成交的skn | ||
92 | - $sknList = array(); | ||
93 | - $skuList = array(); | ||
94 | - $goodsData = array(); | ||
95 | - foreach ($order['order_goods'] as $val) { | ||
96 | - $sknList[] = $val['product_skn']; | ||
97 | - $skuList[] = $val['product_sku']; | ||
98 | - $goodsData[] = array( | ||
99 | - 'goods_name' => $val['product_name'], | ||
100 | - 'product_sku' => $val['product_sku'], | ||
101 | - 'price' => $val['goods_price'], | ||
102 | - 'number' => $val['buy_number'] | ||
103 | - ); | ||
104 | - } | ||
105 | - $result['goodsData'] = $goodsData; | ||
106 | - // skn列表 | ||
107 | - $result['sknList'] = implode(',', $sknList); | ||
108 | - // sku列表 | ||
109 | - $result['skuList'] = implode(',', $skuList); | ||
110 | 116 | ||
111 | // 用户ID | 117 | // 用户ID |
112 | $result['uid'] = $uid; | 118 | $result['uid'] = $uid; |
@@ -206,11 +212,8 @@ class PayModel | @@ -206,11 +212,8 @@ class PayModel | ||
206 | // 订单数(用于订单统计) | 212 | // 订单数(用于订单统计) |
207 | $result['orderCount'] = $orderCount; | 213 | $result['orderCount'] = $orderCount; |
208 | $result['is_advance'] = $order['attribute'] == 5 ? 'Y' : 'N'; | 214 | $result['is_advance'] = $order['attribute'] == 5 ? 'Y' : 'N'; |
209 | - // 订单商品(用于订单统计) | ||
210 | - $result['orderGoods'] = $order['order_goods']; | ||
211 | // 订单商品数(用于订单统计) | 215 | // 订单商品数(用于订单统计) |
212 | $result['ordersGoodsNums'] = count($order['order_goods']); | 216 | $result['ordersGoodsNums'] = count($order['order_goods']); |
213 | - | ||
214 | } while (false); | 217 | } while (false); |
215 | 218 | ||
216 | return $result; | 219 | return $result; |
@@ -581,6 +584,7 @@ class PayModel | @@ -581,6 +584,7 @@ class PayModel | ||
581 | $result['data'] = array( | 584 | $result['data'] = array( |
582 | 'pay' => $amount, | 585 | 'pay' => $amount, |
583 | 'orderNum' => $orderData['order_code'], | 586 | 'orderNum' => $orderData['order_code'], |
587 | + 'items' => $orderData['order_goods'], // 订单商品 | ||
584 | 'checkOrderUrl' => Helpers::url('/home/orders/detail', array('orderCode' => $orderData['order_code'])), | 588 | 'checkOrderUrl' => Helpers::url('/home/orders/detail', array('orderCode' => $orderData['order_code'])), |
585 | 'payMode' => ($orderData['payment_type'] == 1 ? '在线支付' : '货到付款'), | 589 | 'payMode' => ($orderData['payment_type'] == 1 ? '在线支付' : '货到付款'), |
586 | 'currency' => $orderData['yoho_give_coin'], | 590 | 'currency' => $orderData['yoho_give_coin'], |
@@ -231,7 +231,7 @@ class IndexController extends WebAction | @@ -231,7 +231,7 @@ class IndexController extends WebAction | ||
231 | if (empty($orderEnsure)) { | 231 | if (empty($orderEnsure)) { |
232 | $this->go(Helpers::url('/shopping/cart')); | 232 | $this->go(Helpers::url('/shopping/cart')); |
233 | } | 233 | } |
234 | - | 234 | + |
235 | $this->_view->display('order-ensure', array( | 235 | $this->_view->display('order-ensure', array( |
236 | 'orderEnsurePage' => true, | 236 | 'orderEnsurePage' => true, |
237 | 'orderEnsure' => $orderEnsure, | 237 | 'orderEnsure' => $orderEnsure, |
@@ -385,7 +385,13 @@ class NoticeController extends WebAction | @@ -385,7 +385,13 @@ class NoticeController extends WebAction | ||
385 | 385 | ||
386 | if ($code == 200) { | 386 | if ($code == 200) { |
387 | $view = 'index'; | 387 | $view = 'index'; |
388 | - $data = array('payNotice' => $dealResult['data']); | 388 | + $data = array( |
389 | + 'payNotice' => $dealResult['data'], | ||
390 | + 'criteo' => array(// 统计代码有关数据 | ||
391 | + 'orderNum' => $dealResult['data']['orderNum'], | ||
392 | + 'items' => $dealResult['data']['items'] | ||
393 | + ) | ||
394 | + ); | ||
389 | } | 395 | } |
390 | 396 | ||
391 | //头部导航 | 397 | //头部导航 |
@@ -58,12 +58,27 @@ class IndexController extends WebAction | @@ -58,12 +58,27 @@ class IndexController extends WebAction | ||
58 | $options['action'] = 'brand';//说明当前方法名 | 58 | $options['action'] = 'brand';//说明当前方法名 |
59 | 59 | ||
60 | //调用模型获得品牌页数据 | 60 | //调用模型获得品牌页数据 |
61 | - $data = BrandsModel::getBrandSearchData($condition, $options); | 61 | + $data = BrandsModel::getBrandSearchData($condition, $options); |
62 | + | ||
63 | + //统计前三个商品 | ||
64 | + $skn=array(); | ||
65 | + $arr=array(); | ||
66 | + if (isset($data['goods']) && !empty($data['goods'])) { | ||
67 | + $arr = array_slice($data['goods'],0,3); | ||
68 | + foreach ($arr as $key=>$value) { | ||
69 | + $skn[] = $value['skn']; | ||
70 | + } | ||
71 | + $arr = array('skn'=>$skn); | ||
72 | + }else{ | ||
73 | + $arr = array('skn'=>array()); | ||
74 | + } | ||
75 | + | ||
62 | $seo = $data['seo']; | 76 | $seo = $data['seo']; |
63 | $data = array( | 77 | $data = array( |
64 | //初始化js | 78 | //初始化js |
65 | 'brandPage' => true, | 79 | 'brandPage' => true, |
66 | - 'list' => $data | 80 | + 'list' => $data, |
81 | + 'criteo' => $arr | ||
67 | ); | 82 | ); |
68 | $this->setBrandSeo($seo); | 83 | $this->setBrandSeo($seo); |
69 | $this->setWebNavHeader(); | 84 | $this->setWebNavHeader(); |
@@ -23,15 +23,29 @@ class ListController extends WebAction | @@ -23,15 +23,29 @@ class ListController extends WebAction | ||
23 | 'action' => 'index', | 23 | 'action' => 'index', |
24 | 'adsId' => '79', | 24 | 'adsId' => '79', |
25 | )); | 25 | )); |
26 | - | ||
27 | // 设置SEO信息 | 26 | // 设置SEO信息 |
28 | $this->setListSeo($list['seo']); | 27 | $this->setListSeo($list['seo']); |
29 | /// 设置头部数据 | 28 | /// 设置头部数据 |
30 | $this->setWebNavHeader(); | 29 | $this->setWebNavHeader(); |
30 | + | ||
31 | + //统计前三个商品 | ||
32 | + $skn=array(); | ||
33 | + $arr=array(); | ||
34 | + if (isset($list['goods']) && !empty($list['goods'])) { | ||
35 | + $arr = array_slice($list['goods'],0,3); | ||
36 | + foreach ($arr as $key=>$value) { | ||
37 | + $skn[] = $value['skn']; | ||
38 | + } | ||
39 | + $arr = array('skn'=>$skn); | ||
40 | + }else{ | ||
41 | + $arr = array('skn'=>array()); | ||
42 | + } | ||
43 | + | ||
31 | // 渲染模板 | 44 | // 渲染模板 |
32 | $this->_view->display('list', array( | 45 | $this->_view->display('list', array( |
33 | 'productListPage' => true, // JS控制初始化 | 46 | 'productListPage' => true, // JS控制初始化 |
34 | 'list' => $list, | 47 | 'list' => $list, |
48 | + 'criteo' => $arr | ||
35 | )); | 49 | )); |
36 | } | 50 | } |
37 | 51 | ||
@@ -50,9 +64,24 @@ class ListController extends WebAction | @@ -50,9 +64,24 @@ class ListController extends WebAction | ||
50 | ); | 64 | ); |
51 | 65 | ||
52 | $newData = NewModel::getNewSearchData($condition, $options); | 66 | $newData = NewModel::getNewSearchData($condition, $options); |
67 | + | ||
68 | + //统计前三个商品 | ||
69 | + $skn=array(); | ||
70 | + $arr=array(); | ||
71 | + if (isset($newData['goods']) && !empty($newData['goods'])) { | ||
72 | + $arr = array_slice($newData['goods'],0,3); | ||
73 | + foreach ($arr as $key=>$value) { | ||
74 | + $skn[] = $value['skn']; | ||
75 | + } | ||
76 | + $arr = array('skn'=>$skn); | ||
77 | + }else{ | ||
78 | + $arr = array('skn'=>array()); | ||
79 | + } | ||
80 | + | ||
53 | $data = array( | 81 | $data = array( |
54 | 'productListPage' => true, | 82 | 'productListPage' => true, |
55 | - 'newSale' => $newData | 83 | + 'newSale' => $newData, |
84 | + 'criteo' => $arr | ||
56 | ); | 85 | ); |
57 | // 设置SEO信息 | 86 | // 设置SEO信息 |
58 | $this->setNewSeo($newData['seo']); | 87 | $this->setNewSeo($newData['seo']); |
@@ -77,10 +106,25 @@ class ListController extends WebAction | @@ -77,10 +106,25 @@ class ListController extends WebAction | ||
77 | $condition['p_d'] = '0.01,0.99'; | 106 | $condition['p_d'] = '0.01,0.99'; |
78 | } | 107 | } |
79 | $list = SearchModel::getListData($condition, $option); | 108 | $list = SearchModel::getListData($condition, $option); |
109 | + | ||
110 | + //统计前三个商品 | ||
111 | + $skn=array(); | ||
112 | + $arr=array(); | ||
113 | + if (isset($list['goods']) && !empty($list['goods'])) { | ||
114 | + $arr = array_slice($list['goods'],0,3); | ||
115 | + foreach ($arr as $key=>$value) { | ||
116 | + $skn[] = $value['skn']; | ||
117 | + } | ||
118 | + $arr = array('skn'=>$skn); | ||
119 | + }else{ | ||
120 | + $arr = array('skn'=>array()); | ||
121 | + } | ||
122 | + | ||
80 | $data = array( | 123 | $data = array( |
81 | //初始化js | 124 | //初始化js |
82 | 'brandPage' => true, | 125 | 'brandPage' => true, |
83 | - 'list' => $list | 126 | + 'list' => $list, |
127 | + 'criteo' => $arr | ||
84 | ); | 128 | ); |
85 | // 设置SEO信息 | 129 | // 设置SEO信息 |
86 | $this->setSaleSeo($list['seo']); | 130 | $this->setSaleSeo($list['seo']); |
@@ -52,10 +52,25 @@ class SaleController extends WebAction | @@ -52,10 +52,25 @@ class SaleController extends WebAction | ||
52 | ); | 52 | ); |
53 | 53 | ||
54 | $saleData = SaleModel::getSaleSearchData($condition, $options, $specialInfo); | 54 | $saleData = SaleModel::getSaleSearchData($condition, $options, $specialInfo); |
55 | + | ||
56 | + //统计前三个商品 | ||
57 | + $skn=array(); | ||
58 | + $arr=array(); | ||
59 | + if (isset($saleData['goods']) && !empty($saleData['goods'])) { | ||
60 | + $arr = array_slice($saleData['goods'],0,3); | ||
61 | + foreach ($arr as $key=>$value) { | ||
62 | + $skn[] = $value['skn']; | ||
63 | + } | ||
64 | + $arr = array('skn'=>$skn); | ||
65 | + }else{ | ||
66 | + $arr = array('skn'=>array()); | ||
67 | + } | ||
68 | + | ||
55 | $data = array( | 69 | $data = array( |
56 | //初始化js | 70 | //初始化js |
57 | 'productListPage' => true, | 71 | 'productListPage' => true, |
58 | - 'newSale' => $saleData | 72 | + 'newSale' => $saleData, |
73 | + 'criteo' => $arr | ||
59 | ); | 74 | ); |
60 | $this->setTitle('潮流商品搜索 | YOHO!有货'); | 75 | $this->setTitle('潮流商品搜索 | YOHO!有货'); |
61 | $this->setKeywords('Yoho! 有货,潮流,时尚,流行,购物,B2C,正品,购物网站,网上购物,货到付款,品牌服饰,男士护肤,黑框眼镜,匡威,板鞋,i.t,izzue,5cm,eastpak,vans,lylescott,g-shock,new balance,lacoste,melissa,casio,卡西欧手表,舒雅,jasonwood,odm,AAAA,香港购物,日本潮流'); | 76 | $this->setKeywords('Yoho! 有货,潮流,时尚,流行,购物,B2C,正品,购物网站,网上购物,货到付款,品牌服饰,男士护肤,黑框眼镜,匡威,板鞋,i.t,izzue,5cm,eastpak,vans,lylescott,g-shock,new balance,lacoste,melissa,casio,卡西欧手表,舒雅,jasonwood,odm,AAAA,香港购物,日本潮流'); |
@@ -11,13 +11,29 @@ class SearchController extends WebAction | @@ -11,13 +11,29 @@ class SearchController extends WebAction | ||
11 | 11 | ||
12 | $this->setWebNavHeader(); | 12 | $this->setWebNavHeader(); |
13 | 13 | ||
14 | + $list = SearchModel::searchData(array(), array( | ||
15 | + 'controller' => 'Search', | ||
16 | + 'action' => 'index', | ||
17 | + 'reviewNum' => 7, //浏览记录数 | ||
18 | + )); | ||
19 | + | ||
20 | + //统计前三个商品 | ||
21 | + $skn=array(); | ||
22 | + $arr=array(); | ||
23 | + if (isset($list['goods']) && !empty($list['goods'])) { | ||
24 | + $arr = array_slice($list['goods'],0,3); | ||
25 | + foreach ($arr as $key=>$value) { | ||
26 | + $skn[] = $value['skn']; | ||
27 | + } | ||
28 | + $arr = array('skn'=>$skn); | ||
29 | + }else{ | ||
30 | + $arr = array('skn'=>array()); | ||
31 | + } | ||
32 | + | ||
14 | $data = array( | 33 | $data = array( |
15 | 'productListPage' => true, //初始化js | 34 | 'productListPage' => true, //初始化js |
16 | - 'list' => SearchModel::searchData(array(), array( | ||
17 | - 'controller' => 'Search', | ||
18 | - 'action' => 'index', | ||
19 | - 'reviewNum' => 7, //浏览记录数 | ||
20 | - )) | 35 | + 'list' => $list, |
36 | + 'criteo' => $arr | ||
21 | ); | 37 | ); |
22 | $data['list']['searchPage'] = true; //设置搜素页面标识,区分列表页-->特有的搜索页导航样式 | 38 | $data['list']['searchPage'] = true; //设置搜素页面标识,区分列表页-->特有的搜索页导航样式 |
23 | if (isset($data['list']['goods']) && empty($data['list']['goods'])) { | 39 | if (isset($data['list']['goods']) && empty($data['list']['goods'])) { |
@@ -26,6 +42,7 @@ class SearchController extends WebAction | @@ -26,6 +42,7 @@ class SearchController extends WebAction | ||
26 | $searchData['search']['keyWord'] = isset($data['list']['keyWord']) ? $data['list']['keyWord'] : ''; | 42 | $searchData['search']['keyWord'] = isset($data['list']['keyWord']) ? $data['list']['keyWord'] : ''; |
27 | $searchData['search']['searchActionUrl'] = isset($data['list']['searchActionUrl']) ? $data['list']['searchActionUrl'] : ''; | 43 | $searchData['search']['searchActionUrl'] = isset($data['list']['searchActionUrl']) ? $data['list']['searchActionUrl'] : ''; |
28 | $searchData['search']['latestWalk'] = 7; | 44 | $searchData['search']['latestWalk'] = 7; |
45 | + $searchData['criteo'] = array('skn'=>array()); | ||
29 | $this->_view->display('no-result', $searchData); | 46 | $this->_view->display('no-result', $searchData); |
30 | exit; | 47 | exit; |
31 | } | 48 | } |
@@ -68,6 +68,15 @@ class PayController extends WebAction | @@ -68,6 +68,15 @@ class PayController extends WebAction | ||
68 | $this->setSimpleHeader(); | 68 | $this->setSimpleHeader(); |
69 | $this->_view->display($view, array( | 69 | $this->_view->display($view, array( |
70 | 'shoppingpay' =>$data, | 70 | 'shoppingpay' =>$data, |
71 | + 'pinyou' => array( | ||
72 | + 'orderNum' => $data['orderNum'], | ||
73 | + 'count' => $data['count'], | ||
74 | + 'productList' => $data['pinyouGoods'] | ||
75 | + ), | ||
76 | + 'criteo' => array(// criteo统计代码有关数据 | ||
77 | + 'orderNum' => $data['orderNum'], | ||
78 | + 'items' => $data['orderGoods'] | ||
79 | + ), | ||
71 | 'payPage' => true | 80 | 'payPage' => true |
72 | )); | 81 | )); |
73 | } | 82 | } |
-
Please register or login to post a comment