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

me/detail/detail.nvue

@@ -6,7 +6,7 @@
 				<view class="swipers-items" @longpress="openBs()" @appear="appear(item.courseDetailsId,i)"
 					:style="boxStyle">
 					<!-- 视频 -->
-					<video :show-fullscreen-btn="false" @controlstoggle="controlstoggles" object-fit="cover"
+					<video :show-fullscreen-btn="false" @controlstoggle="controlstoggles" object-fit="contain"
 						v-if="isShowVideo == item.courseDetailsId && item.videoUrl" :play-strategy="2"
 						:show-loading="true" codec="software" :muted="false" :show-center-play-btn="true" :loop="true"
 						@timeupdate="timeupdate"
@@ -18,7 +18,7 @@
 						mode="aspectFill">
 					</image>
 					<!-- 返回图标 -->
-					<image src="../static/nvueIcon/backs.png" @click="goBack()" class="swipers-items-back" mode="">
+					<image v-if="showBack" src="../static/nvueIcon/backs.png" @click="goBack()" class="swipers-items-back" mode="">
 					</image>
 					<!-- 右边操作 -->
 					<view class="swipers-items-right" :style="rightTop" v-if="showControls">
@@ -140,16 +140,11 @@
 						<text class="list-title-lss">
 							当前视频 没有播放权限
 						</text>
-						
 					</view>
-					
 					<view class="list-title-r" @click="closePay()">
 						<image class="list-title-rs" src="../../static/images/me/closeIconss.png" mode=""></image>
 					</view>
 				</view>
-				<text class="" style="font-size: 24rpx;color: #999;padding: 0 34rpx;margin: 20rpx 0; auto;text-align: left;width: 100%;">
-					{{getRedEnvelopeTips}}
-				</text>
 				<view class="pay-content">
 					<view class="pay-content-item" @click="payVideo(1)">
 						<image class="pay-content-item-icon" src="../../static/images/me/rmIcon.png" mode=""></image>
@@ -318,6 +313,7 @@
 	export default {
 		data() {
 			return {
+				showBack:false,
 				noBuyVideoIndex:null,
 				// 奖品列表，
 				showMoney: true,
@@ -387,6 +383,7 @@
 					'width': '750rpx',
 				},
 				isShowVideo: '',
+				noBuyVideoIndex:null,
 				playFlag: false,
 				getRedEnvelopeTips: '',
 				scale: 1,
@@ -871,6 +868,7 @@
 			//显示/隐藏适配控制器的回调
 			controlstoggles(e) {
 				this.showControls = e.detail.show
+				this.showBack=!this.showBack
 				// console.log(e.detail.show, '显示/隐藏控制栏')
 			},
 			//打开倍速弹框
@@ -1108,8 +1106,9 @@
 					this.videoContextId = 'myVideo' + numIdCurr;
 					this.videoContext = uni.createVideoContext(this.videoContextId, this);
 					console.log('走更新了')
-					if(this.noBuyVideoIndex!==null &&this.noBuyVideoIndex==this.current){
+					if(this.noBuyVideoIndex!==null ){
 						this.noBuyVideoIndex=null;
+						this.videoContext.stop()
 						return uni.navigateTo({
 							url:'/me/choujiang/choujiang'
 						})
@@ -1193,8 +1192,9 @@
 										}
 									})
 								})
-								if(this.noBuyVideoIndex!==null&&this.noBuyVideoIndex==indexs){
+								if(this.noBuyVideoIndex!==null){
 									this.noBuyVideoIndex=null
+									this.videoContext.stop()
 									return uni.navigateTo({
 										url:'/me/choujiang/choujiang?orderId'+2144
 									})
@@ -1212,8 +1212,9 @@
 								this.$nextTick(() => {
 									let indexss = indexs > 0 ? indexs : 0
 									if (this.videoList[indexss].videoUrl) { //有播放权限
-										if(this.noBuyVideoIndex!==null&&this.noBuyVideoIndex==indexss){
+										if(this.noBuyVideoIndex!==null){
 											this.noBuyVideoIndex=null
+											this.videoContext.stop()
 											return uni.navigateTo({
 												url:'/me/choujiang/choujiang'
 											})

pages.json

@@ -18,7 +18,7 @@
 				"navigationBarTitleText": "任务",
 				"enablePullDownRefresh": true,
 				"navigationStyle": "custom"
-		
+
 			}
 		},
 		{
@@ -160,7 +160,7 @@
 		},
 		{
 			"path": "pages/login/register",
-			
+
 			"style": {
 				"navigationBarTitleText": "",
 				"navigationBarBackgroundColor": "#f1a48a",
@@ -170,7 +170,7 @@
 					}
 				}
 				// #ifdef H5
-					,
+				,
 				"navigationStyle": "custom"
 				// #endif
 			}
@@ -253,7 +253,7 @@
 					"navigationBarTitleText": "意见反馈",
 					"navigationBarBackgroundColor": "#FFFFFF"
 				}
-			},{
+			}, {
 				"path": "balance/index",
 				"style": {
 					"navigationBarTitleText": "我的余额"
@@ -447,8 +447,16 @@
 					"navigationBarTitleText": "",
 					"enablePullDownRefresh": false,
 					"navigationBarBackgroundColor": "#000000",
+					"style": {
+						"safeAreaInsetBottom": "none"
+					},
 					"app-plus": {
-						"bounce": "none"
+						"bounce": "none",
+						"safearea": {
+							"bottom": {
+								"offset": "none"
+							}
+						}
 					}
 					// #ifndef MP-TOUTIAO
 					,
@@ -578,25 +586,22 @@
 				}
 			},
 			{
-				"path" : "choujiang/choujiang",
+				"path": "choujiang/choujiang",
-				"style" : 
+				"style": {
-				{
+					"navigationBarTitleText": "抽奖"
-					"navigationBarTitleText" : "抽奖"
 				}
 			},
 			{
-				"path" : "gift/gift",
+				"path": "gift/gift",
-				"style" : 
+				"style": {
-				{
 					"navigationStyle": "custom",
-					"navigationBarTitleText" : "奖品列表"
+					"navigationBarTitleText": "奖品列表"
 				}
 			},
 			{
-				"path" : "gift/duihuan",
+				"path": "gift/duihuan",
-				"style" : 
+				"style": {
-				{
+					"navigationBarTitleText": "兑换礼品"
-					"navigationBarTitleText" : "兑换礼品"
 				}
 			}
 		]