Merge branch 'dev' of http://git.izouma.com/xiongzhu/raex_front into dev

src/components/product/ActivityRecord.vue

@@ -47,6 +47,9 @@ export default {
     },
     computed: {
         time() {
+            if (this.info.startTime) {
+                return this.dayjs(this.info.startTime).format('YYYY-MM-DD HH:mm');
+            }
             if (this.info.createdAt) {
                 return this.dayjs(this.info.createdAt).format('YYYY-MM-DD HH:mm');
             }
@@ -55,7 +58,7 @@ export default {
         },
         isNew() {
             if (this.info.createdAt) {
-                let time = this.dayjs(this.info.createdAt).add(1, 'day');
+                let time = this.dayjs(this.info.startTime || this.info.createdAt).add(1, 'day');
                 return this.dayjs().isBefore(time);
             } else {
                 return false;

src/views/Home.vue

@@ -401,7 +401,8 @@ export default {
                             del: false,
                             companyId: 1
                         },
-                        size: 5
+                        size: 5,
+                        sort:'id,desc'
                     },
                     { body: 'json' }
                 )