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

src/views/activities/flashSale/list.vue

@@ -157,7 +157,7 @@
       :dialogVisible.sync="dialogVisible"
       :type="2"
       :excelUrl="excelUrl"
-      :params="query"
+      :params="exportParams"
       :projectName="projectName"
     />
   </div>
@@ -198,6 +198,14 @@ export default {
         [this.query.beginTime, this.query.endTime] = val || ['', ''];
       },
     },
+    exportParams: {
+      get () {
+        return Object.assign({}, this.query, { beginTime: this.getTimeAll(this.query.beginTime), endTime: this.getTimeAll(this.query.endTime) });
+      },
+      set (val) {
+        Object.assign({}, this.query, { beginTime: this.getTimeAll(this.query.beginTime), endTime: this.getTimeAll(this.query.endTime) });
+      },
+    },
   },
   created () {
     this.getSearchList();