Merge branch 'stabble' of iqiyoo:zhuishuyun_wap into stabble

app/Http/Controllers/Wap/Web/WelcomeController.php

@@ -107,7 +107,7 @@ class WelcomeController extends BaseController
         $cpc_channel = '';
         if($adTargetId){
             $cpc_channel = Redis::hget('channel:setting:'.$this->distribution_channel_id,'cpc_channel');
-            if(!$cpc_channel) $cpc_channel = 'zw001';
+            if(!$cpc_channel) $cpc_channel = env('CPC_DEFAULT_CHANNEL','zw005');
         }
         //广告frame
         $is_show_ad_frame_setting = env('IS_SHOW_AD_FRAME_SETTING', '123');