wangguoyu 1 день назад
Родитель
Сommit
5de17c7255
2 измененных файлов с 19 добавлено и 18 удалено
  1. 1 4
      components/videoPlay/videoPlay.vue
  2. 18 14
      pages/admin/Kecheng/study.vue

+ 1 - 4
components/videoPlay/videoPlay.vue

@@ -6,14 +6,12 @@
 			:status="hideFlag"
 			:change:hideFlag="renderScript.hideFlagFun" :seekTime="seekTime" :change:seekTime="renderScript.seekTimeFun"
 			class="kecheng-video">
-				<zmm-watermark :watermark="watermark" color="#999" column="2" margin="24" opacity="0.1"></zmm-watermark>
 		</view>
 	</view>
 </template>
 
 <script>
 		import { nextTick } from "vue";
-import cacheManager from "@/utils/cacheManager.js";
 	export default {
 		name: "videoPlay",
 		data() {
@@ -22,8 +20,7 @@ import cacheManager from "@/utils/cacheManager.js";
 				hideFlag: 'show',
 				videoId: "", //阿里云视频id
 				seekTime: '',
-				playCount: 0,
-				watermark: `<h5>${cacheManager.get("auth").userName}-${cacheManager.get("auth").jzName}"</h5>`
+				playCount: 0
 			};
 		},
 		onUnload() {

+ 18 - 14
pages/admin/Kecheng/study.vue

@@ -1,10 +1,11 @@
 <template>
 	<view class="kecheng-study-page">
+		<zmm-watermark :watermark="watermark" color="#999" column="2" margin="24" opacity="0.1"></zmm-watermark>
 		<view class="icon-title-navBar-box kecheng-study-navBar">
 			<view @click="goUpPage" class="nav-bar-icon"></view>
 			<text class="nav-bar-title">{{name}}</text>
 		</view>
-	<!-- 	  <zmm-watermark :watermark="watermark"></zmm-watermark> -->
+		<!-- 	  <zmm-watermark :watermark="watermark"></zmm-watermark> -->
 		<!-- <view class="icon-title-navBar-box">
 			<view @click="goUpPage" class="nav-bar-icon"></view>
 			<text class="nav-bar-title">{{name}}</text>
@@ -12,7 +13,7 @@
 		<!-- 播放器 -->
 		<videoPlayVue ref="videoRef" class="phone-video-box" v-if="showVideo"></videoPlayVue>
 		<view v-else class="phone-video-box master-image">
-				<!-- <view class="video-player-icon" @click="handlePlayFirst"></view> -->
+			<!-- <view class="video-player-icon" @click="handlePlayFirst"></view> -->
 		</view>
 		<view class="kecheng-study-body">
 			<!-- 播放引导 -->
@@ -30,7 +31,7 @@
 					郑重声明:课程版权归平台所有,禁止对本课程进行任何录音录像,违者将承担法律责任。
 				</view>
 			</view>
-			
+
 			<!-- 大纲 -->
 			<view class="phone-tab-box">
 				<uni-segmented-control :current="current" :values="items" style-type="text" :active-color="activeColor"
@@ -38,10 +39,11 @@
 			</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>
 	</view>
@@ -51,6 +53,7 @@
 	import * as kechengApi from "@/api/kecheng.js";
 	import videoPlayVue from "@/components/videoPlay/videoPlay.vue";
 	import kechengMuluVue from "@/components/kecheng-mulu/kecheng-mulu.vue";
+	import cacheManager from "@/utils/cacheManager.js";
 	import {
 		useUserCache
 	} from "@/utils/userCache.js"
@@ -79,8 +82,9 @@
 				curPlayData: null,
 				kechengFlag: null,
 				operId: '', // 课程
-				pageFrom:'',
+				pageFrom: '',
 				name: '',
+				watermark: `<h5>${cacheManager.get("auth").userName}-${cacheManager.get("auth").jzName}"</h5>`
 				//    watermark: '<h5>我是h5标签我是h5标签我是h5标签我是h5标签</h5><p style="color:#f00">我是p标签</p><br>'
 			}
 		},
@@ -95,22 +99,22 @@
 					// 设置默认展开项
 					this.list[0].open = true;
 					this.list[0].jieList[0].open = true;
-					
+
 					const kejian = this.list[0].jieList[0].kejianList[0];
 					this.handlePlay(kejian)
 				}
 			},
 			goUpPage() {
-				if(this.pageFrom==='shouye'){
+				if (this.pageFrom === 'shouye') {
 					uni.redirectTo({
 						url: '/pages/admin/ShouYe/shouye'
 					})
-				}else{
+				} else {
 					uni.redirectTo({
 						url: '/pages/admin/Kecheng/list'
 					})
 				}
-				
+
 			},
 			onClickItem(e) {
 				if (this.current !== e.currentIndex) {
@@ -127,7 +131,7 @@
 				return data;
 			},
 			handlePlay(data) {
-				console.log('data',data,this.curPlayData)
+				console.log('data', data, this.curPlayData)
 				if (!this.kechengFlag) {
 					uni.showToast({
 						icon: 'none',
@@ -174,14 +178,14 @@
 						operId,
 					} = res.data;
 					this.userCount = userCount;
-					this.period = formatSecondsToCnhms(period,true);
+					this.period = formatSecondsToCnhms(period, true);
 					this.name = name;
 					this.kechengFlag = kechengFlag;
 					this.formatData(kejianUserVo.zhangList)
 					this.list = kejianUserVo.zhangList;
 					this.intro = intro;
 					this.operId = operId;
-					
+
 					this.initFirstVideo();
 
 				})