From c3ee2bfc637798972c0b53d407ba12054dbb121c Mon Sep 17 00:00:00 2001
From: huliyong <2783385703@qq.com>
Date: Wed, 18 Sep 2024 13:47:58 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 App.vue                                |  2 +-
 api/api.js                             | 50 ++++++++++++++++++++++++-
 components/config/configPopup.vue      |  7 ++--
 components/content/contentControls.vue | 68 ++++++++++++++++++++++++++++++----
 components/post/actorList.vue          |  8 ++--
 components/post/postList.vue           |  2 +-
 pages/index/index.vue                  | 17 ++++++---
 pages/publish/actorDetail.vue          | 17 +++++++--
 pages/publish/actorList.vue            |  4 +-
 pages/publish/actorRelease.vue         | 12 +++---
 pages/publish/postDetail.vue           | 12 +++---
 pages/publish/postList.vue             | 33 +++++++++++------
 pages/publish/publishPost.vue          | 33 +++++++++++++++--
 pages_mine/publish/addWorks.vue        | 22 +++++------
 pages_mine/publish/competition.vue     | 20 ++++++++--
 pages_mine/publish/worksDetail.vue     | 18 +++++----
 store/store.js                         | 16 ++++++--
 17 files changed, 259 insertions(+), 82 deletions(-)

diff --git a/App.vue b/App.vue
index 6321230..045a58a 100644
--- a/App.vue
+++ b/App.vue
@@ -3,7 +3,7 @@
 		onLaunch: function() {
 		},
 		onShow: function() {
-			// this.$store.commit('initConfig')
+			this.$store.commit('initConfig')
 		},
 		onHide: function() {
 		}
diff --git a/api/api.js b/api/api.js
index 077b278..c31766a 100644
--- a/api/api.js
+++ b/api/api.js
@@ -211,10 +211,49 @@ const config = {
 		auth: true, 
 		showLoading : true,
 	},
+	// 踩type-作品0-演员1-动态2
+	infoDislike: {
+		url: '/api/info/dislike',
+		method: 'GET',
+		auth: true, 
+		showLoading : true,
+	},
+	// 点赞type-作品0-演员1-动态2
+	infoLike: {
+		url: '/api/info/like',
+		method: 'GET',
+		auth: true, 
+		showLoading : true,
+	},
+	// 举报type-作品0-演员1-动态2
+	infoReport: {
+		url: '/api/info/report',
+		method: 'GET',
+		auth: true, 
+		showLoading : true,
+	},
+	// 发布作品
+	releaseWorks: {
+		url: '/api/info/releaseWorks',
+		method: 'POST',
+		auth: true,
+		showLoading : true,
+	},
 	
 
 	//小程序-登录相关接口
-
+	
+	// 获取隐私政策
+	getPrivacyPolicy: {
+		url: '/api/login/getPrivacyPolicy',
+		method: 'GET',
+	},
+	// 获取用户协议
+	getUserAgreement: {
+		url: '/api/login/getUserAgreement',
+		method: 'GET',
+	},
+	
 	//绑定手机接口
 	loginBindPhone: {
 		url: '/api/login/bindPhone',
@@ -253,6 +292,15 @@ const config = {
 		method: 'GET',
 		showLoading : true,
 	},
+	
+	
+	// 立即支付
+	payOrder: {
+		url: '/api/order/payOrder',
+		method: 'POST',
+		showLoading : true,
+	},
+	
 }
 
 export function api(key, data, callback, loadingTitle) {
diff --git a/components/config/configPopup.vue b/components/config/configPopup.vue
index f0ed9f8..5b25223 100644
--- a/components/config/configPopup.vue
+++ b/components/config/configPopup.vue
@@ -9,7 +9,7 @@
 </template>
 
 <script>
-	import { mapGetters } from 'vuex'
+	import { mapState } from 'vuex'
 	export default {
 		name: 'configPoup',
 		data() {
@@ -18,14 +18,13 @@
 			}
 		},
 		onShow(){
-			console.log(this.getConfig);
 		},
 		methods: {
 			
 			//打开配置信息菜单
 			open(key){
 				console.log(key);
-				this.content = this.getConfig[key]
+				this.content = this.configList[key]
 				this.$refs.popup.open('bottom');
 			}
 			
@@ -33,7 +32,7 @@
 		},
 		
 		computed : {
-			...mapGetters(['getConfig'])
+			...mapState(['configList'])
 		}
 	}
 </script>
diff --git a/components/content/contentControls.vue b/components/content/contentControls.vue
index 5c76eef..495c15b 100644
--- a/components/content/contentControls.vue
+++ b/components/content/contentControls.vue
@@ -1,22 +1,22 @@
 <template>
-	<view class="controls"
-		@click="$emit('bell')">
-		<view class="">
+	<view class="controls">
+		<view class="bell"
+		@click="bell">
 			<uv-icon size="35rpx" name="bell"></uv-icon>
 			举报
 		</view>
 		<view class=""
-		@click="$emit('thumb-up')">
+		@click="thumbUp">
 			<uv-icon size="35rpx" name="thumb-up"></uv-icon>
 			点赞
 		</view>
 		<view class=""
-		@click="$emit('share')">
+		@click="share">
 			<uv-icon size="35rpx" name="share"></uv-icon>
 			分享
 		</view>
 		<view class=""
-		@click="$emit('thumb-down')">
+		@click="thumbDown">
 			<uv-icon size="35rpx" name="thumb-down"></uv-icon>
 			踩
 		</view>
@@ -26,11 +26,65 @@
 <script>
 	export default {
 		name:"contentControls",
+		props : {
+			type : {
+				default : 0
+			},
+			detail : {
+				default : {}
+			}
+		},
 		data() {
 			return {
 				
 			};
-		}
+		},
+		methods : {
+			// 举报
+			bell(){
+				this.$api('infoReport', {
+					type : this.type,
+					id : this.detail.id,
+				}, res => {
+					if(res.code == 200){
+						uni.showToast({
+							title: '举报成功'
+						})
+					}
+				})
+			},
+			// 点赞
+			thumbUp(){
+				this.$api('infoLike', {
+					type : this.type,
+					id : this.detail.id,
+				}, res => {
+					if(res.code == 200){
+						uni.showToast({
+							title: '点赞成功'
+						})
+					}
+				})
+			},
+			// 分享
+			share(){
+				
+			},
+			// 踩
+			thumbDown(){
+				this.$api('infoDislike', {
+					type : this.type,
+					id : this.detail.id,
+				}, res => {
+					if(res.code == 200){
+						uni.showToast({
+							title: '踩成功'
+						})
+						
+					}
+				})
+			},
+		},
 	}
 </script>
 
diff --git a/components/post/actorList.vue b/components/post/actorList.vue
index 6950d0d..50c2964 100644
--- a/components/post/actorList.vue
+++ b/components/post/actorList.vue
@@ -12,7 +12,8 @@
 					<view class="t">
 						{{ item.name }}
 					</view>
-					<view class="auth">
+					<view class="auth"
+					v-if="item.isState == 'Y'">
 						已认证
 					</view>
 				</view>
@@ -24,13 +25,14 @@
 						发布人：{{ item.createBy }}
 					</view> -->
 					<view class="">
-						{{ item.createTime }}
+						{{ $dayjs(item.createTime).format('YYYY-MM-DD') }}
 					</view>
 				</view>
 				<view class="phone">
 					联系方式 <text>去查看</text>
 				</view>
-				<view class="price">
+				<view class="price"
+				v-if="item.money">
 					价格 <text>￥{{ item.money }}</text>
 				</view>
 			</view>
diff --git a/components/post/postList.vue b/components/post/postList.vue
index e747623..8306392 100644
--- a/components/post/postList.vue
+++ b/components/post/postList.vue
@@ -22,7 +22,7 @@
 					</view>
 				</view>
 				<view class="createTime">
-					{{ item.createTime }}
+					{{ $dayjs(item.createTime).format('YYYY-MM-DD') }}
 				</view>
 			</view>
 		</view>
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 60bb20e..dc8d709 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -127,15 +127,21 @@
 		},
 		//滚动到屏幕底部
 		onReachBottom() {
-      console.log("======首页滑动到底部触发====")
-			if(this.queryParams.pageSize < this.total){
+			console.log("======首页滑动到底部触发====")
+			let total = this.queryParams.pageNo * this.queryParams.pageSize
+			if(total < this.total){
 				this.queryParams.pageSize += 10
-				this.indexGetTrendsPage()
+				this.indexGetTrendsPage(res => {
+					this.trends.push(...res.result.records)
+				})
 			}
 		},
 		onShow() {
 			this.getData()
-			this.indexGetTrendsPage()
+			this.queryParams.pageNo = 1
+			this.indexGetTrendsPage(res => {
+				this.trends = res.result.records
+			})
 		},
 		methods: {
 			getData(){
@@ -150,10 +156,11 @@
 					}
 				})
 			},
-			indexGetTrendsPage(){
+			indexGetTrendsPage(fn){
 				this.$api('indexGetTrendsPage', 
 				this.queryParams, res => {
 					if(res.code == 200){
+						// fn && fn(res)
 						this.trends = res.result.records
 						this.total = res.result.total
 					}
diff --git a/pages/publish/actorDetail.vue b/pages/publish/actorDetail.vue
index e2dc506..79279cf 100644
--- a/pages/publish/actorDetail.vue
+++ b/pages/publish/actorDetail.vue
@@ -24,7 +24,14 @@
 						近30天收益
 					</view>
 					<view class="phone">
-						联系方式<text>付费查看</text>
+						<view class=""
+						v-if="item.phonePay != 'Y'">
+							{{ item.phone }}
+						</view>
+						<view class=""
+						v-else>
+							联系方式<text>付费查看</text>
+						</view>
 					</view>
 				</view>
 			</view>
@@ -34,13 +41,15 @@
 					发布人：{{ item.userId }}
 				</view>
 				<view class="">
-					发布时间：{{ item.createTime }}
+					发布时间：{{ $dayjs(item.createTime).format('YYYY-MM-DD') }}
 				</view>
 			</view>
 
 
 			<view class="controls">
-				<contentControls/>
+				<contentControls
+				:type="1"
+				:detail="item"/>
 			</view>
 
 
@@ -96,7 +105,7 @@
 					id
 				}, res => {
 					if(res.code == 200){
-						this.item = res.result
+						this.item = res.result.details
 					}
 				})
 			},
diff --git a/pages/publish/actorList.vue b/pages/publish/actorList.vue
index 7b82b37..f18c653 100644
--- a/pages/publish/actorList.vue
+++ b/pages/publish/actorList.vue
@@ -4,11 +4,11 @@
 		<navbar 
 		leftClick
 		@leftClick="$utils.navigateBack"
-		title="认证演员"/>
+		title="演员集"/>
 		
 		
 		<view class="title">
-			认证创作者
+			创作者
 		</view>
 		
 		<view class="box">
diff --git a/pages/publish/actorRelease.vue b/pages/publish/actorRelease.vue
index 6813131..8078796 100644
--- a/pages/publish/actorRelease.vue
+++ b/pages/publish/actorRelease.vue
@@ -66,12 +66,12 @@
 						<uv-radio size="35rpx" 
 						icon-size="35rpx" 
 						label="本人发布" 
-						labelSize="28rpx" name="1">
+						labelSize="28rpx" name="Y">
 						</uv-radio>
 						<uv-radio size="35rpx" 
 						icon-size="35rpx" 
 						label="经纪人发布" 
-						labelSize="28rpx" name="0">
+						labelSize="28rpx" name="N">
 						</uv-radio>
 					</uv-radio-group>
 				</view>
@@ -82,9 +82,9 @@
 				</view>
 				<view class="textarea">
 					<uv-radio-group v-model="form.phonePay">
-						<uv-radio size="35rpx" icon-size="35rpx" label="是" labelSize="28rpx" name="1">
+						<uv-radio size="35rpx" icon-size="35rpx" label="是" labelSize="28rpx" name="Y">
 						</uv-radio>
-						<uv-radio size="35rpx" icon-size="35rpx" label="否" labelSize="28rpx" name="0">
+						<uv-radio size="35rpx" icon-size="35rpx" label="否" labelSize="28rpx" name="N">
 						</uv-radio>
 					</uv-radio-group>
 				</view>
@@ -186,8 +186,8 @@
 					money: '',
 					name : '',
 					phone : '',
-					isUser : '1',//是否本人发布
-					phonePay : '1',//联系方式是否付费查看
+					isUser : 'Y',//是否本人发布
+					phonePay : 'Y',//联系方式是否付费查看
 					photographerContent : '',//演员介绍
 				},
 				fileList: [//代表作
diff --git a/pages/publish/postDetail.vue b/pages/publish/postDetail.vue
index f7314cd..544b0c6 100644
--- a/pages/publish/postDetail.vue
+++ b/pages/publish/postDetail.vue
@@ -18,13 +18,15 @@
 					发布人：{{ item.userId }}
 				</view>
 				<view class="">
-					发布时间：{{ item.createTime }}
+					发布时间：{{ $dayjs(item.createTime).format('YYYY-MM-DD') }}
 				</view>
 			</view>
 
 
 			<view class="controls">
-				<contentControls />
+				<contentControls
+				:type="2"
+				:detail="item"/>
 			</view>
 
 
@@ -49,10 +51,6 @@
 				item: {},
 			}
 		},
-		mounted() {
-			console.log("===")
-			this.getData(options.id)
-		},
 		onLoad(options) {
 			// this.$route.query的参数
 			console.log(options)
@@ -64,7 +62,7 @@
 					id
 				}, res => {
 					if (res.code == 200) {
-						this.item = res.result
+						this.item = res.result.details
 					}
 				})
 			},
diff --git a/pages/publish/postList.vue b/pages/publish/postList.vue
index 1d94f1b..4cc7173 100644
--- a/pages/publish/postList.vue
+++ b/pages/publish/postList.vue
@@ -17,8 +17,11 @@
 					size="40rpx"
 					name="search"></uv-icon>
 				</view>
-				<input type="text" placeholder="搜索相关..."/>
-				<view class="text">
+				<input type="text" placeholder="搜索相关..."
+				v-model="queryParams.title"
+				/>
+				<view class="text"
+				@click="indexGetTrendsPage">
 					搜索
 				</view>
 			</view>
@@ -41,24 +44,32 @@
 				queryParams : {
 					pageNo : 1,
 					pageSize : 10,
-				}
+					title : '',
+				},
 			}
 		},
 		onShow() {
-			this.getData()
+			this.queryParams.pageNo = 1
+			this.indexGetTrendsPage(res => {
+				this.postList = res.result.records
+			})
 		},
-		onReachBottom(){
-			let allTotal = this.queryParams.pageNo * this.queryParams.pageSize
-			if(allTotal < this.total){
-				//当前条数小于总条数 则增加请求数
+		//滚动到屏幕底部
+		onReachBottom() {
+			let total = this.queryParams.pageNo * this.queryParams.pageSize
+			if(total < this.total){
 				this.queryParams.pageSize += 10
-				this.getData() //调用加载数据方法
+				this.indexGetTrendsPage(res => {
+					this.postList.push(...res.result.records)
+				})
 			}
 		},
 		methods: {
-			getData(){
-				this.$api('indexGetTrendsPage', this.queryParams, res => {
+			indexGetTrendsPage(fn){
+				this.$api('indexGetTrendsPage', 
+				this.queryParams, res => {
 					if(res.code == 200){
+						// fn && fn(res)
 						this.postList = res.result.records
 						this.total = res.result.total
 					}
diff --git a/pages/publish/publishPost.vue b/pages/publish/publishPost.vue
index ca121de..6d1de40 100644
--- a/pages/publish/publishPost.vue
+++ b/pages/publish/publishPost.vue
@@ -70,7 +70,7 @@
 		<confirmationPopup
 		ref="confirmationPopup"
 		title="提示"
-		@confirm="pay"
+		@confirm="paySuccess"
 		confirmText="确认支付">
 			<view class="confirmationPopup">
 				<image src="/static/image/publish/pay.png" 
@@ -162,7 +162,7 @@
 					}
 				})
 			},
-			pay(){
+			paySuccess(){
 				
 				let data = {
 					...this.form,
@@ -178,6 +178,33 @@
 					}
 				})
 			},
+			payOrder(){
+				let self = this
+				this.$api('payOrder', res => {
+					console.log();
+					if(res.code == 200){
+						uni.requestPayment({
+							provider: 'wxpay', // 服务提提供商
+							timeStamp: res.result.timeStamp, // 时间戳
+							nonceStr: res.result.nonceStr, // 随机字符串
+							package: res.result.packageValue,
+							signType: res.result.signType, // 签名算法
+							paySign: res.result.paySign, // 签名
+							success: function (res) {
+								console.log('支付成功',res);
+								self.paySuccess()
+							},
+							fail: function (err) {
+								console.log('支付失败',err);
+								uni.showToast({
+									icon:'none',
+									title:"支付失败"
+								})
+							}
+						});
+					}
+				})
+			},
 			submit(){
 				
 				if(this.fileList.length == 0){
@@ -199,7 +226,7 @@
 					this.$refs.confirmationPopup.open()
 				}else{
 					// 没有选择付费
-					this.pay()
+					this.paySuccess()
 				}
 			},
 			preview(){},
diff --git a/pages_mine/publish/addWorks.vue b/pages_mine/publish/addWorks.vue
index 481ca53..8d1db4f 100644
--- a/pages_mine/publish/addWorks.vue
+++ b/pages_mine/publish/addWorks.vue
@@ -54,7 +54,7 @@
 					详情介绍：
 				</view>
 				<view class="textarea">
-					<uv-textarea v-model="form.photographerContent" :maxlength="200" count placeholder="输入详情介绍"></uv-textarea>
+					<uv-textarea v-model="form.context" :maxlength="200" count placeholder="输入详情介绍"></uv-textarea>
 				</view>
 			</view>
 			<!-- <view class="form-item-content">
@@ -146,7 +146,7 @@
 			return {
 				form: {
 					title : '',
-					photographerContent : '',//演员介绍
+					context : '',//演员介绍
 				},
 				fileList: [//代表作
 					// {
@@ -213,12 +213,11 @@
 				let data = {
 					...this.form,
 					isCard: 1,
-					isImage : this.fileList.map((item) => item.url).join(","),
+					vod : this.fileList.map((item) => item.url).join(","),
 					image : this.fileListImage.map((item) => item.url).join(","),
-					isTop : this.form.topId ? 'Y' : 'N',
 				}
 
-				this.$api('publishActor', data,
+				this.$api('releaseWorks', data,
 					res => {
 						if (res.code == 200) {
 							this.$refs.confirmationPopupUpload.open()
@@ -236,16 +235,14 @@
 				
 				if(this.fileList.length == 0){
 					return uni.showToast({
-						title: '请上传代表作',
+						title: '请上传作品',
 						icon : 'none'
 					})
 				}
 				
 				if (this.$utils.verificationAll(this.form, {
 						title: '请输入标题',
-						photographerContent: '请输入演员介绍',
-						phone: '请输入手机号',
-						money: '请输入价格',
+						context: '请输入介绍',
 					})) {
 					return
 				}
@@ -260,9 +257,10 @@
 			},
 			confirm() {
 				// this.$refs.confirmationPopupUpload.close()
-				uni.navigateTo({
-					url: "/pages/index/index"
-				})
+				// uni.navigateTo({
+				// 	url: "/pages_mine/publish/competition"
+				// })
+				uni.navigateBack(-1)
 			},
 		}
 	}
diff --git a/pages_mine/publish/competition.vue b/pages_mine/publish/competition.vue
index 8615e25..e8067a1 100644
--- a/pages_mine/publish/competition.vue
+++ b/pages_mine/publish/competition.vue
@@ -69,7 +69,7 @@
 								</view>
 							</view>
 							<view class="createTime">
-								发布时间：{{ item.createTime }}
+								发布时间：{{ $dayjs(item.createTime).format('YYYY-MM-DD') }}
 							</view>
 						</view>
 					</view>
@@ -78,9 +78,10 @@
 							<uv-icon 
 							size="30rpx"
 							name="thumb-up"></uv-icon>
-							240
+							{{ item.num }}
 						</view>
-						<view :class="{btn : true, a : index == 3}">
+						<view :class="{btn : true, a : index == 3}"
+						@click.stop="thumbUp(item)">
 							投票
 						</view>
 					</view>
@@ -121,6 +122,19 @@
 			}
 		},
 		methods: {
+			// 点赞
+			thumbUp(item){
+				this.$api('infoLike', {
+					type : 0,
+					id : item.id,
+				}, res => {
+					if(res.code == 200){
+						uni.showToast({
+							title: '点赞成功'
+						})
+					}
+				})
+			},
 			getList(){
 				this.$api('indexGetGetWorkPage', {
 					token : uni.getStorageSync('token'),
diff --git a/pages_mine/publish/worksDetail.vue b/pages_mine/publish/worksDetail.vue
index 63cda0f..67bc4e7 100644
--- a/pages_mine/publish/worksDetail.vue
+++ b/pages_mine/publish/worksDetail.vue
@@ -13,15 +13,15 @@
 		<view class="box">
 
 			<view class="topInfo">
-				<view class="title title1">
+				<!-- <view class="title title1">
 					当前排名<text>{{ item.money || 1 }}</text>
-				</view>
+				</view> -->
 				<view class="price">
 					<view class="">
 						{{ item.title }}
 					</view>
 					<view class="">
-						投票200
+						票数 {{ item.num }}
 					</view>
 				</view>
 				<!-- <view class="right">
@@ -39,23 +39,25 @@
 					发布人：{{ item.userId }}
 				</view>
 				<view class="">
-					发布时间：{{ item.createTime }}
+					发布时间：{{ $dayjs(item.createTime).format('YYYY-MM-DD') }}
 				</view>
 			</view>
 
 
 			<view class="controls">
-				<contentControls/>
+				<contentControls
+				:type="0"
+				:detail="item"/>
 			</view>
 
 
 			<view class="content">
-				<uv-parse :content="item.photographerContent"></uv-parse>
+				<uv-parse :content="item.context"></uv-parse>
 			</view>
 			
 			<view class="works">
 				<view class="item" 
-				v-for="(t, index) in item.isImage && item.isImage.split(',')"
+				v-for="(t, index) in item.vod && item.vod.split(',')"
 				:key="index">
 					<view class="item-image">
 						<video :src="t" object-fit="fill"/>
@@ -92,7 +94,7 @@
 					id
 				}, res => {
 					if(res.code == 200){
-						this.item = res.result
+						this.item = res.result.details
 					}
 				})
 			},
diff --git a/store/store.js b/store/store.js
index da90e9e..2af295d 100644
--- a/store/store.js
+++ b/store/store.js
@@ -22,10 +22,18 @@ const store = new Vuex.Store({
 	mutations: {
 		// 初始化配置
 		initConfig(state){
-			api('getConfig', res => {
-				if(res.code == 200){
-					state.configList = res.result
-				}
+			// api('getConfig', res => {
+			// 	if(res.code == 200){
+			// 		state.configList = res.result
+			// 	}
+			// })
+			let config = ['getPrivacyPolicy', 'getUserAgreement']
+			config.forEach(k => {
+				api(k, res => {
+					if (res.code == 200) {
+						state.configList[k] = res.result
+					}
+				})
 			})
 		},
 		login(state){