diff --git a/api/store.js b/api/store.js
index 05852b2..788beca 100644
--- a/api/store.js
+++ b/api/store.js
@@ -92,6 +92,15 @@ export function getProducts(q) {
 	});
 }
 
+/*
+ * 文章列表
+ * */
+export function getArticle(q) {
+	return request.get("/article/list", q, {
+		login: true
+	});
+}
+
 /*
  * 商品详情
  * */
diff --git a/components/vSwiper.vue b/components/vSwiper.vue
new file mode 100644
index 0000000..a350292
--- /dev/null
+++ b/components/vSwiper.vue
@@ -0,0 +1,107 @@
+<template>
+	<swiper class="swiper-block" vertical="true" circular="true" previous-margin="90rpx" next-margin="90rpx" current="0" @change="swiperChange">
+			<block v-for="(item, index) in imgs" :key="index">
+				<swiper-item class="swiper-item" :class="(swiperIndex == index ? 'active' : '')" @tap="previewImg">	
+					<view class="item-box" :class="(swiperIndex == index ? 'active' : '')" @click="toDetial(item.id)">
+						<image mode="aspectFill" :src="item.imageInput" class="slide-image"></image>
+						<view class="content-box">
+							<view class="title-box">标题标题标题标题标题</view>
+							<view class="content acea-row">
+								<view>云快讯</view>
+								<view>3小时钱</view>
+								<view>300阅读</view>
+							</view>
+						</view>
+					</view>
+				</swiper-item>
+			</block>
+	</swiper>
+</template>
+
+<script>
+	export default{
+		props: {
+			imgs: {
+				type: Array,
+				default: []
+			}
+		},
+		data(){
+			return {
+				swiperIndex: 0
+			}
+		},
+		methods: {
+			swiperChange(e) {
+			  const that = this;
+			  that.setData({
+			    swiperIndex: e.detail.current
+			  });
+			},
+			toDetial(id){
+				uni.navigateTo({
+					url: '/pages/life/articleDetail/index?id='+id
+				})
+			},
+			previewImg() {
+			  uni.previewImage({
+			    urls: this.imgs
+			  });
+			}
+		}
+	}
+</script>
+
+<style lang="less">
+	.swiper-block {
+		width: 670rpx;
+	  height: 300rpx;
+		margin: 0 auto;
+	}
+	  
+	.swiper-item {
+	  display: flex;
+	  flex-direction: column;
+	  justify-content: center;
+	  align-items: center;
+	  overflow: unset;
+	}
+	.item-box{
+		width: 622rpx;
+		height: 200rpx;
+		position: relative;
+		border-radius: 20rpx;
+	}
+	.slide-image {
+		width: 100%;
+		height: 100%;
+	  z-index: 1;
+		border-radius: 20rpx;
+	}
+	.content-box{
+		position: absolute;
+		bottom: 20rpx;
+		left: 20rpx;
+		color: #0081FF;
+		z-index: 5;
+	}
+	.title-box{
+		font-size: 32rpx;
+		font-weight: 500;
+		color: #fff;
+		margin-bottom: 10rpx;
+	}
+	.content{
+		color: #fff;
+		font-size: 26rpx;
+	}
+	.content view{
+		margin-right: 50rpx;
+	}
+	.active {
+	  transform: scale(1.02);
+	  transition: all 0.2s ease-in 0s;
+		border-radius: 20rpx;
+	  z-index: 20;
+	}
+</style>
diff --git a/config/index.js b/config/index.js
index dbb5bee..8e1318a 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://192.168.0.112:8092/api'
 // export const VUE_APP_API_URL = 'http://192.168.0.111:8092/api'
-export const VUE_APP_API_URL = 'https://cloud.api.cyjyyjy.com/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/package-lock.json b/package-lock.json
index 91a8cc8..eade2a6 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,31 @@
 {
+  "name": "zhaoshangMiniApp-uniapp",
+  "lockfileVersion": 2,
   "requires": true,
-  "lockfileVersion": 1,
+  "packages": {
+    "": {
+      "dependencies": {
+        "async-validator": "^4.0.7",
+        "dayjs": "^1.10.7",
+        "uview-ui": "^1.8.4"
+      }
+    },
+    "node_modules/async-validator": {
+      "version": "4.0.7",
+      "resolved": "https://registry.npmmirror.com/async-validator/download/async-validator-4.0.7.tgz?cache=0&sync_timestamp=1634529502627&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fasync-validator%2Fdownload%2Fasync-validator-4.0.7.tgz",
+      "integrity": "sha1-A0oP0hA6ay6/AQ2nUYO+wpkkev4="
+    },
+    "node_modules/dayjs": {
+      "version": "1.10.7",
+      "resolved": "https://registry.nlark.com/dayjs/download/dayjs-1.10.7.tgz?cache=0&sync_timestamp=1631266519235&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fdayjs%2Fdownload%2Fdayjs-1.10.7.tgz",
+      "integrity": "sha512-P6twpd70BcPK34K26uJ1KT3wlhpuOAPoMwJzpsIWUxHZ7wpmbdZL/hQqBDfz7hGurYSa5PhzdhDHtt319hL3ig=="
+    },
+    "node_modules/uview-ui": {
+      "version": "1.8.4",
+      "resolved": "https://registry.npm.taobao.org/uview-ui/download/uview-ui-1.8.4.tgz",
+      "integrity": "sha1-4yu/I3lCHTGQIuMk4ct7U4fTvUQ="
+    }
+  },
   "dependencies": {
     "async-validator": {
       "version": "4.0.7",
diff --git a/package.json b/package.json
index 07b57b1..db9b875 100644
--- a/package.json
+++ b/package.json
@@ -4,4 +4,4 @@
     "dayjs": "^1.10.7",
     "uview-ui": "^1.8.4"
   }
-}
+}
\ No newline at end of file
diff --git a/pages.json b/pages.json
index 3dda68e..22d244c 100644
--- a/pages.json
+++ b/pages.json
@@ -255,8 +255,9 @@
 		{
 			"path": "pages/life/index",
 			"style": {
+				"navigationStyle": "custom",
 				"navigationBarTitleText": "生活",
-				"enablePullDownRefresh": true
+				"enablePullDownRefresh": true	
 			}
 		},
 		{
@@ -290,7 +291,12 @@
 				"navigationBarTitleText": "详情预览"
 			}
 		},
-		
+		{
+			"path": "pages/life/articleDetail/index",
+			"style": {
+				"navigationBarTitleText": "资讯详情"
+			}
+		},
 		{
 			"path": "pages/activity/index",
 			"style": {
diff --git a/pages/home/index.vue b/pages/home/index.vue
index e65df47..d8cee09 100644
--- a/pages/home/index.vue
+++ b/pages/home/index.vue
@@ -96,7 +96,7 @@
             </view>
             <view class="buy-btn">立即抢购</view>
           </view>
-        </view>
+      data-i  </view>
       </scroll-view>
     </view>
   </view> -->
@@ -114,7 +114,7 @@
           <view class="tag">{{item.cname}}</view>
           <view class="desc line2">{{item.detailedDescription}}</view>
           <view class="buy-btn" @tap="toResourcesDetail" :data-id="item.id">了解详情</view>
-       </view>
+        </view>
         <view class="company-box acea-row">
           <image :src="item.enterpriseDto.enterpriseLogo" class="logo"></image>
           <view class="company-info acea-row row-column row-between">
diff --git a/pages/life/articleDetail/index.vue b/pages/life/articleDetail/index.vue
new file mode 100644
index 0000000..94bee8c
--- /dev/null
+++ b/pages/life/articleDetail/index.vue
@@ -0,0 +1,49 @@
+
+<template>
+	<view class="article-box">
+		<view class="headline">楚牛电商一季度卖了300亿，原因竟是这？</view>
+		<view class="">
+			<image src="../../../static/images/cart.png" mode=""></image>
+			<view class="">云快讯</view>
+			<view class="">203 </view>
+			<view>3小时前</view>
+		</view>
+		<view class="statement">转载声明：本文由云快讯收录，观点仅代表作者本人。不代表云快讯立场，云快讯不对所包含的准确性，可靠性或完整性提供任何明示，请自行承担任何责任。</view>
+		<image src="../../../static/images/gd1.png" mode="" class="article-bg1"></image>
+	</view>
+</template>
+
+<script>
+	import { getCategory , getProducts, getArticle} from "@/api/store";
+	export default{
+		data() {
+			return{
+				id:this.id,
+			}
+		},
+		methods:{			
+		},
+		onLoad: function (option) {
+			this.id= this.$yroute.query.id;
+			console.log(this.id)
+		        
+		}
+
+		
+	}
+</script>
+
+<style lang="less">
+	.article-box{
+		width: 100%;
+		min-height: 100vh;
+		background: #F5F6F7;
+		padding: 0 40rpx;
+	}
+	.headline{
+		font-size: 32rpx;
+		color: #333333;
+		padding-top: 30rpx;
+		margin-bottom: 60rpx;
+	}
+</style>
diff --git a/pages/life/index.vue b/pages/life/index.vue
index 8859db7..8efcdd9 100644
--- a/pages/life/index.vue
+++ b/pages/life/index.vue
@@ -1,6 +1,6 @@
 <template>
   <view class="productSort">
-		<view class="page-top-box" :class="isFixed == true ? 'on' : ''">
+		<!-- <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>
@@ -17,7 +17,7 @@
 			    </view>
 			  </view>
 			</div>
-		</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>
@@ -27,16 +27,144 @@
 				<image src="https://download.cyjyyjy.com/life3.png" @click="alertMessage('功能开发中...')"></image>
 			</view>
 		</view> -->
-		<view class="category-tab-box">
+		<!-- 顶部主页 -->
+		<view class="main-box">
+			<view class="back-bg"><image src="../../static/images/life-bg.png" mode=""></image></view>
+			<view class="top-logo acea-row row-center" :style="'top:' + menuTop + 'px;height:' + menuHeight + 'px;line-height: ' + menuHeight + 'px;'">禪易生态云</view>
+			<view class="details-btn">了解详情</view>
+		</view>
+		<!-- 云快讯 -->
+		<view class="yun-box">
+			<view class="acea-row row-between-wrapper">
+				<image src="../../static/images/yun.png" class="headline-yun"></image>
+				<view class="more-r">
+					<text>查看更多</text>
+					<image src="../../static/images/home/arrow-r.png"></image>
+				</view>
+			</view>
+			<view class="rotaion">
+				<vSwiper :imgs="yunList"></vSwiper>
+			</view>
+		</view>
+		<!-- 最新活动 -->
+		<view class="act-box">
+			<view class="headline"><image src="../../static/images/new-act.png" mode=""></image></view>
+			<scroll-view class="scroll-view_H" scroll-x="true">
+				<view class="slide-left" v-for="(iiem,index) in 3"  :key="index">
+					<view class="act-title">新零售与新营销模式重构和实战升级</view>
+					<view class="resource-list acea-row-nowrap">
+						<image src="../../static/images/new-bg.png" class="act-img"></image>
+						<view>
+							<view class="act-time acea-row row-left">
+								<image src="../../static/images/act-time.png" mode=""></image>
+								<view>12-23 00:00至11-25 23:00</view>
+							</view>
+							<view class="act-adress acea-row row-left">
+								<image src="../../static/images/act-address.png" mode=""></image>
+								<view class="line1">武汉市江夏区文化大道288号斤斤计较经济</view>
+							</view>
+							<view class="acea-row row-between-wrapper act-price">
+								<text class="act-i">进行中</text>
+								<text class="act-p">￥888.00</text>
+							</view>
+						</view>
+					</view>
+					<view class="act-bottom acea-row row-between-wrapper">
+						<view class="acea-row row-middle act-num">
+							<image src="../../static/images/cart.png"></image>
+							<image src="../../static/images/cart.png"></image>
+							<image src="../../static/images/cart.png"></image>
+							<text>15人报名</text>
+						</view>
+						<view class="enter-btn">
+							去报名
+						</view>
+					</view>
+				</view>
+			</scroll-view>
+		</view>
+		<!-- 为您推荐 -->
+		<view class="rec-box">
+			<view class="headline"><image src="../../static/images/rec-headline.png" mode=""></image></view>
+			<view class="rec-switch">
+				<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 == 1"></image>
+						<view class="rec-t acea-row row-center-wrapper">
+							<image src="../../static/images/rec-icon1.png" mode=""></image>
+							<view>需求</view>
+						</view>
+					</view>
+					<view class="rec-r "  @click="tabClick(2)">
+						<image src="../../static/images/rec-bg.png" class="rec-bg"  v-show="active == 2"></image>
+						<view class="rec-t acea-row row-center-wrapper">
+							<image src="../../static/images/rec-icon2.png" mode=""></image>
+							<view>资源</view>
+						</view>
+					</view>
+				</view>
+				<view class="rec-switch-a">
+					<view class="list-box" v-if="active == 1">
+						<view class="rec-list" >
+							<view class="acea-row row-middle">
+								<image src="../../static/images/rec-icon2.png" mode=""></image>
+								<view class="rec-name">李子龙111</view>
+								<view class="rec-address">武汉</view>
+								<view class="rec-end acea-row row-right">2021.8.30截止报名</view>
+							</view>
+							<view class="rec-message">我有景区方面资源，洽谈商务合作...</view>
+						</view>
+						<view class="rec-list" >
+							<view class="acea-row row-middle">
+								<image src="../../static/images/rec-icon2.png" mode=""></image>
+								<view class="rec-name">李大龙</view>
+								<view class="rec-address">武汉</view>
+								<view class="rec-end acea-row row-right">2021.8.30截止报名</view>
+							</view>
+							<view class="rec-message">我有景区方面资源，洽谈商务合作...</view>
+						</view>
+					</view>
+					<view class="list-box" v-if="active == 2">
+						<view class="rec-list" >
+							<view class="acea-row row-middle">
+								<image src="../../static/images/rec-icon2.png" mode=""></image>
+								<view class="rec-name">李木龙</view>
+								<view class="rec-address">武汉</view>
+								<view class="rec-end acea-row row-right">2021.8.30截止报名</view>
+							</view>
+							<view class="rec-message">我有景区方面资源，洽谈商务合作...</view>
+						</view>
+						<view class="rec-list" >
+							<view class="acea-row row-middle">
+								<image src="../../static/images/rec-icon2.png" mode=""></image>
+								<view class="rec-name">李子龙111qqq</view>
+								<view class="rec-address">武汉</view>
+								<view class="rec-end acea-row row-right">2021.8.30截止报名</view>
+							</view>
+							<view class="rec-message">我有景区方面资源，洽谈商务合作...</view>
+						</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>
-				<view class="category-item">回头率</view> -->
+				<view class="category-item">回头率</view>
 			</scroll-view>
-		</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)">
@@ -69,30 +197,39 @@
   </view>
 </template>
 <script>
-import { getCategory , getProducts, } from "@/api/store";
+import { getCategory , getProducts, getArticle} 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
+	  tabbar,
+		vSwiper
 	},
   name: "GoodsClass",
   computed: mapGetters(['userInfo']),
   props: {},
   data: function() {
     return {
-      category: [],
-      navActive: 0,
-      search: "",
-      lock: false,
-			currentTabIndex:3,
-			flowList:[],
-			isFixed: false,
-			loadStatus: 'loadmore',
-			page: 1,
-			limit: 10,
-			isLoad: true,  //是否还有更多
+		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,  //是否还有更多
+		yunList: [],
+		active:1,
+		show:false,
     };
   },
   watch: {
@@ -102,11 +239,12 @@ export default {
       }
     }
   },
-	// onShow: function (options) {
+	// onShow: function (options) {	
 		
 	// },
   mounted: function() {
 		this.getProducts();
+		this.getArticle();
   },
 	onReachBottom() {
 		if(this.isLoad){
@@ -170,6 +308,22 @@ export default {
         });
       });
     },
+		getArticle(){
+			let data = {
+				isHot: 0,
+				page: 0,
+				size: 100
+			}
+			getArticle(data).then(res=>{
+				console.log(res)
+				this.yunList = res.data.content
+			})
+		},
+		
+		tabClick(i) {
+			console.log(i,'aiiii')
+		  this.active= i
+		},
 		getProducts(){
 			this.loadStatus = 'loading';
 			getProducts({page:this.page,limit:this.limit}).then((res)=>{
@@ -190,7 +344,6 @@ export default {
 				wx.hideNavigationBarLoading()
 				uni.stopPullDownRefresh()
 			})
-			
 		},
     submitForm: function() {
       var val = trim(this.search);
@@ -223,11 +376,12 @@ export default {
 
 <style lang="less" scoped>
 .productSort {
-  height: 100%;
-	padding-bottom: 200rpx;
-	background: #fff !important;
+  // height: 100%;
+	// padding-bottom: 200rpx;
+	background: #EEEEEE !important;
 	position: relative;
 }
+
 .page-top-box{
 	width: 100%;
 	position: fixed;
@@ -272,46 +426,325 @@ export default {
 		}
 	}
 }
-.category-tab-box{
+
+.main-box{
 	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;
-				}
-			}
-		}
-	}
+	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;
+}
+.details-btn{
+		width: 196rpx;
+		height: 52rpx;
+		border: 2rpx solid #FFFFFF;
+		border-radius: 26px;
+		position: absolute;
+		bottom: 100rpx;
+		left: 50%;
+		margin-left: -98rpx;
+		text-align: center;
+		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;
+	margin-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;
+}
+.act-adress,.act-time{
+	margin: 8rpx 0 20rpx 0;
+	
+}
+.act-adress view,.act-time view{
+	width: 300rpx;
+	font-size: 24rpx;
+	color: #191919;
+}
+.act-time image{
+	width: 18rpx;
+	height: 22rpx;
+	margin-right: 16rpx;
+	margin-top: 7rpx;
+}
+.act-adress image{
+	width: 19rpx;
+	height: 23rpx;
+	margin-right: 14rpx;
+	margin-top: 8rpx;
+}
+.act-price{
+	margin-top: 40rpx;
+}
+.act-i {
+	font-size: 24rpx;
+	color: #FF5A0E;
+}
+.act-p{
+	font-size: 32rpx;
+	color: #2A2B2B;
+}
+.act-bottom{
+	width: 562rpx;
+	border-top: 1rpx solid #ECECEC;
+}
+.act-num image{
+	width: 36rpx;
+	height: 36rpx;
+	border-radius: 50%;
+}
+.act-num{
+	min-width: 154rpx;
+	margin-top: 14rpx;
+}
+.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;
+	margin-right: 38rpx;
+	margin-top: 8rpx;
+	
+}
+
+
+// 推荐供需
+.rec-box{
+	width: 706rpx;
+	height: 493rpx;
+	margin: 32rpx 22rpx 8rpx 22rpx;
+	position: relative;
+	
+}
+.rec-switch{
+	width: 706rpx;
+	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%;
+	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: 33rpx 40rpx 0 40rpx;
+}
+.rec-list image{
+	width: 64rpx;
+	height: 64rpx;
+}
+.rec-name{
+	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;
+	position: absolute;
+	right: 22rpx;
+}
+.rec-message{
+	width: 582rpx;
+	height: 40rpx;
+	font-size: 28rpx;
+	color: #1D1D1D;
+	margin-top: 15rpx;
+}
+
+
+
+// .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{
+		width: 148rpx;
+		height: 52rpx;
+		}
 .warter-box{
 	width: 100%;
-	padding: 92rpx 0 190rpx 24rpx;
+	padding: 24rpx 0 190rpx 24rpx;
 	.u-waterfall {
 		width: 100%;
 		display: flex;
diff --git a/pages/user/completeData/index.vue b/pages/user/completeData/index.vue
index 2a74a31..90501d9 100644
--- a/pages/user/completeData/index.vue
+++ b/pages/user/completeData/index.vue
@@ -1,247 +1,274 @@
 <template>
-<!--pages/user/completeData/index.wxml-->
-<view class="page-box">
-  <view class="back-btn" :style="'top:' + navTopHeight + 'rpx'" @tap="backPage">
+	<!--pages/user/completeData/index.wxml-->
+	<view class="page-box">
+		<view class="back-btn" :style="'top:' + navTopHeight + 'rpx'" @tap="backPage">
 			<image src="/static/images/back.png" mode></image>
+		</view>
+		<view class="bg-img-box">
+			<image src="https://download.cyjyyjy.com/personalPage-bg.png"></image>
+		</view>
+		<view class="mail-box">
+			<view :class="showMove ? 'mail-img-box mail-top top-move' : 'mail-img-box mail-top'">
+				<image src="https://download.cyjyyjy.com/mail-t.png"></image>
+			</view>
+			<view class="mail-img-box mail-center">
+				<image src="https://download.cyjyyjy.com/mail-c.png"></image>
+			</view>
+			<view :class="showMove ? 'mail-img-box mail-bottom btm-move' : 'mail-img-box mail-top'">
+				<image src="https://download.cyjyyjy.com/mail-b.png"></image>
+			</view>
+			<view :class="(showMove ? 'word-move' : '') + ' tips'">信息已为您保存</view>
+			<view class="pay-btn" @tap="toPay">成为体验官</view>
+			<view class="tip">前1000名体验官可享限时专属价 ￥199/年</view>
+		</view>
+
 	</view>
-  <view class="bg-img-box"><image src="https://download.cyjyyjy.com/personalPage-bg.png"></image></view>
-  <view class="mail-box">
-    <view :class="showMove ? 'mail-img-box mail-top top-move' : 'mail-img-box mail-top'">
-      <image src="https://download.cyjyyjy.com/mail-t.png"></image>
-    </view>
-    <view class="mail-img-box mail-center">
-      <image src="https://download.cyjyyjy.com/mail-c.png"></image>
-    </view>
-    <view :class="showMove ? 'mail-img-box mail-bottom btm-move' : 'mail-img-box mail-top'">
-      <image src="https://download.cyjyyjy.com/mail-b.png"></image>
-    </view>
-    <view :class="(showMove ? 'word-move' : '') + ' tips'">信息已为您保存</view>
-    <view class="pay-btn" @tap="toPay">成为体验官</view>
-    <view class="tip">前1000名体验官可享限时专属价 ￥199/年</view>
-  </view>
-  
-</view>
 </template>
 
 <script>
-// pages/user/completeData/index.js
-const app = getApp();
-
-export default {
-  data() {
-    return {
-      showMove: false,
-      navTopHeight: app.globalData.menuTop + app.globalData.navTopHeight + 10
-    };
-  },
-
-  components: {},
-  props: {},
-
-  /**
-   * 生命周期函数--监听页面加载
-   */
-  onLoad: function (options) {
-    this.setData({
-      showMove: true
-    });
-  },
-  methods: {
-    backPage() {
-      uni.navigateBack({
-        delta: 1
-      });
-    },
-
-    toPay() {
-      app.http('post', 'vip/subscribeVip', {num: 1}).then(res => {
-        if (res.data.success) {
-          let orderInfo = res.data.data;
-          this.payment(orderInfo);
-        } else {
-          uni.showToast({
-            title: res.data.msg,
-            icon: 'none'
-          });
-        }
-      });
-    },
-
-    payment(orderInfo) {
-      // 调用支付接口
-      uni.requestPayment({
-        provider: 'wxpay',
-        ...orderInfo,
-        signType: 'MD5',
-        success: success => {
-          uni.showToast({
-            title: '支付成功',
-            icon: 'success',
-            duration: 3000
-          });
-          uni.removeStorageSync('form');
-          let time = setTimeout(() => {
-            clearTimeout(time);
-            uni.navigateTo({
-              url: '../mine/index'
-            });
-          }, 2000);
-        },
-        fail: error => {
-          console.log(error);
-
-          if (error.errMsg == 'requestPayment:fail cancel') {
-            uni.showToast({
-              title: '已取消支付',
-              icon: 'none',
-              duration: 5000
-            });
-          } else {
-            uni.showToast({
-              title: error || error.msg,
-              icon: 'none',
-              duration: 5000
-            });
-          }
-        }
-      });
-    }
-  }
-};
+	// pages/user/completeData/index.js
+	const app = getApp();
+
+	export default {
+		data() {
+			return {
+				showMove: false,
+				navTopHeight: app.globalData.menuTop + app.globalData.navTopHeight + 10
+			};
+		},
+
+		components: {},
+		props: {},
+
+		/**
+		 * 生命周期函数--监听页面加载
+		 */
+		onLoad: function(options) {
+			this.setData({
+				showMove: true
+			});
+		},
+		methods: {
+			backPage() {
+				uni.navigateBack({
+					delta: 1
+				});
+			},
+
+			toPay() {
+				app.http('post', 'vip/subscribeVip', {
+					num: 1
+				}).then(res => {
+					if (res.data.success) {
+						let orderInfo = res.data.data;
+						this.payment(orderInfo);
+					} else {
+						uni.showToast({
+							title: res.data.msg,
+							icon: 'none'
+						});
+					}
+				});
+			},
+
+			payment(orderInfo) {
+				// 调用支付接口
+				uni.requestPayment({
+					provider: 'wxpay',
+					...orderInfo,
+					signType: 'MD5',
+					success: success => {
+						uni.showToast({
+							title: '支付成功',
+							icon: 'success',
+							duration: 3000
+						});
+						uni.removeStorageSync('form');
+						let time = setTimeout(() => {
+							clearTimeout(time);
+							uni.navigateTo({
+								url: '../mine/index'
+							});
+						}, 2000);
+					},
+					fail: error => {
+						console.log(error);
+
+						if (error.errMsg == 'requestPayment:fail cancel') {
+							uni.showToast({
+								title: '已取消支付',
+								icon: 'none',
+								duration: 5000
+							});
+						} else {
+							uni.showToast({
+								title: error || error.msg,
+								icon: 'none',
+								duration: 5000
+							});
+						}
+					}
+				});
+			}
+		}
+	};
 </script>
 <style>
-/* pages/user/completeData/index.wxss */
-page{
-  width: 100%;
-  height: 100vh;
-}
-.page-box{
-  width: 100%;
-  height: 100%;
-  position: relative;
-}
-.bg-img-box{
-  width: 100%;
-  height: 100%;
-  position: absolute;
-  top: 0;
-  left: 0;
-}
-.bg-img-box image{
-  width: 100%;
-  height: 100%;
-}
-.mail-box{
-  width: 687rpx;
-  position: absolute;
-  top: 0;
-  left: 50%;
-  transform: translateX(-50%);
-}
-.mail-box .mail-img-box{
-  position: absolute;
-}
-
-.mail-top,.mail-bottom{
-  z-index: 3;
-}
-.mail-top{
-  z-index: 4;
-   top: 10rpx;
-   /* top: 314rpx; */
-}
-.top-move{
-  animation: topMove 2s ease;
-  animation-fill-mode: forwards;
-}
-.mail-top image{
-  width: 687rpx;
-  height: 445rpx;
-}
-.mail-center image{
-  width: 684rpx;
-  height: 648rpx;
-  transform: scale(0.99);
-}
-.mail-center{
-  top: 316rpx;
-}
-.mail-bottom image{
-  width: 687rpx;
-  height: 432rpx;
-  
-}
-.mail-bottom{
-  top: 616rpx;
-}
-.btm-move{
-  animation: btmMove 1.5s  ease;
-  animation-fill-mode: forwards;
-}
-@keyframes topMove{
-  0% {
-    top: 10rpx;
-    opacity: 0.8;
-  }
-  100% {
-    top: 314rpx;
-    opacity: 1;
-  }
-}
-@keyframes btmMove{
-  0% {
-    top: 616rpx;
-    opacity: 0.2;
-  }
-  100% {
-    top: 532rpx;
-    opacity: 1;
-  }
-}
-
-.tips{
-  width: 100%;
-  color:#EFDACA;
-  font-size: 40rpx;
-  line-height: 56rpx;
-  position: absolute;
-  top: 1000rpx;
-  text-align: center;
-}
-.word-move{
-  animation: wordMove 1s ease;
-  animation-fill-mode: forwards;
-}
-@keyframes wordMove{
-  0%{
-    left: -100%;
-  }
-  100%{
-    left: 0;
-  }
-}
-.pay-btn{
-  width: 686rpx;
-  height: 82rpx;
-  position: absolute;
-  top: 1100rpx;
-  left: 50%;
-  transform: translateX(-50%);
-  background: linear-gradient(322deg, #DEB99F 0%, #E9D1C0 51%, #E3C9B5 100%);
-  border-radius: 62rpx;
-  text-align: center;
-  line-height: 82rpx;
-  color: #946F46;
-}
-.tip{
-  width: 100%;
-  text-align: center;
-  color: #EFDACA;
-  font-size: 32rpx;
-  line-height: 44rpx;
-  position: absolute;
-  top: 1200rpx;
-  left: 50%;
-  transform: translateX(-50%);
-}
-</style>
\ No newline at end of file
+	/* pages/user/completeData/index.wxss */
+	page {
+		width: 100%;
+		height: 100vh;
+	}
+
+	.page-box {
+		width: 100%;
+		height: 100%;
+		position: relative;
+	}
+
+	.bg-img-box {
+		width: 100%;
+		height: 100%;
+		position: absolute;
+		top: 0;
+		left: 0;
+	}
+
+	.bg-img-box image {
+		width: 100%;
+		height: 100%;
+	}
+
+	.mail-box {
+		width: 687rpx;
+		position: absolute;
+		top: 0;
+		left: 50%;
+		transform: translateX(-50%);
+	}
+
+	.mail-box .mail-img-box {
+		position: absolute;
+	}
+
+	.mail-top,
+	.mail-bottom {
+		z-index: 3;
+	}
+
+	.mail-top {
+		z-index: 4;
+		top: 10rpx;
+		/* top: 314rpx; */
+	}
+
+	.top-move {
+		animation: topMove 2s ease;
+		animation-fill-mode: forwards;
+	}
+
+	.mail-top image {
+		width: 687rpx;
+		height: 445rpx;
+	}
+
+	.mail-center image {
+		width: 684rpx;
+		height: 648rpx;
+		transform: scale(0.99);
+	}
+
+	.mail-center {
+		top: 316rpx;
+	}
+
+	.mail-bottom image {
+		width: 687rpx;
+		height: 432rpx;
+
+	}
+
+	.mail-bottom {
+		top: 616rpx;
+	}
+
+	.btm-move {
+		animation: btmMove 1.5s ease;
+		animation-fill-mode: forwards;
+	}
+
+	@keyframes topMove {
+		0% {
+			top: 10rpx;
+			opacity: 0.8;
+		}
+
+		100% {
+			top: 314rpx;
+			opacity: 1;
+		}
+	}
+
+	@keyframes btmMove {
+		0% {
+			top: 616rpx;
+			opacity: 0.2;
+		}
+
+		100% {
+			top: 532rpx;
+			opacity: 1;
+		}
+	}
+
+	.tips {
+		width: 100%;
+		color: #EFDACA;
+		font-size: 40rpx;
+		line-height: 56rpx;
+		position: absolute;
+		top: 1000rpx;
+		text-align: center;
+	}
+
+	.word-move {
+		animation: wordMove 1s ease;
+		animation-fill-mode: forwards;
+	}
+
+	@keyframes wordMove {
+		0% {
+			left: -100%;
+		}
+
+		100% {
+			left: 0;
+		}
+	}
+
+	.pay-btn {
+		width: 686rpx;
+		height: 82rpx;
+		position: absolute;
+		top: 1100rpx;
+		left: 50%;
+		transform: translateX(-50%);
+		background: linear-gradient(322deg, #DEB99F 0%, #E9D1C0 51%, #E3C9B5 100%);
+		border-radius: 62rpx;
+		text-align: center;
+		line-height: 82rpx;
+		color: #946F46;
+	}
+
+	.tip {
+		width: 100%;
+		text-align: center;
+		color: #EFDACA;
+		font-size: 32rpx;
+		line-height: 44rpx;
+		position: absolute;
+		top: 1200rpx;
+		left: 50%;
+		transform: translateX(-50%);
+	}
+</style>
diff --git a/project.config.json b/project.config.json
new file mode 100644
index 0000000..d33412b
--- /dev/null
+++ b/project.config.json
@@ -0,0 +1,68 @@
+{
+    "description": "项目配置文件",
+    "packOptions": {
+        "ignore": []
+    },
+    "setting": {
+        "bundle": false,
+        "userConfirmedBundleSwitch": false,
+        "urlCheck": true,
+        "scopeDataCheck": false,
+        "coverView": true,
+        "es6": true,
+        "postcss": true,
+        "compileHotReLoad": false,
+        "lazyloadPlaceholderEnable": false,
+        "preloadBackgroundData": false,
+        "minified": true,
+        "autoAudits": false,
+        "newFeature": false,
+        "uglifyFileName": false,
+        "uploadWithSourceMap": true,
+        "useIsolateContext": true,
+        "nodeModules": false,
+        "enhance": true,
+        "useMultiFrameRuntime": true,
+        "useApiHook": true,
+        "useApiHostProcess": true,
+        "showShadowRootInWxmlPanel": true,
+        "packNpmManually": false,
+        "enableEngineNative": false,
+        "packNpmRelationList": [],
+        "minifyWXSS": true,
+        "showES6CompileOption": false
+    },
+    "compileType": "miniprogram",
+    "libVersion": "2.21.0",
+    "appid": "wx1bdc220038c3cb61",
+    "projectname": "miniprogram-1",
+    "debugOptions": {
+        "hidedInDevtools": []
+    },
+    "scripts": {},
+    "staticServerOptions": {
+        "baseURL": "",
+        "servePath": ""
+    },
+    "isGameTourist": false,
+    "condition": {
+        "search": {
+            "list": []
+        },
+        "conversation": {
+            "list": []
+        },
+        "game": {
+            "list": []
+        },
+        "plugin": {
+            "list": []
+        },
+        "gamePlugin": {
+            "list": []
+        },
+        "miniprogram": {
+            "list": []
+        }
+    }
+}
\ No newline at end of file
diff --git a/static/images/act-address.png b/static/images/act-address.png
new file mode 100644
index 0000000..c64eb2c
Binary files /dev/null and b/static/images/act-address.png differ
diff --git a/static/images/act-time.png b/static/images/act-time.png
new file mode 100644
index 0000000..884a6f9
Binary files /dev/null and b/static/images/act-time.png differ
diff --git a/static/images/gd1.png b/static/images/gd1.png
new file mode 100644
index 0000000..6ad809e
Binary files /dev/null and b/static/images/gd1.png differ
diff --git a/static/images/gd2.png b/static/images/gd2.png
new file mode 100644
index 0000000..d409146
Binary files /dev/null and b/static/images/gd2.png differ
diff --git a/static/images/gd3.png b/static/images/gd3.png
new file mode 100644
index 0000000..c90b933
Binary files /dev/null and b/static/images/gd3.png differ
diff --git a/static/images/life-bg.png b/static/images/life-bg.png
new file mode 100644
index 0000000..9d3e15e
Binary files /dev/null and b/static/images/life-bg.png differ
diff --git a/static/images/new-act.png b/static/images/new-act.png
new file mode 100644
index 0000000..104cd57
Binary files /dev/null and b/static/images/new-act.png differ
diff --git a/static/images/new-bg.png b/static/images/new-bg.png
new file mode 100644
index 0000000..7281344
Binary files /dev/null and b/static/images/new-bg.png differ
diff --git a/static/images/rec-bg.png b/static/images/rec-bg.png
new file mode 100644
index 0000000..d38d051
Binary files /dev/null and b/static/images/rec-bg.png differ
diff --git a/static/images/rec-bg2.png b/static/images/rec-bg2.png
new file mode 100644
index 0000000..5c75aa0
Binary files /dev/null and b/static/images/rec-bg2.png differ
diff --git a/static/images/rec-headline.png b/static/images/rec-headline.png
new file mode 100644
index 0000000..143f107
Binary files /dev/null and b/static/images/rec-headline.png differ
diff --git a/static/images/rec-icon1.png b/static/images/rec-icon1.png
new file mode 100644
index 0000000..a104d7c
Binary files /dev/null and b/static/images/rec-icon1.png differ
diff --git a/static/images/rec-icon2.png b/static/images/rec-icon2.png
new file mode 100644
index 0000000..91a5725
Binary files /dev/null and b/static/images/rec-icon2.png differ
diff --git a/static/images/rec-title.png b/static/images/rec-title.png
new file mode 100644
index 0000000..81c528e
Binary files /dev/null and b/static/images/rec-title.png differ
diff --git a/static/images/yun.png b/static/images/yun.png
new file mode 100644
index 0000000..7fa942c
Binary files /dev/null and b/static/images/yun.png differ