From 7709c85cb06e35e7458f90381fe76b4fedb402a6 Mon Sep 17 00:00:00 2001
From: huangdeliang <huangdeliang@skieer.com>
Date: Tue, 9 Mar 2021 18:26:48 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A3=9F=E8=B0=B1=E5=B1=95?=
 =?UTF-8?q?=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 stdiet-ui/src/api/custom/recipesShow.js       |  1 +
 stdiet-ui/src/store/index.js                  |  2 ++
 stdiet-ui/src/store/modules/recipesShow.js    | 33 +++++++++++++++++++
 .../MenuDetail/DishesDetailDialog/index.vue   | 12 +++++--
 .../custom/recipesShow/MenuDetail/index.vue   | 16 ++++++---
 .../custom/recipesShow/PlanDrawer/index.vue   |  1 +
 .../src/views/custom/recipesShow/index.vue    | 14 ++++++--
 7 files changed, 70 insertions(+), 9 deletions(-)
 create mode 100644 stdiet-ui/src/store/modules/recipesShow.js

diff --git a/stdiet-ui/src/api/custom/recipesShow.js b/stdiet-ui/src/api/custom/recipesShow.js
index de4d58dc7..5f72315c6 100644
--- a/stdiet-ui/src/api/custom/recipesShow.js
+++ b/stdiet-ui/src/api/custom/recipesShow.js
@@ -1,5 +1,6 @@
 import request from "@/utils/request";
 
+
 export function getRecipesPlans(id) {
   return request({
     url: "/wap/recipes/plans/" + id,
diff --git a/stdiet-ui/src/store/index.js b/stdiet-ui/src/store/index.js
index f3405d89e..ee09d42f2 100644
--- a/stdiet-ui/src/store/index.js
+++ b/stdiet-ui/src/store/index.js
@@ -6,6 +6,7 @@ import tagsView from "./modules/tagsView";
 import permission from "./modules/permission";
 import settings from "./modules/settings";
 import recipes from "./modules/recipes";
+import recipesShow from "./modules/recipesShow";
 import global from "./modules/global";
 
 import getters from "./getters";
@@ -21,6 +22,7 @@ const store = new Vuex.Store({
     permission,
     settings,
     recipes,
+    recipesShow,
     global
   },
   getters,
diff --git a/stdiet-ui/src/store/modules/recipesShow.js b/stdiet-ui/src/store/modules/recipesShow.js
new file mode 100644
index 000000000..84a1d3529
--- /dev/null
+++ b/stdiet-ui/src/store/modules/recipesShow.js
@@ -0,0 +1,33 @@
+const oriState = {
+  recipes: {},
+  shoppingCart: {}
+};
+
+const mutations = {
+  updateStateData(state, payload) {
+    Object.keys(payload).forEach(key => {
+      state[key] = payload[key];
+    });
+  },
+  clean(state) {
+    Object.keys(oriState).forEach(key => {
+      state[key] = oriState[key];
+    });
+  }
+};
+
+const actions = {
+  async fetchFullRecipes({commit, dispatch},payload ) {
+
+  }
+};
+
+const getters = {};
+
+export default {
+  namespaced: true,
+  state: Object.assign({}, oriState),
+  mutations,
+  actions,
+  getters
+};
diff --git a/stdiet-ui/src/views/custom/recipesShow/MenuDetail/DishesDetailDialog/index.vue b/stdiet-ui/src/views/custom/recipesShow/MenuDetail/DishesDetailDialog/index.vue
index 5b0c5df8b..f099daa4c 100644
--- a/stdiet-ui/src/views/custom/recipesShow/MenuDetail/DishesDetailDialog/index.vue
+++ b/stdiet-ui/src/views/custom/recipesShow/MenuDetail/DishesDetailDialog/index.vue
@@ -19,11 +19,17 @@
         </span>
       </div>
     </section>
-    <section class="section_zone">
+    <section class="section_zone" v-if="data.methods">
       <div class="section_title">
         做法<em class="el-icon-dish" style="margin-left: 8px" />
       </div>
-      <div class="methods">{{ data.methods }}</div>
+      <div class="section_content">{{ data.methods }}</div>
+    </section>
+    <section class="section_zone" v-if="data.remark">
+      <div class="section_title">
+        备注<em class="el-icon-warning-outline" style="margin-left: 8px" />
+      </div>
+      <div class="section_content">{{ data.remark }}</div>
     </section>
   </el-dialog>
 </template>
@@ -74,7 +80,7 @@ export default {
     }
   }
 
-  .methods {
+  .section_content {
     padding: 0 8px;
     margin-top: 14px;
   }
diff --git a/stdiet-ui/src/views/custom/recipesShow/MenuDetail/index.vue b/stdiet-ui/src/views/custom/recipesShow/MenuDetail/index.vue
index e9571bbdb..3743ef03e 100644
--- a/stdiet-ui/src/views/custom/recipesShow/MenuDetail/index.vue
+++ b/stdiet-ui/src/views/custom/recipesShow/MenuDetail/index.vue
@@ -1,7 +1,10 @@
 <template>
   <div class="menu_detail_wrapper">
     <!-- 营养分析 -->
-    <NutriComputeCom :date="date" :value="value" />
+    <!-- <NutriComputeCom :date="date" :value="value" /> -->
+    <div class="top">
+      <img :src="logo" style="width: auto; height: 32px" alt="logo" />
+    </div>
     <!-- 食谱详细 -->
     <el-card v-for="obj in menus" :key="obj.type" style="margin-top: 12px">
       <div slot="header">
@@ -12,7 +15,7 @@
       </div>
       <div v-for="mObj in obj.values" :key="mObj.id">
         <div class="dishes_item">
-          <div v-if="!mObj.methods" class="simple_dishes">
+          <div v-if="!mObj.methods && !mObj.remark" class="simple_dishes">
             <span>{{ mObj.name }}</span>
             <span class="weight_style">
               <span style="margin-right: 20px">{{ mObj.cusStr }}</span>
@@ -31,14 +34,14 @@
   </div>
 </template>
 <script>
-import NutriComputeCom from "./NutriComputeCom";
+// import NutriComputeCom from "./NutriComputeCom";
 import DishesDetailDialog from "./DishesDetailDialog";
 import { getDicts } from "@/api/custom/recipesShow";
 export default {
   name: "menuDetail",
   props: ["value", "date"],
   components: {
-    NutriComputeCom,
+    // NutriComputeCom,
     DishesDetailDialog,
   },
   created() {
@@ -63,6 +66,7 @@ export default {
   },
   data() {
     return {
+      logo: require("@/assets/logo/st_logo.png"),
       menuTypeTimeDict: {
         2: "10:00 - 10:30",
         4: "15:00 - 15:30",
@@ -113,6 +117,10 @@ export default {
 <style lang="scss" scoped>
 .menu_detail_wrapper {
   padding: 0 12px 12px 12px;
+  .top {
+    text-align: center;
+    padding: 10px 14px;
+  }
 
   .header_style {
     display: flex;
diff --git a/stdiet-ui/src/views/custom/recipesShow/PlanDrawer/index.vue b/stdiet-ui/src/views/custom/recipesShow/PlanDrawer/index.vue
index b69a9d64a..13833aaaf 100644
--- a/stdiet-ui/src/views/custom/recipesShow/PlanDrawer/index.vue
+++ b/stdiet-ui/src/views/custom/recipesShow/PlanDrawer/index.vue
@@ -21,6 +21,7 @@
             <div class="title_style">
               <span>{{ plan.label }}</span>
               <em
+                v-show="false"
                 class="el-icon-shopping-cart-full icon_style"
                 @click="(e) => handleOnShoppingPlanClick(e, plan)"
               />
diff --git a/stdiet-ui/src/views/custom/recipesShow/index.vue b/stdiet-ui/src/views/custom/recipesShow/index.vue
index 3dec12ecd..02fad1b09 100644
--- a/stdiet-ui/src/views/custom/recipesShow/index.vue
+++ b/stdiet-ui/src/views/custom/recipesShow/index.vue
@@ -7,7 +7,8 @@
         class="icon_btn"
         @click="handleOnPlanClick"
       />
-      <img :src="logo" style="width: auto; height: 32px" alt="logo" />
+      <!-- <img :src="logo" style="width: auto; height: 32px" alt="logo" /> -->
+      <span>{{ curDate }}</span>
       <el-button
         icon="el-icon-user"
         type="text"
@@ -45,6 +46,15 @@ import PlanDrawer from "./PlanDrawer";
 import MenuDetail from "./MenuDetail";
 import dayjs from "dayjs";
 import { getProcessMenuData } from "./utils";
+
+import { createNamespacedHelpers } from "vuex";
+const {
+  mapActions,
+  mapState,
+  mapMutations,
+  mapGetters,
+} = createNamespacedHelpers("recipesShow");
+
 export default {
   name: "recipesShow",
   components: {
@@ -55,7 +65,7 @@ export default {
   props: ["id"],
   data() {
     return {
-      logo: require("@/assets/logo/st_logo.png"),
+      // logo: require("@/assets/logo/st_logo.png"),
       planList: [],
       curPlanId: 0,
       curMenuId: 0,