From 112bb1d3ca7e5c813adc9514f6b56b5e4886f49b Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期二, 12 八月 2025 10:26:29 +0800
Subject: [PATCH] Merge branch 'Dev' of http://101.37.171.70:10101/r/~jhz/STUWMS into Dev
---
utils/menuListApp.js | 125 +++++++++++++++++++++++------------------
1 files changed, 69 insertions(+), 56 deletions(-)
diff --git a/utils/menuListApp.js b/utils/menuListApp.js
index 00e8f97..14d15eb 100644
--- a/utils/menuListApp.js
+++ b/utils/menuListApp.js
@@ -10,58 +10,13 @@
menuName,
HType = "APP"
}) {
- CommonUtils.doRequest2({
- url: '',
- data: {
- HMakeName: user,
- menuName,
- HType
- },
- (res) => {
- let {
- data,
- count,
- Message
- } = res.data;
- if (count == 1) {
- uni.showToast({
- icon: 'none',
- Message: Message
- })
- return data;
- } else {
- uni.showToast({
- icon: 'none',
- Message: Message
- })
- return;
- }
- }
- })()
-}
-
-export function setMenuList({
- user = getUserInfo()['Czymc'],
- menuName,
- type = "APP",
- payload
-}) {
- let oMainSub = []
- Array.from(payload).forEach((one, index) => {
- if (one.hidden == true) {
- oMainSub.push({
- HEntryID: one.id,
- HIndex: index
- HMenuName: one.text
- HPicNum: one.img
- HShowMode: !one.hidden
- })
- })
- // string oMain =
+ return new Promise((resolve, reject) => {
CommonUtils.doRequest2({
- url: '/Web/SetMenuList_APP',
+ url: '/Web/MenuList_APP',
data: {
- oMain: oMain
+ HMaker: user,
+ HMenuListName: menuName,
+ HType
},
resFunction: (res) => {
let {
@@ -70,11 +25,69 @@
Message
} = res.data;
if (count == 1) {
-
+ // uni.showToast({
+ // icon: 'none',
+ // Message: Message
+ // })
+ resolve(data)
} else {
-
+ uni.showToast({
+ icon: 'none',
+ Message: Message
+ })
+ reject()
}
- },
- method: 'POST'
- })()
- }
\ No newline at end of file
+ }
+ })
+ })
+}
+
+export function setMenuList({
+ user = getUserInfo()['Czymc'],
+ menuName,
+ deviceType = "APP",
+ payload
+}) {
+ let oMain = ""
+ let oMainSub = []
+ Array.from(payload).forEach((one, index) => {
+ if (one.hidden == true) {
+ oMainSub.push({
+ HEntryID: one.id,
+ HIndex: index,
+ HName: one.text,
+ HPicNum: one.img,
+ HShowMode: !one.hidden,
+ HMenuName: menuName,
+ })
+ }
+ })
+ oMain = JSON.stringify(oMainSub) + ";" + user + ";" + menuName + ";" +
+ deviceType
+ // string oMain =
+ CommonUtils.doRequest2({
+ url: '/Web/SetMenuList_APP',
+ data: {
+ oMain: oMain
+ },
+ resFunction: (res) => {
+ let {
+ data,
+ count,
+ Message
+ } = res.data;
+ if (count == 1) {
+ uni.showToast({
+ icon: 'none',
+ title: Message
+ })
+ } else {
+ uni.showToast({
+ icon: 'none',
+ Message: Message
+ })
+ }
+ },
+ method: 'POST'
+ })
+}
\ No newline at end of file
--
Gitblit v1.9.1