From b2c7476a17497028e898c64f7ae8da2145e9e1f9 Mon Sep 17 00:00:00 2001
From: huliyong <2783385703@qq.com>
Date: Fri, 20 Sep 2024 14:54:23 +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                       |  1 +
 api/api.js                    |  8 ++++++++
 common.scss                   | 21 +++++++++++++++++++++
 components/post/postList.vue  |  2 +-
 pages/index/index.vue         | 40 +++++++++++++++++++++++++++-------------
 pages/publish/actorDetail.vue | 40 ++++++++++++++++++++++++++++++++++++----
 pages/publish/actorList.vue   | 11 +++++++++--
 pages/publish/postDetail.vue  |  8 ++++----
 pages/publish/postList.vue    | 11 +++++++++--
 9 files changed, 116 insertions(+), 26 deletions(-)
 create mode 100644 common.scss

diff --git a/App.vue b/App.vue
index a351c3f..42063a3 100644
--- a/App.vue
+++ b/App.vue
@@ -11,6 +11,7 @@
 </script>
 
 <style>
+	@import url("common.scss");
 	*{
 		padding: 0;
 		margin: 0;
diff --git a/api/api.js b/api/api.js
index c31766a..053dc52 100644
--- a/api/api.js
+++ b/api/api.js
@@ -76,6 +76,14 @@ const config = {
 
 	// 小程序-个人中心接口
 
+	//点击创建支付订单支付获取联系方式
+	getContact: {
+		url: '/api/info/getContact',
+		method: 'GET',
+		auth: true,
+		limit : 1500,
+		showLoading : true,
+	},
 	//添加银行卡
 	infoAddBankCard: {
 		url: '/api/info/addBankCard',
diff --git a/common.scss b/common.scss
new file mode 100644
index 0000000..297eba9
--- /dev/null
+++ b/common.scss
@@ -0,0 +1,21 @@
+
+// 文字益处处理
+.text-ellipsis{
+	overflow:hidden; //超出的文本隐藏
+	text-overflow:ellipsis; //溢出用省略号显示
+	white-space:nowrap; //溢出不换行
+}
+.text-ellipsis-2{
+	overflow: hidden;
+	text-overflow: ellipsis;
+	display:-webkit-box; //作为弹性伸缩盒子模型显示。
+	-webkit-box-orient:vertical; //设置伸缩盒子的子元素排列方式--从上到下垂直排列
+	-webkit-line-clamp:2; //显示的行
+}
+.text-ellipsis-3{
+	overflow: hidden;
+	text-overflow: ellipsis;
+	display:-webkit-box; //作为弹性伸缩盒子模型显示。
+	-webkit-box-orient:vertical; //设置伸缩盒子的子元素排列方式--从上到下垂直排列
+	-webkit-line-clamp:3; //显示的行
+}
\ No newline at end of file
diff --git a/components/post/postList.vue b/components/post/postList.vue
index 127d366..d76bc2c 100644
--- a/components/post/postList.vue
+++ b/components/post/postList.vue
@@ -12,7 +12,7 @@
 				</view>
 				<view class="createBy">
 					<view class="">
-						发布人：{{ item.userId_dictText }}
+						发布人：{{ item.userId }}
 					</view>
 					<view class="">
 						<uv-icon 
diff --git a/pages/index/index.vue b/pages/index/index.vue
index b7c3d60..67a8458 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -9,15 +9,24 @@
 			</view>
 			
 			<view class="search">
-				<view class="icon">
+				<!-- <view class="icon">
 					<uv-icon
 					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="search">
 					搜索
-				</view>
+				</view> -->
+				<!-- @change -->
+				<uv-search 
+				bgColor="#fff"
+				@search="search"
+				@custom="search"
+				placeholder="请输入搜索关键字..." 
+				v-model="queryParams.title"></uv-search>
 			</view>
 			
 			<view class="swipe">
@@ -48,8 +57,6 @@
 				:autoplay="true" 
 				:duration="500">
 					<swiper-item v-for="(item, index) in actorList" 
-					style="background-color: #fff;border-radius: 20rpx;
-					padding: 20rpx;"
 					:key="index">
 						<view class="swiper-item">
 							<image
@@ -62,8 +69,9 @@
 										{{ item.name }}
 									</view>
 									<view class="info-from">
-										<text>{{ item.userId }}</text>
-										<text style="margin-left: 30rpx;">{{ $dayjs(item.createTime).format('YYYY-MM-DD') }}</text>
+										<text class="text-ellipsis"
+										style="width: 220rpx;">发布人:{{ item.userId }}</text>
+										<text style="margin-left: 20rpx;">{{ $dayjs(item.createTime).format('YYYY-MM-DD') }}</text>
 									</view>
 								</view>
 								<view class="right">
@@ -159,6 +167,9 @@
 					}
 				})
 			},
+			search(){
+				this.indexGetTrendsPage()
+			},
 			indexGetTrendsPage(fn){
 				this.$api('indexGetTrendsPage', 
 				this.queryParams, res => {
@@ -170,10 +181,11 @@
 				})
 			},
 			bannerClick(index){
-				console.log(index);
-				uni.navigateTo({
-					url: '/pages_mine/publish/competition'
-				})
+				if(this.banner[index].toUrl){
+					uni.navigateTo({
+						url: this.banner[index].toUrl
+					})
+				}
 			}
 		}
 	}
@@ -255,7 +267,7 @@
 					flex-direction: column;
 					width: 100%;
 					image{
-						width: 450rpx;
+						width: 100%;
 						height: 180rpx;
 					}
 					.swiper-item-content{
@@ -270,6 +282,7 @@
 							.info-from{
 								font-size: 26rpx;
 								color: #777;
+								display: flex;
 							}
 						}
 						.right{
@@ -283,6 +296,7 @@
 							display: flex;
 							justify-content: center;
 							align-items: center;
+							flex-shrink: 0;
 						}
 					}
 				}
diff --git a/pages/publish/actorDetail.vue b/pages/publish/actorDetail.vue
index 3e553d9..18b60e0 100644
--- a/pages/publish/actorDetail.vue
+++ b/pages/publish/actorDetail.vue
@@ -7,7 +7,7 @@
 			:list="item.details.image &&
 			item.details.image.split(',')" 
 			indicator 
-			height="auto"></uv-swiper>
+			height="820rpx"></uv-swiper>
 		</view>
 
 		<view class="box">
@@ -25,12 +25,13 @@
 					</view>
 					<view class="phone">
 						<view class=""
-						v-if="item.details.phonePay != 'Y'">
-							{{ item.details.phone }}
+						@click="getContact"
+						v-if="item.details.phonePay != 'Y' || item.isPayPhone">
+							联系方式：{{ item.details.phone }}
 						</view>
 						<view class=""
 						v-else>
-							联系方式<text>付费查看</text>
+							联系方式<text @click="getContact">付费查看</text>
 						</view>
 					</view>
 				</view>
@@ -119,6 +120,37 @@
 					}
 				})
 			},
+			// 付费查看联系方式
+			getContact(){
+				
+				let self = this
+				
+				this.$api('getContact', {
+					id : this.item.details.id
+				} , res => {
+					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.getData()
+							},
+							fail: function (err) {
+								console.log('支付失败',err);
+								uni.showToast({
+									icon:'none',
+									title:"支付失败"
+								})
+							}
+						});
+					}
+				})
+			},
 		}
 	}
 </script>
diff --git a/pages/publish/actorList.vue b/pages/publish/actorList.vue
index 06610e3..cf45387 100644
--- a/pages/publish/actorList.vue
+++ b/pages/publish/actorList.vue
@@ -13,7 +13,7 @@
 		
 		<view class="box">
 			<view class="search">
-				<view class="icon">
+				<!-- <view class="icon">
 					<uv-icon
 					size="40rpx"
 					name="search"></uv-icon>
@@ -23,7 +23,14 @@
 				<view class="text"
 				@click="getData">
 					搜索
-				</view>
+				</view> -->
+				
+				<uv-search
+				bgColor="#fff"
+				@search="getData"
+				@custom="getData"
+				placeholder="请输入搜索关键字..." 
+				v-model="queryParams.title"></uv-search>
 			</view>
 			
 			<actorList :list="actorList"/>
diff --git a/pages/publish/postDetail.vue b/pages/publish/postDetail.vue
index c27db83..e49995e 100644
--- a/pages/publish/postDetail.vue
+++ b/pages/publish/postDetail.vue
@@ -52,8 +52,8 @@
 				list: [
 				],
 				item: {},
-				isThumbs_up: {},//是否点赞
-				isThumbs_down: {},//是否踩
+				isThumbs_up: undefined,//是否点赞
+				isThumbs_down: undefined,//是否踩
 				id : 0,
 			}
 		},
@@ -67,11 +67,11 @@
 		},
 		methods: {
 			getData() {
-				this.$api('infoGetMyReleaseDetail', {
+				this.$api('indexGetTrendsDetail', {
 					id : this.id
 				}, res => {
 					if (res.code == 200) {
-						this.item = res.result
+						this.item = res.result.details
 						this.isThumbs_up = res.result.isThumbs_up//是否点赞
 						this.isThumbs_down = res.result.isThumbs_down//是否踩
 					}
diff --git a/pages/publish/postList.vue b/pages/publish/postList.vue
index 4cc7173..63883e0 100644
--- a/pages/publish/postList.vue
+++ b/pages/publish/postList.vue
@@ -12,7 +12,7 @@
 		
 		<view class="box">
 			<view class="search">
-				<view class="icon">
+				<!-- <view class="icon">
 					<uv-icon
 					size="40rpx"
 					name="search"></uv-icon>
@@ -23,7 +23,14 @@
 				<view class="text"
 				@click="indexGetTrendsPage">
 					搜索
-				</view>
+				</view> -->
+				
+				<uv-search
+				bgColor="#fff"
+				@search="indexGetTrendsPage"
+				@custom="indexGetTrendsPage"
+				placeholder="请输入搜索关键字..." 
+				v-model="queryParams.title"></uv-search>
 			</view>
 			
 			<postList :list="postList"/>