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

src/views/activities/flashSale/list.vue

@@ -197,13 +197,8 @@ 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) });
-      },
+    exportParams: function () {
+      return Object.assign({}, this.query, { beginTime: this.query.beginTime ? this.getTimeAll(this.query.beginTime) : '', endTime: this.query.endTime ? this.getTimeAll(this.query.endTime) : '' });
     },
   },
   created () {