From 014f71b43b5fb2122406c194cab95dcb5c03475e Mon Sep 17 00:00:00 2001
From: YeMingfei666 <1619116647@qq.com>
Date: Sat, 7 Dec 2024 17:39:56 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=A7=86=E9=A2=91?=
 =?UTF-8?q?=E6=92=AD=E6=94=BE=E8=BF=94=E5=9B=9E=E6=8C=89=E9=92=AE=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E9=9A=90=E8=97=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 common/config.js      | 12 ++++++------
 me/detail/detail.nvue |  6 ++++--
 pages.json            | 39 ++++++++++++++++++++++-----------------
 3 files changed, 32 insertions(+), 25 deletions(-)

diff --git a/common/config.js b/common/config.js
index 73a8e9c..d614bd8 100644
--- a/common/config.js
+++ b/common/config.js
@@ -1,10 +1,10 @@
-// const ROOTPATH1 = "https://dj-api.hnsiyao.cn/sqx_fast/"; //
-// const ROOTPATH = "https://dj-api.hnsiyao.cn/sqx_fast/"; //后台服务域名
-// const ROOTPATH2 = "https://dj-h5.hnsiyao.cn"; //后台服务域名
+const ROOTPATH1 = "https://dj-api.hnsiyao.cn/sqx_fast/"; //
+const ROOTPATH = "https://dj-api.hnsiyao.cn/sqx_fast/"; //后台服务域名
+const ROOTPATH2 = "https://dj-h5.hnsiyao.cn"; //后台服务域名
 
-const ROOTPATH1 = "https://video.hnsiyao.cn/sqx_fast/"; //
-const ROOTPATH = "https://video.hnsiyao.cn/sqx_fast/"; //后台服务域名
-const ROOTPATH2 = "https://video-h5.hnsiyao.cn"; //后台服务域名
+// const ROOTPATH1 = "https://video.hnsiyao.cn/sqx_fast/"; //
+// const ROOTPATH = "https://video.hnsiyao.cn/sqx_fast/"; //后台服务域名
+// const ROOTPATH2 = "https://video-h5.hnsiyao.cn"; //后台服务域名
 
 module.exports = {
 	APIHOST: ROOTPATH,
diff --git a/me/detail/detail.nvue b/me/detail/detail.nvue
index b053744..f22fa88 100644
--- a/me/detail/detail.nvue
+++ b/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">
@@ -313,6 +313,7 @@
 	export default {
 		data() {
 			return {
+				showBack:false,
 				noBuyVideoIndex:null,
 				// 奖品列表，
 				showMoney: true,
@@ -845,6 +846,7 @@
 			//显示/隐藏适配控制器的回调
 			controlstoggles(e) {
 				this.showControls = e.detail.show
+				this.showBack=!this.showBack
 				// console.log(e.detail.show, '显示/隐藏控制栏')
 			},
 			//打开倍速弹框
diff --git a/pages.json b/pages.json
index 254fba1..4b68cb7 100644
--- a/pages.json
+++ b/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",
-				"style" : 
-				{
-					"navigationBarTitleText" : "抽奖"
+				"path": "choujiang/choujiang",
+				"style": {
+					"navigationBarTitleText": "抽奖"
 				}
 			},
 			{
-				"path" : "gift/gift",
-				"style" : 
-				{
+				"path": "gift/gift",
+				"style": {
 					"navigationStyle": "custom",
-					"navigationBarTitleText" : "奖品列表"
+					"navigationBarTitleText": "奖品列表"
 				}
 			},
 			{
-				"path" : "gift/duihuan",
-				"style" : 
-				{
-					"navigationBarTitleText" : "兑换礼品"
+				"path": "gift/duihuan",
+				"style": {
+					"navigationBarTitleText": "兑换礼品"
 				}
 			}
 		]

From 8b6110805320336a1cd10978ff2a26c755e1fa27 Mon Sep 17 00:00:00 2001
From: YeMingfei666 <1619116647@qq.com>
Date: Sat, 7 Dec 2024 18:09:46 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=BF=94=E5=9B=9E?=
 =?UTF-8?q?=E6=8C=89=E9=92=AE=E6=98=BE=E7=A4=BA=E9=9A=90=E8=97=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 me/detail/detail.nvue | 14 +-------------
 1 file changed, 1 insertion(+), 13 deletions(-)

diff --git a/me/detail/detail.nvue b/me/detail/detail.nvue
index ffd2c66..f22fa88 100644
--- a/me/detail/detail.nvue
+++ b/me/detail/detail.nvue
@@ -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)" v-if="zhengbu === '是'">
 						<image class="pay-content-item-icon" src="../../static/images/me/rmIcon.png" mode=""></image>
@@ -389,8 +384,7 @@
 				},
 				isShowVideo: '',
 				noBuyVideoIndex:null,
-				playFlag: false,
-				getRedEnvelopeTips: ''
+				playFlag: false
 			};
 		},
 		onUnload() {
@@ -482,12 +476,6 @@
 			if(this.courseId){
 				this.getDataList(this.courseId, this.courseDetailsId);
 			}
-			httpsRequest.getT('app/course/getRedEnvelopeTips').then(res => {
-				console.log(res)
-				if (res.code == 0) {
-					this.getRedEnvelopeTips= res.data
-				}
-			})
 		},
 		onLoad(e) {
 			//是开启整部购买

From a234802534e3fe762b6d92c4fedd32a37cfcab15 Mon Sep 17 00:00:00 2001
From: YeMingfei666 <1619116647@qq.com>
Date: Sat, 7 Dec 2024 18:26:55 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=88=A4=E6=96=AD?=
 =?UTF-8?q?=E8=B7=B3=E8=BD=AC=E8=BD=AC=E7=9B=98=E9=80=BB=E8=BE=91=EF=BC=8C?=
 =?UTF-8?q?=E4=B8=8D=E8=BF=9B=E8=A1=8C=E6=98=AF=E5=90=A6=E6=98=AF=E5=BD=93?=
 =?UTF-8?q?=E5=89=8D=E6=9C=AA=E8=B4=AD=E4=B9=B0=E8=A7=86=E9=A2=91=E5=88=A4?=
 =?UTF-8?q?=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 me/detail/detail.nvue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/me/detail/detail.nvue b/me/detail/detail.nvue
index f22fa88..6cd275b 100644
--- a/me/detail/detail.nvue
+++ b/me/detail/detail.nvue
@@ -1078,7 +1078,7 @@
 					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;
 						return uni.navigateTo({
 							url:'/me/choujiang/choujiang'
@@ -1158,7 +1158,7 @@
 										}
 									})
 								})
-								if(this.noBuyVideoIndex!==null&&this.noBuyVideoIndex==indexss){
+								if(this.noBuyVideoIndex!==null){
 									this.noBuyVideoIndex=null
 									return uni.navigateTo({
 										url:'/me/choujiang/choujiang?orderId'+2144
@@ -1174,7 +1174,7 @@
 								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
 											return uni.navigateTo({
 												url:'/me/choujiang/choujiang'

From 57e7a9c032501ed11939fa0098d31553f090ca15 Mon Sep 17 00:00:00 2001
From: YeMingfei666 <1619116647@qq.com>
Date: Sat, 7 Dec 2024 18:33:41 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=B7=B3=E8=BD=AC?=
 =?UTF-8?q?=E8=BD=AC=E7=9B=98=E6=97=B6=E8=A7=86=E9=A2=91=E6=9A=82=E5=81=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 me/detail/detail.nvue | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/me/detail/detail.nvue b/me/detail/detail.nvue
index 6cd275b..a7fe89c 100644
--- a/me/detail/detail.nvue
+++ b/me/detail/detail.nvue
@@ -1080,6 +1080,7 @@
 					console.log('走更新了')
 					if(this.noBuyVideoIndex!==null ){
 						this.noBuyVideoIndex=null;
+						this.videoContext.stop()
 						return uni.navigateTo({
 							url:'/me/choujiang/choujiang'
 						})
@@ -1160,6 +1161,7 @@
 								})
 								if(this.noBuyVideoIndex!==null){
 									this.noBuyVideoIndex=null
+									this.videoContext.stop()
 									return uni.navigateTo({
 										url:'/me/choujiang/choujiang?orderId'+2144
 									})
@@ -1176,6 +1178,7 @@
 									if (this.videoList[indexss].videoUrl) { //有播放权限
 										if(this.noBuyVideoIndex!==null){
 											this.noBuyVideoIndex=null
+											this.videoContext.stop()
 											return uni.navigateTo({
 												url:'/me/choujiang/choujiang'
 											})