From c33ec89d44e8b527f43efd8df2cf9a40cf16063c Mon Sep 17 00:00:00 2001
From: huliyong <2783385703@qq.com>
Date: Thu, 31 Oct 2024 15:00:12 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E4=BC=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/api.js                                    |  27 +++-
 components/config/configPopup.vue             |   3 +
 components/list/activity/activityInfo.vue     | 106 ++++++++++++++
 components/list/activity/activityItem.vue     | 203 ++------------------------
 components/list/dynamic/daynamicInfo.vue      |  81 ++++++++++
 components/list/dynamic/dynamicItem.vue       | 201 ++-----------------------
 components/list/dynamic/dynamicItemEdit.vue   | 178 ++--------------------
 components/list/dynamic/userHeadItem.vue      | 134 +++++++++++++++++
 mixins/list.js                                |   5 +-
 pages.json                                    |   2 +-
 pages/index/activity.vue                      |  10 +-
 pages/index/index.vue                         |  10 +-
 pages_order/activity/activityDetail.vue       | 193 ++++++++++++++----------
 pages_order/auth/wxLogin.vue                  |  17 ++-
 pages_order/car/carList.vue                   |  36 ++++-
 pages_order/car/carListDetail.vue             | 150 ++++++++++++++++++-
 pages_order/components/list/cart/cartItem.vue | 109 ++++++++++++++
 pages_order/post/postDetail.vue               | 187 ++----------------------
 pages_order/scenicSpot/scenicSpotList.vue     |   6 -
 static/image/activity/h.png                   | Bin 0 -> 2464 bytes
 static/image/activity/price.png               | Bin 0 -> 2686 bytes
 static/image/activity/user.png                | Bin 0 -> 2784 bytes
 22 files changed, 819 insertions(+), 839 deletions(-)
 create mode 100644 components/list/activity/activityInfo.vue
 create mode 100644 components/list/dynamic/daynamicInfo.vue
 create mode 100644 components/list/dynamic/userHeadItem.vue
 create mode 100644 pages_order/components/list/cart/cartItem.vue
 create mode 100644 static/image/activity/h.png
 create mode 100644 static/image/activity/price.png
 create mode 100644 static/image/activity/user.png

diff --git a/api/api.js b/api/api.js
index c078588..abf5e60 100644
--- a/api/api.js
+++ b/api/api.js
@@ -111,6 +111,11 @@ const config = {
 		url: '/city/getActivityDetail',
 		method: 'GET',
 	},
+	//获取活动详情
+	getActivityDetail: {
+		url: '/city/getActivityDetail',
+		method: 'GET',
+	},
 	//获取门店信息列表（美食）
 	getStorePage: {
 		url: '/city/getStorePage',
@@ -141,7 +146,7 @@ const config = {
 		url: '/city/getScenicDetail',
 		method: 'GET',
 	},
-	//获取评论列表type-0帖子-1租房-2工作-3景点-4美食-5活动
+	//获取评论列表type-0帖子-1租房-2工作-3景点-4美食-5活动-6人找车-7车找人
 	getCommentPage: {
 		url: '/city/getCommentPage',
 		method: 'GET',
@@ -151,6 +156,26 @@ const config = {
 		url: '/city/getJiangHuInfo',
 		method: 'GET',
 	},
+	//获取人找车分页列表
+	getPeoplePage: {
+		url: '/city/getPeoplePage',
+		method: 'GET',
+	},
+	//获取人找车详情
+	getPeopleDetail: {
+		url: '/city/getPeopleDetail',
+		method: 'GET',
+	},
+	//获取车找人分页列表
+	getCatPage: {
+		url: '/city/getCatPage',
+		method: 'GET',
+	},
+	//获取车找人详情
+	getCatDetail: {
+		url: '/city/getCatDetail',
+		method: 'GET',
+	},
 	
 	
 	
diff --git a/components/config/configPopup.vue b/components/config/configPopup.vue
index 4f70dd3..ef2d21c 100644
--- a/components/config/configPopup.vue
+++ b/components/config/configPopup.vue
@@ -40,6 +40,9 @@
 	.configPopup {
 		.content{
 			padding: 30rpx 20rpx;
+			overflow: scroll;
+			height: 100%;
+			box-sizing: border-box;
 		}
 	}
 </style>
\ No newline at end of file
diff --git a/components/list/activity/activityInfo.vue b/components/list/activity/activityInfo.vue
new file mode 100644
index 0000000..3360018
--- /dev/null
+++ b/components/list/activity/activityInfo.vue
@@ -0,0 +1,106 @@
+<template>
+	<view class="grid">
+		<view class="item" style="--color : #5baaff">
+			<!-- <image src="/static/image/activity/h.png" mode=""></image> -->
+			<uv-icon size="40rpx" color="#5baaff" name="tags"></uv-icon>
+
+			<view class="text">
+				{{ item.type }}
+			</view>
+		</view>
+
+		<view class="item" 
+		style="--color : #f56c6c">
+			<!-- <image src="/static/image/activity/price.png" mode=""></image> -->
+			<uv-icon size="40rpx" color="#f56c6c" name="integral"></uv-icon>
+
+			<view class="text"
+			v-if="item.price">
+				{{ item.price }}元/人
+			</view>
+			<view class="text"
+			v-else>
+				免费
+			</view>
+		</view>
+
+		<view class="item" style="--color : #5ac725">
+			<uv-icon size="40rpx" color="#5ac725" name="account"></uv-icon>
+			
+			<view class="text"
+			v-if="item.sum">
+				{{ item.num }}/{{ item.sum }}人
+			</view>
+			
+			<view class="text"
+			v-else>
+				{{ item.num }}/不限
+			</view>
+		</view>
+
+		<view class="addUser" @click.stop="addUser">
+			<uv-icon size="40rpx" color="#5baaff" name="plus-circle"></uv-icon>
+			加入
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		props: {
+			item: {},
+		},
+		data() {
+			return {
+
+			}
+		},
+		methods: {
+			addUser() {
+				uni.makePhoneCall({
+					phoneNumber: this.item.phone,
+				})
+			},
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+	.grid {
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		padding: 20rpx 0;
+
+		image {
+			width: 30rpx;
+			height: 30rpx;
+		}
+
+		.item {
+			display: flex;
+			align-items: center;
+			font-size: 26rpx;
+			color: var(--color);
+
+			.text {
+				margin-left: 4rpx;
+			}
+		}
+
+		.addUser {
+			display: flex;
+			align-items: center;
+			font-size: 26rpx;
+			color: $uni-color;
+			margin-left: 10rpx;
+			background: rgba($uni-color, 0.2);
+			padding: 10rpx 20rpx;
+			border-radius: 20rpx;
+
+			.text {
+				margin-left: 4rpx;
+			}
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/components/list/activity/activityItem.vue b/components/list/activity/activityItem.vue
index 88b1267..11d5f66 100644
--- a/components/list/activity/activityItem.vue
+++ b/components/list/activity/activityItem.vue
@@ -1,70 +1,12 @@
 <template>
 	<view class="works" @click="$emit('click')">
-		<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>
-			<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="Times">
-					<view class="TimeMonth">
-						<!-- 10-08 -->
-						{{ item.createTime }}发布
-					</view>
-					<!-- <view class="Month">
-						12:34
-					</view> -->
-				</view>
-
-			</view>
-		</view>
 		
-		<view class="dynamics" v-html="$utils.stringFormatHtml(item.title)">
-		</view>
+		<userHeadItem :item="item"/>
 		
-		<view class="address"
-		v-if="item.address">
-			<uv-icon size="30rpx" name="map"></uv-icon>
-			<view class="text-ellipsis">
-				{{ item.address }}
-			</view>
-		</view>
+		<activityInfo :item="item"/>
+		
+		<daynamicInfo :item="item"/>
 		
-		<view class="Artworkimages">
-			<view class="wrokimg" 
-			@click.stop="previewImage(images, i)"
-			:key="i" v-for="(img, i) in images">
-				<image :src="img" mode="aspectFill"></image>
-			</view>
-		</view>
 		<view class="bottom">
 			<view class="browse">
 				{{ item.isBrowse }}浏览
@@ -84,8 +26,16 @@
 
 <script>
 	import mixinsSex from '@/mixins/sex.js'
+	import userHeadItem from '@/components/list/dynamic/userHeadItem.vue'
+	import daynamicInfo from '@/components/list/dynamic/daynamicInfo.vue'
+	import activityInfo from '@/components/list/activity/activityInfo.vue'
 	export default {
 		mixins: [mixinsSex],
+		components : {
+			userHeadItem,
+			daynamicInfo,
+			activityInfo,
+		},
 		props: {
 			item: {},
 		},
@@ -93,24 +43,10 @@
 			return {
 			}
 		},
-		computed : {
-			images(){
-				if(!this.item.image){
-					return []
-				}
-				return this.item.image.split(',')
-			}
-		},
 		methods: {
 			callPhone(){
 				uni.makePhoneCall({
 					phoneNumber: this.item.phone,
-					success() {
-						console.log('安卓拨打成功');
-					},
-					fail() {
-						console.log('安卓拨打失败');
-					}
 				})
 			},
 		},
@@ -125,121 +61,6 @@
 		border-radius: 20rpx;
 		box-shadow: 0 0 6rpx 6rpx #00000011;
 
-		.box {
-			display: flex;
-			align-items: center;
-
-			.headPortraitimg {
-				width: 100rpx;
-				height: 100rpx;
-				border-radius: 15rpx;
-				overflow: hidden;
-				image{
-					width: 100%;
-					height: 100%;
-				}
-			}
-
-			.YaoduUniversalWall {
-				padding: 0rpx 10rpx;
-
-				.username {
-					max-width: 200rpx;
-				}
-
-				.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;
-					}
-				}
-
-			}
-		}
-
-		.personalInformation {
-			display: flex;
-
-			.inde {
-				font-size: 25rpx;
-				padding: 0rpx 8rpx;
-			}
-
-			.authentication {
-				font-size: 25rpx;
-			}
-		}
-
-		.dynamics {
-			margin-top: 20rpx;
-			font-size: 28rpx;
-			// font-weight: bold;
-			// line-height: 35rpx;
-			letter-spacing: 3rpx;
-		}
-		
-		.address{
-			font-size: 24rpx;
-			margin-top: 20rpx;
-			display: flex;
-			align-items: center;
-		}
-
-		.Artworkimages {
-			display: flex;
-			flex-wrap: wrap;
-
-			.wrokimg {
-				margin: 10rpx;
-
-				image {
-					height: 190rpx;
-					width: 190rpx;
-					border-radius: 20rpx;
-				}
-			}
-		}
-
 		.bottom {
 			display: flex;
 			margin-top: 20rpx;
diff --git a/components/list/dynamic/daynamicInfo.vue b/components/list/dynamic/daynamicInfo.vue
new file mode 100644
index 0000000..d2f100a
--- /dev/null
+++ b/components/list/dynamic/daynamicInfo.vue
@@ -0,0 +1,81 @@
+<template>
+	<view>
+		<view class="dynamics" v-html="$utils.stringFormatHtml(item.title)">
+		</view>
+
+		<view class="address" 
+		@click.stop="openLocation(item.latitude, item.longitude)"
+		v-if="item.address">
+			<uv-icon size="30rpx" name="map"></uv-icon>
+			<view class="text-ellipsis">
+				{{ item.address }}
+			</view>
+		</view>
+
+		<view class="Artworkimages">
+			<view class="wrokimg" @click.stop="previewImage(images, i)" :key="i" v-for="(img, i) in images">
+				<image :src="img" mode="aspectFill"></image>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		props: {
+			item: {},
+		},
+		computed : {
+			images(){
+				if(!this.item.image){
+					return []
+				}
+				return this.item.image.split(',')
+			}
+		},
+		data() {
+			return {
+
+			}
+		},
+		methods: {
+
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+
+	.dynamics {
+		margin-top: 20rpx;
+		font-size: 28rpx;
+		letter-spacing: 3rpx;
+	}
+
+	.address {
+		font-size: 24rpx;
+		margin: 20rpx 0;
+		display: flex;
+		align-items: center;
+		background-color: #eee;
+		padding: 10rpx 20rpx;
+		width: fit-content;
+		border-radius: 40rpx;
+		max-width: calc(100% - 40rpx);
+	}
+
+	.Artworkimages {
+		display: flex;
+		flex-wrap: wrap;
+
+		.wrokimg {
+			margin: 10rpx;
+
+			image {
+				height: 190rpx;
+				width: 190rpx;
+				border-radius: 20rpx;
+			}
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/components/list/dynamic/dynamicItem.vue b/components/list/dynamic/dynamicItem.vue
index 88b1267..615f7be 100644
--- a/components/list/dynamic/dynamicItem.vue
+++ b/components/list/dynamic/dynamicItem.vue
@@ -1,70 +1,10 @@
 <template>
 	<view class="works" @click="$emit('click')">
-		<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>
-			<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="Times">
-					<view class="TimeMonth">
-						<!-- 10-08 -->
-						{{ item.createTime }}发布
-					</view>
-					<!-- <view class="Month">
-						12:34
-					</view> -->
-				</view>
-
-			</view>
-		</view>
 		
-		<view class="dynamics" v-html="$utils.stringFormatHtml(item.title)">
-		</view>
+		<userHeadItem :item="item"/>
 		
-		<view class="address"
-		v-if="item.address">
-			<uv-icon size="30rpx" name="map"></uv-icon>
-			<view class="text-ellipsis">
-				{{ item.address }}
-			</view>
-		</view>
+		<daynamicInfo :item="item"/>
 		
-		<view class="Artworkimages">
-			<view class="wrokimg" 
-			@click.stop="previewImage(images, i)"
-			:key="i" v-for="(img, i) in images">
-				<image :src="img" mode="aspectFill"></image>
-			</view>
-		</view>
 		<view class="bottom">
 			<view class="browse">
 				{{ item.isBrowse }}浏览
@@ -84,8 +24,14 @@
 
 <script>
 	import mixinsSex from '@/mixins/sex.js'
+	import userHeadItem from '@/components/list/dynamic/userHeadItem.vue'
+	import daynamicInfo from '@/components/list/dynamic/daynamicInfo.vue'
 	export default {
 		mixins: [mixinsSex],
+		components : {
+			userHeadItem,
+			daynamicInfo,
+		},
 		props: {
 			item: {},
 		},
@@ -93,24 +39,10 @@
 			return {
 			}
 		},
-		computed : {
-			images(){
-				if(!this.item.image){
-					return []
-				}
-				return this.item.image.split(',')
-			}
-		},
 		methods: {
 			callPhone(){
 				uni.makePhoneCall({
-					phoneNumber: this.item.phone,
-					success() {
-						console.log('安卓拨打成功');
-					},
-					fail() {
-						console.log('安卓拨打失败');
-					}
+					phoneNumber: this.item.phone
 				})
 			},
 		},
@@ -125,121 +57,6 @@
 		border-radius: 20rpx;
 		box-shadow: 0 0 6rpx 6rpx #00000011;
 
-		.box {
-			display: flex;
-			align-items: center;
-
-			.headPortraitimg {
-				width: 100rpx;
-				height: 100rpx;
-				border-radius: 15rpx;
-				overflow: hidden;
-				image{
-					width: 100%;
-					height: 100%;
-				}
-			}
-
-			.YaoduUniversalWall {
-				padding: 0rpx 10rpx;
-
-				.username {
-					max-width: 200rpx;
-				}
-
-				.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;
-					}
-				}
-
-			}
-		}
-
-		.personalInformation {
-			display: flex;
-
-			.inde {
-				font-size: 25rpx;
-				padding: 0rpx 8rpx;
-			}
-
-			.authentication {
-				font-size: 25rpx;
-			}
-		}
-
-		.dynamics {
-			margin-top: 20rpx;
-			font-size: 28rpx;
-			// font-weight: bold;
-			// line-height: 35rpx;
-			letter-spacing: 3rpx;
-		}
-		
-		.address{
-			font-size: 24rpx;
-			margin-top: 20rpx;
-			display: flex;
-			align-items: center;
-		}
-
-		.Artworkimages {
-			display: flex;
-			flex-wrap: wrap;
-
-			.wrokimg {
-				margin: 10rpx;
-
-				image {
-					height: 190rpx;
-					width: 190rpx;
-					border-radius: 20rpx;
-				}
-			}
-		}
-
 		.bottom {
 			display: flex;
 			margin-top: 20rpx;
diff --git a/components/list/dynamic/dynamicItemEdit.vue b/components/list/dynamic/dynamicItemEdit.vue
index 81bb75a..ac5c340 100644
--- a/components/list/dynamic/dynamicItemEdit.vue
+++ b/components/list/dynamic/dynamicItemEdit.vue
@@ -1,57 +1,9 @@
 <template>
 	<view class="works" @click="$emit('click')">
-		<view class="box"
-		:style="{'--sexcolor' : sex[item.sex].color}">
-			<view class="headPortraitimg">
-				<image :src="item.userImage" mode="aspectFill"></image>
-			</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="authentication"
-					v-if="item.isContent">
-						<!-- 个人认证 -->
-						{{ item.isContent }}
-					</view>
-				</view>
-
-				<view class="Times">
-					<view class="TimeMonth">
-						<!-- 10-08 -->
-						{{ item.createTime }}发布
-					</view>
-					<!-- <view class="Month">
-						12:34
-					</view> -->
-				</view>
-			</view>
-		</view>
-		<view class="dynamics" v-html="$utils.stringFormatHtml(item.title)">
-		</view>
-		<view class="Artworkimages">
-			<view class="wrokimg" 
-			@click.stop="previewImage(images, i)"
-			:key="i" v-for="(img, i) in images">
-				<image :src="img" mode="aspectFill"></image>
-			</view>
-		</view>
+		
+		<userHeadItem :item="item"/>
+		<daynamicInfo :item="item"/>
+		
 		<view class="bottom">
 			<view class="Leavingamessage"
 			@click.stop="$emit('del')">
@@ -63,8 +15,14 @@
 
 <script>
 	import mixinsSex from '@/mixins/sex.js'
+	import userHeadItem from '@/components/list/dynamic/userHeadItem.vue'
+	import daynamicInfo from '@/components/list/dynamic/daynamicInfo.vue'
 	export default {
 		mixins: [mixinsSex],
+		components : {
+			userHeadItem,
+			daynamicInfo,
+		},
 		props: {
 			item: {},
 		},
@@ -73,14 +31,6 @@
 
 			}
 		},
-		computed : {
-			images(){
-				if(!this.item.image){
-					return []
-				}
-				return this.item.image.split(',')
-			}
-		},
 		methods: {
 		},
 	}
@@ -94,114 +44,6 @@
 		border-radius: 20rpx;
 		box-shadow: 0 0 6rpx 6rpx #00000011;
 
-		.box {
-			display: flex;
-			align-items: center;
-
-			.headPortraitimg {
-				width: 100rpx;
-				height: 100rpx;
-				border-radius: 15rpx;
-				overflow: hidden;
-				image{
-					width: 100%;
-					height: 100%;
-				}
-			}
-
-			.YaoduUniversalWall {
-				padding: 0rpx 10rpx;
-
-				.username {
-					max-width: 200rpx;
-				}
-
-				.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;
-					}
-				}
-
-			}
-		}
-
-		.personalInformation {
-			display: flex;
-
-			.inde {
-				font-size: 25rpx;
-				padding: 0rpx 8rpx;
-			}
-
-			.authentication {
-				font-size: 25rpx;
-			}
-		}
-
-		.dynamics {
-			margin-top: 20rpx;
-			font-size: 28rpx;
-			// font-weight: bold;
-			// line-height: 35rpx;
-			letter-spacing: 3rpx;
-		}
-
-		.Artworkimages {
-			display: flex;
-			flex-wrap: wrap;
-
-			.wrokimg {
-				margin: 10rpx;
-
-				image {
-					height: 190rpx;
-					width: 190rpx;
-					border-radius: 20rpx;
-				}
-			}
-		}
-
 		.bottom {
 			display: flex;
 			margin-top: 20rpx;
diff --git a/components/list/dynamic/userHeadItem.vue b/components/list/dynamic/userHeadItem.vue
new file mode 100644
index 0000000..0d8362d
--- /dev/null
+++ b/components/list/dynamic/userHeadItem.vue
@@ -0,0 +1,134 @@
+<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>
+		<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="Times">
+				<view class="TimeMonth">
+					<!-- 10-08 -->
+					{{ item.createTime }}发布
+				</view>
+				<!-- <view class="Month">
+					12:34
+				</view> -->
+			</view>
+
+		</view>
+	</view>
+</template>
+
+<script>
+	import mixinsSex from '@/mixins/sex.js'
+	export default {
+		mixins: [mixinsSex],
+		props: {
+			item: {},
+		},
+		data() {
+			return {
+
+			}
+		},
+		methods: {
+
+		}
+	}
+</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%;
+			}
+		}
+
+		.YaoduUniversalWall {
+			padding: 0rpx 10rpx;
+
+			.username {
+				max-width: 200rpx;
+			}
+
+			.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/mixins/list.js b/mixins/list.js
index 4f072f9..d01a425 100644
--- a/mixins/list.js
+++ b/mixins/list.js
@@ -26,6 +26,7 @@ export default {
 			},
 			total : 0,
 			list : [],
+			onShowData : true,
 		}
 	},
 	onPullDownRefresh() {
@@ -35,7 +36,9 @@ export default {
 		this.loadMoreData()
 	},
 	onShow() {
-		this.getData()
+		if(this.onShowData){
+			this.getData()
+		}
 	},
 	methods: {
 		getData(queryParams){
diff --git a/pages.json b/pages.json
index afc7377..5e99899 100644
--- a/pages.json
+++ b/pages.json
@@ -8,7 +8,7 @@
 		{
 			"path": "pages/index/activity",
 			"style": {
-				"navigationBarTitleText": ""
+				"enablePullDownRefresh" : true
 			}
 		},
 		{
diff --git a/pages/index/activity.vue b/pages/index/activity.vue
index 3695b72..704221b 100644
--- a/pages/index/activity.vue
+++ b/pages/index/activity.vue
@@ -4,13 +4,13 @@
 		<navbar title="活动"/>
 		
 		<view class="activityList">
-			<activityList :list="list"/>
-			<!-- <dynamicItem
+			<!-- <activityList :list="list"/> -->
+			<activityItem
 			:key="index"
 			v-for="(item, index) in list"
 			:item="item"
-			@click="$utils.navigateTo('/pages_order/post/postDetail?id=' + item.id)"
-			/> -->
+			@click="$utils.navigateTo('/pages_order/activity/activityDetail?id=' + item.id)"
+			/>
 		</view>
 		
 		<tabber select="1" />
@@ -43,7 +43,7 @@
 <style scoped lang="scss">
 .page{
 	.activityList{
-		padding: 0 20rpx;
+		// padding: 0 20rpx;
 	}
 }
 </style>
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 0bedf44..71b9a75 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -157,12 +157,18 @@
 				menu : [],
 				mixinsListApi : 'getPostPage',
 				bannerList : [],
+				onShowData : false,
 			}
 		},
 		onLoad(query) {
 			if(query.shareId){
 				uni.setStorageSync('shareId', query.shareId)
 			}
+			this.getData()
+			this.getIndexHeaderInfo()
+			this.getClassifyList()
+			this.getBannerList()
+			this.$store.commit('getCategory')
 		},
 		onShareAppMessage(res) {
 			return {
@@ -171,10 +177,6 @@
 			}
 		},
 		onShow() {
-			this.getIndexHeaderInfo()
-			this.getClassifyList()
-			this.getBannerList()
-			this.$store.commit('getCategory')
 			this.getUserInfo()
 		},
 		onPullDownRefresh() {
diff --git a/pages_order/activity/activityDetail.vue b/pages_order/activity/activityDetail.vue
index 0a2af45..77e7427 100644
--- a/pages_order/activity/activityDetail.vue
+++ b/pages_order/activity/activityDetail.vue
@@ -2,59 +2,74 @@
 	<view class="postDetail">
 		<navbar leftClick @leftClick="$utils.navigateBack" title="详情" />
 
-		<view class="swipe">
-			<uv-swiper :list="item.image &&
-			item.image.split(',')" indicator height="420rpx"></uv-swiper>
-		</view>
-
-		<view class="box">
-
-			<view class="title">
-				{{ item.title }}
-			</view>
-
-			<view class="createBy">
-				<view class="">
-					发布人：{{ item.userName }}
+		<view class="works">
+			
+			<userHeadItem :item="detail"/>
+			
+			<!-- 活动 -->
+			<activityInfo :item="item"/>
+			
+			<daynamicInfo :item="detail"/>
+			
+			<view class="bottom">
+				<view class="browse">
+					{{ detail.isBrowse }}浏览
 				</view>
-				<view class="">
-					发布时间：{{ $dayjs(item.createTime).format('YYYY-MM-DD') }}
+				<view class="browse">
+					{{ detail.isComment }}条评论
+				</view>
+				
+				<!-- <view class="Leavingamessage"
+				@click="openLocation(detail.latitude, detail.longitude)"
+				v-if="detail.latitude && detail.longitude">
+					<uv-icon size="40rpx" name="map"></uv-icon>
+					导航
+				</view> -->
+				
+				<view class="phone"
+				v-if="detail.phone"
+				@click.stop="callPhone">
+					<image src="/static/image/home/phone.png" mode=""></image>
+					联系{{ ta[detail.sex] }}
 				</view>
 			</view>
-
-
-			<view class="content">
-				<uv-parse :content="item.content"></uv-parse>
-			</view>
-			
-			<!-- <view class="controls">
-				<contentControls
-				:type="2"
-				:up="isThumbs_up"
-				:down="isThumbs_down"
-				@loadData="getData"
-				:detail="item"/>
-			</view> -->
-
-
 		</view>
 
+	
+		<commentList 
+		@getData="getData"
+		:list="list"
+		:params="params"
+		/>
+
+		
 	</view>
 </template>
 
 <script>
-	// import contentControls from '@/components/content/contentControls.vue'
+	import mixinsSex from '@/mixins/sex.js'
+	import mixinsList from '@/mixins/list.js'
+	import commentList from '../components/list/comment/commentList.vue'
+	import userHeadItem from '@/components/list/dynamic/userHeadItem.vue'
+	import daynamicInfo from '@/components/list/dynamic/daynamicInfo.vue'
+	import activityInfo from '@/components/list/activity/activityInfo.vue'
 	export default {
+		mixins: [mixinsSex, mixinsList],
 		components: {
-			// contentControls
+			commentList,
+			userHeadItem,
+			daynamicInfo,
+			activityInfo,
 		},
 		data() {
 			return {
-				list: [
-				],
-				item: {},
-				isThumbs_up: undefined,//是否点赞
-				isThumbs_down: undefined,//是否踩
+				detail: {},
+				mixinsListApi : 'getCommentPage',
+				params : {
+					type : '5',
+					orderId : '',
+					name : '',
+				},
 				id : 0,
 			}
 		},
@@ -62,29 +77,52 @@
 			// this.$route.query的参数
 			console.log(options)
 			this.id = options.id
-		},
-		onPullDownRefresh(){
-			this.getData()
-		},
-		onShow() {
-			this.getData()
+			this.queryParams.type = this.params.type
+			this.queryParams.orderId = options.id
+			
+			this.params.orderId = options.id
 		},
 		onShareAppMessage(res) {
 			return {
 				title: this.detail.title,
-				path: '/pages_order/activity/activityDetail?id=' + this.id
+				path: '/pages_order/post/postDetail?id=' + this.id
 			}
 		},
+		onPullDownRefresh() {
+			this.getDetail()
+		},
+		onShow() {
+			this.getDetail()
+		},
+		onShareAppMessage(res) {
+			// return {
+			//   title: this.item.title,
+			//   desc: this.item.content && this.item.content.slice(0, 30),
+			//   path: '/pages/publish/postDetail?id=' + this.id
+			// }
+		},
 		methods: {
-			getData() {
+			getDetail() {
 				this.$api('getActivityDetail', {
-					id : this.id
+					id: this.id
 				}, res => {
 					uni.stopPullDownRefresh()
 					if (res.code == 200) {
-						this.item = res.result
-						// this.isThumbs_up = res.result.isThumbs_up//是否点赞
-						// this.isThumbs_down = res.result.isThumbs_down//是否踩
+						
+						this.params.name = res.result.userName
+
+						this.detail = res.result
+					}
+				})
+			},
+			callPhone(){
+				uni.makePhoneCall({
+					phoneNumber: this.detail.phone,
+					success() {
+						console.log('安卓拨打成功');
+					},
+					fail() {
+						console.log('安卓拨打失败');
 					}
 				})
 			},
@@ -94,40 +132,41 @@
 
 <style lang="scss" scoped>
 	.postDetail {
-		.box {
-			padding: 20rpx;
-			width: 100vw;
-
-			.title {
-				font-size: 34rpx;
-				font-weight: 600;
-				color: #000;
-			}
+		padding-bottom: env(safe-area-inset-bottom);
+		.works {
+			background-color: #fff;
+			padding: 40rpx;
+			border-radius: 20rpx;
 
-			.createBy {
+			.bottom {
 				display: flex;
-				margin-top: auto;
-				margin-bottom: 10rpx;
-				font-size: 24rpx;
 				margin-top: 20rpx;
-				color: #555;
+				font-size: 24rpx;
 
-				&>view {
+				.browse {
+					margin: 0rpx 30rpx;
+					color: rgb(132, 132, 132);
+				}
+
+				.Leavingamessage {
+					margin-left: auto;
 					display: flex;
 					align-items: center;
-					justify-content: center;
-					padding-right: 20rpx;
 				}
-			}
-
-			.controls {
-				margin-top: 30rpx;
-			}
-
-			.content {
-				margin-top: 30rpx;
-				font-size: 28rpx;
+				
+				.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;
+					}
+				}
 			}
 		}
+		
 	}
 </style>
\ No newline at end of file
diff --git a/pages_order/auth/wxLogin.vue b/pages_order/auth/wxLogin.vue
index 930f806..df845c2 100644
--- a/pages_order/auth/wxLogin.vue
+++ b/pages_order/auth/wxLogin.vue
@@ -16,9 +16,10 @@
 				微信授权登录
 			</view>
 		</view>
-		<!-- <view class="btn b2">
-			使用短信验证登录
-		</view> -->
+		<view class="btn b2"
+		@click="qux">
+			取消登录
+		</view>
 		
 		
 		
@@ -60,7 +61,6 @@
 			}
 		},
 		methods: {
-			
 			wxLogin(){
 				if(!this.checkboxValue.length){
 					return uni.showToast({
@@ -70,12 +70,15 @@
 				}
 				this.$store.commit('login')
 			},
-			
 			//打开应用配置
 			openConfigDetail(key){
 				this.$refs.popup.open(key)
-			}
-			
+			},
+			qux(){
+				uni.reLaunch({
+					url: '/pages/index/index'
+				})
+			},
 		}
 	}
 </script>
diff --git a/pages_order/car/carList.vue b/pages_order/car/carList.vue
index 559c702..4f668a2 100644
--- a/pages_order/car/carList.vue
+++ b/pages_order/car/carList.vue
@@ -1,22 +1,52 @@
 <template>
 	<view class="page pageList">
+		<navbar title="找车" leftClick @leftClick="$utils.navigateBack" />
+		
+		<view
+		style="padding: 10rpx 30rpx;">
+			<uv-search
+			bgColor="#fff"
+			@search="getData"
+			@custom="getData"
+			searchIconSize="30rpx"
+			placeholder="请输入搜索关键字..." 
+			v-model="queryParams.title"></uv-search>
+		</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>
 
 <script>
+	import mixinsList from '@/mixins/list.js'
+	import cartItem from '../components/list/cart/cartItem.vue'
 	export default {
+		mixins: [mixinsList],
+		components : {
+			cartItem,
+		},
 		data() {
 			return {
-				
+				mixinsListApi : 'getCatPage',
 			}
 		},
 		methods: {
-			
 		}
 	}
 </script>
 
 <style scoped lang="scss">
-
+.page{
+	.list{
+		padding: 0 20rpx;
+	}
+}
 </style>
diff --git a/pages_order/car/carListDetail.vue b/pages_order/car/carListDetail.vue
index 559c702..e0974a2 100644
--- a/pages_order/car/carListDetail.vue
+++ b/pages_order/car/carListDetail.vue
@@ -1,22 +1,162 @@
 <template>
-	<view class="page pageList">
+	<view class="postDetail">
+		<navbar leftClick @leftClick="$utils.navigateBack" title="详情" />
+
+		<view class="swipe">
+			<uv-swiper 
+			:list="[detail.imageTitle]" 
+			indicator
+			height="420rpx"></uv-swiper>
+		</view>
+
+		<view class="box">
+			
+			<view class="title">
+				{{ detail.title }}
+			</view>
+
+			<view class="createBy">
+				{{ detail.num }}余座
+				{{ detail.startTime }}出发
+			</view>
+			<view class="createBy">
+				{{ detail.startAddress }}
+				到
+				{{ detail.endAddress }}
+			</view>
+			<view class="createBy">
+				<view class="">
+					{{ $dayjs(detail.createTime).format('YYYY-MM-DD') }}
+				</view>
+				
+				<view class="phone"
+				v-if="detail.phone"
+				@click.stop="callPhone">
+					<image src="/static/image/home/phone.png" mode=""></image>
+					联系司机
+				</view>
+			</view>
+			
+		</view>
 		
+		<commentList
+		@getData="getData"
+		:list="list"
+		:params="params"
+		/>
+
 	</view>
 </template>
 
 <script>
+	import mixinsList from '@/mixins/list.js'
+	import commentList from '../components/list/comment/commentList.vue'
 	export default {
+		mixins: [mixinsList],
+		components: {
+			commentList
+		},
 		data() {
 			return {
-				
+				detail: {},
+				mixinsListApi : 'getCommentPage',
+				params : {
+					type : '7',
+					orderId : '',
+					name : '',
+				},
+				id : 0,
 			}
 		},
-		methods: {
+		onLoad(options) {
+			// this.$route.query的参数
+			console.log(options)
+			this.id = options.id
+			
+			
+			this.queryParams.type = this.params.type
+			this.queryParams.orderId = options.id
 			
+			this.params.orderId = options.id
+		},
+		onPullDownRefresh(){
+			this.getDetail()
+		},
+		onShow() {
+			this.getDetail()
+		},
+		onShareAppMessage(res) {
+			return {
+				title: this.detail.title,
+				path: '/pages_order/scenicSpot/scenicSpotDetail?id=' + this.id
+			}
+		},
+		methods: {
+			getDetail() {
+				this.$api('getCatDetail', {
+					id : this.id
+				}, res => {
+					uni.stopPullDownRefresh()
+					if (res.code == 200) {
+						this.params.title = res.result.title
+						
+						this.detail = res.result
+						
+					}
+				})
+			},
 		}
 	}
 </script>
 
-<style scoped lang="scss">
+<style lang="scss" scoped>
+	.postDetail {
+		.box {
+			padding: 20rpx;
+			width: 100vw;
+			background-color: #fff;
+			box-sizing: border-box;
+			.title {
+				font-size: 34rpx;
+				font-weight: 600;
+				color: #000;
+			}
+
+			.createBy {
+				display: flex;
+				margin-top: auto;
+				margin-bottom: 10rpx;
+				font-size: 24rpx;
+				margin-top: 20rpx;
+				color: #555;
+
+				&>view {
+					display: flex;
+					align-items: center;
+					justify-content: center;
+					padding-right: 20rpx;
+				}
+			}
 
-</style>
+			.controls {
+				margin-top: 30rpx;
+			}
+
+			.content {
+				margin-top: 30rpx;
+				font-size: 28rpx;
+			}
+		}
+	}
+	.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;
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/pages_order/components/list/cart/cartItem.vue b/pages_order/components/list/cart/cartItem.vue
new file mode 100644
index 0000000..3c16ed0
--- /dev/null
+++ b/pages_order/components/list/cart/cartItem.vue
@@ -0,0 +1,109 @@
+<template>
+	<view class="item" @click="$emit('click')">
+		<image :src="item.imageTitle" 
+		@click.stop="previewImage([item.imageTitle])"
+		mode="aspectFill"></image>
+		<view class="text">
+			<view class="title">
+				{{ item.title }}
+			</view>
+			<view class="createBy">
+				{{ item.num }}余座
+				{{ item.startTime }}出发
+			</view>
+			<view class="createBy">
+				{{ item.startAddress }}
+				到
+				{{ item.endAddress }}
+			</view>
+			<view class="createBy">
+				<view class="">
+					{{ $dayjs(item.createTime).format('YYYY-MM-DD') }}
+				</view>
+				
+				<view class="phone"
+				v-if="item.phone"
+				@click.stop="callPhone">
+					<image src="/static/image/home/phone.png" mode=""></image>
+					联系司机
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import mixinsSex from '@/mixins/sex.js'
+	export default {
+		mixins: [mixinsSex],
+		props: ['item'],
+		data() {
+			return {
+
+			};
+		},
+		methods: {
+			callPhone(){
+				uni.makePhoneCall({
+					phoneNumber: this.item.phone
+				})
+			},
+		},
+	}
+</script>
+
+<style lang="scss" scoped>
+	.item {
+		height: 220rpx;
+		width: 100%;
+		background-color: #fff;
+		overflow: hidden;
+		border-radius: 10rpx;
+		color: #777;
+		display: flex;
+		font-size: 24rpx;
+		margin: 30rpx 0;
+
+		image {
+			width: 50%;
+			height: 100%;
+		}
+
+		.text {
+			display: flex;
+			flex-direction: column;
+			padding: 16rpx;
+			width: 50%;
+
+			.title {
+				font-size: 30rpx;
+				font-weight: 600;
+				color: #000;
+			}
+
+			.createBy {
+				display: flex;
+				margin-top: auto;
+				line-height: 40rpx;
+				justify-content: space-between;
+
+				&>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;
+					}
+				}
+			}
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/pages_order/post/postDetail.vue b/pages_order/post/postDetail.vue
index aaac5bd..25b24e5 100644
--- a/pages_order/post/postDetail.vue
+++ b/pages_order/post/postDetail.vue
@@ -2,65 +2,12 @@
 	<view class="postDetail">
 		<navbar leftClick @leftClick="$utils.navigateBack" title="详情" />
 
-		<view class="works" @click="$emit('click')">
-			<view class="box" :style="{'--sexcolor' : sex[detail.sex].color}">
-				<view class="headPortraitimg">
-					<image :src="detail.userImage"
-					@click.stop="previewImage([item.userImage])"
-					mode="aspectFill"></image>
-				</view>
-				<view class="YaoduUniversalWall">
-					<view class="heide">
-						<view class="username text-ellipsis">
-							{{ detail.userName }}
-						</view>
-						<view class="inde" v-if="detail.sex">
-							<!-- 性别 -->
-							{{ detail.sex }}
-						</view>
-						<view class="inde" v-if="detail.yearDate">
-							<!-- 年份 -->
-							{{ detail.yearDate }}
-						</view>
-						<view class="inde" v-if="detail.addId">
-							<!-- 地址 -->
-							{{ detail.addId }}
-						</view>
-						<view class="authentication" v-if="detail.isContent">
-							<!-- 个人认证 -->
-							{{ detail.isContent }}
-						</view>
-					</view>
-
-					<view class="Times">
-						<view class="TimeMonth">
-							<!-- 10-08 -->
-							{{ detail.createTime }}发布
-						</view>
-						<!-- <view class="Month">
-							12:34
-						</view> -->
-					</view>
-				</view>
-			</view>
-			<view class="dynamics" v-html="$utils.stringFormatHtml(detail.title)">
-			</view>
+		<view class="works">
 			
-			<view class="address"
-			@click="openLocation(detail.latitude, detail.longitude)"
-			v-if="detail.address">
-				<uv-icon size="30rpx" name="map"></uv-icon>
-				<view class="text-ellipsis">
-					{{ detail.address }}
-				</view>
-			</view>
+			<userHeadItem :item="detail"/>
+			
+			<daynamicInfo :item="detail"/>
 			
-			<view class="Artworkimages">
-				<view class="wrokimg" @click.stop="previewImage(detail.image, i)" :key="i"
-					v-for="(img, i) in detail.image">
-					<image :src="img" mode="aspectFill"></image>
-				</view>
-			</view>
 			<view class="bottom">
 				<view class="browse">
 					{{ detail.isBrowse }}浏览
@@ -100,10 +47,14 @@
 	import mixinsSex from '@/mixins/sex.js'
 	import mixinsList from '@/mixins/list.js'
 	import commentList from '../components/list/comment/commentList.vue'
+	import userHeadItem from '@/components/list/dynamic/userHeadItem.vue'
+	import daynamicInfo from '@/components/list/dynamic/daynamicInfo.vue'
 	export default {
 		mixins: [mixinsSex, mixinsList],
 		components: {
-			commentList
+			commentList,
+			userHeadItem,
+			daynamicInfo,
 		},
 		data() {
 			return {
@@ -154,10 +105,6 @@
 					if (res.code == 200) {
 						
 						this.params.name = res.result.userName
-						
-						res.result.image =
-						res.result.image ?
-						res.result.image.split(',') : [],
 
 						this.detail = res.result
 					}
@@ -186,122 +133,6 @@
 			padding: 40rpx;
 			border-radius: 20rpx;
 
-			.box {
-				display: flex;
-				align-items: center;
-
-				.headPortraitimg {
-					width: 100rpx;
-					height: 100rpx;
-					border-radius: 15rpx;
-					overflow: hidden;
-
-					image {
-						width: 100%;
-						height: 100%;
-					}
-				}
-
-				.YaoduUniversalWall {
-					padding: 0rpx 10rpx;
-
-					.username {
-						max-width: 200rpx;
-					}
-
-					.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;
-						}
-					}
-
-				}
-			}
-
-			.personalInformation {
-				display: flex;
-
-				.inde {
-					font-size: 25rpx;
-					padding: 0rpx 8rpx;
-				}
-
-				.authentication {
-					font-size: 25rpx;
-				}
-			}
-
-			.dynamics {
-				margin-top: 20rpx;
-				font-size: 28rpx;
-				// font-weight: bold;
-				// line-height: 35rpx;
-				letter-spacing: 3rpx;
-			}
-			
-			.address{
-				font-size: 24rpx;
-				margin-top: 20rpx;
-				display: flex;
-				align-items: center;
-			}
-
-			.Artworkimages {
-				display: flex;
-				flex-wrap: wrap;
-
-				.wrokimg {
-					margin: 10rpx;
-
-					image {
-						height: 190rpx;
-						width: 190rpx;
-						border-radius: 20rpx;
-					}
-				}
-			}
-
 			.bottom {
 				display: flex;
 				margin-top: 20rpx;
diff --git a/pages_order/scenicSpot/scenicSpotList.vue b/pages_order/scenicSpot/scenicSpotList.vue
index f1dfd39..ec15ddc 100644
--- a/pages_order/scenicSpot/scenicSpotList.vue
+++ b/pages_order/scenicSpot/scenicSpotList.vue
@@ -39,12 +39,6 @@
 			}
 		},
 		methods: {
-			getDataThen(list){
-				// list.forEach(n => {
-				// 	n.detailsImage = n.detailsImage ? n.detailsImage.split(',') : []
-				// 	n.details = n.details ? n.details.split(',') : []
-				// })
-			},
 		}
 	}
 </script>
diff --git a/static/image/activity/h.png b/static/image/activity/h.png
new file mode 100644
index 0000000000000000000000000000000000000000..419c1388da67c893bb5facffbac643134f3c39da
GIT binary patch
literal 2464
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

literal 0
HcmV?d00001

diff --git a/static/image/activity/price.png b/static/image/activity/price.png
new file mode 100644
index 0000000000000000000000000000000000000000..5e3dda23fa453b05c03761e35f45877d0fd863f5
GIT binary patch
literal 2686
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

literal 0
HcmV?d00001

diff --git a/static/image/activity/user.png b/static/image/activity/user.png
new file mode 100644
index 0000000000000000000000000000000000000000..dc355ff47318297b4399e735d3f2f525d0094904
GIT binary patch
literal 2784
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

literal 0
HcmV?d00001