Merge branch 'feature/ordrEnsurOptmz' into release/5.3

@@ -28,7 +28,7 @@ $('.nav-back').on('touchend', function() {
         ['订单需要在2小时之内完成，', '放弃商品会被抢光哦！'],
         [
             {
-                href: '/home/orderdetail?order_code=' + theOrderCode,
+                href: 'javascript:history.go(-1);',
                 text: '放弃',
                 class: ''
             },

@@ -840,7 +840,7 @@ class CartModel
 
                 $result['buttons'] = array(
                     array(
-                        'href' => Helpers::url('/cart/index'),
+                        'href' => Helpers::url('/cart/index/index'),
                         'text' => '重新选择商品',
                     ),
                     array(