diff --git a/pages/amendPassword.vue b/pages/amendPassword.vue index dba242b..6302206 100644 --- a/pages/amendPassword.vue +++ b/pages/amendPassword.vue @@ -154,7 +154,7 @@ export default { uni.navigateTo({ url: '/pages/login' }) - },500) + },1000) } }) } diff --git a/pages/weeklyMenu/menuList.vue b/pages/weeklyMenu/menuList.vue index 6f76998..1935023 100644 --- a/pages/weeklyMenu/menuList.vue +++ b/pages/weeklyMenu/menuList.vue @@ -127,7 +127,7 @@ export default { this.tabList=[] //处理数据 this.menuData.forEach(item=>{//渲染类型 - this.tabList.push(item.mealtimeName) + this.tabList.push(this.handleRecipeType(item.mealtimeType)) }) this.$refs.Tabs.handleTab(0) // this.changeTab(0) @@ -147,6 +147,21 @@ export default { this.tIndex=0 } }, + // 处理recipeType + handleRecipeType(type) { + if (type === 1) { + return '早餐' + } else if (type === 2) { + return '午餐' + } else if (type === 3) { + return '外卖' + // return '下午茶' + } else if (type === 4) { + return '晚餐' + }else if (type === 5) { + return '夜宵' + } + }, //改变时间 changeDay(index){ this.hIndex=index;