From a13fa07ffafda20558c1b50feb672b5bd64e612c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zico=E9=83=AD?= <21520993@qq.com>
Date: Thu, 12 Jul 2018 15:37:28 +0800
Subject: [PATCH] zico-7.12.2

---
 src/assets/public/css/public.css            |  2 +-
 src/pages/category/components/residence.vue |  5 +++--
 src/pages/components/flowerTimer.vue        | 15 +++++++++------
 3 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/src/assets/public/css/public.css b/src/assets/public/css/public.css
index 602ea87..941c18e 100644
--- a/src/assets/public/css/public.css
+++ b/src/assets/public/css/public.css
@@ -43,7 +43,7 @@ body {
 
 header {
   width: 100%;
-  
+
   padding: 34px 0 0 41px;
   background-position: center !important;
   box-sizing: border-box;
diff --git a/src/pages/category/components/residence.vue b/src/pages/category/components/residence.vue
index 568403a..0091612 100644
--- a/src/pages/category/components/residence.vue
+++ b/src/pages/category/components/residence.vue
@@ -9,7 +9,7 @@
       </template>
     </com-post-dialog>
 
-    <com-header :bgheight="900" :headerbj="require('@/assets/imgs/category/residence/bannar_bg.png')">
+    <com-header :bgheight="'900'" :headerbj="require('@/assets/imgs/category/residence/bannar_bg.png')">
 
       <template slot="slot1">
         <div class="header_text" style="margin-top: 80px;">
@@ -24,7 +24,8 @@
           </com-dynamic-string>
         </div>
         <div style="bottom:69px;right:69px;position:absolute">
-          <img src="@/assets/imgs/category/residence/have_fun.png" alt="have fun" class="fadeInDown animated banner_img"/>
+          <img src="@/assets/imgs/category/residence/have_fun.png" alt="have fun"
+               class="fadeInDown animated banner_img"/>
         </div>
       </template>
 
diff --git a/src/pages/components/flowerTimer.vue b/src/pages/components/flowerTimer.vue
index ed78d70..aa9b413 100644
--- a/src/pages/components/flowerTimer.vue
+++ b/src/pages/components/flowerTimer.vue
@@ -31,7 +31,7 @@
       <img src="@/assets/imgs/public/sunshine.png" alt="" class="fadeInUp animated sunshine">
     </div>
     <p class="daoji_content">页面停留时间超过
-      <span class="miaoshu" id="tiktock">10:00</span> 秒<br>我们将自行向公益机构捐赠
+      <span class="miaoshu" id="tiktock">10:00</span> 秒我们将自行<br>向公益机构捐赠
       <span class="miaoshu">0.2</span>元</p>
   </div>
 </template>
@@ -47,8 +47,9 @@
 <style lang="scss" scoped>
   .nav_right {
     position: fixed;
-    right: 0;
-    top: 15vh;
+    right: 60px;
+    top: 7vh;
+    width: 290px;
   }
 
   .vase {
@@ -167,9 +168,11 @@
 
   .daoji_content {
     font-size: 12px;
-    color: #fff;
-    text-align: center;
+    /*color: #fff;*/
+    color: #000001;
+    text-align: left;
     margin-bottom: 76px;
+    line-height: 22px;
   }
 
   .dingwei {
@@ -184,7 +187,7 @@
   }
 
   .miaoshu {
-    color: #ffce38;
+    color: #a68b51;
   }
 
   .loading {
-- 
Gitee