Просмотр исходного кода

1.通知undefined bug
2.修改密码bug
3.前端代码警告

zangkai 4 лет назад
Родитель
Сommit
9cce3a0635

+ 1 - 1
frontend_web/src/api/setting/user.js

@@ -87,7 +87,7 @@ export default {
   },
   userchangepwd (params) {
     return request({
-      url: '/users/userchangepwd',
+      url: process.env.VUE_APP_API + 'user/changepassword',
       method: 'put',
       data: params
     })

+ 1 - 1
frontend_web/src/plugin/axios/index.js

@@ -123,7 +123,7 @@ service.interceptors.response.use(
           break
         default:
           // 不是正确的 code
-          errorCreate(`${dataAxios.msg}`)
+          errorCreate(`${dataAxios.msg ? dataAxios.msg : dataAxios.message}`)
           break
       }
     }

+ 1 - 1
frontend_web/src/router/routes.js

@@ -126,7 +126,7 @@ const frameIn = [
           auth: true,
           cache: true
         },
-        component: _import('course/detail/index'),
+        component: _import('course/detail/index')
       },
       // 系统 前端日志
       {

+ 3 - 3
frontend_web/src/store/modules/d2admin/modules/user.js

@@ -11,7 +11,7 @@ export default {
      * @param {Object} state vuex state
      * @param {*} info info
      */
-    set({ state, dispatch }, info) {
+    set ({ state, dispatch }, info) {
       return new Promise(async resolve => {
         // store 赋值
         state.info = info
@@ -49,7 +49,7 @@ export default {
      * @description 从数据库取用户数据
      * @param {Object} state vuex state
      */
-    load({ state, dispatch }) {
+    load ({ state, dispatch }) {
       return new Promise(async resolve => {
         // store 赋值
         state.info = await dispatch(
@@ -70,7 +70,7 @@ export default {
      * @description 从数据库取用户数据
      * @param {Object} state vuex state
      */
-    loadAuthUser({ state, dispatch }) {
+    loadAuthUser ({ state, dispatch }) {
       return new Promise(async resolve => {
         // store 赋值
         state.authUser = await dispatch(

+ 18 - 9
frontend_web/src/views/setuser/passwordset.vue

@@ -11,10 +11,10 @@
                  ref="pwdform"
                  label-width="200px">
           <el-form-item label="当前登录密码 :"
-                        prop="pass"
+                        prop="OldPassword"
                         required>
             <el-input type="password"
-                      v-model="pwdform.pass"
+                      v-model="pwdform.OldPassword"
                       auto-complete="off"></el-input>
           </el-form-item>
           <el-form-item label="新的登录密码 :"
@@ -25,10 +25,10 @@
                       auto-complete="off"></el-input>
           </el-form-item>
           <el-form-item label="确认新的登录密码 :"
-                        prop="checknewPass"
+                        prop="NewPassword"
                         required>
             <el-input type="password"
-                      v-model="pwdform.checknewPass"
+                      v-model="pwdform.NewPassword"
                       auto-complete="off"></el-input>
           </el-form-item>
           <el-form-item>
@@ -44,6 +44,7 @@
 
 <script>
 import userApi from '@/api/setting/user'
+import { mapState } from 'vuex'
 export default {
   name: 'userchangepwd',
   data () {
@@ -51,7 +52,7 @@ export default {
       if (value === '') {
         callback(new Error('请输入新密码'))
       } else {
-        if (this.pwdform.checknewPass !== '') {
+        if (this.pwdform.NewPassword !== '') {
           this.$refs.pwdform.validateField('checknewPass')
         }
         callback()
@@ -68,18 +69,19 @@ export default {
     }
     return {
       pwdform: {
-        pass: '',
+        OldPassword: '',
         newpass: '',
-        checknewPass: ''
+        NewPassword: '',
+        UserName: ''
       },
       pwdrules: {
-        pass: [
+        OldPassword: [
           { required: true, message: '请输入当前密码', trigger: 'blur' }
         ],
         newpass: [
           { validator: validatePass, trigger: 'blur' }
         ],
-        checknewPass: [
+        NewPassword: [
           { validator: validatePass2, trigger: 'blur' }
         ]
       },
@@ -87,12 +89,18 @@ export default {
 
     }
   },
+  computed: {
+    ...mapState('d2admin/user', [
+      'info'
+    ])
+  },
   methods: {
     submitForm (formName) {
       let _this = this
       this.$refs[formName].validate((valid) => {
         if (valid) {
           console.log(_this.pwdform, 'wang')
+          _this.pwdform.UserName = _this.info.name
           userApi.userchangepwd(_this.pwdform)
             .then(res => {
               // response
@@ -107,6 +115,7 @@ export default {
                 // this.pwdform.newpass = ''
                 // this.pwdform.checknewPass = ''
               } else {
+                console.log(res)
                 _this.$message({
                   type: 'warning',
                   message: res.data.message