diff --git a/app/controller/manager/Business.php b/app/controller/manager/Business.php index 6a077f6..2b704d9 100644 --- a/app/controller/manager/Business.php +++ b/app/controller/manager/Business.php @@ -42,7 +42,7 @@ class Business extends Base $whereMap = [["a.state", "=", BusinessModel::state_on]]; $orders = ['a.id' => 'desc']; 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'])){ @@ -142,7 +142,7 @@ class Business extends Base $whereMap = ["business_code" => $businessCode]; if (!empty($keyword)) { - $whereMap[] = ['reason|business_name', 'like', "%$keyword%"]; + $whereMap[] = ['reason', 'like', "%$keyword%"]; } $list = $repo->businessDeductionList($whereMap, $page, $size, ["create_time" => "desc", "id" => "desc"]); diff --git a/app/repository/BillRepository.php b/app/repository/BillRepository.php index 084b911..d1dafa3 100644 --- a/app/repository/BillRepository.php +++ b/app/repository/BillRepository.php @@ -128,7 +128,7 @@ class BillRepository extends Repository $q->whereTime("a.update_time", ">=", $startTime); }) ->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) { $q->whereTime("a.update_time", "<=", $endTime); diff --git a/app/repository/BusinessRepository.php b/app/repository/BusinessRepository.php index a491dc7..1ccabb2 100644 --- a/app/repository/BusinessRepository.php +++ b/app/repository/BusinessRepository.php @@ -43,7 +43,7 @@ class BusinessRepository extends Repository $q = $this->model->alias("a") ->join("account b", "a.code = b.business_code") ->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", "b.avatar_url", "b.nick_name as account_nick_name", diff --git a/view/manager/bill/deduction.html b/view/manager/bill/deduction.html index befb87b..8a4b51a 100644 --- a/view/manager/bill/deduction.html +++ b/view/manager/bill/deduction.html @@ -61,7 +61,7 @@
- +
diff --git a/view/manager/bill/index.html b/view/manager/bill/index.html index f5506ed..e2bb028 100644 --- a/view/manager/bill/index.html +++ b/view/manager/bill/index.html @@ -115,7 +115,7 @@
- +
diff --git a/view/manager/bill/recharge.html b/view/manager/bill/recharge.html index 9280019..4577123 100644 --- a/view/manager/bill/recharge.html +++ b/view/manager/bill/recharge.html @@ -61,7 +61,7 @@
- +
diff --git a/view/manager/business/business_coupon_list.html b/view/manager/business/business_coupon_list.html index 1f7051b..79539bd 100644 --- a/view/manager/business/business_coupon_list.html +++ b/view/manager/business/business_coupon_list.html @@ -29,7 +29,7 @@
- +
diff --git a/view/manager/business/business_deduction_list.html b/view/manager/business/business_deduction_list.html index 9a8f86e..f7f2393 100644 --- a/view/manager/business/business_deduction_list.html +++ b/view/manager/business/business_deduction_list.html @@ -29,7 +29,7 @@
- +
diff --git a/view/manager/business/business_recharge_list.html b/view/manager/business/business_recharge_list.html index a65aeb9..ac08653 100644 --- a/view/manager/business/business_recharge_list.html +++ b/view/manager/business/business_recharge_list.html @@ -29,7 +29,7 @@
- +
diff --git a/view/manager/business/business_wait_list.html b/view/manager/business/business_wait_list.html index 9dedf27..7703a14 100644 --- a/view/manager/business/business_wait_list.html +++ b/view/manager/business/business_wait_list.html @@ -29,7 +29,7 @@
- +
diff --git a/view/manager/business/index.html b/view/manager/business/index.html index c2c950d..b5fe23a 100644 --- a/view/manager/business/index.html +++ b/view/manager/business/index.html @@ -29,7 +29,7 @@
- +
diff --git a/view/manager/coupon/index.html b/view/manager/coupon/index.html index 90dec17..b32361c 100644 --- a/view/manager/coupon/index.html +++ b/view/manager/coupon/index.html @@ -38,7 +38,7 @@
- +