From cbf468d0cb7bf676287f0314bdf263b84cf89a7f Mon Sep 17 00:00:00 2001
From: zzyuan <781948537@qq.com>
Date: Wed, 16 Apr 2025 13:25:19 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=AF=B9=E6=8E=A5=EF=BC=88?=
=?UTF-8?q?=E8=90=A5=E5=85=BB-=E5=8E=9F=E6=96=99=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/api/dish/dish.js | 14 ++---
src/api/dish/material.js | 2 +-
src/api/dish/nutritionInfo.js | 24 ++++----
.../account/accountManager/expired.vue | 2 +-
.../account/accountManager/index.vue | 6 +-
.../account/accountManager/logoff.vue | 2 +-
.../account/tradeRecords/index.vue | 2 +-
.../accountCenter/account/wallet/index.vue | 4 +-
src/views/accountCenter/butie/butie/index.vue | 8 +--
.../butie/butieRecordsTab/index.vue | 4 +-
.../butie/butieSummary/index.vue | 4 +-
.../consume/consumeSummary/index.vue | 4 +-
.../consume/consumerWalletSummary/index.vue | 4 +-
.../accountCenter/consume/deduct/index.vue | 6 +-
.../accountCenter/consume/trade/index.vue | 4 +-
.../accountCenter/freeze/freeze/index.vue | 8 +--
.../freeze/freezeAccount/index.vue | 2 +-
.../freeze/unfreezeAccount/index.vue | 2 +-
src/views/dish/dish/index.vue | 22 ++++----
.../material/components/MaterialDialog.vue | 34 ++++++------
src/views/dish/nutritionInfo/index.vue | 55 +++++++++++--------
src/views/order/offlineManagement/index.vue | 4 +-
src/views/order/reserveManagement/index.vue | 4 +-
src/views/superstore/super/index.vue | 4 +-
src/views/superstore/superOrder/index.vue | 2 +-
src/views/system/user/index.vue | 4 +-
26 files changed, 122 insertions(+), 109 deletions(-)
diff --git a/src/api/dish/dish.js b/src/api/dish/dish.js
index 0b6b5e8e..2908ae40 100644
--- a/src/api/dish/dish.js
+++ b/src/api/dish/dish.js
@@ -72,12 +72,12 @@ export function removeMenuDishesTypeApi(typeId) {
// 菜品列表-分页
export function getMenuDishesListApi(data) {
return request({
- url: '/smart-canteen/api/v2/menudishes/page',
- method: 'post',
+ url: '/smart-canteen/menu_dishes/list',
+ method: 'get',
headers: {
"merchant-id":"378915229716713472",
},
- data: data
+ params: data
})
}
// 菜品列表-新增
@@ -94,7 +94,7 @@ export function addMenuDishesApi(data) {
// 菜品列表-修改
export function editMenuDishesApi(data) {
return request({
- url: '/smart-canteen/api/v2/menudishes/edit',
+ url: '/smart-canteen/menu_dishes/edit',
method: 'post',
headers: {
"merchant-id":"378915229716713472",
@@ -115,14 +115,14 @@ export function menuDishesDetailApi(data) {
}
// 菜品列表-删除
-export function removeMenuDishesApi(dishesId) {
+export function removeMenuDishesApi(data) {
return request({
- url: '/smart-canteen/api/v2/menudishes/remove/'+dishesId,
+ url: '/smart-canteen/menu_dishes/del',
method: 'post',
headers: {
"merchant-id":"378915229716713472",
},
- // data: data
+ data: data
})
}
diff --git a/src/api/dish/material.js b/src/api/dish/material.js
index 7479c2f4..7866aad9 100644
--- a/src/api/dish/material.js
+++ b/src/api/dish/material.js
@@ -118,7 +118,7 @@ export function batchUpdateMaterialApi(data) {
//{current: 1, size: -1, ifListUse: 1, areaId: '421488254718578688'}
export function getDrpUnitListApi(data) {
return request({
- url: '/smart-canteen/api/v1/drpunit/page',
+ url: '/smart-canteen/menu_material/getDrpUnit',
method: 'post',
headers: {
"merchant-id":"378915229716713472",
diff --git a/src/api/dish/nutritionInfo.js b/src/api/dish/nutritionInfo.js
index 01d6c91b..15641fdf 100644
--- a/src/api/dish/nutritionInfo.js
+++ b/src/api/dish/nutritionInfo.js
@@ -49,9 +49,9 @@ export function listNutrition(query) {
// 查询详细
export function getNutrition(data) {
return request({
- url: '/smart-canteen/menu_nutrition_type/getInfo',
- method: 'get',
- params: data
+ url: '/smart-canteen/menu_nutrition/getInfo',
+ method: 'post',
+ data: data
})
}
@@ -86,17 +86,17 @@ export function delNutrition(data) {
// 获取所有营养信息
export function nutritionAllListApi(data) {
return request({
- url: '/smart-canteen/api/v1/menunutrition/all/list',
+ url: '/smart-canteen/menu_nutrition/getListByCategoryId',
method: 'post',
data: data
})
}
-// 获取营养信息-详细数据
-export function nutritionDetailApi(nutritionId) {
- return request({
- url: '/smart-canteen/api/v1/menumaterial/nutrition/detail/'+nutritionId,
- method: 'post',
- // data: data
- })
-}
+// // 获取营养信息-详细数据
+// export function nutritionDetailApi(nutritionId) {
+// return request({
+// url: '/smart-canteen/api/v1/menumaterial/nutrition/detail/'+nutritionId,
+// method: 'post',
+// // data: data
+// })
+// }
diff --git a/src/views/accountCenter/account/accountManager/expired.vue b/src/views/accountCenter/account/accountManager/expired.vue
index a2807635..c2133555 100644
--- a/src/views/accountCenter/account/accountManager/expired.vue
+++ b/src/views/accountCenter/account/accountManager/expired.vue
@@ -122,7 +122,7 @@
-
+
-
+
@@ -262,7 +262,7 @@
-
+
-
+
diff --git a/src/views/accountCenter/account/wallet/index.vue b/src/views/accountCenter/account/wallet/index.vue
index 26f43d30..ac6b30e9 100644
--- a/src/views/accountCenter/account/wallet/index.vue
+++ b/src/views/accountCenter/account/wallet/index.vue
@@ -87,7 +87,7 @@
-->
-
+
@@ -258,7 +258,7 @@
export default {
name: "",
- dicts: ['user_psn_type'],
+ dicts: ['sys_user_type'],
data() {
return {
// 遮罩层
diff --git a/src/views/accountCenter/butie/butie/index.vue b/src/views/accountCenter/butie/butie/index.vue
index dd552d97..cf41a690 100644
--- a/src/views/accountCenter/butie/butie/index.vue
+++ b/src/views/accountCenter/butie/butie/index.vue
@@ -79,7 +79,7 @@
-
+
-
+
@@ -240,7 +240,7 @@
-
+
{
- this.tableList = response.data.records;
- this.total = Number(response.data.total);
+ this.tableList = response.rows;
+ this.total = Number(response.total);
this.loading = false;
});
},
diff --git a/src/views/dish/material/components/MaterialDialog.vue b/src/views/dish/material/components/MaterialDialog.vue
index 6068c988..8252569b 100644
--- a/src/views/dish/material/components/MaterialDialog.vue
+++ b/src/views/dish/material/components/MaterialDialog.vue
@@ -288,7 +288,7 @@