diff --git a/components/headerSerchCommon.vue b/components/headerSerchCommon.vue
new file mode 100644
index 0000000..ea62ebd
--- /dev/null
+++ b/components/headerSerchCommon.vue
@@ -0,0 +1,206 @@
+<template>
+	<!-- #ifdef H5  -->
+	<!-- <view class="header"
+		:style="'background: linear-gradient(90deg, '+ bgColor[0].item +' 50%, '+ bgColor[1].item +' 100%);margin-top:'+ mbConfig*2 +'rpx;'">
+		<view class="serch-wrapper acea-row row-middle" :style="'padding-left:'+ prConfig*2 +'rpx;'">
+			<view class="logo skeleton-rect" v-if="logoConfig">
+				<image :src="logoConfig" mode="heightFix"></image>
+			</view>
+			<navigator url="/pages/goods/goods_search/index" class="input acea-row row-middle skeleton-rect"
+				:class="[boxStyle?'':'fillet',logoConfig?'':'on',txtStyle?'row-center':'']" hover-class="none"><text
+					class="iconfont icon-sousuo"></text>
+				{{$t(`搜索`)}}</navigator>
+		</view>
+	</view> -->
+	<!-- #endif -->
+	<!-- #ifdef MP || APP-PLUS -->
+	<!-- <view v-if="special" class="header"
+		:style="'background: linear-gradient(90deg, '+ bgColor[0].item +' 50%, '+ bgColor[1].item +' 100%);margin-top:'+ mbConfig*2 +'rpx;'">
+		<view class="serch-wrapper acea-row row-middle" :style="'padding-left:'+ prConfig*2 +'rpx;'">
+			<view class="logo skeleton-rect" v-if="logoConfig">
+				<image :src="logoConfig" mode="heightFix"></image>
+			</view>
+			<navigator url="/pages/goods/goods_search/index" class="input acea-row row-middle skeleton-rect"
+				:class="[boxStyle?'':'fillet',logoConfig?'':'on',txtStyle?'row-center':'']" hover-class="none"><text
+					class="iconfont icon-sousuo"></text>
+				{{$t(`搜索`)}}</navigator>
+		</view>
+	</view> -->
+	<!-- v-else -->
+	<view>
+		<view class="mp-header">
+			<view class="sys-head" :style="{ height: statusBarHeight }"></view>
+			<view class="serch-box" style="height: 43px;">
+				<view class="serch-wrapper acea-row row-middle">
+					<view class="logo skeleton-rect">
+						<image src="@/static/images/logo2.png" mode="heightFix"></image>
+					</view>
+					<!-- <navigator url="/pages/goods/goods_search/index" class="input acea-row row-middle skeleton-rect"
+						:class="[boxStyle?'':'fillet',logoConfig?'':'on',txtStyle?'row-center':'']" hover-class="none">
+						<text class="iconfont icon-sousuo"></text>
+						{{$t(`搜索`)}}
+					</navigator> -->
+				</view>
+			</view>
+		</view>
+		<!-- <view :style="'height:'+marTop+'px;'"></view> -->
+	</view>
+	<!-- #endif -->
+</template>
+
+<script>
+	let statusBarHeight = uni.getSystemInfoSync().statusBarHeight + 'px';
+	console.log(statusBarHeight,"888")
+	export default {
+		name: 'headerSerch',
+		props: {
+			
+		},
+		data() {
+			return {
+				statusBarHeight: statusBarHeight,
+				marTop: 0,
+				// bgColor: this.dataConfig.bgColor.color,
+				// boxStyle: this.dataConfig.boxStyle.type,
+				// logoConfig: this.dataConfig.logoConfig.url,
+				// mbConfig: this.dataConfig.mbConfig.val,
+				// txtStyle: this.dataConfig.txtStyle.type,
+				// hotWords: this.dataConfig.hotWords.list,
+				// prConfig: this.dataConfig.prConfig.val
+			};
+		},
+		mounted() {
+			let that = this;
+			uni.setStorageSync('hotList', that.hotWords);
+			that.$store.commit('hotWords/setHotWord', that.hotWords);
+			// #ifdef MP || APP-PLUS
+			setTimeout(() => {
+				// 获取小程序头部高度
+				let info = uni.createSelectorQuery().in(this).select(".mp-header");
+				info.boundingClientRect(function(data) {
+					that.marTop = data.height
+				}).exec()
+			}, 100)
+			// #endif
+		},
+		methods: {
+
+		}
+	}
+</script>
+
+<style lang="scss">
+	.header {
+		width: 100%;
+		height: 100rpx;
+		background:#fff;
+
+		.serch-wrapper {
+			padding: 20rpx 20rpx 0 0;
+
+			.logo {
+				height: 40rpx;
+				margin-right: 20rpx;
+				width: 154rpx;
+				text-align: center;
+				image {
+					width: 100%;
+					height: 100%;
+				}
+			}
+
+			.input {
+				flex: 1;
+				height: 60rpx;
+				padding: 0 0 0 30rpx;
+				background: rgba(247, 247, 247, 1);
+				border: 1px solid rgba(241, 241, 241, 1);
+				color: #BBBBBB;
+				font-size: 28rpx;
+
+				.iconfont {
+					margin-right: 20rpx;
+				}
+
+				// 没有logo，直接搜索框
+				&.on {
+					width: 100%;
+				}
+
+				// 设置圆角
+				&.fillet {
+					border-radius: 29rpx;
+				}
+
+				// 文本框文字居中
+				&.row-center {
+					padding: 0;
+				}
+			}
+		}
+	}
+	/* #ifdef MP || APP-PLUS */
+	.mp-header {
+		z-index: 30;
+		// position: fixed;
+		// left: 0;
+		// top: 0;
+		width: 100%;
+		// background: linear-gradient(90deg, $bg-star 50%, $bg-end 100%);
+		background: #fff;
+
+		.serch-wrapper {
+			height: 100%;
+			/* #ifdef MP */
+			padding: 0 220rpx 0 24rpx;
+			/* #endif */
+			/* #ifdef APP-PLUS */
+			padding: 0 50rpx 0 40rpx;
+      /* #endif */
+			.logo {
+				height: 45rpx;
+				margin-right: 30rpx;
+				image {
+					width: 100%;
+					height: 100%;
+				}
+			}
+
+			.input {
+				flex: 1;
+				height: 50rpx;
+				padding: 0 0 0 30rpx;
+				background: rgba(247, 247, 247, 1);
+				border: 1px solid rgba(241, 241, 241, 1);
+				color: #BBBBBB;
+				font-size: 28rpx;
+
+				.iconfont {
+					margin-right: 20rpx;
+				}
+
+				// 没有logo，直接搜索框
+				&.on {
+					/* #ifdef MP */
+					width: 70%;
+					/* #endif */
+					/* #ifdef APP-PLUS */
+					width: 100%;
+					/* #endif */
+				}
+
+				// 设置圆角
+				&.fillet {
+					border-radius: 29rpx;
+				}
+
+				// 文本框文字居中
+				&.row-center {
+					padding: 0;
+				}
+			}
+		}
+	}
+
+	/* #endif */
+</style>
diff --git a/pages.json b/pages.json
index 3e88cc0..3156240 100644
--- a/pages.json
+++ b/pages.json
@@ -50,6 +50,7 @@
 		{
 			"path": "pages/goods_cate/goods_cate",
 			"style": {
+				"navigationStyle": "custom",
 				"navigationBarTitleText": "商品分类",
 				"app-plus": {
 					// #ifdef APP-PLUS
diff --git a/pages/goods_cate/goods_cate.vue b/pages/goods_cate/goods_cate.vue
index 01fa7a5..888389a 100644
--- a/pages/goods_cate/goods_cate.vue
+++ b/pages/goods_cate/goods_cate.vue
@@ -1,5 +1,6 @@
 <template>
 	<view :style="colorStyle">
+		<headerSerch></headerSerch>
 		<goodsCate1 v-if="category == 1" ref="classOne" :isNew="isNew"></goodsCate1>
 		<goodsCate2 v-if="category == 2" ref="classTwo" :isNew="isNew" @jumpIndex="jumpIndex"></goodsCate2>
 		<goodsCate3 v-if="category == 3" ref="classThree" :isNew="isNew" @jumpIndex="jumpIndex"></goodsCate3>
@@ -11,6 +12,7 @@ import colors from '@/mixins/color';
 import goodsCate1 from './goods_cate1';
 import goodsCate2 from './goods_cate2';
 import goodsCate3 from './goods_cate3';
+import headerSerch from '@/components/headerSerchCommon.vue';
 import { colorChange } from '@/api/api.js';
 import { mapGetters } from 'vuex';
 import { getCategoryVersion } from '@/api/public.js';
@@ -21,7 +23,8 @@ export default {
 		goodsCate1,
 		goodsCate2,
 		goodsCate3,
-		tabBar
+		tabBar,
+		headerSerch
 	},
 	mixins: [colors],
 	data() {
diff --git a/pages/goods_cate/goods_cate1.vue b/pages/goods_cate/goods_cate1.vue
index 0d261fa..742c8cd 100644
--- a/pages/goods_cate/goods_cate1.vue
+++ b/pages/goods_cate/goods_cate1.vue
@@ -29,10 +29,10 @@
 					style="height: 100%;" class="conterScroll">
 					<block v-for="(item,index) in productList" :key="index">
 						<view class='listw' :id="'b'+index">
-							<view class='title acea-row row-center-wrapper'>
-								<view class='line'></view>
+							<view class='title'>
+								<!-- <view class='line'></view> -->
 								<view class='name'>{{$t(item.cate_name)}}</view>
-								<view class='line'></view>
+								<!-- <view class='line'></view> -->
 							</view>
 							<view class='list acea-row'>
 								<navigator hover-class='none'
@@ -265,7 +265,8 @@
 		display: flex;
 		flex-direction: column;
 		//#ifdef MP
-		height: calc(100vh - var(--window-top)) !important;
+		// height: calc(100vh - var(--window-top)) !important;
+		height: calc(100vh - 126rpx) !important;
 		//#endif
 		//#ifndef MP
 		height: 100vh //#endif
@@ -325,17 +326,17 @@
 	.productSort .aside .item {
 		height: 100rpx;
 		width: 100%;
-		font-size: 26rpx;
-		color: #424242;
+		font-size: 24rpx;
+		color: #666666;
 		text-align: center;
 	}
 
 	.productSort .aside .item.on {
 		background-color: #fff;
-		border-left: 4rpx solid var(--view-theme);
+		border-left: 8rpx solid var(--view-theme);
 		width: 100%;
 		color: var(--view-theme);
-		font-weight: bold;
+		// font-weight: bold;
 	}
 
 	.productSort .conter {
@@ -363,9 +364,9 @@
 	}
 
 	.productSort .conter .listw .title .name {
-		font-size: 28rpx;
+		font-size: 30rpx;
 		color: #333;
-		margin: 0 30rpx;
+		margin: 0 20rpx;
 		font-weight: bold;
 	}
 
diff --git a/pages/index/diy/components/goodList.vue b/pages/index/diy/components/goodList.vue
index b3cda6b..192dd7c 100644
--- a/pages/index/diy/components/goodList.vue
+++ b/pages/index/diy/components/goodList.vue
@@ -314,7 +314,7 @@
 					.title {
 						color: #222222;
 						line-height: 34rpx;
-						height: 68rpx;
+						// height: 68rpx;
 					}
 
 					.old-price {
@@ -332,8 +332,8 @@
 					.price {
 						display: flex;
 						align-items: flex-end;
-						font-size: 36rpx;
-						font-weight: 550;
+						font-size: 28rpx;
+						font-weight: 400;
 
 						text {
 							padding-bottom: 4rpx;
diff --git a/pages/index/diy/components/headerSerch.vue b/pages/index/diy/components/headerSerch.vue
index ebcb687..bbb8b51 100644
--- a/pages/index/diy/components/headerSerch.vue
+++ b/pages/index/diy/components/headerSerch.vue
@@ -9,7 +9,7 @@
 			<navigator url="/pages/goods/goods_search/index" class="input acea-row row-middle skeleton-rect"
 				:class="[boxStyle?'':'fillet',logoConfig?'':'on',txtStyle?'row-center':'']" hover-class="none"><text
 					class="iconfont icon-sousuo"></text>
-				{{$t(`搜索商品`)}}</navigator>
+				{{$t(`搜索`)}}</navigator>
 		</view>
 	</view>
 	<!-- #endif -->
@@ -23,7 +23,7 @@
 			<navigator url="/pages/goods/goods_search/index" class="input acea-row row-middle skeleton-rect"
 				:class="[boxStyle?'':'fillet',logoConfig?'':'on',txtStyle?'row-center':'']" hover-class="none"><text
 					class="iconfont icon-sousuo"></text>
-				{{$t(`搜索商品名称`)}}</navigator>
+				{{$t(`搜索`)}}</navigator>
 		</view>
 	</view>
 	<view v-else>
@@ -38,7 +38,7 @@
 					<navigator url="/pages/goods/goods_search/index" class="input acea-row row-middle skeleton-rect"
 						:class="[boxStyle?'':'fillet',logoConfig?'':'on',txtStyle?'row-center':'']" hover-class="none">
 						<text class="iconfont icon-sousuo"></text>
-						{{$t(`搜索商品名称`)}}
+						{{$t(`搜索`)}}
 					</navigator>
 				</view>
 			</view>
@@ -105,7 +105,7 @@
 			padding: 20rpx 20rpx 0 0;
 
 			.logo {
-				height: 60rpx;
+				height: 40rpx;
 				margin-right: 20rpx;
 				width: 154rpx;
 				text-align: center;
@@ -117,7 +117,7 @@
 
 			.input {
 				flex: 1;
-				height: 58rpx;
+				height: 60rpx;
 				padding: 0 0 0 30rpx;
 				background: rgba(247, 247, 247, 1);
 				border: 1px solid rgba(241, 241, 241, 1);
@@ -163,7 +163,7 @@
 			padding: 0 50rpx 0 40rpx;
       /* #endif */
 			.logo {
-				height: 60rpx;
+				height: 40rpx;
 				margin-right: 30rpx;
 				image {
 					width: 100%;
@@ -173,7 +173,7 @@
 
 			.input {
 				flex: 1;
-				height: 50rpx;
+				height: 60rpx;
 				padding: 0 0 0 30rpx;
 				background: rgba(247, 247, 247, 1);
 				border: 1px solid rgba(241, 241, 241, 1);
diff --git a/pages/index/diy/components/titles.vue b/pages/index/diy/components/titles.vue
index da22d9d..b3d845d 100644
--- a/pages/index/diy/components/titles.vue
+++ b/pages/index/diy/components/titles.vue
@@ -53,7 +53,7 @@
 		color: #282828;
 		text-align: center;
 		width: 100%;
-		padding: 20rpx;
+		padding: 20rpx 20rpx 0 20rpx;
 		box-sizing: border-box;
 
 		&.left {
diff --git a/static/css/base.css b/static/css/base.css
index 9dd219e..fca6d4e 100644
--- a/static/css/base.css
+++ b/static/css/base.css
@@ -332,10 +332,10 @@ checkbox .uni-checkbox-input.uni-checkbox-input-checked::before {
 .line2 {
 	text-overflow: ellipsis;
 	display: -webkit-box;
-	-webkit-line-clamp: 2;
+	-webkit-line-clamp: 3;
 	-webkit-box-orient: vertical;
 	display: -moz-box;
-	-moz-line-clamp: 2;
+	-moz-line-clamp: 3;
 	-moz-box-orient: vertical;
 	word-wrap: break-word;
 	word-break: break-all;
diff --git a/static/images/logo2.png b/static/images/logo2.png
new file mode 100644
index 0000000..ed080d5
Binary files /dev/null and b/static/images/logo2.png differ
diff --git a/utils/theme.js b/utils/theme.js
index 90dcf4f..8a3ffeb 100644
--- a/utils/theme.js
+++ b/utils/theme.js
@@ -1,6 +1,7 @@
 const themeList = {
 	green: '--view-theme: rgba(66,202,77,1);--view-theme-16: #42CA4D;--view-priceColor:#FF7600;--view-minorColor:rgba(108, 198, 94, 0.5);--view-minorColorT:rgba(66, 202, 77, 0.1);--view-bntColor:#FE960F;--view-op-ten: rgba(66,202,77, 0.1);--view-main-start:#70E038; --view-main-over:#42CA4D;--view-op-point-four: rgba(66,202,77, 0.04);--view-op-point-eight: rgba(66,202,77, 0.8);--view-linear:linear-gradient(180deg, rgba(66,202,77,0.2) 0%, rgba(255,255,255,0) 100%);',
-	red: '--view-theme: rgba(233,51,35,1);--view-theme-16: #e93323;--view-priceColor:#e93323;--view-minorColor:rgba(233, 51, 35, 0.5);--view-minorColorT:rgba(233, 51, 35, 0.1);--view-bntColor:#FE960F;--view-op-ten: rgba(233,51,35, 0.1);--view-main-start:#FF6151; --view-main-over:#e93323;--view-op-point-four: rgba(233,51,35, 0.04);--view-op-point-eight: rgba(233,51,35, 0.8);--view-linear:linear-gradient(180deg, rgba(232,58,35,0.2) 0%, rgba(255,255,255,0) 100%)',
+	red: '--view-theme: rgba(168,209,120,1);--view-theme-16: #A8D178;--view-priceColor:#A8D178;--view-minorColor:rgba(168,209,120, 0.5);--view-minorColorT:rgba(168,209,120, 0.1);--view-bntColor:#FE960F;--view-op-ten: rgba(233,51,35, 0.1);--view-main-start:#FF6151; --view-main-over:#A8D178;--view-op-point-four: rgba(168,209,120, 0.04);--view-op-point-eight: rgba(168,209,120, 0.8);--view-linear:linear-gradient(180deg, rgba(232,58,35,0.2) 0%, rgba(255,255,255,0) 100%)',
+	// red: '--view-theme: rgba(233,51,35,1);--view-theme-16: #e93323;--view-priceColor:#e93323;--view-minorColor:rgba(233, 51, 35, 0.5);--view-minorColorT:rgba(233, 51, 35, 0.1);--view-bntColor:#FE960F;--view-op-ten: rgba(233,51,35, 0.1);--view-main-start:#FF6151; --view-main-over:#e93323;--view-op-point-four: rgba(233,51,35, 0.04);--view-op-point-eight: rgba(233,51,35, 0.8);--view-linear:linear-gradient(180deg, rgba(232,58,35,0.2) 0%, rgba(255,255,255,0) 100%)',
 	blue: '--view-theme: rgba(29,176,252,1);--view-theme-16:#1db0fc;--view-priceColor:#FD502F;--view-minorColor:rgba(58, 139, 236, 0.5);--view-minorColorT:rgba(9, 139, 243, 0.1);--view-bntColor:#22CAFD;--view-op-ten: rgba(29,176,252, 0.1);--view-main-start:#40D1F4; --view-main-over:#1DB0FC;--view-op-point-four: rgba(29,176,252, 0.04);--view-op-point-eight: rgba(29,176,252, 0.8);--view-linear:linear-gradient(180deg, rgba(29,176,252,0.2) 0%, rgba(255,255,255,0) 100%);',
 	pink: '--view-theme: rgba(255,68,143,1);--view-theme-16:#ff448f;--view-priceColor:#FF448F;--view-minorColor:rgba(255, 68, 143, 0.5);--view-minorColorT:rgba(255, 68, 143, 0.1);--view-bntColor:#282828;--view-op-ten: rgba(255,68,143, 0.1);--view-main-start:#FF67AD; --view-main-over:#FF448F;--view-op-point-four: rgba(255,68,143, 0.04);--view-op-point-eight: rgba(255,68,143, 0.8);--view-linear:linear-gradient(180deg, rgba(255,68,143,0.2) 0%, rgba(255,255,255,0) 100%);',
 	orange: '--view-theme: rgba(254,92,45,1); --view-theme-16:#FE5C2D;--view-priceColor:#FE5C2D;--view-minorColor:rgba(254, 92, 45, 0.5);--view-minorColorT:rgba(254, 92, 45, 0.1);--view-bntColor:#FDB000;--view-op-ten: rgba(254,92,45, 0.1);--view-main-start:#FF9445; --view-main-over:#FE5C2D;--view-op-point-four: rgba(254,92,45, 0.04);--view-op-point-eight: rgba(254,92,45, 0.8);--view-linear:linear-gradient(180deg, rgba(254,92,45,0.2) 0%, rgba(255,255,255,0) 100%);'