diff --git a/.env.development b/.env.development index 49c2e4a..39e3d02 100644 --- a/.env.development +++ b/.env.development @@ -3,7 +3,7 @@ ENV = 'development' # 接口地址 # 许镇-本地服地址 -VUE_APP_BASE_API = 'http://192.168.99.72:15000' +VUE_APP_BASE_API = 'http://192.168.99.63:15000' VUE_APP_WEBRTCSTREAMER_API = '127.0.0.1:8000' # 是否启用 babel-plugin-dynamic-import-node插件 diff --git a/src/api/system/user.js b/src/api/system/user.js index 24c2e23..d8d25fb 100644 --- a/src/api/system/user.js +++ b/src/api/system/user.js @@ -53,7 +53,7 @@ export function edit(data) { export function editUser(data) { return request({ - url: 'api/users/updateOwn', + url: 'api/user/updateOwn', method: 'put', data }) @@ -61,11 +61,13 @@ export function editUser(data) { export function updatePass(user) { const data = { - oldPass: encrypt(user.oldPass), - newPass: encrypt(user.newPass) + oldPass: user.oldPass, + // oldPass: encrypt(user.oldPass), + // newPass: encrypt(user.newPass) + newPass: user.newPass } return request({ - url: 'api/users/updatePass/', + url: 'api/user/updatePass', method: 'post', data }) diff --git a/src/views/assetManage/inventory/index.vue b/src/views/assetManage/inventory/index.vue index 59a754b..3efa783 100644 --- a/src/views/assetManage/inventory/index.vue +++ b/src/views/assetManage/inventory/index.vue @@ -125,28 +125,27 @@ 资产图片 --> - -
- - - - 资产图片 - - +
+ + + + 资产图片 + + - -
- 默认图片 + +
+ 默认图片 +
-
@@ -155,7 +154,7 @@