合并主分支的视频播放

.hbuilderx/launch.json

@@ -4,24 +4,20 @@
     "version" : "0.0",
     "configurations" : [
         {
-        	"app-plus" : 
+            "app-plus" : {
-        	{
+                "launchtype" : "remote"
-        		"launchtype" : "remote"
+            },
-        	},
+            "default" : {
-        	"default" : 
+                "launchtype" : "local"
-        	{
+            },
-        		"launchtype" : "local"
+            "h5" : {
-        	},
+                "launchtype" : "local"
-        	"h5" : 
+            },
-        	{
+            "mp-weixin" : {
-        		"launchtype" : "local"
+                "launchtype" : "local"
-        	},
+            },
-        	"mp-weixin" : 
+            "provider" : "aliyun",
-        	{
+            "type" : "uniCloud"
-        		"launchtype" : "local"
-        	},
-        	"provider" : "aliyun",
-        	"type" : "uniCloud"
         },
         {
             "playground" : "custom",

App.vue

@@ -26,7 +26,7 @@
 		onLaunch: function(e) {
 			// 检测自动更新
 			// #ifdef APP-PLUS
-			updata();
+			 updata();
 			// #endif
 
 			uni.getSystemInfo({

components/z-navigation/z-navigation.vue

@@ -21,7 +21,7 @@
           ></image>
           <text 
             class="footer_nav_item_text"
-            :class="[item.pagePath == path ? 'footer_item_text_active' : '']"
+            :class="[item.pagePath == path ? 'footer_item_text_active' : '',index == 2 && item.pagePath == path ? 'redText' :'']"
             >{{ item.text }}</text
           >
         </view>
@@ -216,6 +216,7 @@ export default {
   color: #7b7b7b;
   margin-top: 6rpx;
 }
+.footer_nav_item_text.redText{color: red;}
 
 .footer_nav_item_text_active {
   color: #f9a633;

manifest.json

@@ -3,7 +3,7 @@
     "appid" : "__UNI__C7475A8",
     "description" : "吴门医述",
     "networkTimeout" : {
-        "request" : 3000
+        "request" : 15000
     },
     "transformPx" : false,
     "icons" : [
@@ -12,8 +12,8 @@
             "src" : "图片路径"
         }
     ],
-    "versionName" : "1.0.15",
+    "versionName" : "1.0.16",
-    "versionCode" : 1015,
+    "versionCode" : 1016,
     "app-plus" : {
         "nvueCompiler" : "weex",
         "compatible" : {

pages/component/commonComponents/curriculumVideo.vue

@@ -1,7 +1,6 @@
 <template>
   <view class="richDetail">
     <!-- 公共组件-每个页面必须引入 -->
-
     <view
       scroll-x="true"
       class="detail_title video_box"
@@ -28,13 +27,16 @@
 import $http from "@/config/requestConfig.js";
 import { mapState } from "vuex";
 export default {
-  props: ["detailInfo", "dataList", "currentVideo"],
+  props: ["detailInfo", "dataList", "currentVideo", "changeVideoLock"],
   components: {},
   data() {
     return {};
   },
   onLoad(options) {},
   onHide() {},
+  mounted() {
+  	console.log('currentVideo播放列表收到的--',this.currentVideo)
+  },
   computed: {
     ...mapState(["userInfo"]),
   },
@@ -47,8 +49,10 @@ export default {
       }
     },
     handleClick(data) {
+		if(this.changeVideoLock){
+			return
+		}
       console.log("data at line 35:", data);
-
       this.$emit("open", data);
     },
 

pages/component/commonComponents/video/index.vue

@@ -1,13 +1,27 @@
 <template>
 	<view class="container" style="background-color: #000; position: relative">
 		<view style="width: 100%; height: 200px">
-			<view v-if="show" style="height: 100%;display: flex;align-items:center;justify-content:center;color: #fff;font-size: 38rpx;text-align: center;">{{errorTxt}}</view>
+			<view v-if="showCountDown" class="showCountDownd" style="">
+				<view class="">
+					<text  class="nextText">{{secondCountDown}} 秒后播放下一个视频</text><br/>
+					<view  > 
+					<text  class="cancelNext" @click="hideNextVideo">取消下一个</text> 
+					<!-- <text class="cancelNext" @click="replayVideo">重新播放</text> -->
+					</view>
+					<!-- <view class="cancelNext" @click="hideNextVideo">重新播放</view> -->
+				</view>
+			</view>
+			<view v-if="show"
+				style="height: 100%;display: flex;align-items:center;justify-content:center;color: #fff;font-size: 38rpx;text-align: center;">
+				{{errorTxt}}</view>
 			<div class="" v-else style="background-color: #000" ref="videoContent" @tap="renderScript.handleClick"
 				id="url-player-test" :videoData="videoData" :winWidth="winWidth" :winHeight="winHeight"
 				:currentVideoList="currentVideoList" :firstTime="firstTime" :isfresh="isfresh" :platform="platform"
 				:isSetFirstTime="isSetFirstTime" :isChange="isChange" :change:videoData="renderScript.receiveMsg"
+				:replayVideoFlag="replayVideoFlag"
 				:change:winWidth="renderScript.receiveWinWidth" :change:winHeight="renderScript.receiveWinHeight"
 				:change:firstTime="renderScript.receiveFirstTime"
+				:change:replayVideoFlag="renderScript.receiveReplayVideoFlag"
 				:change:isSetFirstTime="renderScript.receiveisSetFirstTime"
 				:change:isfresh="renderScript.receiveIsfresh" :change:platform="renderScript.receiveplatform"
 				:change:isChange="renderScript.receiveIsChange"
@@ -29,6 +43,18 @@
 			<div @tap="renderScript.emitopenShow" ref="videoContent5" v-show="false" class="videoContent5">
 				打开视频提示
 			</div>
+			<div @tap="renderScript.emitLoadNextVideo" ref="videoContent6" v-show="false" class="videoContent6">
+				播放下一条
+			</div>
+			<div @tap="renderScript.emitHideNextVideo" ref="videoContent7" v-show="false" class="videoContent7">
+				隐藏播放下一条界面
+			</div>
+			<div @tap="renderScript.emitReplayVideoFlagFalse" ref="videoContent8" v-show="false" class="videoContent8">
+				隐藏播放下一条界面
+			</div>
+			<div @tap="renderScript.emitUnlockChangeVideo" ref="videoContent9" v-show="false" class="videoContent9">
+				释放切换键锁
+			</div>
 			<div class="fullScreenButton-container">
 				<div :class="`prism-fullscreen-btn ${isFullScreen ? 'fullscreen' : ''}`"
 					@tap="renderScript.changeVideoScreen"></div>
@@ -45,9 +71,10 @@
 	} from "vuex";
 
 	export default {
-		props: ["currentVideo", "currentVideoList","videoTitle"],
+		props: ["currentVideo", "currentVideoList", "videoTitle",'secondCountDown'],
 		data() {
 			return {
+				reaquestFlag: false,
 				show: false,
 				platform: null,
 				//当前是否是全屏模式
@@ -56,8 +83,13 @@
 				isChange: false,
 				isControl: true,
 				timer: null,
+				replayVideoFlag:false,
+				// secondCountDown: 5,
+				showCountDown: false,
+				playEndBlank:false,
 				// videoTitle: "",
 				videoList: [],
+				replayVideoLock:false,// 重播操作锁
 				firstTime: 0,
 				options: {},
 				playAuth: "",
@@ -67,7 +99,7 @@
 				isSetFirstTime: false,
 				screenType: null,
 				videoUrl: null,
-				errorTxt:'此设备暂不支持观看当前视频请移步到安卓手机进行学习！'
+				errorTxt: '此设备暂不支持观看当前视频请移步到安卓手机进行学习！'
 			};
 		},
 		computed: {
@@ -110,6 +142,42 @@
 		},
 
 		methods: {
+			replayVideo(){
+				if(!this.replayVideoFlag){
+					this.getLive(true, this.currentVideo)
+					console.log('this.currentVideo',this.currentVideo.id);
+					this.hideNextVideo()				
+					this.replayVideoFlag = true
+				}
+			},
+			replayVideoFlagFalse(){
+				console.log('复原replayVideoFlag',this.replayVideoFlag);
+				this.replayVideoFlag = false
+			},
+			UnlockChangeVideo(){
+				this.$emit('unlockChangeVideo')
+			},
+			hideNextVideo(){
+				this.showCountDown = false
+				this.playEndBlank = false
+				this.$emit('hideNextVideo')
+			},
+			loadNextVideo() {	
+				this.playEndBlank = true
+				var _list = [...this.currentVideoList]
+				_list = _list.map(item => { return item.id})
+				
+				var thisIndex = _list.findIndex(item=>{
+					return item == this.currentVideo.id
+				})
+				console.log('播放列表',_list,this.currentVideo.id, thisIndex);
+				if(thisIndex < this.currentVideoList.length-1){
+					this.showCountDown = true
+					this.$emit('startNextVideoCountDown')
+				}
+				
+			},
+
 			openShow(data) {
 				data.msg ? this.errorTxt = data.msg : '此设备暂不支持观看当前视频请移步到安卓手机进行学习'
 				this.show = true;
@@ -126,11 +194,13 @@
 				this.isChange = false;
 			},
 			async changeVideo(data) {
+				console.log('changeVideo+++++++++', data);
 				this.currentTime = "";
 				this.firstTime = 0;
 				this.isSetFirstTime = false;
 				this.isChange = false;
-				await this.init(data, true);
+				this.getLive(true, data)
+				// await this.init(data, true);
 			},
 			screenChange(data) {
 				console.log(
@@ -163,7 +233,7 @@
 
 				this.videoId = this.options.video;
 				console.log("这是苹果视屏id", this.videoId);
-				await this.getLive(isChange);				
+				await this.getLive(isChange,this.options);
 			},
 			// 配置播放项
 			async getData(data, isChange) {
@@ -177,7 +247,7 @@
 						list = JSON.parse(uni.getStorageSync("videoOssList"));
 
 						var index = list.findIndex((e) => e.id == data.id);
-						console.log('data.id',data.id);
+						console.log('data.id', data.id);
 						if (netWork) {
 							if (index >= 0) {
 								this.firstTime =
@@ -198,7 +268,7 @@
 
 					this.videoData = {
 						...data,
-						firstTime : this.firstTime
+						firstTime: this.firstTime
 					};
 					this.isChange = isChange ? isChange : false;
 					console.log(this.firstTime, "这是第一次播放时长222");
@@ -209,7 +279,7 @@
 			},
 			// 存储本地播放时间
 			recordTime(data) {
-				 console.log('recordTime',data.time);
+				console.log('recordTime', data.time);
 				this.currentTime = data.time;
 
 				var list = [];
@@ -232,13 +302,25 @@
 				uni.setStorageSync("videoOssList", JSON.stringify(list));
 			},
 			// 获取播放凭证
-			async getLive(isChange) {
+			async getLive(isChange, newVideoData) {
+				console.log('获取播放凭证',newVideoData.id);
+				if (this.reaquestFlag) {
+					uni.showToast({
+						title: '操作太快了,歇一下吧',
+						icon: 'none'
+					})
+				}
+				this.reaquestFlag = true
 				var that = this;
 				this.isfresh = false;
 				var data = {
 					...this.options,
 				};
-
+				if (isChange && newVideoData) {
+					data = {
+						...newVideoData,
+					};
+				}
 				await $http
 					.request({
 						url: `sociology/course/checkVideo`,
@@ -250,19 +332,22 @@
 						},
 					})
 					.then(async (res) => {
+						
+						this.reaquestFlag = false
 						if (this.$platform == 'ios') {
-							if (this.currentVideo.type == 1 && res.video.m3u8Url == null || this.currentVideo.type == 1 && res.video.m3u8Url == '') {
+							if (this.currentVideo.type == 1 && res.video.m3u8Url == null || this.currentVideo
+								.type == 1 && res.video.m3u8Url == '') {
 								// 只存在私有加密
 								this.show = true
 								uni.showModal({
 									content: '抱歉，苹果手机不支持此加密视频格式，您可以在安卓端观看本视频',
 									confirmText: '知道了',
 									showCancel: false,
-									success: function (res) {
+									success: function(res) {
-											if (res.confirm) {
+										if (res.confirm) {
-												// uni.navigateBack({delta: 2})
+											// uni.navigateBack({delta: 2})
-											}
 										}
+									}
 								})
 								return
 							}
@@ -292,13 +377,19 @@
 						console.log("是否获取到初始播放值", data);
 
 						that.$forceUpdate();
+					}).catch(e => {
+						this.reaquestFlag = false
+						uni.showToast({
+							'title': '获取播放地址失败',
+							icon: 'none'
+						})
 					});
 			},
 
 			async handleEnd() {
 				var list = JSON.parse(uni.getStorageSync("videoOssList"));
 				var data = list.find((e) => e.id == this.videoData.id);
-				 this.currentTime = data.time;
+				this.currentTime = data.time;
 				console.log(
 					"this.currentTime at line 这是结束的时候掉的存储视频:",
 					this.currentTime
@@ -310,9 +401,9 @@
 			// 存储时长到线上
 			setVideoTime(time) {
 				var data = {};
-				console.log("是否走了存储视屏," + this.videoData.id, time,this.currentTime);
+				console.log("是否走了存储视屏," + this.videoData.id, time, this.currentTime);
 				let _time = null
-				time ?  _time = time : _time = this.currentTime
+				time ? _time = time : _time = this.currentTime
 				var data = {
 					videoId: this.videoData.id,
 					position: _time, //秒数
@@ -356,9 +447,11 @@
 <script module="renderScript" lang="renderjs">
 	var videoData = null
 	var _seconds = 0
+	var ReplayVideoFlag = false
 	var curStatus = null
 	var diff = 0
-	
+	var pauseTime = 0
+	var myplayer = undefined	
 	import $ from 'jquery'
 	export default {
 		components: {
@@ -398,28 +491,56 @@
 				})
 
 			},
+			receiveReplayVideoFlag(newValue, oldValue, ownerVm, vm) {
+				console.log('newValue重新播放',newValue,myplayer);
+				ReplayVideoFlag = newValue
+				if(newValue){
+					$('.videoContent8').click()
+					// ReplayVideoFlag = newValue
+				// 	// myplayer.replay()
+				// 	$('.videoContent7').click()
+				// 	 myplayer.seek(0)
+					// myplayer.play()
+					
+				}
+				
+			},
+			emitReplayVideoFlagFalse(event, ownerInstance) {
+					ownerInstance.callMethod('replayVideoFlagFalse')
+			},
+			emitUnlockChangeVideo(event, ownerInstance) {
+					ownerInstance.callMethod('UnlockChangeVideo')
+			},
 			async receiveFirstTime(newValue, oldValue, ownerVm, vm) {
 
 			},
 			async receiveisSetFirstTime(newValue, oldValue, ownerVm, vm) {
-				console.log('是否刚开始设置播放时间', newValue, this.firstTime, this.player);
+				console.log('是否刚开始设置播放时间', newValue, this.firstTime, myplayer);
 			},
 			emitSetData(event, ownerInstance) {
 				// var that = this;				
-				ownerInstance.callMethod('setVideoFirtsetTime',{
+				ownerInstance.callMethod('setVideoFirtsetTime', {
 					time: _seconds,
 				})
 			},
+			emitHideNextVideo(event, ownerInstance) {
+				ownerInstance.callMethod('hideNextVideo')
+			},
+			emitLoadNextVideo(event, ownerInstance) {
+				ownerInstance.callMethod('loadNextVideo')
+			},
 			emitopenShow(event, ownerInstance) {
-				ownerInstance.callMethod('openShow',{msg:'播放出错啦！'})
+				ownerInstance.callMethod('openShow', {
+					msg: '播放出错啦！'
+				})
 			},
 			// 全屏切换事件
 			changeVideoScreen(event, ownerInstance) {
 				var that = this;
 				// this.$emit('changeScreenLoading',true)
-				var status = this.player.fullscreenService.getIsFullScreen();
+				var status = myplayer.fullscreenService.getIsFullScreen();
-				console.log('this.$platform--------',this.platform);
+				console.log('this.$platform--------', this.platform);
-				if (this.platform != 'ios') {	// 改变按钮形态				
+				if (this.platform != 'ios') { // 改变按钮形态				
 					ownerInstance.callMethod('screenChange', {
 						status: status,
 						primary: status ? 'portrait' : 'landscape'
@@ -428,18 +549,18 @@
 				if (status) {
 					if (this.platform != 'ios') {
 						console.log('恢复竖版');
-					setTimeout(() => {
+						setTimeout(() => {
-						plus.screen.lockOrientation("portrait-primary"); //锁死屏幕方向为竖屏
+							plus.screen.lockOrientation("portrait-primary"); //锁死屏幕方向为竖屏
-						this.player.fullscreenService.cancelFullScreen();
+							myplayer.fullscreenService.cancelFullScreen();
-					}, 100);
+						}, 100);
 					}
 				} else {
-					this.player.fullscreenService.requestFullScreen();
+					myplayer.fullscreenService.requestFullScreen();
 					if (this.platform != 'ios') {
 						setTimeout(() => {
 							plus.screen.lockOrientation("landscape-primary");
 						}, 100);
-					}else{
+					} else {
 						console.log('不要旋转, 使用原生全屏');
 					}
 
@@ -455,12 +576,11 @@
 			},
 			// renderjs阿里云播放器引入与配置
 			getLive() {
-				console.log('这是这只只是666666:', this.firstTime, this.videoData)
+				 console.log('这是这只只是666666:', this.firstTime, this.videoData)
-				if (this.player) {
+				
-					this.player.dispose();
 					$('#url-player-test').empty();
-					this.player = null;
+				
-				}
+				pauseTime = 0
 				var fullScreenButtonComponent = Aliplayer.Component({
 					/**
 					 * 初始函数，在new对象时调用
@@ -487,21 +607,6 @@
 						});
 						$(el).find('.prism-time-display').after(this.$html);
 					},
-					ready: function(player, e) {
-						// this.$html.hide()
-					},
-					/**
-					 * 隐藏广告
-					 */
-					play: function(player, e) {
-						// this.$html.show();
-					},
-					/**
-					 * 显示广告
-					 */
-					pause: function(player, e) {
-						// this.$html.show();
-					},
 					/**
 					 * 隐藏广告
 					 */
@@ -509,32 +614,22 @@
 						this.$html.show();
 						// this.$html.hide();
 					},
-					waiting: function(player, e) {						
+					
-						// this.$html.hide()
-					},
-					timeupdate: function(player, e) {},
-					error: function(player, e) {},
-					/**
-					 * 显示广告
-					 */
-					ended: function(player, e) {					
-					}
 				});
-				console.log('这是查看是否获取到hlstoken', this.videoData)
+				// console.log('这是查看是否获取到hlstoken', this.videoData)
 				var playerOptions = {
 					id: "url-player-test",
-					                width: '100%', //容器的大小
+					width: '100%', //容器的大小
-					                height: '100%', //容器的大小
+					height: '100%', //容器的大小
-					                "qualitySort": "asc",					
+					"qualitySort": "asc",
-					                "cover": "",
+					"cover": "",
-					                "autoplay": true,
+					"autoplay": true,
-					            "isLive": false,
+					"isLive": false,
-					            "rePlay": false,
+					"rePlay": false,
-					            "playsinline": true,
+					"playsinline": true,
-					            "controlBarVisibility": "hover",
+					"controlBarVisibility": "hover",
-					            "useH5Prism": true,					
+					"useH5Prism": true,
-					components: [						
+					components: [{
-						{
 							name: 'adComponent',
 							type: fullScreenButtonComponent,
 							args: [
@@ -635,14 +730,14 @@
 								}
 							}
 							console.log('这是私有加密的视频');
-						 }
+						}
 					} else if (this.videoData.m3u8Url != null || this.videoData.m3u8Url != '') {
 						playerOptions = {
 							...playerOptions,
 							source: this.videoData.m3u8Url,
 							// "playConfig": {"EncryptType": "HLSEncryption"}
 						}
-						console.log('这是标准加密的视频');
+						console.log('这是标准加密的视频', this.videoData.id, this.videoData.m3u8Url);
 					}
 
 				} else {
@@ -655,40 +750,71 @@
 
 				var player = new Aliplayer(playerOptions, function(player) {});
 				this.player = player;
-				console.log('是否拿到第一次初始值呢', this.platform, typeof this.firstTime, this.firstTime)		
+				myplayer = player;
+				// console.log('myplayer------------',myplayer.loadByUrl('https://www.w3schools.com/html/movie.mp4'));
+				// console.log('是否拿到第一次初始值呢', this.platform, typeof this.firstTime, this.firstTime)
 
 				player.on('ready', function() {
+					console.log('播放器准备就绪，开始播放');
+					player.play()
+					$('.videoContent9').click()
+				})
+				player.on('play', function() {
+					console.log('开始播放------');					
+					$('.videoContent7').click()
+					if(pauseTime > 0){
+						player.seek(pauseTime);
+					}
 				})
 				player.one('canplay', function() {
-					console.log('这是ios数据缓冲初次设置播放位置判断！！！！',videoData)
+					// console.log('这是ios数据缓冲初次设置播放位置判断！！！！', videoData)
 					// player.seek(20);
-					player.seek(videoData.firstTime);
+					// if(ReplayVideoFlag){
+					// 	player.seek(0);
+					// }else{
+						var videoDurationTimes = parseInt(player.getDuration())
+						// var firstTime = parseInt(player.getCurrentTime())
+						console.log('视频总长度',parseInt(player.getDuration()),parseInt(player.getCurrentTime()));
+						if(videoData.firstTime < videoDurationTimes){
+						player.seek(videoData.firstTime);
+						}else{
+							player.seek(0);
+						}
+					//}
 				})
-				this.player.on('playing', function() {
+				myplayer.on('playing', function() {
-					console.log('正在播放')
+					console.log('正在播放...')
+					
 				})
-				this.player.on('timeupdate', function() {
+				
+				myplayer.on('timeupdate', function() {
 					let that = this
 					var _time = parseInt(player.getCurrentTime())
 					curStatus = player.getStatus()
 					// console.log('timeupdatetimeupdate...',curStatus);
-					if(_seconds != _time){
+					if (_seconds != _time) {
 						_seconds = _time
-						 diff ++
+						diff++
-						 if(diff % 60 === 0){
+						if (diff % 60 === 0) {
-						 	console.log('符合---------');
+							console.log('符合---------');
-						 	$('.videoContent4').click()
+							$('.videoContent4').click()
-						 	diff = 0
+							diff = 0
-						 }							
+						}
 						$('.videoContent1').click()
 					}
 				})
-				this.player.on('ended', function() {
+				myplayer.on('ended', function() {
 					console.log('播放完毕');
 					$('.videoContent2').click()
+					$('.videoContent6').click()
+				})
+				player.on('pause', function() {					
+					pauseTime = parseInt(player.getCurrentTime())
+					player.pause(true)
+					console.log('触发暂停', pauseTime)	
 				})
 				
-				this.player.on('error', function() {
+				myplayer.on('error', function() {
 					console.log('播放出错')
 					$('.videoContent5').click()
 				})
@@ -719,15 +845,14 @@
 				});
 
 			},
-			receiveScreenType(newValue) {
+			receiveScreenType(newValue) {},
-			},
 			async receiveIsfresh(newValue) {
 
-				console.log('是否走了刷新销毁方法:', this.player)
+				console.log('是否走了刷新销毁方法:', myplayer)
-				if (this.player) {
+				if (myplayer) {
 					// clearInterval(this.$store.state.videoTimer)
 					// await this.setVideoTime();
-					this.player.dispose();				
+					myplayer.dispose();
 				}
 			},
 			async receiveplatform(newValue) {
@@ -747,6 +872,24 @@
 			receiveMsg(newValue, oldValue, ownerVm, vm) {
 				//数据变化	
 				videoData = newValue
+				if (videoData) {
+					return 
+					console.log('切换后的播放数据videoData',videoData.type);
+					if (videoData.type == 1) {
+						if (videoData.m3u8Url != '' && videoData.m3u8Url != null) {
+							// myplayer.source(videoData.m3u8Url)
+							myplayer.loadByUrl(videoData.m3u8Url)
+							console.log('切换走了吗？m3u8');
+						} else {
+							myplayer.replayByVidAndPlayAuth(videoData.videoId, videoData.playAuth)
+							console.log('切换走了吗？私有加密');
+						}
+					} else {
+						myplayer.loadByUrl(videoData.videoUrl)
+						console.log('切换常规视频');
+					}
+				}
+				// console.log('可能是切换视频',  videoData, );
 			},
 			receiveWinWidth(newValue, oldValue, ownerVm, vm) {
 				//数据变化
@@ -764,7 +907,7 @@
 						this.checkValue();
 					}, 1000);
 				} else {
-					console.log('这是这只只是594:', this.firstTime, this.videoData)
+					// console.log('这是这只只是594:', this.firstTime, this.videoData)
 					this.getLive();
 				}
 			},
@@ -799,6 +942,31 @@
 	}
 </script>
 <style>
+	.cancelNext{display: inline-block; margin-right: 20rpx; 
+	border-radius: 10rpx; margin-top: 10rpx; 
+	padding: 10rpx 20rpx !important; background-color: #fff !important;
+	color: #000; text-align: center; line-height: 50rpx;}
+	/* .cancelNext:last-child{margin-left: 10rpx;} */
+	.nextText{}
+	.showCountDownd { 
+	box-sizing: border-box;
+		height: 100%; width: 100%;  background-color: rgba(0, 0, 0, 0.6); 
+		
+		display: flex;
+		align-items: center;
+		justify-content:flex-end;
+		color: #fff;
+		font-size: 38rpx;
+		text-align: center;
+		position: absolute;
+		top: 0; right: 10rpx;
+		z-index: 4;
+		text{
+			
+		}
+		
+	}
+
 	.container {
 		width: 100vw;
 		height: auto;

pages/course/chapterDetailAndorid.vue

@@ -7,7 +7,7 @@
 
       <view
         class="contentBox curriculum_box"
-        :style="`height:calc(100% - ${60 + statusBarHeight}px !important;${
+        :style="`height:calc(100% - ${60 + statusBarHeight}px !important; overflow-x: hidden; ${
           isFullScreen ? 'background:#000' : ''
         }`"
       >
@@ -16,8 +16,12 @@
           <common-video
             @changeScreen="changeScreen"
             @changeScreenLoading="changeScreenLoading"
+			@hideNextVideo="hideNextVideo"
+			@startNextVideoCountDown = "startNextVideoCountDown"
+			@unlockChangeVideo="unlockChangeVideo"
             v-if="isfresh"
             ref="commonVideo"
+			:secondCountDown="secondCountDown"
 			 :videoTitle="curriculumData.title"
             :currentVideo="currentVideo"
 			:noRecored = "noRecored"
@@ -26,7 +30,6 @@
           </common-video>
           <view style="height: 200px" v-else></view>
         </view>		
-
         <scroll-view
           :style="`height:calc(100% - 200px - 40rpx) ;`"
           scroll-y="true"
@@ -53,6 +56,7 @@
               :currentVideo="currentVideo"
               :dataList="videoArray"
               @open="changeVideo"
+			  :changeVideoLock="changeVideoLock"
             >
             </common-curriculum-video>
           </view>
@@ -115,11 +119,14 @@ export default {
   },
   data() {
     return {
+		changeVideoLock:false, // 切换键锁
       isFullScreen: false,
       screenLoading: false,
       isfresh: false,
       currentCateIndex: 0,
       currentVideo: {},
+	  secondCountDown:10,
+	  countDownTimer:undefined,
       videoList: {},
       isOpenMp3: false,
       praise: "",
@@ -207,22 +214,13 @@ export default {
   },
   beforeDestroy(){
 	  console.log('页面卸载')
-	  		  
+	  this.hideNextVideo()
-	  // this.$nextTick(()=>{
-	  		   // this.$refs.commonVideo.handleEnd();		  
-	  		  
-	  // })
   },
   onUnload(){	 
-	  // console.log('页面卸载')
-		  
-	  // // this.$nextTick(()=>{
-		 //   this.$refs.commonVideo.handleEnd();		  
-		  
-	  // // })
 	  
   },
   onHide() {
+	  // this.hideNextVideo()
     // this.showSearchList = false
     // this.searchList = []
   },
@@ -233,7 +231,36 @@ export default {
     ...mapState(["userInfo"]),
   },
   methods: {
-    // 放大图片
+	  unlockChangeVideo(){
+		  this.changeVideoLock = false
+	  },
+	  startNextVideoCountDown(){
+		  this.secondCountDown = 10
+		  let that = this
+		  if(this.countDownTimer){
+			  clearInterval(this.countDownTimer)
+		  }
+		  this.countDownTimer = setInterval(()=>{
+			  this.secondCountDown -= 1
+			  if(this.secondCountDown == 0){
+				  // clearInterval(this.countDownTimer)
+				  // console.log('倒计时结束');
+				  that.hideNextVideo()
+				  console.log('切换之前的播放index是',this.currentCateIndex);
+				  // console.log('当前的播放列表',this.videoArray.length);
+				  // if(this.currentCateIndex < this.videoArray.length-1){
+					  this.currentCateIndex++
+					   console.log('切换之后的播放index是',this.currentCateIndex);
+					  that.changeVideo(this.videoArray[this.currentCateIndex])
+				  // }
+			  }
+		  },1000)
+	  },
+    hideNextVideo(){		
+		console.log('父组件收到了取消加载-------------------');
+		clearInterval(this.countDownTimer)
+		this.countDownTimer = undefined		
+	},
 
     //课程详情
     async gotoDetail(v, index) {
@@ -267,6 +294,7 @@ export default {
       this.$forceUpdate();
     },
     initVideo() {
+		this.changeVideoLock = true
       this.screenLoading = false;
       this.isfresh = false;
       this.$nextTick(() => {
@@ -280,23 +308,34 @@ export default {
       });
     },
     changeVideo(data) {
-      console.log("data at line 370:", data);
+		this.changeVideoLock = true
-      if (data.id != this.currentVideo.id) {
+		if(this.countDownTimer){
-        // handleEnd
+			this.hideNextVideo()
-        this.$refs.commonVideo.handleEnd();
+		}
 		
+      console.log("点击了点击了切换视频-----:", this.countDownTimer,data, );
+		
+      if (data.id != this.currentVideo.id) {
+		this.currentCateIndex = this.videoArray.findIndex(item => {
+			return item.id == data.id
+		})		
+        // handleEnd
+        // this.$refs.commonVideo.handleEnd();
         setTimeout(() => {
-          this.currentVideo = data;
+          
+		  // this.$refs.commonVideo.changeVideo(data);
+		  this.currentVideo = data;		 
           this.initVideo();
           this.isOpenMp3 = false;
         }, 500);
-      } else {
-        this.currentVideo = data;
-        this.initVideo();
-        this.isOpenMp3 = false;
       } 
+	  // else {
+   //      this.currentVideo = data;
+   //      this.initVideo();
+   //      this.isOpenMp3 = false;
+   //    }
 
-      console.log("data at line 380111111111111111111:", data.type);
+      // console.log("data at line 380111111111111111111:", data.type);
     },
     hancleModalCancel() {
       this.show = false;
@@ -374,6 +413,7 @@ export default {
             isHaveHistorySeekVideo != -1 ? isHaveHistorySeekVideo : 0;
           if (that.videoArray.length > 0) {
             this.currentVideo = that.videoArray[that.currentCateIndex];
+			console.log('默认播放的index',that.currentCateIndex, this.currentVideo.id,that.videoArray);
             this.initVideo();
           }         
           var videoArray = [];

pages/course/courseDetail.vue

@@ -51,7 +51,7 @@
                       align-items: center;
                     " @click="isHideCourseInfo = !isHideCourseInfo">
 									<view :class="`${isHideCourseInfo ? 'hidden2' : ''}`"
-										style="width: calc(100% - 50rpx)" v-html="course.content">
+										style="width: calc(100% - 50rpx); font-size: 30rpx;" v-html="course.content">
 									</view>
 									<text
                     style="
@@ -462,7 +462,47 @@
 				fatherIndex: null,
 				supportFlag: false,
 				selectGoodsData: {},
+<<<<<<< .mine
 				buyOptions: [],
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+=======
+				
+				buyOptions: [
+					// {
+					// 		icon: 'chat',
+					// 		text: '客服'
+					// 	},
+					// {
+					//     icon: 'shop',
+					//     text: '店铺',
+					//     // info: 2,
+					//     infoBackgroundColor: '#007aff',
+					//     infoColor: "#f5f5f5"
+					// },
+					//  {
+					// 	icon: 'cart',
+					// 	text: '购物车',
+					// 	info: 2
+					// }
+				],
+>>>>>>> .theirs
 				customButtonGroup1: [{
 					with: 200,
 					text: "立即购买",
@@ -689,10 +729,6 @@
 			onHandleClickBuy(e) {
 				console.log("this.selectGoodsData at line 589:", this.selectGoodsData);				
 				
-				// if (e.index == 0) {
-				//   this.handleClickClose();
-				// }
-				// if (e.index == 0) {
 				var mynavData = JSON.stringify({
 					goods: [this.selectGoodsData],
 					typeId: 0,
@@ -733,8 +769,13 @@
 							if (res.code == 0) {
 								this.getCourseDescriptionData();
 								// this.$commonJS.showToast("");
+<<<<<<< .mine
 							}					
 
+=======
+							}
+
+>>>>>>> .theirs
 							this.$forceUpdate();
 						});
 				} else {
@@ -761,7 +802,7 @@
 							}
 
 							this.$forceUpdate();
-						});
+						})
 				}
 			},
 			getUserInfo() {
@@ -1946,6 +1987,7 @@
 		}
 
 		.price {
+			
 			// text-align: center;
 			font-size: 26rpx;
 			font-weight: bold;
@@ -2235,7 +2277,7 @@
 	/deep/.u-icon__icon--warning {
 		color: #fff !important;
 	}
-
+	/deep/.uni-tag{border-width: 2rpx !important;}
 	/deep/.uni-section {
 		background: transparent !important;
 	}

pages/mine/set/index.vue

@@ -38,31 +38,6 @@
           >退出登录</u-button
         >
       </view>
-
-      <!-- <view class="set_box" style="margin-top:20rpx">
-				<list :dataList="otherList" @hancleClick="handleClickRightContent" label="title">
-
-
-					<template slot="rightSlot" slot-scope="slotProps">
-
-
-
-
-						<text class="fdButtonBox aui-text-success">{{ slotProps.row.content }}</text>
-
-
-
-						<view>
-
-
-						</view>
-
-					</template>
-				</list>
-
-
-
-			</view> -->
     </view>
 
     <u-modal
@@ -73,10 +48,19 @@
       @confirm="signOut"
     >
     </u-modal>
+	<u-popup key="1" v-if="showCodeImg" :show="showCodeImg" :round="10" @close="closePup">
+		<view class="box6">
+			<text style="color: #999; margin-bottom: 20rpx;">点击图片后长按图片保存到手机，或使用微信扫描二维码添加客服企业微信</text>
+			<image @click="previewImage('/static/qiyeWx.jpg')" src="/static/qiyeWx.jpg" mode="widthFix" style="width: 100px; height: 100px; margin: 0 auto;"></image>
+		</view>
+	</u-popup>
   </view>
 </template>
 
 <script>
+	// #ifdef APP-PLUS
+	import updata from "@/uni_modules/uni-upgrade-center-app/utils/check-update";
+	// #endif
 import list from "@/pages/component/commonComponents/list";
 import $http from "@/config/requestConfig.js";
 
@@ -92,7 +76,7 @@ export default {
       playData: {},
       options: {},
       searchValue: "",
-
+showCodeImg:false,
       twoCateList: [], // 二级分类标题
       titleList: [], // 方剂标题
       curOneCateIndex: 0, // 当前选中的一级分类
@@ -117,11 +101,15 @@ export default {
           type: "email",
         },
         {
-          title: "微信号",
+          title: "企业微信",
-          content: "yilujiankangkefu",
+          content: "",
           type: "wxNumber",
         },
-
+		{
+          title: "版本检测",
+          content: "",
+          type: "checkVersion",
+        },
         // {
 
         // 	"title": "清楚缓存",
@@ -161,6 +149,9 @@ export default {
   },
   methods: {
     ...mapMutations(["setUserInfo"]),
+	closePup(){
+		this.showCodeImg = false
+	},
     signOut() {
       this.signShow = false;
       this.setUserInfo({ token: null });
@@ -217,7 +208,11 @@ export default {
           this.$commonJS.handleCopy(row.content, row.title);
           break;
         case "wxNumber":
-          this.$commonJS.handleCopy(row.content, row.title);
+		  this.showCodeImg = true
+          // this.$commonJS.handleCopy(row.content, row.title);
+          break;
+		case "checkVersion":
+          this.getNewVersion()
           break;  
         case "pageJump":
           uni.navigateTo({
@@ -228,25 +223,7 @@ export default {
         //
       }
     },   
-    // 检查是有权限使用搜索功能
+     
-    checkDisable() {
-      console.log("点击了");
-    },
-    // 显示无权限弹窗
-    // showNoRights() {
-    // 	let that = this
-    // 	uni.showModal({
-    // 		content: "",
-    // 		confirmText: '好的',
-    // 		showCancel: false,
-    // 		success: function(res) {
-    // 			if (res.confirm) {
-    // 				// console.log('用户点击确定');
-    // 				that.clear()
-    // 			}
-    // 		}
-    // 	})
-    // },
     // 获取用户详情
     getUserInfo() {
       // 用户详情
@@ -258,6 +235,19 @@ export default {
         });
       }
     },
+	// 版本检测
+	async getNewVersion(){
+		// #ifdef APP-PLUS
+		var info = await updata();
+		console.log('info',JSON.stringify(info))
+		if(info.result.code == 0){
+			uni.showToast({
+				title:info.result.message,
+				icon:'none'
+			})
+		}
+		// #endif
+	},
     // 详情
     gotoDetail(v) {
       console.log(v);
@@ -402,27 +392,6 @@ export default {
     async setOneCateIndex(item, index) {
       console.log(index, 99999);
       var that = this;
-
-      // if(this.userMes.tgdzPower == 0){
-      // 	let that = this
-      // 	uni.showModal({
-      // 		content: "购买 针灸六经法要上册和下册 后方可使用此功能",
-      // 		confirmText: '好的',
-      // 		showCancel: false,
-      // 		success: function(res) {
-      // 			if (res.confirm) {
-      // 				// console.log('用户点击确定');
-      // 			}
-      // 		}
-      // 	})
-      // 	return
-      // }
-      // if(item.title == "时辰取穴"){
-      // 	uni.navigateTo({
-      // 		url: "../timeAcupoint/timeAcupoint"
-      // 	})
-      // 	return
-      // }
       let type = item.type;
       this.curOneCateIndex = index;
       this.curTwoCateIndex = 0;
@@ -432,15 +401,6 @@ export default {
       // if (index != 2) {
       await this.getTowCateList(type);
   
-      // uni.createSelectorQuery().select('.oneCateList').boundingClientRect(function (rect) {
-      // 	var height = rect.height
-      // 	console.log('元素高度：',);
-
-      // }).exec();
-
-      // } else {
-      // 	this.getJFList(dictType)
-      // }
     },
     async getTowCateList(type) {
       var that = this;
@@ -450,11 +410,8 @@ export default {
           method: "POST", // POST、GET、PUT、DELETE，具体说明查看官方文档
           data: {
             loadAnimate: "none", // 请求加载动画           
-            // 'categoryId': id
           },
-          // header: { //默认 无 说明：请求头
+         
-          // 	'Content-Type': 'application/json'
-          // },
         })
         .then((res) => {
           console.log(res, "二级分类获取成功");
@@ -511,15 +468,6 @@ export default {
             this.getTitles(this.twoCateList[0].dictType);
 
             this.$nextTick(async () => {             
-              // await uni.createSelectorQuery().select('.uni-tabbar').boundingClientRect(function (rect) {
-              // 	console.log(rect.height, '3333')
-
-              // 	// var height = 42 + rect.height + 10;
-              // 	// that.scrollViewHeight = height;
-              // 	// console.log(that.scrollViewHeight, '111111')
-              // 	// that.$forceUpdate()
-              // 	// console.log('元素高度2：', height);
-              // }).exec();
               await uni
                 .createSelectorQuery()
                 .select(".cateList")
@@ -557,156 +505,31 @@ export default {
       // const finalResult = Object.keys(result).map(key => ({ [key]: result[key] }));
       return result;
     },
-    // getJFList(id) {
+    
-    // 	$http.request({
-    // 		url: "book/prescript/prescriptListForJF",
-    // 		method: "POST", // POST、GET、PUT、DELETE，具体说明查看官方文档
-    // 		data: {
-    // 			loadAnimate: 'none', // 请求加载动画
-    // 			'categoryId': id
-    // 		},
-    // 		header: { //默认 无 说明：请求头
-    // 			'Content-Type': 'application/json'
-    // 		},
-    // 	}).then(res => {
-    // 		if (res.code == 0 && res.list.length > 0) {
-    // 			this.twoCateList = []
-    // 			this.titleList = this.transformData(res.list)
-    // 			console.log('JF经方', this.titleList)
-    // 		} else {
-    // 			this.twoCateList = []
-    // 			this.titleList = []
-    // 		}
-    // 	}).catch(e => {
-    // 		this.twoCateList = []
-    // 		this.titleList = []
-    // 		console.log(e)
-    // 	})
-    // },
     getCateList(id) {
       id ? "" : (id = 0);
       this.twoCateList = [];
       this.curTwoCateIndex = 0;
-      // 0为获取顶级分类，其他为搜索下级分类，目前的逻辑，顶级是写死的，所以可能只会涉及到搜索第二级
+      
-      // $http.request({
-      // 	url: "book/prescript/prescriptCategoryList",
-      // 	method: "POST", // POST、GET、PUT、DELETE，具体说明查看官方文档
-      // 	data: {
-      // 		loadAnimate: 'none', // 请求加载动画
-      // 		'categoryId': id
-      // 	},
-      // 	header: { //默认 无 说明：请求头
-      // 		'Content-Type': 'application/json'
-      // 	},
-      // }).then(res => {
-      // console.log(res, '脉穴分类获取成功')
-      // if (res.code == 0 && res.list.length > 0) {
-      // this.oneCateList = res.list
       this.getTowCateList(this.oneCateList[0].type);
-      // } else {
+     
-      // 	this.oneCateList = []
-      // }
-      // }).catch(e => {
-      // 	this.oneCateList = []
-      // 	console.log(e)
-      // })
     },
 
     // 放大图片
     previewImage(url) {
       console.log(url);
+	  this.showCodeImg = false
       uni.previewImage({
         urls: [url],
-        longPressActions: {
+        // longPressActions: {
-          itemList: ["很抱歉，暂不支持保存图片到本地"],
+        //   itemList: ["很抱歉，暂不支持保存图片到本地"],
-          success: function (res) {
+        //   success: function (res) {
-            // console.log(res,'+++++')
+        //     // console.log(res,'+++++')
-          },
+        //   },
-        },
+        // },
       });
     },
-    // getSearch() {
-    // 	$http.request({
-    // 		url: "book/prescript/searchPrescript",
-    // 		method: "POST", // POST、GET、PUT、DELETE，具体说明查看官方文档
-    // 		data: {
-    // 			loadAnimate: 'none', // 请求加载动画
-    // 			'keywords': this.searchValue,
-    // 			type: this.curOneCateIndex + 1
-    // 		},
-    // 		header: { //默认 无 说明：请求头
-    // 			'Content-Type': 'application/json'
-    // 		},
-    // 	}).then(res => {
-    // 		console.log(res, '搜索结果')
-    // 		if (res.code == 0 && res.list.length >= 0) {
-    // 			this.showSearchList = true
-    // 			this.searchList = res.list
-    // 		} else {
-    // 			this.searchList = []
-    // 		}
-    // 	}).catch(e => {
-    // 		// this.titleList = []
-    // 		this.searchList = []
-    // 		console.log(e)
-    // 	})
-    // },
-    // search(res) {
-    // 	console.log(res, 'res')
-    // 	// uni.showToast({
-    // 	// 	title: '搜索：' + res,
-    // 	// 	icon: 'none'
-    // 	// })
-    // 	if (res == '') {
-    // 		this.showSearchList = false
-    // 		this.searchList = []
-    // 	} else {
-    // 		this.getSearch()
-    // 	}
    
-    // },
-    // input(res) {
-    // 	console.log('----input:', res)
-    // 	if (res == '') {
-    // 		this.searchList = []
-    // 	} else {
-    // 		this.getSearch()
-    // 	}
-    // },
-    // clear(res) {
-    // 	console.log('----clear:', res)
-    // 	// uni.showToast({
-    // 	// 	title: 'clear事件，清除值为：',
-    // 	// 	icon: 'none'
-    // 	// })
-    // 	this.searchValue = ''
-    // 	this.showSearchList = false
-    // },
-    // blur(res) {
-    // 	// console.log('----blur:', res)
-    // 	// if (res == '') {
-    // 	// 	this.showSearchList = false
-    // 	// 	this.searchList = []
-    // 	// } else {
-    // 	// 	this.getSearch()
-    // 	// }
-    // },
-    // focus(e) {
-    // 	console.log('----focus:')
-    // 	// uni.showToast({
-    // 	// 	title: 'focus事件，输出值为：' + e.value,
-    // 	// 	icon: 'none'
-    // 	// })
-    // 	// 等于1 就是有权限
-    // 	// this.showSearchList = true
-
-    // },
-    // cancel(res) {
-    // 	uni.showToast({
-    // 		title: '点击取消，输入值为：' + res.value,
-    // 		icon: 'none'
-    // 	})
-    // }
   },
   onBackPress() {
     // #ifdef APP-PLUS
@@ -719,6 +542,79 @@ export default {
 <style lang="scss" scoped>
 @import "@/style/common.scss";
 
+.box6 {
+	padding: 20rpx;
+		text-align: center;
+
+		.title {
+			font-size: 28rpx;
+			margin: 10px 0;
+		}
+
+		.list {
+			padding: 0 10px;
+			padding-bottom: 20rpx;
+
+			.item {
+				font-size: 26rpx;
+				color: #333;
+				margin-bottom: 10rpx;
+				padding-top:20rpx ;
+				padding-bottom:20rpx ;
+				line-height:40rpx;
+				border-radius: 50rpx;
+				border: 1px solid #eee;
+			}
+
+			.item.active {
+				color: $themeColor;
+				border: 1px solid $themeColor;
+			}
+
+			.item:last-child {
+				// border-bottom: none
+			}
+		}
+
+		.tbn {
+			justify-content: center;
+		}
+
+		.buybtn { padding: 0 20rpx;
+			background-color: #00d8df;
+			margin: 0;
+			margin-right: 20rpx;
+
+			text {
+				color: #fff;
+			}
+		}
+
+		.saveBtnss {
+			align-items: center;
+			justify-content: center;
+			height: 80rpx;
+
+			// width: 46%;
+			overflow: hidden;
+			border-radius: 50rpx;
+
+			text {
+				padding-left: 10rpx;
+				font-size: 28rpx;
+
+			}
+		}
+
+		.gouwuche {
+			border: 1px solid #666;
+			padding-right: 20rpx;
+
+			text {
+				// color: #fff;
+			}
+		}
+	}
 .u-grid-list {
   // height: 40rpx;
 }

pages/peanut/home.vue

@@ -6,6 +6,9 @@
 				<view class="icon_hua">
 					<image src="../../static/homeLogo.png" mode="aspectFit" class="icon_hua_1"></image>
 				</view>
+				<view class="hehan">
+					<image src="../../static/icon/hehan.png" mode="aspectFit" class="icon_hua_1"></image>
+				</view>
 				<view class="topSearch_box">
 					<image src="../../static/search.png" mode="aspectFit"
 						@click="onPageJump('/pages/peanut/searchFor')"></image>
@@ -50,7 +53,7 @@
 			<view class="childrenBox fourIcon flexbox" style="justify-content: space-around;">
 				<div class="item flexbox" @click="curseClickJump(item)" v-for="(item, index) in sbuMedicalTagsList"
 					:key="index">
-					<image :src="item.icon" mode="aspectFit"></image>
+					<image :src="item.icon" mode="aspectFit" v-if="item.icon != '' && item.icon != null"></image>
 					<text>{{item.title}}</text>
 				</div>
 			</view>
@@ -1058,11 +1061,11 @@
 	}
 
 	.childrenBox {		
-		// background-color: #e4eefa !important;
+		 background-color: #e4eefa !important;
-		border:1px solid #e4eefa;
+		// border:1px solid #e4eefa;
 		border-radius: 6rpx !important;
-		// @include mshadow(10px, 1);
+		 @include mshadow(10px, 1);
-		background-color: #fff;
+		// background-color: #fff;
 		justify-content: center;
 		box-shadow: none !important;
 		// border-radius: 0 !important;	

pages/taihu/index.vue

@@ -307,7 +307,7 @@
 
 			.time { display: block; width: 300rpx;
 				font-size: 26rpx;
-				color: #bebebe;width: 35%;
+				color: #bebebe;width:39%;
 			}
 
 			.title {