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

src/views/activities/flashSale/list.vue

@@ -67,9 +67,20 @@
           </div>
         </div>
         <div v-loading="loading">
-          <el-table :data="tableData" style="width: 100%" @sort-change="sortChange">
+          <el-table
+            ref="table"
+            :data="tableData"
+            style="width: 100%"
+            @sort-change="sortChange"
+            :default-sort="{prop: 'date', order: 'descending'}"
+          >
             <el-table-column label="活动名称" prop="activityName" />
-            <el-table-column label="活动时间" sortable="custom" width="250px">
+            <el-table-column
+              label="活动时间"
+              prop="date"
+              sortable="custom"
+              width="250px"
+            >
               <template slot-scope="{ row }">
                 <div>{{ getTimeAll(row.beginTime) }}&nbsp;至</div>
                 <div>{{ getTimeAll(row.endTime) }}</div>