diff --git a/pages.json b/pages.json
index 0cad8e7..c42c272 100644
--- a/pages.json
+++ b/pages.json
@@ -62,6 +62,24 @@
 				"enablePullDownRefresh": false
 			}
 		}
+        ,{
+            "path" : "pages/index/upload/upload",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "",
+                "enablePullDownRefresh": false
+            }
+            
+        }
+        ,{
+            "path" : "pages/index/material/material",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "",
+                "enablePullDownRefresh": false
+            }
+            
+        }
     ],
 	"globalStyle": {
 		"navigationBarTextStyle": "black",
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 1d2c04c..66d7c62 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -2,22 +2,43 @@
 	<view class="container">
 		<view class="top">
 			<uni-swiper-dot class="uni-swiper-dot-box" @clickItem=clickItem :info="info" :current="current" :mode="mode"
-						 field="content">
-						<swiper class="swiper-box" @change="change" :current="swiperDotIndex" :autoplay="autoplay" 
-						:interval="interval" :duration="duration">
-							<swiper-item v-for="(item, index) in 3" :key="index">
-								<view class="swiper-item" :class="'swiper-item' + index">
-									<text style="color: #fff; font-size: 32px;">{{index+1}}</text>
-								</view>
-							</swiper-item>
-						</swiper>
+				field="content">
+				<swiper class="swiper-box" @change="change" :current="swiperDotIndex" :autoplay="autoplay"
+					:interval="interval" :duration="duration">
+					<swiper-item v-for="(item, index) in 3" :key="index">
+						<view class="swiper-item" :class="'swiper-item' + index">
+							<text style="color: #fff; font-size: 32px;">{{index+1}}</text>
+						</view>
+					</swiper-item>
+				</swiper>
 			</uni-swiper-dot>
 		</view>
 		<view class="middle">
-			素材管理、上传图片
+			<uni-group mode="card">
+				<uni-grid :column="2" :square="true" :highlight="false" @change="change" :showBorder="false">
+					<uni-grid-item v-for="(item, index) in funcList" :index="index" :key="index">
+						<view class="grid-item-box">
+							<!-- <image :src="item.url" class="image" mode="aspectFill" /> -->
+							<uni-icons type="image" :size="30" color="#777" />
+							<text class="text">{{ item.title }}</text>
+						</view>
+					</uni-grid-item>
+				</uni-grid>
+			</uni-group>
 		</view>
 		<view class="foot">
-			表格展示艺术家上传的图片数据
+				<uni-group mode="card" title="素材数据" style="text-align:center;">
+					<uni-grid :column="3" :square="true" :highlight="false" @change="change">
+						<uni-grid-item v-for="(item, index) in list" :index="index" :key="index">
+							<view class="grid-item-box">
+								<!-- <image :src="item.url" class="image" mode="aspectFill" /> -->
+								<uni-icons type="image" :size="30" color="#777" />
+								<text class="text">{{ item.text }}</text>
+								<text class="text">{{ item.num }}</text>
+							</view>
+						</uni-grid-item>
+					</uni-grid>
+				</uni-group>
 		</view>
 	</view>
 </template>
@@ -37,18 +58,65 @@
 				mode: 'nav',
 				swiperDotIndex: 0,
 				autoplay: true,
-                interval: 5000,
-				duration: 500
+				interval: 5000,
+				duration: 500,
+				pageUrl:'',
+				funcList: [{
+					title: '素材管理',
+					url: '/pages/index/material/material'
+				}, {
+					title: '上传素材',
+					url: '/pages/index/upload/upload'
+				}],
+				list: [{
+						url: '/static/c1.png',
+						text: '头像',
+						num: '16'
+					},
+					{
+						url: '/static/c2.png',
+						text: '背景图',
+						num: '1'
+					},
+					{
+						url: '/static/c3.png',
+						text: '手机壁纸',
+						num: '99'
+					},
+					{
+						url: '/static/c4.png',
+						text: '动态壁纸',
+						num: '23',
+					},
+					{
+						url: '/static/c5.png',
+						text: 'apple watch',
+						num: '15'
+					},
+					{
+						url: '/static/c6.png',
+						text: '表情包',
+						num: '31'
+					}
+				]
 			};
 		},
-		methods:{
+		methods: {
 			change(e) {
-				this.current = e.detail.current;
-				//console.log('this.current',this.current)
+				let {
+					index
+				} = e.detail
+				this.funcList[index].badge && this.funcList[index].badge++
+				this.pageUrl = this.funcList[index].url
+				console.log('this.pageUrl',this.pageUrl)
+				/** 跳转指定页面*/
+				uni.navigateTo({
+					url: this.pageUrl
+				});
 			},
 			clickItem(e) {
 				this.swiperDotIndex = e
-				console.log('this.swiperDotIndex',this.swiperDotIndex)
+				console.log('this.swiperDotIndex', this.swiperDotIndex)
 			},
 			// 获取用户信息
 			getUserInfo() {
@@ -64,12 +132,12 @@
 									iv: userInfo.iv
 								}
 								// 用户授权登录
-								console.log('params',params);
+								console.log('params', params);
 								loginWx(params).then(res => {
 									if (res.data.code === 200) {
 										uni.setStorage({
 											key: 'userInfo',
-											data: res.data.data.userInfo, 
+											data: res.data.data.userInfo,
 										})
 									} else {
 										uni.showToast({
@@ -89,96 +157,42 @@
 						console.log(`login 调用失败`);
 					},
 				});
-			
+
 			},
 		}
 	}
 </script>
 
 <style lang="scss">
-// .container {
-// 		.top {
-// 			width: 100vw;
-
-// 			image {
-// 				width: 100vw;
-// 				height: 400rpx;
-// 			}
-
-// 			.uni-searchbar {
-// 				border: 1px solid #11A8FD;
-// 				margin: 0 40rpx;
-// 				border-radius: 16rpx;
-// 				padding: 0;
-
-// 				.uni-searchbar__box {
-// 					padding: 0;
-// 					border-radius: 16rpx !important;
-// 				}
-// 			}
-
-// 			>text {
-// 				font-weight: bold;
-// 				font-size: 14px;
-// 				display: block;
-// 				text-align: center;
-// 				padding-top: 40rpx;
-// 				padding-bottom: 20rpx;
-// 			}
-
-// 			.user-list {
-// 				display: flex;
-// 				justify-content: flex-start;
-// 				align-items: center;
-// 				overflow-x: auto;
-
-// 				.user-list-box {
-// 					width: 140rpx;
-// 					padding: 20rpx;
-// 					text-align: center;
-
-// 					image {
-// 						width: 100rpx;
-// 						height: 100rpx;
-// 						border-radius: 100rpx;
-// 					}
-
-// 					text {
-// 						font-size: 24rpx;
-// 						color: #1E1E1E;
-// 						text-align: center;
-// 					}
-// 				}
-// 			}
-// 		}
-
-// 		.middle {
-// 			text-align: center;
-// 			height: calc(100vh - 248rpx);
-// 			padding-top: 40rpx;
-
-// 			text {
-// 				font-weight: bold;
-// 				font-size: 14px;
-// 				display: block;
-// 			}
-
-// 			image {
-// 				width: 40rpx;
-// 				height: 40rpx;
-// 			}
-// 		}
-// 	}
-.middle{
-	margin-top: 100px;
-}
-
-.foot{
-	margin-top: 100px;
-}
-
-.swiper-box {
-		height: 180px;
+	.container{
+		font-family:‘Franklin Gothic Medium’, ‘Arial Narrow’, Arial, sans-serif;
+	}
+	.grid-item-box {
+		flex: 1;
+		// position: relative;
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: column;
+		align-items: center;
+		justify-content: center;
+		padding: 10px 0;
+	}
+
+	.grid-item-box-row {
+		flex: 1;
+		// position: relative;
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		align-items: center;
+		justify-content: center;
+		padding: 10px 0;
+	}
+
+	.swiper-box {
+		height: 150px;
 	}
 
 	.swiper-item {
diff --git a/pages/index/material/material.vue b/pages/index/material/material.vue
new file mode 100644
index 0000000..ccc383d
--- /dev/null
+++ b/pages/index/material/material.vue
@@ -0,0 +1,22 @@
+<template>
+	<view>
+		我是素材管理界面
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				
+			}
+		},
+		methods: {
+			
+		}
+	}
+</script>
+
+<style>
+
+</style>
diff --git a/pages/index/upload/upload.vue b/pages/index/upload/upload.vue
new file mode 100644
index 0000000..a3ed044
--- /dev/null
+++ b/pages/index/upload/upload.vue
@@ -0,0 +1,22 @@
+<template>
+	<view>
+		我是上传界面
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				
+			}
+		},
+		methods: {
+			
+		}
+	}
+</script>
+
+<style>
+
+</style>
diff --git a/pages/profit/profit.vue b/pages/profit/profit.vue
index 20db052..97b8f70 100644
--- a/pages/profit/profit.vue
+++ b/pages/profit/profit.vue
@@ -1,27 +1,28 @@
 <template>
 	<view class="container">
 		<view class="top">
-			
+			<uni-section title="昨日收益" type="line">
+				<uni-group mode="card">
+					<view>啦啦啦</view>
+				</uni-group>
+			</uni-section>
 		</view>
 		<view class="middle">
-			
-		</view>
-		<view class="foot">
-			
+			<uni-section title="收益明细" type="line">
+				<uni-group mode="card">
+					<view>啦啦啦</view>
+				</uni-group>
+			</uni-section>
 		</view>
 	</view>
 </template>
 
 <script>
-	import {
-		loginWx
-	} from '@/api/index.js'
 	export default {
 		data() {
 			return {
-				hotCreatorList: [],
-				isTarget: true,
-				showChoiceness:false
+				nvueWidth: 730,
+				list: ['美團外賣', '支付助手', '廣告助手', '上傳圖片', '消息通知', '我的信息', '我的短信', '我的頭像']
 			}
 		},
 		// 下拉刷新
@@ -29,87 +30,17 @@
 			uni.stopPullDownRefresh()
 		},
 		created() {
-			
+
 		},
 		methods: {
-			
-			
+
+
 		},
 	}
 </script>
 
-<style lang="less">
-	.container {
-		.top {
-			width: 100vw;
-
-			image {
-				width: 100vw;
-				height: 400rpx;
-			}
-
-			.uni-searchbar {
-				border: 1px solid #11A8FD;
-				margin: 0 40rpx;
-				border-radius: 16rpx;
-				padding: 0;
-
-				.uni-searchbar__box {
-					padding: 0;
-					border-radius: 16rpx !important;
-				}
-			}
-
-			>text {
-				font-weight: bold;
-				font-size: 14px;
-				display: block;
-				text-align: center;
-				padding-top: 40rpx;
-				padding-bottom: 20rpx;
-			}
-
-			.user-list {
-				display: flex;
-				justify-content: flex-start;
-				align-items: center;
-				overflow-x: auto;
-
-				.user-list-box {
-					width: 140rpx;
-					padding: 20rpx;
-					text-align: center;
-
-					image {
-						width: 100rpx;
-						height: 100rpx;
-						border-radius: 100rpx;
-					}
-
-					text {
-						font-size: 24rpx;
-						color: #1E1E1E;
-						text-align: center;
-					}
-				}
-			}
-		}
-
-		.middle {
-			text-align: center;
-			height: calc(100vh - 248rpx);
-			padding-top: 40rpx;
-
-			text {
-				font-weight: bold;
-				font-size: 14px;
-				display: block;
-			}
-
-			image {
-				width: 40rpx;
-				height: 40rpx;
-			}
-		}
+<style lang="scss">
+	.container{
+		font-family:‘Franklin Gothic Medium’, ‘Arial Narrow’, Arial, sans-serif;
 	}
 </style>
diff --git a/pages/userInfo/notice/notice.vue b/pages/userInfo/notice/notice.vue
index 4a8ea0d..2c88f17 100644
--- a/pages/userInfo/notice/notice.vue
+++ b/pages/userInfo/notice/notice.vue
@@ -5,176 +5,8 @@
 </template>
 
 <script>
-	// export default {
-	// 	data() {
-	// 		return {
-	// 			hotCreatorList: [],
-	// 			isTarget: true,
-	// 			showChoiceness:false
-	// 		}
-	// 	},
-	// 	// 下拉刷新
-	// 	onPullDownRefresh() {
-	// 		this.showChoiceness = false
-	// 		uni.stopPullDownRefresh()
-	// 	},
-	// 	created() {
-	// 		const userInfo = uni.getStorageSync('userInfo')
-	// 		if (!userInfo) {
-	// 			console.log('havent userInfo')
-	// 			this.getUserInfo()
-	// 		} else {
-	// 			console.log('have userInfo')
-	// 		}
-	// 	},
-	// 	onPageScroll(e) {
-	// 		// 传入scrollTop值并触发所有easy-loadimage组件下的滚动监听事件
-
-	// 		if (e.scrollTop > 160) {
-	// 			this.showChoiceness = true
-	// 			// uni.redirectTo({
-	// 			// 	url: '../index/choiceness'
-	// 			// })
-	// 		}
-	// 	},
-	// 	methods: {
-	// 		// 搜索
-	// 		search(res) {
-	// 			if (res.value) {
-	// 				console.log('search', res.value)
-	// 				this.goCreatorDetail(res.value)
-	// 			} else {
-	// 				uni.showToast({
-	// 					title: '请输入艺术家代号',
-	// 					icon: 'none'
-	// 				})
-	// 			}
-
-	// 		},
-	// 		// 获取用户信息
-	// 		getUserInfo() {
-	// 			wx.login({
-	// 				force: true,
-	// 				success: res => {
-	// 					wx.getUserInfo({
-	// 						withCredentials: true,
-	// 						success: userInfo => {
-	// 							const params = {
-	// 								code: res.code,
-	// 								encryptedData: userInfo.encryptedData,
-	// 								iv: userInfo.iv
-	// 							}
-	// 							// 用户授权登录
-	// 							console.log('params',params);
-	// 							loginWx(params).then(res => {
-	// 								if (res.data.code === 200) {
-	// 									uni.setStorage({
-	// 										key: 'userInfo',
-	// 										data: res.data.data.userInfo, 
-	// 									})
-	// 								} else {
-	// 									uni.showToast({
-	// 										title: res.data.msg,
-	// 										icon: 'none'
-	// 									})
-	// 								}
-	// 							}).catch(res => {})
-	// 							console.log(`getUserInfo 调用成功`, userInfo);
-	// 						},
-	// 						fail(userInfo) {
-	// 							console.log(`getUserInfo 调用失败`);
-	// 						},
-	// 					});
-	// 				},
-	// 				fail(res) {
-	// 					console.log(`login 调用失败`);
-	// 				},
-	// 			});
-
-	// 		},
-			
-			
-	// 		// 滚动监听
-	// 		handleScroll() {
-	// 			let scrollTop = window.pageYOffset || document.documentElement.scrollTop || document.body.scrollTop
-	// 			console.log(scrollTop)
-	// 		},
-	// 	},
-	// }
-</script>
-
-<style lang="less">
-	.container {
-		.top {
-			width: 100vw;
-
-			image {
-				width: 100vw;
-				height: 400rpx;
-			}
-
-			.uni-searchbar {
-				border: 1px solid #11A8FD;
-				margin: 0 40rpx;
-				border-radius: 16rpx;
-				padding: 0;
-
-				.uni-searchbar__box {
-					padding: 0;
-					border-radius: 16rpx !important;
-				}
-			}
-
-			>text {
-				font-weight: bold;
-				font-size: 14px;
-				display: block;
-				text-align: center;
-				padding-top: 40rpx;
-				padding-bottom: 20rpx;
-			}
-
-			.user-list {
-				display: flex;
-				justify-content: flex-start;
-				align-items: center;
-				overflow-x: auto;
-
-				.user-list-box {
-					width: 140rpx;
-					padding: 20rpx;
-					text-align: center;
-
-					image {
-						width: 100rpx;
-						height: 100rpx;
-						border-radius: 100rpx;
-					}
-
-					text {
-						font-size: 24rpx;
-						color: #1E1E1E;
-						text-align: center;
-					}
-				}
-			}
-		}
-
-		.middle {
-			text-align: center;
-			height: calc(100vh - 248rpx);
-			padding-top: 40rpx;
-
-			text {
-				font-weight: bold;
-				font-size: 14px;
-				display: block;
-			}
+	
+</style>
 
-			image {
-				width: 40rpx;
-				height: 40rpx;
-			}
-		}
-	}
+<style lang="scss">
 </style>
diff --git a/pages/userInfo/userInfo.vue b/pages/userInfo/userInfo.vue
index 102e434..a69f714 100644
--- a/pages/userInfo/userInfo.vue
+++ b/pages/userInfo/userInfo.vue
@@ -3,25 +3,35 @@
 		<view class="top">
 			<uni-notice-bar show-get-more show-icon more-text="查看更多" text="年末大礼：uni-app1.4 新增百度、支付宝小程序。插件市场重磅上线！"
 				@getmore="getMore" />
-			<uni-notice-bar show-icon scrollable
-				text="uni-app 版正式发布，开发一次，同时发布iOS、Android、H5、微信小程序、支付宝小程序、百度小程序、头条小程序等7大平台。" />
+		</view>
+		<view class="my-message">
+			<view class="left">
+				<image :src="userInfo.img" mode=""></image>
+			</view>
+			<view class="right">
+				{{userInfo.username}}
+			</view>
 		</view>
 		<view class="middle">
-			<uni-section title="我的資金" type="line" padding>
-				<text>錢包餘額</text>
+			<uni-section title="我的资金" type="line" padding>
+				<uni-group mode="card">
+					<view>啦啦啦</view>
+				</uni-group>
 			</uni-section>
 		</view>
 		<view class="foot">
-			<uni-section title="更多服務" type="line" padding>
-						<uni-grid :column="4" :highlight="true" @change="change">
-							<uni-grid-item v-for="(item, index) in list" :index="index" :key="index">
-								<view class="grid-item-box" style="background-color: #fff;" >
-									<uni-icons type="image" :size="30" color="#777" />
-									<text class="text">{{item}}</text>
-								</view>
-							</uni-grid-item>
-						</uni-grid>
-					</uni-section>
+			<uni-section title="更多服务" type="line">
+				<uni-group mode="card">
+					<uni-grid :column="3" @change="change" :showBorder="false" :square="true">
+						<uni-grid-item v-for="(item, index) in list" :index="index" :key="index">
+							<view class="grid-item-box" style="background-color: #fff;">
+								<uni-icons type="image" :size="30" color="#777" />
+								<text class="text">{{item.title}}</text>
+							</view>
+						</uni-grid-item>
+					</uni-grid>
+				</uni-group>
+			</uni-section>
 		</view>
 	</view>
 </template>
@@ -30,35 +40,79 @@
 	export default {
 		data() {
 			return {
-				list:['美團外賣','支付助手','廣告助手','上傳圖片','消息通知','我的信息','我的短信','我的頭像']
+				list:[{
+					url: '/pages/userInfo/about/about',
+					title: '关于节点',
+					img: ''
+				},{
+					url: '/pages/userInfo/contact/contact',
+					title: '联系我们',
+					img: ''
+				},{
+					url: '/pages/userInfo/extends/extends',
+					title: '邀请他人',
+					img: ''
+				},{
+					url: '/pages/userInfo/inviteLog/inviteLog',
+					title: '邀请记录',
+					img: ''
+				},{
+					url: '/pages/userInfo/notice/notice',
+					title: '通知公告',
+					img: ''
+				},{
+					url: '/pages/userInfo/withdraw/withdraw',
+					title: '提现记录',
+					img: ''
+				}],
+				pageUrl: ''
 			}
 		},
 		methods: {
 			change(e) {
-				// this.index = e.detail.index
 				let {
 					index
 				} = e.detail
 				this.list[index].badge && this.list[index].badge++
-
-				uni.showToast({
-					title: `点击第${index+1}个宫格`,
-					icon: 'none'
-				})
+				this.pageUrl = this.list[index].url
+				console.log('this.pageUrl',this.pageUrl)
+				/** 跳转指定页面*/
+				uni.navigateTo({
+					url: this.pageUrl
+				});
 			},
 		},
 	}
 </script>
 
 <style lang="scss">
-	.middle {
-		margin-top: 80px;
+	.container{
+		font-family:‘Franklin Gothic Medium’, ‘Arial Narrow’, Arial, sans-serif;
 	}
-
-	.foot {
-		margin-top: 80px;
+	.my-message {
+		display: flex;
+		justify-content: flex-start;
+		align-items: center;
+		padding: 20rpx;
+	
+		.left {
+			width: 100rpx;
+			height: 100rpx;
+			margin-right: 20rpx;
+	
+			>image {
+				width: 100%;
+				height: 100%;
+				border-radius: 50%;
+			}
+		}
+	
+		.right {
+			font-size: 12px;
+		}
 	}
 
+
 	// .container {
 	// 	.top {
 	// 		width: 100vw;