From b2c0b7efb1c7cd1c909178715ae76a4b9793cf5a Mon Sep 17 00:00:00 2001
From: zhaojs <349234519@qq.com>
Date: 星期二, 25 七月 2023 10:51:45 +0800
Subject: [PATCH] no message
---
application/api/logic/Banner.php | 3 +
application/api/logic/ActivityInfo.php | 20 ++++++++++
application/admin/model/Banner.php | 2
application/api/controller/Activity.php | 38 +++++++++++++++++++
public/assets/js/backend/banner.js | 2
5 files changed, 62 insertions(+), 3 deletions(-)
diff --git a/application/admin/model/Banner.php b/application/admin/model/Banner.php
index ccf294f..abdae87 100644
--- a/application/admin/model/Banner.php
+++ b/application/admin/model/Banner.php
@@ -44,7 +44,7 @@
public function getTypeList()
{
- return ['0' => __('Type 0'), '1' => __('Type 1'), '2' => __('Type 2'), '3' => __('Type 3'), '4' => __('Type 4'), '5' => __('Type 5'), '6' => __('Type 6'), '7' => __('Type 7'),'9' => '鏂颁汉鏁欑▼','10'=>'閫涢��','11'=>'app棣栭〉灏忚疆鎾�','12'=>'棣栭〉杩炴爣','13'=>'app棣栭〉蹇嵎涓�','14'=>'app棣栭〉蹇嵎涓�','15'=>'app鍚姩椤�','16'=>'娣樺疂杩斿埄杞挱','17'=>'浜笢杩斿埄杞挱','18'=>'鎶栭煶杩斿埄杞挱','19'=>'鎷煎澶氳繑鍒╄疆鎾�','20'=>'鍞搧浼氳繑鍒╄疆鎾�'];
+ return ['0' => __('Type 0'), '1' => __('Type 1'), '2' => __('Type 2'), '3' => __('Type 3'), '4' => __('Type 4'), '5' => __('Type 5'), '6' => __('Type 6'), '7' => __('Type 7'),'9' => '鏂颁汉鏁欑▼','10'=>'閫涢��','11'=>'app棣栭〉灏忚疆鎾�','12'=>'棣栭〉杩炴爣','13'=>'app棣栭〉蹇嵎涓�','14'=>'app棣栭〉蹇嵎涓�','15'=>'app鍚姩椤�','16'=>'娣樺疂杩斿埄杞挱','17'=>'浜笢杩斿埄杞挱','18'=>'鎶栭煶杩斿埄杞挱','19'=>'鎷煎澶氳繑鍒╄疆鎾�','20'=>'鍞搧浼氳繑鍒╄疆鎾�','21'=>'鑷畾涔夐椤靛脊绐�'];
}
public function getStatusList()
diff --git a/application/api/controller/Activity.php b/application/api/controller/Activity.php
index 6b0be8c..7ffab56 100644
--- a/application/api/controller/Activity.php
+++ b/application/api/controller/Activity.php
@@ -6,6 +6,7 @@
use app\api\logic\taoke\device\Haodanku;
use app\common\model\FqbCate;
use app\api\logic\taoke\device\Jd as LogicJd;
+use app\api\logic\Banner as LogicBanner;
use app\api\logic\ActivityInfo as ActInfo;
@@ -255,4 +256,41 @@
$user = $this->auth->getUser();
$this->success('鑾峰彇鎴愬姛',$user->invitation_code);
}
+
+
+ /**
+ * 鑾峰彇鑷畾涔夊脊绐�
+ *
+ */
+ public function getCustomizePopup()
+ {
+ $LogicBanner = new LogicBanner();
+ $list = $LogicBanner->getList(21);
+ if(!$list||$list['customizePop']==null||count($list['customizePop'])==0)
+ {
+ $this->success('鑾峰彇鎴愬姛',[]);
+ }
+ $user = $this->auth->getUser();
+ $actInfo=new ActInfo();
+ foreach ($list['customizePop'] as $vaule) {
+ $paraJson=json_encode($vaule->parameter_json);
+ $popupType=$paraJson['cmark'];
+ $isPop=false;
+ switch($popupType)
+ {
+ case 'freebuy'://0鍏冭喘寮圭獥
+ $isPop=$actInfo->popupcus_freebuy($user);
+ break;
+ default:
+ break;
+ }
+ if($isPop)
+ {
+ $this->success('鑾峰彇鎴愬姛',$vaule);
+ break;
+ }
+ }
+ }
+
+
}
\ No newline at end of file
diff --git a/application/api/logic/ActivityInfo.php b/application/api/logic/ActivityInfo.php
index 88801da..b09270d 100644
--- a/application/api/logic/ActivityInfo.php
+++ b/application/api/logic/ActivityInfo.php
@@ -6,6 +6,8 @@
use think\Db;
use app\common\model\User as ModelUser;
use app\api\logic\SettlementRecord as LogicSettlementRecord;
+use app\api\logic\UserBrowse as LogicUserBrowse;
+
class ActivityInfo extends BasicLogic
{
@@ -254,4 +256,22 @@
return $maxReward;
}
+ /**
+ * 鑷畾涔夊脊绐�-0鍏冭喘
+ */
+ public function popupcus_freebuy($userInfo)
+ {
+ $LogicUserBrowse = new LogicUserBrowse();
+ $res = $LogicUserBrowse->checkIsFirstFree($userInfo->id);
+ if($res === false)
+ {
+ return false;
+ }
+ if(empty($res))
+ {
+ return true;
+ }
+ return false;
+ }
+
}
\ No newline at end of file
diff --git a/application/api/logic/Banner.php b/application/api/logic/Banner.php
index d1fc61a..1de8cfc 100644
--- a/application/api/logic/Banner.php
+++ b/application/api/logic/Banner.php
@@ -10,7 +10,7 @@
class Banner extends BasicLogic
{
- const BANNER_TYPE = ['1'=>'topBannerList','3'=>'singleLineList','4'=>'doubleLineList','5'=>'bottomBannerList','7' => 'popBannerList','11'=>'popBannerSList','12'=>'indexbanner','13'=>'enterTop','14'=>'enterDown','15'=>'launchpic','16'=>'tmImg','17'=>'jdImg','18'=>'dyImg','19'=>'pddImg','20'=>'wphImg'];
+ const BANNER_TYPE = ['1'=>'topBannerList','3'=>'singleLineList','4'=>'doubleLineList','5'=>'bottomBannerList','7' => 'popBannerList','11'=>'popBannerSList','12'=>'indexbanner','13'=>'enterTop','14'=>'enterDown','15'=>'launchpic','16'=>'tmImg','17'=>'jdImg','18'=>'dyImg','19'=>'pddImg','20'=>'wphImg','21'=>'customizePop'];
public function __construct()
{
@@ -47,6 +47,7 @@
'dyImg'=>[],
'pddImg'=>[],
'wphImg'=>[],
+ 'customizePop'=>[],
];
if(count($type_arr) > 1){
foreach($list as $item){
diff --git a/public/assets/js/backend/banner.js b/public/assets/js/backend/banner.js
index 1e027ea..dc89045 100644
--- a/public/assets/js/backend/banner.js
+++ b/public/assets/js/backend/banner.js
@@ -28,7 +28,7 @@
{checkbox: true},
{field: 'id', title: __('Id')},
{field: 'name', title: __('Name'), operate: 'LIKE'},
- {field: 'type', title: __('Type'), searchList: {"0":__('Type 0'),"1":__('Type 1'),"2":__('Type 2'),"3":__('Type 3'),"4":__('Type 4'),"5":__('Type 5'),"6":__('Type 6'),"7":__('Type 7'),"9":"鏂颁汉鏁欑▼","10":'閫涢��',"11":'app棣栭〉灏忚疆鎾�',"12":'棣栭〉杩炴爣',"13":'app棣栭〉蹇嵎涓�',"14":"app棣栭〉蹇嵎涓�","15":"app鍚姩椤�","16":"娣樺疂杩斿埄杞挱","17":"浜笢杩斿埄杞挱","18":"鎶栭煶杩斿埄杞挱","19":"鎷煎澶氳繑鍒╄疆鎾�","20":"鍞搧浼氳繑鍒╄疆鎾�"}, formatter: Table.api.formatter.normal},
+ {field: 'type', title: __('Type'), searchList: {"0":__('Type 0'),"1":__('Type 1'),"2":__('Type 2'),"3":__('Type 3'),"4":__('Type 4'),"5":__('Type 5'),"6":__('Type 6'),"7":__('Type 7'),"9":"鏂颁汉鏁欑▼","10":'閫涢��',"11":'app棣栭〉灏忚疆鎾�',"12":'棣栭〉杩炴爣',"13":'app棣栭〉蹇嵎涓�',"14":"app棣栭〉蹇嵎涓�","15":"app鍚姩椤�","16":"娣樺疂杩斿埄杞挱","17":"浜笢杩斿埄杞挱","18":"鎶栭煶杩斿埄杞挱","19":"鎷煎澶氳繑鍒╄疆鎾�","20":"鍞搧浼氳繑鍒╄疆鎾�","21":"鑷畾涔夐椤靛脊绐�"}, formatter: Table.api.formatter.normal},
{field: 'image', title: __('Image'), operate: false, events: Table.api.events.image, formatter: Table.api.formatter.image},
{field: 'colour', title: __('Colour'), operate: 'LIKE'},
{field: 'url_type', title: __('Url_type'), searchList: {"0":__('Url_type 0'),"1":__('Url_type 1'),"2":__('Url_type 2'),"3":__('Url_type 3'),"7":__('Url_type 7'),"11":__('Url_type 11'),"12":__('Url_type 12'),"13":__('Url_type 13'),"14":__('Url_type 14'),"999":'涓嶈烦杞�'}, formatter: Table.api.formatter.normal},
--
Gitblit v1.9.3