fe / yohobuy-portal-fe2 · Commits

Go to a project

Authored by leo
Commit 47d11d584aec492e781acc68bf1df71b7e5f220a 2 parents 07f65982 0ece4d99

Merge branch 'dev_店铺装修模块化' into test5.4.1

Inline Side-by-side
Showing 1 changed file with 11 additions and 4 deletions
... ... @@ -99,9 +99,13 @@ $.fn.ajaxfileupload = function (options) {
// 对文件大小做校验
if (file.size / 1024 > settings.size_limit) {
// 上传大小超出限制。
var message = '只允许上传大小' + settings.size_limit + 'KB以内的文件.';
if(files.length > 1) {
message += '第' + (index + 1) + '个文件不符合要求!'; // 这里，只有上传多张图片时，才提示不符合要求的图片索引；否则，在像店铺装修存在多个上传组件的情况下，容易造成误解
}
settings.onComplete.apply($element, [{
status: false,
message: '只允许上传大小' + settings.size_limit + 'KB以内的文件，第' + (index + 1) + '个文件不符合要求'
message: message
}, settings.params]);
var _$element = $element.clone();
var _$parent = $element.parent();
... ... @@ -125,24 +129,27 @@ $.fn.ajaxfileupload = function (options) {
if (settings.height_limit == 0) {
if (Math.abs(width - settings.width_limit) > 10) {
status = false;
message = '只允许上传宽度为' + settings.width_limit + '的图片，第' + (index + 1) + '个图片不符合要求!';
message = '只允许上传宽度为' + settings.width_limit + '的图片.';
}
} else {
if (Math.abs(width - settings.width_limit) > 10 || Math.abs(height - settings.height_limit) > 10) {
status = false;
message = '只允许上传尺寸为' + settings.width_limit + '*' + settings.height_limit + '的图片，第' + (index + 1) + '个文件不符合要求!';
message = '只允许上传尺寸为' + settings.width_limit + '*' + settings.height_limit + '的图片.';
}
}
} else {
// 只限制高度
if (Math.abs(height - settings.height_limit) > 10) {
status = false;
message = '只允许上传高度为' + settings.height_limit + '的图片，第' + (index + 1) + '个图片不符合要求!';
message = '只允许上传高度为' + settings.height_limit + '的图片.';
}
}
if (status == false) {
// 图片规格超出限制
if(files.length > 1) {
message += '第' + (index + 1) + '个文件不符合要求!';
}
settings.onComplete.apply($element, [{
status: false,
message: message
... ...