wangxy il y a 2 mois
Parent
commit
84fc56890e

+ 0 - 1
pages/admin/Kaoshi/exam.vue

@@ -8,7 +8,6 @@
 		<!-- 第一行 -->
 		<view class="kaoshi-page-title">
 			<view v-if="activeSt" class="title-types">{{dlName}}</view>
-			<view>100分钟</view>
 		</view>
 
 

+ 1 - 1
pages/admin/Kaoshi/list.vue

@@ -1,7 +1,7 @@
 <template>
 	<view class="phone-list-page">
 		<view class="icon-title-navBar-box">
-			<view @click="goUpPage" class="nav-bar-icon"></view>
+			<!-- <view @click="goUpPage" class="nav-bar-icon"></view> -->
 			<text class="nav-bar-title">考试管理</text>
 		</view>
 		<!-- 查询职业 -->

+ 1 - 1
pages/admin/Kecheng/list.vue

@@ -1,7 +1,7 @@
 <template>
 	<view class="phone-list-page">
 		<view class="icon-title-navBar-box">
-			<view @click="goUpPage" class="nav-bar-icon"></view>
+			<!-- <view @click="goUpPage" class="nav-bar-icon"></view> -->
 			<text class="nav-bar-title">课程管理</text>
 		</view>
 		<!-- 查询职业 -->

+ 24 - 7
pages/admin/Kecheng/study.vue

@@ -2,10 +2,11 @@
 	<view class="kecheng-study-page">
 		<view class="icon-title-navBar-box">
 			<view @click="goUpPage" class="nav-bar-icon"></view>
-			<text class="nav-bar-title">{{title}}</text>
+			<text class="nav-bar-title">{{name}}</text>
 		</view>
 		<!-- 播放器 -->
-		<videoPlayVue ref="videoRef" class="phone-video-box"></videoPlayVue>
+		<videoPlayVue ref="videoRef" class="phone-video-box" v-if="kechengFlag"></videoPlayVue>
+		<view v-else class="phone-video-box" style="background-color: #333;"></view>
 		<!-- 中间区域 -->
 		<view class="kc-info-box">
 			<view>时长:{{period}}分钟</view>
@@ -18,9 +19,10 @@
 		</view>
 		<view class="kecheng-content-box">
 			<!-- 目录 -->
-			<kechengMuluVue v-if="current === 0" :chapterArr="list" @play="handlePlay" :isHasProgress="false" :activeKjId="curPlayData&&curPlayData.kjId"></kechengMuluVue>
+			<kechengMuluVue v-if="current === 0" :chapterArr="list" @play="handlePlay" :isHasProgress="false" 
+			:activeKjId="curPlayData&&curPlayData.kjId"></kechengMuluVue>
 			<!-- 介绍 -->
-			<rich-text :nodes="intro" v-if="current === 1 && intro" class="kecheng-jieshao-box"></rich-text>
+			<rich-text :nodes="intro || '暂无内容'" v-if="current === 1 && intro" class="kecheng-jieshao-box"></rich-text>
 		</view>
 	</view>
 </template>
@@ -53,7 +55,8 @@
 				userCount: 0, // 学习人数
 				list: [],
 				intro: '',
-				curPlayData: null
+				curPlayData: null,
+				kechengFlag: null
 			}
 		},
 		onLoad(options) {
@@ -81,6 +84,14 @@
 				return data;
 			},
 			handlePlay(data) {
+				if (!this.kechengFlag) {
+					uni.showToast({
+						icon: 'none',
+						title: '当前课件不可查看'
+					})
+					return;
+				}
+				
 				if (this.curPlayData && this.curPlayData.videoId == data.videoId) {
 					return;
 				}
@@ -92,6 +103,7 @@
 						videoId: data.url,
 						playAuth: res.data,
 						seekTime: '',
+						isPlay: true
 					})
 				})
 			},
@@ -102,7 +114,9 @@
 					this.list[0].jieList[0].open = true;
 					
 					const kejian = this.list[0].jieList[0].kejianList[0];
-					this.handlePlay(kejian)
+					if (this.kechengFlag == 1) {
+						this.handlePlay(kejian)
+					}	
 				}
 			},
 			init() {
@@ -114,11 +128,13 @@
 						period,
 						name,
 						kejianUserVo,
-						intro
+						intro,
+						kechengFlag
 					} = res.data;
 					this.userCount = userCount;
 					this.period = formatDuration(period);
 					this.name = name;
+					this.kechengFlag = kechengFlag;
 					let testData = JSON.parse(JSON.stringify([...kejianUserVo.zhangList, ...kejianUserVo.zhangList,
 						...kejianUserVo.zhangList
 					]))
@@ -126,6 +142,7 @@
 					this.list = testData;
 					this.intro = intro;
 
+					
 					this.initFirstVideo();
 
 					uni.setNavigationBarTitle({

+ 1 - 1
pages/admin/Lianxi/list.vue

@@ -1,7 +1,7 @@
 <template>
 	<view class="phone-list-page">
 		<view class="icon-title-navBar-box">
-			<view @click="goUpPage" class="nav-bar-icon"></view>
+			<!-- <view @click="goUpPage" class="nav-bar-icon"></view> -->
 			<text class="nav-bar-title">练习管理</text>
 		</view>
 		<!-- 查询职业 -->

+ 0 - 10
pages/client/Chengji/list.vue

@@ -4,13 +4,6 @@
 			<!-- <view @click="goUpPage" class="nav-bar-icon"></view> -->
 			<text class="nav-bar-title">成绩</text>
 		</view>
-		<!-- 查询职业 -->
-		<view class="phone-search-box">
-			<input class="search-input" placeholder="请输入职业名称" v-model="data.zyName" />
-			<view class="search-icon" @click="handleSearch">
-				<uni-icons type="search" size="24" color="#fff"></uni-icons>
-			</view>
-		</view>
 		<!-- 课程列表 -->
 			<scroll-view scroll-y="true" refresher-enabled="true" :refresher-triggered="data.loading"
 				:refresher-threshold="50" refresher-background="transparent" @refresherrefresh="onRefresh"
@@ -62,7 +55,6 @@
 	
 
 	const data = reactive({
-		zyName: '', // 职业名称
 		list: [], // 考试列表
 		loading: false,
 		page: 0,
@@ -118,7 +110,6 @@
 		const opt = {
 			page: 1,
 			size: 10, // 固定查询10条
-			zyName: data.zyName
 		}
 		data.list = [];
 		// 数学
@@ -147,7 +138,6 @@
 		const opt = {
 			page: 1,
 			size: 10, // 固定查询10条
-			zyName: data.zyName
 		}
 		if (data.state == 'no-more') return;
 		data.state = 'loading';

+ 1 - 1
pages/client/Lianxi/list.vue

@@ -1,6 +1,6 @@
 <template>
 	<view class="phone-list-page">
-		<view class="icon-title-navBar-box">
+		<view class="icon-title-bjcolor-navBar-box">
 			<!-- <view @click="goUpPage" class="nav-bar-icon"></view> -->
 			<text class="nav-bar-title">练习管理</text>
 		</view>