diff --git a/pages.json b/pages.json
index 1bced5a..8ce0b82 100644
--- a/pages.json
+++ b/pages.json
@@ -55,6 +55,18 @@
 				"navigationBarTitleText": "切换小区"
 			}
         }
+        ,{
+            "path" : "pages/userInfo/userInfo",
+            "style" : {
+				"navigationBarTitleText": "个人信息"
+			}
+        }
+        ,{
+            "path" : "pages/changePwd/changePwd",
+            "style" : {
+				"navigationBarTitleText": "修改密码"
+			}
+        }
     ],
 	"globalStyle": {
 		"navigationBarTextStyle": "white",
diff --git a/pages/changePwd/changePwd.vue b/pages/changePwd/changePwd.vue
new file mode 100644
index 0000000..1c360a4
--- /dev/null
+++ b/pages/changePwd/changePwd.vue
@@ -0,0 +1,79 @@
+<template>
+	<view>
+		<form>
+			
+			<view class="cu-form-group margin-top">
+				<view class="title">密码</view>
+				<input placeholder="请输入密码" type="password" name="input" v-model="oldPwd"></input>
+			</view>
+			<view class="cu-form-group ">
+				<view class="title">新密码</view>
+				<input placeholder="请输入新密码" type="password" name="input" v-model="pwd"></input>
+			</view>
+			<view class="cu-form-group ">
+				<view class="title">确认密码</view>
+				<input placeholder="请输入确认密码" type="password" name="input" v-model="newPwd"></input>
+			</view>
+		</form>
+		
+		<view class="padding flex flex-direction">
+			<button class="cu-btn bg-green lg" @tap="_doChangePwd()">提交</button>
+		</view>
+		
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				oldPwd:'',
+				pwd:'',
+				newPwd:''
+			}
+		},
+		methods: {
+			_doChangePwd:function(){
+				let _string = this.java110Util.string;
+				if(_string.isNull(this.oldPwd)){
+					uni.showToast({
+						icon:'none',
+						title:'密码不能为空'
+					});
+					return;
+				}
+				
+				if(_string.isNull(this.pwd)){
+					uni.showToast({
+						icon:'none',
+						title:'新密码不能为空'
+					});
+					return;
+				}
+				
+				if(_string.isNull(this.newPwd)){
+					uni.showToast({
+						icon:'none',
+						title:'确认密码不能为空'
+					});
+					return;
+				}
+				
+				if(this.newPwd != this.pwd){
+					uni.showToast({
+						icon:'none',
+						title:'确认密码和新密码不一致'
+					});
+					return;
+				}
+				
+				
+			}
+			
+		}
+	}
+</script>
+
+<style>
+
+</style>
diff --git a/pages/my/my.vue b/pages/my/my.vue
index 07ee1fd..285a74b 100644
--- a/pages/my/my.vue
+++ b/pages/my/my.vue
@@ -24,6 +24,12 @@
 						<text class="text-grey">个人信息</text>
 					</view>
 				</view>
+				<view class="cu-item arrow" @tap="_changePwd()">
+					<view class="content">
+						<text class="lg text-gray cuIcon-lock"></text>
+						<text class="text-grey">修改密码</text>
+					</view>
+				</view>
 				<view class="cu-item ">
 					<view class="content">
 						<text class="lg text-gray cuIcon-warnfill"></text>
@@ -74,7 +80,15 @@
 			},
 			//用户信息
 			_userInfo:function(){
-				
+				uni.navigateTo({
+					url:"/pages/userInfo/userInfo"
+				});
+			},
+			//修改密码
+			_changePwd:function(){
+				uni.navigateTo({
+					url:"/pages/changePwd/changePwd"
+				});
 			}
 
 		}
diff --git a/pages/userInfo/userInfo.vue b/pages/userInfo/userInfo.vue
new file mode 100644
index 0000000..52da5d3
--- /dev/null
+++ b/pages/userInfo/userInfo.vue
@@ -0,0 +1,94 @@
+<template>
+	<view>
+		<view>
+
+			<view class="padding">商户信息</view>
+			<view class="cu-list menu ">
+				<view class="cu-item">
+					<view class="content">
+						<text class="lg cuIcon-service text-blue margin-right-xs"></text>
+						<text class="text-grey">商户名称</text>
+					</view>
+					<view class="action">
+						<text class="text-grey text-sm">{{storeName}}</text>
+					</view>
+				</view>
+				<view class="cu-item">
+					<view class="content">
+						<text class="lg cuIcon-new text-blue margin-right-xs"></text>
+						<text class="text-grey">商户类型</text>
+					</view>
+					<view class="action">
+						<text class="text-grey text-sm">物业</text>
+					</view>
+				
+				</view>
+				<view class="cu-item">
+					<view class="content">
+						<text class="lg cuIcon-cascades text-blue margin-right-xs"></text>
+						<text class="text-grey">商户编码</text>
+					</view>
+					<view class="action">
+						<text class="text-grey text-sm">{{storeId}}</text>
+					</view>
+					
+				</view>
+			</view>
+
+			<view class="padding">员工信息</view>
+			<view class="cu-list menu ">
+				<view class="cu-item">
+					<view class="content">
+						<text class="lg cuIcon-profile text-blue margin-right-xs"></text>
+						<text class="text-grey">员工名称</text>
+					</view>
+					<view class="action">
+						<text class="text-grey text-sm">{{userName}}</text>
+					</view>
+				</view>
+				<view class="cu-item">
+					<view class="content">
+						<text class="lg cuIcon-cascades text-blue margin-right-xs"></text>
+						<text class="text-grey">员工编号</text>
+					</view>
+					<view class="action">
+						<text class="text-grey text-sm">{{userId}}</text>
+					</view>
+				</view>
+			</view>
+		</view>
+
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				storeName: '',
+				storeId:'',
+				userName:'',
+				userId:'',
+				
+			}
+		},
+		onLoad() {
+			let _userInfo = this.java110Context.getUserInfo();
+
+			console.log('_userInfo', _userInfo);
+			
+			this.storeName = _userInfo.storeName;
+			this.storeId = _userInfo.storeId;
+			this.userName = _userInfo.userName;
+			this.userId = _userInfo.userId;
+			
+		},
+		methods: {
+
+		}
+	}
+</script>
+
+<style>
+
+</style>