|
@ -99,8 +99,7 @@ |
|
|
|
|
|
|
|
|
<view v-for="(item, index) in cardListData" |
|
|
<view v-for="(item, index) in cardListData" |
|
|
:key="item.id"> |
|
|
:key="item.id"> |
|
|
<active-item :cardListData="[item]" v-if="item.ntype == 0"/> |
|
|
|
|
|
<travelList :cardListData="[item]" v-else/> |
|
|
|
|
|
|
|
|
<active-item :cardListData="[item]"/> |
|
|
</view> |
|
|
</view> |
|
|
|
|
|
|
|
|
<uv-load-more :status="status" fontSize="24rpx" dashed line /> |
|
|
<uv-load-more :status="status" fontSize="24rpx" dashed line /> |
|
@ -288,7 +287,7 @@ |
|
|
this.cardListData = [...this.cardListData, ...list1, ...list2] |
|
|
this.cardListData = [...this.cardListData, ...list1, ...list2] |
|
|
|
|
|
|
|
|
this.cardListData.sort((a, b) => { |
|
|
this.cardListData.sort((a, b) => { |
|
|
return new Date(b.startTime).getTime() - new Date(a.startTime).getTime() |
|
|
|
|
|
|
|
|
return this.$dayjs(a.startTime).valueOf() - this.$dayjs(b.startTime).valueOf() |
|
|
}) |
|
|
}) |
|
|
}, |
|
|
}, |
|
|
getApi(api){ |
|
|
getApi(api){ |
|
|