diff --git a/jiuyi2/App.vue b/jiuyi2/App.vue
index 98b15d27..00251bb7 100644
--- a/jiuyi2/App.vue
+++ b/jiuyi2/App.vue
@@ -31,10 +31,11 @@
 				value: userinfo
 			})
 
-			// 腾讯im登录
-			util.loginTencent(userinfo)
 			// 
-			util.getUserinfo()
+			util.getUserinfo().then(rs => {
+				// 腾讯im登录
+				util.loginTencent(userinfo)
+			})
 		}
 	}
 
diff --git a/jiuyi2/api/video.js b/jiuyi2/api/video.js
index 26a6d83e..4d0e3609 100644
--- a/jiuyi2/api/video.js
+++ b/jiuyi2/api/video.js
@@ -137,32 +137,19 @@ const video = {
 	getCollectList(param) {
 		return util.request({
 			url: `/video/collection/getfavorite`,
-			query: param.query,
-			method: 'GET',
+			data: param.data,
+			method: 'POST',
 		})
 	},
 
 	/**
-	 * 新建收藏夹
+	 * 添加 / 修改 收藏夹
 	 * @param {Object} param
 	 */
-	saveCollectList(param) {
+	addfavorite(param) {
 		return util.request({
 			url: `/video/collection/addfavorite`,
-			query: param.query,
-			method: 'POST',
-			load: true,
-		})
-	},
-
-	/**
-	 * 编辑收藏夹
-	 * @param {Object} param
-	 */
-	updateCollectList(param) {
-		return util.request({
-			url: `/collect/updateCollectList`,
-			query: param.query,
+			data: param.data,
 			method: 'POST',
 			load: true,
 		})
@@ -172,49 +159,49 @@ const video = {
 	 * 删除收藏夹
 	 * @param {Object} param
 	 */
-	deleteCollect(param) {
+	deletefavorite(param) {
 		return util.request({
-			url: `/collect/deleteCollect`,
+			url: `/video/collection/deletefavorite`,
 			query: param.query,
 			load: true,
-			method: 'POST',
+			method: 'DELETE',
 		})
 	},
 
 	/**
-	 * 我的收藏视频列表
+	 * 查询收藏夹视频
 	 * @param {Object} param
 	 */
-	getCollectVideoList(param) {
+	getFavoriteVideo(param) {
 		return util.request({
-			url: `/collect/getCollectVideoList`,
+			url: `/video/collection/getFavoriteVideo`,
 			query: param.query,
 			load: true,
-			method: 'POST',
+			method: 'GET',
 		})
 	},
 
 	/**
-	 * 收藏视频
+	 * 往收藏夹添加视频
 	 * @param {Object} param
 	 */
 	collectVideo(param) {
 		return util.request({
-			url: `/collect/collectVideo`,
-			query: param.query,
+			url: `/video/collection/addVideo`,
+			data: param.data,
 			method: 'POST',
 			load: true,
 		})
 	},
 
 	/**
-	 * 取消收藏
+	 * 取消收藏夹中的视频
 	 * @param {Object} param
 	 */
-	cancelCollect(param) {
+	deleteVideo(param) {
 		return util.request({
-			url: `/collect/cancelCollect`,
-			query: param.query,
+			url: `/video/collection/deleteVideo`,
+			data: param.data,
 			method: 'POST',
 			load: true,
 		})
@@ -253,7 +240,7 @@ const video = {
 			url: `/video/comment/getcomment`,
 			query: param.query,
 			data: param.data,
-			method: 'GET',
+			method: 'POST',
 		})
 	},
 
@@ -273,10 +260,10 @@ const video = {
 	 * 发表评论
 	 * @param {Object} param
 	 */
-	comment(param) {
+	savecomment(param) {
 		return util.request({
-			url: `/home/comment`,
-			query: param.query,
+			url: `/video/comment/savecomment`,
+			data: param.data,
 			method: 'POST',
 		})
 	},
diff --git a/jiuyi2/components/index/collect.vue b/jiuyi2/components/index/collect.vue
index 7a78e6f7..a307e043 100644
--- a/jiuyi2/components/index/collect.vue
+++ b/jiuyi2/components/index/collect.vue
@@ -73,25 +73,25 @@
 
 	/**
 	 * 收藏视频
-	 * @param {Object} collects 收藏夹对象
+	 * @param {Object} item 收藏夹对象
 	 */
-	function collectVideo(collects) {
+	function collectVideo(item) {
 		// 
 		api.video.collectVideo({
-			query: {
+			data: {
 				// 视频id
-				videoId: detail.value.videoId,
+				videoId: detail.value.id,
 				// 收藏夹id
-				collectId: collects.id,
-				isPrivate: collects.isPrivate,
+				folderId: item.id,
 			}
 		}).then(rs => {
+			console.log('collect result', rs)
 			if (rs.code == 200) {
 				proxy.$refs.collect.close()
-
-				detail.value.isCollect = true
-				detail.value.collect++
-				uni.$emit('updateVideo', detail.value)
+				uni.$emit('updateVideo', {
+					...detail.value,
+					...rs.data,
+				})
 
 				// 打开收藏弹窗
 				collectResult.value = true
diff --git a/jiuyi2/components/index/collectAdd.vue b/jiuyi2/components/index/collectAdd.vue
index fb295df2..aa75f010 100644
--- a/jiuyi2/components/index/collectAdd.vue
+++ b/jiuyi2/components/index/collectAdd.vue
@@ -17,16 +17,16 @@
 	const {
 		proxy
 	} = getCurrentInstance()
-
+	// 收藏夹类
 	class Form {
-		// 收藏夹名称
-		collectName = ''
-		// 0公开1私密
-		isPrivate = 0
-		// 图片地址
-		pic = ''
 		// 收藏id
-		collectId = ''
+		folderId = ''
+		// 收藏夹名称
+		folderName = ''
+		// 0公开1私密
+		isLock = 0
+		// 图片地址
+		photographUrl = ''
 	}
 
 	// 
@@ -35,10 +35,11 @@
 	const paddingHeight = ref(0)
 
 	onMounted(() => {
-		// 
+		// #ifdef APP
 		uni.onKeyboardHeightChange((rs) => {
 			paddingHeight.value = rs.height
 		})
+		// #endif
 	})
 
 	onBeforeUnmount(() => {
@@ -54,10 +55,10 @@
 	function open(value) {
 		// 如果是编辑
 		if (value) {
-			form.collectName = value.collectName
-			form.isPrivate = value.isPrivate
-			form.collectId = value.id
-			form.pic = value.formatPic
+			form.folderName = value.folderName
+			form.isLock = value.isLock
+			form.folderId = value.id
+			form.photographUrl = value.photographUrl
 		}
 		proxy.$refs.addCollectRef.open()
 	}
@@ -70,44 +71,37 @@
 	// 上传图片
 	function upImage() {
 		util.upload_image({
-			value: form.pic,
 			type: 1,
 			success: rs => {
 				// 修改图片
-				form.pic = rs.value
+				form.photographUrl = rs.value
+				console.log('upload rs', rs, form)
 			}
 		})
 	}
 
 	// 切换是否公开收藏夹
 	function handlePrivate() {
-		form.isPrivate = form.isPrivate == 0 ? 1 : 0
+		form.isLock = form.isLock == 0 ? 1 : 0
 	}
 
-	// 提交
+	// 提交表单
 	function handleSubmit() {
 		const data = {
 			...form,
 		}
 		// 验证
-		if (!form.collectName) {
-			util.alert('请输入收藏夹名称')
-			return
-		}
-		if (!form.pic) {
+		if (!form.photographUrl) {
 			util.alert('请上传封面图')
 			return
 		}
-
-		// 剔除路径
-		data.pic = util.replace_url(data.pic)
-
-		let requestApi = 'saveCollectList'
-		if (form.collectId) requestApi = 'updateCollectList'
-
+		if (!form.folderName) {
+			util.alert('请输入收藏夹名称')
+			return
+		}
 		// 
-		api.video[requestApi]({
-			query: data,
+		api.video.addfavorite({
+			data: data,
 		}).then(rs => {
 			if (rs.code == 200) {
 				// 收藏视频
@@ -147,23 +141,23 @@
 			<!-- 收藏夹信息 -->
 			<view class="rows fdr mtb30">
 				<view class="pic fmid wh80 beee br10" @click="upImage">
-					<image class="wh80 br10" :src="form.pic" mode="aspectFill" v-if="form.pic" />
+					<image class="wh80 br10" :src="form.photographUrl" mode="aspectFill" v-if="form.photographUrl" />
 					<uni-icons type="plusempty" size="40rpx" v-else />
 				</view>
 
 				<view class="edit f1 ml20">
-					<input type="text" :adjust-position="false" v-model="form.collectName" placeholder="输入收藏夹名称" />
+					<input type="text" :adjust-position="false" v-model="form.folderName" placeholder="输入收藏夹名称" />
 				</view>
 			</view>
 
 			<!-- 公开收藏夹 -->
 			<view class="rows fdr mtb30">
 				<view class="df fdr aic">
-					<text>是否公开收藏夹</text>
+					<text>是否快捷收藏夹</text>
 					<image src="/static/lock.png" mode="aspectFit" class="wh24 ml10" />
 				</view>
 
-				<switch class="switch" :checked="form.isPrivate == 0" color="#F85050" @change="handlePrivate" />
+				<switch class="switch" :checked="form.isLock == 1" color="#F85050" @change="handlePrivate" />
 			</view>
 
 			<view :style="{height: paddingHeight + 'px',}"></view>
diff --git a/jiuyi2/components/index/collectList.vue b/jiuyi2/components/index/collectList.vue
index 53d8598c..705b19d8 100644
--- a/jiuyi2/components/index/collectList.vue
+++ b/jiuyi2/components/index/collectList.vue
@@ -96,7 +96,8 @@
 	function getList() {
 		// 获取收藏列表
 		api.video.getCollectList({
-			query: {
+			data: {
+				isLock: '',
 				pageNum: listProperty.pageNum,
 				pageSize: listProperty.pageSize,
 			}
@@ -116,7 +117,10 @@
 				listProperty.total = rs.total
 				return
 			}
-			util.alert(rs.msg)
+			util.alert({
+				content: rs.msg,
+				showCancel: false,
+			})
 		}).finally(() => {
 			// 关闭加载
 			showLoad.value = false
@@ -129,9 +133,9 @@
 	 * @param {Number} index 删除的收藏夹
 	 */
 	function delectList(item, index) {
-		api.video.deleteCollect({
+		api.video.deletefavorite({
 			query: {
-				jyCollectId: item.id,
+				folderId: item.id,
 			}
 		}).then(rs => {
 			if (rs.code === 200) {
@@ -155,6 +159,9 @@
 		// 点击的下标
 		const index = ev.index
 		const item = listProperty.data[target]
+		// 关闭
+		proxy.$refs.swipeActionRef.closeAll()
+
 		switch (index) {
 			case 0:
 				// 删除
@@ -165,13 +172,12 @@
 				})
 				break
 			case 1:
-				// 编辑
-				proxy.$refs.collectAddRef.open(item)
+				setTimeout(() => {
+					// 编辑
+					proxy.$refs.collectAddRef.open(item)
+				}, 200)
 				break
 		}
-
-		// 关闭
-		proxy.$refs.swipeActionRef.closeAll()
 	}
 
 	/**
@@ -202,12 +208,12 @@
 				@click="handleActionItem($event,index)">
 				<view class="item rows fdr mlr20 ptb20" @click.stop="handleItem(item)">
 					<view class="poster">
-						<image class="wh80 br20" :src="item.formatPic" mode="aspectFill" />
+						<image class="wh80 br20" :src="item.photographUrl" mode="aspectFill" />
 					</view>
 					<view class="oh pl20">
-						<text class="c333 f28">{{item.collectName}}</text>
+						<text class="c333 f28">{{item.folderName}}</text>
 					</view>
-					<image class="wh24 ml10" src="/static/lock.png" mode="aspectFit" v-if="item.isPrivate == 1" />
+					<image class="wh24 ml10" src="/static/lock.png" mode="aspectFit" v-if="item.isLock == 1" />
 					<view class="f1"></view>
 				</view>
 			</uni-swipe-action-item>
diff --git a/jiuyi2/components/index/commentArea.vue b/jiuyi2/components/index/commentArea.vue
index 440783d4..abe3f041 100644
--- a/jiuyi2/components/index/commentArea.vue
+++ b/jiuyi2/components/index/commentArea.vue
@@ -43,6 +43,8 @@
 	})
 	// 填充高度
 	const paddingHeight = ref(0)
+	// 用户信息
+	const userinfo = computed(() => uni.$store.state.userinfo || {})
 
 	onMounted(() => {
 		// 
@@ -52,7 +54,11 @@
 	})
 
 	onBeforeUnmount(() => {
-		uni.offKeyboardHeightChange()
+		try {
+			uni.offKeyboardHeightChange(() => {});
+		} catch (error) {
+			console.error('Error onBeforeUnmount', error);
+		}
 	})
 
 	// 刷新列表
@@ -67,8 +73,9 @@
 	function getList() {
 		// 
 		api.video.getcomment({
-			query: {
+			data: {
 				videoId: detail.id,
+				parentId: 0,
 				pageSize: listProperty.pageSize,
 				pageNume: listProperty.pageNum,
 			}
@@ -111,13 +118,19 @@
 		}
 
 		// 
-		api.video.comment({
-			query: {
-				partentId: reply.id ? reply.id : 0,
-				videoId: detail.videoId,
-				context: content.value,
+		api.video.savecomment({
+			data: {
+				// 视频父id
+				parentId: reply.id ? reply.id : 0,
+				// 视频id
+				videoId: detail.id,
+				// 评论内容
+				content: content.value,
+				// 用户id
+				userId: userinfo.value.id,
 			}
 		}).then(rs => {
+			console.log('saveComment', rs)
 			if (rs.code == 200) {
 				proxy.$refs.comment.close()
 				detail.comment++
@@ -295,18 +308,20 @@
 						<view class="item mtb20" v-for="(item,index) in listProperty.data" :key="index">
 							<view class="df fdr">
 								<!-- 头像 -->
-								<image class="wh70 cir" :src="item.formatUserPortrait" mode="aspectFill" @click="toUser(item)" />
+								<image class="wh70 cir" :src="item.headPortrait" mode="aspectFill"
+									@click="toUser(item)" />
 
 								<view class="col ml20 f1">
 									<!-- 用户信息和点赞 -->
 									<view class="df fdr">
 										<view class="f1">
-											<text class="c666 f24" @click="toUser(item)">{{item.userNickname}}</text>
-											<rich-text class="mt5 c333 f28" :nodes="item.context"></rich-text>
+											<text class="c666 f24" @click="toUser(item)">{{item.nickName}}</text>
+											<text class="mt5 c333 f28">{{item.content}}</text>
 										</view>
 
 										<view class="like oh aic pl20" @click="handleLike(item)">
-											<uni-icons type="heart-filled" :color="item.isLike ? '#F84259' : '#b3b3b3'" size="32rpx" />
+											<uni-icons type="heart-filled" :color="item.isLike ? '#F84259' : '#b3b3b3'"
+												size="32rpx" />
 											<text class="c333 f24">{{item.likes}}</text>
 										</view>
 									</view>
@@ -322,20 +337,26 @@
 									<template v-if="item.num != 0">
 										<!-- 子评论 -->
 										<view class="child" v-if="item.childShow">
-											<view class="df fdr mt15" v-for="(secItem,secIndex) in item.child" :key="secItem.id">
+											<view class="df fdr mt15" v-for="(secItem,secIndex) in item.child"
+												:key="secItem.id">
 												<!-- 头像 -->
-												<image class="wh40 cir" :src="secItem.formatUserPortrait" mode="aspectFill" @click="toUser(secItem)" />
+												<image class="wh40 cir" :src="secItem.formatUserPortrait"
+													mode="aspectFill" @click="toUser(secItem)" />
 
 												<view class="col pl20 f1">
 													<!-- 用户信息和点赞 -->
 													<view class="df fdr">
 														<view class="f1">
-															<text class="c333 f24" @click="toUser(secItem)">{{secItem.userNickname}}</text>
-															<rich-text class="mt5 c333 f28" :nodes="secItem.context"></rich-text>
+															<text class="c333 f24"
+																@click="toUser(secItem)">{{secItem.userNickname}}</text>
+															<rich-text class="mt5 c333 f28"
+																:nodes="secItem.context"></rich-text>
 														</view>
 
 														<view class="like oh aic pl20" @click="handleLike(secItem)">
-															<uni-icons type="heart-filled" :color="secItem.isLike ? '#F84259' : '#b3b3b3'" size="32rpx" />
+															<uni-icons type="heart-filled"
+																:color="secItem.isLike ? '#F84259' : '#b3b3b3'"
+																size="32rpx" />
 															<text class="c333 f24">{{secItem.likes}}</text>
 														</view>
 													</view>
@@ -343,7 +364,8 @@
 													<!-- 发布时间和回复 -->
 													<view class="df fdr mt10">
 														<text class="c999 f24">{{secItem.createTime}}</text>
-														<text class="ml100 c666 f24" @click="handleReply(secItem)" v-if="0">回复</text>
+														<text class="ml100 c666 f24" @click="handleReply(secItem)"
+															v-if="0">回复</text>
 													</view>
 
 												</view>
diff --git a/jiuyi2/components/index/fastCollect.vue b/jiuyi2/components/index/fastCollect.vue
index 763e609e..24ff4a19 100644
--- a/jiuyi2/components/index/fastCollect.vue
+++ b/jiuyi2/components/index/fastCollect.vue
@@ -80,12 +80,11 @@
 
 	// 获取列表
 	function getList() {
-		return
 		// 获取收藏列表
 		api.video.getCollectList({
-			query: {
+			data: {
 				// 私密
-				isPrivate: 1,
+				isLock: 1,
 				// 页码
 				pageNum: listProperty.pageNum,
 				pageSize: listProperty.pageSize,
@@ -137,12 +136,11 @@
 	function handleCollect(item) {
 		// 
 		api.video.collectVideo({
-			query: {
+			data: {
 				// 视频id
-				videoId: detail.value.videoId,
+				videoId: detail.value.id,
 				// 收藏夹id
 				collectId: item.id,
-				isPrivate: item.isPrivate,
 			}
 		}).then(rs => {
 			if (rs.code == 200) {
@@ -177,7 +175,7 @@
 					<view class="list fdr plr15">
 						<view class="item wh70 br20" v-for="(item, index) in listProperty.data" :key="index"
 							@click="handleCollect(item)">
-							<image class="wh70 br20" :src="item.formatPic" mode="aspectFill" />
+							<image class="wh70 br20" :src="item.photographUrl" mode="aspectFill" />
 						</view>
 						<view class="item create fmid ml15 wh70 br20" @click="$refs.collectAddRef.open()">
 							<uni-icons type="plusempty" color="#fff" size="40rpx" />
diff --git a/jiuyi2/components/index/indexVideo.vue b/jiuyi2/components/index/indexVideo.vue
index a3a12637..71c46a11 100644
--- a/jiuyi2/components/index/indexVideo.vue
+++ b/jiuyi2/components/index/indexVideo.vue
@@ -259,7 +259,6 @@
 		const changedTouches = ev.changedTouches[0]
 		let x = getNumber(props.width) - getNumber(changedTouches.screenX) + getNumber(changedTouches.pageX)
 		let y = getNumber(changedTouches.screenY) - getNumber(changedTouches.pageY)
-
 		emit('showFastCollect', {
 			item: props.item,
 			position: {
@@ -323,16 +322,17 @@
 		}
 
 		// 取消收藏
-		api.video.cancelCollect({
-			query: {
+		api.video.deleteVideo({
+			data: {
 				// 视频id
-				videoId: detail.videoId,
+				videoId: detail.id,
 			},
 		}).then(rs => {
 			if (rs.code == 200) {
-				detail.isCollect = false
-				detail.collect--
-				uni.$emit('updateVideo', detail)
+				uni.$emit('updateVideo', {
+					...detail,
+					...rs.data,
+				})
 				return
 			}
 			// 
diff --git a/jiuyi2/components/index/videoMenu.vue b/jiuyi2/components/index/videoMenu.vue
index 0d614362..c4149d48 100644
--- a/jiuyi2/components/index/videoMenu.vue
+++ b/jiuyi2/components/index/videoMenu.vue
@@ -115,7 +115,7 @@
 		<!-- 视频菜单 -->
 		<view class="list">
 			<view class="item pr" v-for="(item,index) in list" :key="index" @click="handleVideo(item)">
-				<image :src="item.format_imageUrl" mode="aspectFill" />
+				<image :src="item.coverUrl" mode="aspectFill" />
 
 				<view class="window pfull"></view>
 
diff --git a/jiuyi2/components/mine/like.vue b/jiuyi2/components/mine/like.vue
index b15849cc..3e48af30 100644
--- a/jiuyi2/components/mine/like.vue
+++ b/jiuyi2/components/mine/like.vue
@@ -53,6 +53,7 @@
 
 	// 获取列表
 	function getList() {
+		return
 		// 
 		api.video.myLikeVideoList({
 			query: {
diff --git a/jiuyi2/components/mine/product.vue b/jiuyi2/components/mine/product.vue
index bdbec0d7..4b987820 100644
--- a/jiuyi2/components/mine/product.vue
+++ b/jiuyi2/components/mine/product.vue
@@ -48,6 +48,7 @@
 
 	// 获取列表
 	function getList() {
+		return
 		// 
 		api.video.myVideoList({
 			query: {
diff --git a/jiuyi2/pages/index/index.nvue b/jiuyi2/pages/index/index.nvue
index 435defe5..cdebc485 100644
--- a/jiuyi2/pages/index/index.nvue
+++ b/jiuyi2/pages/index/index.nvue
@@ -129,9 +129,7 @@
 		return uni.$store.state.task
 	})
 	// 用户信息
-	const userinfo = computed(() => {
-		return uni.$store.state.userinfo || {}
-	})
+	const userinfo = computed(() => uni.$store.state.userinfo || {})
 	// 当前tab选中
 	const tabCurrent = computed(() => {
 		return tab[tabIndex.value]
@@ -286,7 +284,7 @@
 				pageSize: recList.pageSize,
 			}
 		}).then(rs => {
-			console.log('getRecList then rs', rs)
+			// console.log('getRecList then rs', rs)
 			// 设置列表
 			setList(rs, recList)
 		}).catch(rs => {
@@ -304,7 +302,8 @@
 			// 总数
 			obj.total = rs.total
 			// 重新排序
-			const list = rs.rows.sort(() => Math.random() - Math.random())
+			// const list = rs.rows.sort(() => Math.random() - Math.random())
+			const list = rs.rows
 			// 第一页清空数据
 			if (obj.pageNum == 1) obj.data.length = 0
 			// 合并
@@ -313,7 +312,7 @@
 				item.readSecond = 0
 				return item
 			}))
-			console.log('result', obj.data, rs)
+			// console.log('result', obj.data, rs)
 
 			// 如果有多的视频 并且当前数据为一条
 			// if (obj.total > 1 && obj.data.length <= 1) getMoreRecList()
@@ -364,17 +363,20 @@
 					const taskValue = task.value
 					console.log('browseLog result', rs, taskValue)
 
-					// 如果原来任务是优先任务 当前任务是有效读秒
-					if (taskValue.taskType == 0 && result.taskType == 1) {
-						// 优先任务完成 播放烟花动画
-						console.log('优先任务完成 播放烟花动画')
-						handleCompleteMode('complete1')
-					}
-					// 如果原来任务任务是有效读秒 并且新返回的数据小于当前的任务进度
-					else if (result.taskType == 1 && (result.viewingDuration < taskValue
-							.viewingDuration)) {
-						console.log('有效读秒完成 播放任务完成动画')
-						handleCompleteMode('complete2')
+					// 如果不是第一次统计
+					if (taskValue.viewingDuration != 0) {
+						// 如果原来任务是优先任务 当前任务是有效读秒
+						if (taskValue.taskType == 0 && result.taskType == 1) {
+							// 优先任务完成 播放烟花动画
+							console.log('优先任务完成 播放烟花动画')
+							handleCompleteMode('complete1')
+						}
+						// 如果原来任务任务是有效读秒 并且新返回的数据小于当前的任务进度
+						else if (result.taskType == 1 && (result.viewingDuration < taskValue
+								.viewingDuration)) {
+							console.log('有效读秒完成 播放任务完成动画')
+							handleCompleteMode('complete2')
+						}
 					}
 
 					// 
@@ -557,6 +559,14 @@
 		proxy.$refs.collectRef.open(item)
 	}
 
+	/**
+	 * 打开快速收藏弹窗
+	 * @param {Object} ev 视频对象和节点位置信息
+	 */
+	function handleShowFastCollect(ev) {
+		proxy.$refs.fastCollectRef.open(ev)
+	}
+
 	/**
 	 * 打开分享给好友弹窗
 	 * @param {Object} item 当前列表项
@@ -603,12 +613,7 @@
 				isDelFlag: param.isDelFlag,
 			}
 		}).then(rs => {
-			console.log('request', rs)
 			if (rs.code == 200) {
-				console.log('item', {
-					...item,
-					...rs.data,
-				})
 				uni.$emit('updateVideo', {
 					...item,
 					...rs.data,
@@ -724,7 +729,7 @@
 								@showTime="handleShowTime" @showComment="handleShowCommentAlt"
 								@showCollect="handleShowCollectAlt" @showShareFirend="handleShowShareFirend"
 								@onPlay="handleVideoOnPlay" @onPause="handleVideoOnPause" @like="videoLike"
-								@longtap="$refs.moreMenuRef.open(secItem)" />
+								@longtap="$refs.moreMenuRef.open(secItem)"@showFastCollect="handleShowFastCollect" />
 						</template>
 					</cell>
 				</list>
diff --git a/jiuyi2/pages/mine/collectsVideo.vue b/jiuyi2/pages/mine/collectsVideo.vue
index 212e2417..86be46e6 100644
--- a/jiuyi2/pages/mine/collectsVideo.vue
+++ b/jiuyi2/pages/mine/collectsVideo.vue
@@ -74,12 +74,10 @@
 	// 获取列表
 	function getList() {
 		// 
-		api.video.getCollectVideoList({
+		api.video.getFavoriteVideo({
 			query: {
 				// 收藏夹id
-				collectId: collectId.value,
-				// 用户id
-				userId: userId.value || '',
+				folderId: collectId.value,
 				pageSize: list.pageSize,
 				pageNum: list.pageNum,
 			},
diff --git a/jiuyi2/pages/mine/homepage.vue b/jiuyi2/pages/mine/homepage.vue
index c18697ab..fdb1a6b4 100644
--- a/jiuyi2/pages/mine/homepage.vue
+++ b/jiuyi2/pages/mine/homepage.vue
@@ -66,7 +66,7 @@
 		}
 	])
 	// 分类列表下标
-	const tabIndex = ref(0)
+	const tabIndex = ref(2)
 	// tab当前项
 	const tabCurrent = computed(() => {
 		let result = tabList[tabIndex.value]
@@ -137,7 +137,7 @@
 		uni.navigateTo({
 			url: util.setUrl('/pages/mine/collectsVideo', {
 				collectId: item.id,
-				collectName: item.collectName,
+				collectName: item.folderName,
 			})
 		})
 	}
@@ -307,23 +307,6 @@
 				<!-- 收藏列表按钮 -->
 				<collectList ref="collectRef" @handleItem="handleCollectsItem" />
 			</view>
-
-			<!-- 历史 -->
-			<view class="history" v-show="tabIndex === 3" v-if="0">
-				<view class="list">
-					<view class="item pr" v-for="(item, index) in 9" :key="index">
-						<image src="https://bkimg.cdn.bcebos.com/pic/d833c895d143ad4bd113ee65b4554dafa40f4bfba845"
-							mode="aspectFill" />
-
-						<view class="window pfull"></view>
-
-						<view class="amount pa l0 r0 b0 df ptb10 plr10">
-							<image class="wh24" src="/static/amount.png" mode="aspectFit" />
-							<view class="txt f1 ml10 cfff f20">6541</view>
-						</view>
-					</view>
-				</view>
-			</view>
 		</view>
 	</view>
 
diff --git a/jiuyi2/pages/news/chat/chat.vue b/jiuyi2/pages/news/chat/chat.vue
index 60ec845e..b53b2452 100644
--- a/jiuyi2/pages/news/chat/chat.vue
+++ b/jiuyi2/pages/news/chat/chat.vue
@@ -140,6 +140,7 @@
 	// 开启监听消息
 	function addListener() {
 		let onMessageReceived = function(event) {
+			console.log('TencentCloudChat.EVENT.MESSAGE_RECEIVED', event)
 			setTimeout(() => {
 				// 获取历史记录
 				getHistory({
@@ -359,6 +360,11 @@
 				redPacketId: redPacket.id,
 				// 领取人id
 				userId: userinfo.value.id,
+				// 群聊类型
+				sendType: {
+					'C2C': '1',
+					'GROUP': '2',
+				} [msg.type],
 			}
 		}).then(rs => {
 			if (rs.code == 200) {
@@ -522,7 +528,7 @@
 					</view>
 					<view class="ml15 f32">{{redPacket.fromName}}的红包</view>
 				</view>
-				<view class="app_name mt15 tac f40">{{ redPacket.blessing }}</view>
+				<view class="app_name mt15 mlr30 tac f40">{{ redPacket.blessing }}</view>
 				<!--  -->
 				<view class="cfff f32 tac mt50" v-if="redPacket.isStale == 1">红包已过期</view>
 				<view class="cfff f32 tac mt50" v-else-if="redPacket.remainingCount == 0">来晚啦，红包已被抢完</view>
diff --git a/jiuyi2/pages/news/chat/components/news-temp/index.vue b/jiuyi2/pages/news/chat/components/news-temp/index.vue
index 2143df0e..1fa85aab 100644
--- a/jiuyi2/pages/news/chat/components/news-temp/index.vue
+++ b/jiuyi2/pages/news/chat/components/news-temp/index.vue
@@ -13,7 +13,6 @@
 	} from 'vue'
 	import NewsAudio from '@/static/audio.png'
 	import JyCommodityInformation from '@/components/public/jy-commodity-information'
-	import resEnvlope from '../red-envelope'
 	const props = defineProps({
 		item: {
 			type: Object,
@@ -142,7 +141,7 @@
 					<view class="redPacket br10" :class="{'disabled': 0}"
 						@click="handleOpenRedBag">
 						<view class="df aic">
-							<image class="img mr10" src="/static/image/red-envelope.png" />
+							<image class="img fs0 mr10" src="/static/image/red-envelope.png" />
 							<view class="red-packet-text cfff">{{ formatData.data.blessing }}</view>
 						</view>
 						<!-- 分割线 -->
diff --git a/jiuyi2/pages/news/chat/components/red-envelope/index.vue b/jiuyi2/pages/news/chat/components/red-envelope/index.vue
deleted file mode 100644
index 85e00fc5..00000000
--- a/jiuyi2/pages/news/chat/components/red-envelope/index.vue
+++ /dev/null
@@ -1,436 +0,0 @@
-<!-- 活动红包 -->
-<template>
-	<view class="red-bag">
-		<!-- 红包 -->
-		<view class="message-content" @click="openCover">
-			<view class="df aic">
-				<image class="img mr10" src="/static/image/red-envelope.png" />
-				<view class="red-packet-text">{{ dataItem.payload.data.name }}</view>
-			</view>
-			<!-- 分割线 -->
-			<view class="line"></view>
-			<view class="f20" style="color:#FBD3A4">{{ dataItem.payload.data.type == 1 ? '积分红包' : '余额红包' }}</view>
-		</view>
-	</view>
-</template>
-
-<script>
-	import api from '@/api/index'
-	import {
-		mapState
-	} from 'vuex';
-	export default {
-		inject: ['util'],
-		props: {
-			dataItem: {
-				type: Object,
-				default: () => {
-					{}
-				}
-			},
-		},
-
-		data() {
-			// console.log('====================================');
-			// console.log(this.dataItem);
-			// console.log('====================================');
-			let {
-				userName,
-				userPortrait
-			} = uni.getStorageSync('toUser') || {
-				userName: null,
-				userPortrait: null
-			};
-			return {
-				status: 'success',
-				openTime: undefined,
-				defConfig: {
-					userImg: userPortrait,
-					userName: userName,
-					coverTitle: '恭喜发财',
-					openTitle: '恭喜您获得',
-					openTips: '已存入钱包，可直接提现',
-					btnText: '查看我的钱包'
-				}, // 默认配置
-				rbagmodelshow: false, // 红包封面
-				openrbagmodelshow: false, // 拆封红包
-				openbrnanimation: {}, // 拆封动画
-				digitalData: [], // 滚动数字数据
-				redValue: null
-			}
-		},
-
-		computed: {
-			// 处理配置项
-			config() {
-				const result = Object.assign(this.defConfig)
-				return result
-			}
-		},
-
-		methods: {
-			openCover() {
-				// 开红包
-				if (this.dataItem.from == this.userinfo.userId) {
-					this.util.checkLink(`pages/news/red-envelope/index?bagId=${this.dataItem.ext.id}`)
-				} else {
-					this.rbagmodelshow = true
-				}
-			},
-			// 红包封面 => 開红包按钮
-			openBtn() {
-				let duration = 1000
-				let animation = uni.createAnimation({
-					duration,
-					timingFunction: 'ease'
-				})
-				this.openbrnanimation = animation
-				animation.rotateY(360).step()
-				this.openbrnanimation = animation.export()
-				setTimeout(() => {
-					this.rbagmodelshow = false
-					this.openbrnanimation = undefined
-					// 打开封面后回调
-					this.$nextTick(() => {
-						api.news.grabred({
-							id: this.dataItem.ext.id
-						}).then(res => {
-							console.log(res);
-							if (res.code == 500) {
-								// 提示领取失败
-								this.status = 'error'
-								this.defConfig.coverTitle = '恭喜发财';
-								this.defConfig.openTitle = '恭喜您获得';
-								this.defConfig.openTips = res.msg;
-								this.defConfig.btnText = '领取记录'
-								this.openrbagmodelshow = true
-							}
-							if (res.code == 200) {
-								let money = null
-								this.redValue = res.data
-								switch (res.data.type) {
-									// 积分
-									case 1:
-										money = res.data.score
-										break;
-										// 余额
-									case 2:
-										money = res.data.balance
-										break;
-									default:
-										break;
-								}
-								this.status = 'success'
-								this.rbagmodelshow = false
-								this.openrbagmodelshow = true
-								this.openbrnanimation = {}
-								this.setMoney(money)
-							}
-						})
-					})
-				}, duration)
-			},
-
-			// 确认红包
-			onConfirm() {
-				this.util.checkLink(`pages/news/red-envelope/index?bagId=${this.dataItem.ext.id}`)
-				this.onClose()
-			},
-
-			// 隐藏红包
-			onClose() {
-				this.rbagmodelshow = false
-				this.openrbagmodelshow = false
-				this.$emit('onClose') // 关闭后回调
-			},
-
-			// 设置金额
-			setMoney(money) {
-				const digitalArr = String(money).split('')
-				const dataList = []
-				digitalArr.forEach((num) => {
-					const obj = {
-						num: isNaN(num) ? num : Number(num),
-						style: ''
-					}
-					dataList.push(obj)
-				})
-				this.digitalData = dataList
-			},
-		}
-	}
-</script>
-
-<style lang="scss" scoped>
-	@keyframes bagAni {
-		0% {
-			transform: rotate(6deg);
-		}
-
-		100% {
-			transform: rotate(36deg);
-		}
-	}
-
-	.message-content {
-		width: 360rpx;
-		padding: 24rpx;
-		background: rgb(248, 162, 60);
-		color: #FCFEFD;
-		border-radius: 10rpx;
-
-		.img {
-			width: 50rpx;
-			height: 60rpx;
-			margin-right: 10rpx;
-		}
-
-		.line {
-			width: 100%;
-			height: 1px;
-			background: #EF9B45;
-			margin: 10rpx 0;
-			display: inline-block;
-		}
-
-	}
-
-	.red-bag {
-		.bag-btn {
-			position: fixed;
-			left: -46rpx;
-			top: 360rpx;
-			width: 150rpx;
-			height: 100rpx;
-			z-index: 999;
-			animation-name: bagAni;
-			animation-duration: 1.1s;
-			animation-iteration-count: infinite;
-			animation-direction: alternate;
-		}
-
-		// 红包封面
-		.rbag-model {
-			position: fixed;
-			top: 0;
-			left: 0;
-			width: 100%;
-			height: 100vh;
-			background-color: rgba(0, 0, 0, 0.3);
-			display: flex;
-			align-items: center;
-			justify-content: center;
-			z-index: 1000;
-
-			.rbag-con {
-				position: relative;
-				width: 80%;
-				height: 840rpx;
-				background-color: #da4d44;
-				border-radius: 14rpx;
-				box-shadow: 0rpx 0rpx 10rpx rgba(0, 0, 0, 0.2);
-
-				.rbag-box {
-					position: relative;
-					width: 100%;
-					height: 100%;
-					border-radius: 14rpx;
-					overflow: hidden;
-				}
-
-				.rbag_top {
-					position: absolute;
-					left: -20%;
-					top: 0;
-					width: 140%;
-					height: 540rpx;
-					background-color: #e0534a;
-					border-radius: 0 0 50% 50%;
-					box-shadow: 0 0 14rpx rgba(0, 0, 0, 0.4);
-					z-index: 1001;
-
-					.rbag_top_info {
-						margin-top: 60rpx;
-
-						.rbag_logo {
-							width: 160rpx;
-							height: 160rpx;
-							border-radius: 50%;
-							display: block;
-							margin: 0 auto;
-							overflow: hidden;
-						}
-
-						.app_name {
-							font-size: 38rpx;
-							color: #f6ac96;
-							text-align: center;
-							margin-top: 18rpx;
-							letter-spacing: 1rpx;
-						}
-
-						.rbag_tips {
-							font-size: 50rpx;
-							color: #edddd3;
-							text-align: center;
-							margin-top: 34rpx;
-							letter-spacing: 1rpx;
-						}
-					}
-				}
-
-				.open_rbag_btn {
-					position: absolute;
-					top: 450rpx;
-					left: 0;
-					right: 0;
-					width: 180rpx;
-					height: 180rpx;
-					line-height: 180rpx;
-					border-radius: 50%;
-					margin: 0 auto;
-					text-align: center;
-					background-color: #ffd287;
-					font-size: 55rpx;
-					color: #fef5e8;
-					box-shadow: 2rpx 2rpx 6rpx rgba(0, 0, 0, 0.2);
-					z-index: 1002;
-				}
-
-				.hide_btn {
-					position: absolute;
-					bottom: -110rpx;
-					left: 0;
-					right: 0;
-					width: 90rpx;
-					height: 90rpx;
-					margin: 0 auto;
-				}
-			}
-		}
-
-		// 打开红包
-		.open_rbag_model {
-			position: fixed;
-			top: 0;
-			left: 0;
-			width: 100%;
-			height: 100vh;
-			background-color: rgba(0, 0, 0, 0.3);
-			z-index: 1000;
-
-			.rbag_conbg {
-				position: absolute;
-				top: 0;
-				left: 0;
-				right: 0;
-				bottom: 0;
-				width: 80%;
-				height: 840rpx;
-				margin: auto;
-				z-index: 1001;
-			}
-
-			.open_rbag_con {
-				z-index: 1002;
-
-				.open_title {
-					height: 120rpx;
-					line-height: 120rpx;
-					text-align: center;
-					font-size: 38rpx;
-					letter-spacing: 2rpx;
-					color: #e46965;
-				}
-
-				.rbag_detail {
-					margin-top: 90rpx;
-
-					.open_money {
-						text-align: center;
-						font-size: 80rpx;
-						color: #c95948;
-						font-weight: bold;
-						display: flex;
-						justify-content: center;
-
-						.danwei {
-							font-size: 30rpx;
-							margin-left: 16rpx;
-							margin-top: 24rpx;
-						}
-					}
-
-					.open_tips {
-						text-align: center;
-						font-size: 30rpx;
-						color: #d26762;
-						margin-top: 30rpx;
-					}
-				}
-
-				.lookbag_box {
-					margin-top: 300rpx;
-					display: flex;
-					justify-content: center;
-
-					.lookbag_btn {
-						width: 70%;
-						height: 90rpx;
-						line-height: 90rpx;
-						text-align: center;
-						font-size: 32rpx;
-						color: #c95948;
-						letter-spacing: 2rpx;
-						background-color: #ffd356;
-						border-radius: 50rpx;
-						box-shadow: 0rpx 0rpx 4rpx rgba(0, 0, 0, 0.2);
-					}
-				}
-
-				.hide_btn {
-					position: absolute;
-					bottom: -110rpx;
-					left: 0;
-					right: 0;
-					width: 80rpx;
-					height: 80rpx;
-					line-height: 80rpx;
-					text-align: center;
-					margin: 0 auto;
-				}
-			}
-		}
-	}
-
-	.digital-scroll {
-		font-size: 28rpx;
-		font-weight: bold;
-		display: flex;
-		align-items: center;
-
-		.digital {
-			display: flex;
-			justify-content: center;
-			width: 0.7em; // 0.7em 是为了让文本间隔没那么宽
-			height: 1em;
-			line-height: 1em;
-			overflow: hidden;
-
-			.scroll-num {
-				// 文本竖直排列
-				writing-mode: vertical-rl;
-				text-orientation: upright;
-
-				.tra-num {
-					transition: all 1s;
-				}
-			}
-		}
-
-		.digitalStr {
-			width: auto;
-			line-height: 1em;
-		}
-	}
-</style>
\ No newline at end of file
diff --git a/jiuyi2/pages/news/redPacket.vue b/jiuyi2/pages/news/redPacket.vue
index 0f4d7e22..c9050801 100644
--- a/jiuyi2/pages/news/redPacket.vue
+++ b/jiuyi2/pages/news/redPacket.vue
@@ -44,7 +44,7 @@
 
 	// 红包类型
 	const typeList = reactive([{
-		id: 2,
+		id: 0,
 		name: '普通红包',
 	}, {
 		id: 1,
@@ -159,7 +159,7 @@
 
 		console.log('data', data)
 
-		// 
+		// 发送红包
 		api.news.sendRedPacket({
 			query: {
 				// 二级密码
@@ -182,12 +182,6 @@
 
 	// 发送红包
 	function handleSend() {
-		// 
-		const data = {
-			...form
-		}
-
-
 		// 支付二级密码
 		proxy.$refs.payPwdRef.open()
 	}
@@ -234,9 +228,9 @@
 			</view>
 
 			<view class="form-group rows mtb30 bfff">
-				<text>祝福语：</text>
+				<text class="fs0">祝福语：</text>
 				<view class="f1 tar">
-					<input class="f34" type="text" v-model="form.name" :placeholder="greeting" />
+					<textarea class="textarea f34" maxlength="100" auto-height="auto" v-model="form.blessing" :placeholder="greeting" />
 				</view>
 			</view>
 
@@ -274,4 +268,9 @@
 			color: #fff;
 		}
 	}
+
+	// 多行文本框
+	.textarea {
+		width: 100%;
+	}
 </style>
\ No newline at end of file
diff --git a/jiuyi2/vite.config.js b/jiuyi2/vite.config.js
index df0bd00d..5ea0f893 100644
--- a/jiuyi2/vite.config.js
+++ b/jiuyi2/vite.config.js
@@ -11,38 +11,38 @@ export default defineConfig({
 		proxy: {
 			"/system": {
 				// target: "http://192.168.0.189:8080",
-				// target: "http://192.168.0.102:8080",
-				target: "http://192.168.0.129:8080",
+				target: "http://192.168.0.102:8080",
+				// target: "http://192.168.0.129:8080",
 				changeOrigin: true,
 			},
 			"/shopify": {
 				// target: "http://192.168.0.189:8080",
-				// target: "http://192.168.0.102:8080",
-				target: "http://192.168.0.129:8080",
+				target: "http://192.168.0.102:8080",
+				// target: "http://192.168.0.129:8080",
 				changeOrigin: true,
 			},
 			"/user": {
 				// target: "http://192.168.0.189:8080",
-				// target: "http://192.168.0.102:8080",
-				target: "http://192.168.0.129:8080",
+				target: "http://192.168.0.102:8080",
+				// target: "http://192.168.0.129:8080",
 				changeOrigin: true,
 			},
 			"/coreplay": {
 				// target: "http://192.168.0.189:8080",
-				// target: "http://192.168.0.102:8080",
-				target: "http://192.168.0.129:8080",
+				target: "http://192.168.0.102:8080",
+				// target: "http://192.168.0.129:8080",
 				changeOrigin: true,
 			},
 			"/file": {
 				// target: "http://192.168.0.189:8080",
-				// target: "http://192.168.0.102:8080",
-				target: "http://192.168.0.129:8080",
+				target: "http://192.168.0.102:8080",
+				// target: "http://192.168.0.129:8080",
 				changeOrigin: true,
 			},
 			"/video": {
 				// target: "http://192.168.0.189:8080",
-				// target: "http://192.168.0.102:8080",
-				target: "http://192.168.0.129:8080",
+				target: "http://192.168.0.102:8080",
+				// target: "http://192.168.0.129:8080",
 				changeOrigin: true,
 			},
 		}