Merge branch 'master' of http://dev.ccwin-in.com:3000/BoXu.Zheng/WZC2

fe/PC/src/api/wms-auth.js

@@ -87,8 +87,8 @@ export function getPageList(data) {
 //重置密码功能 | 用户信息维护
 export function putpassword(id) {
   return request({
-    url: baseURL + '/account/reset-password/' + id,
+    url: baseURL + '/identity/users/reset-password/' + id,
-    method: 'put'
+    method: 'post'
   })
 }
 
@@ -194,9 +194,9 @@ export function putLoginUserInfo(data) {
   })
 }
 //修改登录用户的密码-强密码规则
-export function postLoginUserInfo(data) {
+export function postLoginUserInfo(data, id) {
   return request({
-    url: baseURL + '/identity/my-profile/change-password',
+    url: baseURL + '/identity/users/change-password/' + id,
     method: 'post',
     data
   })

fe/PC/src/views/profileuser/resetPwd.vue

@@ -41,7 +41,6 @@ export default {
       }
     };
     return {
-      test: "1test",
       user: {
         oldPassword: undefined,
         newPassword: undefined,
@@ -75,7 +74,7 @@ export default {
           postLoginUserInfo({
             currentPassword: this.user.oldPassword,
             newPassword: this.user.newPassword,
-          })
+          }, this.$store.getters.name.id)
             .then((response) => {
               this.$notify({
                 title: "成功",

fe/PC/src/views/systemManage/userManage.vue

@@ -695,7 +695,7 @@ export default {
           putpassword(row.id).then((response) => {
             this.$notify({
               title: "成功",
-              message: "重置成功, 密码是: 123456",
+              message: "重置成功, 密码是: 000000",
               type: "success",
               duration: 2000,
             });