From 5dcc05586f53ee4ac7a081a36df07540076e0bb5 Mon Sep 17 00:00:00 2001
From: yvan.ni <yvan.ni@youlipai.com>
Date: Mon, 9 May 2022 15:39:32 +0800
Subject: [PATCH] 跳转打其他小程序的   公告组件， 标题组件

---
 components/diy_notice/diy_notice.wxml | 21 +++++++++++++++++++--
 components/diy_title/diy_title.wxml   |  4 ++++
 2 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/components/diy_notice/diy_notice.wxml b/components/diy_notice/diy_notice.wxml
index 16453d8..6086942 100644
--- a/components/diy_notice/diy_notice.wxml
+++ b/components/diy_notice/diy_notice.wxml
@@ -1,6 +1,6 @@
 <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}}">
+    <block wx:if="{{g_filter.has_char(object.wxapp_url,'plugin')>=0}}">
     <navigator url="{{object.wxapp_url}}" class="s1_gk_a1" style="background-color: {{object.notice_bgcolor}}">
         <view class="big_border">
             <image class="image_c" src="{{imghost}}/miniapp/images/notice.png"></image>
@@ -13,7 +13,24 @@
             </view>
         </view>
     </navigator> 
-	</block>	
+	</block>
+
+    <block wx:elif="{{object.AppId}}">
+        <navigator target="miniProgram" app-id="{{object.AppId}}" path="{{object.wxapp_url}}" class="s1_gk_a1" style="background-color: {{object.notice_bgcolor}}">
+            <view class="big_border">
+                <image class="image_c" src="{{imghost}}/miniapp/images/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" bindtap="go_url" style="background-color: {{object.notice_bgcolor}}">
diff --git a/components/diy_title/diy_title.wxml b/components/diy_title/diy_title.wxml
index 92f7796..5710fbc 100644
--- a/components/diy_title/diy_title.wxml
+++ b/components/diy_title/diy_title.wxml
@@ -9,6 +9,10 @@
         <view class="txet_rim"><view class="text" style='color:{{object.title_namecolor}}'>{{object.title_name}}</view></view>
     </navigator>
 
+    <navigator  wx:elif="{{object.AppId}}" style="width:{{100/nav_list.length}}%;" target="miniProgram" app-id="{{object.AppId}}" path="{{object.wxapp_url}}">
+        <view class="txet_rim"><view class="text" style='color:{{object.title_namecolor}}'>{{object.title_name}}</view></view>
+    </navigator>
+
     <view data-url="{{object.wxapp_url}}" bindtap="go_url" wx:else>
         <view class="txet_rim"><view class="text" style='color:{{object.title_namecolor}}'>{{object.title_name}}</view></view>
     </view>
--
libgit2 0.21.4