diff --git a/pages/demandHall/business/index.vue b/pages/demandHall/business/index.vue
index b2a4d74..7da7e86 100644
--- a/pages/demandHall/business/index.vue
+++ b/pages/demandHall/business/index.vue
@@ -283,7 +283,6 @@
 			width: 100%;
 			height: 330rpx;
 			white-space: nowrap;
-			margin-left: 30rpx;
 
 			.company-list {
 				width: 408rpx;
@@ -293,8 +292,8 @@
 				border-radius: 12rpx;
 				padding: 16rpx 24rpx;
 				display: inline-block;
-				margin: 15rpx 30rpx 0 10rpx;
-
+				margin: 15rpx 32rpx 0 0rpx;
+				
 				.title {
 					font-size: 28rpx;
 					font-weight: 600;
@@ -352,6 +351,9 @@
 				}
 			}
 		}
+		.company-list:nth-child(1){
+			margin-left: 40rpx;
+		}
 	}
 
 	// 推荐服务
diff --git a/pages/demandHall/projectDetail/index.vue b/pages/demandHall/projectDetail/index.vue
index 1e5832f..e3dc818 100644
--- a/pages/demandHall/projectDetail/index.vue
+++ b/pages/demandHall/projectDetail/index.vue
@@ -299,7 +299,6 @@
 		width: 100%;
 		height: 345rpx;
 		white-space: nowrap;
-		padding-left: 22rpx;
 	}
 
 	.recommend-list {
@@ -310,9 +309,11 @@
 		font-size: 24rpx;
 		color: #707070;
 		display: inline-block;
-		margin: 0 22rpx 0 10rpx;
+		margin: 0 32rpx 0 0rpx;
+	}
+	.recommend-list:nth-child(1){
+		margin-left: 32rpx;
 	}
-
 	.recommend-list image {
 		width: 392rpx;
 		height: 194rpx;
diff --git a/pages/home/activityCenter/index.vue b/pages/home/activityCenter/index.vue
index 6cd7306..8289abc 100644
--- a/pages/home/activityCenter/index.vue
+++ b/pages/home/activityCenter/index.vue
@@ -1,62 +1,88 @@
-<template>   
-<!-- sdsd            345 -->
+<template>
+	<!-- sdsd            345 -->
 	<view class="activityCenter-page">
-		<image src="/static/images/center-img.png" class="top-bg"></image>
-		<view class="page-title" :style="'top:' + menuTop + 'px;height:' + menuHeight + 'px;line-height: ' + menuHeight + 'px;'">活动中心</view>
+		<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="activity-box">
-			<view class="activity-list acea-row" v-for="(item,index) in 3">
-				<image src="../../../static/images/business-img1.png" mode="" class="act-img"></image>
+			<view class="activity-list acea-row" v-for="(item,index) in activity" :key="index" @tap="toActiveDetail"
+				:data-id="item.id">
+				<image :src="item.images" mode="aspectFill" class="act-img"></image>
 				<view class="act-con acea-row row-column-between">
-					<view class="title">云生态会员招募开始</view>
+					<view class="title line2">{{item.name}}</view>
 					<view class="act-time acea-row row-middle">
 						<image src="../../../static/images/act-time.png" mode="" class="time-img"></image>
-						<view>12-23 00:00至11-25 23:00</view>
+						<view>{{item.activityStartTime.split(' ')[0]}}至{{item.activityEndTime.split(' ')[0]}}</view>
 					</view>
 					<view class="act-adress acea-row">
 						<image src="../../../static/images/act-address.png" mode="" class="address-img"></image>
-						<view class="title-line">武汉市江夏区文化大道288号斤斤计较经济放假安排发金额为吉安打了个</view>
+						<view class="title-line line2">{{item.address}}</view>
 					</view>
 					<view class="acea-row row-between-wrapper act-price">
-						<text class="act-p">￥888.00</text>
+						<text class="act-p">￥{{item.price}}</text>
 						<text class="act-i">进行中</text>
 						<view class="enter-btn">立即报名</view>
 					</view>
 				</view>
 			</view>
-		</view>	
+		</view>
 	</view>
 </template>
 
 <script>
+	import {
+		getIndexData
+	} from "@/api/home";
 	const app = getApp();
 	export default {
 		data() {
-		  return {
+			return {
 				menuHeight: app.globalData.menuHeight,
 				menuTop: app.globalData.menuTop,
-		  };
+				activity: [], //活动列表
+			};
 		},
+		mounted: function() {
+			this.getIndexData()
+		},
+		methods: {
+			getIndexData() {
+				getIndexData().then(res => {
+					this.activity = res.data.recommendActivity.content
+				})
+			},
+			toActiveDetail(e) {
+				let id = e.currentTarget.dataset.id;
+				uni.navigateTo({
+					url: '/pages/activity/detail/index?id=' + id
+				});
+			},
+		}
 	}
 </script>
 
 <style lang="less">
-	.activityCenter-page{
+	.activityCenter-page {
 		width: 100%;
 		height: auto;
 		background: #fff;
 		position: relative;
 	}
-	.top-bg{
-	  width: 100%;
-	  height: 1210rpx;
+
+	.top-bg {
+		width: 100%;
+		height: 1210rpx;
 	}
-	.page-title{
-	  width: 100%;
-	  color: #fff;
-	  text-align: center;
-	  position: absolute;
+
+	.page-title {
+		width: 100%;
+		color: #fff;
+		position: absolute;
+		text-align: center;
 	}
-	.activity-box{
+
+	.activity-box {
 		width: 100%;
 		height: auto;
 		background: #FFF;
@@ -66,69 +92,76 @@
 		padding: 32rpx 40rpx 0 40rpx;
 		margin-bottom: 218rpx;
 	}
-	
-	.activity-list{
+
+	.activity-list {
 		border-bottom: 1px solid #EEEEEE;
 		padding: 20rpx 0;
-		.act-img{
+
+		.act-img {
 			width: 178rpx;
 			height: 236rpx;
 			margin-right: 20rpx;
+			border-radius: 8rpx;
 		}
-		.act-con{
+
+		.act-con {
 			width: 450rpx;
 			height: 236rpx;
 			padding: 5rpx 0;
-			.title{
-				width: 345rpx;
-				height: 40rpx;
+
+			.title {
 				font-size: 28rpx;
 				font-weight: 600;
-				line-height: 35rpx;
 				color: #1D1D1D;
 			}
-			.act-time{
-				width: 345rpx;
+
+			.act-time {
 				font-size: 24rpx;
 				color: #191919;
-				.time-img{
+
+				.time-img {
 					width: 18rpx;
 					height: 22rpx;
 					line-height: 34rpx;
 					margin: 0rpx 16rpx 0 0;
 				}
 			}
-			.act-adress{
-				width: 345rpx;
+
+			.act-adress {
 				height: 67rpx;
-				.address-img{
+
+				.address-img {
 					width: 19rpx;
 					height: 23rpx;
 					margin: 7rpx 14rpx 40rpx 0;
 				}
-				.title-line{
-					width: 308rpx;
+
+				.title-line {
 					height: 68rpx;
 					font-size: 24rpx;
 					font-weight: 500;
-					color: #191919;	
-					word-wrap : break-word;
-					overflow:hidden;
+					color: #191919;
+					word-wrap: break-word;
+					overflow: hidden;
 				}
 			}
-			.act-price{
+
+			.act-price {
 				width: 100%;
+
 				.act-i {
 					font-size: 24rpx;
 					color: #FF5A0E;
 					font-weight: 600;
 				}
-				.act-p{
+
+				.act-p {
 					font-size: 32rpx;
 					color: #2A2B2B;
 					font-weight: 600;
 				}
-				.enter-btn{
+
+				.enter-btn {
 					width: 138rpx;
 					height: 40rpx;
 					line-height: 40rpx;
@@ -141,5 +174,4 @@
 			}
 		}
 	}
-	
 </style>
diff --git a/pages/home/index.vue b/pages/home/index.vue
index 63b0f40..2be3136 100644
--- a/pages/home/index.vue
+++ b/pages/home/index.vue
@@ -1,12 +1,18 @@
 <template>
-  <view class="productSort">
+	<view class="productSort">
 		<!-- 顶部主页 -->
-		<skeleton v-if="showSkeleton" ref="<strong>skeleton</strong>" 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" :style="'top:' + menuTop + 'px;height:' + menuHeight + 'px;line-height: ' + menuHeight + 'px;'">禪易生态云</view>
+		<skeleton v-if="showSkeleton" ref="<strong>skeleton</strong>" 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"
+				:style="'top:' + menuTop + 'px;height:' + menuHeight + 'px;line-height: ' + menuHeight + 'px;'">禪易生态云
+			</view>
 		</view>
-		<view class="main-box skeleton-rect" >
-			<view class="back-bg"><image src="https://download.cyjyyjy.com/life-bg.png" mode=""></image></view>
+		<view class="main-box skeleton-rect">
+			<view class="back-bg">
+				<image src="https://download.cyjyyjy.com/life-bg.png" mode=""></image>
+			</view>
 			<view class="details-btn skeleton-rect" @click="tolearnMore">了解详情</view>
 		</view>
 		<!-- 云快讯 -->
@@ -23,21 +29,29 @@
 			</view>
 		</view>
 		<!-- 最新活动 -->
-		<view class="act-box skeleton-rect" >
-			<view class="headline"><image src="../../static/images/new-act.png" mode="" skeleton-rect></image></view>
-			<scroll-view class="scroll-view_H" scroll-x="true">			
-				<view class="slide-left  skeleton-rect" v-for="(item,index) in activity" :key="index"  @tap="toActiveDetail" :data-id="item.id">
+		<view class="act-box skeleton-rect">
+			<view class="headline acea-row row-between-wrapper">
+				<image src="../../static/images/new-act.png" mode="" skeleton-rect class="headline-img"></image>
+				<view class="more-r skeleton-rect" @click="toNewActivity">
+					<text>查看更多</text>
+					<image src="../../static/images/home/arrow-r.png"></image>
+				</view>
+			</view>
+			<scroll-view class="scroll-view_H" scroll-x="true">
+				<view class="slide-left  skeleton-rect" v-for="(item,index) in activity" :key="index"
+					@tap="toActiveDetail" :data-id="item.id">
 					<view class="act-title">{{item.name}}</view>
 					<view class="resource-list acea-row-nowrap">
 						<image :src="item.images" class="act-img" mode="aspectFill"></image>
 						<view class="act-con acea-row row-middle">
 							<view class="act-time acea-row row-middle line1">
 								<image src="../../static/images/act-time.png" mode=""></image>
-								<view>{{item.activityStartTime.split(' ')[0]}}至{{item.activityEndTime.split(' ')[0]}}</view>
+								<view>{{item.activityStartTime.split(' ')[0]}}至{{item.activityEndTime.split(' ')[0]}}
+								</view>
 							</view>
 							<view class="act-adress acea-row line1">
 								<image src="../../static/images/act-address.png" mode=""></image>
-								<view class="title-line">{{item.address}}</view>
+								<view class="title-line line2">{{item.address}}</view>
 							</view>
 							<view class="acea-row row-between-wrapper act-price">
 								<text class="act-i">进行中</text>
@@ -57,11 +71,11 @@
 				</view>
 			</scroll-view>
 		</view>
-		<!-- 最新活动 -->
+		<!-- 推荐供需 -->
 		<view class="rec-box">
-			<view class="headline  skeleton-rect"><image src="../../static/images/rec-headline.png" mode=""></image></view>
+			<image src="../../static/images/rec-headline.png" mode="" class="headline-img" skeleton-rect></image>
 			<view class="rec-switch">
-				<view class="rec-title acea-row"> 
+				<view class="rec-title acea-row">
 					<view class="rec-l " @click="tabClick(1)">
 						<image src="../../static/images/rec-bg.png" class="rec-bg" v-show="active == 2"></image>
 						<view class="rec-t acea-row row-center-wrapper">
@@ -69,8 +83,8 @@
 							<view>需求</view>
 						</view>
 					</view>
-					<view class="rec-r "  @click="tabClick(2)">
-						<image src="../../static/images/rec-bg.png" class="rec-bg"  v-show="active == 1"></image>
+					<view class="rec-r " @click="tabClick(2)">
+						<image src="../../static/images/rec-bg.png" class="rec-bg" v-show="active == 1"></image>
 						<view class="rec-t acea-row row-center-wrapper">
 							<image src="../../static/images/rec-icon2.png" mode=""></image>
 							<view>资源</view>
@@ -79,7 +93,8 @@
 				</view>
 				<view class="rec-switch-a">
 					<view class="list-box" v-if="active == 1">
-						<view class="rec-list acea-row row-column-between" v-for="(item,index) in demandList" :key="index" @click="toNeedDetail(item.id)">
+						<view class="rec-list acea-row row-column-between" v-for="(item,index) in demandList"
+							:key="index" @click="toNeedDetail(item.id)">
 							<view class="acea-row row-middle">
 								<image src="../../static/images/rec-icon1.png" mode="aspectFill"></image>
 								<view class="rec-name line1">{{item.title}}</view>
@@ -90,7 +105,8 @@
 						</view>
 					</view>
 					<view class="list-box" v-if="active == 2">
-						<view class="rec-list"  v-for="(item,index) in resourcesList" :key="index" @click="toResourcesDetail(item.id)">
+						<view class="rec-list acea-row row-column-between" v-for="(item,index) in resourcesList"
+							:key="index" @click="toResourcesDetail(item.id)">
 							<view class="acea-row row-middle">
 								<image src="../../static/images/rec-icon2.png" mode=""></image>
 								<view class="rec-name line1">{{item.title}}</view>
@@ -105,30 +121,28 @@
 		</view>
 		<!-- 为您推荐 -->
 		<view class="warter-box">
-			<view class="headline">
-				<image src="../../static/images/rec-title.png" mode=""></image>
-			</view>
+			<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="warter" v-for="(item, index) in leftList" :key="index"  @tap="toGoodsDetail(item.id)">
+					<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"> 
+							<view class="price-box acea-row row-between-wrapper">
 								<text class="price">￥{{item.price}}</text>
-								<text class="old-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>			
+						<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> 
+								<text class="old-price">￥{{item.otPrice}}</text>
 							</view>
 						</view>
 					</view>
@@ -137,292 +151,325 @@
 			<!-- <u-loadmore bg-color="rgb(240, 240, 240)" :status="loadStatus" @loadmore="addRandomData"></u-loadmore> -->
 		</view>
 		<!-- <tabbar :current="currentTabIndex" @click="tabBarClick"></tabbar> -->
-  </view>
+	</view>
 </template>
 <script>
-import { getIndexData } from "@/api/home";
-import { trim } from "@/utils";
-import { mapGetters } from 'vuex'
-import tabbar from "../../tabbarComponent/tabbar";
-import vSwiper from '@/components/vSwiper.vue'
-import skeleton from '@/components/quick-skeleton/quick-skeleton'
-const app = getApp();
-export default {
-	components: {
-	  tabbar,
-		vSwiper,
-		skeleton
-	},
-  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,
-			navTopHeight: app.globalData.navTopHeight,
-			currentTabIndex:0,
-			flowList:[],
-			isFixed: false,
-			loadStatus: 'loadmore',
-			page: 1,
-			limit: 10,
-			isLoad: true,  //是否还有更多
-			active: 1,
-			show: false,
-			articleList: [], //快讯列表
-			activity: [],		//活动列表
-			demandList: [], //需求列表
-			resourcesList: [], //资源列表
-			productDtos: [], //推荐列表
-			
-			showSkeleton: true
-    };
-  },
-  onShareAppMessage() {
-  	return {
-  	  title: '禅易云生态',
-  	  path: '/pages/home/index',
-  	  success(res) {
-  	    uni.showToast({
-  	      title: '分享成功',
-  	    })
-  	  },
-  	  fail(res) {
-  	    uni.showToast({
-  	      title: '分享失败',
-  	      icon: 'none',
-  	    })
-  	  },
-  	}
-  },
-	onReady:function(){
-		const that = this;
-
-		// that.$refs.skeleton.attachedAction();
-
-		that.$refs.skeleton.readyAction();
-	},
-	onLoad() {
-		// uni.hideTabBar()
-	},
-  mounted: function() {
-		this.getIndexData()
-  },
-	onReachBottom() {
-		if(this.isLoad){
-			this.page = this.page+ 1
-		}
-	},
-	onPullDownRefresh(){
-		// wx.showNavigationBarLoading();
-		// this.isLoad= true
-		// this.page= 1
-		// this.getActivity();
-		// this.clear().then(()=>{
-		// 	this.getProducts();
-		// })
-	},
-	onPageScroll(e) {
-		if (e.scrollTop > 60) {
-			this.isFixed = true;
-		} else {
-			this.isFixed = false;
-		};
-	},
-  methods: {
-		getIndexData(){
-			uni.showLoading({ title: '正在加载...' })
-			uni.showNavigationBarLoading();
-			getIndexData().then(res=>{
-				this.articleList = res.data.articleList.reverse()
-				this.activity= res.data.recommendActivity.content
-				this.demandList = res.data.demandList
-				this.resourcesList = res.data.resourcesDtos
-				this.productDtos = res.data.productDtos
-				
-				this.showSkeleton = false
-				uni.hideLoading()
-				uni.hideNavigationBarLoading();
-			})
+	import {
+		getIndexData
+	} from "@/api/home";
+	import {
+		trim
+	} from "@/utils";
+	import {
+		mapGetters
+	} from 'vuex'
+	import tabbar from "../../tabbarComponent/tabbar";
+	import vSwiper from '@/components/vSwiper.vue'
+	import skeleton from '@/components/quick-skeleton/quick-skeleton'
+	const app = getApp();
+	export default {
+		components: {
+			tabbar,
+			vSwiper,
+			skeleton
 		},
-		tolearnMore() {
-		  this.$yrouter.push("/pages/life/learnMore/index")
+		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,
+				navTopHeight: app.globalData.navTopHeight,
+				currentTabIndex: 0,
+				flowList: [],
+				isFixed: false,
+				loadStatus: 'loadmore',
+				page: 1,
+				limit: 10,
+				isLoad: true, //是否还有更多
+				active: 1,
+				show: false,
+				articleList: [], //快讯列表
+				activity: [], //活动列表
+				demandList: [], //需求列表
+				resourcesList: [], //资源列表
+				productDtos: [], //推荐列表
+
+				showSkeleton: true
+			};
 		},
-		toAritcleList(){
-			this.$yrouter.push("/pages/life/articleList/index")
+		onShareAppMessage() {
+			return {
+				title: '禅易云生态',
+				path: '/pages/home/index',
+				success(res) {
+					uni.showToast({
+						title: '分享成功',
+					})
+				},
+				fail(res) {
+					uni.showToast({
+						title: '分享失败',
+						icon: 'none',
+					})
+				},
+			}
 		},
-		tabBarClick(index){
-			this.currentTabIndex = index
+		onReady: function() {
+			const that = this;
+
+			// that.$refs.skeleton.attachedAction();
+
+			that.$refs.skeleton.readyAction();
 		},
-		toActiveDetail(e) {
-		  let id = e.currentTarget.dataset.id;
-		  uni.navigateTo({
-		    url: '/pages/activity/detail/index?id=' + id
-		  });
+		onLoad() {
+			// uni.hideTabBar()
 		},
-		tabClick(i) {
-		  this.active= i
+		mounted: function() {
+			this.getIndexData()
 		},
-		toNeedDetail(id){
-			this.$yrouter.push({
-				path: '/pages/demandHall/needsDetail/index',
-				query: {
-					id: id
-				}
-			})
+		onReachBottom() {
+			if (this.isLoad) {
+				this.page = this.page + 1
+			}
 		},
-		toResourcesDetail(id){
-			this.$yrouter.push({
-				path: '/pages/demandHall/resourcesDetail/index',
-				query: {
-					id: id
-				}
-			})
+		onPullDownRefresh() {
+			// wx.showNavigationBarLoading();
+			// this.isLoad= true
+			// this.page= 1
+			// this.getActivity();
+			// this.clear().then(()=>{
+			// 	this.getProducts();
+			// })
 		},
-		toGoodsDetail(id){
-			this.$yrouter.push({
-			  path: "/pages/shop/GoodsCon/index",
-			  query: { id: id }
-			});
+		onPageScroll(e) {
+			if (e.scrollTop > 60) {
+				this.isFixed = true;
+			} else {
+				this.isFixed = false;
+			};
 		},
-		getProducts(){
-			this.loadStatus = 'loading';
-			getProducts({page:this.page,limit:this.limit}).then((res)=>{
-				if(this.page > 1){
-					this.flowList = this.flowList.concat(res.data)
-				} else{
-					this.flowList = res.data
-				}
-				if(this.limit <= res.data.length){ //分页数等于返回值的length说明还有
-					this.isLoad = true
-				} else{
-					console.log('没有了')
-					this.isLoad = false
-					this.loadStatus = 'nomore';
+		methods: {
+			getIndexData() {
+				uni.showLoading({
+					title: '正在加载...'
+				})
+				uni.showNavigationBarLoading();
+				getIndexData().then(res => {
+					this.articleList = res.data.articleList.reverse()
+					this.activity = res.data.recommendActivity.content
+					this.demandList = res.data.demandList
+					this.resourcesList = res.data.resourcesDtos
+					this.productDtos = res.data.productDtos
+
+					this.showSkeleton = false
+					uni.hideLoading()
+					uni.hideNavigationBarLoading();
+				})
+			},
+			tolearnMore() {
+				this.$yrouter.push("/pages/life/learnMore/index")
+			},
+			toAritcleList() {
+				this.$yrouter.push("/pages/life/articleList/index")
+			},
+			toNewActivity() {
+				this.$yrouter.push("/pages/home/activityCenter/index")
+			},
+			tabBarClick(index) {
+				this.currentTabIndex = index
+			},
+			toActiveDetail(e) {
+				let id = e.currentTarget.dataset.id;
+				uni.navigateTo({
+					url: '/pages/activity/detail/index?id=' + id
+				});
+			},
+			tabClick(i) {
+				this.active = i
+			},
+			toNeedDetail(id) {
+				this.$yrouter.push({
+					path: '/pages/demandHall/needsDetail/index',
+					query: {
+						id: id
+					}
+				})
+			},
+			toResourcesDetail(id) {
+				this.$yrouter.push({
+					path: '/pages/demandHall/resourcesDetail/index',
+					query: {
+						id: id
+					}
+				})
+			},
+			toGoodsDetail(id) {
+				this.$yrouter.push({
+					path: "/pages/shop/GoodsCon/index",
+					query: {
+						id: id
+					}
+				});
+			},
+			getProducts() {
+				this.loadStatus = 'loading';
+				getProducts({
+					page: this.page,
+					limit: this.limit
+				}).then((res) => {
+					if (this.page > 1) {
+						this.flowList = this.flowList.concat(res.data)
+					} else {
+						this.flowList = res.data
+					}
+					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);
 				}
-				wx.hideNavigationBarLoading()
-				uni.stopPullDownRefresh()
-			})
+			},
+			asideTap(index) {
+				this.navActive = index;
+			},
+			alertMessage(msg) {
+				uni.showToast({
+					title: msg,
+					icon: 'none'
+				})
+			},
 		},
-    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);
-  }
-};
+		beforeDestroy: function() {
+			// document.removeEventListener("scroll", this.onScroll, false);
+		}
+	};
 </script>
 <style lang="less" scoped>
 	.productSort {
 		background: #EEEEEE !important;
 		position: relative;
 	}
-	.pageTitle-box{
+
+	.pageTitle-box {
 		width: 100%;
 		position: fixed;
 		top: 0;
 		z-index: 99;
 		transition: all .5s;
 	}
-	.showPageTitle{
+
+	.showPageTitle {
 		background: #fff;
 		color: #000000 !important;
 		opacity: 1;
-		.top-logo{
+
+		.top-logo {
 			color: #000;
 		}
 	}
-.page-top-box{
-	width: 100%;
-	position: fixed;
-	top: 0;
-	left: 0;
-	z-index: 99;
-	background: #fff;
-	padding: 0 30rpx 20rpx;
-	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;
+
+	.page-top-box {
+		width: 100%;
+		position: fixed;
+		top: 0;
+		left: 0;
+		z-index: 99;
+		background: #fff;
+		padding: 0 30rpx 20rpx;
+		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%;
+
+			.cart-btn-box {
+				width: 50rpx;
+				height: 50rpx;
+
+				image {
+					width: 100%;
+					height: 100%;
+				}
 			}
 		}
-	}
-	.index{
-		height: 96rpx;
-		.header{
-			height: 68rpx;
-			position: static;
-			padding: 0;
-			margin-top: 34rpx;
-			.search{
-				background-color: #EEEEEE;
-				border-radius: 8rpx;
+
+		.index {
+			height: 96rpx;
+
+			.header {
+				height: 68rpx;
+				position: static;
+				padding: 0;
+				margin-top: 34rpx;
+
+				.search {
+					background-color: #EEEEEE;
+					border-radius: 8rpx;
+				}
 			}
 		}
 	}
-}
-
-.main-box{
-	width: 100%;
-	height: 522rpx;
-	position: relative;
-}	
-.back-bg image{
-	width: 100%;
-	height: 522rpx;
-}
-.logo-title image{
-	margin-left: 20rpx;
-	width: 80rpx;
-	height: 50rpx;
-}
-.top-logo{
-	position: absolute;
-	width: 100%;
-	color: #fff;
-	font-weight: 600;
-	font-size: 32rpx;
-	transition: all .5s cubic-bezier(.25, .5, .5, .9);
-}
-.details-btn{
+
+	.main-box {
+		width: 100%;
+		height: 522rpx;
+		position: relative;
+	}
+
+	.back-bg image {
+		width: 100%;
+		height: 522rpx;
+	}
+
+	.logo-title image {
+		margin-left: 20rpx;
+		width: 80rpx;
+		height: 50rpx;
+	}
+
+	.top-logo {
+		position: absolute;
+		width: 100%;
+		color: #fff;
+		font-weight: 600;
+		font-size: 32rpx;
+		transition: all .5s cubic-bezier(.25, .5, .5, .9);
+	}
+
+	.details-btn {
 		width: 196rpx;
 		height: 52rpx;
 		border: 2rpx solid #FFFFFF;
@@ -435,417 +482,487 @@ export default {
 		line-height: 50rpx;
 		color: #fff;
 		font-size: 32rpx;
-}
-
-// 云快讯
-.yun-box{
-	margin: 8rpx 40rpx 28rpx 40rpx;
-}
-.headline-yun{
-	width: 112rpx;
-	height: 52rpx;
-}
-.more-r{
-	font-size: 24rpx;
-	color: #8B8B8B;
-}
-.more-r image{
-	width: 12rpx;
-	height: 18rpx;
-	margin-left: 8rpx;
-}
-.rotaion{
-	width: 670rpx;
-	margin-top: 24rpx;
-}
-// 最新活动
-.act-box{
-	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;
-}
-.act-con{
-	width: 338rpx;
-	height: 190rpx;
-}
-.act-adress view,.act-time view{
-	width: 300rpx;
-	font-size: 24rpx;
-	color: #191919;
-}
-.act-time image{
-	width: 18rpx;
-	height: 22rpx;
-	margin-right: 16rpx;
-}
-.act-adress image{
-	width: 19rpx;
-	height: 23rpx;
-	margin: 7rpx 14rpx 0 0;
-}
-.title-line{
-	width: 308rpx;
-	height: 68rpx;
-	font-size: 24rpx;
-	font-weight: 500;
-	color: #191919;
-	white-space:pre-wrap;
-}
-.act-price{
-	width: 335rpx;
-	font-weight: 600;
-	.act-i {
+	}
+
+	// 云快讯
+	.yun-box {
+		margin: 8rpx 40rpx 28rpx 40rpx;
+	}
+
+	.headline-yun {
+		width: 112rpx;
+		height: 52rpx;
+	}
+
+	.more-r {
 		font-size: 24rpx;
-		color: #FF5A0E;
+		color: #8B8B8B;
 	}
-	.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 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;
-}
-
-
-// 推荐供需
-.rec-box{
-	width: 670rpx;
-	height: 493rpx;
-	margin: 32rpx auto 8rpx auto;
-	position: relative;
-	
-}
-.rec-switch{
-	width: 670srpx;
-	height: 423rpx;
-	margin-top: 18rpx;
-	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-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-r .rec-bg{
-	transform: rotate(180deg);
-}
-.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-r image{
-	width: 42rpx;
-	height: 43rpx;
-	margin-right: 8rpx;
-}
-.rec-switch-a{
-	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-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-end{
-	font-size: 24rpx;
-	color: #707070;
-	margin-left: auto;
-}
-.rec-message{
-	width: 582rpx;
-	height: 40rpx;
-	font-size: 28rpx;
-	color: #1D1D1D;
-}
-
-
-
-// .category-tab-box{
-// 	border: 1rpx solid black;
-// 	width: 100%;
-// 	height: 108rpx;
-// 	line-height: 108rpx;
-// 	padding-left: 30rpx;
-// 	// margin-bottom: 30rpx;
-// 	// padding-top: 190rpx;
-// 	.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;
-// 				}
-// 			}
-// 		}
-// 	}
-// }
-.headline image{
+
+	.more-r image {
+		width: 12rpx;
+		height: 18rpx;
+		margin-left: 8rpx;
+	}
+
+	.rotaion {
+		width: 670rpx;
+		margin-top: 24rpx;
+	}
+
+	// 最新活动
+	.act-box {
+		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;
+	}
+
+	.act-con {
+		width: 338rpx;
+		height: 190rpx;
+	}
+
+	.act-adress view,
+	.act-time view {
+		width: 300rpx;
+		font-size: 24rpx;
+		color: #191919;
+	}
+
+	.act-time image {
+		width: 18rpx;
+		height: 22rpx;
+		margin-right: 16rpx;
+	}
+
+	.act-adress image {
+		width: 19rpx;
+		height: 23rpx;
+		margin: 7rpx 14rpx 0 0;
+	}
+
+	.title-line {
+		width: 308rpx;
+		height: 68rpx;
+		font-size: 24rpx;
+		font-weight: 500;
+		color: #191919;
+		white-space: pre-wrap;
+	}
+
+	.act-price {
+		width: 335rpx;
+		font-weight: 600;
+
+		.act-i {
+			font-size: 24rpx;
+			color: #FF5A0E;
+		}
+
+		.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 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;
+	}
+
+
+	// 推荐供需
+	.rec-box {
+		width: 670rpx;
+		height: 493rpx;
+		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-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-r .rec-bg {
+		transform: rotateY(180deg);
+	}
+
+	.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-r image {
+		width: 42rpx;
+		height: 43rpx;
+		margin-right: 8rpx;
+	}
+
+	.rec-switch-a {
+		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-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-end {
+		font-size: 24rpx;
+		color: #707070;
+		margin-left: auto;
+	}
+
+	.rec-message {
+		width: 582rpx;
+		height: 40rpx;
+		font-size: 28rpx;
+		color: #1D1D1D;
+	}
+
+
+
+	// .category-tab-box{
+	// 	border: 1rpx solid black;
+	// 	width: 100%;
+	// 	height: 108rpx;
+	// 	line-height: 108rpx;
+	// 	padding-left: 30rpx;
+	// 	// margin-bottom: 30rpx;
+	// 	// padding-top: 190rpx;
+	// 	.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;
+	// 				}
+	// 			}
+	// 		}
+	// 	}
+	// }
+	.headline{
+		padding-right: 40rpx;
+	}
+	.headline-img{
 		width: 148rpx;
 		height: 52rpx;
-		}
-.warter-box{
-	width: 100%;
-	padding: 24rpx 0 190rpx 24rpx;
-	.u-waterfall {
+	}
+
+	.warter-box {
 		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;
+		padding: 24rpx 0 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%;
-						height: 80rpx;
+						display: block;
 					}
-					.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;
+
+					.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%;
+
+	.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{
+
+		.img-box-r {
 			width: 324rpx;
-			height: 190rpx;
+			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{
+
+	.goods-list-box {
 		width: 100%;
-		.goods-type-box{
-			image{
-				width: 94rpx;
-				height: 94rpx;
-			}
-			.t-word{
-				font-size: 36rpx;
-				color: #222;
-				font-weight: 600;
-			}
-		}
-		.goods-list{
+		padding: 0 30rpx;
+
+		.goods-list-item {
 			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-type-box {
+				image {
+					width: 94rpx;
+					height: 94rpx;
+				}
+
+				.t-word {
+					font-size: 36rpx;
+					color: #222;
+					font-weight: 600;
 				}
 			}
-			.goods-item:nth-child(2n){
-				margin-right: 0;
-			}
-			.goods-desc-box{
+
+			.goods-list {
 				width: 100%;
-				padding: 16rpx;
-				font-size: 24rpx;
-				.goods-name{
-					line-height: 34rpx;
+
+				.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;
 				}
-				.price{
-					font-size: 28rpx;
-					color: #E5270F;
-					line-height: 40rpx;
-					margin-bottom: 26rpx;
+
+				.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/information/index.vue b/pages/information/index.vue
index 3115e13..7402079 100644
--- a/pages/information/index.vue
+++ b/pages/information/index.vue
@@ -1,83 +1,105 @@
 <template>
 	<view class="information-box">
-		<view class="search-box acea-row row-middle" >
-			<image src="../../../static/images/search-icon.png" mode=""></image>
-			<input type="text" value="" placeholder="请输入相关关键词"/>
+		<view class="search-box acea-row row-middle">
+			<image src="../../static/images/search-icon.png" mode=""></image>
+			<input type="text" value="" placeholder="请输入相关关键词" />
 			<view class="search acea-row row-center-wrapper">搜一下</view>
 		</view>
-		<view class="vote-box">
-			<view class="news">
-				<view class="news-title-h">武汉12月底双层公交车将全面下线</view>
-				<view class="news-title-s">趁着有时间和你爱的人再去回味一下,那你认为有下线的必要吗？</view>
-			</view>
-			<view class="vote">
-				
-			</view>
-		</view>
-		<scroll-view class="scroll-view_N" scroll-x="true" >		
-			<view class="rotaion" v-for="(item,index) in 7" :key="index"> 
-				<view class="acea-row row-center">
-					<image src="../../../static/images/collect.png" mode=""></image>
+		<swiper class="vote-box">
+			<swiper-item v-for="(item,index) in articleList" :key="index">
+				<image :src="item.imageInput" mode="aspectFill" class="vote-img"></image>
+				<view class="news">
+					<view class="news-title-h line2">{{item.title}}</view>
+					<view class="news-title-s line1">{{item.title}}</view>
+				</view>
+			</swiper-item>
+
+		</swiper>
+		<scroll-view class="scroll-view_N" scroll-x="true">
+			<view class="rotaion-box" @click="toTodayEvent">
+				<view class="acea-row rotaion row-center">
+					<image src="../../static/images/details1.png" mode=""></image>
 					<view class="rotaion-h">今日大事</view>
 					<view class="rotaion-s">每日热点资讯</view>
 				</view>
-				
+			</view>
+			<view class="rotaion-box" @click="toBusinessInfo">
+				<view class="acea-row rotaion row-center">
+					<image src="../../static/images/details2.png" mode=""></image>
+					<view class="rotaion-h">商业资讯</view>
+					<view class="rotaion-s">商业资讯抢先知</view>
+				</view>
+			</view>
+			<view class="rotaion-box" @click="toGovernmentPolicy">
+				<view class="acea-row rotaion row-center">
+					<image src="../../static/images/details3.png" mode=""></image>
+					<view class="rotaion-h">政府政策</view>
+					<view class="rotaion-s">了解政府政策</view>
+				</view>
+			</view>
+			<view class="rotaion-box" @click="toLifeInfo">
+				<view class="acea-row rotaion row-center">
+					<image src="../../static/images/details4.png" mode=""></image>
+					<view class="rotaion-h">生活资讯</view>
+					<view class="rotaion-s">有趣、好玩</view>
+				</view>
 			</view>
 		</scroll-view>
 		<!-- 最新资讯 -->
 		<view class="newInfo-box">
-			<image src="../../../static/images/newInfo.png" mode="" class="newInfo-title-img"></image>
-			<view class="newInfo" >
-				<view class="modular acea-row row-between" v-for="(item,index) in 3" :key="index">
-					<view class="acea-row title"  >
-						<view class="modular-h">海鸥出行将大巴车市场带入平台化阶段，提高包车出行效率</view>
+			<image src="../../static/images/newInfo.png" mode="" class="newInfo-title-img"></image>
+			<view class="newInfo">
+				<view class="modular acea-row row-between" v-for="(item,index) in articleList" :key="index"
+					@click="toDetail(item.id)">
+					<view class="acea-row title">
+						<view class="modular-h line2">{{item.title}}</view>
 						<view class="title-l acea-row row-between">
-							<view>云资讯</view>
-							<view>1小时前</view>
+							<view>{{item.author}}</view>
+							<view>{{item.createTime.split(' ')[0]}}</view>
 							<view class="acea-row row-middle">203
-								<image src="../../../static/images/eye.png" mode="" ></image>
+								<image src="../../static/images/eye.png" mode=""></image>
 							</view>
 						</view>
 					</view>
-					<image src="../../../static/images/home/top-bg.png" mode="" ></image>
+					<image :src="item.imageInput" mode="aspectFill"></image>
 				</view>
 			</view>
 		</view>
 		<!-- 热点精选 -->
 		<view class="hotspot-box">
-			<image src="../../../static/images/user/hotspot.png" mode="" class="title-h-img"></image>
-			<scroll-view class="scroll-view_H acea-row" scroll-x="true" >
-				<view class="slide-box"  v-for="(item,index) in 3" :key="index">
-					<image src="../../../static/images/home/top-bg.png" mode=""></image>
+			<image src="../../static/images/user/hotspot.png" mode="" class="title-h-img"></image>
+			<scroll-view class="scroll-view_H acea-row" scroll-x="true">
+				<view class="slide-box" v-for="(item,index) in articleList" :key="index">
+					<image :src="item.imageInput" mode="aspectFill"></image>
 					<view class="hotspot-con">
 						<view class="hotspot-icon">热点</view>
-						<view class="hotspot-title-h">禅易云生态：加入云生态，共建万亿私域资源圈获取海量资源与福利。</view>
+						<view class="hotspot-title-h">{{item.title}}</view>
 					</view>
 				</view>
 			</scroll-view>
 		</view>
 		<!-- 值得关注 -->
 		<view class="follow-box">
-			<image src="../../../static/images/follow-title.png" mode="" class="title-h-img"></image>
-			<view class="follow-con"  v-for="(item,index) in 3" :key="index">
+			<image src="../../static/images/follow-title.png" mode="" class="title-h-img"></image>
+			<view class="follow-con" v-for="(item,index) in articleList" :key="index">
 				<view class="follow-top acea-row row-between">
-					<view class="acea-row follow-title"  >
-						<view class="follow-h">2021中国酒店与商用厨具行业品牌盛会</view>
+					<view class="acea-row follow-title">
+						<view class="follow-h line2">{{item.title}}</view>
 						<view class="follow-title-l acea-row row-between">
-							<view>云资讯</view>
-							<view>1小时前</view>
+							<view>{{item.author}}</view>
+							<view>{{item.createTime.split(' ')[0]}}</view>
 							<view class="acea-row row-middle">203
-								<image src="../../../static/images/eye.png" mode="" ></image>
+								<image src="../../static/images/eye.png" mode=""></image>
 							</view>
 						</view>
 					</view>
-					<image src="../../../static/images/home/top-bg.png" mode="" ></image>
+					<image :src="item.imageInput" mode="aspectFill"></image>
 				</view>
 				<view class="follow-bottom acea-row row-middle">
-					<image src="../../../static/images/collect.png" mode=""></image>
+					<image :src="item.imageInput" mode=""></image>
 					<view class="follow-title-b">
-						<view class="title-s">云咨詢</view>
-						<view class="title-con">每天发布商业/生活等相关内容...</view>
+						<view class="title-s">{{item.author}}</view>
+						<view class="title-con line1">{{item.title}}</view>
 					</view>
 					<view class="follow-btn">关注+</view>
 				</view>
@@ -87,15 +109,80 @@
 </template>
 
 <script>
+	import {
+		getArticle
+	} from "@/api/home";
+	export default {
+		data() {
+			return {
+				articleList: [],
+				page: 0,
+				size: 10,
+			}
+		},
+		mounted() {
+			this.getArticleList()
+		},
+		onReachBottom() {
+			this.page = this.page + 1
+			this.getArticleList()
+		},
+		methods: {
+			getArticleList() {
+				getArticle({
+					page: this.page,
+					size: this.size,
+					isHot: 0
+				}).then((res) => {
+					this.articleList = this.articleList.concat(res.data.content)
+				})
+			},
+			toDetail(id) {
+				this.$yrouter.push({
+					path: '/pages/life/articleDetail/index',
+					query: {
+						id: id
+					}
+				})
+			},
+			// 今日大事
+			toTodayEvent() {
+				uni.navigateTo({
+					url: '/pages/life/articleList/index?active=1'
+				});
+			},
+			// 商业资讯
+			toBusinessInfo() {
+				uni.navigateTo({
+					url: '/pages/life/articleList/index?active=2'
+				});
+			},
+			// 政府政策
+			toGovernmentPolicy() {
+				uni.navigateTo({
+					url: '/pages/life/articleList/index?active=3'
+				});
+			},
+			// 生活资讯
+			toLifeInfo() {
+				uni.navigateTo({
+					url: '/pages/life/articleList/index?active=4'
+				});
+			},
+
+		}
+	}
 </script>
 
 <style>
-	.information-box{
+	.information-box {
 		width: 100%;
-		height: 100vh;
+		height: auto;
+		margin-bottom: 50rpx;
 		position: relative;
 	}
-	.search-box{
+
+	.search-box {
 		width: 670rpx;
 		height: 68rpx;
 		border: 2rpx solid #FF5100;
@@ -104,12 +191,14 @@
 		font-size: 28rpx;
 		position: relative;
 	}
-	.search-box image{
+
+	.search-box image {
 		width: 35rpx;
 		height: 35rpx;
 		margin: 0 29rpx 0 52rpx;
 	}
-	.search{
+
+	.search {
 		position: absolute;
 		right: 0;
 		width: 132rpx;
@@ -117,159 +206,201 @@
 		background: linear-gradient(39deg, #FF5100 0%, #FFA074 100%);
 		border-radius: 8rpx;
 		color: #fff;
-		
+
 	}
-	.vote-box{
+
+	.vote-box {
 		width: 670rpx;
 		height: 358rpx;
-		background: #FFFFFF;
+		/* background: #FFFFFF; */
 		box-shadow: 0px 6rpx 12rpx rgba(0, 0, 0, 0.16);
 		border-radius: 16rpx;
 		margin: 0 auto;
 		position: relative;
+		overflow: hidden;
 	}
-	.news{
+
+	.vote-img {
+		position: absolute;
+		width: 670rpx;
+		height: 358rpx;
+	}
+
+	.news {
 		width: 100%;
-		height: 248rpx;
-		background: #D2D2D2;
+		height: 358rpx;
 		border-radius: 16rpx 16rpx 0 0;
 		color: #FFF;
 		position: absolute;
-		padding-left: 42rpx;
+		padding: 0 40rpx;
 	}
-	.news-title-h{
+
+	.news-title-h {
+		width: 590rpx;
 		font-size: 28rpx;
 		position: absolute;
-		bottom: 54rpx;
+		bottom: 65rpx;
 	}
-	.news-title-s{
+
+	.news-title-s {
+		width: 590rpx;
 		font-size: 20rpx;
 		position: absolute;
-		bottom: 18rpx;
+		bottom: 25rpx;
 	}
-	.vote{
+
+/* 	.vote {
 		width: 100%;
 		height: 110rpx;
 		position: absolute;
 		bottom: 0;
 		border: 1rpx solid #000000;
-	}
-	.scroll-view_N{
+	} */
+
+	.scroll-view_N {
 		width: 100%;
-		height: 228rpx;
-		margin: 30rpx 0 0 30rpx;
+		height: 238rpx;
+		margin: 30rpx 0rpx 34rpx 0rpx;
 		white-space: nowrap;
 	}
-	.rotaion{
+
+	.rotaion-box {
 		width: 168rpx;
-		padding: 32rpx 0 16rpx 0;
+		height: 208rpx;
 		background: #FFFFFF;
 		box-shadow: 0rpx 6rpx 12rpx rgba(0, 0, 0, 0.16);
 		border-radius: 16rpx;
-		margin: 10rpx 22rpx 20rpx 10rpx;
+		margin: 10rpx 32rpx 10rpx 0rpx;
 		display: inline-block;
 	}
-	.rotaion image{
+
+	.rotaion-box:nth-child(1) {
+		margin-left: 40rpx;
+	}
+
+	.rotaion {
+		width: 100%;
+		height: 208rpx;
+		padding: 36rpx 0 16rpx 0;
+	}
+
+	.rotaion image {
 		width: 80rpx;
 		height: 80rpx;
-		background: #FF6D2A;
 		border-radius: 50%;
 	}
-	.rotaion-h{
+
+	.rotaion-h {
 		height: 34rpx;
 		font-size: 24rpx;
 		color: #333333;
-		margin: 12rpx 0 4rpx 0;
 		font-weight: 600;
 	}
-	.rotaion-s{
+
+	.rotaion-s {
 		height: 26rpx;
 		font-size: 18rpx;
 		color: #9D9D9D;
 	}
+
 	/* 最新资讯 */
-	.newInfo-box{
-		margin: 44rpx 0 0rpx 0;
+	.newInfo-box {
+		overflow: hidden;
 	}
-	.newInfo-title-img{
+
+	.newInfo-title-img {
 		width: 160rpx;
 		height: 52rpx;
 		margin: 0 0 18rpx 38rpx;
 	}
-	.newInfo{
+
+	.newInfo {
 		width: 100%;
 		height: 528rpx;
 		border-top: 2rpx solid #EFEFEF;
 	}
-	.modular{
+
+	.modular {
 		width: 100%;
 		height: 176rpx;
 		border-bottom: 2rpx solid #EFEFEF;
 		padding: 20rpx 40rpx 22rpx 40rpx;
 	}
-	
-	.modular-h{
-		width: 392rpx;
+
+	.modular-h {
+		width: 400rpx;
 		height: 80rpx;
 		font-size: 28rpx;
 		color: #4A4A4A;
 		font-weight: 600;
 	}
-	.modular image{
+
+	.modular image {
 		width: 204rpx;
 		height: 134rpx;
+		border-radius: 8px;
 	}
-	.title{
-		width: 392rpx;
+
+	.title {
+		width: 400rpx;
 		height: 134rpx;
 	}
-	.title-l{
-		width: 310rpx;
+
+	.title-l {
+		width: 400rpx;
 		height: 34rpx;
 		font-size: 24rpx;
 		color: #707070;
 	}
-	.title-l image{
+
+	.title-l image {
 		width: 24rpx;
 		height: 24rpx;
 		margin-left: 5rpx;
 	}
+
 	/* 热点精选 */
-	.hotspot-box{
+	.hotspot-box {
 		width: 100%;
 		height: 456rpx;
 	}
-	.title-h-img{
+
+	.title-h-img {
 		width: 162rpx;
 		height: 62rpx;
 		margin: 32rpx 0 5rpx 40rpx;
 	}
-	.scroll-view_H{
+
+	.scroll-view_H {
 		width: 100%;
 		height: 344rpx;
 		white-space: nowrap;
 	}
-	.scroll-view_H image{
+
+	.scroll-view_H image {
 		width: 670rpx;
 		height: 344rpx;
 		border-radius: 10rpx;
 		position: absolute;
 	}
-	.slide-box{
+
+	.slide-box {
 		position: relative;
 		width: 670rpx;
 		height: 100%;
 		display: inline-block;
 		margin-right: 16rpx;
 	}
-	.hotspot-con{
+
+	.hotspot-con {
 		width: 588rpx;
 		height: 130rpx;
 		bottom: 34rpx;
 		left: 24rpx;
 		position: absolute;
 	}
-	.hotspot-icon{
+
+	.hotspot-icon {
 		width: 72rpx;
 		height: 32rpx;
 		background: #FE3737;
@@ -280,22 +411,26 @@
 		text-align: center;
 
 	}
-	.hotspot-title-h{
+
+	.hotspot-title-h {
 		width: 588rpx;
 		height: 80rpx;
 		font-size: 28rpx;
 		color: #FFFFFF;
 		position: absolute;
 		bottom: 0;
-		white-space:pre-wrap;
+		white-space: pre-wrap;
 	}
+
 	/* 值得关注 */
-	.follow-box{
+	.follow-box {
 		width: 100%;
-		height: 950rpx;
-		margin-bottom: 50rpx;
+		height: 940rpx;
+		position: relative;
+		overflow: hidden;
 	}
-	.follow-con{
+
+	.follow-con {
 		width: 670rpx;
 		height: 250rpx;
 		margin: 0 auto;
@@ -304,67 +439,76 @@
 		border-radius: 16rpx;
 		margin-bottom: 32rpx;
 	}
-	.follow-top{
+
+	.follow-top {
 		width: 100%;
 		height: 170rpx;
 		padding: 20rpx 20rpx 26rpx 20rpx;
 		border-bottom: 1rpx solid #DCDCDC;
 	}
-	.follow-top image{
+
+	.follow-top image {
 		width: 232rpx;
 		height: 130rpx;
 		border-radius: 16rpx;
 	}
-	.follow-title{
+
+	.follow-title {
 		width: 370rpx;
 		height: 100%;
 	}
-	.follow-h{
-		width: 370rpx;
+
+	.follow-h {
+		width: 100%;
 		height: 80rpx;
 		font-size: 28rpx;
 		color: #000000;
 		font-weight: 600;
 	}
-	.follow-title-l{
-		width: 250rpx;
+
+	.follow-title-l {
+		width: 290rpx;
 		height: 28rpx;
 		font-size: 20rpx;
 		color: #707070;
 	}
-	.follow-title-l image{
+
+	.follow-title-l image {
 		width: 24rpx;
 		height: 24rpx;
 		margin-left: 5rpx;
 	}
-	.follow-bottom{
+
+	.follow-bottom {
 		width: 100%;
 		height: 80rpx;
 		padding: 12rpx 20rpx 16rpx 20rpx;
 	}
-	.follow-bottom image{
+
+	.follow-bottom image {
 		width: 52rpx;
 		height: 52rpx;
 		border-radius: 50%;
 		margin-right: 8rpx;
 	}
-	.follow-title-b{
-		
-	}
-	
-	.title-s{
+
+	.follow-title-b {}
+
+	.title-s {
 		height: 28rpx;
 		font-size: 20rpx;
 		margin-bottom: 6rpx;
 		font-weight: 600;
 	}
-	.title-con{
+
+	.title-con {
+		width: 230rpx;
 		height: 22rpx;
 		font-size: 16rpx;
 		color: #707070;
 	}
-	
-	.follow-btn{
+
+	.follow-btn {
 		width: 136rpx;
 		height: 40rpx;
 		background: linear-gradient(39deg, #FF5A0D 0%, #FFAC85 100%);
@@ -375,4 +519,4 @@
 		position: absolute;
 		right: 60rpx;
 	}
-	</style>
+</style>
diff --git a/pages/life/articleList/index.vue b/pages/life/articleList/index.vue
index aa63eb6..a18a13a 100644
--- a/pages/life/articleList/index.vue
+++ b/pages/life/articleList/index.vue
@@ -1,47 +1,68 @@
 <template>
 	<view class="list-page">
-		
+
 		<view class="search-box">
 			<view class="search-content acea-row row-middle">
-				<view class="search-icon"><image src="../../../static/images/search.png"> </image></view>
+				<view class="search-icon">
+					<image src="../../../static/images/search.png"> </image>
+				</view>
 				<input type="text" placeholder="请输入相关关键词" />
 				<view class="search-btn">搜一下</view>
 			</view>
+			<view class="resource-tabs acea-row row-between-wrapper">
+				<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>
-		
-		<view class="list-box">
-			<view class="list-item acea-row row-between row-middle" v-for="(item,index) in articleList" :key="index" @click="toDetail(item.id)">
-				<view class="item-l">
-					<view class="title-box acea-row">
-						<image src="../../../static/images/hot.png" v-if="item.isHot"></image>
-						<view class="title line2">{{item.title}}</view>
-					</view>
-					<view class="auth-info acea-row row-between">
-						<view class="auth">{{item.author}}</view>
-					</view>
-					<view class="acea-row row-middle">
-						<view class="auth time">{{item.createTime}}</view>
-						<view class="see acea-row row-middle">
-							<text>200</text>
-							<image src="../../../static/images/eye.png"></image>
+		<view class="content-box">
+			<view class="list-box" v-if="active == 1">
+				<view class="list-item acea-row row-between row-middle" v-for="(item,index) in articleList" :key="index"
+					@click="toDetail(item.id)">
+					<view class="item-l">
+						<view class="title-box acea-row">
+							<image src="../../../static/images/hot.png" v-if="item.isHot"></image>
+							<view class="title line2">{{item.title}}</view>
+						</view>
+						<view class="acea-row row-middle row-between">
+							<view class="auth">{{item.author}}</view>
+							<view class="auth time">{{item.createTime.split(' ')[0]}}</view>
+							<view class="see acea-row row-middle">
+								<text>200</text>
+								<image src="../../../static/images/eye.png"></image>
+							</view>
 						</view>
 					</view>
+					<view class="item-r">
+						<image :src="item.imageInput" mode="aspectFill"></image>
+					</view>
 				</view>
-				<view class="item-r">
-					<image :src="item.imageInput" mode="aspectFill"></image>
-				</view>
+			</view>
+			<view class="list-box" v-if="active == 2">
+				<view>2</view>
+			</view>
+			<view class="list-box" v-if="active == 3">
+				<view>3</view>
+			</view>
+			<view class="list-box" v-if="active == 4">
+				<view>4</view>
 			</view>
 		</view>
-		
+
+
 		<view class="loadStatus-box">{{loadStatus}}</view>
 	</view>
 </template>
 
 <script>
-	import { getArticle } from "@/api/home";
-	export default{
-		data(){
-			return{
+	import {
+		getArticle
+	} from "@/api/home";
+	export default {
+		data() {
+			return {
+				active: '1',
 				articleList: [],
 				page: 0,
 				size: 10,
@@ -49,25 +70,32 @@
 				loadStatus: '没有更多了...'
 			}
 		},
+		onLoad(option) {
+			this.active=option.active;
+		},
 		mounted() {
 			this.getArticleList()
 		},
 		onReachBottom() {
-			this.page= this.page+1
+			this.page = this.page + 1
 			this.getArticleList()
 		},
-		methods:{
-			getArticleList(){
-				if(!this.isLoading) return
+		methods: {
+			getArticleList() {
+				if (!this.isLoading) return
 				uni.showLoading({
 					title: '加载中...'
 				})
 				this.loadStatus = '加载中...'
-				getArticle({page: this.page,size: this.size, isHot: 0}).then((res)=>{
-					if(res.data.content.length < this.size){
+				getArticle({
+					page: this.page,
+					size: this.size,
+					isHot: 0
+				}).then((res) => {
+					if (res.data.content.length < this.size) {
 						this.loadStatus = '没有更多了...'
 						this.isLoading = false
-					} else{
+					} else {
 						this.isLoading = true
 						this.loadStatus = '上拉加载更多...'
 					}
@@ -75,51 +103,60 @@
 					uni.hideLoading()
 				})
 			},
-			toDetail(id){
+			toDetail(id) {
 				this.$yrouter.push({
 					path: '/pages/life/articleDetail/index',
 					query: {
 						id: id
 					}
 				})
-			}
+			},
+			tabClick(e) {
+				this.setData({
+					active: e.currentTarget.dataset.i,
+				})
+			},
 		}
 	}
 </script>
 
 <style lang="less">
-	.list-page{
+	.list-page {
 		width: 100%;
 		min-height: 100vh;
 		background: #EEEEEE;
-		.search-box{
+
+		.search-box {
 			width: 100%;
-			padding: 32rpx 40rpx;
+			padding: 32rpx 40rpx 0 40rpx;
 			background: #fff;
-			position: fixed;
-			top: 0;
-			.search-icon{
+
+			.search-icon {
 				width: 35rpx;
 				height: 35rpx;
 				margin-right: 12rpx;
-				image{
+
+				image {
 					width: 100%;
 					height: 100%;
 				}
 			}
-			.search-content{
+
+			.search-content {
 				width: 100%;
 				padding: 0 0 0 50rpx;
 				border: 2rpx solid #FF5100;
 				border-radius: 8rpx;
 				font-size: 28rpx;
 				border-right: 0;
-				input{
+
+				input {
 					color: #BFBFBF;
 				}
-				.search-btn{
+
+				.search-btn {
 					width: 132rpx;
-					height: 68rpx;
+					height: 70rpx;
 					background: linear-gradient(39deg, #FF5100 0%, #FFA074 100%);
 					line-height: 68rpx;
 					text-align: center;
@@ -129,52 +166,99 @@
 				}
 			}
 		}
-	
-		.list-box{
+
+		.resource-tabs {
+			width: 100%;
+			background: #fff;
+
+			.tab {
+				width: 150rpx;
+				padding: 22rpx 0;
+				font-size: 32rpx;
+				color: #707070;
+				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: -40rpx;
+				opacity: 0;
+				transform: scaleX(0);
+				transition: all .2s ease, opacity .15s ease;
+			}
+
+			.tab-a {
+				color: #1D1D1D;
+				font-weight: 600;
+			}
+
+			.tab-a::after {
+				opacity: 1;
+				transform: scaleX(1);
+			}
+		}
+
+		.list-box {
 			width: 100%;
-			padding: 180rpx 40rpx 0rpx;
-			.list-item{
+			padding: 26rpx 40rpx 0;
+
+			.list-item {
 				width: 100%;
 				background: #fff;
 				border-radius: 12rpx;
-				padding: 30rpx 28rpx;
+				padding: 26rpx 32rpx 21rpx 32rpx;
 				font-size: 24rpx;
 				color: #707070;
 				margin-bottom: 24rpx;
-				.item-l{
-					width: calc(100% - 280rpx);
+
+				.item-l {
+					width: calc(100% - 260rpx);
 					display: flex;
 					flex-direction: column;
 					justify-content: space-between;
-					.title-box{
+					height: 130prx;
+
+					.title-box {
 						font-size: 32rpx;
 						color: #4A4A4A;
-						margin-bottom: 12rpx;
-						image{
+
+						image {
 							width: 19rpx;
 							height: 22rpx;
 							margin-right: 20rpx;
 						}
-						.title{
-							width: calc(100% - 38rpx);
+
+						.title {
 							margin-top: -10rpx;
+							margin-bottom: 25rpx;
 						}
 					}
-					.auth-info{
-						margin-bottom: 12rpx;
-					}
-					.see{
-						margin-left: 20rpx;
-						image{
+
+					.see {
+						// margin-left: 20rpx;
+
+						image {
 							width: 24rpx;
 							height: 24rpx;
 							margin-left: 6rpx;
 						}
 					}
 				}
-				.item-r{
+
+				.item-r {
 					width: 240rpx;
-					image{
+
+					image {
 						width: 100%;
 						height: 130rpx;
 						border-radius: 16rpx;
@@ -182,7 +266,8 @@
 				}
 			}
 		}
-		.loadStatus-box{
+
+		.loadStatus-box {
 			text-align: center;
 			font-size: 28rpx;
 			color: #000;
diff --git a/pages/life/learnMore/index.vue b/pages/life/learnMore/index.vue
index 9c426a7..cf6d13c 100644
--- a/pages/life/learnMore/index.vue
+++ b/pages/life/learnMore/index.vue
@@ -1,16 +1,16 @@
 <template>
 	<swiper class="swiper-box" autoplay="true" indicator-dots='true' indicator-color='#B17815' indicator-active-color='#FFB93E' >
 		<swiper-item>
-			<image src="../../../static/images/learnMore1.png"></image>
+			<image src="https://download.cyjyyjy.com/learnMore1.png"></image>
 		</swiper-item>
 		<swiper-item>
-			<image src="../../../static/images/learnMore2.png"></image>
+			<image src="https://download.cyjyyjy.com/learnMore2.png"></image>
 		</swiper-item>
 		<swiper-item>
-			<image src="../../../static/images/learnMore3.png"></image>
+			<image src="https://download.cyjyyjy.com/learnMore3.png"></image>
 		</swiper-item>
 		<swiper-item>
-			<image src="../../../static/images/learnMore4.png"></image>
+			<image src="https://download.cyjyyjy.com/learnMore4.png"></image>
 		</swiper-item>
 	</swiper>
 </template>
diff --git a/pages/life/yunInfo/index.vue b/pages/life/yunInfo/index.vue
index 3115e13..eee0862 100644
--- a/pages/life/yunInfo/index.vue
+++ b/pages/life/yunInfo/index.vue
@@ -1,8 +1,8 @@
 <template>
 	<view class="information-box">
-		<view class="search-box acea-row row-middle" >
+		<view class="search-box acea-row row-middle">
 			<image src="../../../static/images/search-icon.png" mode=""></image>
-			<input type="text" value="" placeholder="请输入相关关键词"/>
+			<input type="text" value="" placeholder="请输入相关关键词" />
 			<view class="search acea-row row-center-wrapper">搜一下</view>
 		</view>
 		<view class="vote-box">
@@ -11,43 +11,44 @@
 				<view class="news-title-s">趁着有时间和你爱的人再去回味一下,那你认为有下线的必要吗？</view>
 			</view>
 			<view class="vote">
-				
+
 			</view>
 		</view>
-		<scroll-view class="scroll-view_N" scroll-x="true" >		
-			<view class="rotaion" v-for="(item,index) in 7" :key="index"> 
+		<scroll-view class="scroll-view_N" scroll-x="true">
+			<view class="rotaion" v-for="(item,index) in 7" :key="index">
 				<view class="acea-row row-center">
 					<image src="../../../static/images/collect.png" mode=""></image>
 					<view class="rotaion-h">今日大事</view>
 					<view class="rotaion-s">每日热点资讯</view>
 				</view>
-				
+
 			</view>
 		</scroll-view>
 		<!-- 最新资讯 -->
 		<view class="newInfo-box">
 			<image src="../../../static/images/newInfo.png" mode="" class="newInfo-title-img"></image>
-			<view class="newInfo" >
-				<view class="modular acea-row row-between" v-for="(item,index) in 3" :key="index">
-					<view class="acea-row title"  >
-						<view class="modular-h">海鸥出行将大巴车市场带入平台化阶段，提高包车出行效率</view>
+			<view class="newInfo">
+				<view class="modular acea-row row-between" v-for="(item,index) in articleList" :key="index"
+					@click="toDetail(item.id)">
+					<view class="acea-row title">
+						<view class="modular-h line2">{{item.title}}</view>
 						<view class="title-l acea-row row-between">
-							<view>云资讯</view>
-							<view>1小时前</view>
+							<view>{{item.author}}</view>
+							<view>{{item.createTime.split(' ')[0]}}</view>
 							<view class="acea-row row-middle">203
-								<image src="../../../static/images/eye.png" mode="" ></image>
+								<image src="../../../static/images/eye.png" mode=""></image>
 							</view>
 						</view>
 					</view>
-					<image src="../../../static/images/home/top-bg.png" mode="" ></image>
+					<image :src="item.imageInput" mode="aspectFill"></image>
 				</view>
 			</view>
 		</view>
 		<!-- 热点精选 -->
 		<view class="hotspot-box">
 			<image src="../../../static/images/user/hotspot.png" mode="" class="title-h-img"></image>
-			<scroll-view class="scroll-view_H acea-row" scroll-x="true" >
-				<view class="slide-box"  v-for="(item,index) in 3" :key="index">
+			<scroll-view class="scroll-view_H acea-row" scroll-x="true">
+				<view class="slide-box" v-for="(item,index) in 3" :key="index">
 					<image src="../../../static/images/home/top-bg.png" mode=""></image>
 					<view class="hotspot-con">
 						<view class="hotspot-icon">热点</view>
@@ -59,19 +60,19 @@
 		<!-- 值得关注 -->
 		<view class="follow-box">
 			<image src="../../../static/images/follow-title.png" mode="" class="title-h-img"></image>
-			<view class="follow-con"  v-for="(item,index) in 3" :key="index">
+			<view class="follow-con" v-for="(item,index) in 3" :key="index">
 				<view class="follow-top acea-row row-between">
-					<view class="acea-row follow-title"  >
+					<view class="acea-row follow-title">
 						<view class="follow-h">2021中国酒店与商用厨具行业品牌盛会</view>
 						<view class="follow-title-l acea-row row-between">
 							<view>云资讯</view>
 							<view>1小时前</view>
 							<view class="acea-row row-middle">203
-								<image src="../../../static/images/eye.png" mode="" ></image>
+								<image src="../../../static/images/eye.png" mode=""></image>
 							</view>
 						</view>
 					</view>
-					<image src="../../../static/images/home/top-bg.png" mode="" ></image>
+					<image src="../../../static/images/home/top-bg.png" mode=""></image>
 				</view>
 				<view class="follow-bottom acea-row row-middle">
 					<image src="../../../static/images/collect.png" mode=""></image>
@@ -87,15 +88,54 @@
 </template>
 
 <script>
+	import {
+		getArticle
+	} from "@/api/home";
+	export default {
+		data() {
+			return {
+				articleList: [],
+				page: 0,
+				size: 10,
+			}
+		},
+		mounted() {
+			this.getArticleList()
+		},
+		onReachBottom() {
+			this.page = this.page + 1
+			this.getArticleList()
+		},
+		methods: {
+			getArticleList() {
+				getArticle({
+					page: this.page,
+					size: this.size,
+					isHot: 0
+				}).then((res) => {
+					this.articleList = this.articleList.concat(res.data.content)
+				})
+			},
+			toDetail(id) {
+				this.$yrouter.push({
+					path: '/pages/life/articleDetail/index',
+					query: {
+						id: id
+					}
+				})
+			}
+		}
+	}
 </script>
 
 <style>
-	.information-box{
+	.information-box {
 		width: 100%;
 		height: 100vh;
 		position: relative;
 	}
-	.search-box{
+
+	.search-box {
 		width: 670rpx;
 		height: 68rpx;
 		border: 2rpx solid #FF5100;
@@ -104,12 +144,14 @@
 		font-size: 28rpx;
 		position: relative;
 	}
-	.search-box image{
+
+	.search-box image {
 		width: 35rpx;
 		height: 35rpx;
 		margin: 0 29rpx 0 52rpx;
 	}
-	.search{
+
+	.search {
 		position: absolute;
 		right: 0;
 		width: 132rpx;
@@ -117,9 +159,10 @@
 		background: linear-gradient(39deg, #FF5100 0%, #FFA074 100%);
 		border-radius: 8rpx;
 		color: #fff;
-		
+
 	}
-	.vote-box{
+
+	.vote-box {
 		width: 670rpx;
 		height: 358rpx;
 		background: #FFFFFF;
@@ -128,7 +171,8 @@
 		margin: 0 auto;
 		position: relative;
 	}
-	.news{
+
+	.news {
 		width: 100%;
 		height: 248rpx;
 		background: #D2D2D2;
@@ -137,30 +181,35 @@
 		position: absolute;
 		padding-left: 42rpx;
 	}
-	.news-title-h{
+
+	.news-title-h {
 		font-size: 28rpx;
 		position: absolute;
 		bottom: 54rpx;
 	}
-	.news-title-s{
+
+	.news-title-s {
 		font-size: 20rpx;
 		position: absolute;
 		bottom: 18rpx;
 	}
-	.vote{
+
+	.vote {
 		width: 100%;
 		height: 110rpx;
 		position: absolute;
 		bottom: 0;
 		border: 1rpx solid #000000;
 	}
-	.scroll-view_N{
+
+	.scroll-view_N {
 		width: 100%;
 		height: 228rpx;
 		margin: 30rpx 0 0 30rpx;
 		white-space: nowrap;
 	}
-	.rotaion{
+
+	.rotaion {
 		width: 168rpx;
 		padding: 32rpx 0 16rpx 0;
 		background: #FFFFFF;
@@ -169,107 +218,127 @@
 		margin: 10rpx 22rpx 20rpx 10rpx;
 		display: inline-block;
 	}
-	.rotaion image{
+
+	.rotaion image {
 		width: 80rpx;
 		height: 80rpx;
 		background: #FF6D2A;
 		border-radius: 50%;
 	}
-	.rotaion-h{
+
+	.rotaion-h {
 		height: 34rpx;
 		font-size: 24rpx;
 		color: #333333;
 		margin: 12rpx 0 4rpx 0;
 		font-weight: 600;
 	}
-	.rotaion-s{
+
+	.rotaion-s {
 		height: 26rpx;
 		font-size: 18rpx;
 		color: #9D9D9D;
 	}
+
 	/* 最新资讯 */
-	.newInfo-box{
+	.newInfo-box {
 		margin: 44rpx 0 0rpx 0;
+		overflow: hidden;
 	}
-	.newInfo-title-img{
+
+	.newInfo-title-img {
 		width: 160rpx;
 		height: 52rpx;
 		margin: 0 0 18rpx 38rpx;
 	}
-	.newInfo{
+
+	.newInfo {
 		width: 100%;
 		height: 528rpx;
 		border-top: 2rpx solid #EFEFEF;
 	}
-	.modular{
+
+	.modular {
 		width: 100%;
 		height: 176rpx;
 		border-bottom: 2rpx solid #EFEFEF;
 		padding: 20rpx 40rpx 22rpx 40rpx;
 	}
-	
-	.modular-h{
-		width: 392rpx;
+
+	.modular-h {
+		width: 400rpx;
 		height: 80rpx;
 		font-size: 28rpx;
 		color: #4A4A4A;
 		font-weight: 600;
 	}
-	.modular image{
+
+	.modular image {
 		width: 204rpx;
 		height: 134rpx;
+		border-radius: 8px;
 	}
-	.title{
-		width: 392rpx;
+
+	.title {
+		width: 400rpx;
 		height: 134rpx;
 	}
-	.title-l{
-		width: 310rpx;
+
+	.title-l {
+		width: 400rpx;
 		height: 34rpx;
 		font-size: 24rpx;
 		color: #707070;
 	}
-	.title-l image{
+
+	.title-l image {
 		width: 24rpx;
 		height: 24rpx;
 		margin-left: 5rpx;
 	}
+
 	/* 热点精选 */
-	.hotspot-box{
+	.hotspot-box {
 		width: 100%;
 		height: 456rpx;
 	}
-	.title-h-img{
+
+	.title-h-img {
 		width: 162rpx;
 		height: 62rpx;
 		margin: 32rpx 0 5rpx 40rpx;
 	}
-	.scroll-view_H{
+
+	.scroll-view_H {
 		width: 100%;
 		height: 344rpx;
 		white-space: nowrap;
 	}
-	.scroll-view_H image{
+
+	.scroll-view_H image {
 		width: 670rpx;
 		height: 344rpx;
 		border-radius: 10rpx;
 		position: absolute;
 	}
-	.slide-box{
+
+	.slide-box {
 		position: relative;
 		width: 670rpx;
 		height: 100%;
 		display: inline-block;
 		margin-right: 16rpx;
 	}
-	.hotspot-con{
+
+	.hotspot-con {
 		width: 588rpx;
 		height: 130rpx;
 		bottom: 34rpx;
 		left: 24rpx;
 		position: absolute;
 	}
-	.hotspot-icon{
+
+	.hotspot-icon {
 		width: 72rpx;
 		height: 32rpx;
 		background: #FE3737;
@@ -280,22 +349,25 @@
 		text-align: center;
 
 	}
-	.hotspot-title-h{
+
+	.hotspot-title-h {
 		width: 588rpx;
 		height: 80rpx;
 		font-size: 28rpx;
 		color: #FFFFFF;
 		position: absolute;
 		bottom: 0;
-		white-space:pre-wrap;
+		white-space: pre-wrap;
 	}
+
 	/* 值得关注 */
-	.follow-box{
+	.follow-box {
 		width: 100%;
 		height: 950rpx;
 		margin-bottom: 50rpx;
 	}
-	.follow-con{
+
+	.follow-con {
 		width: 670rpx;
 		height: 250rpx;
 		margin: 0 auto;
@@ -304,67 +376,75 @@
 		border-radius: 16rpx;
 		margin-bottom: 32rpx;
 	}
-	.follow-top{
+
+	.follow-top {
 		width: 100%;
 		height: 170rpx;
 		padding: 20rpx 20rpx 26rpx 20rpx;
 		border-bottom: 1rpx solid #DCDCDC;
 	}
-	.follow-top image{
+
+	.follow-top image {
 		width: 232rpx;
 		height: 130rpx;
 		border-radius: 16rpx;
 	}
-	.follow-title{
+
+	.follow-title {
 		width: 370rpx;
 		height: 100%;
 	}
-	.follow-h{
+
+	.follow-h {
 		width: 370rpx;
 		height: 80rpx;
 		font-size: 28rpx;
 		color: #000000;
 		font-weight: 600;
 	}
-	.follow-title-l{
+
+	.follow-title-l {
 		width: 250rpx;
 		height: 28rpx;
 		font-size: 20rpx;
 		color: #707070;
 	}
-	.follow-title-l image{
+
+	.follow-title-l image {
 		width: 24rpx;
 		height: 24rpx;
 		margin-left: 5rpx;
 	}
-	.follow-bottom{
+
+	.follow-bottom {
 		width: 100%;
 		height: 80rpx;
 		padding: 12rpx 20rpx 16rpx 20rpx;
 	}
-	.follow-bottom image{
+
+	.follow-bottom image {
 		width: 52rpx;
 		height: 52rpx;
 		border-radius: 50%;
 		margin-right: 8rpx;
 	}
-	.follow-title-b{
-		
-	}
-	
-	.title-s{
+
+	.follow-title-b {}
+
+	.title-s {
 		height: 28rpx;
 		font-size: 20rpx;
 		margin-bottom: 6rpx;
 		font-weight: 600;
 	}
-	.title-con{
+
+	.title-con {
 		height: 22rpx;
 		font-size: 16rpx;
 		color: #707070;
 	}
-	
-	.follow-btn{
+
+	.follow-btn {
 		width: 136rpx;
 		height: 40rpx;
 		background: linear-gradient(39deg, #FF5A0D 0%, #FFAC85 100%);
@@ -375,4 +455,4 @@
 		position: absolute;
 		right: 60rpx;
 	}
-	</style>
+</style>
diff --git a/pages/release/index2.vue b/pages/release/index2.vue
index d442bb5..54ad360 100644
--- a/pages/release/index2.vue
+++ b/pages/release/index2.vue
@@ -157,7 +157,7 @@ export default {
 			  url: '/pages/user/index'
 			});
     },
-
+		// 个人认证
     toPersonlAuth() {
       if (this.authStatus == 0) {
         uni.navigateTo({
@@ -175,7 +175,7 @@ export default {
         });
       }
     },
-
+		// 企业认证
     toCompanyAuth() {
       if (this.authStatus == 0) {
         uni.navigateTo({
@@ -193,6 +193,29 @@ export default {
         });
       }
     },
+		// 投资方认证
+		// toInvestorAuth() {
+		// 	uni.navigateTo({
+		// 	  url: '/pages/release/investorAuth/index'
+		// 	});
+		// },
+		// toPersonlAuth() {
+		//   if (this.authStatus == 0) {
+		//     uni.navigateTo({
+		//       url: '/pages/release/personAuth/index'
+		//     });
+		//   } else if (this.authStatus == 3) {
+		//     let authInfo = encodeURIComponent(JSON.stringify(this.authInfo));
+		//     uni.navigateTo({
+		//       url: '/pages/release/personAuth/index?authInfo=' + authInfo
+		//     });
+		//   } else if (this.authStatus == 1) {
+		//     uni.showToast({
+		//       title: '认证申请审核中，请等待！',
+		//       icon: 'none'
+		//     });
+		//   }
+		// },
 
     isAuthentication() {
       app.http('get', 'user/isAuthentication').then(res => {
@@ -247,6 +270,7 @@ export default {
 
         });
       }
+			
     },
 
     toNeeds() {
@@ -336,7 +360,7 @@ export default {
 }
 .investor-img{
 	width: 71rpx;
-		height: 79rpx;
+	height: 79rpx;
 }
 .auth-title{
 	width: 454rpx;
diff --git a/pages/release/investorAuth/index.vue b/pages/release/investorAuth/index.vue
new file mode 100644
index 0000000..8cb21ce
--- /dev/null
+++ b/pages/release/investorAuth/index.vue
@@ -0,0 +1,207 @@
+<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">姓名</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">手机号</view>
+      <view class="inp-box">
+        <input type="text" :value="form.legalPhone" @input="inpChange" data-type="phone" placeholder="请填写手机号">
+      </view>
+    </view>
+    <view class="form-item acea-row row-between row-middle">
+      <view class="label">身份证号</view>
+      <view class="inp-box">
+        <input type="text" :value="form.legalPersonIdcard" @input="inpChange" data-type="idcard" placeholder="请填写身份证号">
+      </view>
+    </view>
+    <!-- <view class="form-item noBorder">
+      <view class="label">身份证</view>
+      <view class="inp-box sfz">
+        <view class="acea-row row-between-wrapper">
+          <image src="https://download.cyjyyjy.com/sfz1.png" @tap="upCard" data-type="b" v-if="form.idcardPicBehind == ''"></image>
+          <image :src="form.idcardPicBehind" @tap="upCard" data-type="b" v-else></image>
+          <image src="https://download.cyjyyjy.com/sfzb.png"></image>
+        </view>
+        <view class="acea-row row-between-wrapper">
+          <image src="https://download.cyjyyjy.com/sfz2.png" @tap="upCard" data-type="f" v-if="form.idcardPicFront == ''"></image>
+          <image :src="form.idcardPicFront" @tap="upCard" data-type="f" v-else></image>
+          <image src="https://download.cyjyyjy.com/sfzz.png"></image>
+        </view>
+        <view class="acea-row row-between-wrapper">
+          <image src="https://download.cyjyyjy.com/sfz3.png" @tap="upCard" data-type="h" v-if="form.idcardPicHold == ''"></image>
+          <image :src="form.idcardPicHold" @tap="upCard" data-type="h" v-else></image>
+          <image src="https://download.cyjyyjy.com/sfzs.png"></image>
+        </view>
+      </view>
+    </view> -->
+  </view>
+  <view class="submit-btn" @tap="submit">保存并提交</view>
+</view>
+</template>
+
+<script>
+// pages/release/personAuth/index.js
+const util = require("../../../utils/util.js");
+const app = getApp();
+
+export default {
+  data() {
+    return {
+      form: {
+        legalPersonName: '',
+        legalPhone: '',
+        legalPersonIdcard: '',
+        idcardPicFront: '',
+        idcardPicBehind: '',
+        idcardPicHold: ''
+      },
+      isEdit: false
+    };
+  },
+
+  components: {},
+  props: {},
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad: function (options) {
+    if (options.authInfo) {
+      let authInfo = JSON.parse(decodeURIComponent(options.authInfo));
+			this.isEdit = true,
+      this.form.authorizationType = 2;
+      this.form.id = authInfo.id;
+      this.form.idcardPicHold = authInfo.idcardPicHold;
+      this.form.idcardPicBehind = authInfo.idcardPicBehind;
+      this.form.idcardPicFront = authInfo.idcardPicFront;
+      this.form.legalPersonIdcard = authInfo.legalPersonIdcard;
+      this.form.legalPhone = authInfo.legalPhone || '';
+      this.form.legalPersonName = authInfo.legalPersonName;
+    }
+  },
+  methods: {
+    inpChange(e) {
+      let type = e.currentTarget.dataset.type;
+      let value = e.detail.value;
+
+      if (type == 'name') {
+        this.setData({//['form.legalPersonName']: value
+        });
+        //try fix
+        this.form.legalPersonName = value;
+      } else if (type == 'phone') {
+        this.setData({//.form.legalPhone: value
+        });
+        //try fix
+        this.form.legalPhone = value;
+      } else if (type == 'idcard') {
+        this.setData({//.form.legalPersonIdcard: value
+        });
+        //try fix
+        this.form.legalPersonIdcard = value;
+      }
+    },
+
+    upCard(e) {
+      let type = e.currentTarget.dataset.type;
+      util.chooseImages(img => {
+        if (type == 'f') {
+          this.setData({//['form.idcardPicFront']: img
+          });
+          //try fix
+          this.form.idcardPicFront = img;
+        } else if (type == 'b') {
+          this.setData({//.form.idcardPicBehind: img
+          });
+          //try fix
+          this.form.idcardPicBehind = img;
+        } else {
+          this.setData({//.form.idcardPicHold: img
+          });
+          //try fix
+          this.form.idcardPicHold = img;
+        }
+      });
+    },
+
+    submit() {
+      let form = this.form;
+
+      if (form.legalPersonName == '') {
+        uni.showToast({
+          title: '请填写姓名',
+          icon: 'none'
+        });
+        return;
+      } else if (form.legalPhone == '') {
+        uni.showToast({
+          title: '请填写手机号',
+          icon: 'none'
+        });
+        return;
+      } else if (form.legalPersonIdcard == '') {
+        uni.showToast({
+          title: '请填写身份证号',
+          icon: 'none'
+        });
+        return;
+      } else {
+        if (this.isEdit == false) {
+          app.http('post', 'EnterpriseAuthentication/createAuthenticInfoOne', this.form).then(res => {
+            if (res.data.success) {
+              uni.showModal({
+                title: '提示！',
+                content: '提交成功！请等待审核',
+
+                success(res) {
+                  uni.navigateBack({
+                    delta: 1
+                  });
+                }
+
+              });
+            } else {
+              uni.showToast({
+                title: res.data.msg,
+                icon: 'none'
+              });
+            }
+          });
+        } else {
+          app.http('post', 'EnterpriseAuthentication/editAuthenticInfo', this.form).then(res => {
+            if (res.data.success) {
+              uni.showModal({
+                title: '提示！',
+                content: '提交成功！请等待审核',
+
+                success(res) {
+                  uni.navigateBack({
+                    delta: 1
+                  });
+                }
+
+              });
+            } else {
+              uni.showToast({
+                title: res.data.msg,
+                icon: 'none'
+              });
+            }
+          });
+        }
+      }
+    }
+
+  }
+};
+</script>
+<style>
+/* pages/release/personAuth/index.wxss */
+@import "../companyAuth/index.css";
+</style>
\ No newline at end of file
diff --git a/static/images/center-img.png b/static/images/center-img.png
deleted file mode 100644
index 6331721..0000000
Binary files a/static/images/center-img.png and /dev/null differ
diff --git a/static/images/details1.png b/static/images/details1.png
new file mode 100644
index 0000000..5eba67a
Binary files /dev/null and b/static/images/details1.png differ
diff --git a/static/images/details2.png b/static/images/details2.png
new file mode 100644
index 0000000..3dddb3d
Binary files /dev/null and b/static/images/details2.png differ
diff --git a/static/images/details3.png b/static/images/details3.png
new file mode 100644
index 0000000..7721165
Binary files /dev/null and b/static/images/details3.png differ
diff --git a/static/images/details4.png b/static/images/details4.png
new file mode 100644
index 0000000..ddcdb0c
Binary files /dev/null and b/static/images/details4.png differ
diff --git a/static/images/learnMore1.png b/static/images/learnMore1.png
deleted file mode 100644
index a64d016..0000000
Binary files a/static/images/learnMore1.png and /dev/null differ
diff --git a/static/images/learnMore2.png b/static/images/learnMore2.png
deleted file mode 100644
index 1cb2b49..0000000
Binary files a/static/images/learnMore2.png and /dev/null differ
diff --git a/static/images/learnMore3.png b/static/images/learnMore3.png
deleted file mode 100644
index aea06a9..0000000
Binary files a/static/images/learnMore3.png and /dev/null differ
diff --git a/static/images/learnMore4.png b/static/images/learnMore4.png
deleted file mode 100644
index 4b8c6f6..0000000
Binary files a/static/images/learnMore4.png and /dev/null differ