fe / YOHOBUYPC · Commits

Go to a project

Authored by xuqi
Commit a0e27773d6493a1404aded21ca153fe93941a9b5 2 parents 100320f7 cd7b103a

Merge branch 'hotfix/analysis' of http://git.dev.yoho.cn/web/yohobuy into hotfix/analysis

Inline Side-by-side
Showing 5 changed files with 59 additions and 52 deletions
{{> layout/header}}
<div class="pay-notice-page yoho-page">
{{# payNotice}}
<h1>
<i class="ok-icon"></i>
<span class="font-red">恭喜您，购买完成！</span>
您已成功支付
<span class="font-red">{{pay}}</span>
元！
</h1>
<h1>
<i class="ok-icon"></i>
<span class="font-red">恭喜您，购买完成！</span>
您已成功支付
<span class="font-red">{{pay}}</span>
元！
</h1>
<div class="order-info">
<ul class="order-table-header table-row">
<li class="order-num">订单号</li>
<li>实际支付金额</li>
<li>支付方式</li>
<li>获得YOHO币</li>
<li>获得VIP累计金额</li>
</ul>
<ul class="table-row">
<li class="order-num">
<a class="notice-link" href="{{checkOrderUrl}}">{{orderNum}}</a>
</li>
<li class="pay font-red">{{pay}}</li>
<li class="pay-mode">{{payMode}}</li>
<li class="yoho-coin">
<em class="font-red">{{currency}}</em>
<a class="notice-link" href="{{yohoCoinUrl}}">YOHO币能做什么</a>
</li>
<li class="vip">
<em class="font-red">{{vipSum}}</em>
<a class="notice-link" href="{{vipUrl}}">查看VIP特权</a>
</li>
</ul>
</div>
<div class="order-info">
<ul class="order-table-header table-row">
<li class="order-num">订单号</li>
<li>实际支付金额</li>
<li>支付方式</li>
<li>获得YOHO币</li>
<li>获得VIP累计金额</li>
</ul>
<ul class="table-row">
<li class="order-num">
<a class="notice-link" href="{{checkOrderUrl}}">{{orderNum}}</a>
</li>
<li class="pay font-red">{{pay}}</li>
<li class="pay-mode">{{payMode}}</li>
<li class="yoho-coin">
<em class="font-red">{{currency}}</em>
<a class="notice-link" href="{{yohoCoinUrl}}">YOHO币能做什么</a>
</li>
<li class="vip">
<em class="font-red">{{vipSum}}</em>
<a class="notice-link" href="{{vipUrl}}">查看VIP特权</a>
</li>
</ul>
</div>
<div class="notice-tip">
1.每天15：00以前成功付款的订单将在当天发货，15：00-00：00成功付款的订单将在第二天发货。<br>
2.当订单发货后，您可以登录<a href="{{ordersUrl}}" class="notice-link" target="_blank">订单中心</a>查询快递发货详情。<br>
3.有货网支持"开箱验货"和"15天退换货保障"收货后请当面验货，如果发现商品有任何问题请致电客服电话400-889-9646，<a href="{{returnGoodsUrl}}" class="notice-link" target="_blank">退换货政策</a><br>
4.VIP金额的累计，将在您订单签收15天后积累到您的账户，请您知悉。<br>
5.购买商品及参与促销活动赠送的YOHO币，将在您订单签收7天后积累到您的账户，您可以在个人中心-我的YOHO币中查看。<br>
<b style="color:#c00;">6.尊敬的用户：近期为网络诈骗高发期，有货郑重声明，不会以任何形式索取客户的账户信息或引导转账，敬请提高警惕，谨防诈骗。</b>
</div>
<div class="notice-tip">
1.每天15：00以前成功付款的订单将在当天发货，15：00-00：00成功付款的订单将在第二天发货。<br>
2.当订单发货后，您可以登录<a href="{{ordersUrl}}" class="notice-link" target="_blank">订单中心</a>查询快递发货详情。<br>
3.有货网支持"开箱验货"和"15天退换货保障"收货后请当面验货，如果发现商品有任何问题请致电客服电话400-889-9646，<a href="{{returnGoodsUrl}}" class="notice-link"
target="_blank">退换货政策</a><br>
4.VIP金额的累计，将在您订单签收15天后积累到您的账户，请您知悉。<br>
5.购买商品及参与促销活动赠送的YOHO币，将在您订单签收7天后积累到您的账户，您可以在个人中心-我的YOHO币中查看。<br>
<b style="color:#c00;">6.尊敬的用户：近期为网络诈骗高发期，有货郑重声明，不会以任何形式索取客户的账户信息或引导转账，敬请提高警惕，谨防诈骗。</b>
</div>
<p class="btns">
<a class="check-order" href="{{checkOrderUrl}}">查看订单</a>
<a class="return-home" href="{{returnHomeUrl}}">返回首页</a>
</p>
<p class="btns">
<a class="check-order" href="{{checkOrderUrl}}">查看订单</a>
<a class="return-home" href="{{returnHomeUrl}}">返回首页</a>
</p>
{{#if devEnv}}
<img class="notice-img" src="http://webstatic.dev.yohobuy.com/img/pay/notice.jpg">
{{^}}
<img class="notice-img" src="http://cdn.yoho.cn/yohobuy/assets/img/pay/notice.jpg">
{{/if}}
{{#if devEnv}}
<img class="notice-img" src="http://webstatic.dev.yohobuy.com/img/pay/notice.jpg">
{{^}}
<img class="notice-img" src="http://cdn.yoho.cn/yohobuy/assets/img/pay/notice.jpg">
{{/if}}
{{/ payNotice}}
</div>
{{> pay/pay-analysis}}
... ...
... ... @@ -35,5 +35,4 @@
</div>
{{/ payData}}
</div>
{{> pay/pay-analysis}}
{{> layout/footer}}
\ No newline at end of file
... ...
... ... @@ -5,9 +5,9 @@ window.criteo_q = window.criteo_q || [];
window.criteo_q.push(
{ event: "setAccount", account: [16184] },
{ event: "setSiteType", type: "d" },
{ event: "trackTransaction" , id: "{{orderId}}", item: [
{ event: "trackTransaction" , id: "{{orderNum}}", item: [
{{#each items}}
{ id: "{{id}}", price: "{{price}}", quantity: "{{quantity}}"}
{ id: "{{order_id}}", price: "{{goods_price}}", quantity: "{{buy_number}}"}
{{#unless @last}}
,
{{/unless}}
... ...
... ... @@ -601,6 +601,7 @@ class PayModel
$result['data'] = array(
'pay' => $amount,
'orderNum' => $orderData['order_code'],
'items' => $orderData['order_goods'], // 订单商品
'checkOrderUrl' => Helpers::url('/home/orders/detail', array('orderCode' => $orderData['order_code'])),
'payMode' => ($orderData['payment_type'] == 1 ? '在线支付' : '货到付款'),
'currency' => $orderData['yoho_give_coin'],
... ...
... ... @@ -382,7 +382,13 @@ class NoticeController extends WebAction
if ($code == 200) {
$view = 'index';
$data = array('payNotice' => $dealResult['data']);
$data = array(
'payNotice' => $dealResult['data'],
'criteo' => array(// 统计代码有关数据
'orderNum' => $dealResult['data']['orderNum'],
'items' => $dealResult['data']['items']
)
);
}
//头部导航
... ...