diff --git a/app/Admin/Controllers/ProjectArticleController.php b/app/Admin/Controllers/ProjectArticleController.php index aad21f1..8d9f8f6 100644 --- a/app/Admin/Controllers/ProjectArticleController.php +++ b/app/Admin/Controllers/ProjectArticleController.php @@ -69,7 +69,7 @@ class ProjectArticleController extends AdminController amis()->selectControl('cate', __('admin.project_articles.cate'))->options(ProjectCate::get()->pluck('title', 'id'))->required(true), amis()->TextControl('type', __('admin.project_articles.type'))->value(ProjectArticle::TYPE_ARTICLE)->hidden(true), // Components::make()->keywordsTagControl('t_ids', __('admin.articles.tags'), 'article_tag'), - Components::make()->cropImageControl('cover', __('admin.project_articles.cover'))->required(true), + Components::make()->cropImageControl('cover', __('admin.project_articles.cover'), 0.775)->required(true), Components::make()->sortControl('sort', __('admin.project_articles.sort')), // amis()->DateTimeControl('published_at', __('admin.project_articles.published_at'))->format('YYYY-MM-DD HH:mm:ss')->description(__('admin.project_articles.published_at_remark')), amis()->SwitchControl('is_enable', __('admin.project_articles.is_enable'))->value(false), diff --git a/app/Admin/Controllers/ProjectCateController.php b/app/Admin/Controllers/ProjectCateController.php index ad8562d..9e2b553 100644 --- a/app/Admin/Controllers/ProjectCateController.php +++ b/app/Admin/Controllers/ProjectCateController.php @@ -55,7 +55,7 @@ class ProjectCateController extends AdminController amis()->Grid()->columns([ amis()->Wrapper()->body([ amis()->TextControl('title', __('admin.project_cates.title'))->required(true), - Components::make()->cropImageControl('cover', __('admin.project_cates.cover'))->required(true), + Components::make()->cropImageControl('cover', __('admin.project_cates.cover'), 1.68)->required(true), amis()->TextareaControl('description', __('admin.project_cates.description')), Components::make()->sortControl('sort', __('admin.project_cates.sort')), ]) diff --git a/app/Admin/Controllers/ProjectFlowController.php b/app/Admin/Controllers/ProjectFlowController.php index f7b5e0c..91f9c04 100644 --- a/app/Admin/Controllers/ProjectFlowController.php +++ b/app/Admin/Controllers/ProjectFlowController.php @@ -69,7 +69,7 @@ class ProjectFlowController extends AdminController amis()->selectControl('cate', __('admin.project_articles.cate'))->options(ProjectCate::get()->pluck('title', 'id'))->required(true), amis()->TextControl('type', __('admin.project_articles.type'))->value(ProjectArticle::TYPE_FLOW)->hidden(true), // Components::make()->keywordsTagControl('t_ids', __('admin.articles.tags'), 'article_tag'), - Components::make()->cropImageControl('cover', __('admin.project_articles.cover'))->required(true), + Components::make()->imageControl('cover', __('admin.project_articles.cover'))->required(true), Components::make()->sortControl('sort', __('admin.project_articles.sort')), // amis()->DateTimeControl('published_at', __('admin.project_articles.published_at'))->format('YYYY-MM-DD HH:mm:ss')->description(__('admin.project_articles.published_at_remark')), amis()->SwitchControl('is_enable', __('admin.project_articles.is_enable'))->value(false), diff --git a/app/Admin/Controllers/ProjectPhotoController.php b/app/Admin/Controllers/ProjectPhotoController.php index e1f07d3..f52c66e 100644 --- a/app/Admin/Controllers/ProjectPhotoController.php +++ b/app/Admin/Controllers/ProjectPhotoController.php @@ -69,7 +69,7 @@ class ProjectPhotoController extends AdminController amis()->selectControl('cate', __('admin.project_articles.cate'))->options(ProjectCate::get()->pluck('title', 'id'))->required(true), amis()->TextControl('type', __('admin.project_articles.type'))->value(ProjectArticle::TYPE_PHOTO)->hidden(true), // Components::make()->keywordsTagControl('t_ids', __('admin.articles.tags'), 'article_tag'), - Components::make()->cropImageControl('cover', __('admin.project_articles.cover'))->required(true), + Components::make()->cropImageControl('cover', __('admin.project_articles.cover'), 1.67)->required(true), Components::make()->sortControl('sort', __('admin.project_articles.sort')), // amis()->DateTimeControl('published_at', __('admin.project_articles.published_at'))->format('YYYY-MM-DD HH:mm:ss')->description(__('admin.project_articles.published_at_remark')), amis()->SwitchControl('is_enable', __('admin.project_articles.is_enable'))->value(false), diff --git a/app/Traits/UploadTrait.php b/app/Traits/UploadTrait.php index cf5f7f0..05a7e91 100644 --- a/app/Traits/UploadTrait.php +++ b/app/Traits/UploadTrait.php @@ -96,7 +96,7 @@ trait UploadTrait switch($file['state']){ case 'init': if(strpos($file['value'], 'temporary') !== false){ - $filePath = $path.'/'.$file['name']; + $filePath = $path.'/'.($file['name'] ?? $file['id']); Storage::disk(Admin::config('admin.upload.disk'))->move($file['value'], $filePath); $fileArr[] = Storage::disk(Admin::config('admin.upload.disk'))->url($filePath); }else{ diff --git a/database/seeders/AdminMenuSeeder.php b/database/seeders/AdminMenuSeeder.php index dd546a2..c8ec311 100644 --- a/database/seeders/AdminMenuSeeder.php +++ b/database/seeders/AdminMenuSeeder.php @@ -29,13 +29,16 @@ class AdminMenuSeeder extends Seeder ['title'=> 'project_advances', 'icon'=>'', 'url'=>'/project_advances', 'order'=>5], ] ], - ['title' => 'web_content', 'icon' => 'ic:outline-collections-bookmark', 'url' => '/web_content', 'order'=>3, + ['title'=>'case_studies', 'icon'=>'carbon:cloud-satellite-services','url'=>'/case_study_articles', 'order'=>3], + ['title' => 'web_content', 'icon' => 'ic:outline-collections-bookmark', 'url' => '/web_content', 'order'=>4, 'children' =>[ ['title'=>'news', 'icon'=>'','url'=>'/articles', 'order'=>1], ['title'=>'ads', 'icon'=>'','url'=>'/ads', 'order'=>2], ] ], - ['title' => 'admin_system', 'icon' => 'material-symbols:settings-outline', 'url' => '/system', 'order'=>4, + ['title'=> 'contacts', 'icon'=>'fluent-mdl2:chat-invite-friend','url'=>'/contacts', 'order'=>5], + ['title'=> 'friend_links' , 'icon'=>'carbon:ibm-cloud-direct-link-2-connect','url'=>'/contacts', 'order'=>6], + ['title' => 'admin_system', 'icon' => 'material-symbols:settings-outline', 'url' => '/system', 'order'=>7, 'children' => [ ['title' => 'admin_users', 'icon' => '', 'url' => '/system/admin_users', 'order'=>1], ['title' => 'admin_roles', 'icon' => '', 'url' => '/system/admin_roles', 'order'=>2], @@ -45,17 +48,8 @@ class AdminMenuSeeder extends Seeder ['title' => 'keywords', 'icon' => '', 'url' => '/system/keywords', 'order'=>6] ], ], - - // ['title'=>'case_studies', 'icon'=>'lets-icons:img-box','url'=>'', 'order'=>2, - // 'children'=>[ - // ['title'=> 'case_study_tags', 'icon'=>'lets-icons:img-box','url'=>'/case_study_tags', 'order'=>1 ], - // ['title'=> 'case_study_articles', 'icon'=>'lets-icons:img-box','url'=>'/case_study_articles', 'order'=>2 ], - // ] - // ], - // ['title'=> 'news', 'icon'=>'lets-icons:img-box','url'=>'/news', 'order'=>3], - // ['title'=> 'contacts', 'icon'=>'lets-icons:img-box','url'=>'/contacts', 'order'=>4], - // ['title'=> 'friend_links' , 'icon'=>'lets-icons:img-box','url'=>'/contacts', 'order'=>5] + ]; DB::table('admin_menus')->truncate(); diff --git a/database/seeders/KeywordSeeder.php b/database/seeders/KeywordSeeder.php index f5f4649..3863834 100644 --- a/database/seeders/KeywordSeeder.php +++ b/database/seeders/KeywordSeeder.php @@ -17,14 +17,14 @@ class KeywordSeeder extends Seeder { Keyword::truncate(); $list = [ - ['key' => 'article_category', 'name' => '文章分类', 'list' => [ - 'examples'=>'案例', 'services' =>'服务', 'news'=> '资讯动态' - ]], - // ['key' => 'article_tag', 'name' => '文章标签', 'list' => [//标签value填写色号，指定标签颜色 - + // ['key' => 'article_category', 'name' => '文章分类', 'list' => [ + // 'examples'=>'案例', 'services' =>'服务', 'news'=> '资讯动态' // ]], + ['key' => 'case_study_tag', 'name' => '服务分类标签', 'list' => [//标签value填写色号，指定标签颜色 + + ]], ['key' => 'banner_address', 'name' => '广告位置', 'list' => [ - 'index-top'=>'首页', 'service-top' =>'服务项目', 'examples-top'=> '案例展示', 'companny-top'=>'公司介绍','contactus-top'=>'联系我们','news-top'=>'资讯动态' + 'index-top'=>'首页', 'companny-top' =>'关于我们', 'project-top'=>'业务范围', 'examples-top'=> '案例展示', 'news-top'=>'资讯动态','contactus-top'=>'联系我们' ]], ]; diff --git a/lang/zh_CN/admin.php b/lang/zh_CN/admin.php index 40c488c..794019f 100644 --- a/lang/zh_CN/admin.php +++ b/lang/zh_CN/admin.php @@ -256,6 +256,20 @@ return [ 'invalid_package' => '无效的扩展包', ], ], + 'components'=>[ + 'parent_select' => '父级', + 'order' => '排序', + 'content' => '内容', + 'files' => '文件', + 'tag' => '标签', + 'status' => '状态', + 'status_map' => [ + 'enabled' => '开启', + 'disabled'=> '关闭' + ], + 'decimal' => '金额', + + ], 'export' => [ 'title' => '导出', 'all' => '全部',