diff --git a/app/Admin/Controllers/AppVersionController.php b/app/Admin/Controllers/AppVersionController.php index 5d3781c3..537f582f 100644 --- a/app/Admin/Controllers/AppVersionController.php +++ b/app/Admin/Controllers/AppVersionController.php @@ -3,6 +3,7 @@ namespace App\Admin\Controllers; use App\Admin\Repositories\AppVersion; +use Carbon\Carbon; use Dcat\Admin\Admin; use Dcat\Admin\Form; use Dcat\Admin\Grid; @@ -94,13 +95,49 @@ class AppVersionController extends AdminController $form->textarea('context')->required(); $form->text('name')->required(); $form->number('v')->min(0); - $form->radio('cate')->options([ + $form->radio('cate') + ->when(1, function (Form $form) { + $form->text('apk_link1')->rules('required_if:cate,1'); + }) + ->when(2, function (Form $form) { + $form->file('apk_link2')->chunked() + ->accept('apk', 'apk/*') + ->move('app-vesrion/apk/'.Carbon::now()->toDateString()) + ->maxSize(204800)//默认最大200M + ->saveFullUrl() + ->removable(false) + ->autoSave(false) + ->autoUpload()->rules('required_if:cate,2')->customFormat(function ($v) { + if ($this->model()->cate == 2) { + $v = $this->model()->apk_link; + } + return $v; + }); + }) + ->options([ 1=>'苹果', 2=>'安卓', ]); $form->switch('is_force'); - $form->text('apk_link')->required(); - $form->text('wgt_link'); + + $form->file('wgt_link')->chunked() + ->accept('wgt', 'wgt/*') + ->move('app-vesrion/wgt/'.Carbon::now()->toDateString()) + ->maxSize(204800)//默认最大200M + ->saveFullUrl() + ->removable(false) + ->autoSave(false) + ->autoUpload(); + + $form->hidden('apk_link'); + + $form->saving(function (Form $form) { + $apk_link = 'apk_link'.$form->cate; + $form->apk_link = $form->$apk_link; + + $form->deleteInput('apk_link1'); + $form->deleteInput('apk_link2'); + }); $form->display('created_at'); $form->display('updated_at'); diff --git a/app/Admin/Controllers/ArticleController.php b/app/Admin/Controllers/ArticleController.php index b5c4e493..33621c9d 100644 --- a/app/Admin/Controllers/ArticleController.php +++ b/app/Admin/Controllers/ArticleController.php @@ -146,6 +146,7 @@ class ArticleController extends AdminController $form->file('media_content2')->chunked() ->accept('mp3', 'mp3/*') ->move('articles/media/'.Carbon::now()->toDateString()) + ->maxSize(204800)//默认最大200M ->saveFullUrl() ->removable(false) ->autoUpload()->autoSave(false)->customFormat(function ($v) { @@ -158,6 +159,7 @@ class ArticleController extends AdminController $form->file('media_content3')->chunked() ->accept('mp4', 'mp4/*') ->move('articles/media/'.Carbon::now()->toDateString()) + ->maxSize(204800)//默认最大200M ->saveFullUrl() ->removable(false) ->autoUpload()->autoSave(false)->customFormat(function ($v) { diff --git a/app/Admin/Controllers/ProductSkuController.php b/app/Admin/Controllers/ProductSkuController.php index d2048307..96ccdebf 100644 --- a/app/Admin/Controllers/ProductSkuController.php +++ b/app/Admin/Controllers/ProductSkuController.php @@ -86,8 +86,10 @@ class ProductSkuController extends AdminController $form->file('media')->chunked() ->accept('mp4', 'mp4/*') ->move('prduct-sku-medias/'.Carbon::now()->toDateString()) + ->maxSize(204800)//默认最大200M ->saveFullUrl() ->removable(false) + ->autoSave(false) ->autoUpload(); $form->editor('description'); $form->select('buynote_id')->options(ProductBuynote::all()->pluck('name', 'id')); diff --git a/app/Admin/Controllers/ProductSpuController.php b/app/Admin/Controllers/ProductSpuController.php index beff31c0..bf30a6b2 100644 --- a/app/Admin/Controllers/ProductSpuController.php +++ b/app/Admin/Controllers/ProductSpuController.php @@ -142,8 +142,10 @@ class ProductSpuController extends AdminController $form->file('media')->chunked() ->accept('mp4', 'mp4/*') ->move('prduct-spu-medias/'.Carbon::now()->toDateString()) + ->maxSize(204800)//默认最大200M ->saveFullUrl() ->removable(false) + ->autoSave(false) ->autoUpload(); $form->multipleSelect('features')->options(ProductFeature::all()->pluck('name', 'id'))->customFormat(function ($v) { if (! $v) { diff --git a/resources/lang/zh_CN/app-version.php b/resources/lang/zh_CN/app-version.php index e7b7a6e4..a6726fac 100644 --- a/resources/lang/zh_CN/app-version.php +++ b/resources/lang/zh_CN/app-version.php @@ -13,6 +13,8 @@ return [ 'cate' => '平台', 'is_force' => '强制更新', 'apk_link' => '全量包', + 'apk_link1' => '苹果商店', + 'apk_link2'=> '安卓包', 'wgt_link' => '增量包', ], 'options' => [