F

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

@@ -45,6 +45,7 @@ class WelcomeController extends BaseController
         if ($url) {
             return redirect()->to($url);
         }
+        $banners = [];//合并banner
         //site标题
         $title = $this->getSiteTitle($request);
         //客服图片
@@ -149,13 +150,35 @@ class WelcomeController extends BaseController
             'appad_banner'=>'',
             'appad_url'=>''
         ];
-        //无充值用户分享
+
-        $share_switch = 0;
-        $share_switch = ($this->appad())?1:0;
         //突出包年的充值页面
         $outstanding_year_order = $this->outstandingYearOrder();
         $pdd_ad = $this->pddAd();
 
+        //banner 合并
+        if($is_show_activity)
+        {
+            $banners[] = [
+                'img'=>$activity_img,
+                'jump_url'=>$url
+            ];
+        }
+        //pdd 广告用户--增加banner
+        if($pdd_ad)
+        {
+            $pdd_ads = Redis::get('pdd_ads');//pdd广告
+            if($pdd_ads)
+            {
+                foreach (json_decode($pdd_ads,true) as $_ad)
+                {
+                    $banners[] = [
+                        'img'=>$_ad['img'],
+                        'jump_url'=>$_ad['jump_url']
+                    ];
+                }
+            }
+        }
+
         //用户分割
         $this->userPproperty($user->openid);
         $options = json_encode([
@@ -196,10 +219,12 @@ class WelcomeController extends BaseController
             'appad_url'=>$add_ad_status['appad_url'],
             'outstanding_year_order'=>$outstanding_year_order,
             'share_domain'=>env('share_domain_url'),
-            'share_switch'=>$share_switch,
+            'share_switch'=>0,//无充值用户分享关闭
             'pdd_ad'=>$pdd_ad,
             'special_pay_template'=>$this->isMiWan(),  //米玩站点特殊充值页面
             'crm'=>$crm,
+            'self_pa_ad_switch'=>$adTargetId && $pdd_ad ? 1 : 0,//自有平台广告开关
+            'banners'=>$banners,
             'guidepersonalaccount'=>$this->guidePersonalAccount(),
             'cpc_channel'=>$cpc_channel
         ]);
@@ -2139,4 +2164,5 @@ class WelcomeController extends BaseController
             }
         }
     }
+
 }