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

application/api/controller/Ceshi.php

@@ -829,6 +829,13 @@ class Ceshi extends Controllers
             //数组末尾添加元素
             array_push($res, '房间盘删除失败！');
         }
+        $reslut76 = db::name('vs_gift_bag_receive_pan_log')->where('id','>',  0)->delete();
+        if($reslut76){
+            $i++ ;
+        }else{
+            //数组末尾添加元素
+            array_push($res, '礼物背包领取盘日志删除失败！');
+        }
 
         //数据提交
         db::commit();

application/api/controller/Page.php

@@ -33,7 +33,12 @@ class Page extends controller
     {
         $id = input('id', '');
         $reslut = model('Page')->get_page($id);
-        $html = $reslut['content'] ? $reslut['content'] : '';
+        if($reslut){
+            $html = $reslut['content'] ??'';
+        }else{
+            $html = '';
+        }
+
         //解析html
         $html = htmlspecialchars_decode($html);
         return $html;

application/api/model/RoomSong.php

@@ -77,6 +77,7 @@ class RoomSong extends Model
         }else{
             return ['code'=>0,'msg'=>'点歌中！请稍后再试！','data'=>null];
         }
+        return ['code'=>0,'msg'=>'系统繁忙！请稍后再试！','data'=>null];
     }