From 79aba88041e5341a053132a773927a9463ecaa04 Mon Sep 17 00:00:00 2001
From: zzyuan <781948537@qq.com>
Date: Wed, 9 Apr 2025 10:52:27 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=AF=B9=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/accountCenter/manager.js       | 13 ----------
 src/api/base/mobile.js                 | 33 -----------------------
 src/api/dish/dish.js                   | 34 ------------------------
 src/api/dish/material.js               | 12 ---------
 src/api/dish/menu.js                   | 36 ++------------------------
 src/api/dish/nutritionInfo.js          | 24 +++++++++--------
 src/api/order/offline.js               | 34 ------------------------
 src/api/order/reserve.js               | 34 ------------------------
 src/views/dish/nutritionInfo/index.vue | 20 +++++++-------
 9 files changed, 25 insertions(+), 215 deletions(-)

diff --git a/src/api/accountCenter/manager.js b/src/api/accountCenter/manager.js
index 801067a2..3307d758 100644
--- a/src/api/accountCenter/manager.js
+++ b/src/api/accountCenter/manager.js
@@ -1,18 +1,5 @@
 import request from '@/utils/request'
 
-// 系统区域权限树
-export function systemAreaTreeApi(data) {
-  return request({
-    url: '/smart-canteen/api/v2/alloc/area/system-auth/tree',
-    method: 'post',
-    headers: {
-      "merchant-id":"378915229716713472",
-    },
-    data: data
-  })
-}
- 
-
 // 注销过期用户数量
 export function accInfoOperateCountApi(data) {
   return request({
diff --git a/src/api/base/mobile.js b/src/api/base/mobile.js
index e319ee50..117289df 100644
--- a/src/api/base/mobile.js
+++ b/src/api/base/mobile.js
@@ -1,38 +1,5 @@
 import request from '@/utils/request'
 
-// 系统区域权限树
-export function systemAreaTreeApi(data) {
-  return request({
-    url: '/smart-canteen/api/v2/alloc/area/system-auth/tree',
-    method: 'post',
-    headers: {
-      "merchant-id":"378915229716713472",
-    },
-    data: data
-  })
-}
-// 通过区域Id查询食堂
-export function getCanteenByAreaApi(data) {
-  return request({
-    url: '/smart-canteen/api/v2/alloc/canteen/list-all-auth-canteen',
-    method: 'post',
-    headers: {
-        "merchant-id":"378915229716713472",
-    },
-    data: data
-  })
-}
-// 通过食堂Id查询档口
-export function getStallByCanteenApi(data) {
-  return request({
-    url: '/smart-canteen/api/v2/alloc/canteen/list-multiple-auth-stall',
-    method: 'post',
-    headers: {
-        "merchant-id":"378915229716713472",
-    },
-    data: data
-  })
-}
 // 来源下拉数据
 export function getSourceTypeListApi(data) {
   return request({
diff --git a/src/api/dish/dish.js b/src/api/dish/dish.js
index cc24ee89..9d982522 100644
--- a/src/api/dish/dish.js
+++ b/src/api/dish/dish.js
@@ -58,40 +58,6 @@ export function removeMenuDishesTypeApi(typeId) {
     //   data: data
     })
 }
-
-// 系统区域权限树
-export function systemAreaTreeApi(data) {
-  return request({
-    url: '/smart-canteen/api/v2/alloc/area/system-auth/tree',
-    method: 'post',
-    headers: {
-      "merchant-id":"378915229716713472",
-    },
-    data: data
-  })
-}
-// 通过区域Id查询食堂
-export function getCanteenByAreaApi(data) {
-  return request({
-    url: '/smart-canteen/api/v2/alloc/canteen/list-all-auth-canteen',
-    method: 'post',
-    headers: {
-        "merchant-id":"378915229716713472",
-    },
-    data: data
-  })
-}
-// 通过食堂Id查询档口
-export function getStallByCanteenApi(data) {
-  return request({
-    url: '/smart-canteen/api/v2/alloc/canteen/list-multiple-auth-stall',
-    method: 'post',
-    headers: {
-        "merchant-id":"378915229716713472",
-    },
-    data: data
-  })
-}
  
 
 // 菜品列表-分页
diff --git a/src/api/dish/material.js b/src/api/dish/material.js
index 8dd13bd9..7608d256 100644
--- a/src/api/dish/material.js
+++ b/src/api/dish/material.js
@@ -45,18 +45,6 @@ export function removeMaterialTypeApi(data) {
   })
 }
 
-// 系统区域权限树
-export function systemAreaTreeApi(data) {
-  return request({
-    url: '/smart-canteen/api/v2/alloc/area/system-auth/tree',
-    method: 'post',
-    headers: {
-      "merchant-id":"378915229716713472",
-    },
-    data: data
-  })
-}
-
 // 查询原料列表
 export function getMaterialListApi(data) {
     return request({
diff --git a/src/api/dish/menu.js b/src/api/dish/menu.js
index 478af5ea..dcb9b566 100644
--- a/src/api/dish/menu.js
+++ b/src/api/dish/menu.js
@@ -21,40 +21,8 @@ export function menuTypeListApi(data) {
       },
       data: data
     })
-}
-// 系统区域权限树
-export function systemAreaTreeApi(data) {
-  return request({
-    url: '/smart-canteen/api/v2/alloc/area/system-auth/tree',
-    method: 'post',
-    headers: {
-      "merchant-id":"378915229716713472",
-    },
-    data: data
-  })
-}
-// 通过区域Id查询食堂
-export function getCanteenByAreaApi(data) {
-  return request({
-    url: '/smart-canteen/api/v2/alloc/canteen/list-all-auth-canteen',
-    method: 'post',
-    headers: {
-        "merchant-id":"378915229716713472",
-    },
-    data: data
-  })
-}
-// 通过食堂Id查询档口
-export function getStallByCanteenApi(data) {
-  return request({
-    url: '/smart-canteen/api/v2/alloc/canteen/list-multiple-auth-stall',
-    method: 'post',
-    headers: {
-        "merchant-id":"378915229716713472",
-    },
-    data: data
-  })
-}
+} 
+
 // 用户范围
 export function getmkteffectiveApi(data) {
     return request({
diff --git a/src/api/dish/nutritionInfo.js b/src/api/dish/nutritionInfo.js
index ede0b09b..cd3e99f3 100644
--- a/src/api/dish/nutritionInfo.js
+++ b/src/api/dish/nutritionInfo.js
@@ -1,11 +1,20 @@
 import request from '@/utils/request'
 
+// 获取营养信息类别
+export function typeListApi(data) {
+  return request({
+    url: '/smart-canteen/menu_nutrition_type/nutritionTypeList',
+    method: 'post',
+    data: data
+  })
+}
+
 // 查询获取所有营养信息
 export function listNutrition(query) {
   return request({
-    url: '/smart-canteen/api/v1/menunutrition/getMenuNutritionPage',
-    method: 'post',
-    data: query
+    url: '/smart-canteen/menu_nutrition/list',
+    method: 'get',
+    param: query
   })
 }
 
@@ -45,14 +54,7 @@ export function delNutrition(data) {
   })
 }
 
-// 获取营养信息类别
-export function typeList(data) {
-  return request({
-    url: '/smart-canteen/api/v1/menunutrition/all/type/list',
-    method: 'post',
-    data: data
-  })
-}
+
 // 获取所有营养信息
 export function nutritionAllListApi(data) {
   return request({
diff --git a/src/api/order/offline.js b/src/api/order/offline.js
index 02495b41..0eac9134 100644
--- a/src/api/order/offline.js
+++ b/src/api/order/offline.js
@@ -1,39 +1,5 @@
 import request from '@/utils/request'
 
-// 系统区域权限树
-export function systemAreaTreeApi(data) {
-  return request({
-    url: '/smart-canteen/api/v2/alloc/area/system-auth/tree',
-    method: 'post',
-    headers: {
-      "merchant-id":"378915229716713472",
-    },
-    data: data
-  })
-}
-// 通过区域Id查询食堂
-export function getCanteenByAreaApi(data) {
-  return request({
-    url: '/smart-canteen/api/v2/alloc/canteen/list-all-auth-canteen',
-    method: 'post',
-    headers: {
-        "merchant-id":"378915229716713472",
-    },
-    data: data
-  })
-}
-// 通过食堂Id查询档口
-export function getStallByCanteenApi(data) {
-  return request({
-    url: '/smart-canteen/api/v2/alloc/canteen/list-multiple-auth-stall',
-    method: 'post',
-    headers: {
-        "merchant-id":"378915229716713472",
-    },
-    data: data
-  })
-}
-
 // 订单状态
 export function orderStateListApi(data) {
     return request({
diff --git a/src/api/order/reserve.js b/src/api/order/reserve.js
index a78da575..13a5a6ca 100644
--- a/src/api/order/reserve.js
+++ b/src/api/order/reserve.js
@@ -1,39 +1,5 @@
 import request from '@/utils/request'
 
-// 系统区域权限树
-export function systemAreaTreeApi(data) {
-  return request({
-    url: '/smart-canteen/api/v2/alloc/area/system-auth/tree',
-    method: 'post',
-    headers: {
-      "merchant-id":"378915229716713472",
-    },
-    data: data
-  })
-}
-// 通过区域Id查询食堂
-export function getCanteenByAreaApi(data) {
-  return request({
-    url: '/smart-canteen/api/v2/alloc/canteen/list-all-auth-canteen',
-    method: 'post',
-    headers: {
-        "merchant-id":"378915229716713472",
-    },
-    data: data
-  })
-}
-// 通过食堂Id查询档口
-export function getStallByCanteenApi(data) {
-  return request({
-    url: '/smart-canteen/api/v2/alloc/canteen/list-multiple-auth-stall',
-    method: 'post',
-    headers: {
-        "merchant-id":"378915229716713472",
-    },
-    data: data
-  })
-}
-
 // 订单类型
 export function orderTypeListApi(data) {
     return request({
diff --git a/src/views/dish/nutritionInfo/index.vue b/src/views/dish/nutritionInfo/index.vue
index 8296051e..698f706e 100644
--- a/src/views/dish/nutritionInfo/index.vue
+++ b/src/views/dish/nutritionInfo/index.vue
@@ -50,7 +50,7 @@
     <el-table v-loading="loading" :data="menuNutritionList" height="650"> 
       <el-table-column label="序号" align="center" width="80" type="index">
             <template slot-scope="scope">
-                <span>{{(queryParams.current - 1) * queryParams.size + scope.$index + 1}}</span>
+                <span>{{(queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1}}</span>
             </template>
       </el-table-column>
       <el-table-column label="食材编码" align="center" prop="nutritionCode" />
@@ -80,8 +80,8 @@
     <pagination
       v-show="total>0"
       :total="total"
-      :page.sync="queryParams.current"
-      :limit.sync="queryParams.size"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
       @pagination="getList"
     />
 
@@ -465,7 +465,7 @@
 </template>
 
 <script>
-import { listNutrition, getNutrition, delNutrition, addMenuNutrition, updateNutrition, typeList } from "@/api/dish/nutritionInfo";
+import { listNutrition, getNutrition, delNutrition, addMenuNutrition, updateNutrition, typeListApi } from "@/api/dish/nutritionInfo";
 import { cascaderMixin } from './cascaderMixin';
 
 export default {
@@ -489,8 +489,8 @@ export default {
       
       // 查询参数
       queryParams: {
-        current: 1,
-        size: 10,
+        pageNum: 1,
+        pageSize: 10,
         nutritionCode: undefined,
         nutritionName: undefined,
         type: undefined,
@@ -559,7 +559,7 @@ export default {
      * @returns {Promise<void>}
      */
     getFoodType() {
-      typeList().then(response => {
+      typeListApi().then(response => {
         this.typeTreeData = response.data;
         this.cascaderOptions = this.cascaderOptionsMethod();
         console.log(this.cascaderOptions)
@@ -606,8 +606,8 @@ export default {
     getList() {
       this.loading = true;
       listNutrition(this.queryParams).then(response => {
-        this.menuNutritionList = response.data.records;
-        this.total = Number(response.data.total);
+        this.menuNutritionList = response.rows;
+        this.total = Number(response.total);
         this.loading = false;
       });
     },
@@ -658,7 +658,7 @@ export default {
      * @description 重置页码为1并获取列表数据
      */
     handleQuery() {
-      this.queryParams.current = 1;
+      this.queryParams.pageNum = 1;
       this.getList();
     },
     /** 重置按钮操作 */