合并代码

jiuyi2/api/news.js

@@ -134,12 +134,22 @@ export const news = {
 	},
 
 	// 红包详情
-	getRedbag(param) {
+	getRedPacketInfo(param) {
 		return util.request({
-			url: `/home/getRedbag`,
+			url: `/user/getRedPacketInfo`,
-			method: 'POST',
+			method: 'GET',
-			query: param.data
+			query: param.query,
+			load: 1,
+		})
+	},
 
+	// 领红包
+	getRedPacket(param) {
+		return util.request({
+			url: `/user/getRedPacket`,
+			method: 'POST',
+			data: param.data,
+			query: param.query,
 		})
 	},
 

jiuyi2/common/js/util.js

@@ -238,6 +238,7 @@ const util = {
 				},
 				// 请求失败返回
 				fail: res => {
+					console.log('request fail', url, res, params.data ? params.data : '')
 					// 关闭加载效果
 					if (params.load) {
 						uni.hideLoading()

jiuyi2/pages/index/index.nvue

@@ -289,6 +289,8 @@
 			console.log('getRecList then rs', rs)
 			// 设置列表
 			setList(rs, recList)
+		}).catch(rs => {
+			console.log('getRecList', rs)
 		})
 	}
 
@@ -321,8 +323,7 @@
 				const pages = getCurrentPages()
 				// 判断是否当前页
 				if (pages[pages.length - 1].route != 'pages/index/index') {
-					proxy.$refs[`videoRef${tabIndex.value}`][current[tabIndex.value]].playState.value =
+					proxy.$refs[`videoRef${tabIndex.value}`][current[tabIndex.value]].playState.value = false
-						false
 					proxy.$refs[`videoRef${tabIndex.value}`][current[tabIndex.value]].pause()
 				}
 			}, 500)

jiuyi2/pages/news/chat/chat.vue

@@ -73,8 +73,6 @@
 	const top = ref(0)
 	// 工具条的高度
 	const toolHeight = ref(0)
-	// 页码
-	const page = ref(1)
 	// 当前操作的元素
 	const messageItem = ref({})
 	// 工具栏状态 voice录音 input输入框 emoji表情 plus加号菜单
@@ -83,6 +81,8 @@
 	const videoUrl = ref('')
 	// 视频上下文
 	const videoContext = ref(null)
+	// 红包对象
+	const redPacket = reactive({})
 
 	onLoad(option => {
 		// 标题
@@ -187,7 +187,6 @@
 		let request = api.news.getUserMsgHistory
 		// 如果是群聊 获取群聊聊天记录
 		if (msg.type == 'GROUP') request = api.news.getGroupMsgHistory
-		console.log('getHistory')
 
 		// 获取历史记录
 		request({
@@ -216,9 +215,9 @@
 						return item
 					}))
 				}
+				console.log('getHostory', list.data)
 				// 总数
 				list.total = result.total
-				console.log('list', list.data)
 				nextTick(() => {
 					param.callback && param.callback()
 				})
@@ -322,36 +321,20 @@
 	}
 
 	/**
-	 * 打开红包
+	 * 打开红包详情
 	 * @param {Object} ev
 	 */
 	function handleRedPacket(ev) {
 		messageItem.value = ev
-		api.news.getRedbag({
+		api.news.getRedPacketInfo({
-			data: {
+			query: {
 				// 红包id
-				bagId: ev.payload.data.id
+				redPacketId: ev.callbackData.callback_json[0].businessId
 			}
 		}).then(rs => {
-			console.log('getRedbag', rs)
 			if (rs.code == 200) {
-				const result = rs.data
+				proxy.$refs.RedPacketRef.open()
-				messageItem.value.payload.data = {
+				Object.assign(redPacket, rs.data)
-					...result,
-					businessID: 'redPacket',
-				}
-
-				// 同步修改消息
-				let message = {
-					...messageItem.value
-				}
-				message.payload.data = JSON.stringify(msg.payload.data)
-
-				uni.$chat.modifyMessage(message).then(rs => {
-					console.log('modifyMessage success', rs)
-				}).catch(rs => {
-					console.log('modifyMessage catch', rs)
-				})
 				return
 			}
 			util.alert({
@@ -359,22 +342,30 @@
 				showCancel: false,
 			})
 		})
-		proxy.$refs.RedPacket.open()
 	}
 
 	// 领取红包
 	function handleOpenReadPacket() {
-		// 
+		// 如果不能领取
-		if (messageItem.value.payload.data.status != 0) return
+		if (redPacket.redStatus == false) return
+		// 红包过期
+		// if (redPacket.isStale == 1) return
 
-		api.news.grabred({
+
-			data: {
+		// 抢红包
+		api.news.getRedPacket({
+			query: {
 				// 红包id
-				id: messageItem.value.payload.data.id
+				redPacketId: redPacket.id,
+				// 领取人id
+				userId: userinfo.value.id,
 			}
 		}).then(rs => {
 			if (rs.code == 200) {
-				handleRedPacket(messageItem.value)
+				// 修改领取状态
+				redPacket.redStatus = false
+				// 获取金额
+				redPacket.amount = rs.data
 				return
 			}
 			util.alert({
@@ -518,36 +509,40 @@
 		</template>
 	</view>
 
-	<!--  -->
+	<!-- 视频 -->
 	<video :src="videoUrl" id="video" @fullscreenchange="onScreenChange" />
 
 	<!-- 红包封面 -->
-	<uni-popup ref="RedPacket" type="center">
+	<uni-popup ref="RedPacketRef" type="center">
 		<view class="red-bag br20" @touchmove.stop.prevent="">
 			<view class="rbag_top">
 				<view class="user fmid">
 					<view class="avatar">
-						<image class="wh80 cir" :src="messageItem.avatar" mode="scaleToFill" />
+						<image class="wh80 cir" :src="redPacket.fromUrl" mode="scaleToFill" />
 					</view>
-					<view class="ml15 f32">{{messageItem.nick}}的红包</view>
+					<view class="ml15 f32">{{redPacket.fromName}}的红包</view>
 				</view>
-				<view class="app_name mt15 tac f40">{{ messageItem.payload.data.name }}</view>
+				<view class="app_name mt15 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>
 
-				<view class="amount f32" v-if="messageItem.payload.data.receive">
+				<!-- redPacket.redStatus true可以领取 false不可领取 -->
+				<view class="amount f32" v-if="!redPacket.redStatus">
 					<text class="">已领取</text>
-					<text class="value">{{messageItem.payload.data.randomAmount}}</text>
+					<text class="value">{{redPacket.amount}}</text>
-					<text class="unit" v-if="messageItem.payload.data.type == 1">积分</text>
+					<text class="unit" v-if="redPacket.payType == 1">余额</text>
-					<text class="unit" v-else-if="messageItem.payload.data.type == 2">余额</text>
+					<text class="unit" v-else-if="redPacket.payType == 2">积分</text>
 				</view>
 			</view>
 
 			<view class="open_rbag_btn pr fmid" @click="handleOpenReadPacket">
-				<text v-if="messageItem.payload.data.receive">已</text>
+				<text v-if="redPacket.amount">已</text>
 				<text>开</text>
 			</view>
 		</view>
 
-		<view class="tac mt35" @click.stop="$refs.RedPacket.close()">
+		<view class="tac mt35" @click.stop="$refs.RedPacketRef.close()">
 			<uni-icons type="close" color="#fbd977" size="32" />
 		</view>
 	</uni-popup>

jiuyi2/pages/news/chat/components/news-temp/index.vue

@@ -139,11 +139,11 @@
 				<!-- 红包消息 -->
 				<template v-else-if="formatData.businessType == 'redPacket'">
 					<!-- 红包 -->
-					<view class="redPacket br10" :class="{'disabled': formatData.status != 0 || formatData.receive}"
+					<view class="redPacket br10" :class="{'disabled': 0}"
 						@click="handleOpenRedBag">
 						<view class="df aic">
 							<image class="img mr10" src="/static/image/red-envelope.png" />
-							<view class="red-packet-text">{{ formatData.name }}</view>
+							<view class="red-packet-text cfff">{{ formatData.data.blessing }}</view>
 						</view>
 						<!-- 分割线 -->
 						<view class="line"></view>

jiuyi2/readme.md

@@ -299,6 +299,7 @@ call_type 通话类型 2为视频，1是音频
 	销量 分享到消息内的好友
 
 投流推广
+推流收藏夹视频 商家视频显示出让佣金
 设置最低、最多投流数量
 我的收藏的点击视频详情展示 图表 投流列表 
 个人中心增加投流历史 按钮里面展示投流的总数据 (投流数据是每次投流 都是一条数据 还要显示xx用户看了这个视频 用户昵称只显示 一个字儿 只展示星号 两到三个字 展示第一个字儿和* 四个字及以上 1****9)
@@ -350,10 +351,8 @@ call_type 通话类型 2为视频，1是音频
 
 长按二倍速
 
-
 选择视频截帧
 
-
 type
 0 非好友
 1 好友

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.102:8080",
-				// target: "http://192.168.0.129: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.102:8080",
-				// target: "http://192.168.0.129: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.102:8080",
-				// target: "http://192.168.0.129: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.102:8080",
-				// target: "http://192.168.0.129: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.102:8080",
-				// target: "http://192.168.0.129: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.102:8080",
-				// target: "http://192.168.0.129:8080",
+				target: "http://192.168.0.129:8080",
 				changeOrigin: true,
 			},
 		}