Merge branch 'master' into foundation

2017-06-14 16:13:33 +08:00
parent 931dc35d92 0255e79ae7
commit 42656b63f4
1 changed files with 4 additions and 1 deletions
@@ -345,7 +345,10 @@ class GoodController extends Controller
            $width = 1920;
        if($height > 1080)
            $height = 1080;
-        $file = Storage::get('good/titlepic/'.$good_id);
+        if (!Storage::exists('good/titlepic/'.$good_id))
+            $file = Storage::get('public/titlepic.jpg');
+        else
+            $file = Storage::get('good/titlepic/'.$good_id);
        $image = Image::make($file)->resize($width, $height);
        return $image->response('jpg');
    }