2

src/pages/study/index.vue

@@ -139,7 +139,7 @@
 	}
 
 	.box_review_swiper {
-		width: calc(100vw - 36px - 10px);
+		width: calc(100vw - 72rpx - 20rpx);
 		height: 380rpx;
 	}
 
@@ -349,10 +349,32 @@
 							<view v-if="InfoData.Review[current].videolist.length==0">暂无回顾视频...</view>
 							<template v-if="InfoData.Review[current].videolist.length>0">
 								<swiper class="box_review_swiper" @change="swiperChange">
-									<swiper-item style="width: 100%;height: 100%;"
+									<swiper-item style="width: 100%;height: 100%;position: relative;"
 										v-for="(item, index) in InfoData.Review[current].videolist" :key="index">
-										<video class="myVideo" :id="'Video'+current+'-'+index" :src="item.URL" controls
-											@error="spcuowu"></video>
+										<video class="myVideo" :id="'Video'+current+'-'+index" :src="item.URL"
+											@error="spcuowu" :controls="controls" :show-center-play-btn="false"
+											:show-fullscreen-btn="false" @fullscreenchange="videoControl"
+											style="width: 100%; height: 100%">
+										</video>
+										<view @click="enlarge('Video'+current+'-'+index)" style="
+										              position: absolute;
+										              left: 50%;
+										              top: 50%;
+													  z-index: 9;
+										              transform: translate(-50%,-50%);
+										              width: 98rpx;
+										              height: 98rpx;
+										              border-radius: 20rpx;
+										              background-color: rgba(0, 0, 0, 0.4);
+										              display: flex;
+										              align-items: center;
+										              justify-content: center;
+										            ">
+											<!-- 播放按钮 -->
+											<image
+												src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Test/Upload/Goods/1616471847000_345.png"
+												style="width: 37rpx; height: 44rpx" mode=""></image>
+										</view>
 									</swiper-item>
 								</swiper>
 							</template>
@@ -474,10 +496,10 @@
 										</div>
 									</view>
 								</view>
-								<view class="examination-box-btnbox" >
+								<view class="examination-box-btnbox">
 									<view class="examination-btn" @click="gourlkaoshixq(x)">
-										<text v-if="x.ExamStatus==2">开始考试</text> 
-										<text v-else>查看详情</text> 
+										<text v-if="x.ExamStatus==2">开始考试</text>
+										<text v-else>查看详情</text>
 									</view>
 								</view>
 							</view>
@@ -516,6 +538,8 @@
 				proxy
 			} = getCurrentInstance();
 			let data = reactive({
+				videoContext: null,
+				controls: false, //显示默认控件
 				CourseList: [], //课程列表
 				statusBarHeight: 0,
 				CourseInfoMsg: {
@@ -529,9 +553,26 @@
 				checkIndex: 0
 			})
 			let methods = {
+				enlarge(id) {
+					// 全屏
+					data.videoContext = uni.createVideoContext(id);
+					console.log(538,id, data.videoContext)
+					data.videoContext.requestFullScreen({
+						direction: 0,
+					});
+				},
+				videoControl(e) {
+					console.log(544, e)
+					if (e.detail.fullScreen == false) {
+						data.videoContext.stop();
+						data.controls = false;
+					} else {
+						data.videoContext.play();
+						data.controls = true;
+					}
+				},
 				getCourseList() {
 					proxy.$request("/AppletIndex/GetMyStudyCourseList", {}).then(res => {
-
 						if (res.Code == 1) {
 							data.CourseList = res.Data
 							if (data.CourseList.length > 0) {
@@ -546,7 +587,6 @@
 				},
 				getCourseInfo() { //详情
 					proxy.$request("/AppletIndex/GetMyStudyCourseInfo", data.CourseInfoMsg).then(res => {
-
 						if (res.Code == 1) {
 							data.InfoData = res.Data
 							if (res.Data && res.Data.Review.length > 0) {

src/pages/timetable/timeTable.vue

@@ -180,8 +180,8 @@ export default {
     let emptyArr = []; //日历补空
     let getcalendar = (y, m) => {
       calendar.value = getWeek(y, m);
+	   emptyArr.length = calendar.value[0].week;
       if (calendar.value[0].week > 0) {
-        emptyArr.length = calendar.value[0].week;
         emptyArr.fill({ week: "", day: "" });
         calendar.value.unshift(...emptyArr);
       }
@@ -190,9 +190,8 @@ export default {
     let isShowAllDay = ref(false);
     let sliceWeekArr = ref([]);
     let sliceWeek = (item) => {
-	  let w =item.week||item.$orig?.week
-	  let d =item.day||item.$orig?.day
-	  
+	  let w =item.$orig?.week||item.week
+	  let d =item.$orig?.day||item.day
       let newArr = calendar.value.slice(emptyArr.length, calendar.value.length);
       let s = d - (w + 1) <= 0 ? 0 : d - (w + 1);
       let e = d + (6 - w);