diff --git a/pages/patrolGarden/app.vue b/pages/home/app.vue similarity index 87% rename from pages/patrolGarden/app.vue rename to pages/home/app.vue index 6d57ef5..78fbff0 100644 --- a/pages/patrolGarden/app.vue +++ b/pages/home/app.vue @@ -48,15 +48,15 @@ 所有应用 - + 库存 - + 采购 - + 巡园 diff --git a/pages/home/index.vue b/pages/home/index.vue index a89d498..8ba80e6 100644 --- a/pages/home/index.vue +++ b/pages/home/index.vue @@ -281,13 +281,12 @@ - 库存 - 采购 + 应用 + - 巡园记录 - diff --git a/router/home.js b/router/home.js index e8e8d60..5d5e0b9 100644 --- a/router/home.js +++ b/router/home.js @@ -17,6 +17,17 @@ module.exports=[ } } }, + { + path:"pages/home/app", + style:{ + navigationBarTitleText:"应用", + navigationBarBackgroundColor:"#10C176", + navigationBarTextStyle:"white", + "app-plus":{ + "titleNView":true + } + } + }, { path:"pages/home/my", style:{ diff --git a/router/patrolGarden.js b/router/patrolGarden.js index 6aef537..f7743ec 100644 --- a/router/patrolGarden.js +++ b/router/patrolGarden.js @@ -30,17 +30,6 @@ module.exports=[ } } }, - { - path:"pages/patrolGarden/app", - style:{ - navigationBarTitleText:"巡园应用", - navigationBarBackgroundColor:"#10C176", - navigationBarTextStyle:"white", - "app-plus":{ - "titleNView":true - } - } - }, { path:"pages/patrolGarden/abnoReport", style:{ diff --git a/uni.scss b/uni.scss index c93d1d5..e9df8e6 100644 --- a/uni.scss +++ b/uni.scss @@ -85,6 +85,14 @@ $uni-font-size-paragraph:15px; -webkit-font-smoothing: antialiased; -moz-osx-font-smoothing: grayscale; } +@import url('https://at.alicdn.com/t/c/font_4432735_8j85lsm6nhc.css'); +[class*=PA-]{ + font-family: "plantApp" !important; + font-size: 16px; + font-style: normal; + -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; +} .card{ background:#fff;