From 5252d1d3f1a7549b4f9e661c48d16405f6065ed4 Mon Sep 17 00:00:00 2001
From: yvan <yvan.ni@yolipai.com>
Date: Wed, 26 Feb 2020 14:40:58 +0800
Subject: [PATCH] 新试一下  公告的

---
 components/diy_notice/diy_notice.wxml | 21 +++++++++++++++++++++
 components/diy_notice/g_filter.wxs    |  8 ++++++++
 2 files changed, 29 insertions(+), 0 deletions(-)
 create mode 100644 components/diy_notice/g_filter.wxs

diff --git a/components/diy_notice/diy_notice.wxml b/components/diy_notice/diy_notice.wxml
index 7b867a1..029b09b 100644
--- a/components/diy_notice/diy_notice.wxml
+++ b/components/diy_notice/diy_notice.wxml
@@ -1,4 +1,21 @@
+<wxs module="g_filter" src="g_filter.wxs"></wxs>
 <block wx:if="{{object.style==1}}">
+  <block wx:if="{{g_filter.has_char(object.wxapp_url,'plugin')>=0}}">
+    <navigator url="{{object.wxapp_url}}" class="s1_gk_a1 pd_top10" style="background-color: {{object.notice_bgcolor}}">
+        <view class="big_border">
+            <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;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>
+    </navigator> 
+	</block>	
+
+	<block wx:else>
     <view data-url="{{object.wxapp_url}}" class="s1_gk_a1 pd_top10" bindtap="go_url" style="background-color: {{object.notice_bgcolor}}">
         <view class="big_border">
             <image class="image_c" src="/public/static/images/model/notice.png"></image>
@@ -11,6 +28,10 @@
             </view>
         </view>
     </view>
+	</block>	
+
+   
+
 </block>
 
 
diff --git a/components/diy_notice/g_filter.wxs b/components/diy_notice/g_filter.wxs
new file mode 100644
index 0000000..4564e99
--- /dev/null
+++ b/components/diy_notice/g_filter.wxs
@@ -0,0 +1,8 @@
+var g_filters = {
+	has_char:function(url,key){
+	  return	url.indexOf(key);		
+	}
+}
+module.exports = {
+	has_char: g_filters.has_char
+}
\ No newline at end of file
--
libgit2 0.21.4