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 @@
-
+
@@ -16,7 +16,8 @@
{{convertToChineseMonth(item.start_date,item.end_date).month}}
- {{convertToChineseMonth(item.start_date,item.end_date).day}}
+ {{convertToChineseMonth(item.start_date,item.end_date).day}}
+
{{convertToChineseMonth(item.start_date,item.end_date).year}}
@@ -29,11 +30,16 @@
-
{{convertToChineseMonth(item.start_date,item.end_date).endday}}
-
+
+
+ {{convertToChineseMonth(item.start_date,item.end_date).year}}
+ {{convertToChineseMonth(item.start_date,item.end_date).endyear}}
+
+
+
{{convertToChineseMonth(item.start_date,item.end_date).year}}
-
-
@@ -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;