@@ -60,6 +63,10 @@ export default {
},
data() {
return {
+ menuTypeTimeDict: {
+ 2: "10:00 - 10:30",
+ 4: "15:00 - 15:30",
+ },
menuTypeDict: {},
curUnitDict: {},
cusWeightDict: {},
@@ -107,6 +114,15 @@ export default {
.menu_detail_wrapper {
padding: 0 12px 12px 12px;
+ .header_style {
+ display: flex;
+ justify-content: space-between;
+
+ .time {
+ color: #8c8c8c;
+ }
+ }
+
.dishes_item {
height: 38px;
padding: 0 8px;
diff --git a/stdiet-ui/src/views/custom/recipesShow/index.vue b/stdiet-ui/src/views/custom/recipesShow/index.vue
index 59d32f770..d9fc95131 100644
--- a/stdiet-ui/src/views/custom/recipesShow/index.vue
+++ b/stdiet-ui/src/views/custom/recipesShow/index.vue
@@ -15,8 +15,10 @@
@click="handleUserInfoClick"
/>
-
+
@@ -71,24 +73,29 @@ export default {
if (response.code === 200) {
let curPlanId, curMenuId, curDate;
const toDay = dayjs().format("YYYY-MM-DD");
- this.planList = response.data.map((plan) => ({
- menus: plan.menus.map((menu, idx) => {
- const date = dayjs(plan.startDate)
- .add(idx, "day")
- .format("YYYY-MM-DD");
- if (toDay === date) {
- curPlanId = plan.id;
- curMenuId = menu.id;
- curDate = date;
- }
- return {
- date,
- id: menu.id,
- };
- }),
- label: `第${plan.startNumDay} 至 ${plan.endNumDay}天`,
- id: plan.id,
- }));
+ this.planList = response.data.reduce((arr, plan) => {
+ if (plan.menus) {
+ arr.push({
+ menus: plan.menus.map((menu, idx) => {
+ const date = dayjs(plan.startDate)
+ .add(idx, "day")
+ .format("YYYY-MM-DD");
+ if (toDay === date) {
+ curPlanId = plan.id;
+ curMenuId = menu.id;
+ curDate = date;
+ }
+ return {
+ date,
+ id: menu.id,
+ };
+ }),
+ label: `第${plan.startNumDay} 至 ${plan.endNumDay}天`,
+ id: plan.id,
+ });
+ }
+ return arr;
+ }, []);
if (!curMenuId) {
curMenuId = this.planList[0].menus[0].id;
curPlanId = this.planList[0].id;
@@ -98,6 +105,10 @@ export default {
this.curPlanId = curPlanId;
this.curDate = curDate;
+ // console.log({
+ // planList: this.planList,
+ // });
+
this.fetchRecipesInfo(this.curMenuId);
}
});
diff --git a/stdiet-ui/src/views/custom/recipesShow/utils.js b/stdiet-ui/src/views/custom/recipesShow/utils.js
index 14c1e5943..d42cb8e73 100644
--- a/stdiet-ui/src/views/custom/recipesShow/utils.js
+++ b/stdiet-ui/src/views/custom/recipesShow/utils.js
@@ -17,21 +17,21 @@ export function getProcessMenuData(menuData) {
igdList: cur.igdList.reduce((igdArr, igdData) => {
if (igdData.id > 0) {
const tarDetail = cur.detail.find(obj => obj.id === igdData.id);
- igdArr.push({
- id: igdData.id,
- name: igdData.name,
- carbonRatio: igdData.carbonRatio,
- fatRatio: igdData.fatRatio,
- proteinRatio: igdData.proteinRatio,
- cusUnit: tarDetail ? tarDetail.cus_unit : igdData.cusUnit,
- cusWeight: tarDetail
- ? parseFloat(tarDetail.cus_weight)
- : igdData.cusWeight,
- weight: tarDetail ? parseFloat(tarDetail.weight) : igdData.weight,
- notRec: igdData.notRec,
- rec: igdData.rec,
- type: igdData.type
- });
+ if (tarDetail) {
+ igdArr.push({
+ id: igdData.id,
+ name: igdData.name,
+ carbonRatio: igdData.carbonRatio,
+ fatRatio: igdData.fatRatio,
+ proteinRatio: igdData.proteinRatio,
+ cusUnit: tarDetail.cus_unit,
+ cusWeight: tarDetail.cus_weight,
+ weight: parseFloat(tarDetail.weight),
+ notRec: igdData.notRec,
+ rec: igdData.rec,
+ type: igdData.type
+ });
+ }
}
return igdArr;
}, [])