From 9a11f818f304bc13bbd920313792e9560734922f Mon Sep 17 00:00:00 2001
From: hcong <1050828145@qq.com>
Date: 星期五, 27 九月 2024 15:31:25 +0800
Subject: [PATCH] 合并冲突
---
src/api/fysp/userApi.js | 22 ++++++++++++++++++----
1 files changed, 18 insertions(+), 4 deletions(-)
diff --git a/src/api/fysp/userApi.js b/src/api/fysp/userApi.js
index 758b4c2..fc38ad2 100644
--- a/src/api/fysp/userApi.js
+++ b/src/api/fysp/userApi.js
@@ -5,27 +5,41 @@
* 鑾峰彇鐢ㄦ埛璇︽儏
*/
getUserById(id) {
- return $fysp.get(`userinfo/${id}`);
+ return $fysp.get(`userinfo/${id}`).then((res) => res.data);
},
/**
* 鏇存柊鐢ㄦ埛璇︽儏
*/
updateUser(user) {
- return $fysp.post(`userinfo`, user);
+ return $fysp.post(`userinfo`, user).then((res) => res.data);
},
/**
* 鑾峰彇鍦烘櫙鐨勭敤鎴疯鎯�
*/
getUserByScene(sId) {
- return $fysp.get(`userinfo/scene/get?sceneId=${sId}`);
+ return $fysp.get(`userinfo/scene/get?sceneId=${sId}`).then((res) => res.data);
},
/**
* 鑷姩鍒涘缓璐︽埛
*/
autoCreateAccount(sId) {
- return $fysp.post(`userinfo/create?sceneId=${sId}`);
+ return $fysp.post(`userinfo/create?sceneId=${sId}`).then((res) => res.data);
+ },
+
+ /**
+ * 鐢ㄦ埛妯＄硦鎼滅储
+ * @param {object} area 鍖哄煙鑼冨洿鏉′欢
+ * @param {String} keyword 鎼滅储鍏抽敭瀛�
+ * @param {Number} userType 鐢ㄦ埛绫诲瀷锛岄粯璁�3锛氫紒涓�
+ * @returns
+ */
+ searchUser(area, keyword, page = 1, perPage = 20, userType = 3) {
+ const param = `?keyword=${keyword}&userType=${userType}&page=${page}&per_page=${perPage}`
+ return $fysp
+ .post(`userinfo/search${param}`, area)
+ .then((res) => res.data);
}
};
--
Gitblit v1.9.3