Merge branch 'release/v1.1.5发布'

zhaojs

2023-07-31 8dcfae4fff98fbbb19ff46bd9750f25bc56801a9

 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()
    {
@@ -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'=>[],
@@ -47,6 +47,7 @@
            'dyImg'=>[],
            'pddImg'=>[],
            'wphImg'=>[],
            'customizePop'=>[],
        ];
        if(count($type_arr) > 1){
            foreach($list as $item){