Merge branch 'release/5.3' into gray

@@ -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

 var $ = require('jquery');
-require('../../common');
+require('../common');
 
 //支付结果埋点
 setTimeout(function() {

 {
   "name": "yohobuy",
-  "version": "5.3.0",
+  "version": "5.3.1",
   "description": "yohobuy statics",
   "keywords": [],
   "homepage": "",

@@ -436,6 +436,6 @@
 {{/if}}
 {{#if payBackPage}}
 <script>
-    seajs.use('js/product/pay-back');
+    seajs.use('js/cart/pay-back');
 </script>
 {{/if}}

@@ -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';

@@ -50,7 +50,7 @@ application.template.ext = ".phtml"
 application.assets.path = ROOT_PATH "/assets"
 
 ; 应用的版本号
-application.version = "5.3.0"
+application.version = "5.3.1"
 
 ; 网站SEO信息
 application.seo.title = "Yoho!Buy有货 | 潮流购物逛不停"

@@ -50,7 +50,7 @@ application.template.ext = ".phtml"
 application.assets.path = ROOT_PATH "/assets"
 
 ; 应用的版本号
-application.version = "5.3.0"
+application.version = "5.3.1"
 
 ; 网站SEO信息
 application.seo.title = "Yoho!Buy有货 | 潮流购物逛不停"

@@ -50,7 +50,7 @@ application.template.ext = ".phtml"
 application.assets.path = ROOT_PATH "/assets"
 
 ; 应用的版本号
-application.version = "5.3.0"
+application.version = "5.3.1"
 
 ; 网站SEO信息
 application.seo.title = "Yoho!Buy有货 | 潮流购物逛不停"

@@ -50,7 +50,7 @@ application.template.ext = ".phtml"
 application.assets.path = ROOT_PATH "/assets"
 
 ; 应用的版本号
-application.version = "5.3.0"
+application.version = "5.3.1"
 
 ; 网站SEO信息
 application.seo.title = "Yoho!Buy有货 | 潮流购物逛不停"