diff --git a/components/AQ/AQTabber.vue b/components/AQ/AQTabber.vue
index 1f725ff..b2aa29a 100644
--- a/components/AQ/AQTabber.vue
+++ b/components/AQ/AQTabber.vue
@@ -27,7 +27,7 @@
 
 		methods: {
       async init(){
-        uni.setStorageSync('userType','1')
+        uni.setStorageSync('userType','3')
 
         let userType = uni.getStorageSync('userType')
         this.userType = userType
diff --git a/pages.json b/pages.json
index 1789d51..38a68f1 100644
--- a/pages.json
+++ b/pages.json
@@ -99,6 +99,15 @@
 		  "navigationBarTextStyle": "black"
 		}
 	},
+	{
+		"path" : "pages/student/my/update_pass", 
+		"style": {
+		  "navigationBarTitleText": "修改密码", 
+		  "navigationStyle": "default",
+		  "navigationBarBackgroundColor": "#fff",
+		  "navigationBarTextStyle": "black"
+		}
+	},
     {
       "path" : "pages/common/feedback",
       "style": {
@@ -108,6 +117,34 @@
         "navigationBarTextStyle": "white"
       }
     },
+	{
+	  "path" : "pages/student/my/lesson_consumption",
+	  "style": {
+	    "navigationBarTitleText": "课时消耗",
+	    "navigationStyle": "default",
+	    "navigationBarBackgroundColor": "#333333",
+	    "navigationBarTextStyle": "white"
+	  }
+	},
+	{
+	  "path" : "pages/student/my/my_members",
+	  "style": {
+	    "navigationBarTitleText": "我的成员",
+	    "navigationStyle": "default",
+	    "navigationBarBackgroundColor": "#333333",
+	    "navigationBarTextStyle": "white"
+	  }
+	},
+	{
+	  "path" : "pages/student/my/personal_data",
+	  "style": {
+	    "navigationBarTitleText": "个人资料",
+	    "navigationStyle": "default",
+	    "navigationBarBackgroundColor": "#333333",
+	    "navigationBarTextStyle": "white"
+	  }
+	},
+	
 
 
 
diff --git a/pages/common/feedback.vue b/pages/common/feedback.vue
index 5cc6250..9c6237c 100644
--- a/pages/common/feedback.vue
+++ b/pages/common/feedback.vue
@@ -1,189 +1,202 @@
 <!--授课统计-详情-->
 <template>
-  <view class="main_box">
-
-    <view class="main_section">
-      <view class="section">
-        <view class="text_input">
-          <fui-textarea placeholder="请输入反馈内容"></fui-textarea>
-        </view>
-      </view>
-
-      <view class="section">
-       <view class="upload_box">
-         <view>上传图片</view>
-         <AQUplodeImgMulti :inputName="`images_arr`" :inputValue="formData.images_arr || []" @AQUploadSuccess="AQUploadSuccess"/>
-       </view>
-      </view>
-
-      <view class="section">
-        <view class="input_box">
-          <fui-input label="邮箱方式" borderTop placeholder="请输入邮箱"></fui-input>
-        </view>
-      </view>
-
-      <view class="btn">提交</view>
-    </view>
-  </view>
+	<view class="main_box">
+
+		<view class="main_section">
+			<view class="section">
+				<view class="text_input">
+					<fui-textarea placeholder="请输入反馈内容"></fui-textarea>
+				</view>
+			</view>
+
+			<view class="section">
+				<view class="upload_box">
+					<view>上传图片</view>
+					<AQUplodeImgMulti :inputName="`images_arr`" :inputValue="formData.images_arr || []"
+						@AQUploadSuccess="AQUploadSuccess" />
+				</view>
+			</view>
+
+			<view class="section">
+				<view class="input_box">
+					<fui-input label="邮箱方式" borderTop placeholder="请输入邮箱"></fui-input>
+				</view>
+			</view>
+
+			<view class="describe">
+				反馈的相关问题会第一时间通过邮箱解答。
+			</view>
+
+			<view class="btn">提交</view>
+		</view>
+	</view>
 </template>
 
 <script>
-import user from '@/api/user.js';
-import AQUplodeImgMulti from '@/components/AQ/AQUplodeImgMulti';
-import AQTabber from "@/components/AQ/AQTabber"
-
-
-export default {
-  components: {
-    AQTabber,
-    AQUplodeImgMulti,
-  },
-  data() {
-    return {
-      formData:{
-        images_arr:[]
-      },
-
-      //课程下拉菜单相关
-      show_course:false,//是否显示下拉菜单
-      //课程下拉菜单
-      course_name:'课程',//选中的下拉菜单名称
-      options_course: [
-        {
-          text: '请选择课程',
-          value: '',
-          checked: true
-        }, {
-          text: '羽毛球课程1',
-          value: '1'
-        }, {
-          text: '篮球课程2',
-          value: '2'
-        }
-      ],
-
-      //课室下拉菜单相关
-      show_classroom:false,//是否显示下拉菜单
-      //课程下拉菜单
-      classroom_name:'课室',//选中的下拉菜单名称
-      options_classroom: [
-        {
-          text: '请选择课室',
-          value: '',
-          checked: true
-        }, {
-          text: '羽毛球201',
-          value: '1'
-        }, {
-          text: '篮球室101',
-          value: '2'
-        }
-      ],
-    }
-  },
-  onLoad() {
-  },
-  methods: {
-    //######AQ上传文件组件相关######
-    // 上传文件回调
-    AQUploadSuccess(res){
-      console.log('接收AQ上传回调xxx1',res)
-      // 使用 split 方法分割字符串
-      let _inputValue = []
-      if(res.filePathArr.length){
-        _inputValue = res.filePathArr
-      }
-      this.formData[res.inputName]=_inputValue
-      // console.log('接收AQ上传回调xxx1',res)
-      // console.log('接收AQ上传回调xxx2',this.formData.member_store_certification_arr)
-    },
-  }
-}
+	import user from '@/api/user.js';
+	import AQUplodeImgMulti from '@/components/AQ/AQUplodeImgMulti';
+	import AQTabber from "@/components/AQ/AQTabber"
+
+
+	export default {
+		components: {
+			AQTabber,
+			AQUplodeImgMulti,
+		},
+		data() {
+			return {
+				formData: {
+					images_arr: []
+				},
+
+				//课程下拉菜单相关
+				show_course: false, //是否显示下拉菜单
+				//课程下拉菜单
+				course_name: '课程', //选中的下拉菜单名称
+				options_course: [{
+					text: '请选择课程',
+					value: '',
+					checked: true
+				}, {
+					text: '羽毛球课程1',
+					value: '1'
+				}, {
+					text: '篮球课程2',
+					value: '2'
+				}],
+
+				//课室下拉菜单相关
+				show_classroom: false, //是否显示下拉菜单
+				//课程下拉菜单
+				classroom_name: '课室', //选中的下拉菜单名称
+				options_classroom: [{
+					text: '请选择课室',
+					value: '',
+					checked: true
+				}, {
+					text: '羽毛球201',
+					value: '1'
+				}, {
+					text: '篮球室101',
+					value: '2'
+				}],
+			}
+		},
+		onLoad() {},
+		methods: {
+			//######AQ上传文件组件相关######
+			// 上传文件回调
+			AQUploadSuccess(res) {
+				console.log('接收AQ上传回调xxx1', res)
+				// 使用 split 方法分割字符串
+				let _inputValue = []
+				if (res.filePathArr.length) {
+					_inputValue = res.filePathArr
+				}
+				this.formData[res.inputName] = _inputValue
+				// console.log('接收AQ上传回调xxx1',res)
+				// console.log('接收AQ上传回调xxx2',this.formData.member_store_certification_arr)
+			},
+		}
+	}
 </script>
 
 <style lang="less" scoped>
-
-.main_box{
-  background: #292929 ;
-}
-
-//自定义导航栏
-.navbar_section{
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  background: #29d3b4;
-  .title{
-    padding: 20rpx 0;
-    font-size: 30rpx;
-    color: #315d55;
-  }
-}
-
-.main_section{
-  min-height: 100vh;
-  background: #292929 100%;
-  padding: 0 0rpx;
-  padding-top: 32rpx;
-  padding-bottom: 150rpx;
-  font-size: 28rpx;
-  color: #fff;
-  display: flex;
-  flex-direction: column;
-  gap: 20rpx;
-
-  .section{
-    background-color: #434544;
-    padding: 40rpx 40rpx;
-    .text_input{
-      border: 1px solid #434544;
-      background-color: #434544 !important;
-      ::v-deep .fui-textarea__wrap{
-        border: 1px solid #797979;
-        background-color: #434544 !important;
-      }
-      ::v-deep .fui-textarea__background{
-        border: 0;
-        background-color: #434544 !important;
-      }
-    }
-    .upload_box{
-      display: flex;
-      flex-direction: column;
-      gap: 20rpx;
-    }
-    .input_box{
-      padding: 0;
-      color: #fff;
-      ::v-deep .fui-input__wrap{
-        background: #434544 !important;
-        padding-left: 0 !important;
-      }
-      ::v-deep .fui-input__label{
-        span{
-          color: #fff !important;
-        }
-      }
-      ::v-deep .uni-input-input{
-        color: #fff;
-      }
-      ::v-deep .fui-input__background{
-        background: #434544 !important;
-      }
-    }
-  }
-  .btn{
-    margin: 0 auto;
-    margin-top: 40rpx;
-    border: 1px solid #25a18b;
-    color: #25a18b;
-    width: 80%;
-    height: 80rpx;
-    line-height: 80rpx;
-    text-align: center;
-  }
-
-}
-
-
+	.main_box {
+		background: #292929;
+	}
+
+	//自定义导航栏
+	.navbar_section {
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		background: #29d3b4;
+
+		.title {
+			padding: 20rpx 0;
+			font-size: 30rpx;
+			color: #315d55;
+		}
+	}
+
+	.main_section {
+		min-height: 100vh;
+		background: #292929 100%;
+		padding: 0 0rpx;
+		padding-top: 32rpx;
+		padding-bottom: 150rpx;
+		font-size: 28rpx;
+		color: #fff;
+		display: flex;
+		flex-direction: column;
+		gap: 20rpx;
+
+		.section {
+			background-color: #434544;
+			padding: 40rpx 40rpx;
+
+			.text_input {
+				border: 1px solid #434544;
+				background-color: #434544 !important;
+
+				::v-deep .fui-textarea__wrap {
+					border: 1px solid #797979;
+					background-color: #434544 !important;
+				}
+
+				::v-deep .fui-textarea__background {
+					border: 0;
+					background-color: #434544 !important;
+				}
+			}
+
+			.upload_box {
+				display: flex;
+				flex-direction: column;
+				gap: 20rpx;
+			}
+
+			.input_box {
+				padding: 0;
+				color: #fff;
+
+				::v-deep .fui-input__wrap {
+					background: #434544 !important;
+					padding-left: 0 !important;
+				}
+
+				::v-deep .fui-input__label {
+					span {
+						color: #fff !important;
+					}
+				}
+
+				::v-deep .uni-input-input {
+					color: #fff;
+				}
+
+				::v-deep .fui-input__background {
+					background: #434544 !important;
+				}
+			}
+		}
+
+		.btn {
+			margin: 0 auto;
+			margin-top: 40rpx;
+			border: 1px solid #25a18b;
+			color: #25a18b;
+			width: 80%;
+			height: 80rpx;
+			line-height: 80rpx;
+			text-align: center;
+		}
+
+	}
+
+	.describe {
+		color: #999999;
+		padding-left: 30rpx;
+	}
 </style>
\ No newline at end of file
diff --git a/pages/common/privacy_agreement.vue b/pages/common/privacy_agreement.vue
index 8183fd0..cef72a8 100644
--- a/pages/common/privacy_agreement.vue
+++ b/pages/common/privacy_agreement.vue
@@ -1,6 +1,6 @@
 <template>
-	<view>
-		
+	<view class="assemble">
+		<view class="html-style" v-html="text"></view>
 	</view>
 </template>
 
@@ -8,15 +8,46 @@
 	export default {
 		data() {
 			return {
-				
+				type: 1, //类型 1为用户协议,2为隐私策略
+				text: '',
 			}
 		},
+		onLoad(item) {
+			console.log(item.type, '类型')
+			this.init(item.type)
+		},
 		methods: {
-			
+			//初始化拿数据的接口
+			init(type) {
+				if (type == 1) {
+					//用户协议
+					this.text = '用户协议用户协议用户协议用户协议用户协议用户协议用户协议用户协议用户协议用户协议用户协议用户协议用户协议用户协议用户协议用户协议用户协议用户协议用户协议用户协议用户协议用户协议用户协议用户协议'
+						uni.setNavigationBarTitle({
+							title: '用户协议'
+						});
+				} else if (type == 2) {
+					//隐私策略
+					this.text = '隐私策略隐私策略隐私策略隐私策略隐私策略隐私策略隐私策略隐私策略隐私策略隐私策略隐私策略隐私策略隐私策略隐私策略隐私策略隐私策略隐私策略隐私策略隐私策略隐私策略隐私策略隐私策略隐私策略隐私策略'
+					uni.setNavigationBarTitle({
+						title: '隐私策略'
+					});
+				}
+			}
 		}
 	}
 </script>
 
-<style>
+<style lang="less" scoped>
+	.assemble {
+		width: 100%;
+		height: 100vh;
+		overflow: auto;
+		background-color: #fff;
+	}
 
-</style>
+	.html-style {
+		padding: 10rpx 20rpx;
+		line-height: 1.8;
+		font-size: 30rpx;
+	}
+</style>
\ No newline at end of file
diff --git a/pages/student/my/lesson_consumption.vue b/pages/student/my/lesson_consumption.vue
new file mode 100644
index 0000000..1fa68be
--- /dev/null
+++ b/pages/student/my/lesson_consumption.vue
@@ -0,0 +1,158 @@
+<template>
+	<view class="assemble">
+		<view style="height: 50rpx;"></view>
+		<view class="ul">
+			<view class="li">
+				<view class="left">
+					<view class="title">篮球少儿课</view>
+					<view class="date">上课时间：2020.05.30 15:30 - 17:30</view>
+				</view>
+				<view class="right">
+					<view class="btn" style="background-color: #29d3b4;">1课时</view>
+				</view>
+			</view>
+			<view class="li">
+				<view class="left">
+					<view class="title">篮球少儿课</view>
+					<view class="date">上课时间：2020.05.30 15:30 - 17:30</view>
+				</view>
+				<view class="right">
+					<view class="btn" style="background-color: #29d3b4;">1课时</view>
+				</view>
+			</view>
+			<view class="li">
+				<view class="left">
+					<view class="title">篮球少儿课</view>
+					<view class="date">上课时间：2020.05.30 15:30 - 17:30</view>
+				</view>
+				<view class="right">
+					<view class="btn" style="background-color: #29d3b4;">1课时</view>
+				</view>
+			</view>
+			<view class="li">
+				<view class="left">
+					<view class="title">篮球少儿课</view>
+					<view class="date">上课时间：2020.05.30 15:30 - 17:30</view>
+				</view>
+				<view class="right">
+					<view class="btn" style="background-color: #29d3b4;">1课时</view>
+				</view>
+			</view>
+			<view class="li">
+				<view class="left">
+					<view class="title">篮球少儿课</view>
+					<view class="date">上课时间：2020.05.30 15:30 - 17:30</view>
+				</view>
+				<view class="right">
+					<view class="btn" style="background-color: #29d3b4;">1课时</view>
+				</view>
+			</view>
+			<view class="li">
+				<view class="left">
+					<view class="title">篮球少儿课</view>
+					<view class="date">上课时间：2020.05.30 15:30 - 17:30</view>
+				</view>
+				<view class="right">
+					<view class="btn" style="background-color: #29d3b4;">1课时</view>
+				</view>
+			</view>
+			<view class="li">
+				<view class="left">
+					<view class="title">篮球少儿课</view>
+					<view class="date">上课时间：2020.05.30 15:30 - 17:30</view>
+				</view>
+				<view class="right">
+					<view class="btn" style="background-color: #29d3b4;">1课时</view>
+				</view>
+			</view>
+			<view class="li">
+				<view class="left">
+					<view class="title">篮球少儿课</view>
+					<view class="date">上课时间：2020.05.30 15:30 - 17:30</view>
+				</view>
+				<view class="right">
+					<view class="btn" style="background-color: #29d3b4;">1课时</view>
+				</view>
+			</view>
+			<view class="li">
+				<view class="left">
+					<view class="title">篮球少儿课</view>
+					<view class="date">上课时间：2020.05.30 15:30 - 17:30</view>
+				</view>
+				<view class="right">
+					<view class="btn" style="background-color: #29d3b4;">1课时</view>
+				</view>
+			</view>
+			<view class="li">
+				<view class="left">
+					<view class="title">篮球少儿课</view>
+					<view class="date">上课时间：2020.05.30 15:30 - 17:30</view>
+				</view>
+				<view class="right">
+					<view class="btn" style="background-color: #29d3b4;">1课时</view>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+
+			}
+		},
+		methods: {
+
+		}
+	}
+</script>
+
+<style lang="less" scoped>
+	.assemble {
+		width: 100%;
+		height: 100vh;
+		background: #333333;
+		overflow: auto;
+	}
+
+	.ul {
+		display: flex;
+		flex-direction: column;
+		gap: 12rpx;
+		background-color: #fff;
+		width: 90%;
+		margin: 0 auto 30rpx;
+		padding: 26rpx;
+		border-radius: 16rpx;
+	}
+
+	.li {
+		padding: 30rpx 20rpx;
+		border: 1px solid #29D3B4;
+		border-radius: 18rpx;
+		background-color: rgba(41, 211, 180, 0.16);
+		font-size: 26rpx;
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+	}
+
+	.left {
+		display: flex;
+		flex-direction: column;
+		gap: 15rpx;
+	}
+
+	.btn {
+		width: 110rpx;
+		height: 44rpx;
+		line-height: 44rpx;
+		border-radius: 8rpx;
+		background-color: rgba(41, 211, 180, 1);
+		color: rgba(255, 255, 255, 1);
+		font-size: 20rpx;
+		text-align: center;
+	}
+</style>
\ No newline at end of file
diff --git a/pages/student/my/my.vue b/pages/student/my/my.vue
index 7fbc68b..8a8dc6e 100644
--- a/pages/student/my/my.vue
+++ b/pages/student/my/my.vue
@@ -5,7 +5,7 @@
 			<!--用户信息-->
 			<view class="user_section">
 				<view class="box">
-					<view class="left">
+					<view class="left" @click="personal_data">
 						<image class="pic" src="http://www.firstui.cn:4000/vipdoc/img/img_logo.png"></image>
 						<view class="name">包子皮</view>
 					</view>
@@ -44,11 +44,11 @@
 
 		<view class="main_section">
 			<view class="section_box">
-				<view class="item" style="border-radius: 16rpx 16rpx 0 0;">
+				<view class="item" style="border-radius: 16rpx 16rpx 0 0;" @click="lesson_consumption">
 					<view>课时消耗</view>
 				</view>
 
-				<view class="item">
+				<view class="item" @click="my_members">
 					<view>我的成员</view>
 					<view></view>
 				</view>
@@ -68,7 +68,7 @@
 					<view>负责人</view>
 					<view></view>
 				</view>
-				<view class="item">
+				<view class="item" @click="feedback">
 					<view>意见反馈</view>
 					<view></view>
 				</view>
@@ -81,8 +81,12 @@
 </template>
 
 <script>
+	import AQTabber from "@/components/AQ/AQTabber.vue"
 	import user from '@/api/user.js';
 	export default {
+		components: {
+			AQTabber,
+		},
 		data() {
 			return {
 
@@ -96,6 +100,30 @@
 					url: '/pages/student/my/set_up'
 				})
 			},
+			//意见反馈
+			feedback(){
+				uni.navigateTo({
+					url: '/pages/common/feedback'
+				})
+			},
+			//课时消耗
+			lesson_consumption(){
+				uni.navigateTo({
+					url: '/pages/student/my/lesson_consumption'
+				})
+			},
+			//我的成员
+			my_members(){
+				uni.navigateTo({
+					url: '/pages/student/my/my_members'
+				})
+			},
+			//人人资料
+			personal_data(){
+				uni.navigateTo({
+					url: '/pages/student/my/personal_data'
+				})
+			}
 		}
 	}
 </script>
diff --git a/pages/student/my/my_members.vue b/pages/student/my/my_members.vue
new file mode 100644
index 0000000..3fb54b8
--- /dev/null
+++ b/pages/student/my/my_members.vue
@@ -0,0 +1,158 @@
+<template>
+	<view class="assemble">
+		<view style="height: 50rpx;"></view>
+		<view class="ul">
+			<view class="li">
+				<view class="left">
+					<view class="title">智卓燕</view>
+					<view class="date">哥哥</view>
+				</view>
+				<view class="right">
+					<view class="btn" style="background-color: #29d3b4;">5课时</view>
+				</view>
+			</view>
+			<view class="li">
+				<view class="left">
+					<view class="title">智卓燕</view>
+					<view class="date">哥哥</view>
+				</view>
+				<view class="right">
+					<view class="btn" style="background-color: #29d3b4;">5课时</view>
+				</view>
+			</view>
+			<view class="li">
+				<view class="left">
+					<view class="title">智卓燕</view>
+					<view class="date">哥哥</view>
+				</view>
+				<view class="right">
+					<view class="btn" style="background-color: #29d3b4;">5课时</view>
+				</view>
+			</view>
+			<view class="li">
+				<view class="left">
+					<view class="title">智卓燕</view>
+					<view class="date">哥哥</view>
+				</view>
+				<view class="right">
+					<view class="btn" style="background-color: #29d3b4;">5课时</view>
+				</view>
+			</view>
+			<view class="li">
+				<view class="left">
+					<view class="title">智卓燕</view>
+					<view class="date">哥哥</view>
+				</view>
+				<view class="right">
+					<view class="btn" style="background-color: #29d3b4;">5课时</view>
+				</view>
+			</view>
+			<view class="li">
+				<view class="left">
+					<view class="title">智卓燕</view>
+					<view class="date">哥哥</view>
+				</view>
+				<view class="right">
+					<view class="btn" style="background-color: #29d3b4;">5课时</view>
+				</view>
+			</view>
+			<view class="li">
+				<view class="left">
+					<view class="title">智卓燕</view>
+					<view class="date">哥哥</view>
+				</view>
+				<view class="right">
+					<view class="btn" style="background-color: #29d3b4;">5课时</view>
+				</view>
+			</view>
+			<view class="li">
+				<view class="left">
+					<view class="title">智卓燕</view>
+					<view class="date">哥哥</view>
+				</view>
+				<view class="right">
+					<view class="btn" style="background-color: #29d3b4;">5课时</view>
+				</view>
+			</view>
+			<view class="li">
+				<view class="left">
+					<view class="title">智卓燕</view>
+					<view class="date">哥哥</view>
+				</view>
+				<view class="right">
+					<view class="btn" style="background-color: #29d3b4;">5课时</view>
+				</view>
+			</view>
+			<view class="li">
+				<view class="left">
+					<view class="title">智卓燕</view>
+					<view class="date">哥哥</view>
+				</view>
+				<view class="right">
+					<view class="btn" style="background-color: #29d3b4;">5课时</view>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+
+			}
+		},
+		methods: {
+
+		}
+	}
+</script>
+
+<style lang="less" scoped>
+	.assemble {
+		width: 100%;
+		height: 100vh;
+		background: #333333;
+		overflow: auto;
+	}
+
+	.ul {
+		display: flex;
+		flex-direction: column;
+		gap: 12rpx;
+		background-color: #fff;
+		width: 90%;
+		margin: 0 auto 30rpx;
+		padding: 26rpx;
+		border-radius: 16rpx;
+	}
+
+	.li {
+		padding: 30rpx 20rpx;
+		border: 1px solid #29D3B4;
+		border-radius: 18rpx;
+		background-color: rgba(41, 211, 180, 0.16);
+		font-size: 26rpx;
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+	}
+
+	.left {
+		display: flex;
+		flex-direction: column;
+		gap: 15rpx;
+	}
+
+	.btn {
+		width: 110rpx;
+		height: 44rpx;
+		line-height: 44rpx;
+		border-radius: 8rpx;
+		background-color: rgba(41, 211, 180, 1);
+		color: rgba(255, 255, 255, 1);
+		font-size: 20rpx;
+		text-align: center;
+	}
+</style>
\ No newline at end of file
diff --git a/pages/student/my/personal_data.vue b/pages/student/my/personal_data.vue
new file mode 100644
index 0000000..8183fd0
--- /dev/null
+++ b/pages/student/my/personal_data.vue
@@ -0,0 +1,22 @@
+<template>
+	<view>
+		
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				
+			}
+		},
+		methods: {
+			
+		}
+	}
+</script>
+
+<style>
+
+</style>
diff --git a/pages/student/my/set_up.vue b/pages/student/my/set_up.vue
index e38d8dd..b98a620 100644
--- a/pages/student/my/set_up.vue
+++ b/pages/student/my/set_up.vue
@@ -1,9 +1,9 @@
 <template>
 	<view class="assemble">
 		<view style="height: 30rpx;"></view>
-		<view class="option">修改密码</view>
-		<view class="option">用户协议</view>
-		<view class="option">隐私策略</view>
+		<view class="option" @click="update_pass()">修改密码</view>
+		<view class="option" @click="privacy_agreement(1)">用户协议</view>
+		<view class="option" @click="privacy_agreement(2)">隐私策略</view>
 		<view class="option">清空缓存</view>
 		
 		<view style="width:90%;margin: 60rpx auto;">
@@ -20,7 +20,16 @@
 			}
 		},
 		methods: {
-			
+			privacy_agreement(type){
+				uni.navigateTo({
+					url: '/pages/common/privacy_agreement?type='+type
+				})
+			},
+			update_pass(){
+				uni.navigateTo({
+					url: '/pages/student/my/update_pass'
+				})
+			}
 		}
 	}
 </script>
diff --git a/pages/student/my/update_pass.vue b/pages/student/my/update_pass.vue
new file mode 100644
index 0000000..eca2dbd
--- /dev/null
+++ b/pages/student/my/update_pass.vue
@@ -0,0 +1,106 @@
+<template>
+	<view>
+		<view class="title">
+			<view :class="{'green-text': tset_style === 1}">1.验证手机号码</view>
+			<view :class="{'green-text': tset_style === 2}">2.设置新密码</view>
+		</view>
+		<view :style="{'background-color':'#fff','width':'100%','height':'100vh' }">
+			<view style="width: 95%;height: 30rpx;"></view>
+			<view v-if="tset_style == 1">
+				<view class="describe">
+					为保障您的账号安全，修改密码前请填写原密码
+				</view>
+				<view style="width: 95%;margin:30rpx auto;">
+					<fui-input borderTop placeholder="请输入原登录密码" v-model="user" @input="input"
+						backgroundColor="#f2f2f2"></fui-input>
+				</view>
+			</view>
+			<view v-if="tset_style == 2">
+				<view style="width: 95%;margin:30rpx auto;">
+					<fui-input borderTop placeholder="请设置6-20位新的登录密码" v-model="user" @input="input"
+						backgroundColor="#f2f2f2"></fui-input>
+				</view>
+				<view style="width: 95%;margin: auto;">
+					<fui-input borderTop :padding="['20rpx','32rpx']" v-model="code" placeholder="请再次输入新的登录密码" @input="input"
+						backgroundColor="#f2f2f2">
+					</fui-input>
+				</view>
+			</view>
+			<view style="width: 95%;margin:60rpx auto;">
+				<fui-button background="#00be8c" radius="5rpx" @click="nextStep" v-if="tset_style == 1">下一步</fui-button>
+				<fui-button background="#00be8c" radius="5rpx" @click="submit" v-if="tset_style == 2">提交</fui-button>
+				<view style="width: 95%;margin:60rpx auto;">
+					<fui-button background="#fff" radius="5rpx" @click="forgot" color="#999999" v-if="tset_style == 1">忘记原密码</fui-button>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				code: '',
+				user: '',
+				tset_style: 1,
+			}
+		},
+		onLoad() {
+
+		},
+		methods: {
+			sendCode() {
+				//延时为了效果展示
+				setTimeout(() => {
+					//发送短信
+					//...
+					//success方法：短信发送成功后将组件改为倒计时状态
+					this.$refs.fui_cdv && this.$refs.fui_cdv.success()
+				}, 800)
+			},
+			nextStep(){
+				this.tset_style = 2
+			},
+			forgot() {
+				uni.navigateTo({
+					url: '/pages/student/login/forgot'
+				})
+			},
+		}
+	}
+</script>
+
+<style lang="less" scoped>
+	page {
+		font-weight: normal;
+	}
+
+	.fui-section__title {
+		margin-left: 32rpx;
+	}
+
+	.fui-left__icon {
+		padding-right: 24rpx;
+	}
+
+	.title {
+		display: flex;
+		justify-content: space-around;
+		align-items: center;
+		height: 100rpx;
+		width: 100%;
+		background-color: #fff;
+		font-size: 26rpx;
+		border: 4rpx #f5f5f5 solid;
+	}
+	
+	.green-text{
+		color: #36d6b9;
+	}
+	
+	.describe{
+		color: #999999;
+		padding-left: 30rpx;
+	}
+</style>
\ No newline at end of file