Merge branch 'gift'

app/Modules/Book/Services/BookGiftsService.php

@@ -131,7 +131,7 @@ class BookGiftsService
     }
 
     public static function chargeGiveGift($property,$price,$charge_type){
-        if(!$property) return [];
+        if(!$property) $property = 'none';
         $gift_info = [
             1=>['name_desc'=>'黄金玫瑰','cost'=>200,'icon'=>'https://yqcdn.iycdm.com/wap/present/20181016/3.png'],
             2=>['name_desc'=>'文学奖','cost'=>800,'icon'=>'https://yqcdn.iycdm.com/wap/present/20181016/5.png'],