diff --git a/App.vue b/App.vue
index 7dbcdf0..97a42d8 100644
--- a/App.vue
+++ b/App.vue
@@ -107,6 +107,27 @@
 .text-36{
 	font-size:36rpx;
 }
+.text-bold{
+	font-weight:bold;
+}
+.line-h{
+	line-height:1.2
+}
+.mr-32{
+	margin-right:32rpx;
+}
+.text-overflow1 {
+	overflow: hidden;
+	text-overflow: ellipsis;
+	display: -webkit-box;
+	-webkit-line-clamp: 2;
+	line-clamp: 2;
+	-webkit-box-orient: vertical;
+}
+.text-d{
+	text-decoration: line-through;
+}
+
   button {
     margin-bottom: 15px;
   }
diff --git a/pages.json b/pages.json
index 1e152c2..319b911 100644
--- a/pages.json
+++ b/pages.json
@@ -46,7 +46,12 @@
 				"navigationStyle": "custom"
 			}
 		},
-
+		{
+			"path": "pages/shop/search",
+			"style": {
+				"navigationStyle": "custom"
+			}
+		},
 		{
 			"path": "pages/LuckyWheel/LuckyWheel",
 			"style": {
diff --git a/pages/home/home.vue b/pages/home/home.vue
index dc62bfa..9b778f1 100644
--- a/pages/home/home.vue
+++ b/pages/home/home.vue
@@ -424,7 +424,7 @@ export default {
 		},
 		jumpSearch() {
 			uni.navigateTo({
-				url: '/pages/other_package/search/search',
+				url: '/pages/shop/search',
 			})
 		},
 		/**
diff --git a/pages/other_package/search/search.vue b/pages/other_package/search/search.vue
index 3d920fc..db8bb8a 100644
--- a/pages/other_package/search/search.vue
+++ b/pages/other_package/search/search.vue
@@ -25,7 +25,7 @@
 			</view>
 		</view>
 		<!-- 历史搜索 -->
-		<view class="search_history" v-if="!poductList || poductList.length === 0">
+		<!-- <view class="search_history" v-if="!poductList || poductList.length === 0">
 			<view class="search_history_title">
 				<view>猜你喜欢</view>
 				<up-image src="/static/common/delete.png" width="20" height="20" bgColor="#f1f6ff00" @click="isShowSearch = true;"></up-image>
@@ -39,9 +39,9 @@
 				<view class="not_order_warp_img"><up-image src="/static/common/not_search.png" width="100" height="100" bgColor="#f1f6ff00"></up-image></view>
 				<view class="not_order_msg_warp">暂无搜索记录</view>
 			</view>
-		</view>
+		</view> -->
 		<!-- 搜索出内容 -->
-		<view v-else class="poduct_list">
+		<view class="poduct_list">
 			<view class="poduct_search_warp">
 				<view>综合</view>
 				<view>销量</view>
diff --git a/pages/shop/components/shop-item.vue b/pages/shop/components/shop-item.vue
new file mode 100644
index 0000000..5c5a98c
--- /dev/null
+++ b/pages/shop/components/shop-item.vue
@@ -0,0 +1,66 @@
+<template>
+	<view class="shop-item-view" @click="onJump">
+		<view class="top-img-view flex-r-lr">
+			<image :src="obj.url"></image>
+		</view>
+		<view class="bottom-shop-view">
+			<text class="text-28 text-zu text-overflow1">{{obj.title}}</text>
+			<text class="text-28" style="color:#FF4242">
+				￥{{obj.adPrice}}
+				<text class="text-24 text-fu text-d" style="margin-left:12rpx">
+					￥{{obj.price}}
+				</text>
+			</text>
+		</view>
+	</view>
+</template>
+
+<script>
+	
+	export default {
+		props:{
+			obj:{
+				type:Object,
+				default:null
+			},
+		},
+		mounted(){
+		},
+		methods: {
+			onJump(){
+				this.$emit('click');
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.shop-item-view{
+		width:332rpx;
+		height:498rpx;
+		min-height:498rpx;
+		display: flex;
+		flex-direction: column;
+		border-radius: 24rpx;
+		overflow: hidden;
+		background-color: #fff;
+		.bottom-shop-view{
+			width:100%;
+			padding: 16rpx 24rpx 0;
+			box-sizing: border-box;
+			display: flex;
+			flex-direction: column;
+		}
+		.top-img-view{
+			width:332rpx;
+			height:332rpx;
+			min-height:332rpx;
+			image{
+				width:100%;
+				height:100%;
+			}
+			
+		}
+	}
+	
+</style>
diff --git a/pages/shop/search.vue b/pages/shop/search.vue
new file mode 100644
index 0000000..94668a3
--- /dev/null
+++ b/pages/shop/search.vue
@@ -0,0 +1,231 @@
+<template>
+	<view class="content">
+		<TopSafe bgColor="rgba(0,0,0,0)"></TopSafe>
+		<view class="search-view">
+			<view class="head-view">
+				<u-icon size="30rpx" name="arrow-left" color="#333"></u-icon>
+				<u-input class="input-view wx-width" v-model="searchInput"></u-input>
+				<view class="search-btn flex-c" @click="onSearch">
+					<text class="text-32 text-zu">搜索</text>
+				</view>
+			</view>
+			<view class="top-view mt-24">
+				<view class="flex-r-lr">
+					<text class="text-32 text-bold text-zu">搜索历史</text>
+					<u-icon size="40rpx" name="trash" @click="isDel = !isDel" color="#333"></u-icon>
+				</view>
+				<view class="history-view" v-if="historyList.length">
+					<view class="history-box flex-c mt-24 mr-32" v-for="(item,index) in historyList" :key="item">
+						<text class="text-24 text-fu line-h" @click="onText(item)" >{{item}}</text>
+						<u-icon size="32rpx" class="close-pos" v-if="isDel" @click="onDel(index)"
+						 name="close-circle" color="#333"></u-icon>
+					</view>
+				</view>
+				<view class="history-on-data flex-c" v-else>
+					<text class="text-40 text-bold">暂无历史记录</text>
+				</view>
+			</view>
+			<view class="bottom-view">
+				<view class="bottom-head">
+					<text class="text-32 text-bold text-zu">商品展示</text>
+				</view>
+				<view class="bottom-scroll" v-if="dataList.length">
+					<ShopItem :obj="item" class="mt-24" @click="onJump(item)"
+					v-for="(item,index) in dataList" :key="item.id"></ShopItem>
+				</view>
+				<view class="bottom-scroll-no " v-else>
+					<text class="text-48 text-bold" style="margin-top:200rpx">暂无数据</text>
+				</view>
+			</view>
+		</view>
+		
+		<DownPopup></DownPopup>
+	</view>
+</template>
+
+<script>
+import { getUserInfo } from '@/api/auth.js';
+import Header from '@/components/common/header.vue';
+import TopSafe from '@/components/common/top-safe.nvue'
+import DownPopup from '@/components/common/down-popup.vue';
+import { searchList } from '@/api/product.js'
+import ShopItem from './components/shop-item.vue'
+import func from '@/utils/func.js';
+
+export default {
+	components: { Header,TopSafe,DownPopup,ShopItem },
+	data() {
+		return {
+			searchInput:'',
+			historyList:[],
+			isDel:false,
+			dataList:[],
+		};
+	},
+	onShow() {
+		this.init();
+	},
+	methods: {
+		init(){
+			// this.isSignContract()
+			// this.getSignContract()
+			
+			let arr = uni.getStorageSync('history') || '';
+			if(arr){
+				this.historyList = arr.split(',');
+			}else{
+				this.historyList = [];
+			}
+		},
+		onJump(item){
+			uni.navigateTo({
+			    url: '/pages/other_package/productInfo/productInfo?id='+item.id,
+			})
+		},
+		onSearch(){
+			if(!this.searchInput){
+				return;
+			}
+			this.onAdd();
+			let params = {
+				keyword:this.searchInput
+			}
+			searchList(params).then((res)=>{
+				this.dataList = res.data;
+				console.log('res',res)
+			})
+		},
+		onDel(index){
+			this.historyList.splice(index,1);
+			this.onSave()
+		},
+		onAdd(){
+				
+			if(this.searchInput){
+				let bool = false;
+				this.historyList.forEach(item=>{
+					if(item == this.searchInput){
+						bool = true;
+					}
+				})
+				if(!bool){
+					this.historyList.unshift(this.searchInput);
+					if(this.historyList.length > 15){
+						this.historyList.pop();
+					}
+					this.onSave();
+				}
+				
+			}
+		},
+		onText(item){
+			this.searchInput = item;
+		},
+		onSave(){
+			if(this.historyList.length){
+				uni.setStorageSync('history',this.historyList.join(','));
+			}else{
+				uni.setStorageSync('history','');
+			}
+		}
+	}
+}
+</script>
+
+<style lang="scss" scoped>
+.search-view{
+	width:100%;
+	height:calc(100% - var(--status-bar-height));
+	display: flex;
+	flex-direction: column;
+	align-items: center;
+	box-sizing: border-box;
+	.top-view{
+		width:100%;
+		min-height:300rpx;
+		display: flex;
+		flex-direction: column;
+		padding: 0 32rpx;
+		box-sizing: border-box;
+		overflow-y: auto;
+		.history-on-data{
+			width:100%;
+			height:100%;
+			
+		}
+		.history-view{
+			width:100%;
+			display: flex;
+			flex-wrap: wrap;
+			.history-box{
+				position: relative;
+				padding: 8rpx 12rpx;
+				box-sizing: border-box;
+				background-color: #fff;
+				border-radius: 8rpx;
+				.close-pos{
+					right:-20rpx;
+					position: absolute;
+					top:-40%;
+				}
+			}
+		}
+	}
+	.bottom-view{
+		width:100%;
+		flex:1;
+		display: flex;
+		flex-direction: column;
+		padding: 0 32rpx;
+		box-sizing: border-box;
+		.bottom-head{
+			height:50rpx;
+			display: flex;
+		}
+		.bottom-scroll{
+			width:100%;
+			height:calc(100vh - 50rpx - 324rpx - 4rpx - 88rpx - var(--status-bar-height));
+			overflow-y: auto;
+			display: flex;
+			flex-wrap: wrap;
+			justify-content: space-between;
+			
+		}
+		.bottom-scroll-no{
+			width:100%;
+			display: flex;
+			flex-direction: column;
+			align-items: center;
+			
+		}
+	}
+	.head-view{
+		width:100%;
+		height:88rpx;
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+		padding: 0 32rpx;
+		box-sizing: border-box;
+		.search-btn{
+			width:120rpx;
+		}
+		.input-view{
+			height:72rpx;
+			box-sizing: border-box;
+			padding: 0 30rpx !important;
+			border-radius: 36rpx;
+			margin-left:12rpx;
+			border-color:#7934F6 !important;
+		}
+		/* #ifdef MP-WEIXIN */
+		.wx-width{
+			width:350rpx !important;
+			flex:none;
+		}
+		/* #endif */
+		
+		
+	}
+}
+</style>
diff --git a/pages/sort/sort.vue b/pages/sort/sort.vue
index cbf85ec..bd64e07 100644
--- a/pages/sort/sort.vue
+++ b/pages/sort/sort.vue
@@ -128,12 +128,9 @@ export default {
 			}
 		},
 		jumpSearch(item) {
-			let path = "/pages/other_package/search/search";
-			if (item && Object.keys(item).length !== 0) {
-				path = path + "?keyword=" + item.name;
-			}
+		
 			uni.navigateTo({
-				url: path,
+				url: '/pages/shop/search',
 			})
 		},
 		// 查询分类