From cc5ab18628524a4bd0b0c43336e63701bf22502c Mon Sep 17 00:00:00 2001
From: huliyong <2783385703@qq.com>
Date: Mon, 23 Sep 2024 19:27:50 +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

---
 pages/index/index.vue           |  5 +++-
 pages/publish/actorDetail.vue   | 66 +++++++++++++++++++++++++++++++++--------
 pages/publish/postDetail.vue    | 11 +++----
 pages_mine/publish/addWorks.vue |  2 +-
 4 files changed, 64 insertions(+), 20 deletions(-)

diff --git a/pages/index/index.vue b/pages/index/index.vue
index f397921..b28b581 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -181,7 +181,10 @@
 					uni.stopPullDownRefresh()
 					if(res.code == 200){
 						fn && fn(res)
-						// this.trends = res.result.records
+						
+						if(!fn){
+							this.trends = res.result.records
+						}
 						this.total = res.result.total
 					}
 				})
diff --git a/pages/publish/actorDetail.vue b/pages/publish/actorDetail.vue
index b7030e1..0261e61 100644
--- a/pages/publish/actorDetail.vue
+++ b/pages/publish/actorDetail.vue
@@ -3,11 +3,16 @@
 		<navbar leftClick @leftClick="leftClick" />
 
 		<view class="swipe">
-			<uv-swiper 
+			<!-- <uv-swiper 
 			:list="item.details.image &&
 			item.details.image.split(',')" 
 			indicator 
-			height="420rpx"></uv-swiper>
+			height="420rpx"></uv-swiper> -->
+			
+			<video :src="item.details.isImage && 
+			item.details.isImage.split(',')[0]" 
+			style="width: 750rpx;height: 420rpx;"
+			/>
 		</view>
 
 		<view class="box">
@@ -25,13 +30,12 @@
 					</view>
 					<view class="phone">
 						<view class=""
-						@click="getContact"
 						v-if="item.details.phonePay != 'Y' || item.isPayPhone">
 							联系方式：{{ item.details.phone }}
 						</view>
 						<view class=""
 						v-else>
-							联系方式<text @click="getContact">付费查看</text>
+							联系方式<text @click="submit">付费查看</text>
 						</view>
 					</view>
 				</view>
@@ -47,6 +51,10 @@
 			</view>
 
 
+			<view class="content">
+				<uv-parse :content="item.details.photographerContent"></uv-parse>
+			</view>
+
 			<view class="controls">
 				<contentControls
 				:type="1"
@@ -55,31 +63,43 @@
 				@loadData="getData"
 				:detail="item.details"/>
 			</view>
-
-
-			<view class="content">
-				<uv-parse :content="item.details.photographerContent"></uv-parse>
-			</view>
 			
 			<view class="works">
 				<view class="item" 
 				v-for="(t, index) in item.details.isImage && item.details.isImage.split(',')"
 				:key="index">
 					<view class="item-image">
-						<video :src="t" object-fit="fill"/>
+						<video :src="t" />
 					</view>
 				</view>
 			</view>
 		</view>
 
+		<confirmationPopup
+		ref="confirmationPopup"
+		title="提示"
+		@confirm="getContact"
+		confirmText="确认支付">
+			<view class="confirmationPopup">
+				<image src="/static/image/publish/pay.png" 
+				style="width: 150rpx;height: 150rpx;"
+				mode=""></image>
+				<view class="info">
+					请支付10元，10小时内可查看任意联系方式
+				</view>
+			</view>
+		</confirmationPopup>
+
 	</view>
 </template>
 
 <script>
 	import contentControls from '@/components/content/contentControls.vue'
+	import confirmationPopup from '@/components/toast/confirmationPopup.vue'
 	export default {
 		components : {
-			contentControls
+			contentControls,
+			confirmationPopup,
 		},
 		data() {
 			return {
@@ -131,6 +151,10 @@
 					}
 				})
 			},
+			submit(){
+				console.log(1);
+				this.$refs.confirmationPopup.open()
+			},
 			// 付费查看联系方式
 			getContact(){
 				
@@ -196,7 +220,7 @@
 				}
 			}
 			.title {
-				font-size: 30rpx;
+				font-size: 34rpx;
 				font-weight: 600;
 				color: #000;
 			}
@@ -240,7 +264,7 @@
 					.item-image{
 						background-color: #999;
 						width: 100%;
-						height: 250rpx;
+						height: 180rpx;
 						video{
 							width: 100%;
 							height: 100%;
@@ -250,4 +274,20 @@
 			}
 		}
 	}
+	.confirmationPopup{
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		justify-content: center;
+		width: 100%;
+		height: 300rpx;
+		image{
+			margin-top: 40rpx;
+		}
+		.info{
+			margin-top: 40rpx;
+			font-size: 26rpx;
+			padding: 0 30rpx;
+		}
+	}
 </style>
\ No newline at end of file
diff --git a/pages/publish/postDetail.vue b/pages/publish/postDetail.vue
index 9297529..1e5425f 100644
--- a/pages/publish/postDetail.vue
+++ b/pages/publish/postDetail.vue
@@ -23,6 +23,10 @@
 			</view>
 
 
+			<view class="content">
+				<uv-parse :content="item.content"></uv-parse>
+			</view>
+			
 			<view class="controls">
 				<contentControls
 				:type="2"
@@ -33,9 +37,6 @@
 			</view>
 
 
-			<view class="content">
-				<uv-parse :content="item.content"></uv-parse>
-			</view>
 		</view>
 
 	</view>
@@ -102,7 +103,7 @@
 			width: 100vw;
 
 			.title {
-				font-size: 30rpx;
+				font-size: 34rpx;
 				font-weight: 600;
 				color: #000;
 			}
@@ -129,7 +130,7 @@
 
 			.content {
 				margin-top: 30rpx;
-				color: #777;
+				font-size: 28rpx;
 			}
 		}
 	}
diff --git a/pages_mine/publish/addWorks.vue b/pages_mine/publish/addWorks.vue
index 8d1db4f..aa2dbe4 100644
--- a/pages_mine/publish/addWorks.vue
+++ b/pages_mine/publish/addWorks.vue
@@ -1,6 +1,6 @@
 <template>
 	<view class="actorRelease">
-		<navbar leftClick @leftClick="$utils.navigateBack" title="演员发布" />
+		<navbar leftClick @leftClick="$utils.navigateBack" title="作品发布" />
 		
 		<view class="images box">
 			<view class="">