From e81cb62e5140269b2cf4fae49eab625c39919c45 Mon Sep 17 00:00:00 2001
From: huangdeliang <huangdeliang@skieer.com>
Date: Fri, 5 Mar 2021 17:44:28 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E9=A2=9C=E8=89=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 stdiet-ui/src/views/custom/contract/index.vue     |  2 +-
 .../recipesBuild/RecipesView/RecipesCom/index.vue | 15 +++++++++++----
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/stdiet-ui/src/views/custom/contract/index.vue b/stdiet-ui/src/views/custom/contract/index.vue
index ed75d8fb0..1001ef614 100644
--- a/stdiet-ui/src/views/custom/contract/index.vue
+++ b/stdiet-ui/src/views/custom/contract/index.vue
@@ -187,7 +187,7 @@
         prop="updateTime"
         width="180"
       />
-      <el-table-column label="合同地址" align="center" prop="path" >
+      <el-table-column label="合同地址" align="center" prop="path">
         <template slot-scope="scope">
           <el-button
             type="text"
diff --git a/stdiet-ui/src/views/custom/recipesBuild/RecipesView/RecipesCom/index.vue b/stdiet-ui/src/views/custom/recipesBuild/RecipesView/RecipesCom/index.vue
index 5c4044cfb..339562e89 100644
--- a/stdiet-ui/src/views/custom/recipesBuild/RecipesView/RecipesCom/index.vue
+++ b/stdiet-ui/src/views/custom/recipesBuild/RecipesView/RecipesCom/index.vue
@@ -9,7 +9,7 @@
       size="mini"
       header-row-class-name="recipes_header"
       :cell-class-name="cellClassName"
-      :style="`outline: ${currentDay === num ? '1px solid #d96969' : 'none'}`"
+      :style="`outline: ${currentDay === num ? '1px solid #d53950' : 'none'}`"
     >
       <el-table-column prop="type" :width="100" align="center">
         <template slot="header">
@@ -365,7 +365,7 @@ export default {
       if (!columnIndex) {
         return "recipes_first_col";
       } else {
-        return `recipes_cell_${this.fontSize}`;
+        return `recipes_cell recipes_cell_${this.fontSize}`;
       }
     },
     handleParentClick(e) {
@@ -509,14 +509,21 @@ export default {
 
 .recipes_header {
   & > th {
-    background: #d96969 !important;
+    background: #d53950 !important;
     color: white !important;
+    font-weight: bold;
   }
 }
 
 .recipes_first_col {
-  background: #d96969 !important;
+  background: #d53950 !important;
   color: white !important;
+  font-weight: bold;
+}
+
+.recipes_cell {
+  font-weight: bold;
+  color: #595959;
 }
 
 .recipes_cell_12 {

From e08a5e24c654aaf64a9394aeab6faaa521a908ee Mon Sep 17 00:00:00 2001
From: huangdeliang <huangdeliang@skieer.com>
Date: Fri, 5 Mar 2021 18:57:58 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=88=86=E9=87=8F?=
 =?UTF-8?q?=E4=BC=B0=E7=AE=97=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../RecipesView/RecipesCom/AddDishesDrawer/index.vue      | 1 +
 .../RecipesView/RecipesCom/EditableUnit/index.vue         | 8 ++++++++
 2 files changed, 9 insertions(+)

diff --git a/stdiet-ui/src/views/custom/recipesBuild/RecipesView/RecipesCom/AddDishesDrawer/index.vue b/stdiet-ui/src/views/custom/recipesBuild/RecipesView/RecipesCom/AddDishesDrawer/index.vue
index 0bebd4e41..85b55b313 100644
--- a/stdiet-ui/src/views/custom/recipesBuild/RecipesView/RecipesCom/AddDishesDrawer/index.vue
+++ b/stdiet-ui/src/views/custom/recipesBuild/RecipesView/RecipesCom/AddDishesDrawer/index.vue
@@ -115,6 +115,7 @@ export default {
       this.active = 1;
       this.dishesTypeOptions = (this.type || data.type)
         .split(",")
+        .sort((a, b) => a - b)
         .reduce((arr, cur, idx) => {
           if (idx === 0) {
             this.selDishes.type = cur;
diff --git a/stdiet-ui/src/views/custom/recipesBuild/RecipesView/RecipesCom/EditableUnit/index.vue b/stdiet-ui/src/views/custom/recipesBuild/RecipesView/RecipesCom/EditableUnit/index.vue
index 4b90c69d8..08f15f796 100644
--- a/stdiet-ui/src/views/custom/recipesBuild/RecipesView/RecipesCom/EditableUnit/index.vue
+++ b/stdiet-ui/src/views/custom/recipesBuild/RecipesView/RecipesCom/EditableUnit/index.vue
@@ -95,6 +95,14 @@ export default {
       this.mUnit = value;
     },
   },
+  watch: {
+    weight(val) {
+      this.mWeight = val;
+    },
+    unit(val) {
+      this.mUnit = val;
+    },
+  },
   computed: {
     unitWeight() {
       return (