wkyy 2 years ago
parent
commit
0121ab68d0

+ 8 - 6
pages/parents/classSchedule/classScheduleDetails.vue

@@ -6,12 +6,13 @@
 			<u-cell-group>
 				<u-cell-item title="校区" :value="detail.schoolName" :arrow="false">
 				</u-cell-item>
-				<u-cell-item title="开课/结课日期" :value="detail.courseStart+'至'+detail.courseEnd"
-					:arrow="false">
+				<u-cell-item v-if="detail.courseStart!=null && detail.courseEnd!=null" title="开课/结课日期"
+					:value="detail.courseStart+'至'+detail.courseEnd" :arrow="false">
 				</u-cell-item>
 				<u-cell-item title="上课时间" :value="detail.courseDate+' '+detail.coursePeriods" :arrow="false">
 				</u-cell-item>
-				<u-cell-item title="课次" :value="detail.courseAmount+detail.freeAmount+'次'" :arrow="false">
+				<u-cell-item v-if="detail.courseAmount!=null && detail.freeAmount!=null" title="课次"
+					:value="detail.courseAmount+detail.freeAmount+'次'" :arrow="false">
 				</u-cell-item>
 				<u-cell-item title="上课教室" :value="detail.classroomName" :arrow="false">
 				</u-cell-item>
@@ -24,8 +25,8 @@
 
 		<view class="main">
 			<u-cell-group>
-				<u-cell-item  title="打卡签到" :value="rollcallLogs.rollcall" :arrow="false"></u-cell-item>
-				<u-cell-item  title="签到时间" :value="rollcallLogs.rollcallTime"  :arrow="false"></u-cell-item>
+				<u-cell-item title="打卡签到" :value="rollcallLogs.rollcall" :arrow="false"></u-cell-item>
+				<u-cell-item v-if="rollcallLogs.rollcallTime" title="签到时间" :value="rollcallLogs.rollcallTime"  :arrow="false"></u-cell-item>
 			</u-cell-group>
 		</view>
 
@@ -98,7 +99,8 @@
 						if(second < 10) {
 							second = '0' + second;
 						}
-						this.rollcallLogs.rollcallTime = hour + ':' + minute + ':' + second;
+						// this.rollcallLogs.rollcallTime = hour + ':' + minute + ':' + second;
+						this.rollcallLogs.rollcallTime = ''
 					}
 				}).catch(error => {
 					uni.showToast({

+ 6 - 3
pages/parents/course/courseDetails.vue

@@ -38,8 +38,11 @@
 						地址
 					</view>
 					<view class="content">
-						<view class="text">
-							青少年宫
+						<view class="text" v-if="courseBase.suitSchool == '1'">
+							青少年宫校区
+						</view>
+						<view class="text" v-if="courseBase.suitSchool == '2'">
+							分校区
 						</view>
 						<view class="img">
 							<img src="../../../assets/img/riFill-navigation-fill@1x.png" alt="">
@@ -124,7 +127,7 @@
 					课程详情
 				</view>
 				<view class="detail">
-					课程介绍课程介绍课程介绍课程介绍课程介绍课程介绍课程介绍课程介绍课程介绍课程介绍课程介绍课程介绍课程介绍课程介绍课程介绍课程介绍课程介绍课程介绍课程介绍课程介绍。
+					{{courseBase.remark!=null ? courseBase.remark : '无'}}
 				</view>
 				<!-- <view class="img">
 					<img src="../../../assets/img/detaiimg.png" alt="">

+ 2 - 2
pages/parents/homePage/homePage.vue

@@ -72,7 +72,7 @@
 						缴费记录
 					</view>
 				</view>
-				<view class="item">
+				<!-- <view class="item">
 					<view class="icon-box"
 						style="background: linear-gradient(180deg, rgba(255,189,96,1) 1%,rgba(255,150,0,1) 100%);">
 						<img src="../../../assets/img/riFill-file-edit-fill@1x.png" alt="">
@@ -80,7 +80,7 @@
 					<view class="text">
 						签到记录
 					</view>
-				</view>
+				</view> -->
 				<!-- <view class="item">
 					<view class="icon-box"
 						style="background: linear-gradient(180deg, rgba(89,222,232,1) 1%,rgba(13,186,199,1) 100%);">