1

app/JsonRpc/WebsiteService.php

@@ -493,15 +493,8 @@ class WebsiteService implements WebsiteServiceInterface
         if(empty($ad_place)){
             return Result::error("error",0);
         }else{
-<<<<<<< HEAD
-            $adplaceid = [];
-            foreach($ad_place as $val){
-                $adplaceid = $val;
-            }
-=======
             $adplaceid = $ad_place['id'];
             //查找有没有广告
->>>>>>> web_sannong_fr
             $ad=Ad::where('pid',$adplaceid['id'])->where('status',1)->orderBy('id','asc')->get();
             if(empty($ad)){
                 //若没有生效的广告，则显示默认的缩略图