From 8ef7c192cec4a8d6fd806c82a1215e99cc4b6b94 Mon Sep 17 00:00:00 2001
From: Targaryen <chengyao.guo@yoho.cn>
Date: Tue, 20 Dec 2016 18:30:32 +0800
Subject: [PATCH] pay-result-modified
---
static/js/cart/entry.js | 1 +
static/js/cart/pay-back.js | 18 ++++++++++++++++++
static/js/product/pay-back.js | 18 ------------------
template/m.yohobuy.com/partials/layout/use.phtml | 2 +-
yohobuy/m.yohobuy.com/application/modules/Shopping/controllers/Pay.php | 4 ++--
5 files changed, 22 insertions(+), 21 deletions(-)
create mode 100644 static/js/cart/pay-back.js
delete mode 100644 static/js/product/pay-back.js
diff --git a/static/js/cart/entry.js b/static/js/cart/entry.js
index 664fcd3..5c4233c 100644
--- a/static/js/cart/entry.js
+++ b/static/js/cart/entry.js
@@ -11,3 +11,4 @@ require('./invoice-info');
require('./select-coupon');
require('./select-address');
require('./jit-detail');
+require('./pay-back');
\ No newline at end of file
diff --git a/static/js/cart/pay-back.js b/static/js/cart/pay-back.js
new file mode 100644
index 0000000..694250a
--- /dev/null
+++ b/static/js/cart/pay-back.js
@@ -0,0 +1,18 @@
+var $ = require('jquery');
+require('../common');
+
+//支付结果埋点
+setTimeout(function() {
+ if (window._yas && window._yas.sendCustomInfo) {
+ window._yas.sendCustomInfo({
+ op: 'YB_SC_PAY_RES',
+ param: JSON.stringify({
+ C_ID: window._ChannelVary[cookie('_Channel')],
+ ORDER_CODE: $('.order-code').val(),
+ PAY_RES: $('.pay-back').val(),
+ PAY_AMOUNT: $('.pay-amount').val(),
+ PAY_STYLE: '支付宝'
+ })
+ }, true);
+ }
+}, 200);
diff --git a/static/js/product/pay-back.js b/static/js/product/pay-back.js
deleted file mode 100644
index d5d1e7a..0000000
--- a/static/js/product/pay-back.js
+++ /dev/null
@@ -1,18 +0,0 @@
-var $ = require('jquery');
-require('../../common');
-
-//支付结果埋点
-setTimeout(function() {
- if (window._yas && window._yas.sendCustomInfo) {
- window._yas.sendCustomInfo({
- op: 'YB_SC_PAY_RES',
- param: JSON.stringify({
- C_ID: window._ChannelVary[cookie('_Channel')],
- ORDER_CODE: $('.order-code').val(),
- PAY_RES: $('.pay-back').val(),
- PAY_AMOUNT: $('.pay-amount').val(),
- PAY_STYLE: '支付宝'
- })
- }, true);
- }
-}, 200);
diff --git a/template/m.yohobuy.com/partials/layout/use.phtml b/template/m.yohobuy.com/partials/layout/use.phtml
index 4d4a83f..6aede95 100644
--- a/template/m.yohobuy.com/partials/layout/use.phtml
+++ b/template/m.yohobuy.com/partials/layout/use.phtml
@@ -436,6 +436,6 @@
{{/if}}
{{#if payBackPage}}
<script>
- seajs.use('js/product/pay-back');
+ seajs.use('js/cart/pay-back');
</script>
{{/if}}
diff --git a/yohobuy/m.yohobuy.com/application/modules/Shopping/controllers/Pay.php b/yohobuy/m.yohobuy.com/application/modules/Shopping/controllers/Pay.php
index 47c56e4..da6d85a 100644
--- a/yohobuy/m.yohobuy.com/application/modules/Shopping/controllers/Pay.php
+++ b/yohobuy/m.yohobuy.com/application/modules/Shopping/controllers/Pay.php
@@ -234,7 +234,7 @@ class PayController extends AbstractAction
$this->setNavHeader('支付中心', Helpers::url('/home/orders'), false);
$view = 'notneedpay';
- if ($payResult->payResult == 200) {
+ if ($payResult->payResult === 200) {
$view = 'index';
if (!empty($payResult->orderCode)) {
$orderCode = $payResult->orderCode;
@@ -247,7 +247,7 @@ class PayController extends AbstractAction
$payOrderCode = $payResult->orderCode;
$payAmount = $payResult->totalFee;
- if ($view = 'notneedpay') {
+ if ($view === 'notneedpay') {
$payBack = 'failure';
} else {
$payBack = 'success';
--
libgit2 0.24.0