From 164d0abd68fdd61130d2bd3b852c15b4bb7a9c2e Mon Sep 17 00:00:00 2001
From: wangxinglong <2371974647@qq.com>
Date: Thu, 23 Dec 2021 16:56:59 +0800
Subject: [PATCH] settter

---
 app/controller/api/Consumer.php            |  2 +-
 public/static/manager/js/bill.js           | 13 +++++++------
 public/static/manager/js/bill_deduction.js | 15 +++++++++------
 public/static/manager/js/bill_recharge.js  | 13 +++++++------
 4 files changed, 24 insertions(+), 19 deletions(-)

diff --git a/app/controller/api/Consumer.php b/app/controller/api/Consumer.php
index eec814d..0f32fff 100644
--- a/app/controller/api/Consumer.php
+++ b/app/controller/api/Consumer.php
@@ -62,7 +62,7 @@ class Consumer extends Base
             $whereMap[] = ['using_count', '>', 0];
 
             if (!empty($params['keyword'])) {
-                $whereMap[] = ['name', 'like', "%".$params['keyword']."%"];
+                $whereMap[] = ['name|business_name', 'like', "%".$params['keyword']."%"];
             }
             if ($params['businessType'] > 0) {
                 $whereMap[] = ['business_type', '=', $params['businessType']];
diff --git a/public/static/manager/js/bill.js b/public/static/manager/js/bill.js
index 1686032..8778c7c 100644
--- a/public/static/manager/js/bill.js
+++ b/public/static/manager/js/bill.js
@@ -70,7 +70,13 @@ layui.use(['laytpl', 'table', 'jquery', 'form', 'miniTab', 'xmSelect',"laydate"]
                         d.create_time,
                     ]
                 })
-                exportData=rdata
+                exportData=rdata;
+                $("#exports").on("click",function(){
+                    //console.log(exportData)
+                    table.exportFile(exportDataTitle,exportData, 'xls');
+                    return false;
+                })
+
             }
         });
 
@@ -97,11 +103,6 @@ layui.use(['laytpl', 'table', 'jquery', 'form', 'miniTab', 'xmSelect',"laydate"]
             ,type: 'datetime'
         });
 
-        $("#exports").on("click",function(){
-            //console.log(exportData)
-            table.exportFile(exportDataTitle,exportData, 'xls');
-            return false;
-        })
 
 
     }
diff --git a/public/static/manager/js/bill_deduction.js b/public/static/manager/js/bill_deduction.js
index 935bc90..cec2926 100644
--- a/public/static/manager/js/bill_deduction.js
+++ b/public/static/manager/js/bill_deduction.js
@@ -70,6 +70,7 @@ layui.use(['laytpl', 'table', 'jquery', 'form', 'miniTab', 'xmSelect',"laydate"]
                 // {templet: '#row-operate', minWidth: 200, fixed: 'right', align: 'center', title: '操作'}
             ]],
             done: function (res, curr, count) {
+                console.log( res.data);
                 Tools.setInsTb(insTb);
                 var rdata=[];
                 res.data.forEach(function (d,index) {
@@ -88,14 +89,16 @@ layui.use(['laytpl', 'table', 'jquery', 'form', 'miniTab', 'xmSelect',"laydate"]
 
                          ]
                 })
-                exportData=rdata
+                exportData=rdata;
+
+                $("#exports").on("click",function(){
+                    console.log(exportData)
+                    table.exportFile(exportDataTitle,exportData, 'xls');
+                    return false;
+                })
             }
         });
-        $("#exports").on("click",function(){
-            //console.log(exportData)
-            table.exportFile(exportDataTitle,exportData, 'xls');
-            return false;
-        })
+
 
 
 
diff --git a/public/static/manager/js/bill_recharge.js b/public/static/manager/js/bill_recharge.js
index 261e1cb..c984692 100644
--- a/public/static/manager/js/bill_recharge.js
+++ b/public/static/manager/js/bill_recharge.js
@@ -72,14 +72,15 @@ layui.use(['laytpl', 'table', 'jquery', 'form', 'miniTab', 'xmSelect',"laydate"]
                         d.balance,
                          ]
                 })
-                exportData=rdata
+                exportData=rdata;
+                $("#exports").on("click",function(){
+                    //console.log(exportData)
+                    table.exportFile(exportDataTitle,exportData, 'xls');
+                    return false;
+                })
             }
         });
-        $("#exports").on("click",function(){
-            //console.log(exportData)
-            table.exportFile(exportDataTitle,exportData, 'xls');
-            return false;
-        })
+