Authored by 毕凯

对接 收货地址

@@ -3,12 +3,11 @@ @@ -3,12 +3,11 @@
3 * @author: bikai<kai.bi@yoho.cn> 3 * @author: bikai<kai.bi@yoho.cn>
4 * @date: 2015/12/14 4 * @date: 2015/12/14
5 */ 5 */
6 -var info = window.cookie('order-info'),  
7 - orderInfo; 6 +var info = window.cookie('order-info');
8 7
9 // info 必须是 JSON 字符串 8 // info 必须是 JSON 字符串
10 try { 9 try {
11 - info = JSON.parse(orderInfo); 10 + info = JSON.parse(info);
12 } catch (e) { 11 } catch (e) {
13 info = {}; 12 info = {};
14 } 13 }
@@ -149,7 +149,7 @@ class ShoppingCartController extends AbstractAction @@ -149,7 +149,7 @@ class ShoppingCartController extends AbstractAction
149 $this->setNavHeader('购物车'); 149 $this->setNavHeader('购物车');
150 150
151 $cartType = $this->post('cartType', 'ordinary'); 151 $cartType = $this->post('cartType', 'ordinary');
152 - $cookieData = $this->getCookie('orderInfo', null); 152 + $cookieData = $this->getCookie('order-info', null);
153 $uid = $this->getUid(true); 153 $uid = $this->getUid(true);
154 $data = array( 154 $data = array(
155 'orderEnsurePage' => true, 155 'orderEnsurePage' => true,