Merge branch 'develop' of http://47.244.231.31:8099/zhl/globalso-v6 into develop
正在显示
2 个修改的文件
包含
1 行增加
和
3 行删除
| @@ -29,6 +29,7 @@ class ProductLogic extends BaseLogic | @@ -29,6 +29,7 @@ class ProductLogic extends BaseLogic | ||
| 29 | public function getList(array $map = [], array $sort = ['id' => 'desc'], array $columns = ['*'], int $limit = 20) | 29 | public function getList(array $map = [], array $sort = ['id' => 'desc'], array $columns = ['*'], int $limit = 20) |
| 30 | { | 30 | { |
| 31 | $data = parent::getList($map, $sort, $columns, $limit); | 31 | $data = parent::getList($map, $sort, $columns, $limit); |
| 32 | + | ||
| 32 | foreach ($data['list'] as &$v){ | 33 | foreach ($data['list'] as &$v){ |
| 33 | $v = $this->formatData($v); | 34 | $v = $this->formatData($v); |
| 34 | } | 35 | } |
| @@ -43,9 +43,6 @@ class ProductRequest extends FormRequest | @@ -43,9 +43,6 @@ class ProductRequest extends FormRequest | ||
| 43 | if (empty($v['url'])) { | 43 | if (empty($v['url'])) { |
| 44 | $fail('图片链接不能为空'); | 44 | $fail('图片链接不能为空'); |
| 45 | } | 45 | } |
| 46 | - if (!Str::contains($v['url'], env('UPLOAD_LOCAL_URL') ?: env('APP_URL'))) { | ||
| 47 | - $fail('图片链接不正确'); | ||
| 48 | - } | ||
| 49 | } | 46 | } |
| 50 | }], | 47 | }], |
| 51 | 'attrs' => ['array', function ($attribute, $value, $fail) { | 48 | 'attrs' => ['array', function ($attribute, $value, $fail) { |
-
请 注册 或 登录 后发表评论