Merge branch 'fix-m-tips0104' into test

src/views/system/settings/setpsd.vue

@@ -280,7 +280,7 @@
           if(res.code === 1) {
             this.$message({type:"success",message: '验证码发送成功'});
           }else {
-            this.$message({type:"error",message: '验证码发送失败'});
+            this.$message({type:"error",message: res.message ?  res.message : '验证码发送失败'});
           }
         });
 
@@ -351,7 +351,7 @@
           if(res.code === 1) {
             this.$message({type:"success",message: '验证码发送成功'});
           }else {
-            this.$message({type:"error",message: '验证码发送失败'});
+            this.$message({type:"error",message: res.message ?  res.message : '验证码发送失败'});
           }
         });
       },
@@ -376,8 +376,7 @@
                   }, 1000)
                 })
               }else {
-                let msg = res.msg || '修改失败';
-                this.$message({type:"error",message: msg});
+                this.$message({type:"error",message: res.message ?  res.message : '修改失败'});
               }
               this.clearAccountCodeDown();
             });
@@ -404,8 +403,7 @@
                   }, 1000)
                 })
               }else {
-                let msg = res.msg || '修改失败';
-                this.$message({type:"error",message: msg});
+                this.$message({type:"error",message: res.message ?  res.message : '修改失败'});
               }
               this.clearAccountCodeDown();
               this.isLogin = false;
@@ -423,8 +421,7 @@
                 this.clearAccountCodeDown();
                 this.isPay = false;
               }else {
-                let msg = res.msg || '修改失败';
-                this.$message({type:"error",message: msg});
+                this.$message({type:"error",message: res.message ?  res.message : '修改失败'});
               }
             });
           }