diff --git a/Addons/UploadImages/upload.html b/Addons/UploadImages/upload.html index 45245d6d3..b633ed7ab 100644 --- a/Addons/UploadImages/upload.html +++ b/Addons/UploadImages/upload.html @@ -45,7 +45,7 @@ $('.btn-close-{$name}').click(function(event) { 'fileTypeExts' : '*.jpg; *.jpeg; *.png; *.gif;', "onUploadSuccess" : uploadPicture{$name}, 'onFallback' : function() { - alert('未检测到兼容版本的Flash.'); + // alert('未检测到兼容版本的Flash.'); } }); }) diff --git a/Application/Admin/Controller/FileController.class.php b/Application/Admin/Controller/FileController.class.php index a9db7bd78..24f32d3a4 100644 --- a/Application/Admin/Controller/FileController.class.php +++ b/Application/Admin/Controller/FileController.class.php @@ -202,10 +202,11 @@ class FileController extends AdminController /* 调用文件上传组件上传文件 */ $Picture = D('Picture'); $pic_driver = C('PICTURE_UPLOAD_DRIVER'); + // dd(I('icon')); if (I('icon')) { - if ($_FILES['file']['size'] > 51200) { - $return = array('status' => 1001, 'info' => '图片大小不得超过50k', 'data' => ''); + if ($_FILES['file']['size'] > 2*1024*1024) { + $return = array('status' => 1001, 'info' => '图片大小不得超过2M', 'data' => ''); $this->ajaxReturn($return); } } diff --git a/Application/Admin/View/Game/add.html b/Application/Admin/View/Game/add.html index 0cf95aabd..bb4fc360f 100644 --- a/Application/Admin/View/Game/add.html +++ b/Application/Admin/View/Game/add.html @@ -49,6 +49,14 @@ + + 游戏原包名称: + + + + + + 游戏类型: @@ -278,7 +286,7 @@ - 尺寸不得小于512*512px,圆角半径113px,不强制要求,可直接提供512*512方图 + 尺寸不得小于512*512px,圆角半径113px,不强制要求,可直接提供512*512方图,不得大于2M @@ -1468,7 +1476,7 @@ thumb:true, compress:false, prepareNextFile: true, - formData: function(){return $.extend(true, {}, userInfo);}, + formData: function(){return $.extend(true, {icon:1}, userInfo);}, chunked:false, duplicate: true }); @@ -1567,6 +1575,11 @@ return false; }); + if (response.status==1001) { + alert('图片大小不得超过2M'); + $('#icon_thelist').children().last().remove(); + location.reload() + } }); function setIconVal() diff --git a/Application/Admin/View/Game/edit.html b/Application/Admin/View/Game/edit.html index ee9a72c58..a2c185650 100644 --- a/Application/Admin/View/Game/edit.html +++ b/Application/Admin/View/Game/edit.html @@ -316,7 +316,7 @@ - 尺寸不得小于125*125px,大小不得超过50K + 尺寸不得小于512*512px,圆角半径113px,不强制要求,可直接提供512*512方图,不得大于2M @@ -2586,7 +2586,7 @@ }); if (response.status==1001) { - alert('图片大小不得超过50k'); + alert('图片大小不得超过2M'); $('#icon_thelist').children().last().remove(); location.reload() } diff --git a/Application/Admin/View/Game/relation.html b/Application/Admin/View/Game/relation.html index 54fb1cca6..a4922054a 100644 --- a/Application/Admin/View/Game/relation.html +++ b/Application/Admin/View/Game/relation.html @@ -534,7 +534,7 @@ $("#upload_picture_icon").uploadify({ 'fileTypeExts' : '*.jpg; *.jpeg; *.png; *.gif;', "onUploadSuccess" : upload_picture_icon{$field.name}, 'onFallback' : function() { - alert('未检测到兼容版本的Flash.'); + // alert('未检测到兼容版本的Flash.'); } }); function upload_picture_icon{$field.name}(file, data){ @@ -569,7 +569,7 @@ $("#upload_picture_cover").uploadify({ 'fileTypeExts' : '*.jpg; *.jpeg; *.png; *.gif;', "onUploadSuccess" : upload_picture_cover{$field.name}, 'onFallback' : function() { - alert('未检测到兼容版本的Flash.'); + // alert('未检测到兼容版本的Flash.'); } }); function upload_picture_cover{$field.name}(file, data){ @@ -602,7 +602,7 @@ $("#upload_picture_detail").uploadify({ 'fileTypeExts' : '*.jpg; *.jpeg; *.png; *.gif;', "onUploadSuccess" : upload_picture_detail{$field.name}, 'onFallback' : function() { - alert('未检测到兼容版本的Flash.'); + // alert('未检测到兼容版本的Flash.'); } }); function upload_picture_detail{$field.name}(file, data){