From bd25d9a8a058e8c618ee4188ed5f15a898c0f7e8 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期六, 27 一月 2024 11:43:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
platform/src/api/system/menu.js | 17 ++++++++++++++---
1 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/platform/src/api/system/menu.js b/platform/src/api/system/menu.js
index adad7ad..ad94c4b 100644
--- a/platform/src/api/system/menu.js
+++ b/platform/src/api/system/menu.js
@@ -1,13 +1,19 @@
import request from '@/utils/request'
+<<<<<<< HEAD
// 鏌ヨ----骞冲彴鑿滃崟
export function fetchTree () {
- return request.post(`/system/menu/treeList/0`)
+ return request.post('/system/menu/treeList/0')
}
// 鏌ヨ----浼佷笟鑿滃崟
export function fetchTree1 () {
- return request.post(`/system/menu/treeList/1`)
+ return request.post('/system/menu/treeList/1')
+=======
+// 鏌ヨ
+export function fetchTree (data, type) {
+ return request.post(`/system/menu/treeList/${type}`, data)
+>>>>>>> c6c95a49be6194989c124b8fd316fb5d434bd153
}
// 鏂板缓
@@ -40,8 +46,13 @@
}
// 鏌ヨ鑿滃崟鏍�
+<<<<<<< HEAD
export function fetchMenuTree () {
- return request.get('/system/menu/treeNodes?type=0')
+ return request.get('/system/menu/treeNodes?type=1')
+=======
+export function fetchMenuTree (params) {
+ return request.get('/system/menu/treeNodes', { params })
+>>>>>>> c6c95a49be6194989c124b8fd316fb5d434bd153
}
// 鎺掑簭
--
Gitblit v1.9.3