From 11c8d1fdd19221384c1bb173c3819ee70678f25d Mon Sep 17 00:00:00 2001
From: jia <1451658316@qq.com>
Date: Sat, 7 Oct 2023 11:36:08 +0800
Subject: [PATCH] =?UTF-8?q?h5=E8=A7=86=E9=A2=91=E5=A4=84=E7=90=86=E5=8F=8A?=
 =?UTF-8?q?=E5=AE=A2=E6=9C=8D=E8=81=8A=E5=A4=A9=E7=95=8C=E9=9D=A2=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/chat/customer_list/chat.vue       |  19 +++--
 pages/short_video/appSwiper/index.nvue  |  68 +++++++++++-----
 pages/short_video/nvueSwiper/index.nvue | 100 +++++++++++++-----------
 3 files changed, 117 insertions(+), 70 deletions(-)

diff --git a/pages/chat/customer_list/chat.vue b/pages/chat/customer_list/chat.vue
index 40a218e..007d711 100644
--- a/pages/chat/customer_list/chat.vue
+++ b/pages/chat/customer_list/chat.vue
@@ -143,7 +143,7 @@
 										<!--拼团商品链接-->
 										<div class="conter acea-row row-middle"
 											v-if="item.msn_type === 8 && item.productGroup && item.productGroup.product">
-											<div class=" noPad">
+											<div class="noPad">
 												<navigator class="acea-row row-column-around noPad"
 													v-if="item.productGroup.product_group_id"
 													:url="`/pages/activity/combination_details/index?id=${item.productGroup.product_group_id}`"
@@ -216,6 +216,7 @@
 												</div>
 											</div>
 										</navigator>
+										
 										<!--订单链接-->
 										<div v-if="item.msn_type === 5 && item.orderInfo.order_id">
 											<div class="broadcast-details_num acea-row row-middle">
@@ -358,6 +359,7 @@
 					<block v-for="(items,index) in history" v-if="userId == 0" :key="items.time">
 						<div class="create_time">{{items.time}}</div>
 						<block v-for="(item,j) in items.children" :key="item.service_log_id">
+							
 							<!-- 左边 -->
 							<div class="item acea-row row-top" v-if="item.send_type == 1">
 								<div v-if="item.msn_type !== 100" class="pictrue">
@@ -684,7 +686,7 @@
 						</block>
 					</block>
 					<view class="footer_box" v-if="productId || orderId || refund_order_id"></view>
-					<div class="broadcast-details_order footer_count">
+					<div class="broadcast-details_order footer_count" >
 						<!-- 商品信息 -->
 						<div class="broadcast-details_box" v-if="productId && productInfo.product_id">
 							<text class="iconfont icon-guanbi" @click.stop="productId = ''"></text>
@@ -778,7 +780,7 @@
 					</view>
 				</div>
 			</form>
-			<div class="banner slider-banner">
+			<div class="banner slider-banner" >
 				<swiper class="swiper-wrapper" :autoplay="autoplay" :circular="circular" :interval="interval"
 					:duration="duration" v-if="emojiGroup.length > 0">
 					<block v-for="(emojiList, index) in emojiGroup" :key="index">
@@ -1603,7 +1605,7 @@
 		margin-top: 20rpx;
 		width: 710rpx;
 		position: fixed;
-		bottom: 120rpx;
+		bottom: 160rpx;
 		left: 20rpx;
 
 		.broadcast-details_box,
@@ -1790,6 +1792,7 @@
 
 	.broadcast-details .chat .item .text {
 		margin-left: 20rpx;
+	
 	}
 
 	.broadcast-details .chat .item .text.textR {
@@ -1945,12 +1948,12 @@
 		position: fixed;
 		bottom: 0;
 		left: 0;
-		margin-bottom:  var(--status-bar-height);;
+		padding-bottom:  var(--status-bar-height);
 	}
 
 	.broadcast-details .footerCon.on {
 		position: relative;
-		top: -300rpx;
+		top: -250rpx;
 		transform: translate3d(0, 0, 0) !important;
 	}
 
@@ -1980,6 +1983,8 @@
 
 	.broadcast-details .footerCon .slider-banner .swiper-pagination-bullet-active {
 		background-color: #999;
+		
+		
 	}
 
 	.broadcast-details .recording {
@@ -2064,7 +2069,7 @@
 		display: inline-block;
 		width: 50rpx;
 		height: 50rpx;
-		margin: 40rpx 0 0 50rpx;
+		margin: 20rpx 0 0 40rpx;
 	}
 
 	.emoji-outer {
diff --git a/pages/short_video/appSwiper/index.nvue b/pages/short_video/appSwiper/index.nvue
index dc96839..b4775b3 100644
--- a/pages/short_video/appSwiper/index.nvue
+++ b/pages/short_video/appSwiper/index.nvue
@@ -226,7 +226,8 @@
 									<text class="count">{{item.relevance.length}}</text>
 								</view>
 							</view>
-							<view v-if="showManage == item.author.uid || showManage " class="manage"  :style="{'margin-top':item.relevance.length>0?'-115rpx':'0px'}">
+							<view v-if="showManage == item.author.uid || showManage " class="manage"
+								:style="{'margin-top':item.relevance.length>0?'-115rpx':'0px'}">
 								<view class="manage-gou"></view>
 								<navigator hover-class="none"
 									:url="'/pages/plantGrass/plant_release/index?id='+item.community_id+'&type=2'"
@@ -304,16 +305,16 @@
 				 deleteAndroidHeight
 				 这两个参数用于控制评论等的高度
 				 -->
-				<douyin-scrollview ref="comments" :deleteIOSHeight="36" :deleteAndroidHeight="15"   :userInfo="userInfo" 
+				<douyin-scrollview ref="comments" :deleteIOSHeight="36" :deleteAndroidHeight="15" :userInfo="userInfo"
 					@closeScrollview="closeScrollview" @successFul="pinlunFun"></douyin-scrollview>
 			</view>
 		</uni-popup>
 		<!-- 他提到的宝贝弹窗 -->
-		<uni-popup type="bottom" ref="pinglunMentioned" >
-		
-		
-				<mentioned ref="mentioned" @close="closePopup" :list="moreList" :uid="authorUid" ></mentioned>
-		
+		<uni-popup type="bottom" ref="pinglunMentioned">
+
+
+			<mentioned ref="mentioned" @close="closePopup" :list="moreList" :uid="authorUid"></mentioned>
+
 		</uni-popup>
 		<authorize @onLoadFun="onLoadFun" :isAuto="isAuto" :isShowAuth="isShowAuth" @authColse="authColse"></authorize>
 		<view class="fixed-head">
@@ -361,6 +362,7 @@
 	import {
 		navigateBack
 	} from '../../../libs/uniApi';
+import list from '../../../uni_modules/uview-ui/libs/config/props/list';
 	export default {
 		computed: configMap({
 			statusBarHeight: 0,
@@ -718,14 +720,13 @@
 				// 					});
 				// 				})'
 				// that.isUser ?
-				
+
 				videoList({
 					page: that.page,
 					limit: that.limit,
 					id: this.videoID
 
 				}).then(res => {
-					console.log(res.data,'1')
 					that.getVideoData(res.data.list);
 				})
 
@@ -898,11 +899,43 @@
 				// if(!this.loadVideo) return
 				this.loadVideo = true
 				// 这个方法主要就是用来第一次进入视频播放时用来处理
-				deoList(this.videoID).then(async (res) => {
+				// deoList(this.videoID).then(async (res) => {
+				// 	this.loadVideo = false
+				// 	this.userUid = res.data.uid
+				// 	this.page = 1;
+				// 	var msg = [res.data];
+				// 	for (let i = 0; i < msg.length; i++) {
+				// 		msg[i]['isMore'] = false
+				// 		msg[i]['playIng'] = false
+				// 		msg[i]['state'] = false
+				// 		msg[i]['isplay'] = false
+				// 		msg[i]['loading'] = false
+				// 		msg[i]['community_id'] = msg[i]['community_id'].toString()
+				// 	}
+				// 	this.dataList = msg;
+
+				// 	if (this.dataList.length !== 0) {
+				// 		this.dataList[this.k].state = 'play';
+				// 		uni.createVideoContext(this.dataList[this.k].community_id, this).play()
+				// 	}
+				// }).catch(err => {
+				// 	return uni.showToast({
+				// 		title: err,
+				// 		icon: 'none',
+				// 		duration: 2000
+				// 	});
+				// })
+
+				videoList({
+					page: this.page,
+					limit: this.limit,
+					id: this.videoID
+				}).then(async (res) => {
+			     	this.page = that.page + 1
 					this.loadVideo = false
 					this.userUid = res.data.uid
-					this.page = 1;
-					var msg = [res.data];
+					
+					var msg =res.data.list;
 					for (let i = 0; i < msg.length; i++) {
 						msg[i]['isMore'] = false
 						msg[i]['playIng'] = false
@@ -926,7 +959,6 @@
 				})
 
 
-
 				// this.isUser ?
 				//   myVideoList(this.userUid, {
 				//     page: this.page,
@@ -1115,7 +1147,6 @@
 	}
 </script>
 <style lang="scss" scoped>
-
 	// .video-list{
 	//   padding: 200rpx 28.07rpx 0 28.07rpx;
 	//   display: flex;
@@ -1135,7 +1166,7 @@
 		/* #ifdef MP */
 		padding-top: 200rpx;
 		/* #endif */
-	
+
 		// background-color: #000000;
 		background-color: #F5F5F5;
 
@@ -1258,18 +1289,19 @@
 		left: 0;
 		top: 70rpx;
 		height: 86rpx;
-		
+
 
 
 
 		.icon-xiangzuo {
-			
+
 			margin-left: 10px;
 			width: 20px;
 			height: 20px;
 			color: #ffffff;
-			
+
 		}
+
 		padding-right: 30rpx;
 	}
 
diff --git a/pages/short_video/nvueSwiper/index.nvue b/pages/short_video/nvueSwiper/index.nvue
index f9b28e3..8e0f6c2 100644
--- a/pages/short_video/nvueSwiper/index.nvue
+++ b/pages/short_video/nvueSwiper/index.nvue
@@ -435,7 +435,9 @@
 		},
 		watch: {
 			k(new_k, old_k) {
+
 				const max = new_k + 2;
+
 				if (this.max < max) {
 					this.max = max;
 				}
@@ -451,7 +453,7 @@
 				uni.createVideoContext(this.dataList[old_k].community_id + '' + old_k, this)
 					.pause() //如果视频暂停，那么旧视频停止，这里的this.dataList[old_k].id + '' + old_k，后面加 old_k 是为了每一个视频的 id 值不同，这样就可以大程度的避免串音问题
 				// console.log('已经暂停 --> 第' + (old_k + 1) + '个视频～') //提示
-				// #ifdef MP
+
 				this.dataList[new_k].state = 'play'
 				this.dataList[new_k].isplay = false
 				this.dataList[new_k].playIng = true
@@ -461,7 +463,7 @@
 					}, 250)
 				}
 				this.videoShare(this.dataList[new_k])
-				// #endif
+
 			}
 		},
 		onLoad(options) {
@@ -504,7 +506,7 @@
 					}
 				})
 			},
-			//#ifdef MP
+			
 			videoShare(item) {
 				if (item && item.status == 1) {
 					let uid = this.uid ? this.uid : 0;
@@ -520,7 +522,7 @@
 					uni.hideShareMenu()
 				}
 			},
-			// #endif
+			
 			goBack: function() {
 				uni.navigateBack();
 			},
@@ -752,43 +754,43 @@
 				let that = this
 
 				// 1.这里引入后端请求数据
-				if (that.videoshow) {
-					deoList(this.videoID).then(res => {
-						that.videoData([res.data])
-						if (res.data.list.length < that.limit) {
-							this.loadMore = false;
-						}
-					}).catch(err => {
-						return uni.showToast({
-							title: err,
-							icon: 'none',
-							duration: 2000
-						});
-					})
-					this.videoshow = false
-				} else {
-					// videoList().then(res=>{
-					//   that.videoData(res.data.list);
-					// })
-					// console.log(that.userUid,that.videoID)
-					videoList({
-						page: that.page,
-						limit: that.limit,
-						id: this.videoID
-					
-					}).then(res => {
-						that.videoData(res.data.list)
-						if (res.data.list.length < that.limit) {
-							this.loadMore = false;
-						}
-					}).catch(err => {
-						return uni.showToast({
-							title: err,
-							icon: 'none',
-							duration: 2000
-						});
-					})
-				}
+				// if (that.videoshow) {
+				// 	deoList(this.videoID).then(res => {
+				// 		that.videoData([res.data])
+				// 		if (res.data.list.length < that.limit) {
+				// 			this.loadMore = false;
+				// 		}
+				// 	}).catch(err => {
+				// 		return uni.showToast({
+				// 			title: err,
+				// 			icon: 'none',
+				// 			duration: 2000
+				// 		});
+				// 	})
+				// 	this.videoshow = false
+				// } else {
+				// videoList().then(res=>{
+				//   that.videoData(res.data.list);
+				// })
+				// console.log(that.userUid,that.videoID)
+				videoList({
+					page: that.page,
+					limit: that.limit,
+					id: this.videoID
+
+				}).then(res => {
+					that.videoData(res.data.list)
+					if (res.data.list.length < that.limit) {
+						this.loadMore = false;
+					}
+				}).catch(err => {
+					return uni.showToast({
+						title: err,
+						icon: 'none',
+						duration: 2000
+					});
+				})
+				// }
 
 				// that.isUser ?
 				// 	myVideoList(that.userUid, {
@@ -851,7 +853,9 @@
 				this.communityId = list[0]['community_id']
 				if (list.length == 0) return
 				let that = this;
+
 				that.page = that.page + 1;
+
 				var msg = list
 				// 2.这里把视频添加到视频列表
 				for (let i = 0; i < msg.length; i++) {
@@ -861,15 +865,21 @@
 					msg[i]['isplay'] = true
 					msg[i]['loading'] = false
 					that.dataList.push(msg[i])
-					//#ifndef H5
+
+					
+					console.log(i, that.k)
 					if (i == 0 && that.k == 0) {
 						this.dataList[0].isplay = false
 						this.dataList[0].playIng = true
 						this.dataList[0].state = 'play'
 						this.dataList[0].loading = false
-						uni.createVideoContext(that.dataList[0].community_id + '' + 0, that).play()
+						setTimeout(() => {
+								uni.createVideoContext(that.dataList[0].community_id + '' + 0, that).play()
+							// uni.createVideoContext(this.dataList[new_k].community_id + '' + new_k, this).play()
+						}, 250)
+					
 					}
-					//#endif
+					
 				}
 				//#ifdef MP
 				if (this.k == 0) {
@@ -1767,7 +1777,7 @@
 		margin-top: 27rpx;
 
 		.product-item {
-			   display: inline-block;
+			display: inline-block;
 			width: 444rpx;
 			height: 136rpx;
 			background: rgba(0, 0, 0, .55);