From 8dcfae4fff98fbbb19ff46bd9750f25bc56801a9 Mon Sep 17 00:00:00 2001
From: zhaojs <349234519@qq.com>
Date: 星期一, 31 七月 2023 10:42:20 +0800
Subject: [PATCH] Merge branch 'release/v1.1.5发布'
---
application/api/controller/Activity.php | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/application/api/controller/Activity.php b/application/api/controller/Activity.php
index 7ffab56..a39bc4a 100644
--- a/application/api/controller/Activity.php
+++ b/application/api/controller/Activity.php
@@ -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]);
}
--
Gitblit v1.9.3