diff --git a/demo/src/api/ad/sysAdServer.js b/demo/src/api/ad/sysAdServer.js index 1ae6e49..08bf3d1 100644 --- a/demo/src/api/ad/sysAdServer.js +++ b/demo/src/api/ad/sysAdServer.js @@ -2,7 +2,7 @@ import http from "@/libs/http"; class SysAdServer { async getAll(param) { - return await window.framework.httpget("/sys_ad/index", param); + return await window.framework.http.get("/sys_ad/index", param); } async add(row) { diff --git a/demo/src/api/ai/ai_messages_server.js b/demo/src/api/ai/ai_messages_server.js index 14d4d7c..4c2a76b 100644 --- a/demo/src/api/ai/ai_messages_server.js +++ b/demo/src/api/ai/ai_messages_server.js @@ -1,7 +1,7 @@ class ai_messagesClServer { async all(param) { - let res= await window.framework.httpget('/ai_messages/all', param); + let res= await window.framework.http.get('/ai_messages/all', param); return res; } diff --git a/demo/src/api/ball/games_server.js b/demo/src/api/ball/games_server.js index 55f4c47..b5c13bd 100644 --- a/demo/src/api/ball/games_server.js +++ b/demo/src/api/ball/games_server.js @@ -1,7 +1,7 @@ class gamesClServer { async all(param) { - let res= await window.framework.httpget('/gme_games/all', param); + let res= await window.framework.http.get('/gme_games/all', param); return res; } @@ -41,7 +41,7 @@ class gamesClServer { } async statistics() { - let res = await window.framework.httpget('/gme_games/statistics', {}); + let res = await window.framework.http.get('/gme_games/statistics', {}); return res; } } diff --git a/demo/src/api/ball/payment_orders_server.js b/demo/src/api/ball/payment_orders_server.js index dc9a01e..8ff1c43 100644 --- a/demo/src/api/ball/payment_orders_server.js +++ b/demo/src/api/ball/payment_orders_server.js @@ -1,7 +1,7 @@ class paymentOrdersClServer { async all(param) { - let res= await window.framework.httpget('/pay_orders/all', param); + let res= await window.framework.http.get('/pay_orders/all', param); return res; } diff --git a/demo/src/api/ball/venues_server.js b/demo/src/api/ball/venues_server.js index b7f0fb1..95783b3 100644 --- a/demo/src/api/ball/venues_server.js +++ b/demo/src/api/ball/venues_server.js @@ -1,7 +1,7 @@ class venuesClServer { async all(param) { - let res= await window.framework.httpget('/ven_venues/all', param); + let res= await window.framework.http.get('/ven_venues/all', param); return res; } diff --git a/demo/src/api/ball/wallet_transactions_server.js b/demo/src/api/ball/wallet_transactions_server.js index 1aca99c..902aac9 100644 --- a/demo/src/api/ball/wallet_transactions_server.js +++ b/demo/src/api/ball/wallet_transactions_server.js @@ -2,7 +2,7 @@ class walletTransactionsClServer { async all(param) { - let res= await window.framework.httpget('/wch_wallet_transactions/all', param); + let res= await window.framework.http.get('/wch_wallet_transactions/all', param); return res; } @@ -17,7 +17,7 @@ class walletTransactionsClServer { } async detail(id) { - let res= await window.framework.httpget('/wch_wallet_transactions/detail', { id }); + let res= await window.framework.http.get('/wch_wallet_transactions/detail', { id }); return res; } @@ -27,7 +27,7 @@ class walletTransactionsClServer { } async statistics() { - let res = await window.framework.httpget('/wch_wallet_transactions/statistics', {}); + let res = await window.framework.http.get('/wch_wallet_transactions/statistics', {}); return res; } } diff --git a/demo/src/api/ball/wallets_server.js b/demo/src/api/ball/wallets_server.js index a139ee4..1867ae9 100644 --- a/demo/src/api/ball/wallets_server.js +++ b/demo/src/api/ball/wallets_server.js @@ -2,7 +2,7 @@ class walletsClServer { async all(param) { - let res= await window.framework.httpget('/wch_wallets/all', param); + let res= await window.framework.http.get('/wch_wallets/all', param); return res; } @@ -27,7 +27,7 @@ class walletsClServer { } async statistics() { - let res = await window.framework.httpget('/wch_wallets/statistics', {}); + let res = await window.framework.http.get('/wch_wallets/statistics', {}); return res; } } diff --git a/demo/src/api/ball/wch_users_server.js b/demo/src/api/ball/wch_users_server.js index 31727e5..caa772f 100644 --- a/demo/src/api/ball/wch_users_server.js +++ b/demo/src/api/ball/wch_users_server.js @@ -1,7 +1,7 @@ class wch_usersClServer { async all(param) { - let res= await window.framework.httpget('/wch_users/all', param); + let res= await window.framework.http.get('/wch_users/all', param); return res; } diff --git a/demo/src/api/cote/info_server.js b/demo/src/api/cote/info_server.js index 004d980..96d55c5 100644 --- a/demo/src/api/cote/info_server.js +++ b/demo/src/api/cote/info_server.js @@ -1,7 +1,7 @@ class infoClServer { async all(param) { - let res= await window.framework.httpget('/inf_info/all', param); + let res= await window.framework.http.get('/inf_info/all', param); return res; } diff --git a/demo/src/api/cote/info_type_server.js b/demo/src/api/cote/info_type_server.js index 98fa068..8ec4c24 100644 --- a/demo/src/api/cote/info_type_server.js +++ b/demo/src/api/cote/info_type_server.js @@ -1,7 +1,7 @@ class info_typeClServer { async all(param) { - let res= await window.framework.httpget('/inf_info_type/all', param); + let res= await window.framework.http.get('/inf_info_type/all', param); return res; } diff --git a/demo/src/api/home/homeServer.js b/demo/src/api/home/homeServer.js index 4e0d743..7bdb530 100644 --- a/demo/src/api/home/homeServer.js +++ b/demo/src/api/home/homeServer.js @@ -2,22 +2,22 @@ import http from "@/libs/http"; class HomeServer { // 获取订单统计 async getOderCount() { - let res = await window.framework.httpget("/order/count"); + let res = await window.framework.http.get("/order/count"); return res; } async getUserCount() { - let res = await window.framework.httpget("/user/count"); + let res = await window.framework.http.get("/user/count"); return res; } async getSalesRank() { - let res = await window.framework.httpget("/index/salesRank"); + let res = await window.framework.http.get("/index/salesRank"); return res; } async userRecommendRank() { - let res = await window.framework.httpget("/index/userRecommendRank"); + let res = await window.framework.http.get("/index/userRecommendRank"); return res; } } diff --git a/demo/src/api/ntrp/ntr_questions_server.js b/demo/src/api/ntrp/ntr_questions_server.js index 3647d94..71af6c0 100644 --- a/demo/src/api/ntrp/ntr_questions_server.js +++ b/demo/src/api/ntrp/ntr_questions_server.js @@ -1,7 +1,7 @@ class ntr_questionsClServer { async all(param) { - let res= await window.framework.httpget('/ntr_questions/all', param); + let res= await window.framework.http.get('/ntr_questions/all', param); return res; } diff --git a/demo/src/api/ntrp/ntr_records_server.js b/demo/src/api/ntrp/ntr_records_server.js index 9c95796..504b878 100644 --- a/demo/src/api/ntrp/ntr_records_server.js +++ b/demo/src/api/ntrp/ntr_records_server.js @@ -1,7 +1,7 @@ class ntr_recordsClServer { async all(param) { - let res= await window.framework.httpget('/ntr_records/all', param); + let res= await window.framework.http.get('/ntr_records/all', param); return res; } diff --git a/demo/src/api/order/transfer_details_server.js b/demo/src/api/order/transfer_details_server.js index 467b98b..a14736c 100644 --- a/demo/src/api/order/transfer_details_server.js +++ b/demo/src/api/order/transfer_details_server.js @@ -1,7 +1,7 @@ class transfer_detailsClServer { async all(param) { - let res= await window.framework.httpget('/transfer_details/all', param); + let res= await window.framework.http.get('/transfer_details/all', param); return res; } diff --git a/demo/src/api/system/rolePermissionServer.js b/demo/src/api/system/rolePermissionServer.js index 5fd7179..6041193 100644 --- a/demo/src/api/system/rolePermissionServer.js +++ b/demo/src/api/system/rolePermissionServer.js @@ -1,12 +1,12 @@ import http from '@/libs/http' class RolePermissionServer { async getRoles(callback) { - let res = await window.framework.httpget('/SysRolePermission/Query', {}) + let res = await window.framework.http.get('/SysRolePermission/Query', {}) return res } async getRole(row) { - let res = await window.framework.httpget('/SysRolePermission/QueryByRoleId', row) + let res = await window.framework.http.get('/SysRolePermission/QueryByRoleId', row) return res } diff --git a/demo/src/api/system/roleServer.js b/demo/src/api/system/roleServer.js index 47ad35e..6e06022 100644 --- a/demo/src/api/system/roleServer.js +++ b/demo/src/api/system/roleServer.js @@ -1,7 +1,7 @@ import http from "@/libs/http"; class RoleServer { async list() { - let res = await window.framework.httpget("/sys_role/index", {}); + let res = await window.framework.http.get("/sys_role/index", {}); return res; } diff --git a/demo/src/api/system/sysAddressServer.js b/demo/src/api/system/sysAddressServer.js index 0ad8054..1fca5ee 100644 --- a/demo/src/api/system/sysAddressServer.js +++ b/demo/src/api/system/sysAddressServer.js @@ -1,7 +1,7 @@ import http from "@/libs/http"; class SysAddress { async index(param) { - let res = await window.framework.httpget("/sys_address/index", param); + let res = await window.framework.http.get("/sys_address/index", param); return res; } } diff --git a/demo/src/api/system/sysModuleServer.js b/demo/src/api/system/sysModuleServer.js index 8fdbaa1..6e6666f 100644 --- a/demo/src/api/system/sysModuleServer.js +++ b/demo/src/api/system/sysModuleServer.js @@ -1,12 +1,12 @@ import http from "@/libs/http"; class SysModuleServer { async all() { - let res = await window.framework.httpget("/sys_menu/all", {}); + let res = await window.framework.http.get("/sys_menu/all", {}); return res; } async list(row) { - let res = await window.framework.httpget("/sys_menu/all", row); + let res = await window.framework.http.get("/sys_menu/all", row); return res; } diff --git a/demo/src/api/system/sys_log_serve.js b/demo/src/api/system/sys_log_serve.js index 7dfc86f..2f35a9b 100644 --- a/demo/src/api/system/sys_log_serve.js +++ b/demo/src/api/system/sys_log_serve.js @@ -1,27 +1,27 @@ import http from "@/libs/http"; class SysLogServe { async all(param) { - let res = await window.framework.httpget("/sys_log/all", param); + let res = await window.framework.http.get("/sys_log/all", param); return res; } async detail(param) { - let res = await window.framework.httpget("/sys_log/detail", param); + let res = await window.framework.http.get("/sys_log/detail", param); return res; } async delete(param) { - let res = await window.framework.httpget("/sys_log/delete", param); + let res = await window.framework.http.get("/sys_log/delete", param); return res; } async delete_all(param) { - let res = await window.framework.httpget("/sys_log/delete_all", param); + let res = await window.framework.http.get("/sys_log/delete_all", param); return res; } async operates(param) { - let res = await window.framework.httpget("/sys_log/operates", param); + let res = await window.framework.http.get("/sys_log/operates", param); return res; } } diff --git a/demo/src/api/system/systemType_server.js b/demo/src/api/system/systemType_server.js index accabd4..f0918d9 100644 --- a/demo/src/api/system/systemType_server.js +++ b/demo/src/api/system/systemType_server.js @@ -1,7 +1,7 @@ class systemTypeClServer { async all(param) { - let res= await window.framework.httpget('/sys_project_type/all', param); + let res= await window.framework.http.get('/sys_project_type/all', param); return res; } diff --git a/demo/src/api/system/tableServer.js b/demo/src/api/system/tableServer.js index 73f77dc..797c772 100644 --- a/demo/src/api/system/tableServer.js +++ b/demo/src/api/system/tableServer.js @@ -1,7 +1,7 @@ import http from '@/libs/http' class TableServer { async getAll(callback) { - return await window.framework.httpget('/table/index', {}) + return await window.framework.http.get('/table/index', {}) } async add(row, callback) { @@ -19,11 +19,11 @@ class TableServer { } async autoApi(id) { - return await window.framework.httpget('/template/api', { id: id }) + return await window.framework.http.get('/template/api', { id: id }) } async autoDb(id) { - return await window.framework.httpget('/template/autoDb', { id: id }) + return await window.framework.http.get('/template/autoDb', { id: id }) } } diff --git a/demo/src/api/system/userServer.js b/demo/src/api/system/userServer.js index f6d4eca..f3723d6 100644 --- a/demo/src/api/system/userServer.js +++ b/demo/src/api/system/userServer.js @@ -6,7 +6,7 @@ class UserServer { } async all() { - let res = await window.framework.httpget("/sys_user/index", {}); + let res = await window.framework.http.get("/sys_user/index", {}); return res; } diff --git a/demo/src/api/system_high/formFieldServer.js b/demo/src/api/system_high/formFieldServer.js index f5379ed..cc594cf 100644 --- a/demo/src/api/system_high/formFieldServer.js +++ b/demo/src/api/system_high/formFieldServer.js @@ -1,7 +1,7 @@ import http from "@/libs/http"; class FormFieldServer { async all(param) { - let res = await window.framework.httpget("/sys_form_field/all", param); + let res = await window.framework.http.get("/sys_form_field/all", param); return res; } diff --git a/demo/src/api/system_high/formServer.js b/demo/src/api/system_high/formServer.js index 43d9986..fe17f71 100644 --- a/demo/src/api/system_high/formServer.js +++ b/demo/src/api/system_high/formServer.js @@ -1,7 +1,7 @@ import http from "@/libs/http"; class FormServer { async all(param) { - let res = await window.framework.httpget("/sys_form/all", param); + let res = await window.framework.http.get("/sys_form/all", param); return res; } diff --git a/demo/src/api/system_high/menuServer.js b/demo/src/api/system_high/menuServer.js index b44089b..18b88fd 100644 --- a/demo/src/api/system_high/menuServer.js +++ b/demo/src/api/system_high/menuServer.js @@ -2,7 +2,7 @@ import http from "@/libs/http"; class MenuServer { async list(row) { - let res = await window.framework.httpget("/sys_menu/index", row); + let res = await window.framework.http.get("/sys_menu/index", row); return res; } diff --git a/demo/src/api/system_high/modelFieldServer.js b/demo/src/api/system_high/modelFieldServer.js index cf3f3fb..8ecfd5e 100644 --- a/demo/src/api/system_high/modelFieldServer.js +++ b/demo/src/api/system_high/modelFieldServer.js @@ -1,12 +1,12 @@ import http from "@/libs/http"; class ModelFieldServer { async all(row) { - let res = await window.framework.httpget("/sys_model_field/all", row); + let res = await window.framework.http.get("/sys_model_field/all", row); return res; } async allByKey(row) { - let res = await window.framework.httpget("/sys_model_field/allByKey", row, { + let res = await window.framework.http.get("/sys_model_field/allByKey", row, { hideLoad: true }); return res; diff --git a/demo/src/api/system_high/modelServer.js b/demo/src/api/system_high/modelServer.js index 23af85f..c10639c 100644 --- a/demo/src/api/system_high/modelServer.js +++ b/demo/src/api/system_high/modelServer.js @@ -6,12 +6,12 @@ class ModelServer { } async all() { - let res = await window.framework.httpget("/sys_model/all", {}); + let res = await window.framework.http.get("/sys_model/all", {}); return res; } async detail(row) { - let res = await window.framework.httpget("/sys_model/detail", row); + let res = await window.framework.http.get("/sys_model/detail", row); return res; } diff --git a/demo/src/api/system_high/paramSetupServer.js b/demo/src/api/system_high/paramSetupServer.js index 66ee240..6cebf79 100644 --- a/demo/src/api/system_high/paramSetupServer.js +++ b/demo/src/api/system_high/paramSetupServer.js @@ -1,11 +1,11 @@ import http from "@/libs/http"; class ParamSetupServer { async getAll() { - return await window.framework.httpget("/sys_parameter/index", {}); + return await window.framework.http.get("/sys_parameter/index", {}); } async getOne(key) { - return await window.framework.httpget("/sys_parameter/key", { key }); + return await window.framework.http.get("/sys_parameter/key", { key }); } async add(row) { diff --git a/demo/src/api/system_high/sysControlTypeServer.js b/demo/src/api/system_high/sysControlTypeServer.js index 1b54b9f..2cd8ffb 100644 --- a/demo/src/api/system_high/sysControlTypeServer.js +++ b/demo/src/api/system_high/sysControlTypeServer.js @@ -1,7 +1,7 @@ import http from "@/libs/http"; class SysControlTypeServer { async all(param) { - let res = await window.framework.httpget("/sys_control_type/all", param); + let res = await window.framework.http.get("/sys_control_type/all", param); return res; } diff --git a/demo/src/api/users/recommend_blocks_server.js b/demo/src/api/users/recommend_blocks_server.js index 09246c0..0a7b16e 100644 --- a/demo/src/api/users/recommend_blocks_server.js +++ b/demo/src/api/users/recommend_blocks_server.js @@ -1,7 +1,7 @@ class recommend_blocksClServer { async all(param) { - let res= await window.framework.httpget('/recommend_blocks/all', param); + let res= await window.framework.http.get('/recommend_blocks/all', param); return res; } diff --git a/demo/src/api/users/user_follows_server.js b/demo/src/api/users/user_follows_server.js index bacaf93..18bc07c 100644 --- a/demo/src/api/users/user_follows_server.js +++ b/demo/src/api/users/user_follows_server.js @@ -1,7 +1,7 @@ class user_followsClServer { async all(param) { - let res= await window.framework.httpget('/user_follows/all', param); + let res= await window.framework.http.get('/user_follows/all', param); return res; } diff --git a/demo/src/api/users/user_tracking_server.js b/demo/src/api/users/user_tracking_server.js index 576e270..87a3206 100644 --- a/demo/src/api/users/user_tracking_server.js +++ b/demo/src/api/users/user_tracking_server.js @@ -1,7 +1,7 @@ class user_trackingClServer { async all(param) { - let res= await window.framework.httpget('/user_tracking/all', param); + let res= await window.framework.http.get('/user_tracking/all', param); return res; } diff --git a/demo/src/api/venues/wch_cities_server.js b/demo/src/api/venues/wch_cities_server.js index 6e4567b..8f89d0a 100644 --- a/demo/src/api/venues/wch_cities_server.js +++ b/demo/src/api/venues/wch_cities_server.js @@ -1,7 +1,7 @@ class wch_citiesClServer { async all(param) { - let res= await window.framework.httpget('/wch_cities/all', param); + let res= await window.framework.http.get('/wch_cities/all', param); return res; } diff --git a/src/api/system/rolePermissionServer.js b/src/api/system/rolePermissionServer.js index 61eefec..55b67be 100644 --- a/src/api/system/rolePermissionServer.js +++ b/src/api/system/rolePermissionServer.js @@ -1,12 +1,12 @@ import http from '@/utils/http' class RolePermissionServer { async getRoles(callback) { - let res = await window.framework.httpget('/SysRolePermission/Query', {}) + let res = await window.framework.http.get('/SysRolePermission/Query', {}) return res } async getRole(row) { - let res = await window.framework.httpget('/SysRolePermission/QueryByRoleId', row) + let res = await window.framework.http.get('/SysRolePermission/QueryByRoleId', row) return res } diff --git a/src/api/system/roleServer.js b/src/api/system/roleServer.js index 298db1b..3b995ab 100644 --- a/src/api/system/roleServer.js +++ b/src/api/system/roleServer.js @@ -1,7 +1,7 @@ import http from "@/utils/http"; class RoleServer { async list() { - let res = await window.framework.httpget("/sys_role/index", {}); + let res = await window.framework.http.get("/sys_role/index", {}); return res; } diff --git a/src/api/system/sysAddressServer.js b/src/api/system/sysAddressServer.js index 4e2b895..0fe88a6 100644 --- a/src/api/system/sysAddressServer.js +++ b/src/api/system/sysAddressServer.js @@ -1,7 +1,7 @@ import http from "@/utils/http"; class SysAddress { async index(param) { - let res = await window.framework.httpget("/sys_address/index", param); + let res = await window.framework.http.get("/sys_address/index", param); return res; } } diff --git a/src/api/system/sysModuleServer.js b/src/api/system/sysModuleServer.js index 57c87e6..4709a01 100644 --- a/src/api/system/sysModuleServer.js +++ b/src/api/system/sysModuleServer.js @@ -1,12 +1,12 @@ import http from "@/utils/http"; class SysModuleServer { async all() { - let res = await window.framework.httpget("/sys_menu/all", {}); + let res = await window.framework.http.get("/sys_menu/all", {}); return res; } async list(row) { - let res = await window.framework.httpget("/sys_menu/all", row); + let res = await window.framework.http.get("/sys_menu/all", row); return res; } diff --git a/src/api/system/sys_log_serve.js b/src/api/system/sys_log_serve.js index 4c5c9aa..1c50018 100644 --- a/src/api/system/sys_log_serve.js +++ b/src/api/system/sys_log_serve.js @@ -1,27 +1,27 @@ import http from "@/utils/http"; class SysLogServe { async all(param) { - let res = await window.framework.httpget("/sys_log/all", param); + let res = await window.framework.http.get("/sys_log/all", param); return res; } async detail(param) { - let res = await window.framework.httpget("/sys_log/detail", param); + let res = await window.framework.http.get("/sys_log/detail", param); return res; } async delete(param) { - let res = await window.framework.httpget("/sys_log/delete", param); + let res = await window.framework.http.get("/sys_log/delete", param); return res; } async delete_all(param) { - let res = await window.framework.httpget("/sys_log/delete_all", param); + let res = await window.framework.http.get("/sys_log/delete_all", param); return res; } async operates(param) { - let res = await window.framework.httpget("/sys_log/operates", param); + let res = await window.framework.http.get("/sys_log/operates", param); return res; } } diff --git a/src/api/system/systemType_server.js b/src/api/system/systemType_server.js index 17fc674..bf18955 100644 --- a/src/api/system/systemType_server.js +++ b/src/api/system/systemType_server.js @@ -1,7 +1,7 @@ import http from '@/utils/http'; class systemTypeClServer { async all(param) { - let res= await window.framework.httpget('/sys_project_type/all', param); + let res= await window.framework.http.get('/sys_project_type/all', param); return res; } diff --git a/src/api/system/tableServer.js b/src/api/system/tableServer.js index c47208d..fecdfd5 100644 --- a/src/api/system/tableServer.js +++ b/src/api/system/tableServer.js @@ -1,7 +1,7 @@ import http from '@/utils/http' class TableServer { async getAll(callback) { - return await window.framework.httpget('/table/index', {}) + return await window.framework.http.get('/table/index', {}) } async add(row, callback) { @@ -19,11 +19,11 @@ class TableServer { } async autoApi(id) { - return await window.framework.httpget('/template/api', { id: id }) + return await window.framework.http.get('/template/api', { id: id }) } async autoDb(id) { - return await window.framework.httpget('/template/autoDb', { id: id }) + return await window.framework.http.get('/template/autoDb', { id: id }) } } diff --git a/src/api/system/userServer.js b/src/api/system/userServer.js index 86f597f..d24c63d 100644 --- a/src/api/system/userServer.js +++ b/src/api/system/userServer.js @@ -6,7 +6,7 @@ class UserServer { } async all() { - let res = await window.framework.httpget("/sys_user/index", {}); + let res = await window.framework.http.get("/sys_user/index", {}); return res; } diff --git a/src/api/system_high/formFieldServer.js b/src/api/system_high/formFieldServer.js index 09022f9..ea05701 100644 --- a/src/api/system_high/formFieldServer.js +++ b/src/api/system_high/formFieldServer.js @@ -1,7 +1,7 @@ import http from "@/utils/http"; class FormFieldServer { async all(param) { - let res = await window.framework.httpget("/sys_form_field/all", param); + let res = await window.framework.http.get("/sys_form_field/all", param); return res; } diff --git a/src/api/system_high/formServer.js b/src/api/system_high/formServer.js index c7e57a4..5607af7 100644 --- a/src/api/system_high/formServer.js +++ b/src/api/system_high/formServer.js @@ -1,7 +1,7 @@ import http from "@/utils/http"; class FormServer { async all(param) { - let res = await window.framework.httpget("/sys_form/all", param); + let res = await window.framework.http.get("/sys_form/all", param); return res; } diff --git a/src/api/system_high/menuServer.js b/src/api/system_high/menuServer.js index d99d9ba..f94823b 100644 --- a/src/api/system_high/menuServer.js +++ b/src/api/system_high/menuServer.js @@ -2,7 +2,7 @@ import http from "@/utils/http"; class MenuServer { async list(row) { - let res = await window.framework.httpget("/sys_menu/index", row); + let res = await window.framework.http.get("/sys_menu/index", row); return res; } diff --git a/src/api/system_high/modelFieldServer.js b/src/api/system_high/modelFieldServer.js index 800dfea..d451b93 100644 --- a/src/api/system_high/modelFieldServer.js +++ b/src/api/system_high/modelFieldServer.js @@ -1,12 +1,12 @@ import http from "@/utils/http"; class ModelFieldServer { async all(row) { - let res = await window.framework.httpget("/sys_model_field/all", row); + let res = await window.framework.http.get("/sys_model_field/all", row); return res; } async allByKey(row) { - let res = await window.framework.httpget("/sys_model_field/allByKey", row, { + let res = await window.framework.http.get("/sys_model_field/allByKey", row, { hideLoad: true }); return res; diff --git a/src/api/system_high/modelServer.js b/src/api/system_high/modelServer.js index 438cfef..0e2a4b6 100644 --- a/src/api/system_high/modelServer.js +++ b/src/api/system_high/modelServer.js @@ -6,12 +6,12 @@ class ModelServer { } async all() { - let res = await window.framework.httpget("/sys_model/all", {}); + let res = await window.framework.http.get("/sys_model/all", {}); return res; } async detail(row) { - let res = await window.framework.httpget("/sys_model/detail", row); + let res = await window.framework.http.get("/sys_model/detail", row); return res; } diff --git a/src/api/system_high/paramSetupServer.js b/src/api/system_high/paramSetupServer.js index 21ff496..e149ad6 100644 --- a/src/api/system_high/paramSetupServer.js +++ b/src/api/system_high/paramSetupServer.js @@ -1,11 +1,11 @@ import http from "@/utils/http"; class ParamSetupServer { async getAll() { - return await window.framework.httpget("/sys_parameter/index", {}); + return await window.framework.http.get("/sys_parameter/index", {}); } async getOne(key) { - return await window.framework.httpget("/sys_parameter/key", { key }); + return await window.framework.http.get("/sys_parameter/key", { key }); } async add(row) { diff --git a/src/api/system_high/sysControlTypeServer.js b/src/api/system_high/sysControlTypeServer.js index b0be274..4761c59 100644 --- a/src/api/system_high/sysControlTypeServer.js +++ b/src/api/system_high/sysControlTypeServer.js @@ -1,7 +1,7 @@ import http from "@/utils/http"; class SysControlTypeServer { async all(param) { - let res = await window.framework.httpget("/sys_control_type/all", param); + let res = await window.framework.http.get("/sys_control_type/all", param); return res; } diff --git a/src/utils/uiTool.js b/src/utils/uiTool.js index de33d14..319ae79 100644 --- a/src/utils/uiTool.js +++ b/src/utils/uiTool.js @@ -244,10 +244,27 @@ export default class uiTool { let menus = uiTool.transformTree(authorityMenus) let curRoutes = uiTool.menuToRoute(menus, ParentView, Page404) - // 合并权限路由,保留默认 home 路由 + // 递归检查所有层级中是否有首页路由 + const hasHomeInRoutes = (routes) => { + if (!routes || !Array.isArray(routes)) return false + + for (let route of routes) { + // 检查当前路由的 path + if (route.path === '/home' || route.path === 'home') { + return true + } + // 递归检查子路由 + if (route.children && route.children.length > 0) { + if (hasHomeInRoutes(route.children)) { + return true + } + } + } + return false + } + const homeRoute = mainRoute.children.find(r => r.path === '/home') - // 检查权限路由中是否有首页(基于 path 判断) - const hasHome = curRoutes.some(r => r.path === '/home' || r.path === 'home') + const hasHome = hasHomeInRoutes(curRoutes) if (hasHome) { // 如果权限路由中有 home,使用权限路由的 home(不添加默认首页)