Merge branch 'feature/cart' of http://git.yoho.cn/fe/yohobuywap-node into feature/cart

@@ -3,7 +3,7 @@
  * @Author: Targaryen
  * @Author: Targaryen
  * @Date: 2017-01-04 15:17:51
  * @Date: 2017-01-04 15:17:51
  * @Last Modified by: Targaryen
  * @Last Modified by: Targaryen
- * @Last Modified time: 2017-01-10 16:43:54
+ * @Last Modified time: 2017-01-17 16:02:22
  */
  */
 
 
 'use strict';
 'use strict';

@@ -53,6 +53,10 @@ const _getOthersBuy2 = (param) => {
 
 
 // 订单信息
 // 订单信息
 const _getOtherDetail = (param) => {
 const _getOtherDetail = (param) => {
+    if (!param.uid || !param.orderCode) {
+        return Promise.resolve({});
+    }
+
     return api.get('', {
     return api.get('', {
         method: 'app.SpaceOrders.detail',
         method: 'app.SpaceOrders.detail',
         uid: param.uid,
         uid: param.uid,

@@ -307,7 +307,7 @@ function submitOrder() {
                 // 货到付款的进入订单页面
                 // 货到付款的进入订单页面
                 url = '/home/orderDetail?order_code=' + res.data.order_code;
                 url = '/home/orderDetail?order_code=' + res.data.order_code;
             } else {
             } else {
-                url = '/cart/index/new/pay?order_code=' + res.data.order_code;
+                url = '/home/orders/paynew?order_code=' + res.data.order_code;
             }
             }
 
 
             /* tar add 161116 */
             /* tar add 161116 */

@@ -249,6 +249,7 @@
         line-height: 100px;
         line-height: 100px;
         font-size: 28px;
         font-size: 28px;
         padding-left: 4%;
         padding-left: 4%;
+        z-index: 3;
 
 
         span {
         span {
             color: #f00;
             color: #f00;