管理员修改用户密码强退用户

src/api/login.js

@@ -1,7 +1,7 @@
 import request from '@/utils/request'
 
 // 登录方法
-export function login(username, password, code, uuid) {
+export function login(usernameOrEmail, password, code, uuid) {
   return request({
     url: '/auth/login',
     headers: {
@@ -9,7 +9,7 @@ export function login(username, password, code, uuid) {
       repeatSubmit: false
     },
     method: 'post',
-    data: {username, password, code, uuid}
+    data: {usernameOrEmail, password, code, uuid}
   })
 }
 

src/api/system/user.js

@@ -45,11 +45,7 @@ export function delUser(userId) {
 }
 
 // 用户密码重置
-export function resetUserPwd(userId, password) {
+export function resetUserPwd(data) {
-  const data = {
-    userId,
-    password
-  }
   return request({
     url: '/system/user/resetPwd',
     method: 'put',

src/store/modules/user.js

@@ -38,12 +38,12 @@ const user = {
   actions: {
     // 登录
     Login({commit}, userInfo) {
-      const username = userInfo.username.trim()
+      const usernameOrEmail = userInfo.usernameOrEmail.trim()
       const password = userInfo.password
       const code = userInfo.code
       const uuid = userInfo.uuid
       return new Promise((resolve, reject) => {
-        login(username, password, code, uuid).then(res => {
+        login(usernameOrEmail, password, code, uuid).then(res => {
           let data = res.data
           setToken(data.access_token)
           commit('SET_TOKEN', data.access_token)

src/utils/request.js

@@ -73,7 +73,6 @@ service.interceptors.request.use(config => {
 
 // 响应拦截器
 service.interceptors.response.use(res => {
-  debugger
     // 未设置状态码则默认成功状态
     const code = res.data.code || 200;
     // 获取错误信息

src/views/login.vue

@@ -2,11 +2,11 @@
   <div class="login">
     <el-form ref="loginForm" :model="loginForm" :rules="loginRules" class="login-form">
       <h3 class="title">若依后台管理系统</h3>
-      <el-form-item prop="username">
+      <el-form-item prop="usernameOrEmail">
         <el-input
-          v-model="loginForm.username"
+          v-model="loginForm.usernameOrEmail"
           auto-complete="off"
-          placeholder="账号"
+          placeholder="账号/邮箱"
           type="text"
         >
           <svg-icon slot="prefix" class="el-input__icon input-icon" icon-class="user"/>
@@ -72,15 +72,15 @@ export default {
     return {
       codeUrl: "",
       loginForm: {
-        username: "admin",
+        usernameOrEmail: "",
-        password: "admin123",
+        password: "",
         rememberMe: false,
         code: "",
         uuid: ""
       },
       loginRules: {
-        username: [
+        usernameOrEmail: [
-          {required: true, trigger: "blur", message: "请输入您的账号"}
+          {required: true, trigger: "blur", message: "请输入您的账号/邮箱"}
         ],
         password: [
           {required: true, trigger: "blur", message: "请输入您的密码"}
@@ -118,11 +118,11 @@ export default {
       });
     },
     getCookie() {
-      const username = Cookies.get("username");
+      const usernameOrEmail = Cookies.get("usernameOrEmail");
       const password = Cookies.get("password");
       const rememberMe = Cookies.get('rememberMe')
       this.loginForm = {
-        username: username === undefined ? this.loginForm.username : username,
+        usernameOrEmail: usernameOrEmail === undefined ? this.loginForm.usernameOrEmail : usernameOrEmail,
         password: password === undefined ? this.loginForm.password : decrypt(password),
         rememberMe: rememberMe === undefined ? false : Boolean(rememberMe)
       };
@@ -132,11 +132,11 @@ export default {
         if (valid) {
           this.loading = true;
           if (this.loginForm.rememberMe) {
-            Cookies.set("username", this.loginForm.username, {expires: 30});
+            Cookies.set("usernameOrEmail", this.loginForm.usernameOrEmail, {expires: 30});
             Cookies.set("password", encrypt(this.loginForm.password), {expires: 30});
             Cookies.set('rememberMe', this.loginForm.rememberMe, {expires: 30});
           } else {
-            Cookies.remove("username");
+            Cookies.remove("usernameOrEmail");
             Cookies.remove("password");
             Cookies.remove('rememberMe');
           }

src/views/system/user/index.vue

@@ -622,7 +622,8 @@ export default {
         inputPattern: /^.{5,20}$/,
         inputErrorMessage: "用户密码长度必须介于 5 和 20 之间"
       }).then(({value}) => {
-        resetUserPwd(row.userId, value).then(response => {
+        row.password = value;
+        resetUserPwd(row).then(response => {
           this.$modal.msgSuccess("修改成功，新密码是：" + value);
         });
       }).catch(() => {