!97 修复分量估算错误

Merge pull request !97 from 德仔/develop

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"

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;

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 (

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 {