From ecf4c5a1f398c487c0b8bc35a87adced4ee31a37 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zico=E9=83=AD?= <21520993@qq.com> Date: Thu, 12 Jul 2018 15:58:16 +0800 Subject: [PATCH 1/3] zico-7.12.3 --- src/assets/public/css/public.css | 12 +----------- src/pages/components/flowerTimer.vue | 14 +++++++++----- 2 files changed, 10 insertions(+), 16 deletions(-) diff --git a/src/assets/public/css/public.css b/src/assets/public/css/public.css index 941c18e..f7b9c67 100644 --- a/src/assets/public/css/public.css +++ b/src/assets/public/css/public.css @@ -103,14 +103,6 @@ header { margin: 0 auto; } -.daoji_content { - font-size: 12px; - color: #fff; - text-align: center; - margin-bottom: 76px; - -} - .dingwei { position: relative; z-index: 5; @@ -122,9 +114,7 @@ header { font-size: 16px; } -.miaoshu { - color: #ffce38; -} + .loading { position: absolute; diff --git a/src/pages/components/flowerTimer.vue b/src/pages/components/flowerTimer.vue index aa9b413..a2b20e3 100644 --- a/src/pages/components/flowerTimer.vue +++ b/src/pages/components/flowerTimer.vue @@ -42,14 +42,17 @@ export default { name: "flowerTimer" } +