Merge branch 'develop' of http://g.28ms.com:8000/yangjianbin/page into develop

@@ -19,8 +19,8 @@
             </div>
             </div>
             <div class="form-group col-sm-3 col-md-2">
             <div class="form-group col-sm-3 col-md-2">
                 <label>&nbsp;</label>
                 <label>&nbsp;</label>
-                <div id="uploader-demo">
-                    <div class="filePicker">选择图片</div>
+                <div>
+                    <label class="filePicker">选择图片</label>
                 </div>
                 </div>
             </div>
             </div>
         </div>
         </div>
@@ -60,4 +60,4 @@
             </div>
             </div>
         </div>
         </div>
     </div>
     </div>
-</div>
\ No newline at end of file
+</div>

@@ -28,7 +28,6 @@ jQuery(function() {
 
 
   // 当有文件添加进来的时候
   // 当有文件添加进来的时候
   uploader.on('fileQueued', function(file) {
   uploader.on('fileQueued', function(file) {
-    console.log(file);
     var $id = $('select.uploader').val(), $list = $('tr[data-id='+$id+'] .filelist');
     var $id = $('select.uploader').val(), $list = $('tr[data-id='+$id+'] .filelist');
     var $li = $( '<div id="' + file.id + '" class="file-item thumbnail">' + '<img>' +
     var $li = $( '<div id="' + file.id + '" class="file-item thumbnail">' + '<img>' +
         '<div class="info">' + file.name + '</div>' + '</div>'),
         '<div class="info">' + file.name + '</div>' + '</div>'),
@@ -128,4 +127,4 @@ jQuery(function() {
     $li.off().find('.file-panel').off().end().remove();
     $li.off().find('.file-panel').off().end().remove();
     alert('删除成功');
     alert('删除成功');
   }
   }
-});
\ No newline at end of file
+});