Merge branch 'ymf' of https://e.coding.net/g-cphe0354/duanju/video_app into test

me/choujiang/choujiang.vue

@@ -30,6 +30,7 @@
 			</view>
 			<!-- <button @click="showLingPop">showLingPop</button> -->
 			<almost-lottery :lottery-size="lotteryConfig.lotterySize" :action-size="lotteryConfig.actionSize"
+			:selfTime="selfTime"
 				:ring-count="2" :duration="1" :self-rotaty="false" :img-circled="true" :canvasCached="true"
 				:prize-list="prizeList" :prize-index="prizeIndex" :lotteryBg="lotteryBg" :actionBg="actionBg"
 				@reset-index="prizeIndex = -1" @draw-before="handleDrawBefore" @draw-start="handleDrawStart"
@@ -108,7 +109,7 @@
 					// 抽奖按钮的尺寸，单位rpx
 					actionSize: 200
 				},
-
+				selfTime:2000,
 				// 以下是转盘 UI 配置
 				// 转盘外环图，如有需要，请参考替换为自己的设计稿
 				lotteryBg: require('@/uni_modules/almost-lottery/static/almost-lottery/almost-lottery__bg2x.png'),

me/detail/detail.nvue

@@ -1194,7 +1194,7 @@
 									this.noBuyVideoIndex=null
 									this.videoContext.stop()
 									return uni.navigateTo({
-										url:'/me/choujiang/choujiang?orderId'+2144
+										url:'/me/choujiang/choujiang'
 									})
 								}
 							} else { //直接跳转进来的
@@ -1208,13 +1208,6 @@
 										this.goListPosition(this.videoList[indexs].courseDetailsId)
 									}
 									if (this.videoList[indexss].videoUrl) { //有播放权限
-										if(this.noBuyVideoIndex!==null){
-											this.noBuyVideoIndex=null
-											this.videoContext.stop()
-											return uni.navigateTo({
-												url:'/me/choujiang/choujiang'
-											})
-										}
 										let numIdCurr = this.videoList[indexss].courseDetailsId;
 										this.videoContextId = 'myVideo' + numIdCurr;
 										this.videoContext = uni.createVideoContext(this

me/detail/detail.vue

@@ -1463,10 +1463,10 @@
 										}
 									})
 								})
-								if(this.noBuyVideoIndex!==null&&this.noBuyVideoIndex==indexss){
+								if(this.noBuyVideoIndex!==null){
 									this.noBuyVideoIndex=null
 									return uni.navigateTo({
-										url:'/me/choujiang/choujiang?orderId'+2144
+										url:'/me/choujiang/choujiang'
 									})
 								}
 							} else { //直接跳转进来的