From d803e13ca30de8d2d098fe8bea71d56e237bd8ce Mon Sep 17 00:00:00 2001
From: huangdeliang <huangdeliang@skieer.com>
Date: Fri, 26 Feb 2021 20:45:30 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E6=8E=A5=E5=8F=A3=E6=9D=83?=
 =?UTF-8?q?=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../web/controller/custom/SysWapController.java       | 11 ++++++++++-
 stdiet-ui/src/api/custom/recipesShow.js               | 10 ++++++++++
 stdiet-ui/src/api/system/dict/data.js                 |  5 +----
 stdiet-ui/src/utils/request.js                        |  2 ++
 .../src/views/custom/recipesShow/MenuDetail/index.vue |  9 +++++----
 stdiet-ui/src/views/custom/recipesShow/index.vue      |  2 +-
 6 files changed, 29 insertions(+), 10 deletions(-)

diff --git a/stdiet-admin/src/main/java/com/stdiet/web/controller/custom/SysWapController.java b/stdiet-admin/src/main/java/com/stdiet/web/controller/custom/SysWapController.java
index 8e6683851..45cb7f108 100644
--- a/stdiet-admin/src/main/java/com/stdiet/web/controller/custom/SysWapController.java
+++ b/stdiet-admin/src/main/java/com/stdiet/web/controller/custom/SysWapController.java
@@ -2,9 +2,9 @@ package com.stdiet.web.controller.custom;
 
 import com.stdiet.common.core.controller.BaseController;
 import com.stdiet.common.core.domain.AjaxResult;
-import com.stdiet.custom.service.ISysRecipesPlanService;
 import com.stdiet.custom.service.ISysRecipesService;
 import com.stdiet.custom.service.ISysWapServices;
+import com.stdiet.system.service.ISysDictTypeService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
@@ -20,8 +20,12 @@ public class SysWapController extends BaseController {
     @Autowired
     ISysRecipesService iSysRecipesService;
 
+    @Autowired
+    ISysDictTypeService iSysDictTypeService;
+
     /**
      * 客户食谱详情
+     *
      * @param outId
      * @return
      */
@@ -39,4 +43,9 @@ public class SysWapController extends BaseController {
     public AjaxResult dayilyMenu(@PathVariable Long id) {
         return AjaxResult.success(iSysRecipesService.selectDishesByMenuId(id));
     }
+
+    @GetMapping(value = "/dict/{dictType}")
+    public AjaxResult sysDict(@PathVariable String dictType) {
+        return AjaxResult.success(iSysDictTypeService.selectDictDataByType(dictType));
+    }
 }
diff --git a/stdiet-ui/src/api/custom/recipesShow.js b/stdiet-ui/src/api/custom/recipesShow.js
index ecdd3523e..de4d58dc7 100644
--- a/stdiet-ui/src/api/custom/recipesShow.js
+++ b/stdiet-ui/src/api/custom/recipesShow.js
@@ -29,3 +29,13 @@ export function getRecipesMenuInfoApi(id) {
     }
   });
 }
+
+export function getDicts(id) {
+  return request({
+    url: "/wap/dict/" + id,
+    method: "get",
+    headers: {
+      isToken: false
+    }
+  });
+}
diff --git a/stdiet-ui/src/api/system/dict/data.js b/stdiet-ui/src/api/system/dict/data.js
index 0c2043a9d..bd4d851b8 100644
--- a/stdiet-ui/src/api/system/dict/data.js
+++ b/stdiet-ui/src/api/system/dict/data.js
@@ -21,10 +21,7 @@ export function getData(dictCode) {
 export function getDicts(dictType) {
   return request({
     url: "/system/dict/data/type/" + dictType,
-    method: "get",
-    headers: {
-      isToken: false
-    }
+    method: "get"
   });
 }
 
diff --git a/stdiet-ui/src/utils/request.js b/stdiet-ui/src/utils/request.js
index 112d453da..f6261ff03 100644
--- a/stdiet-ui/src/utils/request.js
+++ b/stdiet-ui/src/utils/request.js
@@ -29,9 +29,11 @@ service.interceptors.request.use(config => {
 service.interceptors.response.use(res => {
     // 未设置状态码则默认成功状态
     const code = res.data.code || 200;
+    console.log(res)
     // 获取错误信息
     const msg = errorCode[code] || res.data.msg || errorCode['default']
     if (code === 401) {
+      console.log(code)
       MessageBox.confirm('登录状态已过期，您可以继续留在该页面，或者重新登录', '系统提示', {
           confirmButtonText: '重新登录',
           cancelButtonText: '取消',
diff --git a/stdiet-ui/src/views/custom/recipesShow/MenuDetail/index.vue b/stdiet-ui/src/views/custom/recipesShow/MenuDetail/index.vue
index 17d7741f1..5f3b87964 100644
--- a/stdiet-ui/src/views/custom/recipesShow/MenuDetail/index.vue
+++ b/stdiet-ui/src/views/custom/recipesShow/MenuDetail/index.vue
@@ -30,6 +30,7 @@
 <script>
 import NutriComputeCom from "./NutriComputeCom";
 import DishesDetailDialog from "./DishesDetailDialog";
+import { getDicts } from "@/api/custom/recipesShow";
 export default {
   name: "menuDetail",
   props: ["value", "date"],
@@ -38,19 +39,19 @@ export default {
     DishesDetailDialog,
   },
   created() {
-    this.getDicts("cus_cus_unit").then((response) => {
+    getDicts("cus_cus_unit").then((response) => {
       this.curUnitDict = response.data.reduce((obj, cur) => {
         obj[cur.dictValue] = cur.dictLabel;
         return obj;
       }, {});
     });
-    this.getDicts("cus_cus_weight").then((response) => {
+    getDicts("cus_cus_weight").then((response) => {
       this.cusWeightDict = response.data.reduce((obj, cur) => {
         obj[cur.dictValue] = cur.dictLabel;
         return obj;
       }, {});
     });
-    this.getDicts("cus_dishes_type").then((response) => {
+    getDicts("cus_dishes_type").then((response) => {
       this.menuTypeDict = response.data.reduce((obj, cur) => {
         obj[cur.dictValue] = cur.dictLabel;
         return obj;
@@ -91,7 +92,7 @@ export default {
         typeName: this.menuTypeDict[type],
         values: mData[type],
       }));
-      console.log(mMenus);
+      // console.log(mMenus);
       return mMenus;
     },
   },
diff --git a/stdiet-ui/src/views/custom/recipesShow/index.vue b/stdiet-ui/src/views/custom/recipesShow/index.vue
index 7f4a37f14..59d32f770 100644
--- a/stdiet-ui/src/views/custom/recipesShow/index.vue
+++ b/stdiet-ui/src/views/custom/recipesShow/index.vue
@@ -123,7 +123,7 @@ export default {
         if (response.code === 200) {
           this.loading = false;
           this.menuData = getProcessMenuData(response.data);
-          console.log(this.menuData);
+          // console.log(this.menuData);
         }
       });
     },