diff --git a/pages.json b/pages.json
index c061971..095a70c 100644
--- a/pages.json
+++ b/pages.json
@@ -87,6 +87,12 @@
 				"navigationStyle": "custom"
 			}
 		},
+		{
+			"path": "pages/me/about",
+			"style": {
+				"navigationStyle": "custom"
+			}
+		},
 		{
 			"path": "pages/me/inviteFriends",
 			"style": {
diff --git a/pages/login/forget.vue b/pages/login/forget.vue
index a9d5030..e510aeb 100644
--- a/pages/login/forget.vue
+++ b/pages/login/forget.vue
@@ -1,216 +1,280 @@
 <template>
-    <view class="main">
-        <navigation>{{ i18n.ForgotPassword }}</navigation>
-        <view class="body">
-            <u--form class="form" :model="userInfo" :rules="rules" ref="form1" errorType="toast">
-                <!-- 邮箱 -->
-                <u-form-item class="input-item" prop="email" ref="item1">
-                    <u-icon class="icon"
-                        :name="userInfo.email ? '../../static/login/email_pr.png' : '../../static/login/email_de.png'"
-                        size="48rpx" width="48rpx"></u-icon>
-                    <u-input class="input" v-model="userInfo.email" color="#fff" fontSize="32rpx" border="none"
-                        :placeholder="i18n.emailInputText">
-                    </u-input>
-                </u-form-item>
-                <!-- 验证码 -->
-             <u-form-item class="input-item vCode" prop="code" ref="item1">
-             	<u-icon class="icon"
-             		:name="userInfo.code ? '../../static/login/code_pr.png' : '../../static/login/code_de.png'"
-             		size="48rpx" width="48rpx"></u-icon>
-             	<u-input class="input" v-model="userInfo.code" color="#fff" fontSize="32rpx" border="none"
-             		:placeholder="i18n.registerWelcomeText" maxlength="6">
-             	</u-input>
-             	<u-code startText="Get code" :seconds="seconds" ref="uCode" keep-running unique-key="login"
-             		@change="codeChange">
-             	</u-code>
-             	<u-button class="getVCodeBtn" color="#323045" @tap="getCode">{{tips}}</u-button>
-             </u-form-item>
-                <!-- 密码 -->
-                <u-form-item class="input-item" prop="password" ref="item1">
-                    <u-icon class="icon"
-                        :name="userInfo.password ? '../../static/login/Password_pr.png' : '../../static/login/Password_de.png'"
-                        size="48rpx" width="48rpx"></u-icon>
-                    <u-input class="input" type="password" v-model="userInfo.password" color="#fff" fontSize="32rpx" border="none"
-                        :placeholder="i18n.passwordText">
-                    </u-input>
-                </u-form-item>
-                <!-- 重复密码 -->
-                <u-form-item class="input-item" prop="confirmPassword" ref="item1">
-                    <u-icon class="icon"
-                        :name="userInfo.confirmPassword ? '../../static/login/Password_pr.png' : '../../static/login/Password_de.png'"
-                        size="48rpx" width="48rpx"></u-icon>
-                    <u-input class="input" type="password" v-model="userInfo.confirmPassword" color="#fff" fontSize="32rpx"
-                        border="none" :placeholder="i18n.confirmPasswordText">
-                    </u-input>
-                </u-form-item>
-
-            </u--form>
-            <u-button class="button" color="#00E8A2" throttleTime="500" :disabled="!agreeFlag">{{ i18n.Save }}
-            </u-button>
-        </view>
-
-
-    </view>
+	<view class="main">
+		<navigation>{{ i18n.ForgotPassword }}</navigation>
+		<view class="body">
+			<u--form class="form" :model="userInfo" :rules="rules" ref="uForm" errorType="toast">
+				<!-- 邮箱 -->
+				<u-form-item class="input-item" prop="email" ref="item1">
+					<u-icon class="icon"
+						:name="userInfo.email ? '../../static/login/email_pr.png' : '../../static/login/email_de.png'"
+						size="48rpx" width="48rpx"></u-icon>
+					<u-input class="input" v-model="userInfo.email" color="#fff" fontSize="32rpx" border="none"
+						:placeholder="i18n.emailInputText">
+					</u-input>
+				</u-form-item>
+				<!-- 验证码 -->
+				<u-form-item class="input-item vCode" prop="code" ref="item1">
+					<u-icon class="icon"
+						:name="userInfo.code ? '../../static/login/code_pr.png' : '../../static/login/code_de.png'"
+						size="48rpx" width="48rpx"></u-icon>
+					<u-input class="input" v-model="userInfo.code" color="#fff" fontSize="32rpx" border="none"
+						:placeholder="i18n.registerWelcomeText" maxlength="6">
+					</u-input>
+					<u-code startText="Get code" :seconds="seconds" ref="uCode" keep-running unique-key="login"
+						@change="codeChange">
+					</u-code>
+					<u-button class="getVCodeBtn" color="#323045" @tap="getCode">{{tips}}</u-button>
+				</u-form-item>
+				<!-- 密码 -->
+				<u-form-item class="input-item" prop="password" ref="item1">
+					<u-icon class="icon"
+						:name="userInfo.password ? '../../static/login/Password_pr.png' : '../../static/login/Password_de.png'"
+						size="48rpx" width="48rpx"></u-icon>
+					<u-input class="input" type="password" v-model="userInfo.password" color="#fff" fontSize="32rpx"
+						border="none" :placeholder="i18n.passwordText">
+					</u-input>
+				</u-form-item>
+				<!-- 重复密码 -->
+				<u-form-item class="input-item" prop="confirmPassword" ref="item1">
+					<u-icon class="icon"
+						:name="userInfo.confirmPassword ? '../../static/login/Password_pr.png' : '../../static/login/Password_de.png'"
+						size="48rpx" width="48rpx"></u-icon>
+					<u-input class="input" type="password" v-model="userInfo.confirmPassword" color="#fff"
+						fontSize="32rpx" border="none" :placeholder="i18n.confirmPasswordText">
+					</u-input>
+				</u-form-item>
+
+			</u--form>
+			<u-button class="button" color="#00E8A2" throttleTime="500" :disabled="!agreeFlag" @click="forgotPassword" :throttleTime="500">{{ i18n.Save }}
+			</u-button>
+		</view>
+
+
+	</view>
 </template>
 
 <script>
-import UButton from '../../uview-ui/components/u-button/u-button.vue'
-export default {
-    name: "ForgotPassword",
-    data() {
-        return {
-			// 验证码倒计时
-			tips: '',
-			seconds: 60,
-			// 邮箱号码是否正确
-			isCanGetCode: false,
-            userInfo: {
-                name: "",
-                password: "",
-            },
-            rules: {
-                email: {
-                    type: "string",
-                    required: true,
-                    message: this.$t("login.emailInputMessage"),
-                    trigger: ["blur", "change"],
-                },
-                code: {
-                    type: "string",
-                    required: true,
-                    message: this.$t("login.verificationCodeMessage"),
-                    trigger: ["blur", "change"]
-                },
-                password: {
-                    type: "string",
-                    required: true,
-                    message: this.$t("login.passwordInputMessage"),
-                    trigger: ["blur", "change"]
-                },
-            },
-            agreeFlag: false,
-        };
-    },
-    computed: {
-        i18n() {
-            return this.$t("login");
-        },
-    },
-	watch: {
-		'userInfo.email': {
-			handler(newValue) {
-				this.isCanGetCode = uni.$u.test.email(newValue);
-			}
-		}
-	},
-    onLoad() {
-        // console.log(this.$t('login.emailInputMessage'));
-    },
-    onShow() { },
-    methods: {
-		// 验证码相关
-		codeChange(text) {
-			this.tips = text;
+	import UButton from '../../uview-ui/components/u-button/u-button.vue'
+	import api from '@/utils/api'
+	import md5 from 'js-md5'
+	export default {
+		name: "ForgotPassword",
+		data() {
+			return {
+				// 验证码倒计时
+				tips: '',
+				seconds: 60,
+				// 邮箱号码是否正确
+				isCanGetCode: false,
+				// 密码格式对不对
+				isCanPassword: false,
+				userInfo: {
+					email: "",
+					password: "",
+					confirmPassword: "",
+					code:"",
+				},
+				rules: {
+					email: {
+						type: "string",
+						required: true,
+						message: this.$t("login").emailInputMessage,
+						trigger: ["blur", "change"],
+					},
+					code: {
+						type: "string",
+						required: true,
+						message: this.$t("login").verificationCodeMessage,
+						trigger: ["blur", "change"]
+					},
+					password: {
+						type: "string",
+						required: true,
+						message: this.$t("login").passwordInputMessage,
+						trigger: ["blur", "change"]
+					},
+					confirmPassword: {
+						type: "string",
+						required: true,
+						message: this.$t("login").passwordInputMessage,
+						trigger: ["blur", "change"]
+					},
+				},
+			};
 		},
-		// 验证码获取
-		getCode() {
-			if (!this.userInfo.email) {
-				uni.$u.toast(this.$t("login.Emailempty"))
-				return
-			}
-			if (!this.isCanGetCode) {
-				uni.$u.toast(this.$t("login.Emailincorrect"))
-				return
+		computed: {
+			i18n() {
+				return this.$t("login");
+			},
+			agreeFlag() {
+				return this.userInfo.email && this.userInfo.password && this.userInfo.confirmPassword && this.userInfo.code
 			}
-			if (this.$refs.uCode.canGetCode) {
-				const data = {
-					email: this.userInfo.email,
-					type: 0,
+		},
+		watch: {
+			'userInfo.email': {
+				handler(newValue) {
+					this.isCanGetCode = uni.$u.test.email(newValue);
 				}
-				// 模拟向后端请求验证码
-				uni.showLoading({
-					title: this.$t("login.GettingVerificationCode")
-				})
-				this.$api.sendEmailCode(data).then(res => {
-					if (res.code === 200) {
-						uni.hideLoading();
+			},
+			'userInfo.password': {
+				handler(newValue) {
+					const numberReg = /^(?=.*[A-Z])(?=.*[a-z])(?=.*[0-9])[A-Za-z0-9 _]{6,20}$/
+					this.isCanPassword = numberReg.test(newValue)
+				}
+			},
+		},
+		onLoad() {
+			// console.log(this.$t('login.emailInputMessage'));
+		},
+		onShow() {},
+		methods: {
+			// 验证码相关
+			codeChange(text) {
+				this.tips = text;
+				if (text.length == 7) {
+					text = text.slice(0, 2); //截取第二个到第四个之间的字符 cd
+					this.tips = text + "s";
+				}
+				if (text.length == 6) {
+					text = text.substring(0, 1)
+					this.tips = text + "s";
+				}
+				if (text.length == 4) {
+					this.tips = this.$t("login").Getcode
+				}
+
+			},
+			// 验证码获取
+			getCode() {
+				if (!this.userInfo.email) {
+					uni.$u.toast(this.$t("login").Emailempty)
+					return
+				}
+				if (!this.isCanGetCode) {
+					uni.$u.toast(this.$t("login").Emailincorrect)
+					return
+				}
+				if (this.$refs.uCode.canGetCode) {
+					const data = {
+						email: this.userInfo.email,
+						type: 0,
+					}
+					// 模拟向后端请求验证码
+					uni.showLoading({
+						title: this.$t("login").GettingVerificationCode
+					})
+					api.sendEmailCode(data).then(res => {
+						uni.hideLoading(this.$t("login").CodeHasSent);
 						// 这里此提示会被this.start()方法中的提示覆盖
-						uni.$u.toast(this.$t("login.CodeHasSent"));
+						uni.$u.toast(this.$t("login").CodeHasSent);
 						// 通知验证码组件内部开始倒计时
 						this.$refs.uCode.start();
-					} else {
-						uni.$u.toast(res.msg)
+					})
+				} else {
+					uni.$u.toast(this.$t("login").SendAfter);
+				}
+			},
+
+			// 输入密码
+			forgotPassword() {
+				if (!this.isCanPassword) {
+					uni.$u.toast(this.$t("login").passwordRule)
+					return
+				}
+				// 验证重复输入的密码
+				if (this.userInfo.password !== this.userInfo.confirmPassword) {
+					uni.$u.toast(this.$t("login").passwordConfirm)
+					return
+				}
+				this.$refs.uForm.validate().then(res => {
+					let userInfo = {
+						email: this.userInfo.email,
+						password: md5(this.userInfo.password),
+						confirmPassword: md5(this.userInfo.confirmPassword),
+						code: this.userInfo.code,
 					}
+					api.forgotPassword(userInfo).then(res => {
+						setTimeout(() => {
+							uni.showToast({
+								title: this.$t("login").resSuccess
+							})
+						}, 600)
+						uni.reLaunch({
+							url: '/pages/login/index'
+						})
+					})
+				}).catch(errors => {
+					console.log('err')
 				})
-			} else {
-				uni.$u.toast(this.$t("login.SendAfter"));
-			}
+
+			},
 		},
-	},
-    components: { UButton }
-}
+		components: {
+			UButton
+		}
+	}
 </script>
 
 <style lang="scss" scoped>
-.main {
-
-    .body {
-        margin-top: 204rpx;
-        padding: 0 64rpx;
-        overflow: hidden;
-
-        .form {
-            font-size: 32rpx;
-            margin-top: 48rpx;
-
-            .input-item {
-                height: 112rpx;
-                line-height: 112rpx;
-                background: #211F32;
-                margin-bottom: 48rpx;
-                border-radius: 32rpx;
-
-                .icon {
-                    margin: 0 24rpx;
-                }
-
-                /deep/.u-form-item__body {
-                    padding: 0;
-                }
-
-                .input {
-                    height: 112rpx;
-                }
-            }
-
-            .vCode {
-
-                .getVCodeBtn {
-                    // position: absolute;
-                    width: 154rpx;
-                    height: 56rpx;
-                    right: 28rpx;
-                    // top: 14px;
-                    border-radius: 8px;
-                    line-height: 56rpx;
-                    font-size: 24rpx;
-                    color: #00E8A2 !important;
-                    padding: 0;
-                }
-            }
-        }
-
-        .button {
-            margin-top: 64rpx;
-            height: 112rpx;
-            line-height: 112rpx;
-            border-radius: 32rpx;
-            font-size: 32rpx;
-            color: #15141F !important;
-        }
-
-
-    }
-
-}
+	.main {
+
+		.body {
+			margin-top: 204rpx;
+			padding: 0 64rpx;
+			overflow: hidden;
+
+			.form {
+				font-size: 32rpx;
+				margin-top: 48rpx;
+
+				.input-item {
+					height: 112rpx;
+					line-height: 112rpx;
+					background: #211F32;
+					margin-bottom: 48rpx;
+					border-radius: 32rpx;
+
+					.icon {
+						margin: 0 24rpx;
+					}
+
+					/deep/.u-form-item__body {
+						padding: 0;
+					}
+
+					.input {
+						height: 112rpx;
+					}
+				}
+
+				.vCode {
+
+					.getVCodeBtn {
+						// position: absolute;
+						width: 154rpx;
+						height: 56rpx;
+						right: 28rpx;
+						// top: 14px;
+						border-radius: 8px;
+						line-height: 56rpx;
+						font-size: 24rpx;
+						color: #00E8A2 !important;
+						padding: 0;
+					}
+				}
+			}
+
+			.button {
+				margin-top: 64rpx;
+				height: 112rpx;
+				line-height: 112rpx;
+				border-radius: 32rpx;
+				font-size: 32rpx;
+				color: #15141F !important;
+			}
+
+
+		}
+
+	}
 </style>
diff --git a/pages/login/index.vue b/pages/login/index.vue
index 7b74ce0..b945b30 100644
--- a/pages/login/index.vue
+++ b/pages/login/index.vue
@@ -21,8 +21,8 @@
 			</u-form-item>
 		</u--form>
 		<navigator class="forget" url="./forget">{{ i18n.forgotText }}</navigator>
-		<u-button class="button" color="#00E8A2">{{ i18n.Login }}</u-button>
-		<view class="signUp" @click.native="$u.throttle(login, 500)">{{ i18n.notAccountText }}
+		<u-button class="button" color="#00E8A2"  @click="login" :throttleTime="500">{{ i18n.Login }}</u-button>
+		<view class="signUp">{{ i18n.notAccountText }}
 			<navigator class="navigator" url="./register">{{ i18n.SignUp }}
 			</navigator>
 		</view>
@@ -31,10 +31,14 @@
 </template>
 
 <script>
+	import api from '@/utils/api'
+	import md5 from 'js-md5'
 	export default {
 		name: 'login',
 		data() {
 			return {
+				// 邮箱号码是否正确
+				isCanGetCode: false,
 				userInfo: {
 					name: '',
 					password: '',
@@ -43,18 +47,25 @@
 					email: {
 						type: 'string',
 						required: true,
-						message: this.$t('login.emailInputMessage'),
+						message: this.$t('login').emailInputMessage,
 						trigger: ['blur', 'change'],
 					},
 					password: {
 						type: 'string',
 						required: true,
-						message: this.$t('login.passwordInputMessage'),
+						message: this.$t('login').passwordInputMessage,
 						trigger: ['blur', 'change']
 					},
 				},
 			}
 		},
+		watch: {
+			'userInfo.email': {
+				handler(newValue) {
+					this.isCanGetCode = uni.$u.test.email(newValue);
+				}
+			},
+		},
 		computed: {
 			i18n() {
 				return this.$t('login')
@@ -65,22 +76,29 @@
 		},
 		onShow() {},
 		methods: {
-			// 注册
+			// 登录
 			login() {
+				if (!this.isCanGetCode) {
+					uni.$u.toast(this.$t("login").Emailincorrect)
+					return
+				}
 				this.$refs.uForm.validate().then(res => {
-					this.$api.login(this.userInfo).then(res => {
-						if (res.errCode === 'SUCCESS') {
+					let userInfo={
+						email:this.userInfo.email,
+						password:md5(this.userInfo.password),
+					}
+					api.login(userInfo).then(res => {
 							setTimeout(() => {
 								uni.showToast({
-									title: this.$t("login.loginSuccess")
+									title: this.$t("login").loginSuccess
 								})
 							}, 600)
-							uni.switchTab({
+							uni.reLaunch({
 								url: '/pages/home/index'
 							})
-						} else {
-							uni.$u.toast(res.msg)
-						}
+							// 换取成功后 暂存这些数据 留作后续操作
+							uni.setStorageSync('ticket',res)
+					
 					})
 				}).catch(errors => {
 					console.log('err')
diff --git a/pages/login/register.vue b/pages/login/register.vue
index 2576e1e..44ff315 100644
--- a/pages/login/register.vue
+++ b/pages/login/register.vue
@@ -23,7 +23,7 @@
 					<u-input class="input" v-model="userInfo.code" color="#fff" fontSize="32rpx" border="none"
 						:placeholder="i18n.registerWelcomeText" maxlength="6">
 					</u-input>
-					<u-code startText="Get code" :seconds="seconds" ref="uCode" keep-running unique-key="login"
+					<u-code :startText="i18n.Getcode" :seconds="seconds" ref="uCode" keep-running unique-key="login"
 						@change="codeChange">
 					</u-code>
 					<u-button class="getVCodeBtn" color="#323045" @tap="getCode">{{tips}}</u-button>
@@ -58,9 +58,9 @@
 				<!-- 邀请码 -->
 				<u-form-item class="input-item" prop="InvitationCode" ref="item1">
 					<u-icon class="icon"
-						:name="userInfo.InvitationCode ? '../../static/login/Invitation_pr.png' : '../../static/login/Invitation_de.png'"
+						:name="userInfo.inviteCode ? '../../static/login/Invitation_pr.png' : '../../static/login/Invitation_de.png'"
 						size="48rpx" width="48rpx"></u-icon>
-					<u-input class="input" v-model="userInfo.InvitationCode" color="#fff" fontSize="32rpx" border="none"
+					<u-input class="input" v-model="userInfo.inviteCode" color="#fff" fontSize="32rpx" border="none"
 						:placeholder="i18n.InvitationCodeText">
 					</u-input>
 				</u-form-item>
@@ -73,7 +73,8 @@
                         i18n.Conditions
                 }}</span></view>
 			</view>
-			<u-button class="button" color="#00E8A2" throttleTime="500" :disabled="!agreeFlag" @click="register" :throttleTime="500">
+			<u-button class="button" color="#00E8A2" throttleTime="500" :disabled="!agreeFlag" @click="register"
+				:throttleTime="500">
 				{{ i18n.SignUp }}
 			</u-button>
 			<view class="signUp">{{ i18n.haveAccount }}
@@ -89,6 +90,7 @@
 <script>
 	import UButton from '../../uview-ui/components/u-button/u-button.vue'
 	import api from '@/utils/api'
+	import md5 from 'js-md5'
 	export default {
 		name: "register",
 		data() {
@@ -98,11 +100,15 @@
 				seconds: 60,
 				// 邮箱号码是否正确
 				isCanGetCode: false,
+				// 密码格式对不对
+				isCanPassword: false,
+				// 支付密码格式
+				isCanPayPassword:false,
 				userInfo: {
 					password: "",
 					email: '',
 					payPassword: '',
-					inviteCode: '',
+					inviteCode: 'gyUafm',
 					code: '',
 					lang: '',
 				},
@@ -131,7 +137,7 @@
 						message: this.$t("login").passwordInputMessage,
 						trigger: ["blur", "change"]
 					},
-					InvitationCode: {
+					inviteCode: {
 						type: "string",
 						required: true,
 						message: this.$t("login").InvitationCodeMessage,
@@ -161,14 +167,37 @@
 				handler(newValue) {
 					this.isCanGetCode = uni.$u.test.email(newValue);
 				}
-			}
+			},
+			'userInfo.password': {
+				handler(newValue) {
+					const numberReg = /^(?=.*[A-Z])(?=.*[a-z])(?=.*[0-9])[A-Za-z0-9 _]{6,20}$/
+					this.isCanPassword = numberReg.test(newValue)
+				}
+			},
+			'userInfo.payPassword': {
+				handler(newValue) {
+					const numberReg = /^(?=.*[A-Z])(?=.*[a-z])(?=.*[0-9])[A-Za-z0-9 _]{6,20}$/
+					this.isCanPayPassword = numberReg.test(newValue)
+				}
+			},
 		},
 		onShow() {},
 		methods: {
 			// 验证码相关
 			codeChange(text) {
-				console.log(text)
 				this.tips = text;
+				if (text.length == 7) {
+					text = text.slice(0, 2); //截取第二个到第四个之间的字符 cd
+					this.tips = text + "s";
+				}
+				if (text.length == 6) {
+					text = text.substring(0, 1)
+					this.tips = text + "s";
+				}
+				if (text.length == 4) {
+					this.tips = this.$t("login").Getcode
+				}
+
 			},
 			// 验证码获取
 			getCode() {
@@ -202,20 +231,36 @@
 			},
 			// 注册
 			register() {
+				if (!this.isCanPassword) {
+					uni.$u.toast(this.$t("login").passwordRule)
+					return
+				}
+				if (!this.isCanPayPassword) {
+					uni.$u.toast(this.$t("login").passwordRule)
+					return
+				}
+				// 验证重复输入的密码
+				if(this.userInfo.password!==this.userInfo.confirmPassword){
+					uni.$u.toast(this.$t("login").passwordConfirm)
+					return
+				}
 				this.$refs.uForm.validate().then(res => {
-					this.$api.register(this.userInfo).then(res => {
-						if (res.errCode === 'SUCCESS') {
-							setTimeout(() => {
-								uni.showToast({
-									title: this.$t("login").resSuccess
-								})
-							}, 600)
-							uni.switchTab({
-								url: '/pages/login/index'
+					let userInfo={
+						email:this.userInfo.email,
+						password:md5(this.userInfo.password),
+						payPassword:md5(this.userInfo.payPassword),
+						inviteCode:this.userInfo.inviteCode,
+						code:this.userInfo.code,
+					}
+					api.register(userInfo).then(res => {
+						setTimeout(() => {
+							uni.showToast({
+								title: this.$t("login").resSuccess
 							})
-						} else {
-							uni.$u.toast(res.msg)
-						}
+						}, 600)
+						uni.reLaunch({
+							url: '/pages/login/index'
+						})
 					})
 				}).catch(errors => {
 					console.log('err')
diff --git a/pages/me/about.vue b/pages/me/about.vue
new file mode 100644
index 0000000..0dc65cf
--- /dev/null
+++ b/pages/me/about.vue
@@ -0,0 +1,97 @@
+<template>
+    <view class="main">
+        <!-- nav -->
+        <navigation>{{ i18n.AboutUs }}</navigation>
+        <view class="body">
+         
+
+        </view>
+    </view>
+</template>
+
+<script>
+import api from '@/utils/api'
+export default {
+    name: "AboutUs",
+    data() {
+        return {
+         
+        };
+    },
+    computed: {
+        i18n() {
+            return this.$t("me");
+        },
+    },
+    onLoad() {
+		this.about();
+    },
+    onShow() { },
+    methods: {
+        // 关于我们
+        about() {
+         api.aboutus().then(res => {
+			 console.log(res)
+         })
+        },
+    },
+}
+</script>
+
+<style lang="scss" scoped>
+.main {
+
+    .body {
+        overflow: hidden;
+        margin-top: 200rpx;
+        padding: 0 48rpx;
+
+        .shareText {
+            margin-top: 104rpx;
+            font-size: 60rpx;
+            font-weight: 800;
+            text-align: center;
+        }
+
+        .scanText {
+            font-size: 32rpx;
+            text-align: center;
+            color: #A2A0A8;
+        }
+
+        .QRCode {
+            box-sizing: border-box;
+            margin: 66rpx auto;
+            width: 520rpx;
+            height: 520rpx;
+            background-image: url(../../static/me/bg_QR_code.png);
+            background-repeat: no-repeat;
+            background-size: 520rpx;
+            padding: 52rpx;
+
+            .QRCodeImg {
+                margin-left: 8rpx;
+            }
+        }
+
+        .myIdText {
+            font-size: 48rpx;
+            font-weight: 800;
+            text-align: center;
+        }
+
+        .button {
+            height: 112rpx;
+            margin: 72rpx 0;
+            border-radius: 32rpx;
+            color: #15141F !important;
+            font-weight: 700;
+            font-size: 32rpx;
+        }
+
+
+
+    }
+
+}
+</style>
diff --git a/pages/me/index.vue b/pages/me/index.vue
index 76dc2dc..24f7f7b 100644
--- a/pages/me/index.vue
+++ b/pages/me/index.vue
@@ -1,378 +1,408 @@
 <template>
-    <view class="main">
-        <view class="contentBody">
-            <!-- 用户头像和id -->
-            <view class="userInfo">
-                <u-image class="headImg" src="../../static/me/Ellipse 85.png" width="160rpx" height="160rpx"
-                    radius="160rpx"></u-image>
-                <view class="idAndAccount">
-                    <view class="id">ID:984934</view>
-                    <view class="account">{{ i18n.account }}:348798457498579</view>
-                </view>
-            </view>
-            <!-- 三个按钮 -->
-            <view class="btnDiv" >
-                <!-- 充值 -->
-                <view class="item" id='recharge' @click="goto">
-                    <view class="img" id='recharge'></view>
-                    <view class="title" id='recharge'>{{ i18n.Recharge }}</view>
-                </view>
-                <!-- 取现 -->
-                <view class="item" id='withdrawal'  @click="goto">
-                    <view class="img" id='withdrawal'></view>
-                    <view class="title" id='withdrawal'>{{ i18n.Withdrawal }}</view>
-                </view>
-                <!-- 兑换 -->
-                <view class="item" id='transfer'  @click="goto">
-                    <view class="img" id='transfer'></view>
-                    <view class="title" id='transfer'>{{ i18n.Transfer }}</view>
-                </view>
-            </view>
-            <!-- 余额相关 -->
-            <view class="balanceRow">
-                <!-- 可用余额 -->
-                <view class="item">
-                    <view class="number">0</view>
-                    <view class="title">{{ i18n.Balance }}</view>
-                </view>
-                <!-- 质押余额 -->
-                <view class="item">
-                    <view class="number">0</view>
-                    <view class="title">{{ i18n.Pledge }}</view>
-                </view>
-                <!-- 合约余额 -->
-                <view class="item">
-                    <view class="number">0</view>
-                    <view class="title">{{ i18n.Contarct }}</view>
-                </view>
-            </view>
-            <!-- General -->
-            <view class="GeneralPart">
-                <view class="General">{{ i18n.General }}</view>
-                <view class="list" @click="goto">
-                    <!-- 邀请朋友 -->
-                    <view class="item" id="InviteFriends">{{ i18n.InviteFriends }}</view>
-                    <!-- 账户信息 -->
-                    <view class="item" id="AccountInfo">{{ i18n.AccountInfo }}</view>
-                    <!-- 我的团队 -->
-                    <view class="item" id="MyTeam">{{ i18n.MyTeam }}</view>
-                    <!-- 钱包历史 -->
-                    <view class="item" id="WalletHistory">{{ i18n.WalletHistory }}</view>
-                    <!-- 通知 -->
-                    <view class="item" id="Notification">{{ i18n.Notification }}</view>
-                    <!-- 捐赠记录 -->
-                    <view class="item" id="DonateRecord">{{ i18n.DonateRecord }}</view>
-                    <!-- 语言 -->
-                    <view class="item" id="Language">{{ i18n.Language }}</view>
-                    <!-- 关于我们 -->
-                    <view class="item" id="AboutUs">{{ i18n.AboutUs }}</view>
-                </view>
-            </view>
-
-            <!-- 退出登录 -->
-            <u-button class="logOutButton" color="#323045" throttleTime="500">
-                <view class="title">{{ i18n.LogOut }}</view>
-            </u-button>
-
-        </view>
-
-
-        <!-- tabBar -->
-        <tab-bar :selectActive="5"></tab-bar>
-    </view>
+	<view class="main">
+		<view class="contentBody">
+			<!-- 用户头像和id -->
+			<view class="userInfo">
+				<u-image class="headImg" src="../../static/me/Ellipse 85.png" width="160rpx" height="160rpx"
+					radius="160rpx"></u-image>
+				<view class="idAndAccount">
+					<view class="id">ID:{{userInfo.uid}}</view>
+					<view class="account">{{ i18n.account }}:{{userInfo.email}}</view>
+				</view>
+			</view>
+			<!-- 三个按钮 -->
+			<view class="btnDiv">
+				<!-- 充值 -->
+				<view class="item" id='recharge' @click="goto">
+					<view class="img" id='recharge'></view>
+					<view class="title" id='recharge'>{{ i18n.Recharge }}</view>
+				</view>
+				<!-- 取现 -->
+				<view class="item" id='withdrawal' @click="goto">
+					<view class="img" id='withdrawal'></view>
+					<view class="title" id='withdrawal'>{{ i18n.Withdrawal }}</view>
+				</view>
+				<!-- 兑换 -->
+				<view class="item" id='transfer' @click="goto">
+					<view class="img" id='transfer'></view>
+					<view class="title" id='transfer'>{{ i18n.Transfer }}</view>
+				</view>
+			</view>
+			<!-- 余额相关 -->
+			<view class="balanceRow">
+				<!-- 可用余额 -->
+				<view class="item">
+					<view class="number">{{userInfoBalance.balance}}</view>
+					<view class="title">{{ i18n.Balance }}</view>
+				</view>
+				<!-- 质押余额 -->
+				<view class="item">
+					<view class="number">{{userInfoBalance.pledge}}</view>
+					<view class="title">{{ i18n.Pledge }}</view>
+				</view>
+				<!-- 合约余额 -->
+				<view class="item">
+					<view class="number">{{userInfoBalance.contract}}</view>
+					<view class="title">{{ i18n.Contarct }}</view>
+				</view>
+			</view>
+			<!-- General -->
+			<view class="GeneralPart">
+				<view class="General">{{ i18n.General }}</view>
+				<view class="list" @click="goto">
+					<!-- 邀请朋友 -->
+					<view class="item" id="InviteFriends">{{ i18n.InviteFriends }}</view>
+					<!-- 账户信息 -->
+					<view class="item" id="AccountInfo">{{ i18n.AccountInfo }}</view>
+					<!-- 我的团队 -->
+					<view class="item" id="MyTeam">{{ i18n.MyTeam }}</view>
+					<!-- 钱包历史 -->
+					<view class="item" id="WalletHistory">{{ i18n.WalletHistory }}</view>
+					<!-- 通知 -->
+					<view class="item" id="Notification">{{ i18n.Notification }}</view>
+					<!-- 捐赠记录 -->
+					<view class="item" id="DonateRecord">{{ i18n.DonateRecord }}</view>
+					<!-- 语言 -->
+					<view class="item" id="Language">{{ i18n.Language }}</view>
+					<!-- 关于我们 -->
+					<view class="item" id="AboutUs">{{ i18n.AboutUs }}</view>
+				</view>
+			</view>
+
+			<!-- 退出登录 -->
+			<u-button class="logOutButton" color="#323045" throttleTime="500" @click="showLogOut=true">
+				<view class="title">{{ i18n.LogOut }}</view>
+			</u-button>
+
+		</view>
+		<!-- tabBar -->
+		<tab-bar :selectActive="5"></tab-bar>
+		<!-- 确认退出登录 -->
+		<u-modal :show="showLogOut" :showCancelButton="true" :confirmText="i18n.Confirm" :cancelText="i18n.Cancel" 
+		:content="i18n.isLogOut" @confirm="logOut" @cancel="showLogOut=false"></u-modal>
+	</view>
 </template>
 
 <script>
-export default {
-    name: 'me',
-    data() {
-        return {
-
-        }
-    },
-    onLoad() {
-
-    },
-    onShow() {
-
-    },
-    onHide() {
-    },
-    computed: {
-        i18n() {
-            return this.$t('me')
-        }
-    },
-    methods: {
-        goto(e) {
-            // console.log(e.target);
-            // console.log(e.target.id);
-            const id = e.target.id;
-            let url = '';
-            switch (id) {
-                case 'recharge':
-                    url = '/pages/recharge/recharge'
-                    break;
-                case 'withdrawal':
-                    url = '/pages/withdrawal/withdrawal'
-                    break;
-                case 'transfer':
-                    url = '/pages/me/transfer'
-                    break;
-                case 'InviteFriends':
-                    url = '/pages/me/inviteFriends'
-                    break;
-                case 'AccountInfo':
-                    url = '/pages/me/accountInfo'
-                    break;
-                case 'MyTeam':
-                    url = '/pages/me/myTeam'
-                    break;
-                case 'WalletHistory':
-                    url = '/pages/me/walletHistory'
-                    break;
-                case 'Notification':
-                    url = '/pages/me/notification'
-                    break;
-                case 'DonateRecord':
-                    url = '/pages/me/donateRecord'
-                    break;
-                case 'Language':
-                    url = '/pages/me/language'
-                    break;
-                case 'AboutUs':
-                    break;
-                default:
-                    break;
-            }
-            if (url) {
-                // console.log(url);
-                uni.navigateTo({
-                    url,
-                });
-            }
-
-        }
-    }
-}
-
+	import api from '@/utils/api'
+	export default {
+		name: 'me',
+		data() {
+			return {
+				// 退出登录模态框的显示与否。
+				showLogOut: false,
+				// 用户信息
+				userInfo:{},
+				// 用户余额
+				userInfoBalance:{},
+			}
+		},
+		onLoad() {
+            
+		},
+		onShow() {
+			// 获取用户信息
+            this.getUserInfo()
+			// 获取用户余额信息
+			this.getUserInfoBalance();
+		},
+		onHide() {},
+		computed: {
+			i18n() {
+				return this.$t('me')
+			}
+		},
+		methods: {
+			// 获取用户信息
+			getUserInfo() {
+			 api.userInfo().then(res => {
+				 this.userInfo=res
+			 })
+			},
+			// 获取用户余额信息
+			getUserInfoBalance() {
+			 api.userAccount().then(res => {
+				 this.userInfoBalance=res
+			 })
+			},
+			// 退出登录
+			logOut() {
+			 api.loginOut().then(res => {
+				 uni.setStorageSync('ticket',null)
+			 	uni.reLaunch({
+			 		url: '/pages/login/index'
+			 	})
+			 })
+			},
+			goto(e) {
+				// console.log(e.target);
+				// console.log(e.target.id);
+				const id = e.target.id;
+				let url = '';
+				switch (id) {
+					case 'recharge':
+						url = '/pages/recharge/recharge'
+						break;
+					case 'withdrawal':
+						url = '/pages/withdrawal/withdrawal'
+						break;
+					case 'transfer':
+						url = '/pages/me/transfer'
+						break;
+					case 'InviteFriends':
+						url = '/pages/me/inviteFriends'
+						break;
+					case 'AccountInfo':
+						url = '/pages/me/accountInfo'
+						break;
+					case 'MyTeam':
+						url = '/pages/me/myTeam'
+						break;
+					case 'WalletHistory':
+						url = '/pages/me/walletHistory'
+						break;
+					case 'Notification':
+						url = '/pages/me/notification'
+						break;
+					case 'DonateRecord':
+						url = '/pages/me/donateRecord'
+						break;
+					case 'Language':
+						url = '/pages/me/language'
+						break;
+					case 'AboutUs':
+					    url = '/pages/me/about'
+						break;
+					default:
+						break;
+				}
+				if (url) {
+					// console.log(url);
+					uni.navigateTo({
+						url,
+					});
+				}
+
+			}
+		}
+	}
 </script>
 
 <style lang="scss" scoped>
-.main {
-    padding-top: 88rpx;
-    padding-bottom: 198rpx; // 避免底部TabBar盖住内容
-
-    .contentBody {
-
-        box-sizing: border-box;
-        width: 100%;
-        background: #211F32;
-        border-radius: 64rpx 64rpx 0 0;
-        padding: 44rpx 48rpx;
-        overflow: hidden;
-
-
-        .userInfo {
-            height: 168rpx;
-            display: flex;
-            flex-wrap: wrap;
-
-            .headImg {
-                height: 160rpx;
-                width: 160rpx;
-                border-radius: 160rpx;
-                border: 4rpx solid #F6A609;
-            }
-
-            .idAndAccount {
-                margin-left: 40rpx;
-
-                .id {
-                    height: 56rpx;
-                    width: 378rpx;
-                    font-weight: 600;
-                    font-size: 40rpx;
-                    margin: 16rpx 0;
-                }
-
-                .account {
-                    position: relative;
-                    height: 56rpx;
-                    line-height: 56rpx;
-                    width: 378rpx;
-                    background: rgba(255, 188, 31, 0.1);
-                    border-radius: 16rpx;
-                    font-size: 24rpx;
-                    color: #FFBC1F;
-                    text-align: center;
-                    padding-left: 20rpx;
+	.main {
+		padding-top: 88rpx;
+		padding-bottom: 198rpx; // 避免底部TabBar盖住内容
+
+		.contentBody {
+
+			box-sizing: border-box;
+			width: 100%;
+			background: #211F32;
+			border-radius: 64rpx 64rpx 0 0;
+			padding: 44rpx 48rpx;
+			overflow: hidden;
+
+
+			.userInfo {
+				height: 168rpx;
+				display: flex;
+				flex-wrap: wrap;
+
+				.headImg {
+					height: 160rpx;
+					width: 160rpx;
+					border-radius: 160rpx;
+					border: 4rpx solid #F6A609;
+				}
+
+				.idAndAccount {
+					margin-left: 40rpx;
+
+					.id {
+						height: 56rpx;
+						width: 378rpx;
+						font-weight: 600;
+						font-size: 40rpx;
+						margin: 16rpx 0;
+					}
+
+					.account {
+						position: relative;
+						height: 56rpx;
+						line-height: 56rpx;
+						width: 378rpx;
+						background: rgba(255, 188, 31, 0.1);
+						border-radius: 16rpx;
+						font-size: 24rpx;
+						color: #FFBC1F;
+						text-align: left;
+						padding-left: 20rpx;
 
-                    &::before {
-                        display: block;
-                        position: absolute;
-                        content: '';
-                        background-image: url(../../static/me/ranking.png);
-                        background-repeat: no-repeat;
-                        background-size: 32rpx;
-                        width: 32rpx;
-                        height: 32rpx;
-                        top: 12rpx;
-                        left: 20rpx;
-                    }
-                }
-            }
-
-
-        }
-
-        .btnDiv {
-            margin: 32rpx 0;
-
-            .item {
-                display: inline-block;
-                width: 200rpx;
-                height: 190rpx;
-                text-align: center;
-                background: #323045;
-                border-radius: 52rpx;
-                box-sizing: border-box;
-
-                .img {
-                    height: 64rpx;
-                    width: 64rpx;
-                    margin: 32rpx auto;
-                    background-image: url(../../static/me/ic_u_recharge.png);
-                    background-repeat: no-repeat;
-                    background-size: 64rpx;
-
-                }
-
-                &:nth-child(2) {
-                    margin: 0 26rpx;
-
-                    .img {
-                        background-image: url(../../static/me/ic_u_withdrawal.png);
-                    }
-                }
-
-                &:nth-child(3) .img {
-                    background-image: url(../../static/me/ic_u_transfer.png);
-                }
-
-                .title {
-                    font-size: 26rpx;
-                }
-
-
-            }
-
-
-        }
-
-        .balanceRow {
-            margin: 32rpx 0;
-            background: #323045;
-            border-radius: 52rpx;
-            box-sizing: border-box;
-
-            .item {
-                display: inline-block;
-                width: 218rpx;
-                height: 200rpx;
-                text-align: center;
+						&::before {
+							display: block;
+							position: absolute;
+							content: '';
+							background-image: url(../../static/me/ranking.png);
+							background-repeat: no-repeat;
+							background-size: 32rpx;
+							width: 32rpx;
+							height: 32rpx;
+							top: 12rpx;
+							left: 20rpx;
+						}
+					}
+				}
+
+
+			}
+
+			.btnDiv {
+				margin: 32rpx 0;
+
+				.item {
+					display: inline-block;
+					width: 200rpx;
+					height: 190rpx;
+					text-align: center;
+					background: #323045;
+					border-radius: 52rpx;
+					box-sizing: border-box;
+
+					.img {
+						height: 64rpx;
+						width: 64rpx;
+						margin: 32rpx auto;
+						background-image: url(../../static/me/ic_u_recharge.png);
+						background-repeat: no-repeat;
+						background-size: 64rpx;
+
+					}
+
+					&:nth-child(2) {
+						margin: 0 26rpx;
+
+						.img {
+							background-image: url(../../static/me/ic_u_withdrawal.png);
+						}
+					}
+
+					&:nth-child(3) .img {
+						background-image: url(../../static/me/ic_u_transfer.png);
+					}
+
+					.title {
+						font-size: 26rpx;
+					}
+
+
+				}
+
+
+			}
+
+			.balanceRow {
+				margin: 32rpx 0;
+				background: #323045;
+				border-radius: 52rpx;
+				box-sizing: border-box;
+
+				.item {
+					display: inline-block;
+					width: 218rpx;
+					height: 200rpx;
+					text-align: center;
 
 
-                .number {
-                    margin: 32rpx auto;
-                    font-size: 48rpx;
+					.number {
+						margin: 32rpx auto;
+						font-size: 48rpx;
 
 
-                }
+					}
 
 
 
-                .title {
-                    font-size: 28rpx;
-                }
+					.title {
+						font-size: 28rpx;
+					}
 
 
-            }
+				}
 
 
-        }
+			}
 
-        .GeneralPart {
-            .General {
-                font-size: 28rpx;
-                color: #A1A0A8;
-            }
+			.GeneralPart {
+				.General {
+					font-size: 28rpx;
+					color: #A1A0A8;
+				}
 
-            .list {
-                font-size: #fff;
+				.list {
+					font-size: #fff;
 
-                .item {
-                    position: relative;
-                    height: 116rpx;
-                    font-size: 32rpx;
-                    line-height: 116rpx;
-                    border-bottom: 2rpx solid #323045;
+					.item {
+						position: relative;
+						height: 116rpx;
+						font-size: 32rpx;
+						line-height: 116rpx;
+						border-bottom: 2rpx solid #323045;
 
-                    &::after {
-                        display: block;
-                        position: absolute;
-                        content: '';
-                        background-image: url(../../static/me/arrow-right.png);
-                        background-repeat: no-repeat;
-                        background-size: 48rpx;
-                        width: 48rpx;
-                        height: 48rpx;
-                        top: 32rpx;
-                        right: 0rpx;
-                    }
+						&::after {
+							display: block;
+							position: absolute;
+							content: '';
+							background-image: url(../../static/me/arrow-right.png);
+							background-repeat: no-repeat;
+							background-size: 48rpx;
+							width: 48rpx;
+							height: 48rpx;
+							top: 32rpx;
+							right: 0rpx;
+						}
 
-                    &:last-child {
-                        border-bottom: none;
-                    }
-                }
-            }
-        }
+						&:last-child {
+							border-bottom: none;
+						}
+					}
+				}
+			}
 
-        .logOutButton {
-            position: relative;
-            margin-top: 14rpx;
-            height: 112rpx;
-            line-height: 112rpx;
-            border-radius: 32rpx;
-            font-size: 36rpx;
-            color: #A1A0A8 !important;
+			.logOutButton {
+				position: relative;
+				margin-top: 14rpx;
+				height: 112rpx;
+				line-height: 112rpx;
+				border-radius: 32rpx;
+				font-size: 36rpx;
+				color: #A1A0A8 !important;
 
 
-            .title {
-                padding-left: 80rpx;
+				.title {
+					padding-left: 80rpx;
 
-                &::before {
-                    display: block;
-                    position: absolute;
-                    content: '';
-                    background-image: url(../../static/me/ic_logout.png);
-                    background-repeat: no-repeat;
-                    background-size: 48rpx;
-                    width: 48rpx;
-                    height: 48rpx;
-                    top: 30rpx;
-                    left: 220rpx;
-                }
-            }
+					&::before {
+						display: block;
+						position: absolute;
+						content: '';
+						background-image: url(../../static/me/ic_logout.png);
+						background-repeat: no-repeat;
+						background-size: 48rpx;
+						width: 48rpx;
+						height: 48rpx;
+						top: 30rpx;
+						left: 220rpx;
+					}
+				}
 
 
-        }
+			}
 
-    }
+		}
 
 
 
 
 
-}
+	}
 </style>
diff --git a/utils/api.js b/utils/api.js
index f00dbeb..3de8b17 100644
--- a/utils/api.js
+++ b/utils/api.js
@@ -81,6 +81,7 @@ const api = {
  //--------------------------------- 个人中心 ---------------------------------
    register: (params) => Vue.prototype.$axios.post('/api/index/register',params),//注册
    login: (params) => Vue.prototype.$axios.post('/api/user/login',params),//登录
+   aboutus: (params) => Vue.prototype.$axios.post('/api/index/aboutus',params),//关于我们
    loginOut: (params) => Vue.prototype.$axios.post('/api/user/loginOut',params),//退出登录
    forgotPassword: (params) => Vue.prototype.$axios.post('/api/user/forgotPassword',params),//忘记密码
    updatePassword: () => Vue.prototype.$axios.get('/api/user/updatePassword'),//修改登录密码
diff --git a/utils/axios.js b/utils/axios.js
index 802f60d..05fb449 100644
--- a/utils/axios.js
+++ b/utils/axios.js
@@ -40,7 +40,8 @@ service.interceptors.request.use(
 		}
 		
 		const ticket = uni.getStorageSync('ticket')
-		if (ticket != '') {
+		if (ticket) {
+			config.data = {};
 			config.data['ticket'] = ticket
 		}
 		if (Vue.prototype.$showDialog) {
diff --git a/utils/language/en_US.js b/utils/language/en_US.js
index ff80a54..0e97ac0 100644
--- a/utils/language/en_US.js
+++ b/utils/language/en_US.js
@@ -14,6 +14,8 @@ export default {
 		Login: 'Login',
 		SignUp: 'Sign Up',
 		ForgotPassword: 'Forgot password',
+		Getcode:'Get code',
+		passwordRule:'Please enter a password of 6-20 characters, which must contain at least 1 capital letter, 1 lowercase letter and 1 digit',
 		// login
 		welcomeText: 'Hi, Welcome Back!',
 		signInText: 'Sign in to your account.',
@@ -27,6 +29,7 @@ export default {
 		checkTheTermsOfService: 'Please review and agree to the terms of service',
 
 		// register
+		passwordConfirm:"The login passwords entered repeatedly are inconsistent",
 		loginSuccess:"Login successful",
 		resSuccess:"Registration success",
 		Emailempty:"E-mail can not be empty",
@@ -321,6 +324,7 @@ export default {
 
 	//me
 	me: {
+		isLogOut:'Are you sure you want to log out?',
 		account: 'account',
 		Recharge: 'Recharge',
 		Withdrawal: 'Withdrawal',
@@ -354,6 +358,7 @@ export default {
 		PleaseEnterTheOldPassword: 'Please Enter the old password',
 		CreateNewLoginPassword: 'Create new Login password',
 		Confirm: 'Confirm',
+		Cancel: 'Cancel',
 		ModifyWithdrawalPassword: 'Modify Withdrawal Password',
 		CreateNewPassword: 'Create new password',