Merge branch 'feature/1月-1年后上线' of http://git.gicdev.com/integralMall/integral-mall into dev

src/views/activities/flashSale/list.vue

@@ -53,22 +53,9 @@
             </div>
           </div>
           <div class="fr">
-            <el-button
-              size="small"
-              v-if="$getButtonLimit($buttonCode.flashSaleExport)"
-              :limit-code="$buttonCode.flashSaleExport"
-              @click="exportExcel"
-            >
-              导出订单
+            <el-button size="small" @click="exportExcel">
+              导出
             </el-button>
-            <!-- <el-button
-              @click="exportExcel"
-              v-if="$getButtonLimit($buttonCode.flashSaleExport)"
-              :limit-code="$buttonCode.flashSaleExport"
-              type="primary"
-            >
-              <i class="iconfont icon-icon_yunxiazai" style="margin-right:5px" />导出订单
-            </el-button> -->
             <el-button
               type="primary"
               @click="addActivity"