zhaojs
2023-07-25 b2c0b7efb1c7cd1c909178715ae76a4b9793cf5a
no message
已修改5个文件
65 ■■■■■ 文件已修改
application/admin/model/Banner.php 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
application/api/controller/Activity.php 38 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
application/api/logic/ActivityInfo.php 20 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
application/api/logic/Banner.php 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
public/assets/js/backend/banner.js 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
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()
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;
            }
        }
    }
}
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;
    }
}
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){
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},