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

@@ -88,7 +88,9 @@ exports.orderEnsure = (req, res, next) => {
         let viewData = {
             orderEnsurePage: true,
             isOrdinaryCart: cartType !== 'advance',
-            orderEnsure: order,
+            orderEnsure: _.assign(order, {
+                isOrdinaryCart: cartType !== 'advance'
+            }),
             userMobile: mobile,
             pageHeader: headerData,
             pageFooter: false,

@@ -72,7 +72,7 @@ exports.orderComputeAPI = (uid, cartType, deliveWay, paymentType, couponCode, yo
     let param = {
         method: activityInfo ? 'app.Shopping.easyCompute' : 'app.Shopping.compute',
         cart_type: cartType,
-        delive_way: deliveWay,
+        delivery_way: deliveWay,
         payment_type: paymentType,
         uid: uid
     };