fe / YOHOBUYWAP · Commits

Go to a project

Authored by 郭成尧
Commit 580c247f6448df6947ebb242fbfdf3eac06f6e2e 2 parents f08da89a 7425ada2

Merge branch 'release/5.3' into gray

Inline Side-by-side
Showing 15 changed files with 10 additions and 9 deletions
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
@@ -11,3 +11,4 @@ require('./invoice-info'); @@ -11,3 +11,4 @@ require('./invoice-info');
11 require('./select-coupon'); 11 require('./select-coupon');
12 require('./select-address'); 12 require('./select-address');
13 require('./jit-detail'); 13 require('./jit-detail');
  14 +require('./pay-back');
1 var $ = require('jquery'); 1 var $ = require('jquery');
2 -require('../../common'); 2 +require('../common');
3 3
4 //支付结果埋点 4 //支付结果埋点
5 setTimeout(function() { 5 setTimeout(function() {
1 { 1 {
2 "name": "yohobuy", 2 "name": "yohobuy",
3 - "version": "5.3.0", 3 + "version": "5.3.1",
4 "description": "yohobuy statics", 4 "description": "yohobuy statics",
5 "keywords": [], 5 "keywords": [],
6 "homepage": "", 6 "homepage": "",
@@ -436,6 +436,6 @@ @@ -436,6 +436,6 @@
436 {{/if}} 436 {{/if}}
437 {{#if payBackPage}} 437 {{#if payBackPage}}
438 <script> 438 <script>
439 - seajs.use('js/product/pay-back'); 439 + seajs.use('js/cart/pay-back');
440 </script> 440 </script>
441 {{/if}} 441 {{/if}}
@@ -234,7 +234,7 @@ class PayController extends AbstractAction @@ -234,7 +234,7 @@ class PayController extends AbstractAction
234 $this->setNavHeader('支付中心', Helpers::url('/home/orders'), false); 234 $this->setNavHeader('支付中心', Helpers::url('/home/orders'), false);
235 235
236 $view = 'notneedpay'; 236 $view = 'notneedpay';
237 - if ($payResult->payResult == 200) { 237 + if ($payResult->payResult === 200) {
238 $view = 'index'; 238 $view = 'index';
239 if (!empty($payResult->orderCode)) { 239 if (!empty($payResult->orderCode)) {
240 $orderCode = $payResult->orderCode; 240 $orderCode = $payResult->orderCode;
@@ -247,7 +247,7 @@ class PayController extends AbstractAction @@ -247,7 +247,7 @@ class PayController extends AbstractAction
247 $payOrderCode = $payResult->orderCode; 247 $payOrderCode = $payResult->orderCode;
248 $payAmount = $payResult->totalFee; 248 $payAmount = $payResult->totalFee;
249 249
250 - if ($view = 'notneedpay') { 250 + if ($view === 'notneedpay') {
251 $payBack = 'failure'; 251 $payBack = 'failure';
252 } else { 252 } else {
253 $payBack = 'success'; 253 $payBack = 'success';
@@ -50,7 +50,7 @@ application.template.ext = ".phtml" @@ -50,7 +50,7 @@ application.template.ext = ".phtml"
50 application.assets.path = ROOT_PATH "/assets" 50 application.assets.path = ROOT_PATH "/assets"
51 51
52 ; 应用的版本号 52 ; 应用的版本号
53 -application.version = "5.3.0" 53 +application.version = "5.3.1"
54 54
55 ; 网站SEO信息 55 ; 网站SEO信息
56 application.seo.title = "Yoho!Buy有货 | 潮流购物逛不停" 56 application.seo.title = "Yoho!Buy有货 | 潮流购物逛不停"
@@ -50,7 +50,7 @@ application.template.ext = ".phtml" @@ -50,7 +50,7 @@ application.template.ext = ".phtml"
50 application.assets.path = ROOT_PATH "/assets" 50 application.assets.path = ROOT_PATH "/assets"
51 51
52 ; 应用的版本号 52 ; 应用的版本号
53 -application.version = "5.3.0" 53 +application.version = "5.3.1"
54 54
55 ; 网站SEO信息 55 ; 网站SEO信息
56 application.seo.title = "Yoho!Buy有货 | 潮流购物逛不停" 56 application.seo.title = "Yoho!Buy有货 | 潮流购物逛不停"
@@ -50,7 +50,7 @@ application.template.ext = ".phtml" @@ -50,7 +50,7 @@ application.template.ext = ".phtml"
50 application.assets.path = ROOT_PATH "/assets" 50 application.assets.path = ROOT_PATH "/assets"
51 51
52 ; 应用的版本号 52 ; 应用的版本号
53 -application.version = "5.3.0" 53 +application.version = "5.3.1"
54 54
55 ; 网站SEO信息 55 ; 网站SEO信息
56 application.seo.title = "Yoho!Buy有货 | 潮流购物逛不停" 56 application.seo.title = "Yoho!Buy有货 | 潮流购物逛不停"
@@ -50,7 +50,7 @@ application.template.ext = ".phtml" @@ -50,7 +50,7 @@ application.template.ext = ".phtml"
50 application.assets.path = ROOT_PATH "/assets" 50 application.assets.path = ROOT_PATH "/assets"
51 51
52 ; 应用的版本号 52 ; 应用的版本号
53 -application.version = "5.3.0" 53 +application.version = "5.3.1"
54 54
55 ; 网站SEO信息 55 ; 网站SEO信息
56 application.seo.title = "Yoho!Buy有货 | 潮流购物逛不停" 56 application.seo.title = "Yoho!Buy有货 | 潮流购物逛不停"