moshaorui hace 5 meses
padre
commit
b09b4118c7

+ 3 - 3
app/Distributor/Controllers/ApiController.php

@@ -23,7 +23,7 @@ class ApiController extends Controller
             $obj = new DistProduct();
             $obj = new DistProduct();
             return $obj->model()->where('title', 'like', "%$q%")->paginate(null, ['id', 'title as text']);
             return $obj->model()->where('title', 'like', "%$q%")->paginate(null, ['id', 'title as text']);
         } else {
         } else {
-            // 获取最新的50
+            // 获取最新的N
             $selectOptionsNew =  DistProduct::selectOptionsNew();
             $selectOptionsNew =  DistProduct::selectOptionsNew();
             return $this->changeOptions($selectOptionsNew);
             return $this->changeOptions($selectOptionsNew);
         }
         }
@@ -37,7 +37,7 @@ class ApiController extends Controller
             $obj = new SitePages();
             $obj = new SitePages();
             return $obj->model()->where('title', 'like', "%$q%")->paginate(null, ['id', 'title as text']);
             return $obj->model()->where('title', 'like', "%$q%")->paginate(null, ['id', 'title as text']);
         } else {
         } else {
-            // 获取最新的50
+            // 获取最新的N
             $selectOptionsNew =  SitePages::selectOptionsNew();
             $selectOptionsNew =  SitePages::selectOptionsNew();
             return $this->changeOptions($selectOptionsNew);
             return $this->changeOptions($selectOptionsNew);
         }
         }
@@ -51,7 +51,7 @@ class ApiController extends Controller
             $obj = new SitePagesTag();
             $obj = new SitePagesTag();
             return $obj->model()->where('name', 'like', "%$q%")->paginate(null, ['id', 'name as text']);
             return $obj->model()->where('name', 'like', "%$q%")->paginate(null, ['id', 'name as text']);
         } else {
         } else {
-            // 获取最新的50
+            // 获取最新的N
             $selectOptionsNew =  SitePagesTag::selectOptionsNew();
             $selectOptionsNew =  SitePagesTag::selectOptionsNew();
             return $this->changeOptions($selectOptionsNew);
             return $this->changeOptions($selectOptionsNew);
         }
         }

+ 3 - 1
app/Distributor/Controllers/SiteMenuController.php

@@ -104,12 +104,14 @@ class SiteMenuController extends AdminDistController
             //类型
             //类型
             $form->select('menu_type')->options(admin_trans_array(config('dictionary.menu_type')))->required()
             $form->select('menu_type')->options(admin_trans_array(config('dictionary.menu_type')))->required()
                 ->when(1, function (Form $form) use ($menuConfig,$thisObject) {
                 ->when(1, function (Form $form) use ($menuConfig,$thisObject) {
-                    //选择产品
+                    //选择集合类型
                     $form->select('collections_type')->options(admin_trans_array(config('dictionary.collections_type')))
                     $form->select('collections_type')->options(admin_trans_array(config('dictionary.collections_type')))
                         ->value($thisObject->getArrayValue('collections_type',$menuConfig))
                         ->value($thisObject->getArrayValue('collections_type',$menuConfig))
                         ->when(0, function (Form $form) use ($menuConfig,$thisObject) {
                         ->when(0, function (Form $form) use ($menuConfig,$thisObject) {
+                            //产品分类
                             $form->select('product_category')->options(DistProductCategory::selectOptions())->value($thisObject->getArrayValue('product_category',$menuConfig));
                             $form->select('product_category')->options(DistProductCategory::selectOptions())->value($thisObject->getArrayValue('product_category',$menuConfig));
                         })->when(1, function (Form $form) use ($menuConfig,$thisObject) {
                         })->when(1, function (Form $form) use ($menuConfig,$thisObject) {
+                            //文章标签
                             $form->select('pages_tag')->options('api/tag')->value($thisObject->getArrayValue('pages_tag',$menuConfig));
                             $form->select('pages_tag')->options('api/tag')->value($thisObject->getArrayValue('pages_tag',$menuConfig));
                         });
                         });
                 })
                 })

+ 2 - 1
app/Distributor/Controllers/SitePagesController.php

@@ -66,6 +66,7 @@ class SitePagesController extends AdminDistController
                 $filter->panel();
                 $filter->panel();
                 $filter->expand();
                 $filter->expand();
                 $filter->like('title')->width(2);
                 $filter->like('title')->width(2);
+                $filter->equal('pagesTag.id',admin_trans_label('tags'))->select('api/tag')->width(2);
             });
             });
             //权限与条件
             //权限与条件
             $grid->model()->where('dist_id', getDistributorId())->orderBy('id', 'desc');
             $grid->model()->where('dist_id', getDistributorId())->orderBy('id', 'desc');
@@ -122,7 +123,7 @@ class SitePagesController extends AdminDistController
         return Form::make(SitePages::with(['pagesTag']), function (Form $form) {
         return Form::make(SitePages::with(['pagesTag']), function (Form $form) {
             $form->text('title')->required();
             $form->text('title')->required();
             $form->text('author');
             $form->text('author');
-            $form->date('post_date')->format('YYYY-MM-DD')->required();
+            $form->date('post_date')->format('YYYY-MM-DD')->default(date('Y-m-d'))->required();
             $form->tags('pagesTag', '文章标签')
             $form->tags('pagesTag', '文章标签')
                 ->setView('admin.form_custom.tags')
                 ->setView('admin.form_custom.tags')
                 ->pluck('name', 'name') // name 为需要显示的 Tag 模型的字段,id 为主键
                 ->pluck('name', 'name') // name 为需要显示的 Tag 模型的字段,id 为主键