Merge branch 'master' of http://git.9026.com/wesley/furniture

app/Http/Controllers/Api/V1/FurnitureController.php

@@ -151,8 +151,10 @@ class FurnitureController extends Controller
         //顶部菜单栏
         $menus = AlbumNavModel::where([['store_id', $store_id], ['state', 1]])->orderByDesc('sort')->get();
 
-
-        return $this->api(compact('setting', 'banner', 'navbar', 'menus'));
+        $conf = AlbumManufacturerModel::where('store_id',$request->get('store_id'))->first();
+        $getPhone = $conf->getPhone;
+        $getFocus = $conf->getFocus;
+        return $this->api(compact('setting', 'banner', 'navbar', 'menus','getFocus'));
     }