From 8876ab732267bb51e8f6314ab8f8a246f2e1a2c0 Mon Sep 17 00:00:00 2001
From: kk_888 <1422704179@qq.com>
Date: Tue, 4 Jan 2022 13:41:18 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BA=91=E7=94=9F=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 config/index.js                             |   4 +-
 pages.json                                  |   7 +
 pages/demandHall/business/index.vue         | 194 ++++---
 pages/demandHall/demoInvestment/index.vue   |   5 +-
 pages/demandHall/enterpriseServer/index.vue |  66 ++-
 pages/demandHall/supplyHall/index.vue       |  99 ++--
 pages/home/activityCenter/index.vue         |  61 ++-
 pages/information/index.vue                 |   2 +-
 pages/life/index2.vue                       | 560 ++++++++++++++++++++
 pages/life/learnMore/index.vue              |  74 ++-
 pages/shop/GoodSearch/index.vue             |  32 +-
 static/images/life-icon1.png                | Bin 0 -> 4211 bytes
 static/images/life-icon2.png                | Bin 0 -> 4321 bytes
 static/images/life-icon3.png                | Bin 0 -> 4035 bytes
 static/images/life-icon4.png                | Bin 0 -> 4093 bytes
 15 files changed, 906 insertions(+), 198 deletions(-)
 create mode 100644 pages/life/index2.vue
 create mode 100644 static/images/life-icon1.png
 create mode 100644 static/images/life-icon2.png
 create mode 100644 static/images/life-icon3.png
 create mode 100644 static/images/life-icon4.png

diff --git a/config/index.js b/config/index.js
index 1751c55..9ade227 100644
--- a/config/index.js
+++ b/config/index.js
@@ -1,8 +1,8 @@
 // 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://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://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 = 'https://thapi.xinxintuan.co/api'
 //  export const VUE_APP_API_URL = 'https://h5api.xinxintuan.co/api';
diff --git a/pages.json b/pages.json
index 7e9740c..839277a 100644
--- a/pages.json
+++ b/pages.json
@@ -320,6 +320,13 @@
 				"enablePullDownRefresh": true	
 			}
 		},
+		{
+			"path": "pages/life/index2",
+			"style": {
+				"navigationBarTitleText": "生活",
+				"enablePullDownRefresh": true	
+			}
+		},
 		{
 			"path": "pages/life/temp/index",
 			"style": {
diff --git a/pages/demandHall/business/index.vue b/pages/demandHall/business/index.vue
index 10a47f6..0feb907 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>
@@ -121,11 +122,20 @@
 </template>
 
 <script>
-	import { getArticle } from "@/api/home";
-	import { briefing, supply, listResourcesCagetory, listEnterprise } from  "@/api/business"
+	import {
+		getArticle
+	} from "@/api/home";
+	import {
+		briefing,
+		supply,
+		listResourcesCagetory,
+		listEnterprise
+	} from "@/api/business"
 	import NewsSwiper from "./newsSwiper.vue"
 	export default {
-		components:{ NewsSwiper },
+		components: {
+			NewsSwiper
+		},
 		data() {
 			return {
 				showCirc: false,
@@ -136,73 +146,73 @@
 				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){
+			toArticleDetail(id) {
 				uni.navigateTo({
-					url:"/pages/life/articleDetail/index?id=" + id
+					url: "/pages/life/articleDetail/index?id=" + id
 				})
 			},
 			//获取供应
-			getSupplyList(){
-				supply().then((res)=>{
+			getSupplyList() {
+				supply().then((res) => {
 					this.supplyList = res.data
 				})
 			},
 			//获取分类
-			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/life/articleDetail/index?id=" + id
+					url: "/pages/life/articleDetail/index?id=" + id
 				})
 			},
 			//换一批
-			replaceClick(){
-				if(!this.showCirc){
+			replaceClick() {
+				if (!this.showCirc) {
 					this.showCirc = true;
 					this.getEnterpriseList()
 				}
 			},
 			// 供需大厅
-			toSupplyHall(e){
+			toSupplyHall(e) {
 				uni.navigateTo({
-					url:"/pages/demandHall/supplyHall/index"
+					url: "/pages/demandHall/supplyHall/index"
 				})
 			},
 			// 企业服务
-			toEnterpriseServer(e){
+			toEnterpriseServer(e) {
 				uni.navigateTo({
-					url:"/pages/demandHall/enterpriseServer/index"
+					url: "/pages/demandHall/enterpriseServer/index"
 				})
 			},
 			// 项目投融
-			toDemoInvestment(e){
+			toDemoInvestment(e) {
 				uni.showModal({
-					title:'提示！',
+					title: '提示！',
 					content: '模块开发中，请等待...',
 					showCancel: false
 				})
@@ -211,13 +221,13 @@
 				// })
 			},
 			// 认证
-			toAuthentication(e){
+			toAuthentication(e) {
 				uni.navigateTo({
-					url:"/pages/release/index2"
+					url: "/pages/release/index2"
 				})
 			}
 		},
-		
+
 	}
 </script>
 
@@ -230,6 +240,37 @@
 		margin-bottom: 100rpx;
 	}
 
+	.category-box {
+		width: 100%;
+		height: 36rpx;
+		overflow: hidden;
+		.tag {
+			// width: 112rpx;
+			padding: 0 10rpx;
+			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;
+		}
+	}
+
 	// 搜索
 	.search-box {
 		width: 670rpx;
@@ -237,6 +278,7 @@
 		border: 2rpx solid #FF5100;
 		border-radius: 8rpx;
 		margin: 24rpx auto;
+		position: relative;
 
 		.search-icon {
 			width: 35rpx;
@@ -245,9 +287,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;
@@ -294,18 +338,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;
 				}
 			}
@@ -327,12 +376,13 @@
 		width: 134rpx;
 		height: 46rpx;
 	}
-	
-	@keyframes doCric{
+
+	@keyframes doCric {
 		0% {
 			transform: rotate(0deg);
 		}
-		100%{
+
+		100% {
 			transform: rotate(360deg);
 		}
 	}
@@ -350,7 +400,7 @@
 			line-height: 26rpx;
 			color: #666666;
 			margin-left: auto;
-			
+
 		}
 
 		.update-icon image {
@@ -359,7 +409,8 @@
 			background: rgba(0, 0, 0, 0);
 			margin-right: 10rpx;
 		}
-		.update-icon .circ{
+
+		.update-icon .circ {
 			animation: doCric 1s ease;
 		}
 
@@ -386,32 +437,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;
@@ -584,33 +609,6 @@
 					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..59b20d7 100644
--- a/pages/demandHall/demoInvestment/index.vue
+++ b/pages/demandHall/demoInvestment/index.vue
@@ -240,6 +240,7 @@
 			border: 2rpx solid #FF5100;
 			border-radius: 8rpx;
 			margin: 0 auto;
+			position: relative;
 			.search-img {
 				width: 35rpx;
 				height: 35rpx;
@@ -247,12 +248,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%;
diff --git a/pages/demandHall/enterpriseServer/index.vue b/pages/demandHall/enterpriseServer/index.vue
index ba7b51c..82cea9a 100644
--- a/pages/demandHall/enterpriseServer/index.vue
+++ b/pages/demandHall/enterpriseServer/index.vue
@@ -29,7 +29,7 @@
 					<view class="enterprise-con acea-row">
 						<image src="../../../static/images/home/menu6.png" class="enterprise-img"></image>
 						<view class="content-right acea-row row-column-between">
-							<view>APP开发平台搭建外卖小程序返现H5定制一站式解决</view>
+							<view class="line2">APP开发平台搭建外卖小程序返现H5定制一站式解决</view>
 							<view class="category-box acea-row">
 								<view class="tag-item-b tag">商务合作</view>
 								<view class="tag-item-y tag">场地租赁</view>
@@ -50,16 +50,14 @@
 						{{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="title-h line1">{{item.enterpriseName}}</view>
 							<view class="category-box acea-row">
 								<view class="tag-item-b tag">{{item.cname}}</view>
 								<!-- <view class="tag-item-y tag"></view> -->
 							</view>
-							<view class="title-s">{{item.enterpriseTitle}}</view>
+							<view class="title-s line2">{{item.enterpriseTitle}}</view>
 						</view>
 					</view>
 					<vie class="business-img acea-row row-around">
@@ -207,7 +205,7 @@
 	}
 </script>
 
-<style>
+<style lang="less">
 	.supplyHall-page {
 		width: 100%;
 		min-height: 100vh;
@@ -229,6 +227,7 @@
 		border: 2rpx solid #FF5100;
 		border-radius: 8rpx;
 		margin: 0 auto;
+		position: relative;
 	}
 
 	.search-box image {
@@ -236,14 +235,19 @@
 		height: 35rpx;
 		margin: 0 29rpx 0 52rpx;
 	}
+	.search-box input {
+		width: 400rpx;
+	}
 
 	.search {
-		margin-left: auto;
+		/* margin-left: auto; */
 		width: 132rpx;
 		height: 68rpx;
 		background: linear-gradient(39deg, #FF5100 0%, #FFA074 100%);
 		border-radius: 8rpx;
 		color: #fff;
+		position: absolute;
+		right: -2rpx;
 	}
 
 	.resource-tabs {
@@ -337,27 +341,34 @@
 	}
 	.category-box{
 		width: 100%;
+		height: 36rpx;
+		overflow: hidden;
+		.tag {
+			width: auto;
+			height: 36rpx;
+			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;
+		}
 	}
-	.tag {
-		width: auto;
-		padding: 0rpx 10rpx;
-		line-height: 26rpx;
-		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;
@@ -457,6 +468,7 @@
 	}
 
 	.title-h {
+		width: 450rpx;
 		height: 44rpx;
 		font-size: 32rpx;
 		color: #1D1D1D;
diff --git a/pages/demandHall/supplyHall/index.vue b/pages/demandHall/supplyHall/index.vue
index a83e00a..b1f2f0f 100644
--- a/pages/demandHall/supplyHall/index.vue
+++ b/pages/demandHall/supplyHall/index.vue
@@ -49,9 +49,9 @@
 						{{item.enterpriseType == 1 ? '企业' : '个人'}}
 					</view>
 					<view class="enterprise-box acea-row row-column-between">
-						<view class="title-h">{{item.title}}</view>
+						<view class="title-h line1">{{item.title}}</view>
 						<view class="enterprise-price">{{item.capital}}</view>
-						<view class="supply-screen acea-row">
+						<view class="category-box 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>
@@ -60,10 +60,11 @@
 						<view class="enterprise-info acea-row row-middle">
 							<image :src="item.resourceImgs" mode="" class="head-logo"></image>
 							<view class="user-name">{{item.enterpriseName}}</view>
+							<view class="todetails">查看详情</view>
 						</view>
 					</view>
 
-					<view class="todetails">查看详情</view>
+					
 				</view>
 				<LoadStatus :loadStatus="loadStatus"></LoadStatus>
 			</view>
@@ -79,14 +80,16 @@
 							<view class="user-address">武汉</view>
 							<view class="user-price">￥20,000</view>
 						</view>
-						<view class="supply-con">李先生需要景区方面资源，洽谈相关合作</view>
+						<view class="supply-con line2">李先生需要景区方面资源，洽谈相关合作</view>
 						<view class="category-box acea-row">
 							<view class="tag-item-b tag">商务合作</view>
 							<view class="tag-item-y tag">场地租赁</view>
 						</view>
-						<view class="time-end">2021.8.30截止报名</view>
+						<view class="acea-row row-middle">
+							<view class="time-end">2021.8.30截止报名</view>
+							<view class="todetails">查看详情</view>
+						</view>
 					</view>
-					<view class="todetails">查看详情</view>
 				</view>
 				<view class="enterprise-list">
 					<view :class="'tips-item' + (item.enterpriseType == 2 ? ' bg2' : '' )">
@@ -95,7 +98,7 @@
 					<view class="enterprise-con acea-row">
 						<image src="../../../static/images/home/menu6.png" class="enterprise-img"></image>
 						<view class="content-right acea-row row-column-between">
-							<view>APP开发平台搭建外卖小程序返现H5定制一站式解决</view>
+							<view class="line2">APP开发平台搭建外卖小程序返现H5定制一站式解决</view>
 							<view class="category-box acea-row">
 								<view class="tag-item-b tag">商务合作</view>
 								<view class="tag-item-y tag">场地租赁</view>
@@ -106,8 +109,9 @@
 					<view class="enterprise-info acea-row row-middle mt20">
 						<image src="../../../static/images/cart.png" mode="" class="head-logo"></image>
 						<view class="user-name">湖北知音动漫有限公司</view>
+						<view class="todetails">查看详情</view>
 					</view>
-					<view class="todetails">查看详情</view>
+					
 				</view>
 				<LoadStatus :loadStatus="loadStatus"></LoadStatus>
 			</view>
@@ -314,6 +318,7 @@
 		border: 2rpx solid #FF5100;
 		border-radius: 8rpx;
 		margin: 0 auto;
+		position: relative;
 	}
 
 	.search-box image {
@@ -323,12 +328,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 {
@@ -428,8 +435,8 @@
 	}
 
 	.info-box {
-		height: 214rpx;
-		padding-left: 20rpx;
+		min-height: 214rpx;
+		padding: 0 58rpx 0 20rpx;
 	}
 
 	.head-img {
@@ -463,35 +470,43 @@
 	}
 
 	.supply-con {
-		height: 40rpx;
+		width: 100%;
+		height: auto;
 		color: #1D1D1D;
 		font-weight: 600;
+		padding: 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: 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;
+		}
 	}
+	
 
 	.time-end {
 		height: 34rpx;
@@ -505,9 +520,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;
 	}
@@ -524,11 +537,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;
@@ -581,7 +594,7 @@
 	}
 
 	.mt20 {
-		padding-left: 20rpx;
+		padding: 0 20rpx;
 	}
 
 
diff --git a/pages/home/activityCenter/index.vue b/pages/home/activityCenter/index.vue
index 8289abc..866b57d 100644
--- a/pages/home/activityCenter/index.vue
+++ b/pages/home/activityCenter/index.vue
@@ -2,9 +2,12 @@
 	<!-- sdsd            345 -->
 	<view class="activityCenter-page">
 		<image src="https://download.cyjyyjy.com/center-img.png" class="top-bg"></image>
-		<view class="page-title"
-			:style="'top:' + menuTop + 'px;height:' + menuHeight + 'px;line-height: ' + menuHeight + 'px;'">
-			活动中心</view>
+		<view class="pageTitle-box" :class="isFixed ? 'showPageTitle' : ''"
+			:style="{'padding-top':navTopHeight + 'px',height:navHeight*2+ 'px'}">
+			<view class="page-title acea-row row-center row-middle"
+				:style="'top:' + menuTop + 'px;height:' + menuHeight + 'px;line-height: ' + menuHeight + 'px;'"><image src="../../../static/images/arror-right.png" mode="" class="page-back" @tap="toBackHome"></image>活动中心
+			</view>
+		</view>
 		<view class="activity-box">
 			<view class="activity-list acea-row" v-for="(item,index) in activity" :key="index" @tap="toActiveDetail"
 				:data-id="item.id">
@@ -39,8 +42,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() {
@@ -58,6 +71,10 @@
 					url: '/pages/activity/detail/index?id=' + id
 				});
 			},
+			toBackHome(e){
+				console.log("1")
+				uni.navigateBack();
+			}
 		}
 	}
 </script>
@@ -73,13 +90,49 @@
 	.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;
+		transition: all .5s cubic-bezier(.25, .5, .5, .9);
+	}
+	.page-back {
+		width: 18rpx;
+		height: 30rpx;
+		position: absolute;
+		left: 40rpx;
+		transform: rotateY(180deg);
 	}
 
 	.activity-box {
diff --git a/pages/information/index.vue b/pages/information/index.vue
index f9a8ede..a723371 100644
--- a/pages/information/index.vue
+++ b/pages/information/index.vue
@@ -200,7 +200,7 @@
 
 	.search {
 		position: absolute;
-		right: 0;
+		right: -2rpx;
 		width: 132rpx;
 		height: 68rpx;
 		background: linear-gradient(39deg, #FF5100 0%, #FFA074 100%);
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/static/images/life-icon1.png b/static/images/life-icon1.png
new file mode 100644
index 0000000000000000000000000000000000000000..23126302736c8504a272972dabdfc34cc1ef57d4
GIT binary patch
literal 4211
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
JPDHLkV1k!^^6vlu

literal 0
HcmV?d00001

diff --git a/static/images/life-icon2.png b/static/images/life-icon2.png
new file mode 100644
index 0000000000000000000000000000000000000000..3e1ee039a4f9135eb97543663cdcfe46a23f9bbc
GIT binary patch
literal 4321
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
P00000NkvXXu0mjf!COcg

literal 0
HcmV?d00001

diff --git a/static/images/life-icon3.png b/static/images/life-icon3.png
new file mode 100644
index 0000000000000000000000000000000000000000..9c28e66f9a6efd61f5260e0e643de8ae505c6ecc
GIT binary patch
literal 4035
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

literal 0
HcmV?d00001

diff --git a/static/images/life-icon4.png b/static/images/life-icon4.png
new file mode 100644
index 0000000000000000000000000000000000000000..ade15037fa9c5a432661c354bb06a5457671d854
GIT binary patch
literal 4093
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

literal 0
HcmV?d00001


From 70a59b5da832ea1e075b64fd9a7e0716f72f1d4d Mon Sep 17 00:00:00 2001
From: kk_888 <1422704179@qq.com>
Date: Mon, 24 Jan 2022 10:26:15 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BA=91=E7=94=9F=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 config/index.js                             |   2 +-
 pages.json                                  |  14 +
 pages/activity/detail/index.vue             |   2 +-
 pages/demandHall/business/index.vue         |  19 +-
 pages/demandHall/demoInvestment/index.vue   | 146 ++----
 pages/demandHall/enterprisePage/index.vue   |  31 +-
 pages/demandHall/enterpriseServer/index.vue |  95 ++--
 pages/demandHall/newProject/index.vue       | 160 ++++++
 pages/demandHall/projectDetail/index.vue    | 334 ++++++------
 pages/demandHall/projectManage/index.vue    | 312 +++++++++++
 pages/demandHall/supplyHall/index.vue       |  42 +-
 pages/home/index.vue                        | 547 ++++++++++++--------
 pages/information/index.vue                 |  49 +-
 pages/life/articleDetail/index.vue          |  15 +-
 pages/shop/GoodsCon/index.vue               |   5 +-
 static/images/home/c1.png                   | Bin 0 -> 505 bytes
 static/images/home/c2.png                   | Bin 0 -> 519 bytes
 static/images/home/c3.png                   | Bin 0 -> 636 bytes
 18 files changed, 1185 insertions(+), 588 deletions(-)
 create mode 100644 pages/demandHall/newProject/index.vue
 create mode 100644 pages/demandHall/projectManage/index.vue
 create mode 100644 static/images/home/c1.png
 create mode 100644 static/images/home/c2.png
 create mode 100644 static/images/home/c3.png

diff --git a/config/index.js b/config/index.js
index 9ade227..3293949 100644
--- a/config/index.js
+++ b/config/index.js
@@ -3,7 +3,7 @@
 // export const VUE_APP_API_URL = 'http://192.168.0.112: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 839277a..d284641 100644
--- a/pages.json
+++ b/pages.json
@@ -264,6 +264,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": {
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 0feb907..b10affa 100644
--- a/pages/demandHall/business/index.vue
+++ b/pages/demandHall/business/index.vue
@@ -106,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>
@@ -245,10 +244,10 @@
 		height: 36rpx;
 		overflow: hidden;
 		.tag {
-			// width: 112rpx;
+			width: auto;
 			padding: 0 10rpx;
 			height: 36rpx;
-			line-height: 33rpx;
+			line-height: 34rpx;
 			border-radius: 4rpx;
 			font-size: 20rpx;
 			margin-right: 16rpx;
@@ -587,6 +586,7 @@
 			}
 
 			.right-con {
+				width: 510rpx;
 				.title {
 					font-weight: 800;
 					height: 35rpx;
@@ -596,15 +596,16 @@
 						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;
diff --git a/pages/demandHall/demoInvestment/index.vue b/pages/demandHall/demoInvestment/index.vue
index 59b20d7..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: '',
 			  });
 			},
@@ -338,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 {
@@ -357,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;
@@ -382,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 {
@@ -391,6 +354,7 @@
 						font-weight: 900;
 					}
 					.price {
+						width: 350rpx;
 						font-weight: 900;
 					}
 					.tocheck {
@@ -442,6 +406,7 @@
 					color: #707070;
 					.name {
 						width: 100%;
+						height: 38rpx;
 						font-size: 32rpx;
 						font-weight: bold;
 						color: #1D1D1D;
@@ -531,7 +496,7 @@
 	  width: 152rpx;
 	  height: 64rpx;
 	  line-height: 64rpx;
-	  text-align: center;
+	  text-align: center;                                                                           
 	  font-size: 24rpx;
 	  color: #666666;
 	  background: #F6F6F6;
@@ -541,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 82cea9a..4e80873 100644
--- a/pages/demandHall/enterpriseServer/index.vue
+++ b/pages/demandHall/enterpriseServer/index.vue
@@ -37,11 +37,11 @@
 							<view class="enterprise-price">￥20,000</view>
 						</view>
 					</view>
-					<view class="user-info acea-row row-middle">
+					<view class="enterprise-info acea-row row-middle">
 						<image src="../../../static/images/cart.png" mode="" class="head-logo"></image>
-						<view class="user-name">湖北知音动漫有限公司</view>
+						<view class="enterprise-name line1">湖北知音动漫有限公司</view>
+						<view class="todetails">查看详情</view>
 					</view>
-					<view class="todetails">查看详情</view>
 				</view>
 			</view>
 			<view class="company-box" v-if="active == 2">
@@ -51,7 +51,7 @@
 					</view>
 					<view class="business-con acea-row">
 							<image :src="item.enterpriseLogo" class="logo-img"></image>
-						<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>
@@ -63,6 +63,10 @@
 					<vie class="business-img acea-row row-around">
 						<image v-for="(item, index2) in item.imgPaths" :key="index2" mode="aspectFill" :src="item"
 							v-if="index2 < 2"></image>
+							<image v-for="(item, index2) in item.imgPaths" :key="index2" mode="aspectFill" :src="item"
+								v-if="index2 < 2"></image>
+								<image v-for="(item, index2) in item.imgPaths" :key="index2" mode="aspectFill" :src="item"
+									v-if="index2 < 2"></image>
 					</vie>
 				</view>
 			</view>
@@ -329,16 +333,10 @@
 		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;
@@ -346,7 +344,7 @@
 		.tag {
 			width: auto;
 			height: 36rpx;
-			line-height: 28rpx;
+			line-height: 34rpx;
 			border-radius: 4rpx;
 			font-size: 20rpx;
 			margin-right: 8rpx;
@@ -373,18 +371,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 {
@@ -393,7 +394,6 @@
 		margin: 0 auto;
 		margin-top: 32rpx;
 		border-radius: 12rpx;
-		position: relative;
 	}
 
 	.enterprise-price {
@@ -421,7 +421,6 @@
 
 	.content-right {
 		width: 456rpx;
-		position: relative;
 	}
 
 	.content-right>.supply-screen {
@@ -439,7 +438,7 @@
 		margin: 0 auto;
 		margin-top: 32rpx;
 		border-radius: 12rpx;
-		position: relative;
+		padding-bottom: 30rpx;
 	}
 
 	.business-lable {
@@ -455,41 +454,40 @@
 	.bg2 {
 		background: linear-gradient(141deg, #FFA782 0%, #FF6D31 100%);
 	}
-
-
 	.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 {
-		width: 450rpx;
-		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 {
@@ -572,6 +570,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 b1f2f0f..a9e39d6 100644
--- a/pages/demandHall/supplyHall/index.vue
+++ b/pages/demandHall/supplyHall/index.vue
@@ -51,15 +51,18 @@
 					<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="category-box 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.resourceImgs" mode="" class="head-logo"></image>
-							<view class="user-name">{{item.enterpriseName}}</view>
+							<view class="enterprise-name line1">{{item.enterpriseName}}</view>
 							<view class="todetails">查看详情</view>
 						</view>
 					</view>
@@ -76,7 +79,7 @@
 					<view class="acea-row row-column-between info-box">
 						<view class="user-info acea-row row-middle">
 							<image src="../../../static/images/business-img1.png" mode="" class="head-img"></image>
-							<view class="user-name">大老虎</view>
+							<view class="user-name line1">大老虎</view>
 							<view class="user-address">武汉</view>
 							<view class="user-price">￥20,000</view>
 						</view>
@@ -108,7 +111,7 @@
 					</view>
 					<view class="enterprise-info acea-row row-middle mt20">
 						<image src="../../../static/images/cart.png" mode="" class="head-logo"></image>
-						<view class="user-name">湖北知音动漫有限公司</view>
+						<view class="enterprise-name line1">湖北知音动漫有限公司</view>
 						<view class="todetails">查看详情</view>
 					</view>
 					
@@ -445,6 +448,8 @@
 	}
 
 	.user-name {
+		width: auto;
+		max-width: 250rpx;
 		height: 40rpx;
 		color: #1D1D1D;
 		margin: 0 10rpx 0 16rpx;
@@ -474,7 +479,7 @@
 		height: auto;
 		color: #1D1D1D;
 		font-weight: 600;
-		padding: 10rpx 0;
+		margin: 10rpx 0;
 	}
 	.category-box{
 		width: 100%;
@@ -483,7 +488,7 @@
 		.tag {
 			width: auto;
 			height: 36rpx;
-			line-height: 28rpx;
+			line-height: 34rpx;
 			border-radius: 4rpx;
 			font-size: 20rpx;
 			margin-right: 8rpx;
@@ -555,18 +560,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 {
@@ -674,6 +689,7 @@
 	}
 
 	.screen-item .item-active {
+		line-height: 44rpx;
 		border: 2rpx solid #FF6E33;
 		color: #FE7D26;
 		background: #FDEFE6;
diff --git a/pages/home/index.vue b/pages/home/index.vue
index 2ebb4ae..a46eb3a 100644
--- a/pages/home/index.vue
+++ b/pages/home/index.vue
@@ -1,8 +1,8 @@
 <template>
 	<view class="productSort">
 		<!-- 顶部主页 -->
-		<skeleton v-if="showSkeleton" ref="skeleton" loading="chiaroscuro" selector="skeleton"
-			bgcolor="#FFF"></skeleton>
+		<skeleton v-if="showSkeleton" ref="skeleton" loading="chiaroscuro" selector="skeleton" bgcolor="#FFF">
+		</skeleton>
 		<view class="pageTitle-box" :class="isFixed ? 'showPageTitle' : ''"
 			:style="{'padding-top':navTopHeight + 'px',height:navHeight*2+ 'px'}">
 			<view class="top-logo acea-row row-center"
@@ -122,8 +122,31 @@
 		<!-- 为您推荐 -->
 		<view class="warter-box">
 			<image src="../../static/images/rec-headline.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">
@@ -515,126 +538,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;
@@ -642,138 +663,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%;
@@ -811,14 +808,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 a723371..37f8952 100644
--- a/pages/information/index.vue
+++ b/pages/information/index.vue
@@ -73,7 +73,7 @@
 					<image :src="item.imageInput" mode="aspectFill"></image>
 					<view class="hotspot-con">
 						<view class="hotspot-icon">热点</view>
-						<view class="hotspot-title-h">{{item.title}}</view>
+						<view class="hotspot-title-h line2">{{item.title}}</view>
 					</view>
 				</view>
 			</scroll-view>
@@ -97,8 +97,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>
@@ -174,7 +174,7 @@
 	}
 </script>
 
-<style>
+<style lang="less">
 	.information-box {
 		width: 100%;
 		height: auto;
@@ -395,7 +395,7 @@
 	.hotspot-con {
 		width: 588rpx;
 		height: 130rpx;
-		bottom: 34rpx;
+		bottom: 30rpx;
 		left: 24rpx;
 		position: absolute;
 	}
@@ -405,20 +405,17 @@
 		height: 32rpx;
 		background: #FE3737;
 		border-radius: 12rpx 2rpx 12rpx 0;
-		position: absolute;
 		font-size: 22rpx;
 		color: #fff;
 		text-align: center;
-
+		margin-bottom: 16rpx;
 	}
 
 	.hotspot-title-h {
-		width: 588rpx;
-		height: 80rpx;
+		max-width: 588rpx;
+		max-height: 80rpx;
 		font-size: 28rpx;
 		color: #FFFFFF;
-		position: absolute;
-		bottom: 0;
 		white-space: pre-wrap;
 	}
 
@@ -482,7 +479,7 @@
 	.follow-bottom {
 		width: 100%;
 		height: 80rpx;
-		padding: 12rpx 20rpx 16rpx 20rpx;
+		padding: 14rpx 20rpx 14rpx 20rpx;
 	}
 
 	.follow-bottom image {
@@ -492,22 +489,24 @@
 		margin-right: 8rpx;
 	}
 
-	.follow-title-b {}
-
-	.title-s {
-		height: 28rpx;
-		font-size: 20rpx;
-		margin-bottom: 6rpx;
-		font-weight: 600;
-	}
-
-	.title-con {
+	.follow-title-b {
 		width: 230rpx;
-		height: 22rpx;
-		font-size: 16rpx;
-		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/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 0000000000000000000000000000000000000000..ab59bdecafe8243b515435f4638425e074117f88
GIT binary patch
literal 505
zcmV<V0S5kwP)<h;3K|Lk000e1NJLTq000yK000yS1^@s6jfou%00001b5ch_0Itp)
z=>Px$vq?ljR5(wKls!wsP!xvWbCan30YX6s1qTNO7YDb3`VSN(byRfhW-%24wth_N
zCaB<GBZ8}&qJx8*4uWGH{2Ck_918h35~cMvO>WF~?|JW&=bjuwP&{nsx_l!$P7p(3
zECB9x_w|zOYcJ^-B^9`wp9z2+5VEZqeijf*WF4Q!os9+Z`rKl`yr;4k#PhV`97Z#3
zz`8v>VCcpph;$VYjJoG}qn-BYgPdyv`ekz;MDu?k4*PWmkO#&T2wlw@^MO`!7E*xu
zH@R;?z>~(Ra}geL*Jg7<Xjc;OLn}GmYG5VLQs6<es>AXDzhd42G}71;u8|@8sNPt&
zT$$~h9vD5YbloS-a{42{8bE!GJ<Y1NFxq=qF&_aMl%Pe;a<;;?Uon>f+HBOAajTcA
zV`)9y0HGM2z27zU%KHLbAj{cR0>A9(Y)0>>wS3LE`C+^Z@1>vY>t_FcUKyA5%lT~(
z3d+Hbu}cJ|S|->f0)IY$!ZNORv121&G0{?Cr!-8mRN18h+bmP;Qh`y+G`oKRo0h<5
v+}uS+EAfvl2i-Mu0>pKrbaJDb&9L?jRo%4}4URgV00000NkvXXu0mjf*dyM5

literal 0
HcmV?d00001

diff --git a/static/images/home/c2.png b/static/images/home/c2.png
new file mode 100644
index 0000000000000000000000000000000000000000..d9b995c8f70e6b0ab326d0fc38231c1a759aead6
GIT binary patch
literal 519
zcmV+i0{H!jP)<h;3K|Lk000e1NJLTq000yK000yS1^@s6jfou%00001b5ch_0Itp)
z=>Px$!AV3xR5(xVl+S7tQ5eO~xpxB5Cy>-d-T4R=D!4EUp+a{ij$jK43O;~13rEc8
z6NrlnRWPN{MGM__A#~G)50ITMYAD!67E)s7&yhPJc4{UzLYB_v4&OcB@B7OoX8iF_
zo?iL)mFXUn?rnyj`epGH-l)o}?b7fgpS3>}HDkau^49^Zm^i({aPw<9urZ%i>=yv<
zZO~r*4+PT44<y`ly&!NE#3e}w0857gs7i7H!jXVZ?nms|pdC>y|4v41{%)*>RE*Bj
zsg!Gs&|n(feGV|31rSg;0r<D{Mxh0W!)i{mDFNn}N&tFisulVmss-m{_+QkGXLvY>
z)9Y0n9cGo<8o(7mou32NFYw#3ytyqAON2f%KB?!Sy^Fgd7l-gMpx)VF<Dt8XTg^p7
zv+qPU*m&V=$;;+4joAk9#0Kp*xh-lwAk5k%V8_HK*BI{f(w6@k#8U|eHW}1`@BLBM
zlJ;!Uz2zXOH@8h<X#y}`mma7d!1==Do$Uv}%cnLS15Dh`PBE0S<(tOlde~|_0`1#r
z<mYOXKBjxyvPx|o;_}(GIM=;Usaq-Sn7F$-_8$HNrc^p};4k+D?kZyPy`%sD002ov
JPDHLkV1l(h@hboT

literal 0
HcmV?d00001

diff --git a/static/images/home/c3.png b/static/images/home/c3.png
new file mode 100644
index 0000000000000000000000000000000000000000..f1646093f8c8ded8d975b293ca2acb8771922dba
GIT binary patch
literal 636
zcmV-?0)zdDP)<h;3K|Lk000e1NJLTq000yK000yS1^@s6jfou%00001b5ch_0Itp)
z=>Px%Hc3Q5R5(wqlrd-%Q5eVn|96+zLIwwiA_Y4XTpU`+pooycq1g&r>?MLrK^IY}
zlb1jsNf#~ZCWxTW3zY~u2o_Yj2o840;37Cg2qL&R1ggEe_sJzqa!JlmOK!UNzVG|L
z-+SNxJz~rs$E=4TK`CWU_>d%_k|3r<Fdbf$L<53`K<^mf4s(@neeuq~D`l^caueX(
z|4~a#gb&P|^DL-q5qf2-N~nv&LQ*FX6x0FnNX`f(32<gGS0J0FU9spEms3g^+x^(`
z!2_<x?Mf|*_D}iJsTj=10-O%Vwdiwni`Ift>P;^oo(F&ai2eNYsIBjnGjj&;382}@
z(^{t~g_Nny<M%->Q1I0kS&!u_?}8-1l(`!;#;_|^)Hr}KsBQ=`3z045eZTcj+el$4
z;hXWdq)Y*L+NR(lfP`}Q=2@sVqjnG}*eonfO_=eQWd9k3j-|Hiy6Hrr`eRUZ*oVc-
zC$*B-0A^dsf?psu_y3nc9NiabD9!WCZ+waLVXJm6dsb_C1@c%sN$R_<d!|DYkWa>9
zAG@{@X)1D&w)4It+9i~dbwNXIfS3rac-yd@^)P{7&aMKu*PRpb6u82$v0EK1XJyE&
zloj(%<w>95nspVT9u4Liw$p;^5=IINw#=N94i|f+>^6zip#<AK!3zU^i^zv@jX=Z|
z1%?SrnV-F8jJhKcF~M&m=S=o(x$SzcLiMiFfn>FKTKLe+JAu`P-@^lmj7S>$i~Sb@
W1K0~Sn<!fV0000<MNUMnLSTZ5QY2CU

literal 0
HcmV?d00001