Merge branch 'stabble'

app/Http/Controllers/Wap/Book/ChapterController.php

@@ -1331,7 +1331,7 @@ class ChapterController extends BaseController
             if($fee >45) $fee = 45;
         }*/
         if($fee <37) $fee = 37;
-        if($fee >50) $fee = 50;
+        if($fee >60) $fee = 60;
         return $fee;
     }
 

app/Http/Controllers/Wap/User/CoflController.php

@@ -625,11 +625,12 @@ class CoflController extends Controller
             'ACTIVE_GUIDE_PERSONAL_ACCOUNT_MAX_EVERY_UV');
         $img = empty($env_config[0])?'https://cdn-novel.iycdm.com/h5/personal_account/chenchen.jpg':$env_config[0];
         $max = empty($env_config[1])?100:$env_config[1];
+        $max = (int)$max;
         $one_loop_max = empty($env_config[3])?10:$env_config[3];
         $now_id = (int)$env_config[2];
         $uv = Redis::scard('active_guide_personal_uv');
         $personal_info = DB::table('personal_account_list')->where('id',$now_id)->select('count')->first();
-        $total_max = $personal_info->count+$uv;
+        $total_max = (int)($personal_info->count+$uv);
         //Log::info('$total_max is: '.);
         if($uv >= $one_loop_max || $total_max>=$max){
             if($total_max>=$max){