Authored by Rock Zhang

Merge branch 'feature/cart' of git.dev.yoho.cn:web/yohobuy into feature/cart

framework @ 75bbc3b0
1 -Subproject commit e9d066dd88a8e7e37103021c427a205a5cfcdcec 1 +Subproject commit 75bbc3b075de19f239532f60c5995d06c5f814e2
@@ -35,12 +35,13 @@ function getProductInfo(skn, promotionId) { @@ -35,12 +35,13 @@ function getProductInfo(skn, promotionId) {
35 tip.show('网络错误'); 35 tip.show('网络错误');
36 return; 36 return;
37 } 37 }
38 - console.log(res);  
39 if (!panelTmpl) { 38 if (!panelTmpl) {
40 return; 39 return;
41 } 40 }
42 if (res.code === 200) { 41 if (res.code === 200) {
43 - $chosePanel.html(panelTmpl(res.data)); 42 + $chosePanel.html(panelTmpl({
  43 + cartInfo: res.data
  44 + }));
44 chosePanel.show(); 45 chosePanel.show();
45 } else { 46 } else {
46 tip.show(res.message || '网络错误'); 47 tip.show(res.message || '网络错误');