From c9f80d74fc6b7b43208e7ac985fb2cf62beec1bb Mon Sep 17 00:00:00 2001
From: sentsin <xu@sentsin.com>
Date: Sun, 6 May 2018 18:38:05 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20upload=20size=20=E6=8F=90?=
 =?UTF-8?q?=E7=A4=BA=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 examples/upload.html      | 2 +-
 src/lay/modules/upload.js | 5 +----
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/examples/upload.html b/examples/upload.html
index e37161e4b..673eba4e7 100644
--- a/examples/upload.html
+++ b/examples/upload.html
@@ -89,7 +89,7 @@
   var uploadInst = upload.render({
     elem: '#test1'
     ,url: '/upload/'
-    //,size: 60 //限制文件大小，单位 KB
+    ,size: 2000 //限制文件大小，单位 KB
     ,accept: 'file'
     ,fileAccept: 'image/*'
     ,exts: "jpg|png|gif|bmp|jpeg|pdf"
diff --git a/src/lay/modules/upload.js b/src/lay/modules/upload.js
index 6026fcd4c..b178ee8a5 100644
--- a/src/lay/modules/upload.js
+++ b/src/lay/modules/upload.js
@@ -381,12 +381,9 @@ layui.define('layer' , function(exports){
       layui.each(that.chooseFiles, function(index, file){
         if(file.size > 1024*options.size){
           var size = options.size/1024;
-          size = size >= 1 
-            ? (Math.floor(size) + (size%1 > 0 ? size.toFixed(1) : 0)) + 'MB' 
-          : options.size + 'KB'
+          size = size >= 1 ? (size.toFixed(2) + 'MB') : options.size + 'KB'
           elemFile.value = '';
           limitSize = size;
-          
         }
       });
       if(limitSize) return that.msg('文件不能超过'+ limitSize);