Merge branch 'hotfix/wapCat' into beta/wap

@@ -347,7 +347,7 @@ function phoneHidden(phone) {
 
 $('.info-phone').html(phoneHidden($('.info-phone').html()));
 
-if (orderInfo('address').is_support === 'N') {
+if (orderInfo('address') && orderInfo('address').is_support === 'N') {
     orderInfo('deliveryId', $('.delivery-id .icon-cb-radio').data('id'));
     orderCompute();
 }
\ No newline at end of file

@@ -368,7 +368,7 @@ class CartModel
 
             // cookie保存的数据
             if (!empty($orderInfo)) {
-
+                $orderInfo['paymentType'] = isset($orderInfo['paymentType']) ? $orderInfo['paymentType'] : '';
                 $orderCompute = self::orderCompute($uid, $cartType, $orderInfo['deliveryId'], $orderInfo['paymentType'], $orderInfo['couponCode'], $orderInfo['yohoCoin'], $skuList);
             }
             // 根据地址id查询地址信息