Merge branch 'feature/mBrandShop' of http://git.dev.yoho.cn/web/yohobuywap into feature/mBrandShop

@@ -59,11 +59,10 @@
 
 
     .primary-level-trilangle{
     .primary-level-trilangle{
         float: right;
         float: right;
-        background: url('product/arrow.png');
-        margin-top: 14px;
-        width: 21px;
-        height: 60px;
-        background-repeat: no-repeat;
+        background: url(/product/arrow.png) no-repeat;
+        margin-top: 22px;
+        width: 20px;
+        height: 46px;
     }
     }
 
 
     .trilanglefont {
     .trilanglefont {

@@ -2,10 +2,9 @@
 
 
 use Action\AbstractAction;
 use Action\AbstractAction;
 use LibModels\Wap\Product\SaleData;
 use LibModels\Wap\Product\SaleData;
-use Plugin\Helpers;
 use LibModels\Wap\Product\ShopData;
 use LibModels\Wap\Product\ShopData;
+use Plugin\Helpers;
 use Product\ListModel;
 use Product\ListModel;
-use Plugin\Mobile;
 
 
 /**
 /**
  * 商品列表相关的控制器
  * 商品列表相关的控制器
@@ -376,7 +375,7 @@ class IndexController extends AbstractAction
         if($resource['code'] === 200){
         if($resource['code'] === 200){
             $result = ListModel::brandData($resource['data'],$requestData['shop_id']);
             $result = ListModel::brandData($resource['data'],$requestData['shop_id']);
         }
         }
-        if(Mobile::isMobile()){
+        if($this->isApp()){
             $this->setTitle('品牌');
             $this->setTitle('品牌');
         }else{
         }else{
             $this->setNavHeader('品牌', true, SITE_MAIN);
             $this->setNavHeader('品牌', true, SITE_MAIN);
@@ -405,7 +404,7 @@ class IndexController extends AbstractAction
         if ($resource['code'] === 200) {
         if ($resource['code'] === 200) {
             $result = ListModel::categoryData($resource['data'],$requestData['shop_id']);
             $result = ListModel::categoryData($resource['data'],$requestData['shop_id']);
         }
         }
-        if(Mobile::isMobile()){
+        if($this->isApp()){
             $this->setTitle('品类');
             $this->setTitle('品类');
         }else{
         }else{
             $this->setNavHeader('品类', true, SITE_MAIN);
             $this->setNavHeader('品类', true, SITE_MAIN);
@@ -434,7 +433,7 @@ class IndexController extends AbstractAction
         if ($resource['code'] === 200) {
         if ($resource['code'] === 200) {
             $result = ListModel::introData($resource['data']);
             $result = ListModel::introData($resource['data']);
         }
         }
-        if(Mobile::isMobile()){
+        if($this->isApp()){
             $this->setTitle('店铺简介');
             $this->setTitle('店铺简介');
         }else{
         }else{
             $this->setNavHeader('店铺简介', true, SITE_MAIN);
             $this->setNavHeader('店铺简介', true, SITE_MAIN);
@@ -470,6 +469,15 @@ class IndexController extends AbstractAction
     }
     }
 
 
     /**
     /**
+     * 判断是不是APP
+     *
+     * @return bool
+     */
+    public function isApp(){
+        return !empty($this->get('app_version'));
+    }
+
+    /**
      * 店铺上新
      * 店铺上新
      */
      */
     public function shopNewPro()
     public function shopNewPro()