dfgApi.git - Gitblit

			@@ -265,7 +265,7 @@
			public function getCustomizePopup()
			{
			$LogicBanner = new LogicBanner();
			$list = $LogicBanner->getList(21);
			$list = $LogicBanner->getList('20,21');
			if(!$list\|\|$list['customizePop']==null\|\|count($list['customizePop'])==0)
			{
			$this->success('获取成功',[]);
			@@ -273,10 +273,9 @@
			$user = $this->auth->getUser();
			$actInfo=new ActInfo();
			foreach ($list['customizePop'] as $vaule) {
			$paraJson=json_encode($vaule->parameter_json);
			$popupType=$paraJson['cmark'];
			$paraJson=json_decode($vaule->note);
			$isPop=false;
			switch($popupType)
			switch($paraJson->poptype)
			{
			case 'freebuy'://0元购弹窗
			$isPop=$actInfo->popupcus_freebuy($user);
			@@ -286,10 +285,11 @@
			}
			if($isPop)
			{
			$this->success('获取成功',$vaule);
			$this->success('获取成功',['haspop'=>true,'info'=>$vaule]);
			break;
			}
			}
			$this->success('获取成功',['haspop'=>false]);
			}

			@@ -30,7 +30,7 @@
			$where['status'] = 1;
			$where['start_time'] = ['<=',time()];
			$where['end_time'] = ['>',time()];
			$list = $this->model->field('id,type,image,url_type,url,colour,parameter_json')->where($where)->whereIn('type',$type_arr)->order('sort desc')->select();
			$list = $this->model->field('id,type,image,url_type,url,colour,note,parameter_json')->where($where)->whereIn('type',$type_arr)->order('sort desc')->select();
			$return_data = [
			'topBannerList'=>[],
			'singleLineList'=>[],

	application/api/controller/Activity.php	10 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	application/api/logic/Banner.php	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史