From a4e613404d7c6223fc43c7d9236e38352a662746 Mon Sep 17 00:00:00 2001
From: liangyuyan <1103300295@qq.com>
Date: Tue, 11 Aug 2020 20:58:21 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B8=82=E5=9C=BA=E5=88=97=E8=A1=A8=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E6=90=9C=E7=B4=A2=E6=9D=A1=E4=BB=B6=EF=BC=8C=E5=8E=BB?=
 =?UTF-8?q?=E6=8E=89-=E7=AD=9B=E9=80=89=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Admin/Controllers/ImsCjdcMarketController.php | 10 ++++++++--
 resources/lang/zh-CN/coupon-tie.php               |  2 ++
 resources/lang/zh-CN/ims-cjdc-market.php          |  1 +
 resources/lang/zh-CN/lanzu-mm-info.php            |  2 ++
 resources/lang/zh-CN/lanzu-mm-withdraw.php        |  1 +
 resources/lang/zh-CN/lanzu-mp-info.php            |  1 +
 resources/lang/zh-CN/lanzu-mp-withdraw.php        |  1 +
 7 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/app/Admin/Controllers/ImsCjdcMarketController.php b/app/Admin/Controllers/ImsCjdcMarketController.php
index 7c18675..b32f49a 100644
--- a/app/Admin/Controllers/ImsCjdcMarketController.php
+++ b/app/Admin/Controllers/ImsCjdcMarketController.php
@@ -30,7 +30,12 @@ class ImsCjdcMarketController extends AdminController
                 }
                 return $mp->name;
             });
-            $grid->column('status', '状态')->display(function ($status) {
+            $grid->column('status', '状态')->filter(
+                Grid\Column\Filter\In::make([
+                    0 => '禁用',
+                    1 => '正常',
+                ])
+            )->display(function ($status) {
                 if ($status == 0) {
                     return '禁用';
                 } else {
@@ -42,7 +47,8 @@ class ImsCjdcMarketController extends AdminController
             $grid->filter(function (Grid\Filter $filter) {
                 $filter->equal('id');
             });
-
+            $grid->disableFilterButton();
+            $grid->quickSearch(['name'])->placeholder('名称');
 
             $grid->actions(function (Grid\Displayers\Actions $actions) {
 
diff --git a/resources/lang/zh-CN/coupon-tie.php b/resources/lang/zh-CN/coupon-tie.php
index 6757d91..e6de2f0 100644
--- a/resources/lang/zh-CN/coupon-tie.php
+++ b/resources/lang/zh-CN/coupon-tie.php
@@ -2,6 +2,8 @@
 return [
     'labels' => [
         'couponTie' => '活动绑定',
+        'coupon' => '活动绑定',
+        'TieForm' => '绑定',
     ],
     'fields' => [
         'activity' => '活动',
diff --git a/resources/lang/zh-CN/ims-cjdc-market.php b/resources/lang/zh-CN/ims-cjdc-market.php
index 90c5c3c..56779a7 100644
--- a/resources/lang/zh-CN/ims-cjdc-market.php
+++ b/resources/lang/zh-CN/ims-cjdc-market.php
@@ -2,6 +2,7 @@
 return [
     'labels' => [
         'ImsCjdcMarket' => '市场管理',
+        'market' => '市场管理'
     ],
     'fields' => [
         'name' => '名称',
diff --git a/resources/lang/zh-CN/lanzu-mm-info.php b/resources/lang/zh-CN/lanzu-mm-info.php
index c39bb9a..baa0da1 100644
--- a/resources/lang/zh-CN/lanzu-mm-info.php
+++ b/resources/lang/zh-CN/lanzu-mm-info.php
@@ -2,6 +2,7 @@
 return [
     'labels' => [
         'LanzuMmInfo' => '市场经理',
+        'mm' => '市场经理'
     ],
     'fields' => [
         'name' => '名称',
@@ -12,6 +13,7 @@ return [
         'admin_user_id' => '系统登陆帐号',
         'status' => '状态',
         'is_del' => '是否删除',
+        'market_id'=>'所属市场'
     ],
     'options' => [
     ],
diff --git a/resources/lang/zh-CN/lanzu-mm-withdraw.php b/resources/lang/zh-CN/lanzu-mm-withdraw.php
index 7c49c78..c3754a1 100644
--- a/resources/lang/zh-CN/lanzu-mm-withdraw.php
+++ b/resources/lang/zh-CN/lanzu-mm-withdraw.php
@@ -2,6 +2,7 @@
 return [
     'labels' => [
         'LanzuMmWithdraw' => '市场经理提现',
+        'mm_withdraw' => '市场经理提现'
     ],
     'fields' => [
         'mm_id' => '关联的市场经理id',
diff --git a/resources/lang/zh-CN/lanzu-mp-info.php b/resources/lang/zh-CN/lanzu-mp-info.php
index 52b1598..71d1269 100644
--- a/resources/lang/zh-CN/lanzu-mp-info.php
+++ b/resources/lang/zh-CN/lanzu-mp-info.php
@@ -2,6 +2,7 @@
 return [
     'labels' => [
         'LanzuMpInfo' => '服务商管理',
+        'mp' => '服务商管理'
     ],
     'fields' => [
         'name' => '名称',
diff --git a/resources/lang/zh-CN/lanzu-mp-withdraw.php b/resources/lang/zh-CN/lanzu-mp-withdraw.php
index 09e94bf..df368ec 100755
--- a/resources/lang/zh-CN/lanzu-mp-withdraw.php
+++ b/resources/lang/zh-CN/lanzu-mp-withdraw.php
@@ -2,6 +2,7 @@
 return [
     'labels' => [
         'LanzuMpWithdraw' => '服务商提现',
+        'mp_withdraw' => '服务商提现',
     ],
     'fields' => [
         'mp_id' => '关联的服务商id',