From 585a15b29ee34b3cefa08ffcace6e3428fff0926 Mon Sep 17 00:00:00 2001 From: zzyuan <781948537@qq.com> Date: Mon, 12 May 2025 09:22:02 +0800 Subject: [PATCH] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages.json | 14 +- pages/advanceOrder/dishDetail.vue | 2 +- pages/amendPassword.vue | 2 +- pages/index.vue | 8 +- pages/login.vue | 2 +- pages/system.vue | 6 +- pages/weeklyMenu/menuDetail.vue | 4 +- pages/weeklyMenu/menuHistory.vue | 347 +++++++++++++++++++++++++++++ pages/weeklyMenu/menuList.vue | 45 ++-- pages/work/details.vue | 2 +- pages/work/evaluateCenter.vue | 4 +- pages/work/index.vue | 349 +++++++++++++++--------------- static/images/index/noticeBg.png | Bin 0 -> 31967 bytes static/images/system/top.png | Bin 80353 -> 79759 bytes static/images/system/topOld2.png | Bin 0 -> 80353 bytes utils/request.js | 2 +- 16 files changed, 574 insertions(+), 213 deletions(-) create mode 100644 pages/weeklyMenu/menuHistory.vue create mode 100644 static/images/index/noticeBg.png create mode 100644 static/images/system/topOld2.png diff --git a/pages.json b/pages.json index 2a99c95..20a15cc 100644 --- a/pages.json +++ b/pages.json @@ -13,8 +13,8 @@ { "path": "pages/system", "style": { - "navigationBarTitleText": "皖送e餐" - // "navigationStyle": "custom" + // "navigationBarTitleText": "皖送e餐" + "navigationStyle": "custom" } }, { @@ -189,9 +189,17 @@ { "path": "pages/weeklyMenu/menuList", "style": { - "navigationBarTitleText": "周菜谱" + // "navigationBarTitleText": "周菜谱" + "navigationStyle": "custom" } }, + { + "path": "pages/weeklyMenu/menuHistory", + "style": { + // "navigationBarTitleText": "历史菜谱", + "navigationStyle": "custom" + } + }, { "path": "pages/weeklyMenu/menuDetail", "style": { diff --git a/pages/advanceOrder/dishDetail.vue b/pages/advanceOrder/dishDetail.vue index e78b5ee..3a3f621 100644 --- a/pages/advanceOrder/dishDetail.vue +++ b/pages/advanceOrder/dishDetail.vue @@ -39,7 +39,7 @@ 菜品简介 - - + {{dashesData.intro||'-'}} 主料 diff --git a/pages/amendPassword.vue b/pages/amendPassword.vue index 87296b4..d6a402d 100644 --- a/pages/amendPassword.vue +++ b/pages/amendPassword.vue @@ -144,7 +144,7 @@ export default { // 验证通过 let param = { "mobile": this.form.phone, - "code": "LOGIN", + "code": this.form.code, "newPassword":AES.encrypt(this.form.newPassWord) } resetForgetPwdApi(param).then(res => { diff --git a/pages/index.vue b/pages/index.vue index b4433f3..1827b03 100644 --- a/pages/index.vue +++ b/pages/index.vue @@ -129,14 +129,14 @@ --> - - + + 通知 - + {{noticeData.informContent}} - 关闭 + 知道了 diff --git a/pages/login.vue b/pages/login.vue index 351486c..5a7bebb 100644 --- a/pages/login.vue +++ b/pages/login.vue @@ -171,7 +171,7 @@ export default { // this.getCode() // } }) - // this.$tab.reLaunch('/pages/system') + this.$tab.reLaunch('/pages/system') }, // 登录成功后,处理函数 loginSuccess(result) { diff --git a/pages/system.vue b/pages/system.vue index fb34cd2..d86a62c 100644 --- a/pages/system.vue +++ b/pages/system.vue @@ -1,6 +1,8 @@