diff --git a/config/index.js b/config/index.js
index 93ee94a..947f5ca 100644
--- a/config/index.js
+++ b/config/index.js
@@ -1,9 +1,9 @@
 // export const VUE_APP_API_URL = 'http://natapp.xinxintuan.co/api';
 // export const VUE_APP_API_URL = 'https://wxapi.yixiang.co/api'
 // export const VUE_APP_API_URL = 'http://192.168.0.112:8092/api'
-   // export const VUE_APP_API_URL = 'http://192.168.1.34:8092/api'
+   // export const VUE_APP_API_URL = 'http://10.11.32.103:8092/api'
 export const VUE_APP_API_URL = 'https://cloud.api.cyjyyjy.com/api'
-//  export const VUE_APP_API_URL = 'http://natapp.xinxintuan.co/api';
+ // export const VUE_APP_API_URL = 'http://natapp.xinxintuan.co/api';
 // export const VUE_APP_API_URL = 'https://thapi.xinxintuan.co/api'
 //  export const VUE_APP_API_URL = 'https://h5api.xinxintuan.co/api';
 // export const VUE_APP_API_URL = 'https://h5api.xinxintuan.co/api';
diff --git a/pages.json b/pages.json
index 2676e2e..aaf063c 100644
--- a/pages.json
+++ b/pages.json
@@ -270,6 +270,20 @@
 				"enablePullDownRefresh": true
 			}
 		},
+		{
+			"path": "pages/demandHall/projectManage/index",
+			"style": {
+				"navigationBarTitleText": "项目管理",
+				"enablePullDownRefresh": true
+			}
+		},
+		{
+			"path": "pages/demandHall/newProject/index",
+			"style": {
+				"navigationBarTitleText": "新建项目",
+				"enablePullDownRefresh": true
+			}
+		},
 		{
 			"path": "pages/demandHall/business/index",
 			"style": {
@@ -326,6 +340,13 @@
 				"enablePullDownRefresh": true	
 			}
 		},
+		{
+			"path": "pages/life/index2",
+			"style": {
+				"navigationBarTitleText": "生活",
+				"enablePullDownRefresh": true	
+			}
+		},
 		{
 			"path": "pages/life/temp/index",
 			"style": {
diff --git a/pages/activity/detail/index.vue b/pages/activity/detail/index.vue
index 029c308..ffb4978 100644
--- a/pages/activity/detail/index.vue
+++ b/pages/activity/detail/index.vue
@@ -68,7 +68,7 @@
       </view>
       <view class="call-box  acea-row row-middle" @tap="collect">
         <image src="/static/images/collect.png"></image>
-        <text>{{activityDetail.collect ? '已收藏':'收藏'}}</text>
+        <text>{{activityDetail.collect ? '已收藏':'收藏'}}</text>  
       </view>
     </view>
     <view class="handle-btn-box">
diff --git a/pages/demandHall/business/index.vue b/pages/demandHall/business/index.vue
index 643cc82..59a340c 100644
--- a/pages/demandHall/business/index.vue
+++ b/pages/demandHall/business/index.vue
@@ -30,7 +30,8 @@
 				<view class="news-con acea-row row-middle">
 					<image src="../../../static/images/rem-icon.png"></image>
 					<view class="notice-swiper">
-						<NewsSwiper :list="isRecommend" :interval="4000" @toArticleDetail="toArticleDetail"></NewsSwiper>
+						<NewsSwiper :list="isRecommend" :interval="4000" @toArticleDetail="toArticleDetail">
+						</NewsSwiper>
 					</view>
 				</view>
 			</view>
@@ -40,13 +41,13 @@
 		<view class="company-box">
 			<view class="title-con acea-row">
 				<image src="../../../static/images/business-title1.png" class="title-img"></image>
-				<view class="update-icon acea-row row-center-wrapper"  @click="replaceClick">
+				<view class="update-icon acea-row row-center-wrapper" @click="replaceClick">
 					<image src="../../../static/images/update-icon.png" :class="showCirc ? 'circ' : ''"></image>换一批
 				</view>
 			</view>
 			<scroll-view class="scroll-view_H acea-row" scroll-x="true">
 				<view class="company-list" v-for="(item,index) in enterpriseList" :key="index">
-					<view class="title">{{item.enterpriseName}}</view>
+					<view class="title line1">{{item.enterpriseName}}</view>
 					<view class="category-box acea-row">
 						<view class="tag" :class="index%2 == 0 ? 'tag-item-b' : 'tag-item-y' ">{{item.cname}}</view>
 						<!-- <view class="tag-item-y tag">财务规范</view>
@@ -105,13 +106,12 @@
 					<view class="acea-row row-middle title">
 						<image src="../../../static/images/new-icon.png" mode="" class="new-icon">
 						</image>
-						<view class="title-h">富硒产品</view>
+						<view class="title-h line1">富硒产品</view>
 					</view>
 					<view class="title-s line1">农业项目、国家扶贫、乡村振兴、国家红利</view>
 					<view class="category-box acea-row">
 						<view class="tag-item-y tag">持续盈利</view>
 						<view class="tag-item-b tag">财务规范</view>
-						<view class="tag-item-p tag">零负债</view>
 					</view>
 				</view>
 			</view>
@@ -125,7 +125,9 @@
 	import { briefing, supply, listResourcesCagetory, listEnterprise } from  "@/api/business"
 	import NewsSwiper from "@/components/newsSwiper.vue"
 	export default {
-		components:{ NewsSwiper },
+		components: {
+			NewsSwiper
+		},
 		data() {
 			return {
 				showCirc: false,
@@ -136,19 +138,19 @@
 				enterpriseList: []
 			};
 		},
-		mounted(){
+		mounted() {
 			this.getArticleList()
 			this.getSupplyList()
 			this.getCagetoryList()
 			this.getEnterpriseList()
 		},
-		methods:{
+		methods: {
 			//获取资讯
-			getArticleList(){
-				briefing().then((res)=>{
-					const articleList= res.data
-					this.isHotList = articleList.filter(item=> item.isHot == 1)
-					this.isRecommend = articleList.filter(item=> item.isRecommend == 1)
+			getArticleList() {
+				briefing().then((res) => {
+					const articleList = res.data
+					this.isHotList = articleList.filter(item => item.isHot == 1)
+					this.isRecommend = articleList.filter(item => item.isRecommend == 1)
 				})
 			},
 			toArticleDetail(id){
@@ -160,8 +162,8 @@
 				})
 			},
 			//获取供应
-			getSupplyList(){
-				supply().then((res)=>{
+			getSupplyList() {
+				supply().then((res) => {
 					this.supplyList = res.data
 				})
 			},
@@ -178,26 +180,26 @@
 				
 			},
 			//获取分类
-			getCagetoryList(){
-				listResourcesCagetory().then((res)=>{
+			getCagetoryList() {
+				listResourcesCagetory().then((res) => {
 					this.cagetoryList = res.data
 				})
 			},
 			//获取企业
-			getEnterpriseList(){
-				listEnterprise().then((res)=>{
+			getEnterpriseList() {
+				listEnterprise().then((res) => {
 					this.enterpriseList = res.data
 					this.showCirc = false
 				})
 			},
-			toCompanyDetail(id){
+			toCompanyDetail(id) {
 				uni.navigateTo({
 					url:"/pages/demandHall/companyDetail/index?id=" + id
 				})
 			},
 			//换一批
-			replaceClick(){
-				if(!this.showCirc){
+			replaceClick() {
+				if (!this.showCirc) {
 					this.showCirc = true;
 					this.getEnterpriseList()
 				}
@@ -205,7 +207,7 @@
 			// 供需大厅
 			toSupplyHall(id){
 				uni.navigateTo({
-					url:"/pages/demandHall/supplyHall/index"
+					url: "/pages/demandHall/supplyHall/index"
 				})
 			},
 			// 企业服务
@@ -215,9 +217,9 @@
 				})
 			},
 			// 项目投融
-			toDemoInvestment(e){
+			toDemoInvestment(e) {
 				uni.showModal({
-					title:'提示！',
+					title: '提示！',
 					content: '模块开发中，请等待...',
 					showCancel: false
 				})
@@ -226,13 +228,13 @@
 				// })
 			},
 			// 认证
-			toAuthentication(e){
+			toAuthentication(e) {
 				uni.navigateTo({
 					url:"/pages/release/index"
 				})
 			}
 		},
-		
+
 	}
 </script>
 
@@ -245,6 +247,37 @@
 		margin-bottom: 100rpx;
 	}
 
+	.category-box {
+		width: 100%;
+		height: 36rpx;
+		overflow: hidden;
+		.tag {
+			width: auto;
+			padding: 0 10rpx;
+			height: 36rpx;
+			line-height: 34rpx;
+			border-radius: 4rpx;
+			font-size: 20rpx;
+			margin-right: 16rpx;
+			text-align: center;
+		}
+
+		.tag-item-b {
+			border: 1rpx solid #3A9EFA;
+			color: #3A9EFA;
+		}
+
+		.tag-item-y {
+			border: 1px solid #FFAA00;
+			color: #FFAA00;
+		}
+
+		.tag-item-p {
+			color: #FC9367;
+			border: 1px solid #FC9367;
+		}
+	}
+
 	// 搜索
 	.search-box {
 		width: 670rpx;
@@ -252,6 +285,7 @@
 		border: 2rpx solid #FF5100;
 		border-radius: 8rpx;
 		margin: 24rpx auto;
+		position: relative;
 
 		.search-icon {
 			width: 35rpx;
@@ -260,9 +294,11 @@
 		}
 
 		.search {
-			margin-left: auto;
+			// margin-left: auto;
+			position: absolute;
+			right: -2rpx;
 			width: 132rpx;
-			height: 66rpx;
+			height: 68rpx;
 			background: linear-gradient(39deg, #FF5100 0%, #FFA074 100%);
 			border-radius: 8rpx;
 			color: #fff;
@@ -309,18 +345,23 @@
 			height: 78rpx;
 			margin-left: 18rpx;
 		}
-		.news-con-box{
+
+		.news-con-box {
 			width: calc(100% - 100rpx);
 		}
+
 		.news-con {
 			margin-bottom: 6rpx;
-			.notice-swiper{
+
+			.notice-swiper {
 				width: calc(100% - 116rpx);
 				height: 34rpx;
 			}
-			.scroll-Y{
+
+			.scroll-Y {
 				height: 34rpx;
-				.swiper-item{
+
+				.swiper-item {
 					height: 34rpx;
 				}
 			}
@@ -342,12 +383,13 @@
 		width: 134rpx;
 		height: 46rpx;
 	}
-	
-	@keyframes doCric{
+
+	@keyframes doCric {
 		0% {
 			transform: rotate(0deg);
 		}
-		100%{
+
+		100% {
 			transform: rotate(360deg);
 		}
 	}
@@ -365,7 +407,7 @@
 			line-height: 26rpx;
 			color: #666666;
 			margin-left: auto;
-			
+
 		}
 
 		.update-icon image {
@@ -374,7 +416,8 @@
 			background: rgba(0, 0, 0, 0);
 			margin-right: 10rpx;
 		}
-		.update-icon .circ{
+
+		.update-icon .circ {
 			animation: doCric 1s ease;
 		}
 
@@ -401,32 +444,6 @@
 					margin: 5rpx 0 10rpx 0;
 				}
 
-				.category-box {
-					.tag {
-						width: 112rpx;
-						height: 36rpx;
-						border-radius: 4rpx;
-						font-size: 20rpx;
-						margin-right: 8rpx;
-						text-align: center;
-					}
-
-					.tag-item-b {
-						border: 1rpx solid #3A9EFA;
-						color: #3A9EFA;
-					}
-
-					.tag-item-y {
-						border: 1px solid #FFAA00;
-						color: #FFAA00;
-					}
-
-					.tag-item-p {
-						color: #FC9367;
-						border: 1px solid #FC9367;
-					}
-				}
-
 				.title-s {
 					height: 32rpx;
 					font-weight: 400;
@@ -577,6 +594,7 @@
 			}
 
 			.right-con {
+				width: 510rpx;
 				.title {
 					font-weight: 800;
 					height: 35rpx;
@@ -586,46 +604,20 @@
 						width: 48rpx;
 						height: 24rpx;
 						margin-right: 8rpx;
-
-						.title-h {
-							color: #1D1D1D;
-						}
+					}
+					.title-h {
+						width: 450rpx;
+						height: 35rpx;
+						color: #1D1D1D;
 					}
 				}
 
 				.title-s {
-					width: 450rpx;
+					width: 100%;
 					height: 34rpx;
 					font-size: 24rpx;
 					color: #707070;
 				}
-
-				.category-box {
-					.tag {
-						width: 112rpx;
-						height: 36rpx;
-						line-height: 33rpx;
-						border-radius: 4rpx;
-						font-size: 20rpx;
-						margin-right: 16rpx;
-						text-align: center;
-					}
-
-					.tag-item-b {
-						border: 1rpx solid #3A9EFA;
-						color: #3A9EFA;
-					}
-
-					.tag-item-y {
-						border: 1px solid #FFAA00;
-						color: #FFAA00;
-					}
-
-					.tag-item-p {
-						color: #FC9367;
-						border: 1px solid #FC9367;
-					}
-				}
 			}
 		}
 	}
diff --git a/pages/demandHall/demoInvestment/index.vue b/pages/demandHall/demoInvestment/index.vue
index 4864a3c..b2eaca1 100644
--- a/pages/demandHall/demoInvestment/index.vue
+++ b/pages/demandHall/demoInvestment/index.vue
@@ -28,9 +28,9 @@
 							<view class="acea-row row-middle title">
 								<image src="../../../static/images/new-icon.png" mode="" class="new-icon">
 								</image>
-								<view class="title-h">富硒产品</view>
+								<view class="title-h line1">富硒产品</view>
 							</view>
-							<view class="title-s">农业项目、国家扶贫、乡村振兴、优质资源利用、国家大力支持</view>
+							<view class="title-s line2">农业项目、国家扶贫、乡村振兴、优质资源利用、国家大力支持</view>
 							<view class="category-box acea-row">
 								<view class="tag-item-y tag">持续盈利</view>
 								<view class="tag-item-b tag">财务规范</view>
@@ -40,7 +40,7 @@
 					</view>
 					<view class="project-bottom acea-row row-middle">
 						<view class="finance-price">融资金额</view>
-						<view class="price">200万元-300万元</view>
+						<view class="price line1">200万元-300万元</view>
 						<view class="tocheck acea-row row-middle">
 							<image src="../../../static/images/check.png" mode=""></image>
 							查看
@@ -56,14 +56,14 @@
 						<image src="../../../static/images/vip-icon.png" mode="" class="user-icon"></image>
 					</view>
 					<view class="investor-con acea-row row-middle">
-						<view class="name">李岩斌</view>
-						<view class="title-f acea-row row-middle">
+						<view class="name line1">李岩斌</view>
+						<view class="acea-row row-middle">
 							<view>朗玛峰创投</view>
 							<view class="row "></view>
 							<view>合伙人</view>
 						</view>
-						<view class="title-f mt16">意向领域：智能硬件、企业IT服务...</view>
-						<view class="title-f">投资伦次：A轮、A+轮、B轮</view>
+						<view class="line1">意向领域：智能硬件、企业IT服务...</view>
+						<view class="line1">投资伦次：A轮、A+轮、B轮</view>
 					</view>
 					<view class="toContact">
 						<image src="../../../static/images/contact.png" mode=""></image>
@@ -72,53 +72,30 @@
 			</view>
 			
 		</view>
-	<view class="add"><image src="../../../static/images/fabu-close.png"></image></view>
+	<view class="add"><image src="../../../static/images/fabu-close.png"></image></view> 
 	<view class="mask-box" v-if="showScreenDialog">
 	  <view :class="'screen-dialog-box ' + (showScreenDialog ? 'move' : '')">
 	    <view class="screen-list">
-	      <!-- <view class="screen-item">
-	        <view class="screen-title">所有服务</view>
-	        <view class="acea-row">
-	          <view v-for="(item, index) in cagetoryList" :key="index" :class="'item ' + (cagetoryActive == index ? 'item-active' : '')" @tap="cagetoryClick" :data-i="index" :data-item="item">{{item.cagetoryName}}</view>
-	        </view>
-	      </view> -->
-				<view class="screen-item" >
-				  <view class="screen-title" >项目领域</view>
-				  <view class="acea-row">
-				    <view class="item">农林牧鱼</view>
-						<view class="item">农林牧鱼</view>
-						<view class="item">农林牧鱼</view>
-						<view class="item">农林牧鱼</view>
-						<view class="item">农林牧鱼</view>
+				<view class="screen-item">
+				  <view class="screen-title">项目领域</view>
+				  <view class="acea-row row-left" >
+						<view v-for="(item, index) in cagetoryList" :key="index"
+							:class="'item ' + (cagetoryActive == index ? 'item-active' : '')" @tap="cagetoryClick"  
+							:data-i="index" :data-item="item">{{item.cagetoryName}}</view>
 				  </view>
 				</view>
 				<view class="screen-item">
 				  <view class="screen-title">项目阶段</view>
 				  <view class="acea-row">
-				    <view class="item">农林牧鱼</view>
-						<view class="item">农林牧鱼</view>
-						<view class="item">农林牧鱼</view>
-						<view class="item">农林牧鱼</view>
-						<view class="item">农林牧鱼</view>
+				    <view class="item" v-for="(item,index) in 5">农林牧鱼</view>
 				  </view>
 				</view>
 				<view class="screen-item">
 				  <view class="screen-title">项目标签</view>
 				  <view class="acea-row">
-				    <view class="item">农林牧鱼</view>
-						<view class="item">农林牧鱼</view>
-						<view class="item">农林牧鱼</view>
-						<view class="item">农林牧鱼</view>
-						<view class="item">农林牧鱼</view>
+				    <view class="item" v-for="(item,index) in 5">农林牧鱼</view>
 				  </view>
 				</view>
-	      <!-- <view class="screen-item">
-	        <view class="screen-title">商家身份<text class="fz20">(所有商家均实名认证)</text></view>
-	        <view class="acea-row">
-	          <view :class="'item ' + (enterpriseType == 2 ? 'item-active' : '')" @tap="businessChange" data-name="个人认证" data-type="2">个人认证</view>
-	          <view :class="'item ' + (enterpriseType == 1 ? 'item-active' : '')" @tap="businessChange" data-name="企业认证" data-type="1">企业认证</view>
-	        </view>
-	      </view> -->
 	      <view class="submit-box acea-row row-between">
 	        <view class="btn reset" @tap="resetClick">重置</view>
 	        <view class="btn finish" @tap="finishClick">完成</view>
@@ -137,60 +114,40 @@
 	      active: '1',
 				showScreenDialog: false,
 				cagetoryActive: "",
-				//筛选企业/个人
-				resourceCagetoryId: '',
-				// 分类列表
-				enterpriseType: '',
 				//筛选分类
 				choseCagetory: '',
-				choseBusiness: '',
-				cName: "",
 			}
 		},
-		// onLoad: function (options) {
-		//   this.getCagetoryList();
-		// },
+		onLoad: function (options) {
+		  this.getCagetoryList();
+		},
 		methods:{
 			tabClick(e) {
 				this.setData({
 					active: e.currentTarget.dataset.i,
 				}) 
 			},
-			// getCagetoryList() {
-			//   app.http('get', 'ResourcesCagetory/listResourcesCagetory').then(res => {
-			//     if (res.data.success) {
-			//       this.setData({
-			//         cagetoryList: res.data.data
-			//       });
-			//     }
-			//   });
-			// },
-			showDialog() {
-			  this.setData({
-			    showScreenDialog: true
+			getCagetoryList() {
+			  app.http('get', 'ResourcesCagetory/listResourcesCagetory').then(res => {
+			    if (res.data.success) {
+			      this.setData({
+			        cagetoryList: res.data.data
+			      });
+			    }
 			  });
 			},
-			showhaha() {
+			showDialog() {
 			  this.setData({
 			    showScreenDialog: true
 			  });
 			},
-			// cagetoryClick(e) {
-			//   let item = e.currentTarget.dataset.item;
-			//   let i = e.currentTarget.dataset.i;
-			//   console.log(item);
-			//   this.setData({
-			//     cagetoryActive: i,
-			//     resourceCagetoryId: item.id,
-			//     choseCagetory: item.cagetoryName
-			//   });
-			// },
-			businessChange(e) {
-			  let type = e.currentTarget.dataset.type;
-			  let name = e.currentTarget.dataset.name;
+			cagetoryClick(e) {
+			  let item = e.currentTarget.dataset.item;
+			  let i = e.currentTarget.dataset.i;
+			  console.log(item);
 			  this.setData({
-			    choseBusiness: name,
-			    enterpriseType: type
+			    cagetoryActive: i,
+			    choseCagetory: item.cagetoryName
 			  });
 			},
 			
@@ -202,11 +159,7 @@
 			
 			resetClick() {
 			  this.setData({
-			    cName: '',
 			    cagetoryActive: null,
-			    resourceCagetoryId: '',
-			    enterpriseType: '',
-			    choseBusiness: '',
 			    choseCagetory: '',
 			  });
 			},
@@ -240,6 +193,7 @@
 			border: 2rpx solid #FF5100;
 			border-radius: 8rpx;
 			margin: 0 auto;
+			position: relative;
 			.search-img {
 				width: 35rpx;
 				height: 35rpx;
@@ -247,12 +201,14 @@
 			}
 		}
 		.search {
+			// margin-left: auto;
+			position: absolute;
+			right: -2rpx;
 			width: 132rpx;
 			height: 68rpx;
 			background: linear-gradient(39deg, #FF5100 0%, #FFA074 100%);
 			border-radius: 8rpx;
 			color: #fff;
-			margin-left: auto;
 		}
 		.resource-tabs {
 			width: 100%;
@@ -335,16 +291,19 @@
 						margin-right: 18rpx;
 					}
 					.right-con {
+						width: 450rpx;
 						.title {
-							line-height: 24rpx;
+							line-height: 35rpx;
 							font-weight: 800;
 							.new-icon {
 								width: 48rpx;
 								height: 24rpx;
 								margin-right: 8rpx;
-								.title-h {
-									color: #1D1D1D;
-								}
+							}
+							.title-h {
+								width: 390rpx;
+								height: 35rpx;
+								color: #1D1D1D;
 							}
 						}
 						.title-s {
@@ -354,23 +313,29 @@
 							color: #707070;
 						}
 						.category-box {
+							width: 100%;
+							height: 36rpx;
+							overflow: hidden;
 							.tag {
-								width: 112rpx;
+								padding: 0 10rpx;
 								height: 36rpx;
-								line-height: 33rpx;
+								line-height: 34rpx;
 								border-radius: 4rpx;
 								font-size: 20rpx;
 								margin-right: 16rpx;
 								text-align: center;
 							}
+						
 							.tag-item-b {
 								border: 1rpx solid #3A9EFA;
 								color: #3A9EFA;
 							}
+						
 							.tag-item-y {
 								border: 1px solid #FFAA00;
 								color: #FFAA00;
 							}
+						
 							.tag-item-p {
 								color: #FC9367;
 								border: 1px solid #FC9367;
@@ -379,8 +344,9 @@
 					}
 				}
 				.project-bottom {
+					width: 100%;
 					height: 40rpx;
-					margin: 0 45rpx 0 20rpx;
+					padding: 0 45rpx 0 20rpx;
 					color: #FF5100;
 					font-size: 24rpx;
 					.finance-price {
@@ -388,6 +354,7 @@
 						font-weight: 900;
 					}
 					.price {
+						width: 350rpx;
 						font-weight: 900;
 					}
 					.tocheck {
@@ -439,6 +406,7 @@
 					color: #707070;
 					.name {
 						width: 100%;
+						height: 38rpx;
 						font-size: 32rpx;
 						font-weight: bold;
 						color: #1D1D1D;
@@ -528,7 +496,7 @@
 	  width: 152rpx;
 	  height: 64rpx;
 	  line-height: 64rpx;
-	  text-align: center;
+	  text-align: center;                                                                           
 	  font-size: 24rpx;
 	  color: #666666;
 	  background: #F6F6F6;
@@ -538,9 +506,8 @@
 	  margin-right: 0;
 	}
 	.screen-item .item-active{
-	  border: 2rpx solid #FF6E33;
-	  color: #FE7D26;
-	  background: #FDEFE6;
+	  color: #fff;
+	  background: #FF6D31;
 	}
 	.across-line{
 	  width: 44rpx;
diff --git a/pages/demandHall/enterprisePage/index.vue b/pages/demandHall/enterprisePage/index.vue
index 31f36be..05b6391 100644
--- a/pages/demandHall/enterprisePage/index.vue
+++ b/pages/demandHall/enterprisePage/index.vue
@@ -14,15 +14,15 @@
 			</view>
 			<view class="contact-box acea-row row-column-between">
 				<view class="acea-row row-middle">
-					<image src="/static/images/home/c-location.png" class="contact-icon"></image>
+					<image src="/static/images/home/c1.png" class="contact-icon"></image>
 					<text class="line1">{{detail.enterpriseAddress}}</text>
 				</view>
 				<view class="acea-row row-middle" >
-					<image src="/static/images/home/c-site.png" class="contact-icon"></image>
+					<image src="/static/images/home/c2.png" class="contact-icon"></image>
 					<text class="line1">{{detail.enterpriseNet}}</text>
 				</view>
 				<view class="acea-row row-middle">
-					<image src="/static/images/home/c-phone.png" class="contact-icon"></image>
+					<image src="/static/images/home/c3.png                          " class="contact-icon"></image>
 					<text class="line1">{{detail.enterprisePhone}}</text>
 				</view>
 			</view>
@@ -178,9 +178,10 @@
 				width: 134rpx;
 				height: 134rpx;
 				margin-right: 26rpx;
+				border-radius: 8rpx;
 			}
 			.info-right {
-				width: 470rpx;
+				width: 510rpx;
 				height: 134rpx;
 				color: #FFFFFF;
 				font-size: 24rpx;
@@ -189,28 +190,40 @@
 					font-size: 32rpx;
 				}
 				.category-box {
+					width: 100%;
+					height: 36rpx;
+					overflow: hidden;
 					.tag {
 						width: auto;
-						padding: 0 10rpx;
+						padding: 0 15rpx;
 						height: 36rpx;
 						line-height: 36rpx;
 						border-radius: 8rpx;
 						font-size: 20rpx;
-						margin-right: 12rpx;
+						margin-right: 16rpx;
 						text-align: center;
-						color: #fff;
 					}
+				
 					.tag-item-b {
 						background: #5D8AFD;
+						color: #fff;
 					}
+				
 					.tag-item-y {
+						border: 1px solid #FFAA00;
+						color: #fff;
+						
+					}
+				
+					.tag-item-p {
+						color: #fff;
 						background: #FD855B;
 					}
 				}
 			}
 		}
 		.contact-box{
-			width: 460rpx;
+			width: 500rpx;
 			height: 106rpx;
 			font-size: 24rpx;
 			font-weight: 500;
@@ -222,7 +235,7 @@
 				margin-right: 10rpx;
 			}
 			.line1{
-				width: 400rpx;
+				width: 470rpx;
 				line-height: 30rpx;
 			}
 		}
diff --git a/pages/demandHall/enterpriseServer/index.vue b/pages/demandHall/enterpriseServer/index.vue
index 8e89f8d..6209c4d 100644
--- a/pages/demandHall/enterpriseServer/index.vue
+++ b/pages/demandHall/enterpriseServer/index.vue
@@ -48,15 +48,13 @@
 						{{item.enterpriseType == 1 ? '企业' : '个人'}}
 					</view>
 					<view class="business-con acea-row">
-						<view>
 							<image :src="item.enterpriseLogo" class="logo-img"></image>
-						</view>
-						<view>
-							<view class="title-h">{{item.enterpriseName}}</view>
+						<view class="con-right">
+							<view class="title-h line1">{{item.enterpriseName}}</view>
 							<view class="category-box acea-row">
 								<view class="tag-item-b tag">{{item.cname}}</view>
 							</view>
-							<view class="title-s">{{item.enterpriseTitle}}</view>
+							<view class="title-s line2">{{item.enterpriseTitle}}</view>
 						</view>
 					</view>
 					<view class="business-img acea-row row-around" v-if="item.imgPaths.length > 0">
@@ -248,7 +246,7 @@
 	}
 </script>
 
-<style>
+<style lang="less">
 	image{
 		border-radius: 8rpx;
 	}
@@ -274,6 +272,7 @@
 		border: 2rpx solid #FF5100;
 		border-radius: 8rpx;
 		margin: 0 auto;
+		position: relative;
 	}
 
 	.search-box image {
@@ -281,14 +280,19 @@
 		height: 35rpx;
 		margin: 0 29rpx 0 52rpx;
 	}
+	.search-box input {
+		width: 400rpx;
+	}
 
 	.search {
-		margin-left: auto;
+		/* margin-left: auto; */
 		width: 132rpx;
 		height: 66rpx;
 		background: linear-gradient(39deg, #FF5100 0%, #FFA074 100%);
 		border-radius: 8rpx;
 		color: #fff;
+		position: absolute;
+		right: -2rpx;
 	}
 
 	.resource-tabs {
@@ -370,18 +374,39 @@
 		border-radius: 12rpx;
 	}
 
-	.user-info {
-		margin: 8rpx 0 0rpx 20rpx;
+	.enterprise-info {
+		margin: 8rpx 20rpx 0rpx 20rpx;
 		padding-bottom: 16rpx;
 	}
-
-	.user-name {
-		height: 40rpx;
-		color: #1D1D1D;
-		margin: 0 10rpx 0 16rpx;
-	}
 	.category-box{
 		width: 100%;
+		height: 36rpx;
+		overflow: hidden;
+		.tag {
+			width: auto;
+			height: 36rpx;
+			line-height: 34rpx;
+			border-radius: 4rpx;
+			font-size: 20rpx;
+			margin-right: 8rpx;
+			text-align: center;
+			padding: 0 10rpx;
+		}
+		
+		.tag-item-b {
+			border: 1rpx solid #3A9EFA;
+			color: #3A9EFA;
+		}
+		
+		.tag-item-y {
+			border: 1px solid #FFAA00;
+			color: #FFAA00;
+		}
+		
+		.tag-item-p {
+			color: #FC9367;
+			border: 1px solid #FC9367;
+		}
 	}
 	.tag {
 		width: auto;
@@ -407,18 +432,21 @@
 		color: #FC9367;
 		border: 1px solid #FC9367;
 	}
-
+	.enterprise-name{
+		max-width: 382rpx;
+		height: 40rpx;
+		color: #1D1D1D;
+		margin: 0 10rpx 0 16rpx;
+	}
 	.todetails {
 		width: 148rpx;
 		height: 44rpx;
 		line-height: 44rpx;
 		background: linear-gradient(141deg, #FFA782 0%, #FF6D31 100%);
 		border-radius: 8rpx;
-		position: absolute;
-		right: 18rpx;
-		bottom: 38rpx;
 		text-align: center;
 		color: #fff;
+		margin-left: auto;
 	}
 
 	.enterprise-list {
@@ -427,7 +455,6 @@
 		margin: 0 auto;
 		margin-top: 32rpx;
 		border-radius: 12rpx;
-		position: relative;
 	}
 
 	.enterprise-price {
@@ -455,7 +482,6 @@
 
 	.content-right {
 		width: 456rpx;
-		position: relative;
 	}
 
 	.content-right>.supply-screen {
@@ -490,40 +516,40 @@
 	.bg2 {
 		background: rgba(255, 170, 0, 0.63);
 	}
-
-
 	.business-con {
+		width: 100%;
 		margin: 8rpx 20rpx 16rpx 20rpx;
+		.logo-img {
+			width: 154rpx;
+			height: 154rpx;
+			margin-right: 20rpx;
+		}
+		.con-right{
+			width: 450rpx;
+			.title-h {
+				width: 100%;
+				height: 44rpx;
+				font-size: 32rpx;
+				color: #1D1D1D;
+				margin-bottom: 8rpx;
+			}
+			.title-s {
+				width: 456rpx;
+				height: 65rpx;
+				font-size: 24rpx;
+				color: #666666;
+				margin-top: 10rpx;
+				overflow: hidden;
+				text-overflow: ellipsis;
+			}
+		}
+			
 	}
-
-	.logo-img {
-		width: 154rpx;
-		height: 154rpx;
-		margin-right: 20rpx;
-	}
-
-	.title-h {
-		height: 44rpx;
-		font-size: 32rpx;
-		color: #1D1D1D;
-		margin-bottom: 8rpx;
-	}
-
-	.title-s {
-		width: 456rpx;
-		height: 65rpx;
-		font-size: 24rpx;
-		color: #666666;
-		margin-top: 10rpx;
-		overflow: hidden;
-		text-overflow: ellipsis;
-	}
-
 	.business-img {
 		width: 630rpx;
 		height: 176rpx;
 		margin: 0 20rpx;
-		padding-bottom: 30rpx;
+		overflow: hidden;
 	}
 
 	.business-img image {
@@ -606,6 +632,7 @@
 	}
 
 	.screen-item .item-active {
+		line-height: 44rpx;
 		border: 2rpx solid #FF6E33;
 		color: #FE7D26;
 		background: #FDEFE6;
diff --git a/pages/demandHall/newProject/index.vue b/pages/demandHall/newProject/index.vue
new file mode 100644
index 0000000..650a920
--- /dev/null
+++ b/pages/demandHall/newProject/index.vue
@@ -0,0 +1,160 @@
+<template>
+	<!--pages/release/companyAuth/index.wxml-->
+	<view class="auth-page">
+		<view class="company-info-box">
+			<view class="form-item acea-row row-between row-middle">
+				<view class="label">项目名称<text class="asterisk">*</text></view>
+				<view class="inp-box">
+					<input type="text" :value="form.legalPersonName" @input="inpChange" data-type="name"
+						placeholder="请输入">
+				</view>
+			</view>
+			<view class="form-item acea-row row-between row-middle">
+				<view class="label">项目领域<text class="asterisk">*</text></view>
+				<view class="inp-box">
+					<picker class="pick-box" @change="" mode="selector">
+						<view class="picker row-middle">{{'请选择'}}
+							<image src="../../../static/images/arror-right.png" mode="" class="toright"></image>
+						</view>
+					</picker>
+				</view>
+			</view>
+			<view class="form-item acea-row row-between row-middle">
+				<view class="label">融资阶段<text class="asterisk">*</text></view>
+				<view class="inp-box">
+					<picker class="pick-box" @change="" mode="selector">
+						<view class="picker row-middle">{{'请选择'}}
+							<image src="../../../static/images/arror-right.png" mode="" class="toright"></image>
+						</view>
+					</picker>
+				</view>
+			</view>
+			<view class="form-item acea-row row-between row-middle">
+				<view class="label">融资金额<text class="asterisk">*</text></view>
+				<view class="inp-box">
+					<input type="text" @input="inpChange" data-type="" placeholder="请输入（必填）">
+				</view>
+			</view>
+			<view class="form-item acea-row row-between row-middle">
+				<view class="label">项目标签<text class="asterisk">*</text></view>
+				<view class="inp-box">
+					<picker class="pick-box" @change="" mode="selector">
+						<view class="picker row-middle">{{'请选择（3项）'}}
+							<image src="../../../static/images/arror-right.png" mode="" class="toright"></image>
+						</view>
+					</picker>
+				</view>
+			</view>
+			<view class="form-item acea-row row-between row-middle">
+				<view class="label">项目图片<text class="asterisk">*</text></view>
+				<view class="inp-box">
+					<picker class="pick-box" @change="" mode="selector">
+						<view class="picker row-middle">{{'上传'}}
+							<image src="../../../static/images/arror-right.png" mode="" class="toright"></image>
+						</view>
+					</picker>
+				</view>
+			</view>
+			<view class="form-item acea-row row-between row-middle">
+				<view class="label">所属区域<text class="asterisk">*</text></view>
+				<view class="inp-box">
+					<picker class="pick-box" @change="" mode="selector">
+						<view class="picker row-middle">{{'请选择'}}
+							<image src="../../../static/images/arror-right.png" mode="" class="toright"></image>
+						</view>
+					</picker>
+				</view>
+			</view>
+			<view class="form-item ">
+				<view class="label">项目亮点<text class="asterisk">*</text></view>
+				<view class="area-box">
+					<textarea value="" placeholder="请填写项目亮点" class="input"/>
+				</view>
+			</view>
+			<view class="form-item ">
+				<view class="label">项目详情<text class="asterisk">*</text></view>
+				<view class="area-box">
+					<textarea value="" placeholder="请填写项目详细信息" class="input"/>
+				</view>
+			</view>
+		</view>
+		<view class="submit-btn" @tap="submit">保存并提交</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+
+			}
+		}
+	}
+</script>
+<style>
+	page {
+		background-color: #F8F8F8;
+		font-size: 28rpx;
+	}
+
+	label {
+		margin-right: 40rpx;
+	}
+
+	.company-info-box {
+		width: 100%;
+		padding: 0rpx 40rpx;
+		margin-top: 32rpx;
+		background-color: #fff;
+	}
+
+	.form-item {
+		font-size: 28rpx;
+		color: #1D1D1D;
+		padding: 45rpx 0;
+		border-bottom: 2rpx solid #EEEEEE;
+	}
+
+	.form-item .inp-box {
+		width: 70%;
+		text-align: right;
+	}
+	.inp-box{
+		color: #848484;
+	}
+
+	.asterisk {
+		color: #FF6D31;
+	}
+
+	.toright {
+		width: 10rpx;
+		height: 20rpx;
+		margin-left: 10rpx;
+	}
+	.area-box{
+		width: 100%;
+		height: auto;
+		min-height: 134rpx;
+		background-color: #F2F2F2;
+		border-radius: 12rpx;
+		margin-top: 14rpx;
+	}
+	.input{
+		width: 100%;
+		height: auto;
+		min-height: 134rpx;
+		padding: 12rpx 24rpx;
+	}
+	.submit-btn {
+		width: 670rpx;
+		height: 76rpx;
+		background: linear-gradient(144deg, #FFA782 0%, #FF5100 100%);
+		border-radius: 38rpx;
+		color: #fff;
+		font-size: 28rpx;
+		line-height: 76rpx;
+		text-align: center;
+		margin: 40rpx auto;
+	}
+</style>
diff --git a/pages/demandHall/projectDetail/index.vue b/pages/demandHall/projectDetail/index.vue
index e3dc818..e03bd10 100644
--- a/pages/demandHall/projectDetail/index.vue
+++ b/pages/demandHall/projectDetail/index.vue
@@ -3,9 +3,9 @@
 		<view class="content">
 			<view class="acea-row content-box">
 				<view class="content-left acea-row row-middle">
-					<view class="title">蜂蜜供应商</view>
+					<view class="title line1">蜂蜜供应商</view>
 					<view class="label">A轮</view>
-					<view class="title-s">优质的供应源、多元化的土地使用、快速扩张的能力、稳定的分销渠道</view>
+					<view class="title-s line2">优质的供应源、多元化的土地使用、快速扩张的能力、稳定的分销渠道</view>
 				</view>
 				<image src="../../../static/images/home/menu6.png"></image>
 			</view>
@@ -14,33 +14,36 @@
 				<view class="tag-item-y tag">财务规范</view>
 				<view class="tag-item-p tag">零负债</view>
 			</view>
-		</view>
-		<view class="region acea-row row-middle">
-			<view class="regin-box br1">
-				<view class="title-l">项目领域</view>
-				<view class="title-m">农业</view>
-			</view>
-			<view class="regin-box">
-				<view class="title-l">融资金额</view>
-				<view class="title-m">200万元-300万元</view>
+			<view class="region acea-row row-middle">
+				<view class="regin-box br1">
+					<view class="title-l">项目领域</view>
+					<view class="title-m">农业</view>
+				</view>
+				<view class="regin-box">
+					<view class="title-l">融资金额</view>
+					<view class="title-m">200万元-300万元</view>
+				</view>
 			</view>
 		</view>
 		<view class="detials-box">
-			<view class="title acea-row row-middle">
-				<image src="../../../static/images/shu.png" mode=""></image>项目详情
+			<view class="pa20">
+				<view class="title acea-row row-middle">
+					<image src="../../../static/images/shu.png" mode=""></image>项目详情
+				</view>
+				<view>所属区域：武汉</view>
+				<view class="detail-con">项目详情：融资方的合作标准封锁地带</view>
 			</view>
-			<view>所属区域：武汉</view>
-			<view>项目详情：融资方的合作标准</view>
-		</view>
-		<!-- <view class="mask-box acea-row row-center-wrapper">
-			<view class="acea-row row-center-wrapper mask-con">
-				<view class="con">投资方认证后可查看项目详情</view>
-				<view class="authentication-btn">立即认证</view>
+			<view class="mask-box acea-row row-center-wrapper">
+				<view class="acea-row row-center-wrapper mask-con">
+					<view class="con">投资方认证后可查看项目详情</view>
+					<view class="authentication-btn">立即认证</view>
+				</view>
 			</view>
-		</view> -->
+		</view>
+
 		<view class="recommend-box">
 			<view class="title acea-row row-middle">
-				<image src="../../../static/images/shu.png" mode=""></image>项目详情
+				<image src="../../../static/images/shu.png" mode=""></image>项目推荐
 			</view>
 			<view class="update-box acea-row row-middle">
 				<view>今日已更新7个</view>
@@ -52,8 +55,8 @@
 				<view class="recommend-list acea-row" v-for="(item,index) in 3">
 					<image src="../../../static/images/business-img1.png" mode=""></image>
 					<view class="recommend-bottom acea-row row-column-between">
-						<view class="title-item">蜂蜜供应商</view>
-						<view class="line1">优质的供应源，多元化的土地sssssssssssss</view>
+						<view class="title-item line1">蜂蜜供应商</view>
+						<view class="line1">优质的供应源，多元化的土地</view>
 						<view class="category-box acea-row">
 							<view class="tag-item-b tag">持续盈利</view>
 							<view class="tag-item-y tag">财务规范</view>
@@ -85,6 +88,8 @@
 		width: 100%;
 		height: 284rpx;
 		background: #fff;
+		position: relative;
+		margin-bottom: 90rpx;
 		padding: 20rpx 40rpx 0 40rpx;
 
 		.content-box {
@@ -92,11 +97,18 @@
 			height: 130rpx;
 			margin-bottom: 25rpx;
 
+			image {
+				width: 128rpx;
+				height: 128rpx;
+				margin-left: auto;
+			}
+
 			.content-left {
 				width: 536rpx;
 
 				.title {
-					width: 208rpx;
+					width: auto;
+					max-width: 280rpx;
 					height: 52rpx;
 					font-size: 36rpx;
 					margin-right: 22rpx;
@@ -123,22 +135,21 @@
 				}
 			}
 		}
-
-		.content-box image {
-			width: 128rpx;
-			height: 128rpx;
-			margin-left: auto;
-		}
-
 	}
 
 	.category-box {
+		width: 100%;
+		height: 36rpx;
+		overflow: hidden;
+
 		.tag {
-			width: 112rpx;
+			width: auto;
+			padding: 0 10rpx;
 			height: 36rpx;
+			line-height: 34rpx;
 			border-radius: 4rpx;
 			font-size: 20rpx;
-			margin-right: 5rpx;
+			margin-right: 16rpx;
 			text-align: center;
 		}
 
@@ -165,7 +176,7 @@
 		box-shadow: 0px 6rpx 12rpx rgba(0, 0, 0, 0.16);
 		border-radius: 12rpx;
 		position: relative;
-		top: -48rpx;
+		bottom: -21rpx;
 		margin: 0 auto;
 
 		.regin-box {
@@ -185,7 +196,6 @@
 				color: #FF5100;
 			}
 		}
-
 		.br1 {
 			border-right: 1rpx solid #E9E9E9;
 		}
@@ -193,69 +203,77 @@
 
 	.detials-box {
 		width: 750rpx;
-		height: 384rpx;
+		height: auto;
+		min-height: 384rpx;
 		background: #FFFFFF;
 		font-size: 28rpx;
 		font-weight: 400;
 		color: #343434;
-		padding: 24rpx 0 0 32rpx;
-	}
+		position: relative;
 
-	.detials-box view {
-		margin-bottom: 22rpx;
-	}
+		.pa20 {
+			width: 100%;
+			height: 100%;
+			padding: 24rpx 32rpx 10rpx 32rpx;
+			filter: blur(6rpx);
+			view {
+				margin-bottom: 15rpx;
+			}
 
-	.title {
-		height: 52rpx;
-		font-size: 36rpx;
-		font-family: PingFang SC;
-		font-weight: 600;
-		color: #343434;
-	}
+			.detail-con {
+				width: 100%;
+				height: auto;
+				overflow: hidden;
+			}
+		}
 
-	.title image {
-		width: 18rpx;
-		height: 36rpx;
-		margin-right: 10rpx;
-	}
+		.mask-box {
+			width: 750rpx;
+			height: 100%;
+			background: rgba(255,255,255,0.7);
+			box-shadow: 0px 6rpx 12rpx rgba(0, 0, 0, 0.01);
+			position: absolute;
+			top: 0;
 
-	.mask-box {
-		width: 750rpx;
-		height: 384rpx;
-		background: #fff;
-		box-shadow: 0px 6rpx 12rpx rgba(0, 0, 0, 0.01);
-		filter: blur(6rpx);
-		position: fixed;
-		top: 390rpx;
-	}
+			.mask-con {
+				width: 484rpx;
+				height: 136rpx;
+				z-index: 9999;
 
-	.mask-con {
-		width: 484rpx;
-		height: 136rpx;
-		z-index: 9999;
-	}
+				.con {
+					font-size: 36rpx;
+					font-weight: 600;
+					color: #FF5100;
+					margin-bottom: 20rpx;
+				}
 
-	.con {
-		font-size: 36rpx;
-		font-weight: 600;
-		color: #FF5100;
-		margin-bottom: 20rpx;
+				.authentication-btn {
+					width: 148rpx;
+					height: 52rpx;
+					background: linear-gradient(315deg, #FF6D31 0%, #FFC2AA 100%);
+					border-radius: 12rpx;
+					font-size: 24rpx;
+					font-weight: 600;
+					line-height: 52rpx;
+					color: #FFFFFF;
+					text-align: center;
+				}
+			}
+		}
 	}
 
-	.authentication-btn {
-		width: 148rpx;
+	.title {
 		height: 52rpx;
-		background: linear-gradient(315deg, #FF6D31 0%, #FFC2AA 100%);
-		border-radius: 12rpx;
-		font-size: 24rpx;
+		font-size: 36rpx;
+		font-family: PingFang SC;
 		font-weight: 600;
-		line-height: 52rpx;
-		color: #FFFFFF;
-		text-align: center;
-	}
+		color: #343434;
 
-	.recommend-box .title {
-		margin-left: 32rpx;
+		image {
+			width: 18rpx;
+			height: 36rpx;
+			margin-right: 10rpx;
+		}
 	}
 
 	.recommend-box {
@@ -263,74 +281,78 @@
 		height: 528rpx;
 		background: #FFFFFF;
 		margin: 32rpx 0;
-		// padding: 24rpx 0 0 32rpx;
 		padding: 24rpx 0 0 0rpx;
-	}
 
-	.update-box {
-		width: 670rpx;
-		height: 48rpx;
-		color: #FF6D31;
-		font-size: 24rpx;
-		margin-bottom: 26rpx;
-		margin-left: 32rpx;
-	}
+		.title {
+			margin-left: 32rpx;
+		}
 
-	.update-icon {
-		width: 118rpx;
-		height: 48rpx;
-		background: #FFFFFF;
-		box-shadow: 0rpx 6rpx 12rpx rgba(0, 0, 0, 0.16);
-		border-radius: 24rpx;
-		font-size: 20rpx;
-		line-height: 26rpx;
-		color: #666666;
-		margin-left: auto;
-	}
+		.update-box {
+			width: auto;
+			height: 48rpx;
+			color: #FF6D31;
+			font-size: 24rpx;
+			margin: 0rpx 32rpx 26rpx 32rpx;
+
+			.update-icon {
+				width: 118rpx;
+				height: 48rpx;
+				background: #FFFFFF;
+				box-shadow: 0rpx 6rpx 12rpx rgba(0, 0, 0, 0.16);
+				border-radius: 24rpx;
+				font-size: 20rpx;
+				line-height: 26rpx;
+				color: #666666;
+				margin-left: auto;
+
+				image {
+					width: 26rpx;
+					height: 26rpx;
+					background: rgba(0, 0, 0, 0);
+					margin-right: 10rpx;
+				}
+			}
+		}
 
-	.update-icon image {
-		width: 26rpx;
-		height: 26rpx;
-		background: rgba(0, 0, 0, 0);
-		margin-right: 10rpx;
-	}
+		.scroll-view_H {
+			width: 100%;
+			height: 345rpx;
+			white-space: nowrap;
+
+			.recommend-list {
+				width: 392rpx;
+				background: #FFFFFF;
+				box-shadow: 0px 6rpx 12rpx rgba(0, 0, 0, 0.16);
+				border-radius: 12rpx;
+				font-size: 24rpx;
+				color: #707070;
+				display: inline-block;
+				margin: 0 32rpx 0 0rpx;
 
-	.scroll-view_H {
-		width: 100%;
-		height: 345rpx;
-		white-space: nowrap;
-	}
+				image {
+					width: 392rpx;
+					height: 194rpx;
+					border-radius: 12rpx 12rpx 0 0;
+				}
+			}
 
-	.recommend-list {
-		width: 392rpx;
-		background: #FFFFFF;
-		box-shadow: 0px 6rpx 12rpx rgba(0, 0, 0, 0.16);
-		border-radius: 12rpx;
-		font-size: 24rpx;
-		color: #707070;
-		display: inline-block;
-		margin: 0 32rpx 0 0rpx;
-	}
-	.recommend-list:nth-child(1){
-		margin-left: 32rpx;
-	}
-	.recommend-list image {
-		width: 392rpx;
-		height: 194rpx;
-		border-radius: 12rpx 12rpx 0 0;
-	}
+			.recommend-list:nth-child(1) {
+				margin-left: 32rpx;
+			}
 
-	.recommend-bottom {
-		height: 130rpx;
-		padding: 0 16rpx 15rpx 24rpx;
-	}
+			.recommend-bottom {
+				height: 130rpx;
+				padding: 0 16rpx 15rpx 24rpx;
 
-	.title-item {
-		height: 30rpx;
-		line-height: 30rpx;
-		font-size: 28rpx;
-		font-weight: 600;
-		color: #1D1D1D;
+				.title-item {
+					height: 30rpx;
+					line-height: 30rpx;
+					font-size: 28rpx;
+					font-weight: 600;
+					color: #1D1D1D;
+				}
+			}
+		}
 	}
 
 	.footer {
@@ -338,18 +360,18 @@
 		height: 132rpx;
 		background: #FFFFFF;
 		padding: 32rpx 32rpx 0 0;
-	}
 
-	.toContact {
-		width: 223rpx;
-		height: 76rpx;
-		line-height: 76rpx;
-		text-align: center;
-		background: linear-gradient(144deg, #FFA782 0%, #FF5100 100%);
-		border-radius: 38rpx;
-		margin-left: auto;
-		font-size: 32rpx;
-		font-weight: 500;
-		color: #FFFFFF;
+		.toContact {
+			width: 223rpx;
+			height: 76rpx;
+			line-height: 76rpx;
+			text-align: center;
+			background: linear-gradient(144deg, #FFA782 0%, #FF5100 100%);
+			border-radius: 38rpx;
+			margin-left: auto;
+			font-size: 32rpx;
+			font-weight: 500;
+			color: #FFFFFF;
+		}
 	}
 </style>
diff --git a/pages/demandHall/projectManage/index.vue b/pages/demandHall/projectManage/index.vue
new file mode 100644
index 0000000..cd313ba
--- /dev/null
+++ b/pages/demandHall/projectManage/index.vue
@@ -0,0 +1,312 @@
+<template>
+	<view class="Manager-page">
+		<view class="resource-tabs acea-row row-around">
+			<view :class="'tab ' + (active == 1 ? 'tab-a' : '')" data-i="1" @tap="tabClick">发布中</view>
+			<view :class="'tab ' + (active == 2 ? 'tab-a' : '')" data-i="2" @tap="tabClick">审核中</view>
+			<view :class="'tab ' + (active == 3 ? 'tab-a' : '')" data-i="3" @tap="tabClick">草稿箱</view>
+			<view :class="'tab ' + (active == 4 ? 'tab-a' : '')" data-i="4" @tap="tabClick">已发布</view>
+		</view>
+		<view class="modular-box">
+			<viwe class="project-box" v-if="active == 1">
+				<view class="project-list" v-for="(item,index) in 2">
+					<view class="project-top acea-row row-left">
+						<image src="../../../static/images/home/menu6.png" class="project-img"></image>
+						<view class="right-con acea-row row-column-between">
+							<view class="acea-row row-middle title">
+								<image src="../../../static/images/new-icon.png" mode="" class="new-icon">
+								</image>
+								<view class="title-h line1">富硒产品</view>
+							</view>
+							<view class="title-s line2">农业项目、国家扶贫、乡村振兴、优质资源利用、国家大力支持</view>
+							<view class="category-box acea-row">
+								<view class="tag-item-y tag">持续盈利</view>
+								<view class="tag-item-b tag">财务规范</view>
+								<view class="tag-item-p tag">零负债</view>
+							</view>
+						</view>
+					</view>
+					<view class="project-bottom acea-row row-middle">
+						<view class="finance-price">融资金额</view>
+						<view class="price line1">200万元-300万元</view>
+						<view class="tocheck acea-row row-center">取消发布</view>
+					</view>
+				</view>
+			</viwe>
+			<viwe class="project-box" v-if="active == 2">
+				<view class="project-list">
+					<view class="project-top acea-row row-left">
+						<image src="../../../static/images/home/menu6.png" class="project-img"></image>
+						<view class="right-con acea-row row-column-between">
+							<view class="acea-row row-middle title">
+								<image src="../../../static/images/new-icon.png" mode="" class="new-icon">
+								</image>
+								<view class="title-h line1">富硒产品</view>
+								<view class="colorO">等待审核</view>
+							</view>
+							<view class="title-s line2">农业项目、国家扶贫、乡村振兴、优质资源利用、国家大力支持</view>
+							<view class="category-box acea-row">
+								<view class="tag-item-y tag">持续盈利</view>
+								<view class="tag-item-b tag">财务规范</view>
+								<view class="tag-item-p tag">零负债</view>
+							</view>
+						</view>
+					</view>
+					<view class="project-bottom acea-row row-middle">
+						<view class="finance-price">融资金额</view>
+						<view class="price line1">200万元-300万元</view>
+						<view class="tocheck acea-row row-center">撤回审核</view>
+					</view>
+				</view>
+			</viwe>
+			<viwe class="project-box" v-if="active == 3">
+				<view class="project-list">
+					<view class="project-top acea-row row-left">
+						<image src="../../../static/images/home/menu6.png" class="project-img"></image>
+						<view class="right-con acea-row row-column-between">
+							<view class="acea-row row-middle title">
+								<image src="../../../static/images/new-icon.png" mode="" class="new-icon">
+								</image>
+								<view class="title-h line1">富硒产品</view>
+								<view class="colorO">未编辑完成</view>
+							</view>
+							<view class="title-s line2">农业项目、国家扶贫、乡村振兴、优质资源利用、国家大力支持</view>
+							<view class="category-box acea-row">
+								<view class="tag-item-y tag">持续盈利</view>
+								<view class="tag-item-b tag">财务规范</view>
+								<view class="tag-item-p tag">零负债</view>
+							</view>
+						</view>
+					</view>
+					<view class="project-bottom acea-row">
+						<view class="tocheck acea-row row-center">编辑发布</view>
+						<view class="todetail acea-row row-center">删除项目</view>
+					</view>
+				</view>
+				<view class="project-list">
+					<view class="project-top acea-row row-left">
+						<image src="../../../static/images/home/menu6.png" class="project-img"></image>
+						<view class="right-con acea-row row-column-between">
+							<view class="acea-row row-middle title">
+								<image src="../../../static/images/new-icon.png" mode="" class="new-icon">
+								</image>
+								<view class="title-h line1">富硒产品</view>
+								<view class="colorO">审核未通过</view>
+							</view>
+							<view class="title-s line2">农业项目、国家扶贫、乡村振兴、优质资源利用、国家大力支持</view>
+							<view class="category-box acea-row">
+								<view class="tag-item-y tag">持续盈利</view>
+								<view class="tag-item-b tag">财务规范</view>
+								<view class="tag-item-p tag">零负债</view>
+							</view>
+						</view>
+					</view>
+					<view class="text">未通过原因:不符合项目要求,需要重新修改项目...</view>
+					<view class="project-bottom acea-row">
+						<view class="time acea-row row-bottom">2021.12.21申请</view>
+						<view class="tocheck acea-row row-center">编辑发布</view>
+						<view class="todetail acea-row row-center">删除项目</view>
+					</view>
+				</view>
+			</viwe>
+			<viwe class="project-box" v-if="active == 4">
+				12
+			</viwe>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				active: '1',
+			}
+		},
+		methods: {
+			tabClick(e) {
+				this.setData({
+					active: e.currentTarget.dataset.i,
+				})
+			},
+		},
+	}
+</script>
+
+<style lang="less">
+	.Manager-page {
+		width: 100%;
+		height: 100vh;
+		background-color: #EEEEEE;
+	}
+
+	.resource-tabs {
+		width: 100%;
+		padding-top: 10rpx;
+		background: #fff;
+
+		.tab {
+			width: auto;
+			padding: 25rpx 0;
+			font-size: 32rpx;
+			color: #BFBFBF;
+			position: relative;
+			font-weight: 500;
+			text-align: center;
+		}
+
+		.tab::after {
+			display: block;
+			content: '';
+			width: 84rpx;
+			height: 12rpx;
+			border-radius: 8rpx;
+			background: #FF5100;
+			position: absolute;
+			bottom: -6rpx;
+			left: 50%;
+			margin-left: -42rpx;
+			opacity: 0;
+			transform: scaleX(0);
+			transition: all .2s ease, opacity .15s ease;
+		}
+
+		.tab-a {
+			color: #FF5100;
+		}
+
+		.tab-a::after {
+			opacity: 1;
+			transform: scaleX(1);
+		}
+	}
+	
+	.modular-box {
+		width: 670rpx;
+		margin: 0 auto;
+		background-color: #F5F5F5;
+		margin-bottom: 76rpx;
+		/* 全部项目 */
+		.project-box {
+			.project-list {
+				width: 670rpx;
+				height: auto;
+				background: #FFFFFF;
+				border-radius: 12rpx;
+				margin-top: 32rpx;
+				padding: 16rpx 22rpx;
+				.project-top {
+					width: 630rpx;
+					height: 160rpx;
+					margin-bottom: 15rpx;
+					.project-img {
+						width: 160rpx;
+						height: 160rpx;
+						margin-right: 18rpx;
+					}
+					.right-con {
+						width: 450rpx;
+						.title {
+							height: 35rpx;
+							line-height: 35rpx;
+							font-weight: 800;
+							.new-icon {
+								width: 48rpx;
+								height: 24rpx;
+								margin-right: 8rpx;
+							}
+							.title-h {
+								max-width: 250rpx;
+								height: 35rpx;
+								color: #1D1D1D;
+							}
+							.colorO{
+								color: #FF5100;
+							}
+						}
+						.title-s {
+							width: 450rpx;
+							height: 70rpx;
+							font-size: 24rpx;
+							color: #707070;
+						}
+						.category-box {
+							width: 100%;
+							height: 36rpx;
+							overflow: hidden;
+							.tag {
+								padding: 0 10rpx;
+								height: 36rpx;
+								line-height: 34rpx;
+								border-radius: 4rpx;
+								font-size: 20rpx;
+								margin-right: 16rpx;
+								text-align: center;
+							}
+						
+							.tag-item-b {
+								border: 1rpx solid #3A9EFA;
+								color: #3A9EFA;
+							}
+						
+							.tag-item-y {
+								border: 1px solid #FFAA00;
+								color: #FFAA00;
+							}
+						
+							.tag-item-p {
+								color: #FC9367;
+								border: 1px solid #FC9367;
+							}
+						}
+					}
+				}
+				.text{
+					width: 100%;
+					height: 34rpx;
+					font-size: 24rpx;
+					font-weight: 500;
+					line-height: 34rpx;
+					color: #FF5100;
+					margin: 94rpx 0 24rpx 0;
+				}
+				.project-bottom {
+					width: 100%;
+					height: 56rpx;
+					color: #FF5100;
+					font-size: 24rpx;
+					.finance-price {
+						margin-right: 20rpx;
+						font-weight: 900;
+					}
+					.price {
+						width: 300rpx;
+						font-weight: 900;
+					}
+					.time{
+						color: #A7A7A7;
+					}
+					.tocheck {
+						margin-left: auto;
+						width: 150rpx;
+						height: 56rpx;
+						line-height: 56rpx;
+						background: linear-gradient(134deg, #FFA782 0%, #FF6D31 100%);
+						border-radius: 12rpx;
+						font-weight: 600;
+						color: #fff;
+					}
+					.todetail{
+						margin-left: 16rpx;
+						width: 150rpx;
+						height: 56rpx;
+						line-height: 56rpx;
+						font-weight: 600;
+						background: linear-gradient(134deg, #BFBFBF 0%, #BFBFBF 100%);
+						border-radius: 12rpx;
+						color: #fff;
+					}
+				}
+			}
+		}
+	}
+</style>
diff --git a/pages/demandHall/supplyHall/index.vue b/pages/demandHall/supplyHall/index.vue
index 95cee35..2acd28c 100644
--- a/pages/demandHall/supplyHall/index.vue
+++ b/pages/demandHall/supplyHall/index.vue
@@ -29,12 +29,15 @@
 					<view class="enterprise-box acea-row row-column-between">
 						<view class="title-h line1">{{item.title}}</view>
 						<view class="enterprise-price">{{item.capital}}</view>
-						<view class="supply-screen acea-row">
-							<!-- <view class="tag-item-y tag">网站建设</view>
-							<view class="tag-item-p tag">APP开发</view> -->
-							<view class="tag-item-p tag">{{item.cname}}</view>
-							<view class="time-end-t">{{item.resourceEndTime}}截止报名</view>
+						<view class="category-box acea-row row-between">
+							<view class="acea-row wd37">
+								<!-- <view class="tag-item-y tag">网站建设</view>
+								<view class="tag-item-p tag">APP开发</view> -->
+								<view class="tag-item-p tag">{{item.cname}}</view>
+							</view>	
+							<view class="time-end-t line1">{{item.resourceEndTime}}截止报名</view>
 						</view>
+						
 						<view class="enterprise-info acea-row row-middle">
 							<image :src="item.enterpriseDto.enterpriseLogo" mode="aspectFill" class="head-logo"></image>
 							<view class="user-name">{{item.enterpriseName}}</view>
@@ -276,6 +279,7 @@
 		border: 2rpx solid #FF5100;
 		border-radius: 8rpx;
 		margin: 0 auto;
+		position: relative;
 	}
 
 	.search-box image {
@@ -285,12 +289,14 @@
 	}
 
 	.search {
-		margin-left: auto;
+		// margin-left: auto;
 		width: 132rpx;
-		height: 64rpx;
+		height: 68rpx;
 		background: linear-gradient(39deg, #FF5100 0%, #FFA074 100%);
 		border-radius: 8rpx;
 		color: #fff;
+		position: absolute;
+		right: -2rpx;
 	}
 
 	.resource-tabs {
@@ -390,8 +396,8 @@
 	}
 
 	.info-box {
-		height: 214rpx;
-		padding-left: 20rpx;
+		min-height: 214rpx;
+		padding: 0 58rpx 0 20rpx;
 	}
 
 	.head-img {
@@ -400,6 +406,8 @@
 	}
 
 	.user-name {
+		width: auto;
+		max-width: 250rpx;
 		height: 40rpx;
 		color: #1D1D1D;
 		margin: 0 10rpx 0 16rpx;
@@ -425,35 +433,43 @@
 	}
 
 	.supply-con {
-		height: 40rpx;
+		width: 100%;
+		height: auto;
 		color: #1D1D1D;
 		font-weight: 600;
+		margin: 10rpx 0;
 	}
-
-	.tag {
-		width: auto;
-		line-height: 28rpx;
-		border-radius: 4rpx;
-		font-size: 20rpx;
-		margin-right: 8rpx;
-		text-align: center;
-		padding: 0 10rpx;
-	}
-
-	.tag-item-b {
-		border: 1rpx solid #3A9EFA;
-		color: #3A9EFA;
-	}
-
-	.tag-item-y {
-		border: 1px solid #FFAA00;
-		color: #FFAA00;
-	}
-
-	.tag-item-p {
-		color: #FC9367;
-		border: 1px solid #FC9367;
+	.category-box{
+		width: 100%;
+		height: 36rpx;
+		overflow: hidden;
+		.tag {
+			width: auto;
+			height: 36rpx;
+			line-height: 34rpx;
+			border-radius: 4rpx;
+			font-size: 20rpx;
+			margin-right: 8rpx;
+			text-align: center;
+			padding: 0 10rpx;
+		}
+		
+		.tag-item-b {
+			border: 1rpx solid #3A9EFA;
+			color: #3A9EFA;
+		}
+		
+		.tag-item-y {
+			border: 1px solid #FFAA00;
+			color: #FFAA00;
+		}
+		
+		.tag-item-p {
+			color: #FC9367;
+			border: 1px solid #FC9367;
+		}
 	}
+	
 
 	.time-end {
 		height: 34rpx;
@@ -467,9 +483,7 @@
 		line-height: 44rpx;
 		background: linear-gradient(141deg, #FFA782 0%, #FF6D31 100%);
 		border-radius: 8rpx;
-		position: absolute;
-		right: 18rpx;
-		bottom: 38rpx;
+		margin-left: auto;
 		text-align: center;
 		color: #fff;
 	}
@@ -486,11 +500,11 @@
 
 	.enterprise-box {
 		height: 208rpx;
-		padding-left: 20rpx;
+		padding: 0 20rpx;
 	}
 
 	.title-h {
-		width: 456rpx;
+		width: 100%;
 		height: 35rpx;
 		line-height: 35rpx;
 		font-size: 32rpx;
@@ -504,18 +518,28 @@
 		font-size: 28rpx;
 		color: #FF5100;
 	}
+	.enterprise-name{
+		max-width: 382rpx;
+		height: 40rpx;
+		color: #1D1D1D;
+		margin: 0 10rpx 0 16rpx;
+	}
 
 	.head-logo {
 		width: 72rpx;
 		height: 72rpx;
 	}
-
+	.wd37{
+		width: 370rpx;
+		height: 36rpx;
+		overflow: hidden;
+	}
 	.time-end-t {
-		position: absolute;
-		right: 15rpx;
+		width: 250rpx;
 		height: 34rpx;
 		font-size: 24rpx;
 		color: #707070;
+		text-align: right;
 	}
 
 	.enterprise-con {
@@ -543,7 +567,7 @@
 	}
 
 	.mt20 {
-		padding-left: 20rpx;
+		padding: 0 20rpx;
 	}
 
 
@@ -623,6 +647,7 @@
 	}
 
 	.screen-item .item-active {
+		line-height: 44rpx;
 		border: 2rpx solid #FF6E33;
 		color: #FE7D26;
 		background: #FDEFE6;
diff --git a/pages/home/activityCenter/index.vue b/pages/home/activityCenter/index.vue
index 716fa38..0ff6c40 100644
--- a/pages/home/activityCenter/index.vue
+++ b/pages/home/activityCenter/index.vue
@@ -43,8 +43,18 @@
 		data() {
 			return {
 				menuHeight: app.globalData.menuHeight,
+				navHeight: app.globalData.navHeight,
 				menuTop: app.globalData.menuTop,
+				navTopHeight: app.globalData.navTopHeight,
 				activity: [], //活动列表
+				isFixed: false,
+			};
+		},
+		onPageScroll(e) {
+			if (e.scrollTop > 60) {
+				this.isFixed = true;
+			} else {
+				this.isFixed = false;
 			};
 		},
 		mounted: function() {
@@ -71,6 +81,10 @@
 					url: '/pages/activity/detail/index?id=' + id
 				});
 			},
+			toBackHome(e){
+				console.log("1")
+				uni.navigateBack();
+			}
 		}
 	}
 </script>
@@ -86,12 +100,40 @@
 	.top-bg {
 		width: 100%;
 		height: 1210rpx;
+		position: absolute;
+	}
+
+	.pageTitle-box {
+		width: 100%;
+		position: fixed;
+		top: 0;
+		z-index: 99;
+		transition: all .5s;
 	}
+	.showPageTitle {
+		background: #fff;
+		color: #000000 !important;
+		opacity: 1;
+
+		.page-title {
+			color: #000;
+		}
 
+		.page-back {
+			width: 18rpx;
+			height: 30rpx;
+			background: url(../../../static/images/arror-right.png) no-repeat center center;
+			background-size: 100% 100%;
+			transform: rotateY(180deg);
+		}
+	}
+	
 	.page-title {
+		position: absolute;
 		width: 100%;
 		color: #fff;
-		position: absolute;
+		font-weight: 600;
+		font-size: 32rpx;
 		text-align: center;
 		image{
 			width: 36rpx;
diff --git a/pages/home/index.vue b/pages/home/index.vue
index 7ef5ac8..57c72b3 100644
--- a/pages/home/index.vue
+++ b/pages/home/index.vue
@@ -123,7 +123,28 @@
 		<view class="warter-box">
 			<image src="../../static/images/rec-title.png" mode="" class="headline-img" skeleton-rect></image>
 			<u-waterfall v-model="productDtos" ref="uWaterfall">
+				
 				<template v-slot:left="{leftList}">
+					<view class="radio">
+						<video src=""></video>
+					</view>
+					<view class="warter">
+						<image src="../../static/images/collect.png" mode="" class="enterprise-img"></image>
+						<view class="label">企业</view>
+						<view class="title line1">楚象科技有限公司</view>
+						<view class="category-box acea-row">
+							<view class="tag-item-y tag">商务合作</view>
+							<view class="tag-item-p tag">场地租赁</view>
+						</view>
+					</view>
+					<view class="warter">
+						<image src="../../static/images/business-img1.png" mode="" class="shop-img"></image>
+						<view class="title line1">楚象科技有限公司</view>
+						<view class="shopinfo acea-row row-between-wrapper">
+							<view class="torush">立即抢</view>
+							<view class="surplus">剩余10张</view>
+						</view>
+					</view>
 					<view class="warter" v-for="(item, index) in leftList" :key="index" @tap="toGoodsDetail(item.id)">
 						<image class="warter-img" :src="item.image" :index="index" mode="widthFix"></image>
 						<view class="goodsinfo-box">
@@ -525,126 +546,124 @@
 		width: 100%;
 		height: 400rpx;
 		padding-left: 40rpx;
-	}
-
-	.scroll-view_H {
-		white-space: nowrap;
-		width: 100%;
-	}
-
-	.slide-left {
-		width: 584rpx;
-		height: 344rpx;
-		display: inline-block;
-		border-radius: 16rpx;
-		background-color: #fff;
-		padding: 20rpx 32rpx 0 20rpx;
-		margin-right: 32rpx;
-	}
-
-	.act-title {
-		font-size: 28rpx;
-		color: #191919;
-	}
-
-	.resource-list {
-		width: 100%;
-		height: 190rpx;
-		margin: 18rpx 0 14rpx 0;
-	}
 
-	.act-img {
-		width: 162rpx;
-		height: 190rpx;
-		margin-right: 28rpx;
-		border-radius: 12rpx;
-	}
+		.scroll-view_H {
+			white-space: nowrap;
+			width: 100%;
 
-	.act-con {
-		width: 338rpx;
-		height: 190rpx;
-	}
+			.slide-left {
+				width: 584rpx;
+				height: 344rpx;
+				display: inline-block;
+				border-radius: 16rpx;
+				background-color: #fff;
+				padding: 20rpx 32rpx 0 20rpx;
+				margin-right: 32rpx;
+
+				.act-title {
+					font-size: 28rpx;
+					color: #191919;
+				}
 
-	.act-adress view,
-	.act-time view {
-		width: 300rpx;
-		font-size: 24rpx;
-		color: #191919;
-	}
+				.resource-list {
+					width: 100%;
+					height: 190rpx;
+					margin: 18rpx 0 14rpx 0;
+
+					.act-img {
+						width: 162rpx;
+						height: 190rpx;
+						margin-right: 28rpx;
+						border-radius: 12rpx;
+					}
 
-	.act-time image {
-		width: 18rpx;
-		height: 22rpx;
-		margin-right: 16rpx;
-	}
+					.act-con {
+						width: 338rpx;
+						height: 190rpx;
 
-	.act-adress image {
-		width: 19rpx;
-		height: 23rpx;
-		margin: 7rpx 14rpx 0 0;
-	}
+						.act-adress view,
+						.act-time view {
+							width: 300rpx;
+							font-size: 24rpx;
+							color: #191919;
+						}
 
-	.title-line {
-		width: 308rpx;
-		height: 68rpx;
-		font-size: 24rpx;
-		font-weight: 500;
-		color: #191919;
-		white-space: pre-wrap;
-	}
+						.act-time image {
+							width: 18rpx;
+							height: 22rpx;
+							margin-right: 16rpx;
+						}
 
-	.act-price {
-		width: 335rpx;
-		font-weight: 600;
+						.act-adress image {
+							width: 19rpx;
+							height: 23rpx;
+							margin: 7rpx 14rpx 0 0;
+						}
 
-		.act-i {
-			font-size: 24rpx;
-			color: #FF5A0E;
-		}
+						.title-line {
+							width: 308rpx;
+							height: 68rpx;
+							font-size: 24rpx;
+							font-weight: 500;
+							color: #191919;
+							white-space: pre-wrap;
+						}
 
-		.act-p {
-			font-size: 32rpx;
-			color: #2A2B2B;
-		}
-	}
+						.act-price {
+							width: 335rpx;
+							font-weight: 600;
 
-	.act-bottom {
-		position: relative;
-		width: 562rpx;
-		height: 62rpx;
-		border-top: 1rpx solid #ECECEC;
-	}
+							.act-i {
+								font-size: 24rpx;
+								color: #FF5A0E;
+							}
 
-	.act-num image {
-		width: 36rpx;
-		height: 36rpx;
-		border-radius: 50%;
-	}
+							.act-p {
+								font-size: 32rpx;
+								color: #2A2B2B;
+							}
+						}
+					}
+				}
+				.act-bottom {
+					position: relative;
+					width: 562rpx;
+					height: 62rpx;
+					border-top: 1rpx solid #ECECEC;
+
+					.act-num image {
+						width: 36rpx;
+						height: 36rpx;
+						border-radius: 50%;
+					}
 
-	.act-num {
-		min-width: 154rpx;
-	}
+					.act-num {
+						min-width: 154rpx;
+					}
 
-	.act-num text {
-		font-size: 20rpx;
-		color: #191919;
-		margin-left: 8rpx;
-	}
+					.act-num text {
+						font-size: 20rpx;
+						color: #191919;
+						margin-left: 8rpx;
+					}
 
-	.enter-btn {
-		width: 138rpx;
-		height: 40rpx;
-		line-height: 40rpx;
-		text-align: center;
-		background: linear-gradient(39deg, #FF5A0D 0%, #FFAC85 100%);
-		border-radius: 26rpx;
-		color: #fff;
-		position: absolute;
-		right: 38rpx;
-		font-size: 24rpx;
+					.enter-btn {
+						width: 138rpx;
+						height: 40rpx;
+						line-height: 40rpx;
+						text-align: center;
+						background: linear-gradient(39deg, #FF5A0D 0%, #FFAC85 100%);
+						border-radius: 26rpx;
+						color: #fff;
+						position: absolute;
+						right: 38rpx;
+						font-size: 24rpx;
+					}
+				}
+			}
+		}
 	}
 
-
 	// 推荐供需
 	.rec-box {
 		width: 670rpx;
@@ -652,138 +671,114 @@
 		margin: 32rpx auto 8rpx auto;
 		position: relative;
 
-	}
-
-	.rec-switch {
-		width: 670srpx;
-		height: 423rpx;
-		background: #FFFFFF;
-		box-shadow: 0px 6rpx 12rpx rgba(0, 0, 0, 0.16);
-		border-radius: 20rpx;
-		overflow: hidden;
-	}
-
-	.rec-bg {
-		width: 706rpx;
-		height: 423rpx;
-	}
-
-	.rec-title {
-		width: 100%;
-		height: 80rpx;
-		position: relative;
-
-	}
-
-	.rev-bg {
-		width: 376rpx;
-		height: 80rpx;
-		position: absolute;
-		left: 0;
-	}
-
-	.rev-bg2 {
-		width: 376rpx;
-		height: 80rpx;
-		position: absolute;
-		left: 0;
-		background-image: url(../../static/images/rec-bg.png);
-	}
+		.rec-switch {
+			width: 670srpx;
+			height: 423rpx;
+			background: #FFFFFF;
+			box-shadow: 0px 6rpx 12rpx rgba(0, 0, 0, 0.16);
+			border-radius: 20rpx;
+			overflow: hidden;
+		}
 
-	.rec-l,
-	.rec-r {
-		width: 50%;
-		z-index: 2;
-		position: relative;
-	}
+		.rec-title {
+			width: 100%;
+			height: 80rpx;
+			position: relative;
+
+			.rec-l,
+			.rec-r {
+				width: 50%;
+				z-index: 2;
+				position: relative;
+			}
 
-	.rec-l .rec-bg,
-	.rec-r .rec-bg {
-		width: 100%;
-		height: 100%;
-		position: absolute;
-		top: 0;
-		left: 0;
-	}
+			.rec-l .rec-bg,
+			.rec-r .rec-bg {
+				width: 100%;
+				height: 100%;
+				position: absolute;
+				top: 0;
+				left: 0;
+			}
 
-	.rec-r .rec-bg {
-		transform: rotateY(180deg);
-	}
+			.rec-r .rec-bg {
+				transform: rotateY(180deg);
+			}
 
-	.rec-t {
-		width: 100%;
-		height: 100%;
-		line-height: 37rpx;
-		position: absolute;
-		z-index: 3;
-	}
+			.rec-t {
+				width: 100%;
+				height: 100%;
+				line-height: 37rpx;
+				position: absolute;
+				z-index: 3;
+			}
 
-	.rec-l image {
-		width: 37rpx;
-		height: 37rpx;
-		margin-right: 8rpx;
-	}
+			.rec-l image {
+				width: 37rpx;
+				height: 37rpx;
+				margin-right: 8rpx;
+			}
 
-	.rec-r image {
-		width: 42rpx;
-		height: 43rpx;
-		margin-right: 8rpx;
-	}
+			.rec-r image {
+				width: 42rpx;
+				height: 43rpx;
+				margin-right: 8rpx;
+			}
+		}
 
-	.rec-switch-a {
-		width: 100%;
-		height: 330rpx;
-	}
+		.rec-switch-a {
+			width: 100%;
+			height: 330rpx;
 
-	.list-box {
-		width: 100%;
-		height: 330rpx;
-	}
+			.list-box {
+				width: 100%;
+				height: 330rpx;
 
-	.rec-list {
-		position: relative;
-		height: 165rpx;
-		padding: 30rpx 30rpx 15rpx 30rpx;
-	}
+				.rec-list image {
+					width: 64rpx;
+					height: 64rpx;
+				}
 
-	.rec-list image {
-		width: 64rpx;
-		height: 64rpx;
-	}
+				.rec-list {
+					position: relative;
+					height: 165rpx;
+					padding: 30rpx 30rpx 15rpx 30rpx;
 
-	.rec-name {
-		width: 130rpx;
-		font-size: 28rpx;
-		color: #1D1D1D;
-		margin-left: 16rpx;
-	}
+					.rec-name {
+						width: 130rpx;
+						font-size: 28rpx;
+						color: #1D1D1D;
+						margin-left: 16rpx;
+					}
 
-	.rec-address {
-		width: 80rpx;
-		height: 34rpx;
-		font-size: 24rpx;
-		line-height: 34rpx;
-		color: #FFFFFF;
-		background: #FF5100;
-		border-radius: 16px;
-		text-align: center;
-	}
+					.rec-address {
+						width: 80rpx;
+						height: 34rpx;
+						font-size: 24rpx;
+						line-height: 34rpx;
+						color: #FFFFFF;
+						background: #FF5100;
+						border-radius: 16px;
+						text-align: center;
+					}
 
-	.rec-end {
-		font-size: 24rpx;
-		color: #707070;
-		margin-left: auto;
-	}
+					.rec-end {
+						font-size: 24rpx;
+						color: #707070;
+						margin-left: auto;
+					}
 
-	.rec-message {
-		width: 582rpx;
-		height: 40rpx;
-		font-size: 28rpx;
-		color: #1D1D1D;
+					.rec-message {
+						width: 582rpx;
+						height: 40rpx;
+						font-size: 28rpx;
+						color: #1D1D1D;
+					}
+				}
+			}
+		}
 	}
 
-
-
 	// .category-tab-box{
 	// 	border: 1rpx solid black;
 	// 	width: 100%;
@@ -821,14 +816,114 @@
 	// 		}
 	// 	}
 	// }
-	.headline{
+	.headline {
 		padding-right: 40rpx;
 	}
-	.headline-img{
+
+	.headline-img {
 		width: 148rpx;
 		height: 52rpx;
 	}
-
+	.radio{
+		width: 336rpx;
+		height: 380rpx;
+		margin-bottom: 20rpx;
+		video{
+			width: 336rpx;
+			height: 380rpx;
+			border-radius: 10rpx;
+		}
+	}
+	
+	.warter{
+		width: 336rpx;					
+		box-shadow: 0px 6rpx 12rpx rgba(0, 0, 0, 0.06);
+		border-radius: 10rpx;
+		background-color: #ffffff;
+		padding-bottom: 50rpx;
+		margin-bottom: 20rpx;
+		.enterprise-img{
+			width: 336rpx;
+			height: 184rpx;
+			position: relative;
+		}
+		.shop-img{
+			width: 336rpx;
+			height: 222rpx;
+		}
+		.label{
+			width: 60rpx;
+			height: 32rpx;
+			line-height: 32rpx;
+			text-align: center;
+			background: linear-gradient(180deg, rgba(255, 194, 168, 0.91) 0%, #FF6D31 100%);
+			border-radius: 4rpx;
+			color: #fff;
+			font-size: 20rpx;
+			position: absolute;
+			top: 16rpx;
+			left: 16rpx;
+		}
+		.title{
+			font-size: 28rpx;
+			font-weight: 500;
+			color: #1D1D1D;
+			width: 100%;
+			padding-left: 18rpx;
+			margin: 10rpx 0 10rpx 0;
+		}
+		.category-box{
+			width: 100%;
+			height: 36rpx;
+			overflow: hidden;
+			padding-left: 18rpx;
+			.tag {
+				width: auto;
+				height: 36rpx;
+				line-height: 34rpx;
+				border-radius: 4rpx;
+				font-size: 20rpx;
+				margin-right: 16rpx;
+				text-align: center;
+				padding: 0 10rpx;
+			}
+			.tag-item-y {
+				border: 1px solid #FFAA00;
+				color: #FFAA00;
+			}
+			
+			.tag-item-p {
+				color: #FC9367;
+				border: 1px solid #FC9367;
+			}
+		}	
+		.shopinfo{
+			width: 100%;
+			padding: 0 20rpx;
+			.torush{
+				width: 136rpx;
+				height: 52rpx;
+				background: linear-gradient(315deg, #FB966C 0%, #FFC2AA 100%);
+				border-radius: 12rpx;
+				font-size: 24rpx;
+				font-weight: bold;
+				line-height: 52rpx;
+				color: #FFFFFF;
+				text-align: center;
+			}
+			.surplus{
+				// width: 82rpx;
+				font-size: 20rpx;
+				font-weight: 400;
+				color: #BFBFBF;		
+			}
+		}
+		
+	}
+	
+	
+	
+	
 	.warter-box {
 		width: 100%;
 		padding: 24rpx 0 190rpx 24rpx;
diff --git a/pages/information/index.vue b/pages/information/index.vue
index 975675f..d33f794 100644
--- a/pages/information/index.vue
+++ b/pages/information/index.vue
@@ -77,8 +77,8 @@
 				</view>
 				<view class="follow-bottom acea-row row-middle">
 					<image :src="item.imageInput" mode=""></image>
-					<view class="follow-title-b">
-						<view class="title-s">{{item.author}}</view>
+					<view class="follow-title-b acea-row row-column-between">
+						<view class="title-s line1">{{item.author}}</view>
 						<view class="title-con line1">{{item.title}}</view>
 					</view>
 					<!-- <view class="follow-btn">关注+</view> -->
@@ -176,7 +176,7 @@
 	}
 </script>
 
-<style>
+<style lang="less">
 	.information-box {
 		width: 100%;
 		height: auto;
@@ -202,7 +202,7 @@
 
 	.search {
 		position: absolute;
-		right: 0;
+		right: -2rpx;
 		width: 132rpx;
 		height: 68rpx;
 		background: linear-gradient(39deg, #FF5100 0%, #FFA074 100%);
@@ -413,13 +413,15 @@
 		font-size: 22rpx;
 		color: #fff;
 		text-align: center;
-
+		margin-bottom: 16rpx;
 	}
 
 	.hotspot-title-h {
-		width: 588rpx;
+		max-width: 588rpx;
+		max-height: 80rpx;
 		font-size: 28rpx;
 		color: #FFFFFF;
+		white-space: pre-wrap;
 	}
 
 	/* 值得关注 */
@@ -481,7 +483,7 @@
 	.follow-bottom {
 		width: 100%;
 		height: 80rpx;
-		padding: 12rpx 20rpx 16rpx 20rpx;
+		padding: 14rpx 20rpx 14rpx 20rpx;
 	}
 
 	.follow-bottom image {
@@ -491,21 +493,24 @@
 		margin-right: 8rpx;
 	}
 
-	.follow-title-b {}
-
-	.title-s {
-		height: 28rpx;
-		font-size: 22rpx;
-		margin-bottom: 6rpx;
-		font-weight: 600;
-	}
-
-	.title-con {
+	.follow-title-b {
 		width: 230rpx;
-		font-size: 20rpx;
-		color: #707070;
+		height: 52rpx;
+		.title-s {
+			height: 25rpx;
+			line-height: 25rpx;
+			font-size: 20rpx;
+			font-weight: 600;
+		}
+		.title-con {
+			height: 20rpx;
+			font-size: 16rpx;
+			color: #707070;
+		}
 	}
 
+	
+
 	.follow-btn {
 		width: 136rpx;
 		height: 40rpx;
diff --git a/pages/life/articleDetail/index.vue b/pages/life/articleDetail/index.vue
index 2b8b5f1..7c5ba51 100644
--- a/pages/life/articleDetail/index.vue
+++ b/pages/life/articleDetail/index.vue
@@ -4,9 +4,9 @@
     <view class="article-header">
       <view class="headline">{{ detail.title }}</view>
       <view class="acea-row">
-        <view class="header-img"><image :src="detail.authorLogo"></image></view>
+        <image :src="detail.authorLogo" class="header-img"></image>
         <view class="">
-          <view class="release-auth">{{ detail.author }}</view>
+          <view class="release-auth line1">{{ detail.author }}</view>
           <view class="acea-row">
             <view class="fz24 acea-row row-middle">
               <image
@@ -115,16 +115,13 @@ export default {
     font-weight: 500;
   }
   .header-img {
-    width: 72rpx;
-    height: 72rpx;
+    width: 80rpx;
+    height: 80rpx;
     margin-right: 20rpx;
-    image {
-      width: 100%;
-      height: 100%;
-      border-radius: 25px;
-    }
+		border-radius: 25px;
   }
   .release-auth {
+		width: 550rpx;
     font-size: 32rpx;
     color: #333;
     line-height: 44rpx;
diff --git a/pages/life/index2.vue b/pages/life/index2.vue
new file mode 100644
index 0000000..991d9ac
--- /dev/null
+++ b/pages/life/index2.vue
@@ -0,0 +1,560 @@
+<template>
+  <view class="productSort">
+    <view class="page-top-box" :class="isFixed == true ? 'on' : ''">
+      <view class="top-box acea-row row-between-wrapper">
+        <view class="top-box-l acea-row row-middle">
+          <image src="../../static/images/localtion.png"></image>
+          <text>武汉</text>
+        </view>
+        <view class="cart-btn-box" @click="goShoppingCart()">
+          <image src="../../static/images/cart.png"></image>
+        </view>
+      </view>
+      <view class="search-box acea-row row-middle">
+      	<image src="../../static/images/search.png" mode="" class="search-icon"></image>
+      	<input type="text" value="" placeholder="周末去哪儿聚餐" @click="goGoodSearch()"/>
+      	<view class="search">搜一下</view>
+      </view>
+    </view>
+    <!-- <view class="banner-img-box acea-row row-between-wrapper">
+			<view class="img-box-l">
+				<image src="https://download.cyjyyjy.com/life1.png" @click="alertMessage('功能开发中...')"></image>
+			</view>
+			<view class="img-box-r">
+				<image src="https://download.cyjyyjy.com/life2.png" @click="alertMessage('功能开发中...')"></image>
+				<image src="https://download.cyjyyjy.com/life3.png" @click="alertMessage('功能开发中...')"></image>
+			</view>
+		</view> -->
+		<view class="nav-box">
+			<image src="../../static/images/business-img1.png" mode="" class="nav-img"></image>
+			<view class="nav-list acea-row row-between">
+				<view class="modular acea-row row-center">
+					<image src="../../static/images/life-icon1.png" mode=""></image>
+					<view>至尊宝座</view>
+				</view>
+				<view class="modular acea-row row-center">
+					<image src="../../static/images/life-icon2.png" mode=""></image>
+					<view>优选好房</view>
+				</view>
+				<view class="modular acea-row row-center">
+					<image src="../../static/images/life-icon3.png" mode=""></image>
+					<view>权益福利</view>
+				</view>
+				<view class="modular acea-row row-center">
+					<image src="../../static/images/life-icon4.png" mode=""></image>
+					<view>商超福利</view>
+				</view>
+			</view>
+		</view>
+    <view class="category-tab-box">
+      <scroll-view class="scroll-view_H" scroll-x="true">
+        <view class="category-item category-item-active" >猜您喜欢</view>
+        <view class="category-item">至尊保驾</view>
+				<view class="category-item">优选好房</view>
+				<view class="category-item">商城福利</view>
+				<view class="category-item">回头率榜单</view>
+      </scroll-view>
+    </view>
+		
+    <view class="warter-box">
+      <!-- <view class="headline">
+				<image src="../../static/images/rec-title.png" mode=""></image>
+			</view> -->
+      <u-waterfall v-model="flowList" ref="uWaterfall">
+        <template v-slot:left="{ leftList }">
+          <view
+            class="warter"
+            v-for="(item, index) in leftList"
+            :key="index"
+            @tap="toGoodsDetail(item.id)"
+          >
+            <image
+              class="warter-img"
+              :src="item.image"
+              :index="index"
+              mode="widthFix"
+            ></image>
+            <view class="goodsinfo-box">
+              <view class="title line2"> {{ item.storeName }} </view>
+              <view class="price-box acea-row row-between-wrapper">
+                <text class="price">￥{{ item.price }}</text>
+                <text class="old-price">￥{{ item.price }}</text>
+              </view>
+            </view>
+          </view>
+        </template>
+        <template v-slot:right="{ rightList }">
+          <view
+            class="warter"
+            v-for="(item, index) in rightList"
+            :key="index"
+            @tap="toGoodsDetail(item.id)"
+          >
+            <image
+              class="warter-img"
+              :src="item.image"
+              :index="index"
+              mode="widthFix"
+            ></image>
+            <view class="goodsinfo-box">
+              <view class="title line2"> {{ item.storeName }} </view>
+              <view class="price-box acea-row row-between-wrapper">
+                <text class="price">￥{{ item.price }}</text>
+                <text class="old-price">￥{{ item.otPrice }}</text>
+              </view>
+            </view>
+          </view>
+        </template>
+      </u-waterfall>
+      <u-loadmore
+        bg-color="rgb(240, 240, 240)"
+        :status="loadStatus"
+        @loadmore="addRandomData"
+      ></u-loadmore>
+    </view>
+    <!-- <tabbar :current="currentTabIndex" @click="tabBarClick"></tabbar> -->
+  </view>
+</template>
+<script>
+import { getCategory, getProducts, getArticle, getActivity } from "@/api/store";
+import { trim } from "@/utils";
+import { mapGetters } from "vuex";
+import tabbar from "../../tabbarComponent/tabbar";
+import vSwiper from "@/components/vSwiper.vue";
+const app = getApp();
+export default {
+  components: {
+    tabbar,
+    vSwiper,
+  },
+  name: "GoodsClass",
+  computed: mapGetters(["userInfo"]),
+  props: {},
+  data: function () {
+    return {
+      category: [],
+      navActive: 0,
+      search: "",
+      lock: false,
+      menuHeight: app.globalData.menuHeight,
+      navHeight: app.globalData.navHeight,
+      menuTop: app.globalData.menuTop,
+      currentTabIndex: 3,
+      flowList: [],
+      isFixed: false,
+      loadStatus: "loadmore",
+      page: 1,
+      limit: 10,
+      isLoad: true, //是否还有更多
+      articleList: [],
+      active: 1,
+      show: false,
+      activity: [],
+    };
+  },
+  watch: {
+    "$yroute.query.id": function (n) {
+      if (n) {
+        this.activeCateId(n);
+      }
+    },
+  },
+  // onShow: function (options) {
+
+  // },
+  mounted: function () {
+    this.getProducts();
+    this.getActivity();
+  },
+  onReachBottom() {
+    if (this.isLoad) {
+      this.page = this.page + 1;
+      this.getProducts();
+    }
+  },
+  onPullDownRefresh() {
+    wx.showNavigationBarLoading();
+    this.isLoad = true;
+    this.page = 1;
+    this.getActivity();
+    this.clear().then(() => {
+      this.getProducts();
+    });
+  },
+
+  methods: {
+    toAritcleList() {
+      this.$yrouter.push("/pages/life/articleList/index");
+    },
+    async clear() {
+      this.$refs.uWaterfall.clear();
+    },
+    tabBarClick(index) {
+      this.currentTabIndex = index;
+    },
+    goShoppingCart() {
+      this.$yrouter.push("/pages/shop/ShoppingCart/index");
+    },
+    goGoodSearch() {
+      this.$yrouter.push("/pages/shop/GoodSearch/index");
+    },
+    goGoodsList(child) {
+      this.$yrouter.push({
+        path: "/pages/shop/GoodsList/index",
+        query: { id: child.id, title: child.cateName },
+      });
+    },
+    toGoodsDetail(id) {
+      this.$yrouter.push({
+        path: "/pages/shop/GoodsCon/index",
+        query: { id: id },
+      });
+    },
+    activeCateId(n) {
+      let index = 0;
+      n = parseInt(n);
+      if (!n) return;
+      this.category.forEach((cate, i) => {
+        if (cate.id === n) index = i;
+      });
+      if (index !== this.navActive) {
+        this.asideTap(index);
+      }
+    },
+    loadCategoryData() {
+      getCategory().then((res) => {
+        this.category = res.data;
+        this.$nextTick(() => {
+          if (this.$yroute.query.id) {
+            this.activeCateId(this.$yroute.query.id);
+          }
+        });
+      });
+    },
+    getActivity() {
+      getActivity().then((res) => {
+        this.articleList = res.data.articleList;
+        this.activity = res.data.activityList;
+      });
+    },
+    toActiveDetail(e) {
+      let id = e.currentTarget.dataset.id;
+      uni.navigateTo({
+        url: "/pages/activity/detail/index?id=" + id,
+      });
+    },
+
+    tabClick(i) {
+      console.log(i, "aiiii");
+      this.active = i;
+    },
+    getProducts() {
+      this.loadStatus = "loading";
+      getProducts({ page: this.page, limit: this.limit }).then((res) => {
+        // console.log(res)
+        if (this.page > 1) {
+          this.flowList = this.flowList.concat(res.data);
+        } else {
+          this.flowList = res.data;
+        }
+        // this.isLoad = this.limit <= res.data.length
+        if (this.limit <= res.data.length) {
+          //分页数等于返回值的length说明还有
+          this.isLoad = true;
+        } else {
+          console.log("没有了");
+          this.isLoad = false;
+          this.loadStatus = "nomore";
+        }
+        wx.hideNavigationBarLoading();
+        uni.stopPullDownRefresh();
+      });
+    },
+    submitForm: function () {
+      var val = trim(this.search);
+      if (val) {
+        this.$yrouter.push({
+          path: "/pages/shop/GoodsList/index",
+          query: { s: val },
+        });
+        setTimeout(() => (this.search = ""), 500);
+      }
+    },
+    asideTap(index) {
+      this.navActive = index;
+    },
+    alertMessage(msg) {
+      uni.showToast({
+        title: msg,
+        icon: "none",
+      });
+    },
+  },
+  beforeDestroy: function () {
+    // document.removeEventListener("scroll", this.onScroll, false);
+  },
+};
+</script>
+<style lang="scss" scoped>
+</style>
+
+<style lang="less" scoped>
+.productSort {
+  // height: 100%;
+  // padding-bottom: 200rpx;
+  // background: #eeeeee !important;
+  position: relative;
+}
+
+.page-top-box {
+  width: 100%;
+  position: fixed;
+  top: 0;
+  left: 0;
+  z-index: 99;
+  background: #fff;
+  padding: 0 30rpx 0rpx;
+  // box-shadow: 0px -6px 20px rgba(0, 0, 0, 0.11);
+  .top-box {
+    .top-box-l {
+      font-size: 32rpx;
+      color: #000;
+      font-weight: 500;
+      image {
+        width: 26rpx;
+        height: 30rpx;
+        display: block;
+        margin-right: 10rpx;
+      }
+    }
+    .cart-btn-box {
+      width: 50rpx;
+      height: 50rpx;
+      image {
+        width: 100%;
+        height: 100%;
+      }
+    }
+  }
+  // 搜索
+  .search-box {
+  	width: 670rpx;
+  	height: 68rpx;
+  	border-radius: 8rpx;
+  	margin: 24rpx auto;
+		background: #EEEEEE;
+		border-radius: 8rpx;
+  
+  	.search-icon {
+  		width: 35rpx;
+  		height: 35rpx;
+  		margin: 0 29rpx 0 52rpx;
+  	}
+  
+  	.search {
+  		margin-left: auto;
+  		width: 124rpx;
+  		height: 68rpx;
+			line-height: 65rpx;
+			text-align: center;
+			color: #fff;
+  		background: linear-gradient(149deg, #FFA782 0%, #FF6D31 100%);
+  		border-radius: 0rpx 8rpx 8rpx 0rpx;
+  	}
+  }
+}
+
+.nav-box{
+	width: 100%;
+	height: auto;
+	padding: 180rpx 40rpx 0 40rpx;
+	.nav-img{
+		width: 100%;
+		height: 370rpx;
+	}
+	.nav-list{
+		width: 100%;
+		height: 105rpx;
+		padding: 0 30rpx;
+		margin: 24rpx 0 20rpx 0;
+		.modular{
+			width: 96rpx;
+			font-size: 24rpx;
+			image{
+				width: 70rpx;
+				height: 70rpx;
+			}
+		}
+	}
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+.category-tab-box {
+  width: 100%;
+  height: 108rpx;
+  line-height: 108rpx;
+  padding-left: 30rpx;
+  .scroll-view_H {
+    white-space: nowrap;
+    width: 100%;
+    .category-item {
+      display: inline-block;
+      font-size: 28rpx;
+      line-height: 40rpx;
+      color: #999;
+      margin-right: 40rpx;
+      &.category-item-active {
+        color: #ff6d31;
+        font-size: 32rpx;
+        font-weight: 500;
+        position: relative;
+        &::after {
+          content: "";
+          width: 70rpx;
+          height: 8rpx;
+          border-radius: 6rpx;
+          display: block;
+          position: absolute;
+          bottom: -24rpx;
+          left: 0;
+          background: #ff7942;
+        }
+      }
+    }
+  }
+}
+.warter-box {
+  width: 100%;
+  padding: 44rpx 24rpx 190rpx 24rpx;
+  .u-waterfall {
+    width: 100%;
+    display: flex;
+    justify-content: space-between;
+    .u-column {
+      .warter {
+        width: 336rpx !important;
+        border-radius: 10rpx;
+        background-color: #ffffff;
+        position: relative;
+        overflow: hidden;
+        box-shadow: 0px 6rpx 12rpx rgba(0, 0, 0, 0.06);
+        margin-bottom: 20rpx;
+        image {
+          width: 100%;
+          display: block;
+        }
+        .goodsinfo-box {
+          width: 100%;
+          padding: 12rpx 16rpx;
+          .title {
+            font-size: 28rpx;
+            font-weight: 500;
+            color: #1d1d1d;
+            width: 100%;
+            height: 80rpx;
+          }
+          .price {
+            font-size: 28rpx;
+            font-weight: bold;
+            line-height: 40rpx;
+            color: #ff7942;
+          }
+          .old-price {
+            font-size: 20rpx;
+            line-height: 28rpx;
+            color: #bfbfbf;
+            text-decoration: line-through;
+          }
+        }
+      }
+    }
+  }
+}
+.banner-img-box {
+  width: 100%;
+  padding: 220rpx 40rpx 32rpx;
+  .img-box-l {
+    width: 324rpx;
+    height: 400rpx;
+    image {
+      width: 100%;
+      height: 100%;
+    }
+  }
+  .img-box-r {
+    width: 324rpx;
+    height: 400rpx;
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    // align-items: ;
+    image {
+      width: 324rpx;
+      height: 190rpx;
+    }
+  }
+}
+.goods-list-box {
+  width: 100%;
+  padding: 0 30rpx;
+  .goods-list-item {
+    width: 100%;
+    .goods-type-box {
+      image {
+        width: 94rpx;
+        height: 94rpx;
+      }
+      .t-word {
+        font-size: 36rpx;
+        color: #222;
+        font-weight: 600;
+      }
+    }
+    .goods-list {
+      width: 100%;
+      .goods-item {
+        width: 335rpx;
+        background: #fff;
+        margin-right: 10rpx;
+        margin-bottom: 30rpx;
+        border-radius: 10rpx;
+        overflow: hidden;
+        box-shadow: 0px 6px 12px rgba(0, 0, 0, 0.06);
+        image {
+          width: 100%;
+          height: 278rpx;
+        }
+      }
+      .goods-item:nth-child(2n) {
+        margin-right: 0;
+      }
+      .goods-desc-box {
+        width: 100%;
+        padding: 16rpx;
+        font-size: 24rpx;
+        .goods-name {
+          line-height: 34rpx;
+        }
+        .price {
+          font-size: 28rpx;
+          color: #e5270f;
+          line-height: 40rpx;
+          margin-bottom: 26rpx;
+        }
+      }
+    }
+  }
+}
+</style>
diff --git a/pages/life/learnMore/index.vue b/pages/life/learnMore/index.vue
index cf6d13c..ee8ee9a 100644
--- a/pages/life/learnMore/index.vue
+++ b/pages/life/learnMore/index.vue
@@ -1,30 +1,70 @@
 <template>
-	<swiper class="swiper-box" autoplay="true" indicator-dots='true' indicator-color='#B17815' indicator-active-color='#FFB93E' >
-		<swiper-item>
-			<image src="https://download.cyjyyjy.com/learnMore1.png"></image>
-		</swiper-item>
-		<swiper-item>
-			<image src="https://download.cyjyyjy.com/learnMore2.png"></image>
-		</swiper-item>
-		<swiper-item>
-			<image src="https://download.cyjyyjy.com/learnMore3.png"></image>
-		</swiper-item>
-		<swiper-item>
-			<image src="https://download.cyjyyjy.com/learnMore4.png"></image>
-		</swiper-item>
-	</swiper>
+	<view class="more-page">
+		<view class="page-title acea-row row-middle row-center" :style="'top:' + menuTop + 'px;height:' + menuHeight + 'px;line-height: ' + menuHeight + 'px;'"><image src="../../../static/images/back.png" mode="" @tap="toBackHome"></image>详情</view>
+		<swiper class="swiper-box" autoplay="true" indicator-dots='true' indicator-color='#B17815'
+			indicator-active-color='#FFB93E'>
+			<swiper-item>
+				<image src="https://download.cyjyyjy.com/learnMore1.png"></image>
+			</swiper-item>
+			<swiper-item>
+				<image src="https://download.cyjyyjy.com/learnMore2.png"></image>
+			</swiper-item>
+			<swiper-item>
+				<image src="https://download.cyjyyjy.com/learnMore3.png"></image>
+			</swiper-item>
+			<swiper-item>
+				<image src="https://download.cyjyyjy.com/learnMore4.png"></image>
+			</swiper-item>
+		</swiper>
+	</view>
 </template>
 
 <script>
+	const app = getApp();
+	export default {
+		data() {
+			return {
+				menuHeight: app.globalData.menuHeight,
+				menuTop: app.globalData.menuTop,
+			};
+		},
+		methods:{
+			toBackHome(e){
+				console.log("1")
+				uni.navigateBack();
+			}
+		}
+	}
 </script>
 
-<style>
-	.swiper-box{
+<style lang="less">
+	.more-page{
+		width: 100%;
+		height: 100%;
+		position: relative;
+	}
+	.page-title{
+	  width: 100%;
+	  color: #fff;
+	  position: relative;
+		z-index: 999;
+		image{
+			width: 30rpx;
+			height: 35rpx;
+			position: absolute;
+			left: 40rpx;
+		}
+	}
+
+	.swiper-box {
 		width: 100%;
 		height: 100vh;
 		background-color: #070604;
+		position: absolute;
+		top: 0;
 	}
-	.swiper-box image{
+
+	.swiper-box image {
 		width: 100%;
 		height: 100vh;
 	}
diff --git a/pages/shop/GoodSearch/index.vue b/pages/shop/GoodSearch/index.vue
index 7377845..0c6cf6a 100644
--- a/pages/shop/GoodSearch/index.vue
+++ b/pages/shop/GoodSearch/index.vue
@@ -3,11 +3,12 @@
     <view class="searchGood">
       <view class="search acea-row row-between-wrapper">
         <view class="input acea-row row-between-wrapper">
-          <text class="iconfont icon-sousuo2"></text>
+          <!-- <text class="iconfont icon-sousuo2"></text> -->
           <!-- <form @submit.prevent="submit"></form> -->
-          <input type="text" placeholder="点击搜索商品" v-model="search" />
+          <input type="text" placeholder="大家都在搜APP开发" v-model="search" />
+					<view class="bnt" @click="submit">搜索</view>
         </view>
-        <view class="bnt" @click="submit">搜索</view>
+        
       </view>
       <view v-if="keywords.length">
         <view class="title">热门搜索</view>
@@ -72,8 +73,29 @@ export default {
   }
 };
 </script>
-<style >
-
+<style lang="less">
+	.searchGood{
+		.search{
+			padding: 0 40rpx;
+			.input{
+				width: 670rpx;
+				height: 68rpx;
+				border: 2rpx solid #FF5100;
+				border-radius: 8rpx;
+				background: rgba(255, 255, 255, 0.39);
+				padding: 0 0 0 20rpx;
+				.bnt{
+					width: 132rpx;
+					height: 68rpx;
+					background: linear-gradient(39deg, #FF5100 0%, #FFA074 100%);
+					border-radius: 8rpx;
+					position: absolute;
+					right: 40rpx;
+					color: #fff;
+				}
+			}
+		}
+	}
 .noCommodity {
   border-top: 0.05*100rpx solid #f5f5f5;
 }
diff --git a/pages/shop/GoodsCon/index.vue b/pages/shop/GoodsCon/index.vue
index b7064c9..d2f742a 100644
--- a/pages/shop/GoodsCon/index.vue
+++ b/pages/shop/GoodsCon/index.vue
@@ -45,7 +45,7 @@
 
       <!-- 规格 -->
       <view class="attribute acea-row row-between-wrapper" @click="selecAttrTap">
-        <view>
+        <view class="line2 value">
           <text>{{ attrTxt }}：</text>
           <text class="atterTxt">{{ attrValue }}</text>
         </view>
@@ -795,6 +795,9 @@ export default {
 </script>
 
 <style scoped lang="less">
+	.value{
+		width: 630rpx;
+	}
 .font-color{
 	color: #F6530F !important;
 }
diff --git a/static/images/home/c1.png b/static/images/home/c1.png
new file mode 100644
index 0000000..ab59bde
Binary files /dev/null and b/static/images/home/c1.png differ
diff --git a/static/images/home/c2.png b/static/images/home/c2.png
new file mode 100644
index 0000000..d9b995c
Binary files /dev/null and b/static/images/home/c2.png differ
diff --git a/static/images/home/c3.png b/static/images/home/c3.png
new file mode 100644
index 0000000..f164609
Binary files /dev/null and b/static/images/home/c3.png differ
diff --git a/static/images/life-icon1.png b/static/images/life-icon1.png
new file mode 100644
index 0000000..2312630
Binary files /dev/null and b/static/images/life-icon1.png differ
diff --git a/static/images/life-icon2.png b/static/images/life-icon2.png
new file mode 100644
index 0000000..3e1ee03
Binary files /dev/null and b/static/images/life-icon2.png differ
diff --git a/static/images/life-icon3.png b/static/images/life-icon3.png
new file mode 100644
index 0000000..9c28e66
Binary files /dev/null and b/static/images/life-icon3.png differ
diff --git a/static/images/life-icon4.png b/static/images/life-icon4.png
new file mode 100644
index 0000000..ade1503
Binary files /dev/null and b/static/images/life-icon4.png differ