diff --git a/App.vue b/App.vue index 9e2f3af..4c233de 100644 --- a/App.vue +++ b/App.vue @@ -39,4 +39,8 @@ export default { margin: 0; padding: 0; } +body,html { + height: 100vh !important; + overflow: auto !important; +} diff --git a/config.js b/config.js index eb7ddd7..8728c00 100644 --- a/config.js +++ b/config.js @@ -7,10 +7,11 @@ module.exports = { // baseUrl: '/dev-api', // baseUrl: 'http://10.138.55.104:58080',//测试 // baseUrl: 'http://192.168.0.244:38380',//测试 + // baseUrl: 'http://192.168.0.176:58080',//测试 // baseUrl: 'http://192.168.2.82:58080',//张天强 // baseUrl: 'http://192.168.2.69:58080',//董高文 // baseUrl: 'http://192.168.0.44:58080',//董高文 - // baseUrl: 'http://192.168.2.83:58080',//盛旭 + // baseUrl: 'http://192.168.2.78:58080',//盛旭 // baseUrl: 'http://192.168.1.102:58080',//测试 // #endif // #ifdef APP-PLUS diff --git a/pages/advanceOrder/dishDetail.vue b/pages/advanceOrder/dishDetail.vue index 3a3f621..7a060d5 100644 --- a/pages/advanceOrder/dishDetail.vue +++ b/pages/advanceOrder/dishDetail.vue @@ -37,17 +37,21 @@ - - 菜品简介 - {{dashesData.intro||'-'}} + + 菜品简介 + {{dashesData.intro||'-'}} - - 主料 - - + + 主料 + + {{dashesData.mainMaterialStr||'-'}} + - - 辅料 - - + + 辅料 + + {{dashesData.subMaterialStr||'-'}} + 口味 @@ -68,25 +72,25 @@ 含量 - - - - - - - - - - - - - - - - + {{dashesData.dishesDetailList[0].calories||'-'}} + {{dashesData.dishesDetailList[0].protein||'-'}} + {{dashesData.dishesDetailList[0].fat||'-'}} + {{dashesData.dishesDetailList[0].carbohydrate||'-'}} + {{dashesData.dishesDetailList[0].dietaryFiber||'-'}} + {{dashesData.dishesDetailList[0].cholesterol||'-'}} + {{dashesData.dishesDetailList[0].calcium||'-'}} + {{dashesData.dishesDetailList[0].sodium||'-'}} NRV% - - - - - - - - - - - - - - - - + {{dashesData.dishesDetailList[0].caloriesNrv||'-'}} + {{dashesData.dishesDetailList[0].proteinNrv||'-'}} + {{dashesData.dishesDetailList[0].fatNrv||'-'}} + {{dashesData.dishesDetailList[0].carbohydrateNrv||'-'}} + {{dashesData.dishesDetailList[0].dietaryFiberNrv||'-'}} + {{dashesData.dishesDetailList[0].cholesterolNrv||'-'}} + {{dashesData.dishesDetailList[0].calciumNrv||'-'}} + {{dashesData.dishesDetailList[0].sodiumNrv||'-'}} @@ -282,6 +286,19 @@ export default { const res = await getMenudishesDetailAPI(param) if(res.code==200){ this.dashesData = res.data; + if(this.dashesData.materialList&&this.dashesData.materialList.length>0){ + let arr1=[] + let arr2=[] + this.dashesData.materialList.forEach(item=>{ + if(item.materialType==1){ arr1.push(item.materialName) } + if(item.materialType==2){ arr2.push(item.materialName) } + }) + this.dashesData.mainMaterialStr = arr1.join("、") + this.dashesData.subMaterialStr = arr2.join("、") + }else{ + this.dashesData.mainMaterialStr = "" + this.dashesData.subMaterialStr = "" + } this.$set(this.dashesData, 'quantity', 0) this.$set(this.dashesData, 'monthlySales', this.dashesData.dishesDetailList[0].monthlySales) this.$set(this.dashesData, 'goodProbability', this.dashesData.dishesDetailList[0].goodProbability) @@ -416,6 +433,9 @@ export default { "unitName": null, "weightUnit": null } + if(!cartItem.costModelList){ + this.$set(cartItem, 'costModelList', food.costModelList) + } this.$set(cartItem, 'orderDetailList', [obj]) this.$set(cartItem, 'goodsDishesImgUrl', food.dishesImgUrl) this.$set(cartItem, 'monthlySales', food.dishesDetailList[0].monthlySales) @@ -673,13 +693,14 @@ page { justify-content: space-between; .nutrition-box-item{ - width: 28%; + width: 30%; margin: 0 2%; height: 100%; text-align: center; // background-color: #DD7D3C; view{ margin-bottom: 10px; + height: 20px; } } diff --git a/pages/advanceOrder/index.vue b/pages/advanceOrder/index.vue index 53860e7..a7a9b4e 100644 --- a/pages/advanceOrder/index.vue +++ b/pages/advanceOrder/index.vue @@ -75,7 +75,7 @@ - + @@ -232,12 +232,10 @@ export default { this.stallName=options.stallName; this.recipeId=options.recipeId; }, - onShow() { - //获取预定日期 - this.getReserveDate() + onShow() { setTimeout(()=>{ - //获取预定餐菜谱 - this.getMenuListData() + //获取预定日期 + this.getReserveDate() },200) }, methods: { @@ -249,7 +247,9 @@ export default { } const res = await getlistReserveDateAPI(param) this.getNowFormatDate(res.data[0]) - this.getNowFormatDate2(res.data[0]) + this.getNowFormatDate2(res.data[0]) + //获取预定餐菜谱 + this.getMenuListData() }, // 获取当前时间 getNowFormatDate(data) { @@ -274,7 +274,7 @@ export default { async getMenuListData() { let param = { "recipeId":this.recipeId, - "applyDate":this.newDate2, + "applyDate":this.newDate2 } const res = await getAdvanceDetailListAPI(param) console.log(res, '预订餐菜谱') @@ -295,23 +295,22 @@ export default { this.$set(food, 'dishesId', food.dishesDetailList[0].dishesId) }) }) - }) - //获取购物车 - this.getShoppingCartList() + }) this.tabList=[] //处理数据 this.menuData.forEach(item=>{//渲染类型 this.tabList.push(this.handleRecipeType(item.mealtimeType)) }) this.changeTab(0) + //获取购物车 + this.getShoppingCartList() }else{ this.menuData = []; this.tabList=[]; this.typeList=[] this.typeNameList=[] this.tIndex=0 - } - this.showLoading=false + } }else{ uni.$u.toast(res.msg) this.menuData = []; @@ -319,8 +318,8 @@ export default { this.typeList=[] this.typeNameList=[] this.tIndex=0 - this.showLoading=false - } + } + this.showLoading=false }, //菜品类型（1-早餐 2-午餐 3-下午茶 4-晚餐 5-夜宵） changeTab(index) { @@ -430,6 +429,9 @@ export default { "unitName": null, "weightUnit": null } + if(!cartItem.costModelList){ + this.$set(cartItem, 'costModelList', food.costModelList) + } this.$set(cartItem, 'orderDetailList', [obj]) this.$set(cartItem, 'goodsDishesImgUrl', food.dishesImgUrl) this.$set(cartItem, 'monthlySales', food.dishesDetailList[0].monthlySales) @@ -451,7 +453,7 @@ export default { }) }) }) - }) + }) console.log(this.shoppingCartList) this.isHandle = false //计算总价 @@ -689,7 +691,7 @@ page { // background-color: #DD7D3C; } .content-left{ - width: 20%; + width: 23%; height: 74vh; } .active2 { @@ -699,7 +701,7 @@ page { } .content-right{ - width: 80%; + width: 77%; height: 74vh; // height: auto !important; } diff --git a/pages/advanceOrder/orderDetails.vue b/pages/advanceOrder/orderDetails.vue index c84afe0..2768cc5 100644 --- a/pages/advanceOrder/orderDetails.vue +++ b/pages/advanceOrder/orderDetails.vue @@ -1,13 +1,22 @@