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

me/choujiang/choujiang.vue

@@ -49,16 +49,14 @@
 					<view class="number">1</view>
 					<view class="text">
 						<text>抽奖细则：</text>
-						<text>每人每天最多拥有{{ freeNumDay }}次抽奖机会</text>
+						<text>每日前{{ freeNumDay }}次付款均可获得抽奖机会</text>
 					</view>
 				</view>
 				<view class="item item-rule">
 					<view class="number">2</view>
 					<view class="text">
-						<text>奖励说明：</text>
+						<text>奖励说明：红包奖励将自动发放到红包余额，已绑定支付宝账号将会自动发起提现。其余奖品则需联系客服领取。</text>
-						<text>a.现金奖：系统会即时转入红包余额，可提现。</text>
 						<!-- <text>b.金币奖：系统会即时转入金币账户，可在平台内使用。</text> -->
-						<text>b.实物奖：中奖后需联系客服领取。</text>
 					</view>
 				</view>
 				<!-- <template >
@@ -143,7 +141,7 @@
 				// 每次消耗的金币数
 				goldNum: 20,
 				// 每天免费抽奖次数
-				freeNumDay: 10
+				freeNumDay: 0
 			}
 		},
 		computed: {
@@ -529,6 +527,7 @@
 				const res=await this.$Request.getT('app/discSpinning/drawCount')
 				if(res.code==0){
 					this.freeNum=res.count||0
+					this.freeNumDay=res.sum||0
 				}
 			},
 			lingquClose(){

me/detail/detail.nvue

@@ -1111,7 +1111,6 @@
 					this.videoContextId = 'myVideo' + numIdCurr;
 					this.videoContext = uni.createVideoContext(this.videoContextId, this);
 					console.log('走更新了')
-					
 					this.$nextTick(() => {
 						//播放当前的
 						this.videoContext.play();
@@ -1173,6 +1172,7 @@
 							//菜单数组
 							this.meunList = arr;
 							console.log(type)
+							console.log('this.noBuyVideoIndex',this.noBuyVideoIndex)
 							if (type == true) { //购买视频后返回的
 								console.log('购买视频后返回的')
 								let courseDetailsIds = this.videoList[this.current].courseDetailsId;
@@ -1193,13 +1193,14 @@
 								if(this.noBuyVideoIndex!==null){
 									this.noBuyVideoIndex=null
 									this.videoContext.stop()
-									return uni.navigateTo({
+									 uni.navigateTo({
 										url:'/me/choujiang/choujiang'
 									})
 								}
+								console.log('this.noBuyVideoIndex',this.noBuyVideoIndex)
+								
 							} else { //直接跳转进来的
 								this.videoList = this.meunList
-								
 								this.$nextTick(() => {
 									let indexss = indexs > 0 ? indexs : 0
 									//滚动到记录视频的位置(如果有记录)
@@ -1207,13 +1208,23 @@
 										console.log(indexs, '有记录吗？')
 										this.goListPosition(this.videoList[indexs].courseDetailsId)
 									}
+									console.log('this.noBuyVideoIndex',this.noBuyVideoIndex)
+									if(this.noBuyVideoIndex!==null){
+										 uni.navigateTo({
+											url:'/me/choujiang/choujiang'
+										})
+									}
 									if (this.videoList[indexss].videoUrl) { //有播放权限
 										let numIdCurr = this.videoList[indexss].courseDetailsId;
 										this.videoContextId = 'myVideo' + numIdCurr;
 										this.videoContext = uni.createVideoContext(this
 											.videoContextId,
 											this);
-										this.videoContext.play();
+											if(this.noBuyVideoIndex!=null){
+												this.noBuyVideoIndex=null
+											}else{
+												this.videoContext.play();
+											}
 									} else { //没有播放权限打开购买弹窗
 										this.openPay()
 									}