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

application/api/controller/SingerSong.php

@@ -125,7 +125,7 @@ class SingerSong extends BaseCom
     public function singerSongList()
     {
         $page = input('page', 1);
-        $page_limit = input('page_limit', 30);
+        $page_limit = input('page_limit', 10);
         $room_id = input('room_id', 0);
         if (!$room_id) {
             return V(0, '请选择房间');

application/api/model/UserCp.php

@@ -99,13 +99,13 @@ class UserCp extends Model
             //创建cp任务
             //先查询她两用户有没有其他任务
             $tasks12 = Db::name('vs_user_cp_task')->where(['user_id' => $from_user_id,'delete_time' => 0])->select();
-            if(!$tasks12){
+            if($tasks12){
                 foreach ($tasks12 as $task){
                     db::name('vs_user_cp_task')->where(['id' => $task['id']])->update(['delete_time' => time()]);
                 }
             }
             $tasks13 = Db::name('vs_user_cp_task')->where(['user_id' => $to_user_id,'delete_time' => 0])->select();
-            if(!$tasks13){
+            if($tasks13){
                 foreach ($tasks13 as $task){
                     db::name('vs_user_cp_task')->where(['id' => $task['id']])->update(['delete_time' => time()]);
                 }