视频圈 上拉加载

components/XJ-comment/index.vue

@@ -44,10 +44,10 @@
 					<template v-if="Object.keys(replyTemp).length">
 						<span class="text_aid">回复给</span>
 						<span class="text_main">{{
-            replyTemp.item1.item2
-              ? replyTemp.item1.item2.user_name
-              : replyTemp.item1.item1.user_name
-          }}</span>
+							replyTemp.item1.item2
+							  ? replyTemp.item1.item2.user_name
+							  : replyTemp.item1.item1.user_name
+						  }}</span>
 					</template>
 					<span v-else class="text_main">发表新评论</span>
 				</view>
@@ -92,7 +92,10 @@
 			deleteMode: {
 				type: String,
 				default: "all"
-			}
+			},
+			showPopup: {
+				type: Boolean,
+			},
 		},
 		data() {
 			return {
@@ -122,6 +125,9 @@
 		onPageScroll : function(e) { //nvue暂不支持滚动监听，可用bindingx代替
 			console.log("滚动距离为：" + e.scrollTop);
 		},
+		mounted() {
+			console.log("this.tableData",this.tableData)
+		},
 		methods: {
 			loadMore() {
 			  if (this.isLoading) return;
@@ -213,21 +219,22 @@
 					params.parent_id = this.tableData.parent_id;
 					params.reply_id = this.tableData.reply_id;
 					params.reply_name = this.tableData.reply_name;
+					params.user_name=this.tableData.user_name;
 				} else {
-					params.id = this.tableData.id,
-						params.parent_id = item.item1?.parent_id ?? item.item1.id,
-						params.reply_id = item.item1.id,
-						params.reply_name = item.item2 ? item.item2.user_name : item.item1.user_name
+					params.id = this.tableData.id;
+						params.parent_id = item.item1?.parent_id ?? item.item1.id;
+						params.reply_id = item.item1.id;
+						params.user_name=this.tableData.user_name;
+						params.reply_name = item.item2 ? item.item2.user_name : item.item1.user_name;
 
 				}
 				params = {
 					...params,
-					user_name: this.userInfo.user_name,
-					user_avatar: this.userInfo.user_avatar,
+					user_avatar: this.tableData.filePath?this.tableData.filePath:'../../static/logo.png',
 					user_content: this.commentValue,
 					is_like: false,
 					like_count: 0,
-					create_time: "刚刚",
+					create_time: this.tableData.createTime,
 					owner: true
 				};
 
@@ -235,18 +242,24 @@
 					title: "正在发送",
 					mask: true
 				});
+				console.log("params======。",this.tableData)
+				if(this.showPopup==true){
+					this.$refs.cPopupRef.close();
+				}
 				this.$emit("replyFun", {
 					params
 				}, (res) => {
+					console.log(11)
 					uni.hideLoading();
 					params = {
 						...params,
 						id: res.id
 					};
 					if (this.isNewComment) {
+						console.log(22)
 						this.dataList.push(params);
 					} else {
-						console.log(this.dataList);
+						console.log("44",this.dataList);
 						let c_data = this.dataList[item.index1];
 						(c_data.children || (c_data.children = [])).push(params);
 						if (
@@ -257,8 +270,8 @@
 						}
 					}
 					this.$emit("update:tableTotal", this.tableTotal + 1);
-					this.$refs.cPopupRef.close();
 				});
+				this.$refs.cPopupRef.close();
 			},
 			deleteClick(item1, index1, item2, index2) {
 				this.delTemp = JSON.parse(JSON.stringify({

pages/therapist/orderDetail.vue

@@ -108,12 +108,12 @@
 			
 			
 		</view>
-		<!-- <view class="video-list">
+		<view class="video-list">
 			<view class="video-list-top">
 				<view class="video-list-title">
 					技师主页
 				</view>
-				<view class="video-list-geng">
+				<view class="video-list-geng" @click="videoGengduo">
 					<span>更多</span>
 					<image src="../../static/shezhi-jiantou.png" mode=""></image>
 				</view>
@@ -123,7 +123,7 @@
 					<video class="video-item" :src="item.url" :poster="'https://gd-hbimg.huaban.com/3ae3bb051cba65840b10d2149ecf978b80e1c9793dee6-GkA300_fw658'"></video>
 				</view>
 			</view>
-		</view> -->
+		</view>
 		<view class="excel-line">
 			<view>
 				<image class="excel" src="../../static/excel.png" mode=""></image>
@@ -365,6 +365,11 @@
 			});
 		},
 		methods: {
+			videoGengduo(){
+				uni.switchTab({
+					url:'/pages/videoCircle/index'
+				})
+			},
 			shangxian(){//请TA上线
 				var data={
 					  userId: this.artificerId,

pages/videoCircle/index.vue

@@ -78,7 +78,8 @@
 					<!-- 最底下的文字部分 -->
 					<view class="content" style="display: flex;flex-direction: column;">
 						<!-- <text class="userName" :style="'width: '+ (windowWidth - 90) +'px;'">{{list.title}}</text> -->
-						<text class="words" :style="'width: '+ (windowWidth - 90) +'px;'">{{list.content}}</text><!-- k={{k}} -->
+						{{list.content}}
+						<!-- <text class="words" :style="'width: '+ (windowWidth - 90) +'px;'"></text> -->
 					</view>
 					<!-- 进度条 -->
 					<view v-if="k === index" @touchstart="touchstart" @touchmove="touchmove" @touchend="touchend" :style="'width: '+ (windowWidth - (windowWidth*0.10)) +'px; margin-left: '+ (windowWidth * 0.05) +'px; height: 40px; position: absolute;bottom: 0px;margin-bottom: 6px;z-index: 14;'">
@@ -97,7 +98,7 @@
 		</swiper>
 		<uni-popup class="uni-popup" type="bottom" ref="pinglun" @touchmove.stop.prevent="moveHandle">
 			<view class="popup-content" :style="'width: '+ windowWidth +'px; height: '+ (boxStyle.height/heightNum) +'px;'">
-				    <CComment ref="ccRef" :userInfo="userInfo" :tableData="tableData" :tableTotal="tableTotal" likeFun="likeFun" @replyFun="replyFun" @deleteFun="deleteFun" :deleteMode="deleteMode"></CComment>
+				    <CComment ref="ccRef" :showPopup="showPopup" :userInfo="userInfo" :tableData="tableData" :tableTotal="tableTotal" likeFun="likeFun" @replyFun="replyFun" @deleteFun="deleteFun" :deleteMode="deleteMode"></CComment>
 						<div class="btn" @click="openComment">发一条新评论</div>
 				<!-- <douyin-scrollview
 				:Width="windowWidth"
@@ -124,7 +125,8 @@
 		},
 		data() {
 			return {
-				 ccRef: null,
+				showPopup:false,
+				ccRef: null,
 				userInfo: {
 					id: 120,
 					user_name: "🍁",
@@ -394,9 +396,10 @@
 				  }
 				  this.$Request.post("/app/shipinquan/addContent",data).then(res => {
 				  	if (res.code == 0) {
-						 setTimeout(() => this.getPingL(this.videoID), 500);
+						setTimeout(() => this.getPingL(this.videoID), 500);
+						this.showPopup==true;
 						uni.hideLoading();
-				  			 callback(this.videoID);
+						 // callback(this.videoID);
 				  	} else {
 						uni.hideLoading();
 				  		uni.showToast({
@@ -677,7 +680,9 @@
 			animationfinish(event){
 				// 1.这里进行判断，如果是最后一个视频就进入 get() 方法加载视频进入列表
 				if(this.k == this.dataList.length - 1){
+					this.page++
 					this.GET()
+					
 				}
 			},
 			//每一组结束时新的请求
@@ -940,6 +945,13 @@
 	  justify-content: flex-start;
 	  color: #ffffff;
 	  z-index: 12;
+	  word-break: break-all;
+	  overflow: hidden;
+	  text-overflow: ellipsis;
+	  display: -webkit-box;
+	  -webkit-box-orient: vertical;
+	  -webkit-line-clamp: 3;
+	    
 	  /* background-color: aqua; */
 	}
 	.userName {