haminjory

public/vue/js/app.js

@@ -3366,7 +3366,11 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
     };
   },
   methods: _objectSpread({}, Object(vuex__WEBPACK_IMPORTED_MODULE_0__["mapActions"])('auth', ['changePassword']), {
+<<<<<<< HEAD
     submitVerifyCode: function submitVerifyCode() {
+=======
+    submitChangePassword: function submitChangePassword() {
+>>>>>>> d147ecaacb2020c2dedb3090eb9bcb56de3f6c95
       if (this.form.code != '') {
         this.changePassword({
           form: this.form
@@ -63854,6 +63858,9 @@ function _asyncToGenerator(fn) { return function () { var self = this, args = ar
                 commit('modal/closeModal', {}, {
                   root: true
                 });
+                _router__WEBPACK_IMPORTED_MODULE_2__["default"].push({
+                  name: "Dashboard"
+                });
               }
 
             case 6: