Merge remote-tracking branch 'origin/master' into master

ruoyi-ui/src/views/fantang/weekMenu/index.vue

@@ -248,9 +248,16 @@
       },
       // 根据菜单选择的变化，计算总价
       changeFoods(row) {
+        console.log("row-->", row);
+        console.log("foodList-->", this.foodList)
         let ret = 0;
         for (let i = 0; i < row.foods.length; i++) {
-          ret += this.foodList[i].price;
+          let foodPrice = row.foods[i];
+          this.foodList.forEach(item => {
+            if (item.foodId === foodPrice) {
+              ret += item.price;
+            }
+          });
         }
         this.weekMenuList[row.id - 1].price = ret;
       },