From 84cd6c0e0ac4af89dacce411e5e836b5977be16e Mon Sep 17 00:00:00 2001
From: season <season.su@yolipai.com>
Date: Mon, 2 Dec 2019 17:45:53 +0800
Subject: [PATCH] 公告文字滚动显示不全及速度修改

---
 components/diy_notice/diy_notice.wxml | 6 +++---
 components/diy_notice/diy_notice.wxss | 6 ++++--
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/components/diy_notice/diy_notice.wxml b/components/diy_notice/diy_notice.wxml
index be135f1..7b867a1 100644
--- a/components/diy_notice/diy_notice.wxml
+++ b/components/diy_notice/diy_notice.wxml
@@ -4,9 +4,9 @@
             <image class="image_c" src="/public/static/images/model/notice.png"></image>
             <view class="marquee">
                 <view class="content">
-                    <text style="color: {{object.notice_color}}">{{object.noticetxt}}</text> <text style="display: inline-block; width: 590rpx;"></text>
-                    <text style="color: {{object.notice_color}}">{{object.noticetxt}}</text> <text style="display: inline-block; width: 590rpx;"></text>
-                    <text style="color: {{object.notice_color}}">{{object.noticetxt}}</text> <text style="display: inline-block; width: 590rpx;"></text>
+                    <text style="color: {{object.notice_color}}">{{object.noticetxt}}</text> <text style="display: inline-block; width: 590rpx;line-height:30rpx;"></text>
+                    <text style="color: {{object.notice_color}}">{{object.noticetxt}}</text> <text style="display: inline-block; width: 590rpx;line-height:30rpx;"></text>
+                    <text style="color: {{object.notice_color}}">{{object.noticetxt}}</text> <text style="display: inline-block; width: 590rpx;line-height:30rpx;"></text>
                 </view>
             </view>
         </view>
diff --git a/components/diy_notice/diy_notice.wxss b/components/diy_notice/diy_notice.wxss
index 2330b15..9e1e912 100644
--- a/components/diy_notice/diy_notice.wxss
+++ b/components/diy_notice/diy_notice.wxss
@@ -39,7 +39,7 @@
   white-space: nowrap;
   text-overflow: clip;
   position: relative;
-  font-size: 28rpx;
+  font-size: 24rpx;
   margin-left: 50rpx;
   margin-top: -45rpx;
 }
@@ -47,8 +47,10 @@
   display: inline-block;
   position: relative;
   padding-right: 0px;
-  animation: kf-marque-animation 4.5s linear infinite;
+  animation: kf-marque-animation 20s linear infinite;
   white-space: nowrap;
+  line-height: 2rpx;font-size: 24rpx;
+
 }
 
 .pd_top10{margin: 10rpx 0}
--
libgit2 0.21.4