From 3a0df0487ed8b0d031ebb5be2a9f0a408e52cc1e Mon Sep 17 00:00:00 2001
From: huliyong <2783385703@qq.com>
Date: Sat, 18 Oct 2025 20:52:16 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0=E6=BF=80=E5=8A=B1?=
 =?UTF-8?q?=E8=A7=86=E9=A2=91=E8=AE=B0=E5=BD=95=E5=8A=9F=E8=83=BD=E5=B9=B6?=
 =?UTF-8?q?=E6=89=A9=E5=B1=95=E8=AF=84=E8=AE=BA=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在rewardedVideoAd混入中添加激励视频记录配置
- 扩展评论和记录接口的类型注释(新增9群聊和10抽奖类型)
- 在各页面组件中设置激励视频记录类型和目标ID
- 重构productList组件，添加商品编辑和删除功能
- 更新浏览记录接口注释使其更准确
---
 api/model/browseRecord.js             |   6 +-
 api/model/comment.js                  |   2 +-
 components/user/callPhone.vue         |   3 +
 components/user/productList.vue       | 220 +++++++++++++++++++++++++---------
 mixins/rewardedVideoAd.js             |  11 ++
 pages_order/gourmet/gourmetDetail.vue |   6 +-
 pages_order/group/groupDetail.vue     |   3 +
 pages_order/marketing/turntable.vue   |   2 +
 8 files changed, 194 insertions(+), 59 deletions(-)

diff --git a/api/model/browseRecord.js b/api/model/browseRecord.js
index e9f1c60..6841cce 100644
--- a/api/model/browseRecord.js
+++ b/api/model/browseRecord.js
@@ -1,7 +1,7 @@
-// 评论相关接口
+// 记录相关接口
 
 const api = {
-	//发布评论
+	//添加记录 category 分类 0浏览 1点赞 2转发 3激励视频
 	addBrowseRecord: {
 		url: '/city/browseRecord/addBrowseRecord',
 		method: 'POST',
@@ -9,7 +9,7 @@ const api = {
 		auth : true,
 		showLoading : true,
 	},
-	//获取评论列表type-0帖子-1租房-2工作-3景点-4美食-5活动-6人找车-7车找人-8文章
+	//获取记录列表type-0帖子-1租房-2工作-3景点-4美食-5活动-6人找车-7车找人-8文章
 	getBrowseRecordPage: {
 		url: '/city/browseRecord/getBrowseRecordPage',
 		method: 'GET',
diff --git a/api/model/comment.js b/api/model/comment.js
index 12e68a7..2a90dba 100644
--- a/api/model/comment.js
+++ b/api/model/comment.js
@@ -15,7 +15,7 @@ const api = {
 		auth : true,
 		showLoading : true,
 	},
-	//获取评论列表type-0帖子-1租房-2工作-3景点-4美食-5活动-6人找车-7车找人-8文章
+	//获取评论列表type-0帖子-1租房-2工作-3景点-4美食-5活动-6人找车-7车找人-8文章-9群聊-10抽奖
 	getCommentPage: {
 		url: '/city/getCommentPage',
 		method: 'GET',
diff --git a/components/user/callPhone.vue b/components/user/callPhone.vue
index 5352fb9..8dd2f96 100644
--- a/components/user/callPhone.vue
+++ b/components/user/callPhone.vue
@@ -43,6 +43,9 @@
 					type : this.type,
 					id : this.pid
 				}
+
+                this.rewardedRecordConfig.type = this.type // 
+                this.rewardedRecordConfig.formId = this.pid // 
 				
 				console.log(data);
 				
diff --git a/components/user/productList.vue b/components/user/productList.vue
index f6a7029..322ec05 100644
--- a/components/user/productList.vue
+++ b/components/user/productList.vue
@@ -1,66 +1,97 @@
 <template>
-	<view class="list">
-		<view class="item"
-		v-for="(item, index) in productList"
-		@click="$utils.navigateTo(`/pages_order/product/productDetail?id=${item.id}&pay=${pay}`)"
-		:key="index">
-			<image 
-			class="image"
-			:src="item.image ? item.image.split(',')[0] : 'https://img95.699pic.com/photo/50058/1378.jpg_wh860.jpg'" mode="aspectFill"></image>
-			<view class="info">
-				<view class="title text-ellipsis">
-					{{ item.name }}
-				</view>
-				<!-- <view class="price">
-					<text>￥{{ item.originalPrice }}</text>元/起
-				</view>
-				<view class="favorable" v-if="item.goodsSku">
-					<view class="t">
-						限时优惠
+	<view class="product-list-container">
+		<view class="list">
+			<view class="item"
+			v-for="(item, index) in productList"
+			@click="$utils.navigateTo('/pages_order/product/productDetail?id=' + item.id + '&pay=' + pay)"
+			:key="index">
+				<image 
+				class="image"
+				:src="item.image ? item.image.split(',')[0] : 'https://img95.699pic.com/photo/50058/1378.jpg_wh860.jpg'" mode="aspectFill"></image>
+				<view class="info">
+					<view class="title text-ellipsis">
+						{{ item.name }}
 					</view>
-					<view class="p">
-						￥{{ item.goodsSku.price }}
+					<!-- <view class="price">
+						<text>￥{{ item.originalPrice }}</text>元/起
 					</view>
-				</view> -->
-				
-				<view class="price"
-				v-if="isProductPrice(item)">
-					现价<text>￥{{ item.price }}</text>元
-				</view>
-				<view class="del"
-				v-if="isProductPrice(item)">
-					原价￥{{ item.oldPrice }}
-				</view>
-				<!-- <view class="favorable" v-if="item.oldPrice">
-					<view class="t">
-						原价
+					<view class="favorable" v-if="item.goodsSku">
+						<view class="t">
+							限时优惠
+						</view>
+						<view class="p">
+							￥{{ item.goodsSku.price }}
+						</view>
+					</view> -->
+					
+					<view class="price"
+					v-if="isProductPrice(item)">
+						现价<text>￥{{ item.price }}</text>元
+					</view>
+					<view class="del"
+					v-if="isProductPrice(item)">
+						原价￥{{ item.oldPrice }}
 					</view>
-					<view class="p">
-						￥{{ item.oldPrice }}
+					<!-- <view class="favorable" v-if="item.oldPrice">
+						<view class="t">
+							原价
+						</view>
+						<view class="p">
+							￥{{ item.oldPrice }}
+						</view>
+					</view> -->
+					<view class="favorable" 
+					v-if="item.points 
+					&& isProductPoint(item)">
+						<view class="t">
+							积分兑换
+						</view>
+						<view class="p">
+							{{ item.points }}
+						</view>
 					</view>
-				</view> -->
-				<view class="favorable" 
-				v-if="item.points 
-				&& isProductPoint(item)">
-					<view class="t">
-						积分兑换
+					
+					<view class="num">
+						{{ item.shopId }}
 					</view>
-					<view class="p">
-						{{ item.points }}
+					
+					<!-- 编辑和删除按钮 -->
+					<view class="edit-actions" v-if="edit">
+						<uv-icon
+						name="edit-pen-fill"
+						size="40rpx"
+						@click.stop="toEdit(item)"
+						color="#5baaff"
+						/>
+						
+						<uv-icon
+						name="trash-fill"
+						size="40rpx"
+						@click.stop="del(item)"
+						color="#5baaff"
+						/>
 					</view>
+					
+					<!-- <view class="num">
+						已售卖{{ item.soldNum || 0 }}+件
+					</view> -->
 				</view>
-				
-				<view class="num">
-					{{ item.shopId }}
+				<view class="btn">
+					<uv-icon name="shopping-cart"
+					color="#fff"></uv-icon>
 				</view>
-				
-				<!-- <view class="num">
-					已售卖{{ item.soldNum || 0 }}+件
-				</view> -->
 			</view>
-			<view class="btn">
-				<uv-icon name="shopping-cart"
-				color="#fff"></uv-icon>
+		</view>
+		
+		<!-- 添加商品按钮 -->
+		<view class="createDetail"
+		v-if="edit">
+			<view 
+			@click="$utils.navigateTo('/pages_order/product/addProduct?shopId=' + shopId)">
+				<uv-icon 
+				size="40rpx" 
+				color="#fff" 
+				name="plus"></uv-icon>
 			</view>
 		</view>
 	</view>
@@ -71,19 +102,66 @@
 	export default {
 		mixins : [productMixins],
 		name:"productList",
-		props : ['productList', 'pay'],
+		props : {
+			productList: {
+				type: Array,
+				default: function() {
+					return []
+				}
+			},
+			pay: {
+				type: String,
+				default: ''
+			},
+			edit: {
+				type: Boolean,
+				default: false
+			},
+			shopId: {
+				type: [String, Number],
+				default: ''
+			}
+		},
 		data() {
 			return {
 				
 			};
 		},
 		methods : {
+			// 修改商品
+			toEdit: function(item){
+				this.$utils.navigateTo('/pages_order/product/addProduct?id=' + item.id)
+			},
 			
+			// 下架商品
+			del: function(item){
+				var self = this;
+				uni.showModal({
+					title: '您确认要下架吗？',
+					content: '您正在下架 ' + item.name,
+					success : function(res) {
+						if(res.confirm){
+							self.$api('orderUpdate', {
+								id : item.id,
+								isOpen : 'N',
+							}, function(res) {
+								if(res.code == 200){
+									self.$emit('getData')
+								}
+							})
+						}
+					}
+				})
+			},
 		},
 	}
 </script>
 
 <style scoped lang="scss">
+.product-list-container {
+	position: relative;
+}
+
 .list{
 	display: flex;
 	flex-wrap: wrap;
@@ -146,6 +224,16 @@
 				font-size: 22rpx;
 				color: #888;
 			}
+			
+			.edit-actions{
+				display: flex;
+				margin-top: 10rpx;
+				justify-content: flex-start;
+				
+				/deep/ .uv-icon {
+					margin-right: 20rpx;
+				}
+			}
 		}
 		.btn{
 			position: absolute;
@@ -157,4 +245,28 @@
 		}
 	}
 }
+
+.createDetail {
+	position: fixed;
+	top: 60vh;
+	right: 50rpx;
+	z-index: 999;
+	button{
+		all : unset;
+	}
+	button::after{
+		all : unset;
+	}
+	& > view{
+		width: 100rpx;
+		height: 100rpx;
+		background-color: $uni-color;
+		border-radius: 50rpx;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		box-shadow: 0 0 10rpx 10rpx rgba(0, 0, 0, 0.1);
+		margin-bottom: 30rpx;
+	}
+}
 </style>
\ No newline at end of file
diff --git a/mixins/rewardedVideoAd.js b/mixins/rewardedVideoAd.js
index 1d01ef8..728418b 100644
--- a/mixins/rewardedVideoAd.js
+++ b/mixins/rewardedVideoAd.js
@@ -5,6 +5,11 @@
 export default {
 	data() {
 		return {
+            rewardedRecordConfig: {
+                category: 3, // 分类 3激励视频
+                type: 0, // 类型 0帖子-1租房-2工作-3景点-4美食-5活动-6人找车-7车找人-8文章-9群聊-10抽奖
+                formId: '', // 目标对象ID
+            },
 			// 视频广告相关
 			rewardedVideoAd: null, // 激励视频广告实例
 			isAdLoaded: false, // 广告是否已加载
@@ -60,6 +65,7 @@ export default {
 						} else if (this.onAdWatchComplete && typeof this.onAdWatchComplete === 'function') {
 							this.onAdWatchComplete()
 						}
+
 					} else {
 						// 用户中途关闭了广告
 						console.log('用户中途关闭广告')
@@ -76,6 +82,11 @@ export default {
 							})
 						}
 					}
+
+                    this.$api('addBrowseRecord', {
+                        ...this.rewardedRecordConfig,
+                        complete: (res && res.isEnded) ? 'Y' : 'N'
+                    })
 					
 					// 清理临时回调方法
 					this.tempOnAdWatchComplete = null
diff --git a/pages_order/gourmet/gourmetDetail.vue b/pages_order/gourmet/gourmetDetail.vue
index 79120cc..6f6db92 100644
--- a/pages_order/gourmet/gourmetDetail.vue
+++ b/pages_order/gourmet/gourmetDetail.vue
@@ -64,7 +64,11 @@
 			:list="list"/>
 
 			<view v-else style="padding: 0 20rpx;">
-				<productList :productList="list" :pay="detail.pay"/>
+				<productList 
+                :productList="list" 
+			    @getData="getData"
+			    :edit="detail.shopUser == userInfo.id"
+                :pay="detail.pay"/>
 			</view>
 
 		</view>
diff --git a/pages_order/group/groupDetail.vue b/pages_order/group/groupDetail.vue
index 532d027..0d2cba5 100644
--- a/pages_order/group/groupDetail.vue
+++ b/pages_order/group/groupDetail.vue
@@ -103,6 +103,9 @@
 			
 			// 设置分享路径
 			this.share.path = '/pages_order/group/groupDetail?id=' + options.id
+
+			this.rewardedRecordConfig.type = 9 // 9群聊
+			this.rewardedRecordConfig.formId = this.groupId // 目标对象ID
 		},
 		methods: {
 			// 广告观看完成回调
diff --git a/pages_order/marketing/turntable.vue b/pages_order/marketing/turntable.vue
index f63be8b..ea271cb 100644
--- a/pages_order/marketing/turntable.vue
+++ b/pages_order/marketing/turntable.vue
@@ -148,6 +148,8 @@
 		onLoad() {
 			this.getLuckDrawList()
 			// initRewardedVideoAd() 已在混入的mounted中处理
+
+            this.rewardedRecordConfig.type = 10 // 10抽奖
 		},
 		onShow() {
 			// 刷新用户信息以获取最新积分