Merge branch 'hotfix-批量上架skn' into grey

# Conflicts:
#	code/apps/goods/views/netsale/Batch.html
#	code/static/js.jquery/module/goods/netsale/Batch.js

@@ -71,4 +71,10 @@
         </div>
     </div>
 </div>
+<!-- 不能再丢了 要吐血了-->
+<div class="panel panel-primary-head">
+     <div class="panel-body red" id="message">
+        </div>
+</div>
+
 <%include '../../../common/views/__ui/footer'%>
\ No newline at end of file

@@ -4,8 +4,11 @@ var $ = require('jquery'),
 
 $('input[type="file"]').after('<div class="file-name btn btn-default">请选择文件</div>');
 
+/*这里不能再再丢*/
+var loadModal = null;
+
 function batchExport(el, type) {
-    var loadModal = null;
+    //var loadModal = null;
 
     return {
         params: {