1

src/pages/timetable/timeTable.vue

@@ -74,7 +74,7 @@
 								{{x.StartTime}}
 							</view>
 						</view>
-						
+
 						<!-- <view class="guodu">
 							<text>·</text>
 							<text>·</text>
@@ -89,36 +89,42 @@
 							</view>
 						</view>
 						<!-- 调班时间 -->
+					<!-- 	<view v-if="item.show&&item.IsOut==1" style="border-top: 1px solid;
+							width: 100%;height: 14px;">
+						</view> -->
 						<view v-if="item.show&&item.IsOut==1">
-							<view class="icon" >
+							<view class="icon">
 								上课时间:
 							</view>
-							<view class="time-text" >
+							<view class="time-text">
 								{{item.OutInfo.StartTime}}
 							</view>
 						</view>
 						<view v-if="item.show&&item.IsOut==1">
-							<view class="icon" >
+							<view class="icon">
 								下课时间:
 							</view>
-							<view class="time-text" >
+							<view class="time-text">
 								{{item.OutInfo.EndTime}}
 							</view>
 						</view>
 						<!-- 插班时间 -->
+						<!-- <view v-if="item.show&&item.IsIn==1" style="border-top: 1px solid;
+						width: 100%;height: 14px;">
+						</view> -->
 						<view v-if="item.show&&item.IsIn==1">
-							<view class="icon" >
+							<view class="icon">
 								上课时间:
 							</view>
-							<view class="time-text" >
+							<view class="time-text">
 								{{item.InInfo.StartTime}}
 							</view>
 						</view>
 						<view v-if="item.show&&item.IsIn==1">
-							<view class="icon" >
+							<view class="icon">
 								下课时间:
 							</view>
-							<view class="time-text" >
+							<view class="time-text">
 								{{item.InInfo.EndTime}}
 							</view>
 						</view>
@@ -137,7 +143,7 @@
 							<text style="margin:0 10rpx;">教室：</text>
 							<text>{{item.RoomName}}</text>
 						</view>
-						<view class="teacher-box" style="margin-top: 30rpx;margin-bottom: 0;">
+						<view class="teacher-box" style="margin-top: 30rpx;margin-bottom: 20rpx;">
 							<van-icon name="underway" />
 							<text style="margin:0 10rpx;">出勤：</text>
 							<text v-if="x.IsCheck==0 && item.Finished==1" style="color:#282828">出勤</text>
@@ -151,12 +157,12 @@
 									:style="{color:item.Finished==1?'#ddd':'#282828'}">{{item.Finished==1?'已上课':'未上课'}}</text>
 							</view>
 						</view>
-					<!-- 	<view class="teacher-box" style='color: red;' v-if='item.IsOut==1'>
+						<!-- 	<view class="teacher-box" style='color: red;' v-if='item.IsOut==1'>
 							<text style="margin:0 10rpx;"></text>
 							<text>调出</text>
 						</view> -->
 						<!-- 调出 -->
-						<view v-if="item.show&&item.IsOut==1">
+						<view v-if="item.show&&item.IsOut==1" style="border-top: 1px solid;">
 							<view class="teacher-box">
 								<van-icon name="underway" />
 								<text style="margin:0 10rpx;">时间：</text>
@@ -179,7 +185,7 @@
 							</view>
 						</view>
 						<!-- 插班 -->
-						<view v-if="item.show&&item.IsIn==1">
+						<view v-if="item.show&&item.IsIn==1" style="border-top: 1px solid;">
 							<view class="teacher-box">
 								<van-icon name="underway" />
 								<text style="margin:0 10rpx;">时间：</text>
@@ -799,9 +805,9 @@
 		box-shadow: 0 0 20rpx #D0D0D0;
 		padding: 0;
 		display: flex;
-		 flex-direction: row;
-		            justify-content: center;
-		            align-items:stretch;
+		flex-direction: row;
+		justify-content: center;
+		align-items: stretch;
 		margin: 0 32rpx;
 		margin-bottom: 20rpx;
 	}
@@ -810,12 +816,12 @@
 		border-top-left-radius: 20rpx;
 		border-bottom-left-radius: 20rpx;
 		background-color: #F5F5F5;
-		padding:0rpx 40rpx;
-			display: flex;
-			flex-direction: column;
-			align-items: center;
-			/* justify-content: center */
-			justify-content: space-around;
+		padding: 0rpx 40rpx;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		/* justify-content: center */
+		justify-content: space-around;
 	}