From 5f7b4be87d2a9567f1c26567acf7feb95ec1407e Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Thu, 08 Jan 2026 16:38:46 +0800
Subject: [PATCH] Merge branch 'master' of http://139.196.74.78:10010/r/jagzwxm/ja_web
---
uniapps/work-app/src/api/user/index.js | 28 ++++++++++++++++++++++++----
1 files changed, 24 insertions(+), 4 deletions(-)
diff --git a/uniapps/work-app/src/api/user/index.js b/uniapps/work-app/src/api/user/index.js
index 7597dc1..faa8ce7 100644
--- a/uniapps/work-app/src/api/user/index.js
+++ b/uniapps/work-app/src/api/user/index.js
@@ -26,7 +26,7 @@
// 用户登录接口
export const loginByUsername = (tenantId, deptId, roleId, username, password, type, key, code) => {
return request({
- url: '/blade-auth/oauth/token',
+ url: '/auth/login',
method: 'post',
header: {
'Tenant-Id': tenantId,
@@ -35,10 +35,12 @@
'Captcha-Key': key,
'Captcha-Code': code,
},
- params: {
+ data: {
tenantId,
username,
password,
+ checkCode:'',
+ mobile: false,
grant_type: 'password',
scope: 'all',
type,
@@ -47,13 +49,13 @@
}
export const getUserInfo = () => {
return request({
- url: '/blade-system/user/info',
+ url: '/system/user/getInfo',
method: 'get',
});
};
export const updateInfo = row => {
return request({
- url: '/blade-system/user/update-info',
+ url: '/system/user/profile/update',
method: 'post',
data: row,
});
@@ -70,6 +72,24 @@
});
};
+// 微信登录接口
+export const loginByWechat = (code) => {
+ return request({
+ url: '/blade-auth/oauth/token',
+ method: 'post',
+ header: {
+ 'Tenant-Id': '000000',
+ },
+ params: {
+ tenantId: '000000',
+ code,
+ grant_type: 'wechat',
+ scope: 'all',
+ type: 'wechat',
+ },
+ });
+};
+
// 发送通话信息
export const sendVoiceCallApi = (data) => {
return request({
--
Gitblit v1.9.3