Merge branch 'master' of https://gitlab.ezijing.com/ezijing/transport-weapp-h5

src/pages/login/password.vue

@@ -119,17 +119,17 @@ export default {
         .sendResetPasswordCode({ account: this.ruleForm.account })
         .then(response => {
           if (response.code === 0) {
-            this.$notify({ type: 'success', message: '验证码发送成功' })
+            this.$toast({ type: 'success', message: '验证码发送成功' })
           } else {
             // 停止计时
             this.$refs.countdown.stop()
-            this.$notify(response.msg)
+            this.$toast(response.msg)
           }
         })
         .catch(error => {
           // 停止计时
           this.$refs.countdown.stop()
-          error.response && this.$notify(error.response.data.message)
+          error.response && this.$toast(error.response.data.message)
         })
     },
     // 重置密码
@@ -143,11 +143,11 @@ export default {
           if (response.code === 0) {
             this.isSuccess = true
           } else {
-            this.$notify(response.msg)
+            this.$toast(response.msg)
           }
         })
         .catch(error => {
-          error.response && this.$notify(error.response.data.message)
+          error.response && this.$toast(error.response.data.message)
         })
     },
     // 确认密码校验

src/pages/my/alarm/components/update.vue

@@ -96,7 +96,7 @@ export default {
   methods: {
     onSubmit() {
       if (!this.ruleForm.week_json.length) {
-        this.$notify('不选择星期，不能进行保存')
+        this.$toast('不选择星期，不能进行保存')
         return
       }
       this.isUpdate ? this.handleUpdate() : this.handleAdd()