diff --git a/app/Admin/Controllers/BargainActivityController.php b/app/Admin/Controllers/BargainActivityController.php
new file mode 100644
index 00000000..5d0b93eb
--- /dev/null
+++ b/app/Admin/Controllers/BargainActivityController.php
@@ -0,0 +1,177 @@
+<?php
+
+namespace App\Admin\Controllers;
+
+use App\Admin\Renderable\ProductSkuSimpleTable;
+use App\Admin\Repositories\BargainActivity;
+use App\Models\BargainActivity as BargainActivityModel;
+use App\Models\ProductSku;
+use Carbon\Carbon;
+use Dcat\Admin\Admin;
+use Dcat\Admin\Form;
+use Dcat\Admin\Grid;
+use Dcat\Admin\Grid\Column;
+use Dcat\Admin\Http\Controllers\AdminController;
+use Dcat\Admin\Layout\Row;
+use Dcat\Admin\Show;
+
+class BargainActivityController extends AdminController
+{
+    /**
+     * Make a grid builder.
+     *
+     * @return Grid
+     */
+    protected function grid()
+    {
+        return Grid::make(new BargainActivity(), function (Grid $grid) {
+            $grid->column('id')->sortable();
+            $grid->column('name');
+            // $grid->column('description');
+            $grid->column('is_enable')
+                ->if(function () {
+                    return Admin::user()->can('dcat.admin.bargain_activities.edit');
+                })
+                ->then(function (Column $column) {
+                    $column->switch();
+                })
+                ->else(function (Column $column) {
+                    $column->bool();
+                });
+            // $grid->column('rules');
+            $grid->column('times');
+            // $grid->column('expire_hours');
+            $grid->column('start_at');
+            $grid->column('end_at');
+            $grid->column('created_at');
+            $grid->column('updated_at')->sortable();
+
+            //新增
+            if (Admin::user()->can('dcat.admin.bargain_activities.create')) {
+                $grid->disableCreateButton(false);
+                // $grid->enableDialogCreate();
+            }
+
+            $grid->actions(function (Grid\Displayers\Actions $actions) {
+                $actions->disableView(Admin::user()->cannot('dcat.admin.bargain_activities.show'));
+                $actions->disableDelete(Admin::user()->cannot('dcat.admin.bargain_activities.destroy'));
+                //修改
+                $actions->disableEdit(Admin::user()->cannot('dcat.admin.bargain_activities.edit'));
+            });
+
+            $grid->filter(function (Grid\Filter $filter) {
+                $filter->panel();
+                $filter->like('name')->width(3);
+            });
+        });
+    }
+
+    /**
+     * Make a show builder.
+     *
+     * @param mixed $id
+     *
+     * @return Show
+     */
+    protected function detail($id)
+    {
+        return function (Row $row) use ($id) {
+            $activity = BargainActivityModel::with(['skus'])->findOrFail($id);
+            $row->column(6, function ($column) use ($activity) {
+                $column->row(Show::make($activity, function (Show $show) use ($activity) {
+                    $show->panel()
+                        ->tools(function ($tools) {
+                            $tools->disableEdit(Admin::user()->cannot('dcat.admin.bargain_activities.edit'));
+                            // $tools->disableList();
+                            $tools->disableDelete(Admin::user()->cannot('dcat.admin.bargain_activities.destroy'));
+                        });
+                    $show->row(function (Show\Row $show) use ($activity) {
+                        $show->field('id')->width(10, 1);
+                        $show->field('name')->width(10, 1);
+                        $show->field('is_enable')->using([0=>'未开启', '已开启'])->dot([
+                            '0'=>'#b3b9bf',
+                            '1'=>'success',
+                        ])->width(10, 1);
+                        $show->width(6)->field('start_at');
+                        $show->width(6)->field('end_at');
+                        $show->width(6)->field('times')->append('刀');
+                        $show->width(6)->field('expire_hours')->append('h');
+
+                        $show->width(12)->field('skus')->width(10, 1)->as(function ($value) {
+                            return array_column($value, 'name');
+                        })->label();
+
+                        $show->field('description')->unescape()->width(10, 1);
+
+                        $show->width(6)->field('created_at');
+                        $show->width(6)->field('updated_at');
+                    });
+                }));
+            });
+            $row->column(6, function ($column) use ($activity) {
+                //砍价记录-todo
+            });
+        };
+    }
+
+    /**
+     * Make a form builder.
+     *
+     * @return Form
+     */
+    protected function form()
+    {
+        $builder = BargainActivity::with(['skus']);
+        return Form::make($builder, function (Form $form) {
+            $form->display('id');
+            $form->display('created_at');
+            $form->display('updated_at');
+            $form->block(6, function (Form\BlockForm $form) {
+                $form->text('name')->required();
+                $form->switch('is_enable');
+                $form->dateRange('start_at', 'end_at', '活动时间')->required();
+                $form->multipleSelectTable('skus')
+                    ->from(ProductSkuSimpleTable::make())
+                    ->model(ProductSku::class, 'id', 'name')
+                    ->customFormat(function ($v) {
+                        if (!$v) {
+                            return [];
+                        }
+                        // 这一步非常重要，需要把数据库中查出来的二维数组转化成一维数组
+                        return array_column($v, 'id');
+                    })->required();
+                $form->number('times')->min(0);
+                $form->number('expire_hours')->min(0);
+                $form->textarea('rules')->customFormat(function ($value) {
+                    return implode(',', json_decode($value));
+                })->saving(function ($value) {
+                    // dd($value, explode(',', $value));
+                    return json_encode(explode(',', $value));
+                });
+                $form->showFooter();
+            });
+            $form->block(6, function (Form\BlockForm $form) {
+                $form->multipleImage('images')
+                    ->move('bargain/images/'.Carbon::now()->toDateString())
+                    ->saveFullUrl()
+                    ->removable(false)
+                    ->autoUpload()->retainable()->sortable();
+                $form->editor('description')->height('600');
+            });
+            $form->saving(function ($form) {
+                if ($form->is_enable) {
+                    //查询是否有除了自己以外开启的活动
+                    if ($form->id) {
+                        if (BargainActivityModel::where('id', '<>', $form->id)->isEnable()->exists()) {
+                            return $form->response()->error('当前已有开启的活动');
+                        }
+                    } else {
+                        if (BargainActivityModel::isEnable()->exists()) {
+                            return $form->response()->error('当前已有开启的活动');
+                        }
+                    }
+                }
+            });
+        });
+    }
+}
diff --git a/app/Admin/Repositories/BargainActivity.php b/app/Admin/Repositories/BargainActivity.php
new file mode 100644
index 00000000..c694272c
--- /dev/null
+++ b/app/Admin/Repositories/BargainActivity.php
@@ -0,0 +1,16 @@
+<?php
+
+namespace App\Admin\Repositories;
+
+use App\Models\BargainActivity as Model;
+use Dcat\Admin\Repositories\EloquentRepository;
+
+class BargainActivity extends EloquentRepository
+{
+    /**
+     * Model.
+     *
+     * @var string
+     */
+    protected $eloquentClass = Model::class;
+}
diff --git a/app/Admin/routes.php b/app/Admin/routes.php
index fcb2e921..b8fe30dd 100644
--- a/app/Admin/routes.php
+++ b/app/Admin/routes.php
@@ -214,6 +214,9 @@ Route::group([
     $router->get('dealer-delivery-bills', 'DealerDeliveryBillController@index')->name('dealer_delivery_bills.index');
     $router->get('dealer-delivery-bills/{dealer_delivery_bill}', 'DealerDeliveryBillController@show')->name('dealer_delivery_bills.show');
 
+    //商城端-砍价活动
+    $router->resource('bargain-activities', 'BargainActivityController')->names('bargain_activities');
+
     /** api接口 **/
     $router->get('api/product-categories', 'ProductCategoryController@categories')->name('api.product_categories');
     $router->get('api/product-group-details', 'ProductGroupController@details')->name('api.product_group_details');
diff --git a/app/Endpoint/Api/Http/Controllers/BargainActivityController.php b/app/Endpoint/Api/Http/Controllers/BargainActivityController.php
new file mode 100644
index 00000000..521ba98d
--- /dev/null
+++ b/app/Endpoint/Api/Http/Controllers/BargainActivityController.php
@@ -0,0 +1,23 @@
+<?php
+
+namespace App\Endpoint\Api\Http\Controllers;
+
+use App\Models\BargainActivity;
+use Illuminate\Http\Request;
+
+class BargainActivityController extends Controller
+{
+    /**
+     *
+     *
+     * @param \Illuminate\Http\Request $request
+     * @return void
+     */
+    public function detail($id, Request $request)
+    {
+        $activity = BargainActivity::findOrFail($id);
+        return $request->response()->json([
+            // 'name'
+        ]);
+    }
+}
diff --git a/app/Endpoint/Api/routes.php b/app/Endpoint/Api/routes.php
index 7990b2b6..4d70178d 100644
--- a/app/Endpoint/Api/routes.php
+++ b/app/Endpoint/Api/routes.php
@@ -195,6 +195,8 @@ Route::group([
         Route::get('order/orders/{package}/shipping-info', [OrderController::class, 'shippingInfo']);
 
         Route::get('users/{phone}', [\App\Endpoint\Api\Http\Controllers\UserController::class, 'show']);
+
+        Route::get('bargains/{bargain}', [\App\Endpoint\Api\Http\Controllers\BargainActivityController::class, 'detail']);
     });
 
     Route::group([
diff --git a/app/Models/BargainActivity.php b/app/Models/BargainActivity.php
index 85a36932..9b14ccb9 100644
--- a/app/Models/BargainActivity.php
+++ b/app/Models/BargainActivity.php
@@ -2,10 +2,32 @@
 
 namespace App\Models;
 
+use Dcat\Admin\Traits\HasDateTimeFormatter;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 
 class BargainActivity extends Model
 {
     use HasFactory;
+    use HasDateTimeFormatter;
+
+    public static $enabledText = [
+        0=>'禁用',
+        1=>'启用',
+    ];
+
+    public static $enabledColor = [
+        0=>'#b3b9bf',
+        1=>'success',
+    ];
+
+    public function skus()
+    {
+        return $this->belongsToMany(ProductSku::class, 'bargain_skus', 'activity_id', 'sku_id');
+    }
+
+    public function scopeIsEnable($query)
+    {
+        return $query->where('is_enable', true);
+    }
 }
diff --git a/database/migrations/2022_04_06_110305_create_bargain_activities_table.php b/database/migrations/2022_04_06_110305_create_bargain_activities_table.php
index f35b38f8..5b865480 100644
--- a/database/migrations/2022_04_06_110305_create_bargain_activities_table.php
+++ b/database/migrations/2022_04_06_110305_create_bargain_activities_table.php
@@ -16,6 +16,7 @@ class CreateBargainActivitiesTable extends Migration
         Schema::create('bargain_activities', function (Blueprint $table) {
             $table->id();
             $table->string('name')->comment('活动名称');
+            $table->text('images')->nullable()->comment('活动图');
             $table->text('description')->nullable()->comment('活动描述');
             $table->boolean('is_enable')->nullable()->comment('是否开启');
             $table->text('rules')->nullable()->comment('砍价规则');
diff --git a/dcat_admin_ide_helper.php b/dcat_admin_ide_helper.php
index 93bb1676..33c72eab 100644
--- a/dcat_admin_ide_helper.php
+++ b/dcat_admin_ide_helper.php
@@ -7,11 +7,11 @@
  *
  * @author jqh <841324345@qq.com>
  */
-
 namespace Dcat\Admin {
     use Illuminate\Support\Collection;
 
     /**
+     * @property Grid\Column|Collection width
      * @property Grid\Column|Collection id
      * @property Grid\Column|Collection cover
      * @property Grid\Column|Collection content
@@ -99,12 +99,21 @@ namespace Dcat\Admin {
      * @property Grid\Column|Collection total_revenue
      * @property Grid\Column|Collection transferable
      * @property Grid\Column|Collection is_frozen
+     * @property Grid\Column|Collection is_enable
+     * @property Grid\Column|Collection rules
+     * @property Grid\Column|Collection times
+     * @property Grid\Column|Collection expire_hours
+     * @property Grid\Column|Collection start_at
+     * @property Grid\Column|Collection end_at
+     * @property Grid\Column|Collection bargain_amount
+     * @property Grid\Column|Collection sku_price
+     * @property Grid\Column|Collection bargain_price
+     * @property Grid\Column|Collection status
+     * @property Grid\Column|Collection expire_at
      * @property Grid\Column|Collection continue_click_times
      * @property Grid\Column|Collection last_click_at
      * @property Grid\Column|Collection ranges
-     * @property Grid\Column|Collection is_enable
      * @property Grid\Column|Collection administrator_id
-     * @property Grid\Column|Collection status
      * @property Grid\Column|Collection task_id
      * @property Grid\Column|Collection threshold
      * @property Grid\Column|Collection limit
@@ -116,6 +125,17 @@ namespace Dcat\Admin {
      * @property Grid\Column|Collection lvl
      * @property Grid\Column|Collection total_amount
      * @property Grid\Column|Collection order_completed_at
+     * @property Grid\Column|Collection shipping_fee
+     * @property Grid\Column|Collection consignee_name
+     * @property Grid\Column|Collection consignee_telephone
+     * @property Grid\Column|Collection consignee_zone
+     * @property Grid\Column|Collection consignee_address
+     * @property Grid\Column|Collection pay_sn
+     * @property Grid\Column|Collection pay_way
+     * @property Grid\Column|Collection out_trade_no
+     * @property Grid\Column|Collection pay_at
+     * @property Grid\Column|Collection delivery_bill_id
+     * @property Grid\Column|Collection product_id
      * @property Grid\Column|Collection earningable_type
      * @property Grid\Column|Collection earningable_id
      * @property Grid\Column|Collection total_earnings
@@ -123,35 +143,27 @@ namespace Dcat\Admin {
      * @property Grid\Column|Collection fee_rate
      * @property Grid\Column|Collection payer_id
      * @property Grid\Column|Collection pay_info
-     * @property Grid\Column|Collection pay_at
      * @property Grid\Column|Collection settle_at
      * @property Grid\Column|Collection pay_image
-     * @property Grid\Column|Collection pay_way
      * @property Grid\Column|Collection is_manager
      * @property Grid\Column|Collection real_amount
-     * @property Grid\Column|Collection start_at
-     * @property Grid\Column|Collection end_at
      * @property Grid\Column|Collection is_settle
-     * @property Grid\Column|Collection product_id
      * @property Grid\Column|Collection sales_volume
      * @property Grid\Column|Collection last_consignor_id
      * @property Grid\Column|Collection new_consignor_id
      * @property Grid\Column|Collection price
      * @property Grid\Column|Collection sale_price
+     * @property Grid\Column|Collection deposit_qty
      * @property Grid\Column|Collection reason
      * @property Grid\Column|Collection consignor_id
      * @property Grid\Column|Collection settle_state
-     * @property Grid\Column|Collection consignee_name
-     * @property Grid\Column|Collection consignee_telephone
-     * @property Grid\Column|Collection consignee_zone
-     * @property Grid\Column|Collection consignee_address
      * @property Grid\Column|Collection pay_time
      * @property Grid\Column|Collection paied_time
      * @property Grid\Column|Collection shipping_time
      * @property Grid\Column|Collection shippinged_time
      * @property Grid\Column|Collection allocated_at
-     * @property Grid\Column|Collection pay_sn
-     * @property Grid\Column|Collection out_trade_no
+     * @property Grid\Column|Collection local_status
+     * @property Grid\Column|Collection deposit_status
      * @property Grid\Column|Collection min_order_amount
      * @property Grid\Column|Collection price_1st
      * @property Grid\Column|Collection price_2st
@@ -174,6 +186,8 @@ namespace Dcat\Admin {
      * @property Grid\Column|Collection before_lvl
      * @property Grid\Column|Collection change_lvl
      * @property Grid\Column|Collection revoke_id
+     * @property Grid\Column|Collection is_deposit
+     * @property Grid\Column|Collection deposit_stock
      * @property Grid\Column|Collection rate
      * @property Grid\Column|Collection service_amount
      * @property Grid\Column|Collection account_amount
@@ -225,8 +239,8 @@ namespace Dcat\Admin {
      * @property Grid\Column|Collection after_expire_at
      * @property Grid\Column|Collection remain_quantity
      * @property Grid\Column|Collection gift_for_sku_id
+     * @property Grid\Column|Collection is_gift
      * @property Grid\Column|Collection max
-     * @property Grid\Column|Collection shipping_fee
      * @property Grid\Column|Collection products_total_amount
      * @property Grid\Column|Collection note
      * @property Grid\Column|Collection user_coupon_id
@@ -315,6 +329,7 @@ namespace Dcat\Admin {
      * @property Grid\Column|Collection status_remark
      * @property Grid\Column|Collection old_password
      *
+     * @method Grid\Column|Collection width(string $label = null)
      * @method Grid\Column|Collection id(string $label = null)
      * @method Grid\Column|Collection cover(string $label = null)
      * @method Grid\Column|Collection content(string $label = null)
@@ -402,12 +417,21 @@ namespace Dcat\Admin {
      * @method Grid\Column|Collection total_revenue(string $label = null)
      * @method Grid\Column|Collection transferable(string $label = null)
      * @method Grid\Column|Collection is_frozen(string $label = null)
+     * @method Grid\Column|Collection is_enable(string $label = null)
+     * @method Grid\Column|Collection rules(string $label = null)
+     * @method Grid\Column|Collection times(string $label = null)
+     * @method Grid\Column|Collection expire_hours(string $label = null)
+     * @method Grid\Column|Collection start_at(string $label = null)
+     * @method Grid\Column|Collection end_at(string $label = null)
+     * @method Grid\Column|Collection bargain_amount(string $label = null)
+     * @method Grid\Column|Collection sku_price(string $label = null)
+     * @method Grid\Column|Collection bargain_price(string $label = null)
+     * @method Grid\Column|Collection status(string $label = null)
+     * @method Grid\Column|Collection expire_at(string $label = null)
      * @method Grid\Column|Collection continue_click_times(string $label = null)
      * @method Grid\Column|Collection last_click_at(string $label = null)
      * @method Grid\Column|Collection ranges(string $label = null)
-     * @method Grid\Column|Collection is_enable(string $label = null)
      * @method Grid\Column|Collection administrator_id(string $label = null)
-     * @method Grid\Column|Collection status(string $label = null)
      * @method Grid\Column|Collection task_id(string $label = null)
      * @method Grid\Column|Collection threshold(string $label = null)
      * @method Grid\Column|Collection limit(string $label = null)
@@ -419,6 +443,17 @@ namespace Dcat\Admin {
      * @method Grid\Column|Collection lvl(string $label = null)
      * @method Grid\Column|Collection total_amount(string $label = null)
      * @method Grid\Column|Collection order_completed_at(string $label = null)
+     * @method Grid\Column|Collection shipping_fee(string $label = null)
+     * @method Grid\Column|Collection consignee_name(string $label = null)
+     * @method Grid\Column|Collection consignee_telephone(string $label = null)
+     * @method Grid\Column|Collection consignee_zone(string $label = null)
+     * @method Grid\Column|Collection consignee_address(string $label = null)
+     * @method Grid\Column|Collection pay_sn(string $label = null)
+     * @method Grid\Column|Collection pay_way(string $label = null)
+     * @method Grid\Column|Collection out_trade_no(string $label = null)
+     * @method Grid\Column|Collection pay_at(string $label = null)
+     * @method Grid\Column|Collection delivery_bill_id(string $label = null)
+     * @method Grid\Column|Collection product_id(string $label = null)
      * @method Grid\Column|Collection earningable_type(string $label = null)
      * @method Grid\Column|Collection earningable_id(string $label = null)
      * @method Grid\Column|Collection total_earnings(string $label = null)
@@ -426,35 +461,27 @@ namespace Dcat\Admin {
      * @method Grid\Column|Collection fee_rate(string $label = null)
      * @method Grid\Column|Collection payer_id(string $label = null)
      * @method Grid\Column|Collection pay_info(string $label = null)
-     * @method Grid\Column|Collection pay_at(string $label = null)
      * @method Grid\Column|Collection settle_at(string $label = null)
      * @method Grid\Column|Collection pay_image(string $label = null)
-     * @method Grid\Column|Collection pay_way(string $label = null)
      * @method Grid\Column|Collection is_manager(string $label = null)
      * @method Grid\Column|Collection real_amount(string $label = null)
-     * @method Grid\Column|Collection start_at(string $label = null)
-     * @method Grid\Column|Collection end_at(string $label = null)
      * @method Grid\Column|Collection is_settle(string $label = null)
-     * @method Grid\Column|Collection product_id(string $label = null)
      * @method Grid\Column|Collection sales_volume(string $label = null)
      * @method Grid\Column|Collection last_consignor_id(string $label = null)
      * @method Grid\Column|Collection new_consignor_id(string $label = null)
      * @method Grid\Column|Collection price(string $label = null)
      * @method Grid\Column|Collection sale_price(string $label = null)
+     * @method Grid\Column|Collection deposit_qty(string $label = null)
      * @method Grid\Column|Collection reason(string $label = null)
      * @method Grid\Column|Collection consignor_id(string $label = null)
      * @method Grid\Column|Collection settle_state(string $label = null)
-     * @method Grid\Column|Collection consignee_name(string $label = null)
-     * @method Grid\Column|Collection consignee_telephone(string $label = null)
-     * @method Grid\Column|Collection consignee_zone(string $label = null)
-     * @method Grid\Column|Collection consignee_address(string $label = null)
      * @method Grid\Column|Collection pay_time(string $label = null)
      * @method Grid\Column|Collection paied_time(string $label = null)
      * @method Grid\Column|Collection shipping_time(string $label = null)
      * @method Grid\Column|Collection shippinged_time(string $label = null)
      * @method Grid\Column|Collection allocated_at(string $label = null)
-     * @method Grid\Column|Collection pay_sn(string $label = null)
-     * @method Grid\Column|Collection out_trade_no(string $label = null)
+     * @method Grid\Column|Collection local_status(string $label = null)
+     * @method Grid\Column|Collection deposit_status(string $label = null)
      * @method Grid\Column|Collection min_order_amount(string $label = null)
      * @method Grid\Column|Collection price_1st(string $label = null)
      * @method Grid\Column|Collection price_2st(string $label = null)
@@ -477,6 +504,8 @@ namespace Dcat\Admin {
      * @method Grid\Column|Collection before_lvl(string $label = null)
      * @method Grid\Column|Collection change_lvl(string $label = null)
      * @method Grid\Column|Collection revoke_id(string $label = null)
+     * @method Grid\Column|Collection is_deposit(string $label = null)
+     * @method Grid\Column|Collection deposit_stock(string $label = null)
      * @method Grid\Column|Collection rate(string $label = null)
      * @method Grid\Column|Collection service_amount(string $label = null)
      * @method Grid\Column|Collection account_amount(string $label = null)
@@ -528,8 +557,8 @@ namespace Dcat\Admin {
      * @method Grid\Column|Collection after_expire_at(string $label = null)
      * @method Grid\Column|Collection remain_quantity(string $label = null)
      * @method Grid\Column|Collection gift_for_sku_id(string $label = null)
+     * @method Grid\Column|Collection is_gift(string $label = null)
      * @method Grid\Column|Collection max(string $label = null)
-     * @method Grid\Column|Collection shipping_fee(string $label = null)
      * @method Grid\Column|Collection products_total_amount(string $label = null)
      * @method Grid\Column|Collection note(string $label = null)
      * @method Grid\Column|Collection user_coupon_id(string $label = null)
@@ -618,15 +647,12 @@ namespace Dcat\Admin {
      * @method Grid\Column|Collection status_remark(string $label = null)
      * @method Grid\Column|Collection old_password(string $label = null)
      */
-    class Grid
-    {
-    }
+    class Grid {}
 
-    class MiniGrid extends Grid
-    {
-    }
+    class MiniGrid extends Grid {}
 
     /**
+     * @property Show\Field|Collection width
      * @property Show\Field|Collection id
      * @property Show\Field|Collection cover
      * @property Show\Field|Collection content
@@ -714,12 +740,21 @@ namespace Dcat\Admin {
      * @property Show\Field|Collection total_revenue
      * @property Show\Field|Collection transferable
      * @property Show\Field|Collection is_frozen
+     * @property Show\Field|Collection is_enable
+     * @property Show\Field|Collection rules
+     * @property Show\Field|Collection times
+     * @property Show\Field|Collection expire_hours
+     * @property Show\Field|Collection start_at
+     * @property Show\Field|Collection end_at
+     * @property Show\Field|Collection bargain_amount
+     * @property Show\Field|Collection sku_price
+     * @property Show\Field|Collection bargain_price
+     * @property Show\Field|Collection status
+     * @property Show\Field|Collection expire_at
      * @property Show\Field|Collection continue_click_times
      * @property Show\Field|Collection last_click_at
      * @property Show\Field|Collection ranges
-     * @property Show\Field|Collection is_enable
      * @property Show\Field|Collection administrator_id
-     * @property Show\Field|Collection status
      * @property Show\Field|Collection task_id
      * @property Show\Field|Collection threshold
      * @property Show\Field|Collection limit
@@ -731,6 +766,17 @@ namespace Dcat\Admin {
      * @property Show\Field|Collection lvl
      * @property Show\Field|Collection total_amount
      * @property Show\Field|Collection order_completed_at
+     * @property Show\Field|Collection shipping_fee
+     * @property Show\Field|Collection consignee_name
+     * @property Show\Field|Collection consignee_telephone
+     * @property Show\Field|Collection consignee_zone
+     * @property Show\Field|Collection consignee_address
+     * @property Show\Field|Collection pay_sn
+     * @property Show\Field|Collection pay_way
+     * @property Show\Field|Collection out_trade_no
+     * @property Show\Field|Collection pay_at
+     * @property Show\Field|Collection delivery_bill_id
+     * @property Show\Field|Collection product_id
      * @property Show\Field|Collection earningable_type
      * @property Show\Field|Collection earningable_id
      * @property Show\Field|Collection total_earnings
@@ -738,35 +784,27 @@ namespace Dcat\Admin {
      * @property Show\Field|Collection fee_rate
      * @property Show\Field|Collection payer_id
      * @property Show\Field|Collection pay_info
-     * @property Show\Field|Collection pay_at
      * @property Show\Field|Collection settle_at
      * @property Show\Field|Collection pay_image
-     * @property Show\Field|Collection pay_way
      * @property Show\Field|Collection is_manager
      * @property Show\Field|Collection real_amount
-     * @property Show\Field|Collection start_at
-     * @property Show\Field|Collection end_at
      * @property Show\Field|Collection is_settle
-     * @property Show\Field|Collection product_id
      * @property Show\Field|Collection sales_volume
      * @property Show\Field|Collection last_consignor_id
      * @property Show\Field|Collection new_consignor_id
      * @property Show\Field|Collection price
      * @property Show\Field|Collection sale_price
+     * @property Show\Field|Collection deposit_qty
      * @property Show\Field|Collection reason
      * @property Show\Field|Collection consignor_id
      * @property Show\Field|Collection settle_state
-     * @property Show\Field|Collection consignee_name
-     * @property Show\Field|Collection consignee_telephone
-     * @property Show\Field|Collection consignee_zone
-     * @property Show\Field|Collection consignee_address
      * @property Show\Field|Collection pay_time
      * @property Show\Field|Collection paied_time
      * @property Show\Field|Collection shipping_time
      * @property Show\Field|Collection shippinged_time
      * @property Show\Field|Collection allocated_at
-     * @property Show\Field|Collection pay_sn
-     * @property Show\Field|Collection out_trade_no
+     * @property Show\Field|Collection local_status
+     * @property Show\Field|Collection deposit_status
      * @property Show\Field|Collection min_order_amount
      * @property Show\Field|Collection price_1st
      * @property Show\Field|Collection price_2st
@@ -789,6 +827,8 @@ namespace Dcat\Admin {
      * @property Show\Field|Collection before_lvl
      * @property Show\Field|Collection change_lvl
      * @property Show\Field|Collection revoke_id
+     * @property Show\Field|Collection is_deposit
+     * @property Show\Field|Collection deposit_stock
      * @property Show\Field|Collection rate
      * @property Show\Field|Collection service_amount
      * @property Show\Field|Collection account_amount
@@ -840,8 +880,8 @@ namespace Dcat\Admin {
      * @property Show\Field|Collection after_expire_at
      * @property Show\Field|Collection remain_quantity
      * @property Show\Field|Collection gift_for_sku_id
+     * @property Show\Field|Collection is_gift
      * @property Show\Field|Collection max
-     * @property Show\Field|Collection shipping_fee
      * @property Show\Field|Collection products_total_amount
      * @property Show\Field|Collection note
      * @property Show\Field|Collection user_coupon_id
@@ -930,6 +970,7 @@ namespace Dcat\Admin {
      * @property Show\Field|Collection status_remark
      * @property Show\Field|Collection old_password
      *
+     * @method Show\Field|Collection width(string $label = null)
      * @method Show\Field|Collection id(string $label = null)
      * @method Show\Field|Collection cover(string $label = null)
      * @method Show\Field|Collection content(string $label = null)
@@ -1017,12 +1058,21 @@ namespace Dcat\Admin {
      * @method Show\Field|Collection total_revenue(string $label = null)
      * @method Show\Field|Collection transferable(string $label = null)
      * @method Show\Field|Collection is_frozen(string $label = null)
+     * @method Show\Field|Collection is_enable(string $label = null)
+     * @method Show\Field|Collection rules(string $label = null)
+     * @method Show\Field|Collection times(string $label = null)
+     * @method Show\Field|Collection expire_hours(string $label = null)
+     * @method Show\Field|Collection start_at(string $label = null)
+     * @method Show\Field|Collection end_at(string $label = null)
+     * @method Show\Field|Collection bargain_amount(string $label = null)
+     * @method Show\Field|Collection sku_price(string $label = null)
+     * @method Show\Field|Collection bargain_price(string $label = null)
+     * @method Show\Field|Collection status(string $label = null)
+     * @method Show\Field|Collection expire_at(string $label = null)
      * @method Show\Field|Collection continue_click_times(string $label = null)
      * @method Show\Field|Collection last_click_at(string $label = null)
      * @method Show\Field|Collection ranges(string $label = null)
-     * @method Show\Field|Collection is_enable(string $label = null)
      * @method Show\Field|Collection administrator_id(string $label = null)
-     * @method Show\Field|Collection status(string $label = null)
      * @method Show\Field|Collection task_id(string $label = null)
      * @method Show\Field|Collection threshold(string $label = null)
      * @method Show\Field|Collection limit(string $label = null)
@@ -1034,6 +1084,17 @@ namespace Dcat\Admin {
      * @method Show\Field|Collection lvl(string $label = null)
      * @method Show\Field|Collection total_amount(string $label = null)
      * @method Show\Field|Collection order_completed_at(string $label = null)
+     * @method Show\Field|Collection shipping_fee(string $label = null)
+     * @method Show\Field|Collection consignee_name(string $label = null)
+     * @method Show\Field|Collection consignee_telephone(string $label = null)
+     * @method Show\Field|Collection consignee_zone(string $label = null)
+     * @method Show\Field|Collection consignee_address(string $label = null)
+     * @method Show\Field|Collection pay_sn(string $label = null)
+     * @method Show\Field|Collection pay_way(string $label = null)
+     * @method Show\Field|Collection out_trade_no(string $label = null)
+     * @method Show\Field|Collection pay_at(string $label = null)
+     * @method Show\Field|Collection delivery_bill_id(string $label = null)
+     * @method Show\Field|Collection product_id(string $label = null)
      * @method Show\Field|Collection earningable_type(string $label = null)
      * @method Show\Field|Collection earningable_id(string $label = null)
      * @method Show\Field|Collection total_earnings(string $label = null)
@@ -1041,35 +1102,27 @@ namespace Dcat\Admin {
      * @method Show\Field|Collection fee_rate(string $label = null)
      * @method Show\Field|Collection payer_id(string $label = null)
      * @method Show\Field|Collection pay_info(string $label = null)
-     * @method Show\Field|Collection pay_at(string $label = null)
      * @method Show\Field|Collection settle_at(string $label = null)
      * @method Show\Field|Collection pay_image(string $label = null)
-     * @method Show\Field|Collection pay_way(string $label = null)
      * @method Show\Field|Collection is_manager(string $label = null)
      * @method Show\Field|Collection real_amount(string $label = null)
-     * @method Show\Field|Collection start_at(string $label = null)
-     * @method Show\Field|Collection end_at(string $label = null)
      * @method Show\Field|Collection is_settle(string $label = null)
-     * @method Show\Field|Collection product_id(string $label = null)
      * @method Show\Field|Collection sales_volume(string $label = null)
      * @method Show\Field|Collection last_consignor_id(string $label = null)
      * @method Show\Field|Collection new_consignor_id(string $label = null)
      * @method Show\Field|Collection price(string $label = null)
      * @method Show\Field|Collection sale_price(string $label = null)
+     * @method Show\Field|Collection deposit_qty(string $label = null)
      * @method Show\Field|Collection reason(string $label = null)
      * @method Show\Field|Collection consignor_id(string $label = null)
      * @method Show\Field|Collection settle_state(string $label = null)
-     * @method Show\Field|Collection consignee_name(string $label = null)
-     * @method Show\Field|Collection consignee_telephone(string $label = null)
-     * @method Show\Field|Collection consignee_zone(string $label = null)
-     * @method Show\Field|Collection consignee_address(string $label = null)
      * @method Show\Field|Collection pay_time(string $label = null)
      * @method Show\Field|Collection paied_time(string $label = null)
      * @method Show\Field|Collection shipping_time(string $label = null)
      * @method Show\Field|Collection shippinged_time(string $label = null)
      * @method Show\Field|Collection allocated_at(string $label = null)
-     * @method Show\Field|Collection pay_sn(string $label = null)
-     * @method Show\Field|Collection out_trade_no(string $label = null)
+     * @method Show\Field|Collection local_status(string $label = null)
+     * @method Show\Field|Collection deposit_status(string $label = null)
      * @method Show\Field|Collection min_order_amount(string $label = null)
      * @method Show\Field|Collection price_1st(string $label = null)
      * @method Show\Field|Collection price_2st(string $label = null)
@@ -1092,6 +1145,8 @@ namespace Dcat\Admin {
      * @method Show\Field|Collection before_lvl(string $label = null)
      * @method Show\Field|Collection change_lvl(string $label = null)
      * @method Show\Field|Collection revoke_id(string $label = null)
+     * @method Show\Field|Collection is_deposit(string $label = null)
+     * @method Show\Field|Collection deposit_stock(string $label = null)
      * @method Show\Field|Collection rate(string $label = null)
      * @method Show\Field|Collection service_amount(string $label = null)
      * @method Show\Field|Collection account_amount(string $label = null)
@@ -1143,8 +1198,8 @@ namespace Dcat\Admin {
      * @method Show\Field|Collection after_expire_at(string $label = null)
      * @method Show\Field|Collection remain_quantity(string $label = null)
      * @method Show\Field|Collection gift_for_sku_id(string $label = null)
+     * @method Show\Field|Collection is_gift(string $label = null)
      * @method Show\Field|Collection max(string $label = null)
-     * @method Show\Field|Collection shipping_fee(string $label = null)
      * @method Show\Field|Collection products_total_amount(string $label = null)
      * @method Show\Field|Collection note(string $label = null)
      * @method Show\Field|Collection user_coupon_id(string $label = null)
@@ -1233,41 +1288,31 @@ namespace Dcat\Admin {
      * @method Show\Field|Collection status_remark(string $label = null)
      * @method Show\Field|Collection old_password(string $label = null)
      */
-    class Show
-    {
-    }
+    class Show {}
 
     /**
      * @method \App\Admin\Extensions\Form\Product\SelectAttr selectAttr(...$params)
      * @method \App\Admin\Extensions\Form\Product\SelectSpec selectSpec(...$params)
      */
-    class Form
-    {
-    }
+    class Form {}
 
 }
 
 namespace Dcat\Admin\Grid {
     /**
-
+     * @method $this circleDot(...$params)
      */
-    class Column
-    {
-    }
+    class Column {}
 
     /**
-
+     
      */
-    class Filter
-    {
-    }
+    class Filter {}
 }
 
 namespace Dcat\Admin\Show {
     /**
      * @method $this showLabel(...$params)
      */
-    class Field
-    {
-    }
+    class Field {}
 }
diff --git a/resources/lang/zh_CN/bargain-activity.php b/resources/lang/zh_CN/bargain-activity.php
new file mode 100644
index 00000000..96bec3e3
--- /dev/null
+++ b/resources/lang/zh_CN/bargain-activity.php
@@ -0,0 +1,22 @@
+<?php
+
+return [
+    'labels' => [
+        'BargainActivity' => '砍价活动',
+        'bargain-activities' => '砍价活动',
+    ],
+    'fields' => [
+        'name' => '活动名称',
+        'description' => '活动描述',
+        'is_enable' => '是否开启',
+        'rules' => '砍价规则',
+        'times' => '有效刀',
+        'expire_hours' => '过期小时',
+        'start_at' => '开始时间',
+        'end_at' => '结束时间',
+        'skus'=>'关联商品',
+        'images' => '活动图',
+    ],
+    'options' => [
+    ],
+];