Authored by 周少峰

Merge branch 'hotfix/shopPrice'

@@ -86,16 +86,20 @@ class ShopModel @@ -86,16 +86,20 @@ class ShopModel
86 )); 86 ));
87 87
88 foreach ($proList as $prod) { 88 foreach ($proList as $prod) {
89 - $coverList[$prod['skn']] = $prod['thumb']; 89 + $coverList[$prod['skn']] = array('img'=>$prod['thumb'], 'price' => $prod['salePrice'], 'title' => $prod['name']);
90 } 90 }
91 foreach ($data['newArrivel']['list'] as &$v) { 91 foreach ($data['newArrivel']['list'] as &$v) {
92 if (isset($coverList[$v['productSkn']])) { 92 if (isset($coverList[$v['productSkn']])) {
93 - $v['img'] = $coverList[$v['productSkn']]; 93 + $v['img'] = $coverList[$v['productSkn']]['img'];
  94 + $v['price'] = $coverList[$v['productSkn']]['price'];
  95 + $v['title'] = $coverList[$v['productSkn']]['title'];
94 } 96 }
95 } 97 }
96 foreach ($data['hotSingle']['list'] as &$v) { 98 foreach ($data['hotSingle']['list'] as &$v) {
97 if (isset($coverList[$v['productSkn']])) { 99 if (isset($coverList[$v['productSkn']])) {
98 - $v['img'] = $coverList[$v['productSkn']]; 100 + $v['img'] = $coverList[$v['productSkn']]['img'];
  101 + $v['price'] = $coverList[$v['productSkn']]['price'];
  102 + $v['title'] = $coverList[$v['productSkn']]['title'];
99 } 103 }
100 } 104 }
101 } 105 }