From 6fd74bf0a0e3c97a6aa4c5e5f58ab8a42dd6379f Mon Sep 17 00:00:00 2001
From: Bobi <2166145077@qq.com>
Date: Wed, 13 Nov 2024 15:28:38 +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

---
 App.vue                                            | 15 +++--
 components/list/activity/activityItem.vue          | 11 ++++
 components/list/dynamic/dynamicItem.vue            | 31 ++++++----
 components/list/dynamic/userHeadItem.vue           | 10 +++-
 pages/index/index.vue                              |  5 ++
 pages_order/car/carList.vue                        | 57 +++++++++----------
 pages_order/components/list/cart/cartItem.vue      |  1 +
 .../components/list/gourmet/gourmetItem.vue        |  1 +
 .../components/list/renting/rentingItem.vue        |  2 +
 pages_order/gourmet/gourmetList.vue                | 64 ++++++++++-----------
 pages_order/renting/rentingList.vue                | 66 ++++++++++------------
 pages_order/work/workList.vue                      | 40 +++++++------
 12 files changed, 165 insertions(+), 138 deletions(-)

diff --git a/App.vue b/App.vue
index 282efb9..956ca6d 100644
--- a/App.vue
+++ b/App.vue
@@ -29,13 +29,12 @@
 		}
 	}
 	
-	.screenSearch{
-		.uv-drop-down{
-			background: transparent !important;
-			border: none !important;
-			// .uv-text__value{
-			// 	color: #fff !important;
-			// }
-		}
+	.uv-drop-down{
+		background: transparent !important;
+		border: none !important;
+		justify-content: space-around !important;
+		// .uv-text__value{
+		// 	color: #fff !important;
+		// }
 	}
 </style>
diff --git a/components/list/activity/activityItem.vue b/components/list/activity/activityItem.vue
index d230f7e..a6cbb75 100644
--- a/components/list/activity/activityItem.vue
+++ b/components/list/activity/activityItem.vue
@@ -14,6 +14,15 @@
 			<view class="browse">
 				{{ item.isComment }}条评论
 			</view>
+			<view class="browse">
+				点赞
+			</view>
+			<view class="browse">
+				<view class="icon">
+					<uv-icon name="attach"></uv-icon>
+				</view>
+				分享
+			</view>
 			
 			<callPhone
 			style="margin-left: auto;"
@@ -61,7 +70,9 @@
 			font-size: 24rpx;
 
 			.browse {
+				display: flex;
 				margin: 0rpx 30rpx;
+				margin-left: 10rpx;
 				color: rgb(132, 132, 132);
 			}
 
diff --git a/components/list/dynamic/dynamicItem.vue b/components/list/dynamic/dynamicItem.vue
index dfcbc46..cbeb94f 100644
--- a/components/list/dynamic/dynamicItem.vue
+++ b/components/list/dynamic/dynamicItem.vue
@@ -1,10 +1,10 @@
 <template>
 	<view class="works" @click="$emit('click')">
-		
-		<userHeadItem :item="item"/>
-		
-		<daynamicInfo :item="item"/>
-		
+
+		<userHeadItem :item="item" />
+
+		<daynamicInfo :item="item" />
+
 		<view class="bottom">
 			<view class="browse">
 				{{ item.isBrowse }}浏览
@@ -12,7 +12,16 @@
 			<view class="browse">
 				{{ item.isComment }}条评论
 			</view>
-			<callPhone :phone="item.phone" :sexName="item.sex"/>
+			<view class="browse">
+				点赞
+			</view>
+			<view class="browse">
+				<view class="icon">
+					<uv-icon name="attach"></uv-icon>
+				</view>
+				分享
+			</view>
+			<callPhone :phone="item.phone" :sexName="item.sex" />
 		</view>
 	</view>
 </template>
@@ -21,7 +30,7 @@
 	import userHeadItem from '@/components/list/dynamic/userHeadItem.vue'
 	import daynamicInfo from '@/components/list/dynamic/daynamicInfo.vue'
 	export default {
-		components : {
+		components: {
 			userHeadItem,
 			daynamicInfo,
 		},
@@ -29,11 +38,9 @@
 			item: {},
 		},
 		data() {
-			return {
-			}
-		},
-		methods: {
+			return {}
 		},
+		methods: {},
 	}
 </script>
 
@@ -51,8 +58,10 @@
 			font-size: 24rpx;
 
 			.browse {
+				display: flex;
 				margin: 0rpx 30rpx;
 				color: rgb(132, 132, 132);
+				margin-left: 10rpx;
 			}
 		}
 	}
diff --git a/components/list/dynamic/userHeadItem.vue b/components/list/dynamic/userHeadItem.vue
index 0d8362d..87af665 100644
--- a/components/list/dynamic/userHeadItem.vue
+++ b/components/list/dynamic/userHeadItem.vue
@@ -3,6 +3,7 @@
 		<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">
@@ -20,10 +21,15 @@
 					<!-- 地址 -->
 					{{ item.addId }}
 				</view>
+				<view class="inde">
+					#{{item.classId_dictText}}
+					
+				</view>
 				<view class="authentication" v-if="item.isContent">
 					<!-- 个人认证 -->
 					{{ item.isContent }}
 				</view>
+				
 			</view>
 
 			<view class="Times">
@@ -35,8 +41,8 @@
 					12:34
 				</view> -->
 			</view>
-
 		</view>
+		
 	</view>
 </template>
 
@@ -127,8 +133,10 @@
 				.Month {
 					margin: 0rpx 15rpx;
 				}
+				
 			}
 
 		}
+	
 	}
 </style>
\ No newline at end of file
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 6b6e512..c671c24 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -82,6 +82,8 @@
 		</view>
 
 		<view class="box">
+			
+			<!-- 菜单栏 -->
 			<scroll-view
 			scroll-x="true">
 				<view class="life">
@@ -99,6 +101,7 @@
 				</view>
 			</scroll-view>
 			
+			<!-- 分类 -->
 			<view class="LabelOptions">
 				<uv-tabs :list="category" 
 				:activeStyle="{color : '#000', fontWeight : 900}"
@@ -109,6 +112,8 @@
 				@click="tabsClick"></uv-tabs>
 			</view>
 			
+			
+			<!-- 动态列表 -->
 			<dynamicItem
 			:key="index"
 			v-for="(item, index) in list"
diff --git a/pages_order/car/carList.vue b/pages_order/car/carList.vue
index 12017ff..c0d4234 100644
--- a/pages_order/car/carList.vue
+++ b/pages_order/car/carList.vue
@@ -1,33 +1,21 @@
 <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>
+		<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="">
-			<screenRen
-			:isArea="false"
-			@clickItem="clickItem"/>
+			<screenRen :isArea="false" @clickItem="clickItem" />
 		</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)"
-			/>
+			<cartItem :key="index" v-for="(item, index) in list" :item="item"
+				@click="$utils.navigateTo('/pages_order/car/carListDetail?id=' + item.id)" />
 		</view>
-		
+
 	</view>
 </template>
 
@@ -37,17 +25,17 @@
 	import cartItem from '../components/list/cart/cartItem.vue'
 	export default {
 		mixins: [mixinsList],
-		components : {
+		components: {
 			cartItem,
 			screenRen,
 		},
 		data() {
 			return {
-				mixinsListApi : 'getCatPage',
+				mixinsListApi: 'getCatPage',
 			}
 		},
 		methods: {
-			clickItem(result){
+			clickItem(result) {
 				this.queryParams = {
 					pageNo: 1,
 					pageSize: 10,
@@ -62,9 +50,16 @@
 </script>
 
 <style scoped lang="scss">
-.page{
-	.list{
-		padding: 0 20rpx;
+	.page {
+		.list {
+			padding: 0 20rpx;
+		}
+	}
+
+	.top-bg {
+		position: absolute;
+		height: 500rpx;
+		width: 100%;
+		background: linear-gradient($uni-color, #fff);
 	}
-}
-</style>
+</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
index 4f71254..562fcb5 100644
--- a/pages_order/components/list/cart/cartItem.vue
+++ b/pages_order/components/list/cart/cartItem.vue
@@ -61,6 +61,7 @@
 		display: flex;
 		font-size: 24rpx;
 		margin: 30rpx 0;
+		position: relative;
 
 		image {
 			width: 50%;
diff --git a/pages_order/components/list/gourmet/gourmetItem.vue b/pages_order/components/list/gourmet/gourmetItem.vue
index 512872f..547514f 100644
--- a/pages_order/components/list/gourmet/gourmetItem.vue
+++ b/pages_order/components/list/gourmet/gourmetItem.vue
@@ -69,6 +69,7 @@
 		overflow: hidden;
 		border-radius: 10rpx;
 		color: #777;
+		position: relative;
 	}
 	.box {
 		display: flex;
diff --git a/pages_order/components/list/renting/rentingItem.vue b/pages_order/components/list/renting/rentingItem.vue
index b0e9484..3a98cb5 100644
--- a/pages_order/components/list/renting/rentingItem.vue
+++ b/pages_order/components/list/renting/rentingItem.vue
@@ -60,6 +60,8 @@
 	border-radius: 20rpx;
 	box-shadow: 0 0 6rpx 6rpx #00000011;
 	margin: 24rpx;
+	position: relative;
+	background-color: #fff;
 	image{
 		width: 180rpx;
 		height: 180rpx;
diff --git a/pages_order/gourmet/gourmetList.vue b/pages_order/gourmet/gourmetList.vue
index de92a47..31e752b 100644
--- a/pages_order/gourmet/gourmetList.vue
+++ b/pages_order/gourmet/gourmetList.vue
@@ -1,57 +1,48 @@
 <template>
 	<view class="page pageList">
-		<navbar title="店铺" leftClick @leftClick="$utils.navigateBack" />
+		<navbar title="店铺" bgColor="#5baaff" color="#fff" leftClick @leftClick="$utils.navigateBack" />
+
+		<view class="top-bg"></view>
 		
-		<view
-		style="padding: 10rpx 20rpx;">
-			<uv-search
-			bgColor="#fff"
-			@search="getData"
-			@custom="getData"
-			searchIconSize="30rpx"
-			placeholder="请输入搜索关键字..." 
-			v-model="title"></uv-search>
+		<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="">
-			<screenRen
-			@clickItem="clickItem"/>
+			<screenSearch @clickItem="clickItem" />
 		</view>
-		
+
 		<view class="list">
-			<gourmetItem
-			:key="index"
-			v-for="(item, index) in list"
-			:item="item"
-			@click="$utils.navigateTo('/pages_order/gourmet/gourmetDetail?id=' + item.id)"
-			/>
+			<gourmetItem :key="index" v-for="(item, index) in list" :item="item"
+				@click="$utils.navigateTo('/pages_order/gourmet/gourmetDetail?id=' + item.id)" />
 		</view>
-		
+
 	</view>
 </template>
 
 <script>
 	import mixinsList from '@/mixins/list.js'
-	import screenRen from '../components/screen/screenRen.vue'
+	import screenSearch from '../components/screen/screenSearch.vue'
 	import gourmetItem from '../components/list/gourmet/gourmetItem.vue'
 	export default {
 		mixins: [mixinsList],
-		components : {
+		components: {
 			gourmetItem,
-			screenRen,
+			screenSearch,
 		},
 		data() {
 			return {
-				mixinsListApi : 'getStorePage',
+				mixinsListApi: 'getStorePage',
 			}
 		},
 		methods: {
-			getDataThen(list){
+			getDataThen(list) {
 				list.forEach(n => {
 					n.image = n.image ? n.image.split(',') : []
 				})
 			},
-			clickItem(result){
+			clickItem(result) {
 				this.queryParams = {
 					pageNo: 1,
 					pageSize: 10,
@@ -66,10 +57,17 @@
 </script>
 
 <style scoped lang="scss">
-.page{
-	padding-bottom: env(safe-area-inset-bottom);
-	.list{
-		padding: 0 20rpx;
+	.page {
+		padding-bottom: env(safe-area-inset-bottom);
+
+		.list {
+			padding: 0 20rpx;
+		}
+	}
+	.top-bg{
+		position: absolute;
+		height: 500rpx;
+		width: 100%;
+		background: linear-gradient($uni-color, #fff);
 	}
-}
-</style>
+</style>
\ No newline at end of file
diff --git a/pages_order/renting/rentingList.vue b/pages_order/renting/rentingList.vue
index e84b0d4..c90816f 100644
--- a/pages_order/renting/rentingList.vue
+++ b/pages_order/renting/rentingList.vue
@@ -1,57 +1,50 @@
 <template>
 	<view class="page pageList">
-		<navbar title="租房列表" leftClick @leftClick="$utils.navigateBack" />
-
-		<view class="flex"
-		style="padding: 20rpx;">
-			<uv-search
-			@search="getData"
-			:showAction="false"
-			searchIconSize="30rpx"
-			placeholder="请输入搜索关键字..."
-			v-model="queryParams.title"></uv-search>
-		</view>
+		<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="">
-			<screenRen
-			isMaxPrice
-			@clickItem="clickItem"/>
+			<screenSearch isMaxPrice @clickItem="clickItem" />
 		</view>
 
 		<view class="list">
-			<rentingItem
-			:key="index"
-			v-for="(item, index) in list"
-			:item="item"
-			@click="$utils.navigateTo('/pages_order/renting/rentingDetail?id=' + item.id)"
-			/>
+			<rentingItem :key="index" v-for="(item, index) in list" :item="item"
+				@click="$utils.navigateTo('/pages_order/renting/rentingDetail?id=' + item.id)" />
 		</view>
-		
+
 	</view>
 </template>
 
 <script>
 	import mixinsList from '@/mixins/list.js'
-	import screenRen from '../components/screen/screenRen.vue'
+	import screenSearch from '../components/screen/screenSearch.vue'
 	import rentingItem from '../components/list/renting/rentingItem.vue'
+	
 	export default {
 		mixins: [mixinsList],
-		components : {
-			screenRen,
+		components: {
+			screenSearch,
 			rentingItem,
 		},
 		data() {
 			return {
-				mixinsListApi : 'getRentPage',
+				mixinsListApi: 'getRentPage',
 			}
 		},
 		methods: {
-			clickDetail(item){
+			clickDetail(item) {
 				uni.navigateTo({
 					url: '/pages_order/renting/rentingDetail?id=' + item.id
 				})
 			},
-			clickItem(result){
+			clickItem(result) {
 				console.log(result);
 				this.queryParams = {
 					pageNo: 1,
@@ -67,18 +60,19 @@
 </script>
 
 <style scoped lang="scss">
-	.page{
-		.page pageList{
-			background-color: blue;
-		}
+	.page {
 		min-height: 100vh;
 		background-color: #fff;
-		.list{
+
+		.list {
 			padding: 10rpx;
 		}
-		
-		/deep/ .uv-drop-down{
-			justify-content: space-around;
-		}
 	}
+	.top-bg{
+		position: absolute;
+		height: 500rpx;
+		width: 100%;
+		background: linear-gradient($uni-color, #fff);
+	}
+	
 </style>
\ No newline at end of file
diff --git a/pages_order/work/workList.vue b/pages_order/work/workList.vue
index d823338..2e3b91e 100644
--- a/pages_order/work/workList.vue
+++ b/pages_order/work/workList.vue
@@ -1,21 +1,20 @@
 <template>
-	<view class="page pageList">]
-	
+	<view class="page pageList">
 
-		<navbar title="工作" leftClick @leftClick="$utils.navigateBack" />
-		
-		<view style="padding: 10rpx 20rpx;">
-			    <uv-search bgColor="#fff" @search="getData" :showAction="false" searchIconSize="30rpx"
-				placeholder="请输入搜索关键字..." v-model="queryParams.title">
-				</uv-search>
 
-		
-	</view>
-	
+		<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="">
-			<screenRen @clickItem="clickItem" />
+			<screenSearch @clickItem="clickItem" />
 		</view>
-		
+
 		<!-- <workList ref="workList"/> -->
 
 		<view class="list">
@@ -29,11 +28,11 @@
 <script>
 	import mixinsList from '@/mixins/list.js'
 	import workItem from '../components/list/workList/workItem.vue'
-	import screenRen from '../components/screen/screenRen.vue'
+	import screenSearch from '../components/screen/screenSearch.vue'
 	export default {
 		mixins: [mixinsList],
 		components: {
-			screenRen,
+			screenSearch,
 			workItem,
 		},
 		data() {
@@ -57,9 +56,14 @@
 </script>
 
 <style scoped lang="scss">
-	.page{
+	.page {
+		min-height: 100vh;
 		background-color: #fff;
-	
 	}
-	
+	.top-bg{
+		position: absolute;
+		height: 500rpx;
+		width: 100%;
+		background: linear-gradient($uni-color, #fff);
+	}
 </style>
\ No newline at end of file