fe / YOHOBUYWAP · Commits

Go to a project

Authored by 郝肖肖
Commit 29d0d067584cfb94dfcb3becac74363fba6c68a4 2 parents 4b48080d 8af40c77

Merge branch 'hotfix/wapCat' into beta/wap

Inline Side-by-side
Showing 2 changed files with 2 additions and 2 deletions
@@ -347,7 +347,7 @@ function phoneHidden(phone) { @@ -347,7 +347,7 @@ function phoneHidden(phone) {
347 347
348 $('.info-phone').html(phoneHidden($('.info-phone').html())); 348 $('.info-phone').html(phoneHidden($('.info-phone').html()));
349 349
350 -if (orderInfo('address').is_support === 'N') { 350 +if (orderInfo('address') && orderInfo('address').is_support === 'N') {
351 orderInfo('deliveryId', $('.delivery-id .icon-cb-radio').data('id')); 351 orderInfo('deliveryId', $('.delivery-id .icon-cb-radio').data('id'));
352 orderCompute(); 352 orderCompute();
353 } 353 }
@@ -368,7 +368,7 @@ class CartModel @@ -368,7 +368,7 @@ class CartModel
368 368
369 // cookie保存的数据 369 // cookie保存的数据
370 if (!empty($orderInfo)) { 370 if (!empty($orderInfo)) {
371 - 371 + $orderInfo['paymentType'] = isset($orderInfo['paymentType']) ? $orderInfo['paymentType'] : '';
372 $orderCompute = self::orderCompute($uid, $cartType, $orderInfo['deliveryId'], $orderInfo['paymentType'], $orderInfo['couponCode'], $orderInfo['yohoCoin'], $skuList); 372 $orderCompute = self::orderCompute($uid, $cartType, $orderInfo['deliveryId'], $orderInfo['paymentType'], $orderInfo['couponCode'], $orderInfo['yohoCoin'], $skuList);
373 } 373 }
374 // 根据地址id查询地址信息 374 // 根据地址id查询地址信息