Merge branch 'hotfix/analysis' of http://git.dev.yoho.cn/web/yohobuy into hotfix/analysis

@@ -231,10 +231,19 @@ class IndexController extends WebAction
         if (empty($orderEnsure)) {
         if (empty($orderEnsure)) {
             $this->go(Helpers::url('/shopping/cart'));
             $this->go(Helpers::url('/shopping/cart'));
         }
         }
-        
+
+        $productListArr = array();
+        foreach ($orderEnsure['orderProducts'] as $orderProducts) {
+            $productListArr[] = $orderProducts['id'] . ',' . $orderProducts['productNum'];
+        }
+
         $this->_view->display('order-ensure', array(
         $this->_view->display('order-ensure', array(
             'orderEnsurePage' => true, 
             'orderEnsurePage' => true, 
             'orderEnsure' => $orderEnsure,
             'orderEnsure' => $orderEnsure,
+            'pinyou' => array(
+                'money' => $orderEnsure['lastOrderAmount'],
+                'productList' => implode(';', $productListArr)
+            )
         ));
         ));
     }
     }
     
     

@@ -11,13 +11,25 @@ class SearchController extends WebAction
 
 
         $this->setWebNavHeader();
         $this->setWebNavHeader();
 
 
+        $list = SearchModel::searchData(array(), array(
+        'controller' => 'Search',
+        'action' => 'index',
+        'reviewNum' => 7, //浏览记录数
+        ));
+
+        //统计前三个商品
+        $skn=array();
+        if (isset($list['goods']) && !empty($list['goods'])) {
+            $arr = array_slice($list['goods'],0,3);
+            foreach ($arr as $key=>$value) {
+                $skn[] = $value['skn'];
+            }
+        }
+
         $data = array(
         $data = array(
             'productListPage' => true, //初始化js
             'productListPage' => true, //初始化js
-            'list' => SearchModel::searchData(array(), array(
-                'controller' => 'Search',
-                'action' => 'index',
-                'reviewNum' => 7, //浏览记录数
-            ))
+            'list' => $list,
+            'skn' => $skn
         );
         );
         $data['list']['searchPage'] = true; //设置搜素页面标识，区分列表页-->特有的搜索页导航样式
         $data['list']['searchPage'] = true; //设置搜素页面标识，区分列表页-->特有的搜索页导航样式
         if (isset($data['list']['goods']) && empty($data['list']['goods'])) {
         if (isset($data['list']['goods']) && empty($data['list']['goods'])) {