master
wangxinglong 2021-12-23 09:49:15 +08:00
parent 224e8247cd
commit 0ea8988cf5
12 changed files with 13 additions and 13 deletions

View File

@ -42,7 +42,7 @@ class Business extends Base
$whereMap = [["a.state", "=", BusinessModel::state_on]]; $whereMap = [["a.state", "=", BusinessModel::state_on]];
$orders = ['a.id' => 'desc']; $orders = ['a.id' => 'desc'];
if (!empty($keyword)) { if (!empty($keyword)) {
$whereMap[] = ['b.nick_name|a.business_name', 'like', "%$keyword%"]; $whereMap[] = ['b.nick_name|a.business_name|a.business_subtitle', 'like', "%$keyword%"];
} }
//如果是渠道商或者工作人员 只查看自己的下级商家 //如果是渠道商或者工作人员 只查看自己的下级商家
if(Member::is_agency($this->auth['roles'])){ if(Member::is_agency($this->auth['roles'])){
@ -142,7 +142,7 @@ class Business extends Base
$whereMap = ["business_code" => $businessCode]; $whereMap = ["business_code" => $businessCode];
if (!empty($keyword)) { if (!empty($keyword)) {
$whereMap[] = ['reason|business_name', 'like', "%$keyword%"]; $whereMap[] = ['reason', 'like', "%$keyword%"];
} }
$list = $repo->businessDeductionList($whereMap, $page, $size, ["create_time" => "desc", "id" => "desc"]); $list = $repo->businessDeductionList($whereMap, $page, $size, ["create_time" => "desc", "id" => "desc"]);

View File

@ -128,7 +128,7 @@ class BillRepository extends Repository
$q->whereTime("a.update_time", ">=", $startTime); $q->whereTime("a.update_time", ">=", $startTime);
}) })
->when(!empty($keyword), function ($q) use ($keyword) { ->when(!empty($keyword), function ($q) use ($keyword) {
$q->where("c.business_name|e.business_name", "like", "%$keyword%"); $q->where("c.business_name", "like", "%$keyword%");
}) })
->when(!empty($endTime), function ($q) use ($endTime) { ->when(!empty($endTime), function ($q) use ($endTime) {
$q->whereTime("a.update_time", "<=", $endTime); $q->whereTime("a.update_time", "<=", $endTime);

View File

@ -43,7 +43,7 @@ class BusinessRepository extends Repository
$q = $this->model->alias("a") $q = $this->model->alias("a")
->join("account b", "a.code = b.business_code") ->join("account b", "a.code = b.business_code")
->join("category c", "a.type = c.id","left") ->join("category c", "a.type = c.id","left")
->where("b.type","=",Account::type_consumer) ->where("b.type","=",Account::type_business)
->field(["a.code as business_code", ->field(["a.code as business_code",
"b.avatar_url", "b.avatar_url",
"b.nick_name as account_nick_name", "b.nick_name as account_nick_name",

View File

@ -61,7 +61,7 @@
<div class="layui-inline"> <div class="layui-inline">
<label class="layui-form-label">关键词</label> <label class="layui-form-label">关键词</label>
<div class="layui-inline"> <div class="layui-inline">
<input type="text" name="keyword" class="layui-input"> <input type="text" name="keyword" class="layui-input" placeholder="商家名称或者优惠券名称">
</div> </div>
</div> </div>
<div class="layui-inline"> <div class="layui-inline">

View File

@ -115,7 +115,7 @@
<div class="layui-inline"> <div class="layui-inline">
<label class="layui-form-label">关键词</label> <label class="layui-form-label">关键词</label>
<div class="layui-inline"> <div class="layui-inline">
<input type="text" name="keyword" class="layui-input"> <input type="text" name="keyword" class="layui-input" placeholder="商家名称,用户昵称,优惠券名称">
</div> </div>
</div> </div>
<div class="layui-inline"> <div class="layui-inline">

View File

@ -61,7 +61,7 @@
<div class="layui-inline"> <div class="layui-inline">
<label class="layui-form-label">关键词</label> <label class="layui-form-label">关键词</label>
<div class="layui-inline"> <div class="layui-inline">
<input type="text" name="keyword" class="layui-input"> <input type="text" name="keyword" class="layui-input" placeholder="商家名称">
</div> </div>
</div> </div>
<div class="layui-inline"> <div class="layui-inline">

View File

@ -29,7 +29,7 @@
<div class="layui-form-item"> <div class="layui-form-item">
<label class="layui-form-label">关键词</label> <label class="layui-form-label">关键词</label>
<div class="layui-inline"> <div class="layui-inline">
<input type="text" name="keyword" class="layui-input"> <input type="text" name="keyword" class="layui-input" placeholder="优惠券名称">
</div> </div>
<div class="layui-inline"> <div class="layui-inline">

View File

@ -29,7 +29,7 @@
<div class="layui-form-item"> <div class="layui-form-item">
<label class="layui-form-label">关键词</label> <label class="layui-form-label">关键词</label>
<div class="layui-inline"> <div class="layui-inline">
<input type="text" name="keyword" class="layui-input"> <input type="text" name="keyword" class="layui-input" placeholder="原因">
</div> </div>
<div class="layui-inline"> <div class="layui-inline">

View File

@ -29,7 +29,7 @@
<div class="layui-form-item"> <div class="layui-form-item">
<label class="layui-form-label">关键词</label> <label class="layui-form-label">关键词</label>
<div class="layui-inline"> <div class="layui-inline">
<input type="text" name="keyword" class="layui-input"> <input type="text" name="keyword" class="layui-input" placeholder="订单号">
</div> </div>
<div class="layui-inline"> <div class="layui-inline">

View File

@ -29,7 +29,7 @@
<div class="layui-form-item"> <div class="layui-form-item">
<label class="layui-form-label">关键词</label> <label class="layui-form-label">关键词</label>
<div class="layui-inline"> <div class="layui-inline">
<input type="text" name="keyword" class="layui-input"> <input type="text" name="keyword" class="layui-input" placeholder="用户昵称或者商家名称">
</div> </div>
<div class="layui-inline"> <div class="layui-inline">

View File

@ -29,7 +29,7 @@
<div class="layui-form-item"> <div class="layui-form-item">
<label class="layui-form-label">关键词</label> <label class="layui-form-label">关键词</label>
<div class="layui-inline"> <div class="layui-inline">
<input type="text" name="keyword" class="layui-input"> <input type="text" name="keyword" class="layui-input" placeholder="商家名称或简称">
</div> </div>
<div class="layui-inline"> <div class="layui-inline">

View File

@ -38,7 +38,7 @@
<div class="layui-inline"> <div class="layui-inline">
<label class="layui-form-label">关键词</label> <label class="layui-form-label">关键词</label>
<div class="layui-inline"> <div class="layui-inline">
<input type="text" name="keyword" class="layui-input"> <input type="text" name="keyword" class="layui-input" placeholder="优惠券名称">
</div> </div>
</div> </div>