修改意见

master
lion 1 year ago
parent c73c34c5a1
commit 2b09eb5395

@ -16,7 +16,8 @@
<block v-if="convertToChineseMonth(item.start_date,item.end_date).noend"> <block v-if="convertToChineseMonth(item.start_date,item.end_date).noend">
<view>{{convertToChineseMonth(item.start_date,item.end_date).month}}</view> <view>{{convertToChineseMonth(item.start_date,item.end_date).month}}</view>
<view class="bigFont"> <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> <view>{{convertToChineseMonth(item.start_date,item.end_date).year}}</view>
</block> </block>
<block v-else> <block v-else>
@ -29,11 +30,16 @@
<text>-</text> <text>-</text>
<text>{{convertToChineseMonth(item.start_date,item.end_date).endday}}</text> <text>{{convertToChineseMonth(item.start_date,item.end_date).endday}}</text>
</view> </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).year}}</text>
<!-- <text>{{convertToChineseMonth(item.start_date,item.end_date).endyear}}</text> -->
</view> </view>
</block> </block>
</view> </view>
<view class="list-item-wrap-time-date" v-else> <view class="list-item-wrap-time-date" v-else>
@ -215,6 +221,10 @@
const endday = parseInt(enddateParts[2], 10); const endday = parseInt(enddateParts[2], 10);
// console.log(endmonthNumber, chineseMonths) // console.log(endmonthNumber, chineseMonths)
const endchineseMonth = chineseMonths[endmonthNumber - 1]; const endchineseMonth = chineseMonths[endmonthNumber - 1];
let hasEndYear = false
if (endyear > year) {
hasEndYear = true
}
return { return {
year: year, year: year,
month: chineseMonth, month: chineseMonth,
@ -223,6 +233,7 @@
endyear: endyear, endyear: endyear,
endmonth: endchineseMonth, endmonth: endchineseMonth,
endday: endday, endday: endday,
hasEndYear: hasEndYear
} }
} }
} }
@ -312,12 +323,14 @@
left: 50%; left: 50%;
transform: translate(-50%, -50%); transform: translate(-50%, -50%);
} }
&-img { &-img {
width: calc(100% - 60rpx); width: calc(100% - 60rpx);
height: 125rpx; height: 125rpx;
display: block; display: block;
margin: 0 auto; margin: 0 auto;
} }
&-item { &-item {
margin: 30rpx; margin: 30rpx;
background-color: #fff; background-color: #fff;

Loading…
Cancel
Save