From eea697fa234ae4907abcc161ddaba813a74a2903 Mon Sep 17 00:00:00 2001 From: liangyuyan <1103300295@qq.com> Date: Thu, 10 Sep 2020 11:32:16 +0800 Subject: [PATCH] =?UTF-8?q?=E5=95=86=E5=93=81=E6=B8=85=E6=B4=97--=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E7=AD=9B=E9=80=89=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/v3/BannersController.php | 4 ++-- .../v3/GoodsActivityController.php | 4 ++-- app/Admin/Controllers/v3/GoodsController.php | 4 ++-- .../Controllers/v3/GoodsNewController.php | 23 +++++++++++++------ app/Admin/Controllers/v3/StoreController.php | 10 ++++---- app/Admin/routes.php | 6 ++++- app/Models/v3/GoodsCategory.php | 2 +- 7 files changed, 33 insertions(+), 20 deletions(-) diff --git a/app/Admin/Controllers/v3/BannersController.php b/app/Admin/Controllers/v3/BannersController.php index 76d46eb..be3b5f8 100644 --- a/app/Admin/Controllers/v3/BannersController.php +++ b/app/Admin/Controllers/v3/BannersController.php @@ -98,10 +98,10 @@ class BannersController extends AdminController $form->number('sort')->default(0); $form->switch('status') ->customFormat(function ($v) { - return $v == '正常' ? 1 : 0; + return $v == 1 ? 1 : 0; }) ->saving(function ($v) { - return $v; + return $v == 1 ? 1 : 0; }); }); $form->column(6, function (Form $form) { diff --git a/app/Admin/Controllers/v3/GoodsActivityController.php b/app/Admin/Controllers/v3/GoodsActivityController.php index 37b9b0b..a37ab3b 100644 --- a/app/Admin/Controllers/v3/GoodsActivityController.php +++ b/app/Admin/Controllers/v3/GoodsActivityController.php @@ -184,10 +184,10 @@ class GoodsActivityController extends AdminController }); $form->switch('on_sale') ->customFormat(function ($v) { - return $v == '上架' ? 1 : 0; + return $v == 1 ? 1 : 0; }) ->saving(function ($v) { - return $v; + return $v == 1 ? 1 : 0; }); $form->saving(function (Form $form){ $storeId = $form->input('store_id'); diff --git a/app/Admin/Controllers/v3/GoodsController.php b/app/Admin/Controllers/v3/GoodsController.php index 34a9869..f1a6026 100644 --- a/app/Admin/Controllers/v3/GoodsController.php +++ b/app/Admin/Controllers/v3/GoodsController.php @@ -202,10 +202,10 @@ class GoodsController extends AdminController }); $form->switch('on_sale') ->customFormat(function ($v) { - return $v == '上架' ? 1 : 0; + return $v == 1 ? 1 : 0; }) ->saving(function ($v) { - return $v; + return $v == 1 ? 1 : 0; }); $form->disableResetButton(); diff --git a/app/Admin/Controllers/v3/GoodsNewController.php b/app/Admin/Controllers/v3/GoodsNewController.php index 043c22d..dce3f92 100644 --- a/app/Admin/Controllers/v3/GoodsNewController.php +++ b/app/Admin/Controllers/v3/GoodsNewController.php @@ -30,6 +30,10 @@ class GoodsNewController extends AdminController $categoryList = CategoryModel::getArray([['parent_id','>',0]],['选择分类'=>0]); // 店铺 $storeList = StoreModel::getStoreArray(); + // 商品类目 + $goodsCategoryList = GoodsCategoryModel::getArray([],['选择类目'=>0]); + //市场 + $marketList = MarketModel::getMarketArray(); $grid->id->sortable(); $grid->cover_img_url->image('',50); @@ -44,22 +48,27 @@ class GoodsNewController extends AdminController return empty($store) ? '' : $store->name; }); $grid->category_id->select($categoryList); + // ->load('goods_category_id', '/api/goods_category_list') // ->display(function ($categoryId){ // $item = CategoryModel::getInfo($categoryId,'title'); // return empty($item) ? '选择分类' : $item->title; // }); - $grid->goods_category_id->display(function ($goodsCategoryId){ - $item = GoodsCategoryModel::getInfo($goodsCategoryId,'title'); - return empty($item) ? '' : $item->title; - }); + $grid->goods_category_id->select($goodsCategoryList); + // ->display(function ($goodsCategoryId){ + // $item = GoodsCategoryModel::getInfo($goodsCategoryId,'title'); + // return empty($item) ? '' : $item->title; + // }); $grid->sort->sortable(); $grid->on_sale->switch(); $grid->actions([new GoodsNewCopy()]); - $grid->filter(function (Grid\Filter $filter) use($storeList){ + $grid->filter(function (Grid\Filter $filter) use($storeList, $categoryList, $goodsCategoryList, $marketList){ $filter->like('name'); $filter->equal('store_id')->select($storeList); + $filter->equal('category_id')->select($categoryList); + $filter->equal('goods_category_id')->select($goodsCategoryList); + $filter->equal('market_id')->select($marketList); }); $grid->model()->orderBy('category_id', 'asc'); @@ -208,10 +217,10 @@ class GoodsNewController extends AdminController }); $form->switch('on_sale') ->customFormat(function ($v) { - return $v == '上架' ? 1 : 0; + return $v == 1 ? 1 : 0; }) ->saving(function ($v) { - return $v; + return $v == 1 ? 1 : 0; }); $form->disableResetButton(); diff --git a/app/Admin/Controllers/v3/StoreController.php b/app/Admin/Controllers/v3/StoreController.php index 9b1a06f..163f4bc 100644 --- a/app/Admin/Controllers/v3/StoreController.php +++ b/app/Admin/Controllers/v3/StoreController.php @@ -160,18 +160,18 @@ class StoreController extends AdminController $form->number('sort'); $form->switch('is_rest') ->customFormat(function ($v) { - return $v == '休息' ? 1 : 0; + return $v == 1 ? 1 : 0; }) ->saving(function ($v) { - return $v; + return $v == 1 ? 1 : 0; }); $form->switch('is_open') ->customFormat(function ($v) { - return $v == '开启' ? 1 : 0; + return $v == 1 ? 1 : 0; }) ->saving(function ($v) { - return $v; - })->default(1); + return $v == 1 ? 1 : 0; + }); $form->text('address'); }); $form->column(6, function (Form $form) use($userList){ diff --git a/app/Admin/routes.php b/app/Admin/routes.php index c57b438..35f013f 100644 --- a/app/Admin/routes.php +++ b/app/Admin/routes.php @@ -59,6 +59,10 @@ Route::group([ // banner $router->resource('/banners', 'v3\BannersController'); - $router->any('/test', 'Test@test'); + $router->resource('/order', 'ImsCjdcOrderMainController'); + $router->any('/detail', 'ImsCjdcOrderMainController@orderDetail'); + + $router->resource('/horseman', 'LanzuServiceHorsemanController'); + $router->any('ops/files', 'v3\FileController@handle'); }); diff --git a/app/Models/v3/GoodsCategory.php b/app/Models/v3/GoodsCategory.php index fb0c086..a263c95 100644 --- a/app/Models/v3/GoodsCategory.php +++ b/app/Models/v3/GoodsCategory.php @@ -45,7 +45,7 @@ class GoodsCategory extends Model $new = array_merge($options,$list); return array_flip($new); }else{ - return $list; + return array_flip($list); } }