作者 李宇航

合并分支 'lyh_edit' 到 'master'

修改上传图片提示文案



查看合并请求 !516
@@ -451,7 +451,7 @@ class ImageController extends Controller @@ -451,7 +451,7 @@ class ImageController extends Controller
451 foreach ($files as $file){ 451 foreach ($files as $file){
452 if(isset($this->cache['image_max']) && ($this->cache['image_max'] != 0)){ 452 if(isset($this->cache['image_max']) && ($this->cache['image_max'] != 0)){
453 if ($file->getSize() > $this->cache['image_max'] * 1024) { 453 if ($file->getSize() > $this->cache['image_max'] * 1024) {
454 - $this->response('图片最大为1024K',Code::SYSTEM_ERROR); 454 + $this->response('图片最大为'.$this->cache['image_max'],Code::SYSTEM_ERROR);
455 } 455 }
456 }else{ 456 }else{
457 if ($file->getSize() > $max) { 457 if ($file->getSize() > $max) {
@@ -462,7 +462,7 @@ class ImageController extends Controller @@ -462,7 +462,7 @@ class ImageController extends Controller
462 }else{ 462 }else{
463 if(isset($this->cache['image_max']) && ($this->cache['image_max'] != 0)){ 463 if(isset($this->cache['image_max']) && ($this->cache['image_max'] != 0)){
464 if ($files->getSize() > $this->cache['image_max'] * 1024) { 464 if ($files->getSize() > $this->cache['image_max'] * 1024) {
465 - $this->response('图片最大为1024K',Code::SYSTEM_ERROR); 465 + $this->response('图片最大为'.$this->cache['image_max'],Code::SYSTEM_ERROR);
466 } 466 }
467 }else{ 467 }else{
468 if ($files->getSize() > $max) { 468 if ($files->getSize() > $max) {