广告位格式调整

@@ -1097,12 +1097,15 @@ class HelperSearch
 
 
                 $pattern = "/[img|IMG].*?src=['|\"](.*?(?:[.gif|.jpg]))['|\"].*?[\/]?>/";
                 $pattern = "/[img|IMG].*?src=['|\"](.*?(?:[.gif|.jpg]))['|\"].*?[\/]?>/";
                 preg_match_all($pattern,$string,$img);
                 preg_match_all($pattern,$string,$img);
-                
-                foreach($href[1] as $key=>$vo){
-                        $result[$key]['href'] = $vo;
-                        $result[$key]['src'] = $img[1][$key];
+                foreach($img[1] as $key=>$vo){
+                    if(strrchr($vo, '.swf') == '.swf'){
+                        $result[$key]['isVedio'] = true;
+                        $result[$key]['src'] = $vo;
+                    }else{
+                        $result[$key]['href'] = $href[1][$key];
+                        $result[$key]['src'] = $vo;
+                    }
                 }
                 }
-                
                return $result;
                return $result;
             }
             }
     }
     }

@@ -47,6 +47,7 @@ class IndexController extends WebAction
         $options['brandNameCn'] = isset($result['brandNameCn']) ? $result['brandNameCn'] : '';
         $options['brandNameCn'] = isset($result['brandNameCn']) ? $result['brandNameCn'] : '';
         $options['reviewNum'] = 6;
         $options['reviewNum'] = 6;
         $options['controller'] = $this->_request->controller;
         $options['controller'] = $this->_request->controller;
+        $options['action'] = $this->_request->action;
         
         
         //调用模型获得数据
         //调用模型获得数据
         $data = BrandsModel::getBrandSearchData($condition, $options);
         $data = BrandsModel::getBrandSearchData($condition, $options);
@@ -92,6 +93,7 @@ class IndexController extends WebAction
         $options['brandBanner'] = isset($result['brandBanner']) ? $result['brandBanner'] : '';
         $options['brandBanner'] = isset($result['brandBanner']) ? $result['brandBanner'] : '';
         $options['brandAbout'] = isset($result['brandAbout']) ? $result['brandAbout'] : '';
         $options['brandAbout'] = isset($result['brandAbout']) ? $result['brandAbout'] : '';
         $options['controller'] = $this->_request->controller;
         $options['controller'] = $this->_request->controller;
+        $options['action'] = $this->_request->action;
         //调用模型获得数据
         //调用模型获得数据
         $data = Product\BrandsModel::getBrandIntro($condition, $options);
         $data = Product\BrandsModel::getBrandIntro($condition, $options);
         
         

@@ -13,7 +13,8 @@ class ListController extends WebAction
         $options = array(
         $options = array(
             'positionId' => $positionId,
             'positionId' => $positionId,
             'reviewNum' => 6,
             'reviewNum' => 6,
-            'controller' => $this->_request->controller
+            'controller' => $this->_request->controller,
+            'action' => $this->_request->action
         );
         );
         
         
         $indexData = Product\IndexModel::getIndexData($condition, $options);
         $indexData = Product\IndexModel::getIndexData($condition, $options);
@@ -43,7 +44,8 @@ class ListController extends WebAction
         $data = array(
         $data = array(
             'productListPage' => true,
             'productListPage' => true,
             'newSale' => $newData,
             'newSale' => $newData,
-            'controller' => $this->_request->controller
+            'controller' => $this->_request->controller,
+            'action' => $this->_request->action
         );
         );
         $this->setWebNavHeader();
         $this->setWebNavHeader();
         //渲染模板
         //渲染模板
@@ -61,7 +63,8 @@ class ListController extends WebAction
             //初始化js
             //初始化js
             'productListPage' => true,
             'productListPage' => true,
             'list' => $list,
             'list' => $list,
-            'controller' => $this->_request->controller
+            'controller' => $this->_request->controller,
+            'action' => $this->_request->action
         );
         );
         $this->setWebNavHeader();
         $this->setWebNavHeader();
         $this->_view->display('list', $data);
         $this->_view->display('list', $data);

@@ -41,6 +41,7 @@ class SaleController extends WebAction
         
         
         $options = array(
         $options = array(
             'controller' => $this->_request->controller,
             'controller' => $this->_request->controller,
+            'action' => $this->_request->action,
             'reviewNum' => 6
             'reviewNum' => 6
         );
         );