Merge remote-tracking branch 'origin/release/2.0' into release/2.0

 <template>
     <LayoutBody>
         <LayoutFilter :no-line="true" :col="1">
+            <FilterItem>
+                <div class="import-title">导出</div>
+            </FilterItem>
+        </LayoutFilter>
+        <LayoutFilter :no-line="true" :col="1">
             <FilterItem label="文件类型">
                 <Select v-model="fileType.model">
                     <Option v-for="item in fileType.list" :value="item.id" :key="item">{{ item.label }}</Option>
@@ -129,12 +134,12 @@
             upload() {
                 this.$refs.xlsxUpload.upload({brandId: this.brandId});
             },
-            onSuccess(data) {
+            onSuccess() {
             },
             onError() {
 
             },
-            onProgress(p) {
+            onProgress() {
 
             }
         },

@@ -122,7 +122,7 @@
         }
 
         .info-tip {
-            color: #ff0000;
+            color: #f00;
         }
 
         .ivu-modal {