Merge branch 'master' of https://gitee.com/jyyforjava/hive-app

li-guang

2021-01-11 5227ce05a36d16fc32691b73e4d75c8aee9cea51

 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;