From ed94f1796ada88d5405ab92555bbfd28e6a4c86f Mon Sep 17 00:00:00 2001
From: Bobi <2166145077@qq.com>
Date: Thu, 14 Nov 2024 00:10:20 +0800
Subject: [PATCH] =?UTF-8?q?=E7=B2=89=E4=B8=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/list/dynamic/dynamicItem.vue       |  31 +++-
 components/list/dynamic/userHeadItem.vue      | 220 +++++++++++++++-----------
 components/user/createDetailPopup.vue         |  49 ++++--
 pages/index/center.vue                        |  11 +-
 pages/index/index.vue                         |  53 ++-----
 pages_order/car/carList.vue                   |  31 +++-
 pages_order/components/list/cart/cartItem.vue | 179 ++++++++++++++++-----
 7 files changed, 379 insertions(+), 195 deletions(-)

diff --git a/components/list/dynamic/dynamicItem.vue b/components/list/dynamic/dynamicItem.vue
index cbeb94f..db91395 100644
--- a/components/list/dynamic/dynamicItem.vue
+++ b/components/list/dynamic/dynamicItem.vue
@@ -6,20 +6,36 @@
 		<daynamicInfo :item="item" />
 
 		<view class="bottom">
+			<!-- 浏览 -->
 			<view class="browse">
-				{{ item.isBrowse }}浏览
+					{{ item.isBrowse }}
+				<view class="bontt">
+					<uv-icon name="eye-fill"></uv-icon>
+				</view>
 			</view>
+			<!-- 评论 -->
 			<view class="browse">
-				{{ item.isComment }}条评论
+				{{ item.isComment }}
+				<view class="bontt">
+					<uv-icon name="chat-fill"></uv-icon>
+				</view>
+				
 			</view>
 			<view class="browse">
-				点赞
+				22
+				<view class="bontt">
+					<uv-icon name="thumb-up-fill"></uv-icon>
+				</view>
+				<!-- 点赞 -->
+				
+			
 			</view>
 			<view class="browse">
-				<view class="icon">
+				0
+				<view class="bontt">
 					<uv-icon name="attach"></uv-icon>
 				</view>
-				分享
+					
 			</view>
 			<callPhone :phone="item.phone" :sexName="item.sex" />
 		</view>
@@ -59,10 +75,15 @@
 
 			.browse {
 				display: flex;
+				justify-content: center;
+				align-items: center;
 				margin: 0rpx 30rpx;
 				color: rgb(132, 132, 132);
 				margin-left: 10rpx;
 			}
+			.bontt{
+				margin: 0rpx 5rpx;
+			}
 		}
 	}
 </style>
\ No newline at end of file
diff --git a/components/list/dynamic/userHeadItem.vue b/components/list/dynamic/userHeadItem.vue
index 87af665..5cb0e1b 100644
--- a/components/list/dynamic/userHeadItem.vue
+++ b/components/list/dynamic/userHeadItem.vue
@@ -1,49 +1,64 @@
 <template>
-	<view class="box" :style="{'--sexcolor' : sex[item.sex].color}">
-		<view class="headPortraitimg">
-			<image :src="item.userImage" @click.stop="previewImage([item.userImage])" mode="aspectFill"></image>
+	<view class="o">
+		<view class="indee">
+			<view class="k">
+				#{{item.classId_dictText}}
+			</view>
 		</view>
-		
-		<view class="YaoduUniversalWall">
-			<view class="heide">
-				<view class="username text-ellipsis">
-					{{ item.userName }}
-				</view>
-				<view class="inde" v-if="item.sex">
-					<!-- 性别 -->
-					{{ item.sex }}
-				</view>
-				<view class="inde" v-if="item.yearDate">
-					<!-- 年份 -->
-					{{ item.yearDate }}
-				</view>
-				<view class="inde" v-if="item.addId">
-					<!-- 地址 -->
-					{{ item.addId }}
-				</view>
-				<view class="inde">
-					#{{item.classId_dictText}}
-					
-				</view>
-				<view class="authentication" v-if="item.isContent">
-					<!-- 个人认证 -->
-					{{ item.isContent }}
-				</view>
-				
+		<view class="box" :style="{'--sexcolor' : sex[item.sex].color}">
+
+			<!-- 	<view class="indee">
+			#{{item.classId_dictText}}
+		</view> -->
+
+			<view class="headPortraitimg">
+				<image :src="item.userImage" @click.stop="previewImage([item.userImage])" mode="aspectFill"></image>
 			</view>
 
-			<view class="Times">
-				<view class="TimeMonth">
-					<!-- 10-08 -->
-					{{ item.createTime }}发布
+			<view class="YaoduUniversalWall">
+
+				<view class="heide">
+					<view class="username text-ellipsis">
+						{{ item.userName }}
+					</view>
+					<view class="inde" v-if="item.sex">
+						<!-- 性别 -->
+						{{ item.sex }}
+					</view>
+					<view class="inde" v-if="item.yearDate">
+						<!-- 年份 -->
+						{{ item.yearDate }}
+					</view>
+					<view class="inde" v-if="item.addId">
+						<!-- 地址 -->
+						{{ item.addId }}
+					</view>
+					<!-- 分类 -->
+
+					<view class="authentication" v-if="item.isContent">
+						<!-- 个人认证 -->
+						{{ item.isContent }}
+					</view>
+
 				</view>
-				<!-- <view class="Month">
+
+
+
+				<view class="Times">
+					<view class="TimeMonth">
+						<!-- 10-08 -->
+						{{ item.createTime }}发布
+					</view>
+					<!-- <view class="Month">
 					12:34
 				</view> -->
+				</view>
+
 			</view>
+
 		</view>
-		
 	</view>
+
 </template>
 
 <script>
@@ -65,78 +80,95 @@
 </script>
 
 <style scoped lang="scss">
-	.box {
-		display: flex;
-		align-items: center;
-
-		.headPortraitimg {
-			width: 100rpx;
-			height: 100rpx;
-			border-radius: 15rpx;
-			overflow: hidden;
-
-			image {
-				width: 100%;
-				height: 100%;
+	.o {
+		.indee{
+			.k{
+				display: flex;
+				justify-content: flex-end;
+				margin-top: -30rpx;
+				color:gold;
 			}
 		}
+		.box {
+			display: flex;
+			align-items: center;
 
-		.YaoduUniversalWall {
-			padding: 0rpx 10rpx;
+			.indee {}
 
-			.username {
-				max-width: 200rpx;
-			}
+			.headPortraitimg {
 
-			.heide {
-				display: flex;
-				justify-content: center;
-				align-items: center;
-			}
+				width: 100rpx;
+				height: 100rpx;
+				border-radius: 15rpx;
+				overflow: hidden;
 
-			.inde {
-				display: flex;
-				justify-content: center;
-				align-items: center;
-				padding: 0rpx 10rpx;
-				margin: 0rpx 5rpx;
-				font-size: 20rpx;
-				height: 30rpx;
-				color: white;
-				// background-color: rgb(124, 136, 242);
-				background-color: var(--sexcolor);
-				border-radius: 7rpx;
-				flex-shrink: 0;
+
+
+				image {
+					width: 100%;
+					height: 100%;
+				}
 			}
 
-			.authentication {
-				display: flex;
-				justify-content: center;
-				align-items: center;
-				padding: 0rpx 10rpx;
-				margin: 0rpx 5rpx;
-				font-size: 20rpx;
-				height: 34rpx;
+			.YaoduUniversalWall {
 				padding: 0rpx 10rpx;
-				color: white;
-				background-color: #ffd036;
-				border-radius: 7rpx;
-				flex-shrink: 0;
-			}
 
-			.Times {
-				display: flex;
-				padding: 5rpx 0rpx;
-				font-size: 20rpx;
-				margin-top: 10rpx;
+				.username {
+					max-width: 200rpx;
+				}
 
-				.Month {
-					margin: 0rpx 15rpx;
+				.heide {
+					display: flex;
+					justify-content: center;
+					align-items: center;
 				}
-				
+
+				.inde {
+					display: flex;
+					justify-content: center;
+					align-items: center;
+					padding: 0rpx 10rpx;
+					margin: 0rpx 5rpx;
+					font-size: 20rpx;
+					height: 30rpx;
+					color: white;
+					// background-color: rgb(124, 136, 242);
+					background-color: var(--sexcolor);
+					border-radius: 7rpx;
+					flex-shrink: 0;
+				}
+
+
+
+				.authentication {
+					display: flex;
+					justify-content: center;
+					align-items: center;
+					padding: 0rpx 10rpx;
+					margin: 0rpx 5rpx;
+					font-size: 20rpx;
+					height: 34rpx;
+					padding: 0rpx 10rpx;
+					color: white;
+					background-color: #ffd036;
+					border-radius: 7rpx;
+					flex-shrink: 0;
+				}
+
+				.Times {
+					display: flex;
+					padding: 5rpx 0rpx;
+					font-size: 20rpx;
+					margin-top: 10rpx;
+
+					.Month {
+						margin: 0rpx 15rpx;
+					}
+
+				}
+
 			}
 
 		}
-	
 	}
 </style>
\ No newline at end of file
diff --git a/components/user/createDetailPopup.vue b/components/user/createDetailPopup.vue
index 8bb7063..6438a70 100644
--- a/components/user/createDetailPopup.vue
+++ b/components/user/createDetailPopup.vue
@@ -1,7 +1,25 @@
 <template>
 	<view>
-		<view class="createDetail" @click="open">
-			<uv-icon size="40rpx" color="#fff" name="plus"></uv-icon>
+		<view class="createDetail">
+			<view @click="open">
+				<uv-icon size="40rpx" color="#fff" name="plus"></uv-icon>
+			</view>
+			<!-- 悬浮图标 -->
+			<view>
+				<button @click="$utils.navigateTo('/pages_order/mine/promotion')">
+					<uv-icon size="40rpx" 
+					color="#fff" 
+					name="server-man"></uv-icon>
+				</button>
+			</view>
+			
+			<view>
+				<button>
+					<uv-icon size="40rpx" 
+					color="#fff" 
+					name="question-circle"></uv-icon>
+				</button>
+			</view>
 		</view>
 
 		<uv-popup ref="createDetailPopup" :round="30">
@@ -64,17 +82,26 @@
 <style scoped lang="scss">
 	.createDetail {
 		position: fixed;
-		top: 70vh;
+		top: 60vh;
 		right: 50rpx;
-		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(#000, 0.1);
 		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(#000, 0.1);
+			margin-bottom: 30rpx;
+		}
 	}
 
 	.createDetailPopup {
diff --git a/pages/index/center.vue b/pages/index/center.vue
index 70c8634..f92314e 100644
--- a/pages/index/center.vue
+++ b/pages/index/center.vue
@@ -1,7 +1,6 @@
 <template>
 	<view class="page">
 		<view class="beijin">
-
 			<view class=" profile">
 				<view class="o">
 					<view class="headImage">
@@ -44,7 +43,7 @@
 						<view class="digit">
 							<uv-icon
 							size="40rpx"
-							color="#fff"
+							color="#black"
 							name="grid"></uv-icon>
 						</view>
 						<view class="fans">
@@ -192,16 +191,18 @@
 <style scoped lang="scss">
 	.page {
 		.beijin {
-			background: linear-gradient(to bottom, rgb(85, 94, 123), rgb(45, 51, 73));
+			// background: linear-gradient(to bottom, rgb(85, 94, 123), rgb(45, 51, 73));
+			background: linear-gradient($uni-color, #fff);
 			background-color: black;
-			color: white;
+			color: black;
+			
 
 			.profile {
 				padding: 40rpx;
 				padding-top: 160rpx;
 
 				.box {
-					padding: 5rpx 10rpx;
+					padding: 0rpx 10rpx;
 					display: flex;
 					align-items: center;
 					text-align: center;
diff --git a/pages/index/index.vue b/pages/index/index.vue
index c671c24..30eec47 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -112,36 +112,29 @@
 				@click="tabsClick"></uv-tabs>
 			</view>
 			
-			
 			<!-- 动态列表 -->
-			<dynamicItem
-			:key="index"
-			v-for="(item, index) in list"
-			:item="item"
-			@click="$utils.navigateTo('/pages_order/post/postDetail?id=' + item.id)"
-			/>
+			<view 
+			class="dynamicList"
+			:style="{backgroundColor: queryParams.classId ? '' : 'wheat'}">
+				<dynamicItem
+				:key="index"
+				v-for="(item, index) in list"
+				:item="item"
+				@click="$utils.navigateTo('/pages_order/post/postDetail?id=' + item.id)"
+				/>
+			</view>
 		</view>
 
 		<createDetailPopup/>
-		
 		<certificationPopup ref="certificationPopup"/>
-		
 		<sharePopup ref="sharePopup"/>
 		
 		<customerServicePopup 
 		:title="headinfo.details"
 		:image="headinfo.kefu" 
 		ref="customerServicePopup"/>
-		
-		<view class="customerService">
-			<button>
-				<uv-icon size="40rpx" 
-				color="#fff" 
-				name="server-man"></uv-icon>
-			</button>
-		</view>
-
 		<PrivacyAgreementPoup />
+		
 		<tabber select="0" />
 	</view>
 </template>
@@ -291,6 +284,7 @@
 <style scoped lang="scss">
 	.page{
 		position: relative;
+		
 	}
 	image{
 		width: 100%;
@@ -374,6 +368,7 @@
 		z-index: 9;
 		overflow: hidden;
 		.life {
+			
 			display: flex;
 			text-align: center;
 			padding: 10rpx 0;
@@ -398,26 +393,8 @@
 				}
 			}
 		}
-	}
-
-
-	.customerService{
-		position: fixed;
-		top: calc(70vh + 120rpx);
-		right: 50rpx;
-		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(#000, 0.1);
-		z-index: 999;
-		overflow: hidden;
-		button{
-			// background-color: ;
-			all : unset;
+		.dynamicList{
+			padding-top: 10rpx;
 		}
 	}
 
diff --git a/pages_order/car/carList.vue b/pages_order/car/carList.vue
index c0d4234..8fadb05 100644
--- a/pages_order/car/carList.vue
+++ b/pages_order/car/carList.vue
@@ -1,20 +1,34 @@
 <template>
 	<view class="page pageList">
-		<navbar title="景点" bgColor="#5baaff" color="#fff" leftClick @leftClick="$utils.navigateBack" />
+		<navbar title="找车" bgColor="#5baaff" color="#fff" leftClick @leftClick="$utils.navigateBack" />
+		
 		<view class="top-bg"></view>
+		
 		<view style="padding: 10rpx 30rpx 0 30rpx;">
 			<uv-search bgColor="#fff" @search="getData" :showAction="false" searchIconSize="30rpx"
 				placeholder="请输入搜索关键字..." v-model="queryParams.title"></uv-search>
 		</view>
+		
+		<view class="LabelOptions">
+			<uv-tabs :list="tabs" 
+			:activeStyle="{color : '#fff', fontWeight : 900}"
+			:inactiveStyle="{color : '#eee'}"
+			lineColor="#fff"
+			lineHeight="8rpx"
+			lineWidth="50rpx"
+			:scrollable="false"
+			@click="tabsClick"></uv-tabs>
+		</view>
 
-		<view class="">
+		<!-- <view class="">
 			<screenRen :isArea="false" @clickItem="clickItem" />
-		</view>
+		</view> -->
 
 		<view class="list">
 			<cartItem :key="index" v-for="(item, index) in list" :item="item"
 				@click="$utils.navigateTo('/pages_order/car/carListDetail?id=' + item.id)" />
 		</view>
+		
 
 	</view>
 </template>
@@ -32,6 +46,14 @@
 		data() {
 			return {
 				mixinsListApi: 'getCatPage',
+				tabs : [
+					{
+						name : "车找人",
+					},
+					{
+						name : "人找车",
+					},
+				],
 			}
 		},
 		methods: {
@@ -54,6 +76,9 @@
 		.list {
 			padding: 0 20rpx;
 		}
+		.LabelOptions{
+			position: relative;
+		}
 	}
 
 	.top-bg {
diff --git a/pages_order/components/list/cart/cartItem.vue b/pages_order/components/list/cart/cartItem.vue
index 562fcb5..116e29f 100644
--- a/pages_order/components/list/cart/cartItem.vue
+++ b/pages_order/components/list/cart/cartItem.vue
@@ -1,9 +1,9 @@
 <template>
 	<view class="item" @click="$emit('click')">
-		<image :src="item.imageTitle" 
+		<!-- <image :src="item.imageTitle" 
 		@click.stop="previewImage([item.imageTitle])"
-		mode="aspectFill"></image>
-		<view class="text">
+		mode="aspectFill"></image> -->
+		<!-- <view class="text">
 			<view class="title">
 				{{ item.title }}
 			</view>
@@ -26,8 +26,62 @@
 				:phone="item.phone" 
 				title="司机"/>
 			</view>
+		</view> -->
+		<view class="zhaoche">
+
+			<view class="touxinag">
+
+			</view>
+			<view class="chezhaoren">
+				<uv-icon name="car-fill" color="#2979ff" size="50"></uv-icon>
+				车找人 {{item.num}}空位
+			</view>
+			<view class="lianxi">
+				<uv-icon name="phone-fill" color="#fff" size="40"></uv-icon>
+				联系
+
+			</view>
+
+		</view>
+	
+	<view class="address">
+		<view class="shi">
+			始
+		</view>
+		<view class="zhi">
+				{{item.startAddress}}
+			
+		</view>
+	</view>
+	
+	<view class="ads">
+		<view class="zhon">
+			终
+		</view>
+		<view class="zhi">
+		{{item.endAddress}}
+		</view>
+	</view>
+	
+	<view class="time">
+		出发时间：{{item.startTime}}
+	</view>
+	
+	<view class="chexing">
+		车型：suv
+	</view>
+	
+	<view class="chezhuxinxi">
+		<view class="sex">
+			<uv-icon name="man" color="#2979ff" size="28"></uv-icon>
+		</view>
+		<view class="name">
+			{{item.createBy}}
 		</view>
 	</view>
+	
+	</view>
+	
 </template>
 
 <script>
@@ -41,7 +95,7 @@
 			};
 		},
 		methods: {
-			callPhone(){
+			callPhone() {
 				uni.makePhoneCall({
 					phoneNumber: this.item.phone
 				})
@@ -52,57 +106,104 @@
 
 <style lang="scss" scoped>
 	.item {
-		height: 220rpx;
+		height: 330rpx;
 		width: 100%;
 		background-color: #fff;
 		overflow: hidden;
 		border-radius: 10rpx;
 		color: #777;
-		display: flex;
+		// display: flex;
 		font-size: 24rpx;
 		margin: 30rpx 0;
 		position: relative;
 
-		image {
-			width: 50%;
-			height: 100%;
-		}
-
-		.text {
+		.zhaoche {
+			width: 100%;
+			margin: 20rpx 10rpx;
 			display: flex;
-			flex-direction: column;
-			padding: 16rpx;
-			width: 50%;
+			justify-content: space-between;
+			
+
+			.touxinag {
+				height: 70rpx;
+				width: 70rpx;
+				background-color: black;
 
-			.title {
-				font-size: 30rpx;
-				font-weight: 600;
-				color: #000;
 			}
 
-			.createBy {
+			.chezhaoren {
 				display: flex;
-				margin-top: auto;
-				line-height: 40rpx;
-				justify-content: space-between;
+				justify-content: center;
+				align-items: center;
+				margin-right: 230rpx;
+				border: 1rpx solid $uni-color;
+				height: 40rpx;
+				padding: 16rpx;
+				color:$uni-color ;
+			}
 
-				&>view {
-					display: flex;
-					align-items: center;
-					justify-content: center;
-				}
-				.phone{
-					background-color: rgba($uni-color, 0.2);
-					color: $uni-color;
-					padding: 8rpx 16rpx;
-					border-radius: 10rpx;
-					margin-left: auto;
-					image{
-						width: 20rpx;
-						height: 20rpx;
-					}
-				}
+			.lianxi {
+				color: #fff;
+				background-color: $uni-color;
+				height: 70rpx;
+				display: flex;
+				justify-content: center;
+				align-items: center;
+				width: 120rpx;
+				border-radius: 15rpx;
+				margin: 0rpx 20rpx;
+			}
+			
+		}
+		.address{
+			display: flex;
+			margin: 0rpx 10rpx;
+			.shi{
+				margin-right: 10rpx;
+				background-color:$uni-color ;
+				color: white;
+				width: 30rpx;
+				height: 30rpx;
+				padding: 5rpx;
+				border-radius: 50%;
+				text-align: center;
+			}
+			.zhi{
+				margin-top: 5rpx;
+				
 			}
 		}
+		.ads{
+			display: flex;
+			margin: 10rpx 10rpx;
+			.zhon{
+				margin-right: 10rpx;
+				background-color:red;
+				color: white;
+				width: 30rpx;
+				height: 30rpx;
+				padding: 5rpx;
+				border-radius: 50%;
+				text-align: center;
+			}
+		}
+		.time{
+				margin: 10rpx 10rpx;
+		}
+		.chexing{
+			margin: 10rpx 10rpx;
+		}
+		.chezhuxinxi{
+			display: flex;
+			margin: 10rpx 10rpx;
+			.sex{
+				margin-top: 5rpx;
+			}
+			.name{
+				margin-left: 8rpx;
+			}
+		}
+
+
 	}
 </style>
\ No newline at end of file