Merge remote-tracking branch 'origin/develop' into develop

application/api/controller/RoomAuction.php

@@ -32,7 +32,7 @@ class RoomAuction extends BaseCom
         //礼物不能是CP礼物
         $cp_gift_ids =  explode(',', get_system_config_value('cp_gift_id'));
         if (in_array($gift_id, $cp_gift_ids)) {
-            return ['code' => 0, 'msg' => '礼物不能是CP礼物，请重新选择', 'data' => null];
+            return V( 0,  '礼物不能是CP礼物，请重新选择');
         }
        $relation_id = input('relation_id','');
        $auction_type = input('auction_type',1);//1真爱拍  2 亲密拍

application/api/model/RoomAuction.php

@@ -54,8 +54,8 @@ class RoomAuction extends Model
             }
         }
         //查询房间是否正在拍卖
-        $auction = db::name('vs_room_auction')->where('room_id',$room_id)->where('status',2)->find();
-        if($auction){
+        $auctions = db::name('vs_room_auction')->where('room_id',$room_id)->where('status',2)->find();
+        if($auctions){
             return ['code' => 0, 'msg' => '房间正在竞拍中！请稍后继续','data' => null];
         }
         $user_ids = Cache::get('auction_user_'.$room_id);