修改测试

components/course/courseChapter.vue

@@ -93,7 +93,10 @@ export default {
 		
 	},
 	onPageShow() {
-		this.refreshList({isRebuild:this.isRebuild});
+		if(this.isBuy) {
+			this.refreshList({isRebuild:this.isRebuild});
+		}
+		
 	},
 	methods: {
 		refreshList(isRebuild) {

components/nav-bar/nav-bar.vue

@@ -1,6 +1,6 @@
 <template>
 	<view>
-		<u-navbar :is-back="showBackBtn" :title="title">
+		<u-navbar :is-back="showBackBtn" :title="title" z-index="99999999999999">
 			<view class="slot-wrap">
 				<u-icon class="homeIcon" v-if="showHomeBtn" @click="goHome()" name="home"  size="40"></u-icon>
 			</view>

pages2/appointment/kporder.vue

@@ -38,12 +38,12 @@
 			</view>
 			<view v-else class="appointmentItem">
 				<view class="title">
-					<text v-if="addressName">
+					<text v-if="addressName && addressName != '请选择'">
 						该考试地点暂无考试时间，建议重新选择考试地点
 					</text>
-					<text v-else>
+					<!-- <text v-else>
 						当前考培地点无考前培训时间点
-					</text>
+					</text> -->
 					
 				</view>
 			</view>

pages2/appointment/order.vue

@@ -29,6 +29,17 @@
 					</view>
 				</view>
 			</view>
+			<view v-else class="appointmentItem">
+				<view class="title">
+					<text v-if="addressName && addressName != '请选择'">
+						该考试地点暂无考试时间，建议重新选择考试地点
+					</text>
+					<!-- <text v-else>
+						当前考培地点无考前培训时间点
+					</text> -->
+					
+				</view>
+			</view>
 			<view class="btnMain">
 				<view class="return" @click="backPage">上一步</view>
 				<view class="sure" @click="sureOppoint">{{ dataId === 1 ? '下一步' : dataId === 2 ? '确定预约' : '异常' }}</view>

pages2/bank/questionBank.vue

@@ -18,7 +18,7 @@
 							</view>
 							<view style="color: #666;font-size: 28rpx;">{{ countdown(lastTime) }}</view>
 						</view>
-						<view class="titles"><rich-text :nodes="bank.content"></rich-text></view>
+						<view class="titles" @click="showPhoto(bank.content)"><rich-text :nodes="bank.content"></rich-text></view>
 					</view>
 					
 					<template v-if="bank.type == 1">
@@ -1985,6 +1985,32 @@ export default {
 
 		tabSelect(index, bankindex) {
 			this.$set(this.questionList[bankindex], 'current', index);
+		},
+		
+		showPhoto(contentStr) {
+			if(contentStr && typeof contentStr == 'string') {
+				let reg = /<img[^>]*src[=\'\"\s]+([^\'\"]*)[\'\"]?[^>]*>/gi;
+				let strArr = contentStr.match(reg);
+				strArr.forEach((str,index) => {
+					strArr[index] = str.replace(reg,'$1')
+				})
+				
+				// 预览图片
+				uni.previewImage({
+					urls: strArr,
+					longPressActions: {
+						itemList: ['发送给朋友', '保存图片', '收藏'],
+						success: function(data) {
+							console.log('选中了第' + (data.tapIndex + 1) + '个按钮,第' + (data.index + 1) + '张图片');
+						},
+						fail: function(err) {
+							console.log(err.errMsg);
+						}
+					}
+				});
+			}
+			
+			
 		}
 	}
 };

pages2/bank/questionBankContinue.vue

@@ -19,7 +19,7 @@
 							<view style="color: #666;font-size: 28rpx;"></view>
 							<view class="leftLetters"></view>
 						</view>
-						<view class="titles">
+						<view class="titles" @click="showPhoto(bank.content)">
 							<rich-text :nodes="bank.content"></rich-text>
 						</view>		
 					</view>
@@ -1462,6 +1462,34 @@ export default {
 			this.$set(this.questionList[bankindex],'current',index)
 			
 		},
+		
+		
+		
+		showPhoto(contentStr) {
+			if(contentStr && typeof contentStr == 'string') {
+				let reg = /<img[^>]*src[=\'\"\s]+([^\'\"]*)[\'\"]?[^>]*>/gi;
+				let strArr = contentStr.match(reg);
+				strArr.forEach((str,index) => {
+					strArr[index] = str.replace(reg,'$1')
+				})
+				
+				// 预览图片
+				uni.previewImage({
+					urls: strArr,
+					longPressActions: {
+						itemList: ['发送给朋友', '保存图片', '收藏'],
+						success: function(data) {
+							console.log('选中了第' + (data.tapIndex + 1) + '个按钮,第' + (data.index + 1) + '张图片');
+						},
+						fail: function(err) {
+							console.log(err.errMsg);
+						}
+					}
+				});
+			}
+			
+			
+		}
 	}
 };
 </script>

pages2/class/questionBank.vue

@@ -148,7 +148,7 @@
 										</view>
 									</view>
 								</view>
-								<view class="ans_submit answerInfos" v-if="bank.ques">
+								<view class="ans_submit answerInfos" v-if="bank.ques.text || bank.ques.imageList.length">
 									<view class="answerTitle">我的答案:</view>
 									{{ bank.ques.text }}
 									<view class="imgs"><image class="img" v-for="(ques,quesIndex) in bank.ques.imageList" :key="quesIndex" :src="$method.splitImgHost(ques, true)"></image></view>

pages2/exam/exam_appointment.vue

@@ -4,7 +4,7 @@
 		<view style="width: 100%;text-align: center;position: fixed;height: 96rpx;z-index: 999;">
 			<u-tabs :list="list" sticky :current="current" @change="change" active-color="#007AFF" inactive-color="#999"></u-tabs>
 		</view>
-		<view class="safeArea" style="position: absolute;top: 96rpx;width: 100%;">
+		<view class="safeArea" style="position: absolute;top: 288rpx;width: 100%;">
 			<view class="examMain">
 				<view class="noData" v-if="!listData.length">您暂无相关考试预约哦~</view>
 				<view v-for="(item, index) in listData" :key="index" class="examList">

pages2/order/confirm_success.vue

@@ -5,7 +5,10 @@
 			<view style="padding: 8rpx;">
 				<view class="box1">
 					<view class="box1_t1">
-						<u-icon name="checkmark-circle" color="#34C759" size="32"></u-icon><text style="margin-left: 8rpx;">您的订单已支付成功！</text></view>
+						<u-icon name="checkmark-circle" color="#34C759" size="32"></u-icon><text style="margin-left: 8rpx;">您的订单已支付成功！</text>
+					</view>
+					
+					<view class="tip">*您可在“我的＞我的订单”中查询</view>
 					<view style="display: flex;align-items: center;justify-content: center;" v-if="isBK === '1'">
 						<view class="btn1" @click="backMyStudent">
 							返回我的网课
@@ -40,7 +43,6 @@
 							<view class="txt_left">订单编号</view>
 							<view class="txt_right_sn">{{sn}}</view>
 						</view>
-						<view class="tip">*您可在“我的＞我的订单”中查询</view>
 					</view>
 					<u-line color="#D6D6DB" />
 				</view>
@@ -185,6 +187,7 @@ export default {
 		margin-top: 30rpx;
 	}
 	.tip{
+		text-align: center;
 		font-size: 24rpx;
 		color: #999999;
 		height: 40rpx;

pages2/order/index.vue

@@ -1,8 +1,8 @@
 <template>
 	<view>
-		<nav-bar title="创建计划"></nav-bar>
-		<view style="width: 100%;text-align: center;position: fixed;height: 96rpx;z-index: 999;">
-			<u-tabs :list="list" sticky :current="current" @change="change" active-color="#007AFF"></u-tabs>
+		<nav-bar title="我的订单"></nav-bar>
+		<view style="width: 100%;text-align: center;position: fixed;height: 96rpx;z-index: 999;" >
+			<u-tabs :list="list" sticky :current="current" @change="change" active-color="#007AFF" :offset="[-1,0]"></u-tabs>
 		</view>
 		<view style="padding: 96rpx 8rpx 96rpx;">
 			<view v-if="!order.length" class="noData">您暂无相关订单哦~</view>
@@ -66,13 +66,16 @@ export default {
 		return {
 			list: [
 				{
-					name: '待支付'
+					name: '待支付',
+					count: 0
 				},
 				{
-					name: '已支付'
+					name: '已支付',
+					count: 0
 				},
 				{
-					name: '已取消'
+					name: '已取消',
+					count: 0
 				}
 			],
 			current: 0,
@@ -91,6 +94,7 @@ export default {
 	onLoad(option) {
 		this.current = +option.current || 0;
 		this.getOrderList();
+		this.getOrderNum();
 		console.log(this.current)
 	},
 	onShow() {
@@ -111,6 +115,44 @@ export default {
 		this.getFY();
 	},
 	methods: {
+		getOrderNum() {
+			
+			this.$api.getorderlists({
+				status: '0,1',
+				pageNum: 1,
+				pageSize: 1,
+				orderStatus:'0'
+			}).then(res => {
+				if (res.data.code === 200) {
+					this.list[0].count = res.data.total;
+				}
+			});
+			
+			
+			this.$api.getorderlists({
+				status: '0,1',
+				pageNum: 1,
+				pageSize: 1,
+				orderStatus:'1,2,3'
+			}).then(res => {
+				if (res.data.code === 200) {
+					this.list[1].count = res.data.total;
+					
+				}
+			});
+			
+			this.$api.getorderlists({
+				status: '0,1',
+				pageNum: 1,
+				pageSize: 1,
+				orderStatus:'-1,-2,4'
+			}).then(res => {
+				if (res.data.code === 200) {
+					this.list[2].count = res.data.total;
+					
+				}
+			});
+		},
 		/**
 		 * 跳转发票申请页面
 		 */

pages2/plan/create.vue

@@ -1,6 +1,6 @@
 <template>
 	<view>
-		<nav-bar title="我的订单"></nav-bar>
+		<nav-bar title="创建计划"></nav-bar>
 		<view class="list_box">
 			<view class="item" v-for="(item, index) in list" :key="index">
 				<image :src="item.coverUrl"></image>
@@ -57,13 +57,15 @@
 		</view>
 		<u-calendar v-model="calendar_show" :min-date="minDate" :mode="calendar" @change="change" :max-date="maxDate"></u-calendar>
 		<!-- 弹框-->
-		<u-popup v-model="week_show" mode="bottom">
-			<view style="height: 400rpx;text-align: center">
-				<view style="padding-top: 100rpx;padding-left: 40rpx;text-align: center;">
-					<u-checkbox-group @change="checkboxGroupChange">
-						<u-checkbox v-model="item.checked" v-for="(item, index) in list3" :key="index" :name="item.name">{{ item.name }}</u-checkbox>
+		<u-popup v-model="week_show" mode="bottom" @close="weekPopClose">
+			<view style="height: 450rpx;">
+				<view style="padding-top: 20rpx;padding-left: 40rpx;padding-right:40rpx;">
+					<u-checkbox-group @change="checkboxGroupChange" width="100%">
+						<u-checkbox v-model="item.checked" v-for="(item, index) in list3" :key="index" :name="item.name">
+							<view style="width:660rpx;">{{ item.name }}</view>
+						</u-checkbox>
 					</u-checkbox-group>
-					<view class="title_l" @click="week_submit" style="margin: 50rpx auto;">确认</view>
+					<!-- <view class="title_l" @click="week_submit" style="margin: 50rpx auto;">确认</view> -->
 				</view>
 			</view>
 		</u-popup>
@@ -124,7 +126,7 @@ export default {
 				time: '20:30',
 				startDate: '2021-05-07',
 				endDate: '2021-05-31',
-				week: '一、三、五'
+				week: '每周一、每周三、每周五'
 			},
 			studyNums: '?',
 			calendar: 'range',
@@ -138,51 +140,51 @@ export default {
 			businessId:'',
 			list3: [
 				{
-					name: '一',
+					name: '每周日',
+					checked: false,
+					disabled: false,
+					id: 0
+				},
+				{
+					name: '每周一',
 					checked: false,
 					disabled: false,
 					id: 1
 				},
 				{
-					name: '二',
+					name: '每周二',
 					checked: false,
 					disabled: false,
 					id: 2
 				},
 				{
-					name: '三',
+					name: '每周三',
 					checked: false,
 					disabled: false,
 					id: 3
 				},
 				{
-					name: '四',
+					name: '每周四',
 					checked: false,
 					disabled: false,
 					id: 4
 				},
 				{
-					name: '五',
+					name: '每周五',
 					checked: false,
 					disabled: false,
 					id: 5
 				},
 				{
-					name: '六',
+					name: '每周六',
 					checked: false,
 					disabled: false,
 					id: 6
 				},
-				{
-					name: '日',
-					checked: false,
-					disabled: false,
-					id: 0
-				}
 			],
 			selWeek: '',
 			index_review: 4,
-			array_review: [1, 2, 3, 4, 5, 6, 7]
+			array_review: [0,1, 2, 3, 4, 5, 6, 7]
 		};
 	},
 	onLoad(option) {
@@ -233,25 +235,25 @@ export default {
 			let ss = this.form.week.split('、');
 			let weekArray = [];
 			for (let i = 0; i < ss.length; i++) {
-				if (ss[i] == '日') {
+				if (ss[i] == '每周日') {
 					weekArray.push(0);
 				}
-				if (ss[i] == '一') {
+				if (ss[i] == '每周一') {
 					weekArray.push(1);
 				}
-				if (ss[i] == '二') {
+				if (ss[i] == '每周二') {
 					weekArray.push(2);
 				}
-				if (ss[i] == '三') {
+				if (ss[i] == '每周三') {
 					weekArray.push(3);
 				}
-				if (ss[i] == '四') {
+				if (ss[i] == '每周四') {
 					weekArray.push(4);
 				}
-				if (ss[i] == '五') {
+				if (ss[i] == '每周五') {
 					weekArray.push(5);
 				}
-				if (ss[i] == '六') {
+				if (ss[i] == '每周六') {
 					weekArray.push(6);
 				}
 			}
@@ -348,6 +350,9 @@ export default {
 			this.form.week = this.selWeek;
 			this.week_show = false;
 		},
+		weekPopClose() {
+			this.form.week = this.selWeek;
+		},
 		openWeek() {
 			this.week_show = true;
 			this.selWeek = this.form.week;

pages2/plan/edit.vue

@@ -57,13 +57,15 @@
 		</view>
 		<u-calendar v-model="calendar_show" :min-date="minDate" :mode="calendar" @change="change" :max-date="maxDate"></u-calendar>
 		<!-- 弹框-->
-		<u-popup v-model="week_show" mode="bottom">
-			<view style="height: 400rpx;text-align: center">
-				<view style="padding-top: 100rpx;padding-left: 40rpx;text-align: center;">
-					<u-checkbox-group @change="checkboxGroupChange">
-						<u-checkbox v-model="item.checked" v-for="(item, index) in list3" :key="index" :name="item.name">{{ item.name }}</u-checkbox>
+		<u-popup v-model="week_show" mode="bottom"  @close="weekPopClose">
+			<view style="height: 450rpx;">
+				<view style="padding-top: 20rpx;padding-left: 40rpx;padding-right:40rpx;">
+					<u-checkbox-group @change="checkboxGroupChange" width="100%">
+						<u-checkbox v-model="item.checked" v-for="(item, index) in list3" :key="index" :name="item.name">
+							<view style="width:660rpx;">{{ item.name }}</view>
+						</u-checkbox>
 					</u-checkbox-group>
-					<view class="title_l" @click="week_submit" style="margin: 50rpx auto;">确认</view>
+					<!-- <view class="title_l" @click="week_submit" style="margin: 50rpx auto;">确认</view> -->
 				</view>
 			</view>
 		</u-popup>
@@ -123,7 +125,7 @@ export default {
 				time: '20:30',
 				startDate: '2021-05-07',
 				endDate: '2021-05-31',
-				week: '一、三、五'
+				week: '每周一、每周三、每周五'
 			},
 			businessId:'',
 			calendar: 'range',
@@ -135,51 +137,51 @@ export default {
 			minDate: '',
 			list3: [
 				{
-					name: '一',
+					name: '每周日',
+					checked: false,
+					disabled: false,
+					id: 0
+				},
+				{
+					name: '每周一',
 					checked: false,
 					disabled: false,
 					id: 1
 				},
 				{
-					name: '二',
+					name: '每周二',
 					checked: false,
 					disabled: false,
 					id: 2
 				},
 				{
-					name: '三',
+					name: '每周三',
 					checked: false,
 					disabled: false,
 					id: 3
 				},
 				{
-					name: '四',
+					name: '每周四',
 					checked: false,
 					disabled: false,
 					id: 4
 				},
 				{
-					name: '五',
+					name: '每周五',
 					checked: false,
 					disabled: false,
 					id: 5
 				},
 				{
-					name: '六',
+					name: '每周六',
 					checked: false,
 					disabled: false,
 					id: 6
-				},
-				{
-					name: '日',
-					checked: false,
-					disabled: false,
-					id: 0
 				}
 			],
 			selWeek: '',
 			index_review: 4,
-			array_review: [1, 2, 3, 4, 5, 6, 7],
+			array_review: [0,1, 2, 3, 4, 5, 6, 7],
 			planId: null,
 			studyNums: '?'
 		};
@@ -233,25 +235,25 @@ export default {
 			let ss = this.form.week.split('、');
 			let weekArray = [];
 			for (let i = 0; i < ss.length; i++) {
-				if (ss[i] == '日') {
+				if (ss[i] == '每周日') {
 					weekArray.push(0);
 				}
-				if (ss[i] == '一') {
+				if (ss[i] == '每周一') {
 					weekArray.push(1);
 				}
-				if (ss[i] == '二') {
+				if (ss[i] == '每周二') {
 					weekArray.push(2);
 				}
-				if (ss[i] == '三') {
+				if (ss[i] == '每周三') {
 					weekArray.push(3);
 				}
-				if (ss[i] == '四') {
+				if (ss[i] == '每周四') {
 					weekArray.push(4);
 				}
-				if (ss[i] == '五') {
+				if (ss[i] == '每周五') {
 					weekArray.push(5);
 				}
-				if (ss[i] == '六') {
+				if (ss[i] == '每周六') {
 					weekArray.push(6);
 				}
 			}
@@ -324,31 +326,31 @@ export default {
 				var numWeek = [];
 				this.form.week.forEach((items, indexs) => {
 					if (items === 1) {
-						numWeek.push('一');
+						numWeek.push('每周一');
 						return;
 					}
 					if (items === 2) {
-						numWeek.push('二');
+						numWeek.push('每周二');
 						return;
 					}
 					if (items === 3) {
-						numWeek.push('三');
+						numWeek.push('每周三');
 						return;
 					}
 					if (items === 4) {
-						numWeek.push('四');
+						numWeek.push('每周四');
 						return;
 					}
 					if (items === 5) {
-						numWeek.push('五');
+						numWeek.push('每周五');
 						return;
 					}
 					if (items === 6) {
-						numWeek.push('六');
+						numWeek.push('每周六');
 						return;
 					}
 					if (items === 0) {
-						numWeek.push('日');
+						numWeek.push('每周日');
 						return;
 					}
 				});
@@ -370,6 +372,9 @@ export default {
 			this.form.week = this.selWeek;
 			this.week_show = false;
 		},
+		weekPopClose() {
+			this.form.week = this.selWeek;
+		},
 		openWeek() {
 			this.week_show = true;
 			this.selWeek = this.form.week;

pages2/plan/index.vue

@@ -279,6 +279,7 @@ export default {
 			let currentMonth = date.getMonth() + 1;
 			this.haveNextMonth = false;
 			this.havePreviousMonth = false;
+			this.calendarStudyVo = {}
 			this.workList = this.getStudyCourseByDay();
 			// this.workList = this.listItem.goodsVos;
 			if (this.listItem !== undefined) {
@@ -295,6 +296,16 @@ export default {
 						}
 					}
 				}
+				
+				if(!this.calendarStudyVo.dayStudyList) { //计划没有当前月
+					this.monthIndex = 0;
+					this.calendarStudyVo = this.listItem.calendarStudyVo[0];
+					
+					if(this.listItem.calendarStudyVo.length > 1) {
+						console.log('len')
+						this.haveNextMonth = true;
+					}
+				}
 				this.dealDayList();
 			}
 		},
@@ -527,11 +538,12 @@ export default {
 				if (result.data.rows.length > 0) {
 					self.listItem = self.list[0];
 					self.dealMonth();
-					if (self.list.length > 0) {
-						self.listItem = self.list[0];
-						self.dealMonth();
-						self.havePlan = true;
-					}
+					self.havePlan = true;
+					// if (self.list.length > 0) {
+					// 	self.listItem = self.list[0];
+					// 	self.dealMonth();
+					// 	self.havePlan = true;
+					// }
 				} else {
 					self.havePlan = false;
 				}

pages2/verify/input.vue

@@ -9,7 +9,7 @@
 				</view>
 				<view style="color: #007AFF;" @click="backPage">稍后再填</view>
 			</view>
-			<u-collapse v-if="remarkStatus" :item-style="itemStyle" event-type="close">
+			<u-collapse v-if="remarkStatus" :item-style="itemStyle" event-type="close" ref="collapse">
 				<u-collapse-item title="审核结果反馈">
 					<view style="padding-bottom: 30rpx;">
 						<text class="collapse-item">{{ remark }}</text>
@@ -552,6 +552,9 @@ export default {
 		},
 		agree() {
 			this.agreementModal = false;
+			this.$nextTick(() => {
+				this.$refs.collapse.init()
+			})
 		},
 		refuseAgreement() {
 			uni.navigateBack({
@@ -780,6 +783,7 @@ export default {
 		},
 		getarrays(key) {
 			if (key === 'sex') {
+				console.log(this.dictObj)
 				return this.dictObj['sys_user_sex'];
 			}
 			if (key === 'education') {

pages2/wd/class.vue

@@ -1,5 +1,5 @@
 <template>
-	<view style="padding: 30rpx;">
+	<view style=" padding:0 30rpx 30rpx;">
 		<nav-bar title="我的网课"></nav-bar>
 		<view class="class" v-for="(item, index) in goodsList" :key="index">
 			

pages3/course/detail.vue

@@ -40,7 +40,7 @@
 			</view>
 			
 		</view>
-		<view style="padding: 20rpx;position: relative;" v-show="current==0">
+		<view style="padding: 20rpx;padding-bottom: 100rpx;position: relative;" v-show="current==0">
 			<view class="content">
 				<view v-html="detail.mobileDetailHtml" style="width: 100%;overflow: hidden;"></view>
 			</view>

pages3/polyv/detail.vue

@@ -1,6 +1,6 @@
 <template>
 	<view>
-		<nav-bar title="身份证"></nav-bar>
+		<nav-bar title="课程详情" v-if="navShow"></nav-bar>
 		<view style="position: fixed;width: 100%;z-index: 999;background: #FFFFFF;" id="top">
 			<view class="video_box" v-if="!startStatus">
 				<image :src="$method.splitImgHost(detail.coverUrl)" style="width: 100%;height: 460rpx;"></image>
@@ -16,11 +16,18 @@
 						:showSettingBtn="true"
 						:enablePlayGesture="true"
 						@statechange="onStateChange"
+						@fullscreenchange="fullscreenchange	"
 						:autoplay="autoplay"
 						:isAllowSeek="isAllowSeek"
 						:playbackRate="playbackRate"
 						:startTime="startTime"
+						:enableAutoRotation="enableAutoRotation"
 					></polyv-player>
+					<cover-view class="video-toast__close" v-if="videoToastShow" @click="closeToast()">X</cover-view>
+					<cover-view class="video-toast" v-if="videoToastShow">
+						<cover-view class="video-toast__text">您上次看到 {{seekTime}}，正在自动续播</cover-view>
+						<cover-view class="video-toast__btn" @click="restart()">从头播放</cover-view>
+					</cover-view>
 				</view>
 				<view class="video_box" style="width: 100%;height: 460rpx;" v-if="playChannelId>0">
 				  <player
@@ -130,7 +137,7 @@
 				</view>
 				<view v-for="(item, index) in answerList" :key="index" style="background-color: #FFFFFF;margin-bottom: 20rpx;">
 					<view class="chat_box" @click.stop="clearCtx">
-						<view style="display: flex;">
+						<view style="display: flex;flex:1;">
 							<view><image :src="item.assignUserId > 0 ? '/static/logo_xcx.png' :$method.splitImgHost(item.avatar)" style="width: 64rpx;height: 64rpx;"></image></view>
 							<view style="margin-left: 15rpx;">
 								<view class="chat1">{{ item.assignUserId > 0 ? '祥粤老师' : item.realname }}</view>
@@ -216,6 +223,11 @@ export default {
 	},
 	data() {
 		return {
+			navShow:true,
+			enableAutoRotation:true,
+			seekTime:'',
+			toastTimer:null,
+			videoToastShow:false,
 			initLiveOk:false,
 			livePlay:false, //是否正在播放直播，不含暂停
 			liveDuration:0, //直播观看时长
@@ -1067,8 +1079,8 @@ export default {
 					if(self.gradeDetail.learningStatus==2){
 						uni.showModal({
 							showCancel:false,
-							cancelText: '返回',
-							content: '当前课程正在申请中，请耐心等待',
+							confirmText: '确定',
+							content: '当前课程正在申请中，正式开班后方可进行学习，请耐心等候！',
 							success: function(resultst) {
 								uni.navigateBack();
 							}
@@ -1320,13 +1332,29 @@ export default {
 				}
 			}
 		},
+		closeToast() {
+			clearTimeout(this.toastTimer)
+			this.videoToastShow = false;
+			
+		},
+		restart() {
+			var polyvPlayerContext = this.selectComponent('#playerVideo');
+			polyvPlayerContext.seek(0);
+			clearTimeout(this.toastTimer)
+			this.videoToastShow = false;
+		},
 		onStateChange(newstate, oldstate) {
 			if (newstate.detail.newstate == 'playing') {
 				if (this.needSeek) {  
 					var polyvPlayerContext = this.selectComponent('#playerVideo');
 					if(this.recordObj.videoCurrentTime){
-						console.log('seek')
 						polyvPlayerContext.seek(this.recordObj.videoCurrentTime);
+						this.seekTime = this.$method.secondToDate(this.recordObj.videoCurrentTime)
+						this.videoToastShow = true;
+						this.toastTimer = setTimeout(() => {
+							this.videoToastShow = false;
+						},3000)
+						
 					}else{
 						polyvPlayerContext.seek(1);//避免相同节继续播放
 					}
@@ -1352,6 +1380,9 @@ export default {
 		},
 		//拍照
 		openPhoto() {
+			var polyvPlayerContext = this.selectComponent('#playerVideo');
+			polyvPlayerContext.exitFullScreen();
+			this.enableAutoRotation = false;
 			this.photoPopup = true;
 			uni.authorize({
 			     scope: 'scope.camera',
@@ -1383,6 +1414,7 @@ export default {
 					self.submit();
 
 					self.photoPopup = false;
+					self.enableAutoRotation = true;
 				},
 				fail: err => {
 					console.log(err);
@@ -1396,6 +1428,19 @@ export default {
 		//关闭相机
 		closePhoto() {
 			this.photoPopup = false;
+			self.enableAutoRotation = true;
+		},
+		/**
+		 * 进入全屏
+		 */
+		fullscreenchange(event) {
+			console.log(event)
+			if(event.detail.direction == 'vertical') {
+				this.navShow = true;
+			} else if(event.detail.direction == 'horizontal') {
+				this.navShow = false;
+				
+			}
 		},
 		getGoodsDetail() {
 			let self = this;
@@ -1736,9 +1781,9 @@ export default {
 }
 
 page {
-	padding-top: 10px;
-	padding-top: constant(safe-area-inset-top);
-	padding-top: env(safe-area-inset-top);
+	// padding-top: 10px;
+	// padding-top: constant(safe-area-inset-top);
+	// padding-top: env(safe-area-inset-top);
 }
 .inputBottom {
 	position: fixed;
@@ -2121,6 +2166,48 @@ page {
 }
 .video_box {
 	position: relative;
+	
+	.video-toast {
+		position:absolute;
+		width: 686rpx;
+		height: 80rpx;
+		background: rgba(0,0,0,0.6);
+		border-radius: 24rpx;
+		bottom:100rpx;
+		left:50%;
+		transform: translateX(-50%);
+		color:#fff;
+		display: flex;
+		font-size: 26rpx;
+		align-items: center;
+		overflow:visible;
+		
+		&__text {
+			flex:1;
+			margin-left:40rpx;
+		}
+		
+		
+		
+		&__btn {
+			width:180rpx;
+			text-align: center;
+			border-left:1rpx solid #fff;
+		}
+	}
+	
+	.video-toast__close {
+		position:absolute;
+		right:32rpx;
+		bottom:184rpx;
+		width: 40rpx;
+		height: 40rpx;
+		line-height: 40rpx;
+		text-align: center;
+		background: rgba(0,0,0,0.6);
+		border-radius:50%;
+		color:rgba(255,255,255,0.3)
+	}
 }
 .rotoct {
 	transform: rotate(90deg);