From 2b09eb5395a2558d963afc0ee5b534d3f0bc1ad1 Mon Sep 17 00:00:00 2001
From: lion <120344285@qq.com>
Date: Wed, 11 Sep 2024 17:45:25 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=84=8F=E8=A7=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/course/index.vue | 47 +++++++++++++++++++++++++++---------------
 1 file changed, 30 insertions(+), 17 deletions(-)

diff --git a/pages/course/index.vue b/pages/course/index.vue
index 51b6566..740fbad 100644
--- a/pages/course/index.vue
+++ b/pages/course/index.vue
@@ -3,7 +3,7 @@
 		<image class="cbg" :src="base.imgHost('common_bg.png')"></image>
 		<!-- <view> -->
 		<scroll-view :scroll-y="true" @scrolltolower="scrollGet" class="list">
-			<!-- <topBanner v-if="banner_list.length>0" :banner_list="banner_list"></topBanner> -->
+			<!-- <topBanner v-if="banner_list.length>0" :banner_list="banner_list"></topBanner> -->
 			<image @click="goCourse" class="list-img" :src="base.imgHost('course-top.png')"></image>
 			<view v-if="hasData" style="padding-bottom: 200rpx;">
 				<!-- 10进行中 40已结束 -->
@@ -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>
@@ -148,11 +154,11 @@
 
 		},
 
-		methods: {
-			goCourse(){
-				uni.navigateTo({
-					url:'/packages/mycourse/index'
-				})
+		methods: {
+			goCourse() {
+				uni.navigateTo({
+					url: '/packages/mycourse/index'
+				})
 			},
 			scrollGet() {
 				if (!this.hasData) {
@@ -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
 						}
 					}
 				}
@@ -299,8 +310,8 @@
 
 
 		.list {
-			height: 100vh;
-			padding:30rpx 0;
+			height: 100vh;
+			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;
+
+			&-img {
+				width: calc(100% - 60rpx);
+				height: 125rpx;
+				display: block;
+				margin: 0 auto;
 			}
+
 			&-item {
 				margin: 30rpx;
 				background-color: #fff;