diff --git a/app/Admin/Forms/v3/GoodsActivitySettingForm.php b/app/Admin/Forms/v3/GoodsActivitySettingForm.php index 2e477cd..1653f3b 100644 --- a/app/Admin/Forms/v3/GoodsActivitySettingForm.php +++ b/app/Admin/Forms/v3/GoodsActivitySettingForm.php @@ -41,15 +41,23 @@ class GoodsActivitySettingForm extends Form $activitySetting = [ 'index_activity_type' => $this->indexOptionsValue[$input['index_activity_type']] ?? $this->indexOptionsValue[0] ]; - + $imageUrl = config('filesystems.disks.oss.img_host'); switch($activitySetting['index_activity_type']){ case 'flash_sale': + $banner1 = $input['banner_1']; + $bLen = empty($banner1) ? 1 : strrpos($banner1,'http'); + $banner = $bLen !== false ? $banner1 : $imageUrl.'/'.$banner1 ; + + $image1 = $input['index_image_1']; + $iLen = empty($image1) ? 1 : strrpos($image1,'http'); + $image = $iLen !== false ? $image1 : $imageUrl.'/'.$image1 ; + $setting = [ 'buy_num_limit' => $input['buy_num_limit_1'] ?? 0, - 'banner' => $input['banner_1'] ?? '', + 'banner' => $banner, 'show_type' => $this->typeOptionsValue[$input['show_type_1']] ?? $this->typeOptionsValue[1], 'index_num_limit' => $input['index_num_1'] ?? 6, - 'index_image' => $input['index_image_1'] ?? '', + 'index_image' => $image, 'index_url' => $input['index_url_1'] ?? '', ]; $data = [ @@ -57,12 +65,20 @@ class GoodsActivitySettingForm extends Form ]; break; case 'group_buy': + $banner2 = $input['banner_2']; + $bLen = empty($banner2) ? 2 : strrpos($banner2,'http'); + $banner = $bLen !== false ? $banner2 : $imageUrl.'/'.$banner2 ; + + $image2 = $input['index_image_2']; + $iLen = empty($image2) ? 2 : strrpos($image2,'http'); + $image = $iLen !== false ? $image2 : $imageUrl.'/'.$image2 ; + $setting = [ 'buy_num_limit' => $input['buy_num_limit_2'] ?? 0, - 'banner' => $input['banner_2'] ?? '', + 'banner' => $banner, 'show_type' => $this->typeOptionsValue[$input['show_type_2']] ?? $this->typeOptionsValue[1], 'index_num_limit' => $input['index_num_2'] ?? 6, - 'index_image' => $input['index_image_2'] ?? '', + 'index_image' => $image, 'index_url' => $input['index_url_2'] ?? '', ]; $data = [ @@ -70,12 +86,20 @@ class GoodsActivitySettingForm extends Form ]; break; case 'new_product': + $banner3 = $input['banner_3']; + $bLen = empty($banner3) ? 3 : strrpos($banner3,'http'); + $banner = $bLen !== false ? $banner3 : $imageUrl.'/'.$banner3 ; + + $image3 = $input['index_image_3']; + $iLen = empty($image3) ? 3 : strrpos($image3,'http'); + $image = $iLen !== false ? $image3 : $imageUrl.'/'.$image3 ; + $setting = [ 'buy_num_limit' => $input['buy_num_limit_3'] ?? 0, - 'banner' => $input['banner_3'] ?? '', + 'banner' => $banner, 'show_type' => $this->typeOptionsValue[$input['show_type_3']] ?? $this->typeOptionsValue[1], 'index_num_limit' => $input['index_num_3'] ?? 6, - 'index_image' => $input['index_image_3'] ?? '', + 'index_image' => $image, 'index_url' => $input['index_url_3'] ?? '', ]; $data = [ @@ -134,7 +158,7 @@ class GoodsActivitySettingForm extends Form $sData = $settingData[1] ?? []; $showType = $sData['show_type'] ?? 'list'; $form->number('buy_num_limit_1','购买数量限制')->attribute('min', 0)->default(1)->value($buyNumLimit)->width(6)->help('同一活动类型的商品,单笔订单可购买商品个数'); - $form->image('banner_1','banner')->required()->autoUpload()->saveFullUrl() + $form->image('banner_1','banner')->required()->autoUpload() ->customFormat(function() use($sData){ return [$sData['banner'] ?? '']; })->width(3); @@ -144,7 +168,7 @@ class GoodsActivitySettingForm extends Form $form->number('index_num_1','首页显示数量')->value($sData['index_num'] ?? 6)->min(1)->default(6)->width(6); }) ->when([2],function(Form $form) use($sData){ - $form->image('index_image_1','首页大图')->autoUpload()->saveFullUrl() + $form->image('index_image_1','首页大图')->autoUpload() ->customFormat(function() use($sData){ return [$sData['index_image'] ?? '']; })->width(3); @@ -160,7 +184,7 @@ class GoodsActivitySettingForm extends Form $sData = $settingData[2] ?? []; $showType = $sData['show_type'] ?? 'list'; $form->number('buy_num_limit_2','购买数量限制')->attribute('min', 0)->default(1)->value($buyNumLimit)->width(6)->help('同一活动类型的商品,单笔订单可购买商品个数'); - $form->image('banner_2','banner')->required()->autoUpload()->saveFullUrl() + $form->image('banner_2','banner')->required()->autoUpload() ->customFormat(function() use($sData){ return [$sData['banner'] ?? '']; })->width(3); @@ -169,7 +193,7 @@ class GoodsActivitySettingForm extends Form $form->number('index_num_2','首页显示数量')->value($sData['index_num'] ?? 6)->min(1)->default(6)->width(6); }) ->when([2],function(Form $form) use($sData){ - $form->image('index_image_2','首页大图')->autoUpload()->saveFullUrl() + $form->image('index_image_2','首页大图')->autoUpload() ->customFormat(function() use($sData){ return [$sData['index_image'] ?? '']; })->width(3); @@ -184,7 +208,7 @@ class GoodsActivitySettingForm extends Form $sData = $settingData[3] ?? []; $showType = $sData['show_type'] ?? 'list'; $form->number('buy_num_limit_3','购买数量限制')->attribute('min', 0)->default(1)->value($buyNumLimit)->width(6)->help('同一活动类型的商品,单笔订单可购买商品个数'); - $form->image('banner_3','banner')->required()->autoUpload()->saveFullUrl() + $form->image('banner_3','banner')->required()->autoUpload() ->customFormat(function() use($sData){ return [$sData['banner'] ?? '']; })->width(3); @@ -194,7 +218,7 @@ class GoodsActivitySettingForm extends Form $form->number('index_num_3','首页显示数量')->value($sData['index_num'] ?? 6)->min(1)->default(6)->width(6); }) ->when([2],function(Form $form) use($sData){ - $form->image('index_image_3','首页大图')->autoUpload()->saveFullUrl() + $form->image('index_image_3','首页大图')->autoUpload() ->customFormat(function() use($sData){ return [$sData['index_image'] ?? '']; })->width(3);