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/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 b83611a..664b9b7 100644
--- a/pages.json
+++ b/pages.json
@@ -50,6 +50,42 @@
 					}
 				}
 			}
+		},
+		{
+			"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/complaint",
+			"style": {
+				"navigationBarTitleText": "骑手投诉",
+				"app-plus": {
+                    "titleNView": {
+						"backgroundColor": "#FFFFFF",
+                        "titleColor": "#333333"
+					}
+				}
+			}
 		}
 	],
 	"globalStyle": {
diff --git a/pages/user/complaint.vue b/pages/user/complaint.vue
new file mode 100644
index 0000000..b1107c1
--- /dev/null
+++ b/pages/user/complaint.vue
@@ -0,0 +1,25 @@
+<template>
+	<view class="complaint">
+		<view class="complaint-item" v-for="(item, index) in 4" :key="index">
+			<ComplaintItem></ComplaintItem>
+		</view>
+	</view>
+</template>
+<script>
+import ComplaintItem from '@/components/complaint-item/index'
+export default {
+	data() {
+		return {}
+	},
+	components: {
+		ComplaintItem
+	}
+};
+</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/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..7e9db19 100644
--- a/pages/user/index.vue
+++ b/pages/user/index.vue
@@ -5,33 +5,42 @@
                 <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('fans')">
+			<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..7f97739
--- /dev/null
+++ b/pages/user/updatePassword.vue
@@ -0,0 +1,60 @@
+<template>
+	<view class="password">
+		<view class="form-class">
+			<u-form :model="form" ref="uForm">
+				<u-form-item label="原密码" label-width="160" prop="password" label-style="label-class">
+					<u-input :border="border" 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 :border="border" 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 :border="border" 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/返回@2x.png b/static/image/user/返回@2x.png
new file mode 100644
index 0000000..a00d9a1
Binary files /dev/null and b/static/image/user/返回@2x.png differ