From 5227ce05a36d16fc32691b73e4d75c8aee9cea51 Mon Sep 17 00:00:00 2001
From: li-guang <153605324@qq.com>
Date: Mon, 11 Jan 2021 16:46:37 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/jyyforjava/hive-app

---
 hive-app/pages/mine/changePassword.vue |    7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/hive-app/pages/mine/changePassword.vue b/hive-app/pages/mine/changePassword.vue
index a2d56cd..607c5d8 100644
--- a/hive-app/pages/mine/changePassword.vue
+++ b/hive-app/pages/mine/changePassword.vue
@@ -45,12 +45,11 @@
 					newPwd: this.newPassword.trim()
 				},'post').then((res)=>{
 					if(res.status == 200){
-						this.$toast.info(res.info);
 						uni.navigateBack();
-						this.isDisabled = false;
 					}
-				}).catch((err) => {
 					this.$toast.info(res.info);
+					this.isDisabled = false;
+				}).catch((err) => {
 					this.isDisabled = false;
 				})
 			}
@@ -60,7 +59,7 @@
 
 <style>
 	.container{
-		padding: 0 30px;
+		padding: 0 15px;
 	}
 	.btn{
 		margin-top: 40px;

--
Gitblit v1.9.1