From 2b1c350846c5a8cd84b23be7c20370c38b1293d6 Mon Sep 17 00:00:00 2001
From: J_yt <1592211625@qq.com>
Date: Fri, 15 Apr 2022 17:48:46 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=BC=B9=E7=AA=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
config.js | 5 +-
pages.json | 32 ++---
pages/index/customer.vue | 28 +++-
pages/index/index.vue | 153 +++++++++++++++++++++-
pages/index/learning.vue | 24 ++++
pages/index/personal.vue | 41 +++++-
pages/mine/messageDetail.vue | 6 +-
static/images/screenCode/screen_note.png | Bin 252775 -> 106677 bytes
static/images/updateIcon.png | Bin 0 -> 55372 bytes
utils/tabbar.js | 27 ++++
uview-ui/components/u-tabbar/u-tabbar.vue | 135 +++++++++++++++----
uview-ui/libs/css/style.components.scss | 7 +-
12 files changed, 407 insertions(+), 51 deletions(-)
create mode 100644 static/images/updateIcon.png
create mode 100644 utils/tabbar.js
diff --git a/config.js b/config.js
index 54022f9..dd4cbfb 100644
--- a/config.js
+++ b/config.js
@@ -72,7 +72,10 @@ var config = {
// 升级公告更新阅读
updateRead: `${host}/zkMessage/updateFlag`,
// 隐私协议
- privacyAgr: `${host}/zkPrivate/findById`
+ privacyAgr: `${host}/zkPrivate/findById`,
+ //首页更新弹框
+ updatePopup: `${host}/zkMessage/showMessage`,
+
}
};
module.exports = config;
\ No newline at end of file
diff --git a/pages.json b/pages.json
index 71fd132..81b63a3 100644
--- a/pages.json
+++ b/pages.json
@@ -551,28 +551,28 @@
"selectedColor": "#1296db",
"borderStyle": "white",
"list": [{
- "pagePath": "pages/index/index",
- "iconPath": "/static/images/tabBar/home.png",
- "selectedIconPath": "/static/images/tabBar/homeActive.png",
- "text": "首页"
+ "pagePath": "pages/index/index"
+ // "iconPath": "/static/images/tabBar/home.png",
+ // "selectedIconPath": "/static/images/tabBar/homeActive.png",
+ // "text": "首页"
},
{
- "pagePath": "pages/index/customer",
- "iconPath": "/static/images/tabBar/customer.png",
- "selectedIconPath": "/static/images/tabBar/customerActive.png",
- "text": "接待"
+ "pagePath": "pages/index/customer"
+ // "iconPath": "/static/images/tabBar/customer.png",
+ // "selectedIconPath": "/static/images/tabBar/customerActive.png",
+ // "text": "接待"
},
{
- "pagePath": "pages/index/learning",
- "iconPath": "/static/images/tabBar/voice.png",
- "selectedIconPath": "/static/images/tabBar/voiceActive.png",
- "text": "学习"
+ "pagePath": "pages/index/learning"
+ // "iconPath": "/static/images/tabBar/voice.png",
+ // "selectedIconPath": "/static/images/tabBar/voiceActive.png",
+ // "text": "学习"
},
{
- "pagePath": "pages/index/personal",
- "iconPath": "/static/images/tabBar/user.png",
- "selectedIconPath": "/static/images/tabBar/userActive.png",
- "text": "个人"
+ "pagePath": "pages/index/personal"
+ // "iconPath": "/static/images/tabBar/user.png",
+ // "selectedIconPath": "/static/images/tabBar/userActive.png",
+ // "text": "个人"
}
]
},
diff --git a/pages/index/customer.vue b/pages/index/customer.vue
index 557735c..f0b8e85 100644
--- a/pages/index/customer.vue
+++ b/pages/index/customer.vue
@@ -61,13 +61,19 @@
src="/static/images/add.png" mode="">
+