banner多字段market_ids

app/Admin/Controllers/BannerController.php

@@ -84,7 +84,9 @@ class BannerController extends AdminController
             $form->hidden('id');
             // 市场
             $marketList = MarketModel::getMarket();
-            $form->select('market_id')->width(4)->options($marketList);
+            $form->select('market_id')->width(4)->options($marketList)->default(0);
+            // 多个市场
+            $form->multipleSelect('market_ids')->options($marketList);
             $form->select('type')->options(BannerModel::$_type)->required();
             $form->text('title')->required();
             $form->text('sub_title');
@@ -92,7 +94,7 @@ class BannerController extends AdminController
             $form->select('cover_type')->options(BannerModel::$_coverType)->required();
             $form->text('path')->default('');
             $form->select('path_type')->options(BannerModel::$_pathType)->default('');
-            $form->text('sort');
+            $form->number('sort')->width(2)->default(0);
             
 
             $form->disableResetButton();

app/Admin/Controllers/CategoryController.php

@@ -21,8 +21,10 @@ class CategoryController extends AdminController
                 $tree->branch(function ($branch) {
                     $src = $branch['cover_img_url'];
                     $logo = "<img src='$src' style='margin-left: 20px; max-width:35px;max-height:35px' class='img'/>";
+
+                    $actions = '<a href="/admin/category/TieForm/'.$branch['id'].'" style="margin-left: 20px;">绑定</a>';
                 
-                    return "{$branch['id']} - {$branch['title']}  $logo";
+                    return "{$branch['id']} - {$branch['title']}  $logo  $actions";
                 });
 
                 $row->column(12, $tree);

app/Admin/Controllers/GoodsController.php

@@ -7,7 +7,7 @@ use Dcat\Admin\Form;
 use Dcat\Admin\Grid;
 use Dcat\Admin\Show;
 use Dcat\Admin\Controllers\AdminController;
-use App\Models\GoodsType as GoodsTypeModel;
+use App\Models\Category as CategoryModel;
 use App\Models\Store as StoreModel;
 use Dcat\Admin\Form\NestedForm;
 use App\Models\Goods as GoodsModel;
@@ -26,9 +26,9 @@ class GoodsController extends AdminController
             $grid->id->sortable();
             $grid->cover_img_url->image('',50);
             $grid->name;
-            $grid->goods_type_id->display(function ($goodsTypeId){
-                $goodsType = GoodsTypeModel::getGoodsInfo($goodsTypeId,'type_name');
-                return empty($goodsType) ? '' : $goodsType->type_name;
+            $grid->category_id->display(function ($categoryId){
+                $category = CategoryModel::getCategoryInfo($categoryId,'title');
+                return empty($category) ? '' : $category->title;
             });
             $grid->store_id->display(function ($storeId){
                 $store = StoreModel::getStoreInfo($storeId,'name');
@@ -96,16 +96,16 @@ class GoodsController extends AdminController
         return Form::make($builder, function (Form $form) {
             $form->hidden('id');
 
-            // 二级分类（商品分类）
-            $goodsTypeList = GoodsTypeModel::getGoodsTypeArray();
+            // 二级分类 
+            $categoryList = CategoryModel::getCategoryArray([['parent_id','>',0]]);
             // 店铺
             $storeList = StoreModel::getStoreArray();
             //市场
             $marketList = MarketModel::getMarket();
 
-            $form->column(6, function (Form $form) use($marketList,$storeList,$goodsTypeList ){
+            $form->column(6, function (Form $form) use($marketList,$storeList,$categoryList ){
                 $form->select('market_id')->required()->options($marketList);
-                $form->select('goods_type_id')->required()->options($goodsTypeList);
+                $form->select('category_id')->required()->options($categoryList);
                 $form->select('store_id')->required()->options($storeList);
                 $form->text('name')->required()->maxLength(20);
                 $form->image('cover_img')->required();

app/Admin/Controllers/StoreController.php

@@ -14,6 +14,7 @@ use App\Admin\Common\StoreQRCode;
 use App\Admin\Repositories\StoreType;
 use App\Models\Store as StoreModel;
 use App\Models\ImsCjdcUser as UserModel;
+use App\Models\Category as CategoryModel;
 
 class StoreController extends AdminController
 {
@@ -113,8 +114,8 @@ class StoreController extends AdminController
             $mmList = MminfoModel::getMmInfoArray();
             // 查询市场
             $marketList = MarketModel::getMarket();
-            // 查询一级分类（店铺分类）
-            $storeTypeList = StoreTypeModel::getStoreTypeArray();
+            // 查询一级分类
+            $storeTypeList = CategoryModel::getCategoryArray([['parent_id','=',0]]);
             // 用户
             $userList = UserModel::getUserArray();
 

app/Admin/routes.php

@@ -45,13 +45,14 @@ Route::group([
     $router->resource('/storeUserReport', 'StoreUserReportController');
 
     // 分类
-    $router->resource('/storeType', 'StoreTypeController');
-    $router->resource('/goodsType', 'GoodsTypeController');
     $router->resource('/category', 'CategoryController');
+    $router->get('/category/TieForm', 'CategoryTieController@CategoryTieForm');
+
     // 店铺
     $router->resource('/store', 'StoreController');
     // 商品
     $router->resource('/goods', 'GoodsController');
     // banner
     $router->resource('/banner', 'BannerController');
+    
 });

app/Models/Banner.php

@@ -17,6 +17,9 @@ class Banner extends Model
     protected $appends = [
         'cover_url',
     ];
+    protected $casts = [
+        'market_ids'=>'array',
+    ];
 
     public static $_coverType = [1=>'图片', 2=>'视频'];
     public static $_pathType = ['page'=>'page','webview'=>'webview','applet'=>'applet'];

app/Models/Category.php

@@ -31,6 +31,18 @@ class Category extends Model
         $value = $value ? $value : $this->cover_img;
         return $this->imageUrl($value);
     }
+
+    /**
+     * 获取单个信息
+     * @param int $id
+     * @param string $field
+     * @return string
+     */
+    public static function getCategoryInfo($id,$field = '*')
+    {
+        return self::select($field)->find($id);
+    }
+
     /**
      * 获取二级分类数组
      * id为键，name为值

resources/lang/zh-CN/banner.php

@@ -6,6 +6,7 @@ return [
     ],
     'fields' => [
         'market_id' => '市场',
+        'market_ids' => '多选市场',
         'title' => '标题',
         'sub_title' => '副标题',
         'cover' => '封面图',