diff --git a/components/complaint-item/index.vue b/components/complaint-item/index.vue
new file mode 100644
index 0000000..25f71c1
--- /dev/null
+++ b/components/complaint-item/index.vue
@@ -0,0 +1,69 @@
+<template>
+	<view class="item">
+		<image></image>
+		<view class="people">
+			<view class="status">已受理</view>
+			<view class="goods-name u-line-1">心机小黑裙连衣裙赫本风夏季爆款...</view>
+			<view class="info">
+				<view class="name">骑手：李先生</view>
+				<view class="price">￥199.9</view>
+			</view>
+		</view>
+	</view>
+</template>
+<script>
+export default {
+	data() {
+		return {}
+	},
+	methods: {
+	},
+};
+</script>
+<style lang="scss" scoped>
+.item {
+	width: 690rpx;
+	height: 220rpx;
+	background: rgba(255,255,255,1);
+	border-radius: 10rpx;
+	padding: 30rpx;
+	display: flex; 
+	align-items: center;
+	margin-bottom: 20rpx;
+	> image {
+		width: 160rpx;
+		height: 160rpx;
+		flex-shrink: 0;
+		margin-right: 25rpx;
+		background-color: aqua;
+	}
+	.people {
+		.status {
+			text-align: right;
+			font-size: 26rpx;
+			color: rgba(255,49,49,1);
+			margin-bottom: 30rpx;
+		}
+		.goods-name {
+			width: 439rpx;
+			font-size: 28rpx;
+			color: rgba(51,51,51,1);
+			margin-bottom: 30rpx;
+		}
+		.info {
+			display: flex;
+			align-items: center;
+			font-size: 26rpx;
+			color: rgba(102,102,102,1);
+			.name {
+				font-size: 26rpx;
+				color: rgba(101,101,101,1);
+				margin-right: auto;
+			}
+			.price {
+				color: #FF780F;
+			}
+		}
+	}
+}
+</style>
\ No newline at end of file
diff --git a/components/content-item/index.vue b/components/content-item/index.vue
new file mode 100644
index 0000000..b67ae4b
--- /dev/null
+++ b/components/content-item/index.vue
@@ -0,0 +1,124 @@
+<template>
+	<view class="content-item">
+		<view class="image">
+			<image class="cover"></image>
+			<image src="/static/image/user/5.png" class="play-icon" v-if="cur==1"></image>
+		</view>
+		<view class="right" @click="toDetailsPage">
+			<u-icon name="close" color="#999999" size="27" @click.stop="showPopup"></u-icon>
+			<view class="tags u-line-2">#配饰就该这么搭#</view>
+			<view class="data">
+				<view>
+					<image src="/static/image/user/2.png"></image>
+					<text>2.5w</text>
+				</view>
+				<view>
+					<image src="/static/image/user/3.png"></image>
+					<text>2.5w</text>
+				</view>
+				<view>
+					<image src="/static/image/user/4.png"></image>
+					<text>2.5w</text>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+<script>
+export default {
+	data() {
+		return {}
+	},
+	props: {
+		cur: [Number, String],
+		delItem: {
+			type: Function,
+			default: null
+		}
+	},
+	methods: {
+		showPopup() {
+			this.delItem();
+		},
+		toDetailsPage() {
+			uni.navigateTo({
+				url: '/pages/user/contentDetails?current=' + this.cur
+			});
+		}
+	},
+};
+</script>
+<style lang="scss" scoped>
+.content-item {
+	display: flex;
+	padding: 30rpx;
+	background-color: #FFFFFF;
+	margin-bottom: 2rpx;
+	.image {
+		margin-right: 25rpx;
+		position: relative;
+		.cover {
+			width: 160rpx;
+			height: 160rpx;
+			border-radius: 10rpx;
+			background-color: aqua;
+			flex-shrink: 0;
+		}
+		.play-icon {
+			position: absolute;
+			top: 50%;
+			left: 50%;
+			transform: translate(-50%, -50%);
+			width: 58rpx;
+			height: 58rpx;
+			z-index: 9;
+		}
+	}
+	.right {
+		flex: 1;
+		display: flex;
+		flex-direction: column;
+		.u-icon {
+			justify-content: flex-end;
+		}
+		.tags {
+			margin: 10rpx 0 auto;
+			font-size: 28rpx;
+			color: rgba(51,51,51,1);
+		}
+		.data {
+			margin-bottom: 10rpx;
+			display: flex;
+			align-items: center;
+			justify-content: flex-end;
+			@mixin image-class($width) {
+				> image {
+					width: $width;
+					height: 26rpx;
+					margin-right: 20rpx;
+				}
+			}
+			> view {
+				display: flex;
+				align-items: center;
+				&:not(:last-child) {
+					margin-right: 35rpx;
+				}
+				&:first-child {
+					@include image-class(31rpx);
+				}
+				&:nth-child(2) {
+					@include image-class(26rpx);
+				}
+				&:last-child {
+					@include image-class(20rpx);
+				}
+				> text {
+					font-size: 24rpx;
+					color: rgba(51,51,51,1);
+				}
+			}
+		}
+	}
+}
+</style>
\ No newline at end of file
diff --git a/components/fans-item/index.vue b/components/fans-item/index.vue
new file mode 100644
index 0000000..20b890d
--- /dev/null
+++ b/components/fans-item/index.vue
@@ -0,0 +1,41 @@
+<template>
+	<view class="fans-item">
+		<image></image>
+		<view class="name">兽兽</view>
+		<view class="date">2017-10-14</view>
+	</view>
+</template>
+<script>
+export default {
+	data() {
+		return {}
+	}
+};
+</script>
+<style lang="scss" scoped>
+.fans-item {
+	width: 750rpx;
+	height: 100rpx;
+	background: rgba(255,255,255,1);
+	padding: 0 30rpx;
+	display: flex;
+	align-items: center;
+	margin-bottom: 2rpx;
+	> image {
+		width: 70rpx;
+		height: 70rpx;
+		border-radius: 10rpx;
+		background-color: aqua;
+		margin-right: 30rpx;
+	}
+	.name {
+		font-size: 28rpx;
+		color: rgba(51,51,51,1);
+		margin-right: auto;
+	}
+	.date {
+		font-size: 24rpx;
+		color: rgba(153,153,153,1);
+	}
+}
+</style>
\ No newline at end of file
diff --git a/components/user/navs.vue b/components/user/navs.vue
deleted file mode 100644
index 5c63d71..0000000
--- a/components/user/navs.vue
+++ /dev/null
@@ -1,29 +0,0 @@
-<template>
-    <view class="nav">
-        <text>dsadasdas</text>
-        <image></image>
-    </view>
-</template>
-<script>
-export default {
-    name:"navs"    
-}
-</script>
-<style lang="scss" scoped>
-.nav{
-    width: 100%;
-    height: 100rpx;
-    display: flex;
-    padding: 30rpx;
-    align-items: center;
-    justify-content: space-between;
-    font-size: 30rpx;
-    margin-bottom: 2rpx;
-    color:#333;
-    background-color: #fff;
-    >image{
-        width: 13rpx;
-        height: 25rpx;
-    }
-}
-</style>
\ No newline at end of file
diff --git a/pages.json b/pages.json
index b5d3be8..014ac12 100644
--- a/pages.json
+++ b/pages.json
@@ -100,6 +100,77 @@
 					}
 				}
 			}
+		},
+		{
+			"path": "pages/user/updatePassword",
+			"style": {
+				"navigationBarTitleText": "修改密码",
+				"app-plus": {
+                    "titleNView": {
+						"backgroundColor": "#FFFFFF",
+                        "titleColor": "#333333"
+					}
+				}
+			}
+		},
+		{
+			"path": "pages/user/fans",
+			"style": {
+				"navigationBarTitleText": "我的粉丝",
+				"app-plus": {
+                    "titleNView": {
+						"backgroundColor": "#FFFFFF",
+                        "titleColor": "#333333"
+					}
+				}
+			}
+		},
+		{
+			"path": "pages/user/content",
+			"style": {
+				"navigationBarTitleText": "内容管理",
+				"app-plus": {
+                    "titleNView": {
+						"backgroundColor": "#FFFFFF",
+                        "titleColor": "#333333"
+					}
+				}
+			}
+		},
+		{
+			"path": "pages/user/contentDetails",
+			"style": {
+				"app-plus": {
+                    "titleNView": {
+						"backgroundColor": "#FFFFFF",
+                        "titleColor": "#333333"
+					}
+				}
+			}
+		},
+		{
+			"path": "pages/user/complaint",
+			"style": {
+				"navigationBarTitleText": "骑手投诉",
+				"app-plus": {
+                    "titleNView": {
+						"backgroundColor": "#FFFFFF",
+                        "titleColor": "#333333"
+					}
+				}
+			}
+		},
+		{
+			"path": "pages/user/complaintDetails",
+			"style": {
+				"navigationBarTitleText": "骑手投诉详情",
+				"app-plus": {
+                    "titleNView": {
+						"backgroundColor": "#FFFFFF",
+                        "titleColor": "#333333"
+					}
+				}
+			}
 		}
 	],
 	"globalStyle": {
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 59639b6..a2d490d 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -277,7 +277,6 @@ export default {
 			height: 36rpx;
 			flex-shrink: 0;
 			margin-bottom: 2rpx;
-			background-color: aqua;
 		}
 		.text {
 			font-size: 20rpx;
diff --git a/pages/user/complaint.vue b/pages/user/complaint.vue
new file mode 100644
index 0000000..89a0f59
--- /dev/null
+++ b/pages/user/complaint.vue
@@ -0,0 +1,32 @@
+<template>
+	<view class="complaint">
+		<view class="complaint-item" v-for="(item, index) in 4" :key="index" @click="toDetailsPage">
+			<ComplaintItem></ComplaintItem>
+		</view>
+	</view>
+</template>
+<script>
+import ComplaintItem from '@/components/complaint-item/index'
+export default {
+	data() {
+		return {}
+	},
+	components: {
+		ComplaintItem
+	},
+	methods: {
+		toDetailsPage() {
+			uni.navigateTo({
+				url: '/pages/user/complaintDetails'
+			});
+		}
+	},
+};
+</script>
+<style lang="scss" scoped>
+.complaint {
+	min-height: calc(100vh - var(--window-top));
+	background-color: #ECECEC;
+	padding: 20rpx 30rpx;
+}
+</style>
\ No newline at end of file
diff --git a/pages/user/complaintDetails.vue b/pages/user/complaintDetails.vue
new file mode 100644
index 0000000..fb6474b
--- /dev/null
+++ b/pages/user/complaintDetails.vue
@@ -0,0 +1,117 @@
+<template>
+	<view class="details">
+		<view class="goods-info">
+			<image></image>
+			<view class="text">
+				<view class="name u-line-1">心机小黑裙连衣裙赫本风夏季爆款dlk...</view>
+				<view class="num">共一件商品</view>
+			</view>
+		</view>
+		<view class="worker-info">
+			<view class="title">骑手信息</view>
+			<view class="item">
+				<view>
+					<view class="item-title">姓名</view>
+					<view class="value">李先生</view>
+				</view>
+				<view>
+					<view class="item-title">手机号</view>
+					<view class="value">1561</view>
+				</view>
+				<view>
+					<view class="item-title">公司名称</view>
+					<view class="value">申通快递公司</view>
+				</view>
+			</view>
+		</view>
+		<view class="reason">
+			<view class="title">投诉原因</view>
+			<view class="value u-line-4">太慢了太慢了！！！！</view>
+		</view>
+	</view>
+</template>
+<script>
+export default {
+	data() {
+		return {}
+	}
+};
+</script>
+<style lang="scss" scoped>
+.details {
+	min-height: calc(100vh - var(--window-top));
+	background-color: #ECECEC;
+	.goods-info {
+		padding: 30rpx;
+		margin: 2rpx 0 20rpx;
+		background-color: #FFFFFF;
+		display: flex;
+		align-items: center;
+		> image {
+			width: 160rpx;
+			height: 160rpx;
+			background-color: aqua;
+			border-radius: 10rpx;
+			margin-right: 25rpx;
+		}
+		.text {
+			.name {
+				width: 440rpx;
+				font-size: 28rpx;
+				color: rgba(51,51,51,1);
+				margin-bottom: 35rpx;
+			}
+			.num {
+				font-size: 26rpx;
+				color: rgba(102,102,102,1);
+			}
+		}
+	}
+	.worker-info {
+		padding: 30rpx;
+		background-color: #FFFFFF;
+		margin-bottom: 20rpx;
+		.title {
+			font-size: 30rpx;
+			font-weight: 500;
+			color: rgba(51,51,51,1);
+			margin-bottom: 60rpx;
+		}
+		.item {
+			> view {
+				display: flex;
+				align-items: center;
+				color: rgba(51,51,51,1);
+				&:not(:last-child) {
+					margin-bottom: 60rpx;
+				}
+				.item-title {
+					width: 120rpx;
+					margin-right: 40rpx;
+					font-size: 30rpx;
+				}
+				.value {
+					font-size: 26rpx;
+				}
+			}
+		}
+	}
+	.reason {
+		padding: 30rpx {
+			bottom: 60rpx;
+		};
+		background-color: #FFFFFF;
+		.title {
+			font-size: 30rpx;
+			font-weight: 500;
+			color: rgba(51,51,51,1);
+			margin-bottom: 60rpx;
+		}
+		.value {
+			font-size: 26rpx;
+			color: rgba(51,51,51,1);
+			line-height: 36rpx;
+		}
+	}
+}
+</style>
\ No newline at end of file
diff --git a/pages/user/content.vue b/pages/user/content.vue
new file mode 100644
index 0000000..70b13fe
--- /dev/null
+++ b/pages/user/content.vue
@@ -0,0 +1,109 @@
+<template>
+	<view class="content">
+		<view class="tab-swiper">
+			<u-tabs-swiper ref="uTabs" :list="list" :current="current" @change="tabsChange" active-color="#FF780F" inactive-color="#333333" font-size="30" gutter="317" height="98" :show-bar="false" swiperWidth="750" :is-scroll=false></u-tabs-swiper>
+		</view>
+		<swiper :current="swiperCurrent" @animationfinish="animationfinish">
+			<swiper-item class="swiper-item">
+				<scroll-view scroll-y style="height: 100%;width: 100%;" class="list">
+					<view v-for="(item, index) in 5" :key="index">
+						<ContentItem :cur="current" :delItem="showPopup"></ContentItem>
+					</view>
+				</scroll-view>
+			</swiper-item>
+			<swiper-item class="swiper-item">
+				<scroll-view scroll-y style="height: 100%;width: 100%;" class="video-list">
+					<view v-for="(item, index) in 5" :key="index">
+						<ContentItem :cur="current" :delItem="showPopup"></ContentItem>
+					</view>
+				</scroll-view>
+			</swiper-item>
+		</swiper>
+		<u-popup v-model="show" mode="center">
+			<view class="close-popup">
+				<view class="tips">确定要删除该视频吗</view>
+				<view class="btn">
+					<view class="cancel" @click="show=false">取消</view>
+					<view class="confirm">确定</view>
+				</view>
+			</view>
+		</u-popup>
+	</view>
+</template>
+<script>
+import ContentItem from '@/components/content-item/index'
+export default {
+	data() {
+		return {
+			show: false,
+			current: 0,
+			swiperCurrent: 0,
+			list: [{
+				name: '图文'
+			}, {
+				name: '视频'
+			}],
+		}
+	},
+	components: {
+		ContentItem
+	},
+	methods: {
+		showPopup() {
+			this.show = true;
+		},
+		tabsChange(index) {
+			this.swiperCurrent = index;
+		},
+		animationfinish(e) {
+			let current = e.detail.current;
+			// this.$refs.uTabs.setFinishCurrent(current);
+			this.swiperCurrent = current;
+			this.current = current;
+		},
+	},
+};
+</script>
+<style lang="scss" scoped>
+.content {
+	min-height: calc(100vh - var(--window-top));
+	background-color: #ECECEC;
+	display: flex;
+	flex-direction: column;
+	> uni-swiper {
+		flex: 1;
+	}
+	.tab-swiper {
+		margin: 2rpx 0 20rpx 0;
+	}
+	.close-popup {
+		background:rgba(255,255,255,1);
+		border-radius: 10rpx;
+		.tips {
+			width: 420rpx;
+			font-size: 28rpx;
+			color: rgba(102,102,102,1);
+			text-align: center;
+			padding: 38rpx 0;
+		}
+		.btn {
+			width: 420rpx;
+			border-top: 2rpx #ECECEC solid;
+			display: flex;
+			> view {
+				font-size: 26rpx;
+				flex: 1;
+				line-height: 98rpx;
+				text-align: center;
+			}
+			.cancel {
+				color: #333333;
+				border-right: 2rpx #ECECEC solid;
+			}
+			.confirm {
+				color: #FF780F;
+			}
+		}
+	}
+}
+</style>
\ No newline at end of file
diff --git a/pages/user/contentDetails.vue b/pages/user/contentDetails.vue
new file mode 100644
index 0000000..3650a28
--- /dev/null
+++ b/pages/user/contentDetails.vue
@@ -0,0 +1,173 @@
+<template>
+	<view class="details">
+		<view class="main"></view>
+		<view></view>
+		<view class="data-list">
+			<view>
+				<image src="/static/image/user/2.png"></image>
+				<text>2.5w</text>
+			</view>
+			<view>
+				<image src="/static/image/user/3.png" v-if="0"></image>
+				<image src="/static/image/user/7.png" v-else></image>
+				<text>2.5w</text>
+			</view>
+			<view>
+				<image src="/static/image/user/4.png" v-if="0"></image>
+				<image src="/static/image/user/6.png" v-else></image>
+				<text>2.5w</text>
+			</view>
+		</view>
+		<view class="comment-list">
+			<view class="item" v-for="(item, index) in 4" :key="index">
+				<view class="info">
+					<image></image>
+					<view class="center">
+						<view class="name">用户1</view>
+						<view class="time">6小时前</view>
+					</view>
+					<view class="btn" @click="showChat=true">回复</view>
+				</view>
+				<view class="content u-line-1">德铭阳光赞德铭阳光赞德铭阳光赞</view>
+			</view>
+		</view>
+		<u-popup v-model="showChat" mode="bottom" :mask=false>
+			<view class="chat">
+				<view class="input-box">
+					<input type="text">
+					<view class="btn">发送</view>
+				</view>
+			</view>
+		</u-popup>
+	</view>
+</template>
+<script>
+export default {
+	data() {
+		return {
+			showChat: false
+		}
+	},
+	onLoad(option) {
+		this.setNavTitle(option.current);
+	},
+	methods: {
+		setNavTitle(current) {
+			uni.setNavigationBarTitle({
+				title: current == 0 ? "图文详情" : "视频详情"
+			});
+		}
+	},
+};
+</script>
+<style lang="scss" scoped>
+.details {
+	min-height: calc(100vh - var(--window-top));
+	background-color: #ECECEC;
+	.main {
+		height: 740rpx;
+		margin: 2rpx 0rpx; 
+		background-color: #FFFFFF;
+	}
+	.comment-list {
+		.item {
+			background-color: #FFFFFF;
+			padding: 30rpx;
+			margin-bottom: 2rpx;
+			.info {
+				display: flex;
+				align-items: flex-end;
+				margin-bottom: 20rpx;
+				> image {
+					width: 60rpx;
+					height: 60rpx;
+					border-radius: 50%;
+					margin-right: 20rpx;
+					background-color: aqua;
+				}
+				.center {
+					margin-right: auto;
+					.name {
+						font-size: 26rpx;
+						color: rgba(51,51,51,1);
+						margin-bottom: auto;
+					}
+					.time {
+						font-size: 22rpx;
+						color: rgba(153,153,153,1);
+					}
+				}
+				.btn {
+					font-size: 26rpx;
+					color: rgba(51,51,51,1);
+				}
+			}
+			.content {
+				margin-left: 80rpx;
+				display: flex;
+			}
+		}
+	}
+	.data-list {
+		background-color: #FFFFFF;
+		display: flex;
+		height: 88rpx;
+		padding: 0 30rpx;
+		align-items: center;
+		justify-content: space-between;
+		@mixin image-class($width) {
+			> image {
+				width: $width;
+				height: 40rpx;
+				margin-right: 20rpx;
+			}
+		}
+		> view {
+			display: flex;
+			align-items: center;
+			&:first-child {
+				@include image-class(45rpx);
+			}
+			&:nth-child(2) {
+				@include image-class(40rpx);
+			}
+			&:last-child {
+				@include image-class(32rpx);
+			}
+			> text {
+				font-size: 28rpx;
+				color: rgba(51,51,51,1);
+			}
+		}
+	}
+	.chat {
+		background-color: #ECECEC;
+		width: 100%;
+		height: 98rpx;
+		padding: 19rpx 30rpx;
+		.input-box {
+			background-color: #FFFFFF;
+			width: 690rpx;
+			height: 60rpx;
+			background: rgba(255,255,255,1);
+			border-radius: 30rpx;
+			display: flex;
+			align-items: center;
+			> input {
+				flex: 1;
+				padding: 10rpx 30rpx;
+			}
+			.btn {
+				width: 90rpx;
+				background: rgba(255,120,15,1);
+				border-radius: 25rpx;
+				font-size: 26rpx;
+				color: rgba(255,255,255,1);
+				line-height: 50rpx;
+				text-align: center;
+				margin-right: 5rpx;
+			}
+		}
+	}
+}
+</style>
\ No newline at end of file
diff --git a/pages/user/fans.vue b/pages/user/fans.vue
new file mode 100644
index 0000000..727509d
--- /dev/null
+++ b/pages/user/fans.vue
@@ -0,0 +1,44 @@
+<template>
+	<view class="fans">
+		<view class="lately">
+			<view class="title">最新</view>
+			<view class="items">
+				<view v-for="(item, index) in 3" :key="index">
+					<FansItem></FansItem>
+				</view>
+			</view>
+		</view>
+		<view class="before">
+			<view class="title">早前</view>
+			<view class="items">
+				<view v-for="(item, index) in 13" :key="index">
+					<FansItem></FansItem>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+<script>
+import FansItem from '@/components/fans-item/index'
+export default {
+	data() {
+		return {}
+	},
+	components: {
+		FansItem
+	}
+};
+</script>
+<style lang="scss" scoped>
+.fans {
+	min-height: calc(100vh - var(--window-top));
+    background: #ececec;
+	.lately, .before {
+		.title {
+			font-size: 26rpx;
+			color:rgba(101,101,101,1);
+			padding: 20rpx 30rpx;
+		}
+	}
+}
+</style>
\ No newline at end of file
diff --git a/pages/user/index.vue b/pages/user/index.vue
index 7c8d3c5..8a7425a 100644
--- a/pages/user/index.vue
+++ b/pages/user/index.vue
@@ -1,37 +1,46 @@
 <template>
     <view class="user">
-        <view class="head">
+        <view class="head" @click="toOthersPage('info')">
             <view class="info">
                 <image></image>
                 <view class="name">
                     <text>萨大赛</text>
-                    <text>dasasd</text>
-                    <text>asdasd</text>
+                    <text>账号：123456789</text>
+                    <text>个性签名：为梦努力</text>
                 </view>
             </view>
-            <image></image>
+            <image src="/static/image/user/1.png"></image>
         </view>
-        <navs></navs>
-        <navs></navs>
-        <navs></navs>
+        <view class="nav" @click="toOthersPage('fans')">
+			<text>我的粉丝</text>
+			<image src="/static/image/user/1.png"></image>
+		</view>
+		<view class="nav" @click="toOthersPage('content')">
+			<text>内容管理</text>
+			<image src="/static/image/user/1.png"></image>
+		</view>
+		<view class="nav" @click="toOthersPage('complaint')">
+			<text>骑手投诉</text>
+			<image src="/static/image/user/1.png"></image>
+		</view>
     </view>
 </template>
 <script>
-import navs from "@/components/user/navs"
 export default {
-    name:"user" ,
-    components:{
-        navs
-    }  
+	name:"user",
+	methods: {
+		toOthersPage(url) {
+			uni.navigateTo({
+				url: '/pages/user/' + url
+			});
+		}
+	},
 }
 </script>
 <style lang="scss" scoped>
-/deep/image{
-    background-color: #0f0;
-}
-
 .user{
-    background-color: #ececec;
+    min-height: calc(100vh - var(--window-top));
+    background: #ececec;
     .head{
         width: 100%;
         height: 220rpx;
@@ -48,6 +57,7 @@ export default {
                 width: 110rpx;
                 height: 110rpx;
                 border-radius: 50%;
+				background-color: #0f0;
             }
             .name{
                 font-size: 24rpx;
@@ -70,5 +80,21 @@ export default {
             height: 20rpx;
         }
     }
+	.nav{
+		width: 100%;
+		height: 100rpx;
+		display: flex;
+		padding: 30rpx;
+		align-items: center;
+		justify-content: space-between;
+		font-size: 30rpx;
+		margin-bottom: 2rpx;
+		color:#333;
+		background-color: #fff;
+		>image{
+			width: 13rpx;
+			height: 25rpx;
+		}
+	}
 }
 </style>
\ No newline at end of file
diff --git a/pages/user/info.vue b/pages/user/info.vue
index b78fd0a..f6e4db7 100644
--- a/pages/user/info.vue
+++ b/pages/user/info.vue
@@ -1,25 +1,59 @@
 <template>
     <view class="info">
-        <view class="head">
+        <view class="head" @click="showImage=true">
             <image></image>
             <text>更换头像</text>
         </view>
         <view class="item">
-            <text></text>
-            <text></text>
+            <text class="title">用户名</text>
+            <text class="value">兽兽</text>
         </view>
+		<view class="item">
+            <text class="title">个性签名</text>
+            <text class="value">变瘦变高变有钱</text>
+        </view>
+		<view class="password" @click="updatePwd">
+			<text>修改密码</text>
+			<image src="/static/image/user/1.png"></image>
+		</view>
+		<u-popup v-model="showImage" mode="bottom">
+			<view class="image-popup">
+				<view @click="chooseImage('camera')">拍摄新照片</view>
+				<view @click="chooseImage('album')">从相册选取</view>
+			</view>
+		</u-popup>
     </view>
 </template>
 <script>
 export default {
-    name:"info"    
+    name:"info",
+	data() {
+		return {
+			showImage: false
+		}
+	},
+	methods: {
+		chooseImage(sourceType) {
+			uni.chooseImage({
+				count: 1,
+				sizeType: ['original', 'compressed'], //可以指定是原图还是压缩图，默认二者都有
+				sourceType: [sourceType],
+				success: function (res) {
+					console.log(JSON.stringify(res.tempFilePaths));
+				}
+			});
+		},
+		updatePwd() {
+			uni.navigateTo({
+				url: '/pages/user/updatePassword'
+			});
+		}
+	},
 }
 </script>
 <style lang="scss" scoped>
-image{
-    background-color: #0f0;
-}
 .info{
+	min-height: calc(100vh - var(--window-top));
     background: #ececec;
     .head{
         height: 202rpx;
@@ -28,10 +62,12 @@ image{
         align-items: center;
         justify-content: center;
         background-color: #fff;
+		margin-bottom: 2rpx;
         >image{
             width: 120rpx;
             height: 120rpx;
             border-radius: 50%;
+			background-color: #0f0;
         }
         >text{
             font-size: 24rpx;
@@ -40,6 +76,52 @@ image{
         }
         margin-bottom: 2rpx;
     }
-
+	.item {
+		display: flex;
+		align-items: center;
+		height: 98rpx;
+		background: rgba(255,255,255,1);
+		padding: 0 30rpx;
+		margin-bottom: 2rpx;
+		.title {
+			width: 120rpx;
+			font-size: 30rpx;
+			color: rgba(51,51,51,1);
+			margin-right: 120rpx;
+		}
+		.value {
+			font-size: 30rpx;
+			color: rgba(101,101,101,1);
+		}
+	}
+	.password {
+		margin-top: 20rpx;
+		padding: 0 30rpx;
+		height: 98rpx;
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		background: rgba(255,255,255,1);
+		> text {
+			font-size: 30rpx;
+			color: rgba(51,51,51,1);
+		}
+		> image {
+			width: 11rpx;
+			height: 22rpx;
+		}
+	}
+	.image-popup {
+		padding: 0 30rpx;
+		> view {
+			font-size:　28rpx;
+			color: rgba(51,51,51,1);
+			line-height: 98rpx;
+			text-align: center;
+			&:first-child {
+				border-bottom: 2rpx solid #EBEBEB;
+			}
+		}
+	}
 }
 </style>
\ No newline at end of file
diff --git a/pages/user/updatePassword.vue b/pages/user/updatePassword.vue
new file mode 100644
index 0000000..4ba7d3d
--- /dev/null
+++ b/pages/user/updatePassword.vue
@@ -0,0 +1,60 @@
+<template>
+	<view class="password">
+		<view class="form-class">
+			<u-form :model="model" ref="uForm">
+				<u-form-item label="原密码" label-width="160" prop="password">
+					<u-input type="password" :password="true" v-model="model.password" placeholder="请输入原密码"></u-input>
+				</u-form-item>
+				<u-form-item label="新密码" label-width="160" prop="newPassword">
+					<u-input type="password" :password="true" v-model="model.newPassword" placeholder="请输入新密码"></u-input>
+				</u-form-item>
+				 <!-- right-icon="eye-off" -->
+				<u-form-item label="确认新密码" label-width="160" prop="rePassword">
+					<u-input type="password" :password="true" v-model="model.rePassword" placeholder="请再次输入新密码"></u-input>
+				</u-form-item>
+			</u-form>
+		</view>
+		<text class="tips">密码必须是8-16位，至少含数字/字母/字符两种组合</text>
+		<view class="btn">确定</view>
+	</view>
+</template>
+<script>
+export default {
+	data() {
+		return {
+			model: {
+				password: '',
+				newPassword: '',
+				rePassword: ''
+			},
+		}
+	}
+};
+</script>
+<style lang="scss" scoped>
+.password {
+	min-height: calc(100vh - var(--window-top));
+    background: #ececec;
+	.form-class {
+		background-color: #ffffff;
+		padding: 0 30rpx;
+		margin-bottom: 25rpx;
+	}
+	.tips {
+		margin: 0 30rpx;
+		font-size: 24rpx;
+		color: rgba(101,101,101,1);
+	}
+	.btn {
+		margin: 120rpx auto 0;
+		width: 690rpx;
+		height: 98rpx;
+		background: rgba(255,119,15,1);
+		border-radius: 49rpx;
+		line-height: 98rpx;
+		text-align: center;
+		font-size: 36rpx;
+		color: rgba(255,255,255,1);
+	}
+}
+</style>
\ No newline at end of file
diff --git a/static/image/user/1.png b/static/image/user/1.png
new file mode 100644
index 0000000..a00d9a1
Binary files /dev/null and b/static/image/user/1.png differ
diff --git a/static/image/user/2.png b/static/image/user/2.png
new file mode 100644
index 0000000..677f54b
Binary files /dev/null and b/static/image/user/2.png differ
diff --git a/static/image/user/3.png b/static/image/user/3.png
new file mode 100644
index 0000000..4d6b6d5
Binary files /dev/null and b/static/image/user/3.png differ
diff --git a/static/image/user/4.png b/static/image/user/4.png
new file mode 100644
index 0000000..3fe620b
Binary files /dev/null and b/static/image/user/4.png differ
diff --git a/static/image/user/5.png b/static/image/user/5.png
new file mode 100644
index 0000000..cf3ef54
Binary files /dev/null and b/static/image/user/5.png differ
diff --git a/static/image/user/6.png b/static/image/user/6.png
new file mode 100644
index 0000000..f059d34
Binary files /dev/null and b/static/image/user/6.png differ
diff --git a/static/image/user/7.png b/static/image/user/7.png
new file mode 100644
index 0000000..ffa4cd3
Binary files /dev/null and b/static/image/user/7.png differ