|
|
|
|
@ -16,7 +16,8 @@
|
|
|
|
|
<block v-if="convertToChineseMonth(item.start_date,item.end_date).noend">
|
|
|
|
|
<view>{{convertToChineseMonth(item.start_date,item.end_date).month}}</view>
|
|
|
|
|
<view class="bigFont">
|
|
|
|
|
{{convertToChineseMonth(item.start_date,item.end_date).day}}</view>
|
|
|
|
|
{{convertToChineseMonth(item.start_date,item.end_date).day}}
|
|
|
|
|
</view>
|
|
|
|
|
<view>{{convertToChineseMonth(item.start_date,item.end_date).year}}</view>
|
|
|
|
|
</block>
|
|
|
|
|
<block v-else>
|
|
|
|
|
@ -29,11 +30,16 @@
|
|
|
|
|
<text>-</text>
|
|
|
|
|
<text>{{convertToChineseMonth(item.start_date,item.end_date).endday}}</text>
|
|
|
|
|
</view>
|
|
|
|
|
<view>
|
|
|
|
|
<!-- 跨年 -->
|
|
|
|
|
<view class="flexbetween"
|
|
|
|
|
v-if="convertToChineseMonth(item.start_date,item.end_date).hasEndYear">
|
|
|
|
|
<text>{{convertToChineseMonth(item.start_date,item.end_date).year}}</text>
|
|
|
|
|
<text>{{convertToChineseMonth(item.start_date,item.end_date).endyear}}</text>
|
|
|
|
|
</view>
|
|
|
|
|
<!-- 不跨年 -->
|
|
|
|
|
<view v-else class="flexbetween" style="justify-content: center;">
|
|
|
|
|
<text>{{convertToChineseMonth(item.start_date,item.end_date).year}}</text>
|
|
|
|
|
<!-- <text>{{convertToChineseMonth(item.start_date,item.end_date).endyear}}</text> -->
|
|
|
|
|
</view>
|
|
|
|
|
|
|
|
|
|
</block>
|
|
|
|
|
</view>
|
|
|
|
|
<view class="list-item-wrap-time-date" v-else>
|
|
|
|
|
@ -149,9 +155,9 @@
|
|
|
|
|
},
|
|
|
|
|
|
|
|
|
|
methods: {
|
|
|
|
|
goCourse(){
|
|
|
|
|
goCourse() {
|
|
|
|
|
uni.navigateTo({
|
|
|
|
|
url:'/packages/mycourse/index'
|
|
|
|
|
url: '/packages/mycourse/index'
|
|
|
|
|
})
|
|
|
|
|
},
|
|
|
|
|
scrollGet() {
|
|
|
|
|
@ -215,6 +221,10 @@
|
|
|
|
|
const endday = parseInt(enddateParts[2], 10);
|
|
|
|
|
// console.log(endmonthNumber, chineseMonths)
|
|
|
|
|
const endchineseMonth = chineseMonths[endmonthNumber - 1];
|
|
|
|
|
let hasEndYear = false
|
|
|
|
|
if (endyear > year) {
|
|
|
|
|
hasEndYear = true
|
|
|
|
|
}
|
|
|
|
|
return {
|
|
|
|
|
year: year,
|
|
|
|
|
month: chineseMonth,
|
|
|
|
|
@ -223,6 +233,7 @@
|
|
|
|
|
endyear: endyear,
|
|
|
|
|
endmonth: endchineseMonth,
|
|
|
|
|
endday: endday,
|
|
|
|
|
hasEndYear: hasEndYear
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
@ -300,7 +311,7 @@
|
|
|
|
|
|
|
|
|
|
.list {
|
|
|
|
|
height: 100vh;
|
|
|
|
|
padding:30rpx 0;
|
|
|
|
|
padding: 30rpx 0;
|
|
|
|
|
position: relative;
|
|
|
|
|
top: 0;
|
|
|
|
|
left: 0;
|
|
|
|
|
@ -312,12 +323,14 @@
|
|
|
|
|
left: 50%;
|
|
|
|
|
transform: translate(-50%, -50%);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
&-img {
|
|
|
|
|
width: calc(100% - 60rpx);
|
|
|
|
|
height: 125rpx;
|
|
|
|
|
display: block;
|
|
|
|
|
margin: 0 auto;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
&-item {
|
|
|
|
|
margin: 30rpx;
|
|
|
|
|
background-color: #fff;
|
|
|
|
|
|