From 57c0f6736d10bb627b30fd13705c7738e26cc7fc Mon Sep 17 00:00:00 2001
From: chenzhi <chenzhi063@qq.com>
Date: Mon, 11 Oct 2021 17:13:28 +0800
Subject: [PATCH 1/7] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=8E=A8=E5=B9=BF?=
 =?UTF-8?q?=E5=90=8E=E5=8F=B0=E5=85=AC=E5=91=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../PromoteNoticeController.class.php         | 26 ++++++
 .../Admin/View/PromoteNotice/edit.html        | 87 +++++++++++++++++++
 .../Controller/PromoteController.class.php    | 10 ++-
 .../Home/View/default/Promote/index.html      | 53 +++++++++--
 4 files changed, 170 insertions(+), 6 deletions(-)
 create mode 100644 Application/Admin/Controller/PromoteNoticeController.class.php
 create mode 100644 Application/Admin/View/PromoteNotice/edit.html

diff --git a/Application/Admin/Controller/PromoteNoticeController.class.php b/Application/Admin/Controller/PromoteNoticeController.class.php
new file mode 100644
index 000000000..8fa3c526d
--- /dev/null
+++ b/Application/Admin/Controller/PromoteNoticeController.class.php
@@ -0,0 +1,26 @@
+<?php
+
+namespace Admin\Controller;
+use Think\Model;
+
+/**
+ * 推广后台公告
+ */
+class PromoteNoticeController extends ThinkController
+{
+    public function edit()
+    {
+        $data = M("promote_notice","tab_")->find();
+        $this->assign('data',$data);
+        $this->display();
+    }
+
+    public function doEdit()
+    {
+        $res = M("promote_notice","tab_")->save($_REQUEST);
+        if(!$res){
+            $this->ajaxReturn(["status"=>0,"msg"=>"保存失败"]);
+        }
+        $this->ajaxReturn(["status"=>1,"msg"=>"修改并保存成功"]);
+    }
+}
diff --git a/Application/Admin/View/PromoteNotice/edit.html b/Application/Admin/View/PromoteNotice/edit.html
new file mode 100644
index 000000000..a4d663dcf
--- /dev/null
+++ b/Application/Admin/View/PromoteNotice/edit.html
@@ -0,0 +1,87 @@
+<extend name="Public/base" />
+
+<block name="body">
+    <script src="__STATIC__/layer/layer.js" type="text/javascript"></script>
+    <script src="__STATIC__/layer/extend/layer.ext.js" type="text/javascript"></script>
+    <link rel="stylesheet" href="__STATIC__/kindeditor/default/default.css" />
+    <script charset="utf-8" src="__STATIC__/kindeditor/kindeditor-min.js"></script>
+    <script charset="utf-8" src="__STATIC__/kindeditor/zh_CN.js"></script>
+    <!-- 标签页导航 -->
+    <div class="cf main-place top_nav_list navtab_list">
+        <h3 class="page_title">推广后台公告</h3>
+        <p class="description_text">说明：设置推广后台公告。</p>
+    </div>
+    <div class="tab-content tabcon1711">
+        <!-- 表单 -->
+            <!-- 基础 -->
+            <div id="tab1" class="tab-pane in tab1">
+                <table  border="0" cellspacing="0" cellpadding="0">
+                    <tr >
+                        <td class="l noticeinfo">是否开启:</td>
+                        <td class="r table_radio table_radio2">
+                        <span class="table_btn">
+                             <label>
+                                 <input type="radio" class="inp_radio" value="1" name="is_open" <if condition="$data['is_open'] eq 1"> checked</if>> 是
+                             </label>
+                             <label style="margin-left: 50px;">
+                                 <input type="radio" class="inp_radio" value="0" name="is_open" <if condition="$data['is_open'] eq 0"> checked</if> > 否
+                             </label></span>
+                        </td>
+                    </tr>
+                    <tr style="height: 50px;"></tr>
+                    <tr>
+                        <td class="l">公告内容：</td>
+                        <td class="r">
+                            <textarea name="content" id="content" class="txt_area">{$data['content']}</textarea>
+                        </td>
+                    </tr>
+                </table>
+            </div>
+            <div class="form-item cf">
+                <input type="hidden" name="id" value="{$data['id']}" />
+                <button class="submit_btn" style="margin-left:210px;">
+                    保存
+                </button>
+            </div>
+    </div>
+    
+
+</block>
+<block name="script">
+    <script type="text/javascript">
+        highlight_subnav("{:U('edit')}");
+        KindEditor.ready(function(K) {
+            var options = {
+                filterMode : true,
+                width : '700px',
+                height:'600px'
+            };
+            var editor = K.create('textarea[name="content"]', options);
+            $('.submit_btn').on("click",function(){
+                editor.sync();
+                var senddata = {
+                    id:$("input[name='id']").val(),
+                    is_open:$("input[type='radio']:checked").val(),
+                    content:$("#content").val()
+                }
+                $.ajax({
+                    type: "POST",
+                    url: "{:U('doEdit')}",
+                    dataType: 'json',
+                    data: senddata,
+                    success:function(data){
+                        if(data.status==1){
+                            layer.msg("<font style='color:white'>" + data.msg + "</font>");
+                            setTimeout(function(){
+                                window.location.reload();
+                            },1500);
+                        }else{
+                            layer.msg("<font style='color:white'>" + data.msg + "</font>");
+                            return false;
+                        }
+                    }
+                });
+            })
+        })
+        </script>
+</block>
diff --git a/Application/Home/Controller/PromoteController.class.php b/Application/Home/Controller/PromoteController.class.php
index c54ea9248..17c6c7adc 100644
--- a/Application/Home/Controller/PromoteController.class.php
+++ b/Application/Home/Controller/PromoteController.class.php
@@ -298,9 +298,17 @@ class PromoteController extends BaseController
         $this->assign("tips",$tips);
         $this->assign("message",$message);
         $this->meta_title = "首页";
+        //首页公告
+        $this->getIndexTip();
         $this->display();
     }
-
+    public function getIndexTip()
+    {
+        $data = M("promote_notice","tab_")->where("is_open = 1")->getField('content');
+        if($data){
+            $this->assign('index_tip',$data);
+        }
+    }
     public function popRuleDetail($id=0, $p=1, $row=1, $force=false, $pop = false)
     {
         $promoteBelong = M('promote', 'tab_')->where(['id'=>get_pid()])->getField('company_belong');
diff --git a/Application/Home/View/default/Promote/index.html b/Application/Home/View/default/Promote/index.html
index 718ea9b7f..b46351e03 100644
--- a/Application/Home/View/default/Promote/index.html
+++ b/Application/Home/View/default/Promote/index.html
@@ -3,6 +3,10 @@
     <link href="__CSS__/index/index.new.css" rel="stylesheet" >
 </block>
 <block name="body">
+    <script type="text/javascript" src="__JS__/jquery.min.js"></script>
+    <script type="text/javascript" src="__JS__/index/jquery.fxTab.js"></script>
+    <script type="text/javascript" src="__JS__/20170831/select2.min.js"></script>
+    <script src="__STATIC__/js.cookie.min.js" type="text/javascript"></script>
     <div class="page-overview promote-index-overview index-overview clearfix poll">
         <?php if($canViewUserRecharge):?>
         <ul>
@@ -209,12 +213,51 @@
                 {$_page}
             </div>
         </div>
-    </div>.
-    <script type="text/javascript" src="__JS__/jquery.min.js"></script>
-    <script type="text/javascript" src="__JS__/index/jquery.fxTab.js"></script>
-    <script type="text/javascript" src="__JS__/20170831/select2.min.js"></script>
-    <script>
+    </div>
+    <notempty name="index_tip">
+        <div id="TestingTipShow" style="display: none;">
+            <div style="width: 100vw;height:100%;padding: 0;position: absolute;top: 0;z-index: 9999;background-color:rgba(0,0,0,.6);margin: -1.9%;">
+                <div class="layui-layer  layui-layer-hui" style="width:800px;height:auto;z-index: 19891015; top:18%; left:50%;margin-left: -400px;border-radius: 2%;background-color:white;color: #0a001f;">
+                    <div style="padding: 15px 30px 15px 20px;font-size: 18px;text-align: center;border-bottom: 1px dashed #999;">系统公告</div>
+                    <div style="padding: 5px 25px;height: auto;max-height: 500px;overflow-x:hidden;overflow-y:auto">
+                        {$index_tip}
+                    </div>
+                    <div style="text-align: right;margin-top: 20px;margin-right: 30px;padding-bottom: 55px;">
+                            <div class="form-group normal_space fr">
+                                <input type="button" id="closeTip" class="submit" value="关闭">
+                            </div>
+                            <div class="form-group normal_space fr">
+                                <input type="button" id="ignoreTip" class="submit" value="今日不再提醒" style="background-color: #fff;border: 1px solid #333;color: #333;">
+                            </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+        <script>
+            var d = new Date();
+            var cookieKey = 'promote-notice-ignore-'+d.getFullYear()+"-"+(d.getMonth()-0+1)+"-"+d.getDate();
+
+            var isIgnore = Cookies.get(cookieKey);
+			if(!isIgnore){
+				$("#TestingTipShow").show();
+			}
+
+            $("#closeTip").on("click",function(){
+                $("#TestingTipShow").hide();
+            })
+            $("#ignoreTip").on("click",function(){
+                Cookies.set(cookieKey, 1, { expires: 2 });
+                $("#TestingTipShow").hide();
+            })
+
+        </script>
+        
 
+
+     </notempty>
+	
+   
+    <script>
         var pop_ids = {$match_rules_id};
         var match_rules_route ={$match_rules_route};
         var pop_time = {$pop_time1};

From 08f4769c58d6752464f1bab5dd414581a3fa8e1c Mon Sep 17 00:00:00 2001
From: chenzhi <chenzhi063@qq.com>
Date: Thu, 21 Oct 2021 15:05:38 +0800
Subject: [PATCH 2/7] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=94=AF=E4=BB=98?=
 =?UTF-8?q?=E8=AE=A2=E5=8D=95=E6=9F=A5=E7=9C=8B=EF=BC=8C=E9=BB=98=E8=AE=A4?=
 =?UTF-8?q?=E6=94=AF=E4=BB=98=E6=88=90=E5=8A=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controller/ExportController.class.php     | 27 +++++++++++++------
 .../Controller/SpendController.class.php      | 17 ++++++++----
 Application/Admin/View/Spend/lists.html       |  6 ++---
 3 files changed, 34 insertions(+), 16 deletions(-)

diff --git a/Application/Admin/Controller/ExportController.class.php b/Application/Admin/Controller/ExportController.class.php
index 68fe07c75..0a375e21c 100644
--- a/Application/Admin/Controller/ExportController.class.php
+++ b/Application/Admin/Controller/ExportController.class.php
@@ -1084,10 +1084,18 @@ class ExportController extends Controller
             case 7:
                 $startDate = empty($_REQUEST['timestart']) ? date('Y-m-d', strtotime('-6 day', time())) : $_REQUEST['timestart'];
                 $endDate = empty($_REQUEST['timeend']) ? date('Y-m-d') : $_REQUEST['timeend'];
+                $payStatus = isset($_REQUEST['pay_status']) ? $_REQUEST['pay_status'] : 1;
 
                 $startTime = strtotime($startDate);
                 $endTime = strtotime($endDate) + 86399;
-                $map['pay_time'] = array('BETWEEN', array($startTime, $endTime));
+
+                if($payStatus > 0){
+                    $map['pay_time'] = array('BETWEEN', array($startTime, $endTime));
+                }else{
+                    $map['spend_time'] = array('BETWEEN', array($startTime, $endTime));
+                }
+                $map['pay_status'] = $payStatus;
+
                 $is_sub_data = I("issubdata",0);
                 if($is_sub_data  == 1){
                     $SpendModel = M("spend","tab_",SUBSITE_DB);
@@ -1129,10 +1137,7 @@ class ExportController extends Controller
                     $map['extend'] = array('like', trim($_REQUEST['extend']));
                     unset($_REQUEST['extend']);
                 }
-                if (isset($_REQUEST['pay_status'])) {
-                    $map['pay_status'] = $_REQUEST['pay_status'];
-                    unset($_REQUEST['pay_status']);
-                }
+  
                 if (isset($_REQUEST['pay_way'])) {
                     if ($_REQUEST['pay_way'] == 2) {
                         $map['pay_way'] = ['in', '2,3,4'];
@@ -1205,9 +1210,11 @@ class ExportController extends Controller
                 //     $map1 = $map;
                 // }
                 D("Spend")->addSubsiteWhere($map);
-                $map1 = $map;
-                $map1['pay_status'] = 1;
-                $total = $SpendModel->where($map1)->sum('pay_amount');
+                if($payStatus > 0){
+                    $map1 = $map;
+                    $map1['pay_status'] = 1;
+                    $total = $SpendModel->where($map1)->sum('pay_amount');
+                }
 //                var_dump($total);die();
                 $total=$total?$total:0;
 
@@ -1253,6 +1260,7 @@ class ExportController extends Controller
 
                 $xlsCell = array_values($headers);
                 $fields = array_keys($headers);
+                $fields[] = "spend_time";
                 // ----获取游戏的基本信息begin
                 //获取游戏公司
                 $cpCompanyDb = M("partner","tab_")->field("id,partner")->order("id asc")->select();
@@ -1313,6 +1321,9 @@ class ExportController extends Controller
 
                     foreach($xlsData as $value) {
                         //游戏信息匹配
+                        if(!$value['pay_time']) $value['pay_time'] = $value['spend_time'];
+                        unset($value['spend_time']);
+
                         $thisGameInfo =  $gameInfo[$value["game_id"]];
                         $value['game_name'] =$thisGameInfo['relation_game_name'];
                         $value['sdk_version'] = $value['sdk_version'] == 1 ? "安卓" : "苹果";
diff --git a/Application/Admin/Controller/SpendController.class.php b/Application/Admin/Controller/SpendController.class.php
index 6992f84ac..a680fc63c 100644
--- a/Application/Admin/Controller/SpendController.class.php
+++ b/Application/Admin/Controller/SpendController.class.php
@@ -17,10 +17,18 @@ class SpendController extends ThinkController
     {
         $startDate = empty($_REQUEST['timestart']) ? date('Y-m-d', strtotime('-6 day', time())) : $_REQUEST['timestart'];
         $endDate = empty($_REQUEST['timeend']) ? date('Y-m-d') : $_REQUEST['timeend'];
+        $payStatus = isset($_REQUEST['pay_status']) ? $_REQUEST['pay_status'] : 1;
 
         $startTime = strtotime($startDate);
         $endTime = strtotime($endDate) + 86399;
-        $map['pay_time'] = array('BETWEEN', array($startTime, $endTime));
+
+        if($payStatus > 0){
+            $map['pay_time'] = array('BETWEEN', array($startTime, $endTime));
+        }else{
+            $map['spend_time'] = array('BETWEEN', array($startTime, $endTime));
+        }
+        
+        $map['pay_status'] = $payStatus;
 
         unset($_REQUEST['timestart']);
         unset($_REQUEST['timeend']);
@@ -64,10 +72,7 @@ class SpendController extends ThinkController
             $map['extend'] = array('like', trim($_REQUEST['extend']));
             unset($_REQUEST['extend']);
         }
-        if (isset($_REQUEST['pay_status'])) {
-            $map['pay_status'] = $_REQUEST['pay_status'];
-            unset($_REQUEST['pay_status']);
-        }
+        
         if (isset($_REQUEST['pay_way'])) {
             if ($_REQUEST['pay_way'] == 2) {
                 $map['pay_way'] = ['in', '2,3,4'];
@@ -155,6 +160,7 @@ class SpendController extends ThinkController
                 $game_arr = explode("(", rtrim($value['game_name'], ")"));
                 $value['game_name'] = $game_arr[0];
                 $value['sdk_version_name'] = $game_arr[1];
+                if(!$value['pay_time']) $value['pay_time'] = $value['spend_time'];
             }
         }
         
@@ -168,6 +174,7 @@ class SpendController extends ThinkController
         $this->assign('marketAdmins', getMarketAdmins());
         $this->assign('startDate', $startDate);
         $this->assign('endDate', $endDate);
+        $this->assign('payStatus', $payStatus);
         $this->assign('list_data', $data['data']);
         $this->assign('_page', $data['page']);
         $show_data_power = (is_administrator()|| session('user_auth')['show_data']);
diff --git a/Application/Admin/View/Spend/lists.html b/Application/Admin/View/Spend/lists.html
index a7c9a6043..604c7c1db 100644
--- a/Application/Admin/View/Spend/lists.html
+++ b/Application/Admin/View/Spend/lists.html
@@ -124,9 +124,9 @@
             </div>
             <div class="input-list search_item input-list-orderstatus">
                 <select name="pay_status" style="color:#444" class="select_gallery" id="sel_order">
-                    <option value="">订单状态</option>
-                    <option value="1">充值成功</option>
-                    <option value="0">下单未付款</option>
+                    <!-- <option value="">订单状态</option> -->
+                    <option value="1" <?php echo $payStatus == 1 ? "selected" : ''?>>充值成功</option>
+                    <option value="0" <?php echo $payStatus == 0 ? "selected" : ''?>>下单未付款</option>
                 </select>
             </div>
             <div class="input-list">

From 409653ac8e0a84af7d9ed7c656a0bd6fc5f135b1 Mon Sep 17 00:00:00 2001
From: chenzhi <chenzhi063@qq.com>
Date: Thu, 21 Oct 2021 15:10:37 +0800
Subject: [PATCH 3/7] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=85=85=E5=80=BC?=
 =?UTF-8?q?=E6=88=90=E5=8A=9F=E6=B1=87=E6=80=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Admin/Controller/SpendController.class.php        | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/Application/Admin/Controller/SpendController.class.php b/Application/Admin/Controller/SpendController.class.php
index a680fc63c..25b7fd15a 100644
--- a/Application/Admin/Controller/SpendController.class.php
+++ b/Application/Admin/Controller/SpendController.class.php
@@ -137,11 +137,14 @@ class SpendController extends ThinkController
         // }
         $this->checkListOrCountAuthRestMap($map,["extend", "pay_order_number", "user_account"]);
         D("Spend")->addSubsiteWhere($map);
-
-        $map1 = $map;
-        $map1['pay_status'] = 1;
-        $total = null_to_0(M(self::model_name,"tab_")->where($map1)->sum('pay_amount'));
+        if ($payStatus > 0) {
+            $map1 = $map;
+            $map1['pay_status'] = 1;
+            $total = null_to_0(M(self::model_name, "tab_")->where($map1)->sum('pay_amount'));
+        }
+        $total=$total?$total:0;
         $this->assign('total', $total);
+
         $this->meta_title = $this->m_title = '游戏充值';
         $this->assign('commonset', M('Kuaijieicon')->where(['url' => 'Spend/lists', 'status' => 1])->find());
         

From a331d874a9cad09e05d331659556ea0040cc99b3 Mon Sep 17 00:00:00 2001
From: chenzhi <chenzhi063@qq.com>
Date: Mon, 25 Oct 2021 19:51:04 +0800
Subject: [PATCH 4/7] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=B4=A2=E5=8A=A1?=
 =?UTF-8?q?=E6=B1=87=E6=80=BB=E6=94=AF=E4=BB=98=E6=B8=A0=E9=81=93=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E9=94=99=E4=B9=B1=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Admin/Controller/FinancialSummaryController.class.php       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Application/Admin/Controller/FinancialSummaryController.class.php b/Application/Admin/Controller/FinancialSummaryController.class.php
index 0998a121f..68c8dfdeb 100644
--- a/Application/Admin/Controller/FinancialSummaryController.class.php
+++ b/Application/Admin/Controller/FinancialSummaryController.class.php
@@ -71,7 +71,7 @@ class FinancialSummaryController extends AdminController
 
         $merchant_data = M("payment_merchant","tab_")
             ->field("identifier,name")
-            ->where(['status'=>1,'type'=>1])
+            ->where(['type'=>1])
             ->select();
 
         //将商户插入到默认数组中

From 903c3abba0a7036a397eea4009a4463f39a734f8 Mon Sep 17 00:00:00 2001
From: chenzhi <chenzhi063@qq.com>
Date: Thu, 28 Oct 2021 11:11:48 +0800
Subject: [PATCH 5/7] =?UTF-8?q?=E5=B8=82=E5=9C=BA=E9=83=A8=E9=9A=90?=
 =?UTF-8?q?=E8=97=8F=E5=95=86=E6=88=B7=E6=9F=A5=E7=9C=8B=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Application/Admin/Common/extend.php           |  4 ++--
 .../FinancePromoteController.class.php        | 22 ++++++++++---------
 .../Controller/SpendController.class.php      |  1 +
 3 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/Application/Admin/Common/extend.php b/Application/Admin/Common/extend.php
index be718fc64..7b6de2193 100644
--- a/Application/Admin/Common/extend.php
+++ b/Application/Admin/Common/extend.php
@@ -3286,9 +3286,9 @@ function getCpCompanySelect($type = 1){
  * @return mixed
  */
 function getMerchantList($type = 1){
+    if(A('Market','Event')->getConfig('isMarket')) return [];
 
     $data = M("payment_merchant","tab_")->field("id,name,ways")->select();
-
     return $data;
 }
 
@@ -3299,9 +3299,9 @@ function getMerchantList($type = 1){
  * @return mixed
  */
 function getMerchantName($id = 1){
+    if(A('Market','Event')->getConfig('isMarket')) return '--';
 
     $data = M("payment_merchant","tab_")->field("name")->where(['id'=>$id])->find();
-
     return $data['name']?$data['name']:'无';
 }
 
diff --git a/Application/Admin/Controller/FinancePromoteController.class.php b/Application/Admin/Controller/FinancePromoteController.class.php
index 07f2b68e3..a9078a5d7 100644
--- a/Application/Admin/Controller/FinancePromoteController.class.php
+++ b/Application/Admin/Controller/FinancePromoteController.class.php
@@ -894,19 +894,21 @@ class FinancePromoteController extends AdminController
             $marketAdmins = getAdminUsernameList($marketAdminIds);
             $adminDepartments = getAdminDepartmentList($marketAdminIds);
         }
-
-        $merchant_data = M("payment_merchant","tab_")
-            ->field("id,name")
-            ->where("1=1")
-            ->select();
-        $handle_merchant = [];
-
-        foreach ($merchant_data as $key => $value) {
-            $handle_merchant[$value['id']] = $value['name'];
+        $isMarketAdmin = A('Market','Event')->getConfig('isMarket');
+        if(!$isMarketAdmin){
+            $merchant_data = M("payment_merchant","tab_")
+                ->field("id,name")
+                ->where("1=1")
+                ->select();
+            $handle_merchant = [];
+
+            foreach ($merchant_data as $key => $value) {
+                $handle_merchant[$value['id']] = $value['name'];
+            }
         }
 
         foreach($data as $key => $value) {
-            $data[$key]['merchant_name'] = $handle_merchant[$value['merchant_id']];
+            $data[$key]['merchant_name'] = $isMarketAdmin ? "--" : $handle_merchant[$value['merchant_id']];
             $data[$key]['pay_way'] = getPayType($value['pay_way']);
             $data[$key]['game_name'] =clearGameNameType($data[$key]['game_name']);
             $data[$key]['sdk_version'] =getGameTypeName($data[$key]['sdk_version']);
diff --git a/Application/Admin/Controller/SpendController.class.php b/Application/Admin/Controller/SpendController.class.php
index 25b7fd15a..48daf740b 100644
--- a/Application/Admin/Controller/SpendController.class.php
+++ b/Application/Admin/Controller/SpendController.class.php
@@ -149,6 +149,7 @@ class SpendController extends ThinkController
         $this->assign('commonset', M('Kuaijieicon')->where(['url' => 'Spend/lists', 'status' => 1])->find());
         
         $data = D(self::model_name)->lists($_GET["p"], $map, $order);
+        // dd($data);
         if (!empty($data['data'])) {
             $adminIds = array_column($data['data'], 'market_admin_id');
             $adminUsernameList = getAdminUsernameList($adminIds);

From ca6b51e1a84aada41d390f5ed5b9f7a8706c1cb7 Mon Sep 17 00:00:00 2001
From: chenzhi <chenzhi063@qq.com>
Date: Thu, 28 Oct 2021 14:20:59 +0800
Subject: [PATCH 6/7] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=8F=9C=E5=8D=95?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Public/Admin/css/style.css | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Public/Admin/css/style.css b/Public/Admin/css/style.css
index de74ba5b3..f37a46fcb 100644
--- a/Public/Admin/css/style.css
+++ b/Public/Admin/css/style.css
@@ -293,6 +293,8 @@ background-color:#3F97C9;
     
     
     background-color:#F0F9FD;
+    max-height: 400px;
+    overflow-y: scroll;
 }
 .side-sub-menu > li {
     position: relative;

From 5c3fcaf9957016865bff527f9dc53f0234d8ae77 Mon Sep 17 00:00:00 2001
From: chenzhi <chenzhi063@qq.com>
Date: Thu, 28 Oct 2021 14:30:52 +0800
Subject: [PATCH 7/7] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Public/Admin/css/style.css | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/Public/Admin/css/style.css b/Public/Admin/css/style.css
index f37a46fcb..03f518c21 100644
--- a/Public/Admin/css/style.css
+++ b/Public/Admin/css/style.css
@@ -294,7 +294,21 @@ background-color:#3F97C9;
     
     background-color:#F0F9FD;
     max-height: 400px;
-    overflow-y: scroll;
+    overflow: auto;
+}
+::-webkit-scrollbar {
+    width: 12px;
+    height: 12px;
+}
+::-webkit-scrollbar-corner {
+    background-color: transparent;
+}
+::-webkit-scrollbar-thumb {
+    height: 6px;
+    border-radius: 7px;
+    border: 3px solid transparent;
+    background-color: #ddd;
+    background-clip: padding-box;
 }
 .side-sub-menu > li {
     position: relative;