From 48c8692dcfe33233b26a9fb5fecbe0344e1dd2c3 Mon Sep 17 00:00:00 2001
From: yvan <yvan.ni@yolipai.com>
Date: Wed, 26 Feb 2020 22:14:00 +0800
Subject: [PATCH] 自定义模板要显示 直播组件的修改

---
 components/diy_advertising/diy_advertising.wxml | 226 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-----------------------------------------------------------------------------------------
 components/diy_advertising/diy_advertising.wxss |   1 +
 components/diy_nav/diy_nav.wxml                 |  52 ++++++++++++++--------------------------------------
 components/diy_nav/diy_nav_part1.wxml           |  23 +++++++++++++++++++++++
 components/diy_nav/diy_nav_part2.wxml           |  17 +++++++++++++++++
 components/diy_picMax/diy_picMax.wxml           |  11 +++++++++--
 components/diy_title/diy_title.js               |  12 ++++++++++--
 components/diy_title/diy_title.wxml             |  17 ++++++++++++-----
 8 files changed, 223 insertions(+), 136 deletions(-)
 create mode 100644 components/diy_nav/diy_nav_part1.wxml
 create mode 100644 components/diy_nav/diy_nav_part2.wxml

diff --git a/components/diy_advertising/diy_advertising.wxml b/components/diy_advertising/diy_advertising.wxml
index cf4c379..347c432 100644
--- a/components/diy_advertising/diy_advertising.wxml
+++ b/components/diy_advertising/diy_advertising.wxml
@@ -1,4 +1,4 @@
-<!--pages/diy_gk/diy_gk.wxml-->
+<wxs module="g_filter" src="../diy_notice/g_filter.wxs"></wxs>
 <!--上下两块-->
 <block wx:if='{{object.style==0}}'>
 <view class="zwp_s1">
@@ -9,10 +9,13 @@
           <text>建议宽度640</text>
         </block>
         <block wx:if="{{item.src!=''}}">
-          <view data-url="{{item.wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url">
-            <image src="{{item.src}}" mode="widthFix">
-            </image>
-          </view>
+            <navigator url="{{item.wxapp_imgurl}}" class="s1_gk_a1"
+						     wx:if="{{g_filter.has_char(item.wxapp_imgurl,'plugin')>=0}}">
+                <image src="{{item.src}}" mode="widthFix"></image>
+            </navigator>
+			<view data-url="{{item.wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url" wx:else>
+                <image src="{{item.src}}" mode="widthFix"></image>
+             </view>
         </block>
       </view>
 
@@ -31,10 +34,14 @@
           <text>建议宽度640</text>
         </block>
         <block wx:if="{{item.src!=''}}">
-          <view data-url="{{item.wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url">
-            <image src="{{item.src}}" mode="widthFix">
-            </image>
+          <navigator url="{{item.wxapp_imgurl}}" class="s1_gk_a1"  wx:if="{{g_filter.has_char(item.wxapp_imgurl,'plugin')>=0}}">
+            <image src="{{item.src}}" mode="widthFix"></image>
+          </navigator>
+
+					<view data-url="{{item.wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url" wx:else>
+            <image src="{{item.src}}" mode="widthFix"></image>
           </view>
+
         </block>
 
       </view>
@@ -55,9 +62,15 @@
             <text>300*300</text>
           </block>
           <block wx:if="{{item.src!=''}}">
-            <view data-url="{{item.wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url">
+            <navigator url="{{item.wxapp_imgurl}}" class="s1_gk_a1"  wx:if="{{g_filter.has_char(item.wxapp_imgurl,'plugin')>=0}}">
+              <image src="{{item.src}}" mode="widthFix"></image>
+            </navigator>
+
+            <view data-url="{{item.wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url" wx:else>
               <image src="{{item.src}}" mode="widthFix"></image>
             </view>
+
+
           </block>
         </view>
       </view>
@@ -76,9 +89,8 @@
         <text>200*200</text>
       </block>
       <block wx:if="{{item.src!=''}}">
-        <view data-url="{{item.wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url">
-          <image src="{{item.src}}" ></image>
-        </view>
+        <navigator url="{{item.wxapp_imgurl}}" class="s1_gk_a1" wx:if="{{g_filter.has_char(item.wxapp_imgurl,'plugin')>=0}}"><image src="{{item.src}}" ></image></navigator>
+        <view data-url="{{item.wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url" wx:else><image src="{{item.src}}" ></image></view>
       </block>
     </view>
   </block>
@@ -86,7 +98,6 @@
 <view class="clear"></view>
 
 
-
 <!--第5 3个图 -->
 <view class='s5' wx:if='{{object.style==5}}'>
 
@@ -95,7 +106,10 @@
       <text>300*300</text>
     </block>
     <block wx:if="{{object.data[0].src!=''}}">
-      <view data-url="{{object.data[0].wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url">
+      <navigator url="{{object.data[0].wxapp_imgurl}}" class="s1_gk_a1" wx:if="{{g_filter.has_char(object.data[0].wxapp_imgurl,'plugin')>=0}}">>
+        <image src="{{object.data[0].src}}"></image>
+      </navigator>
+      <view data-url="{{object.data[0].wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url" wx:else>
         <image src="{{object.data[0].src}}"></image>
       </view>
     </block>
@@ -107,9 +121,15 @@
         <text>300*150</text>
       </block>
       <block wx:if="{{object.data[1].src!=''}}">
-        <view data-url="{{object.data[1].wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url">
+        <navigator url="{{object.data[1].wxapp_imgurl}}" class="s1_gk_a1" wx:if="{{g_filter.has_char(object.data[1].wxapp_imgurl,'plugin')>=0}}">
+           <image src="{{object.data[1].src}}"></image>
+        </navigator>
+
+        <view data-url="{{object.data[1].wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url" wx:else>
           <image src="{{object.data[1].src}}"></image>
         </view>
+
+
       </block>
     </view>
     <view class='s5_g5_2'>
@@ -117,9 +137,14 @@
         <text>300*150</text>
       </block>
       <block wx:if="{{object.data[2].src!=''}}">
-        <view data-url="{{object.data[2].wxapp_imgurl}}" open-type="switchTab" class="s1_gk_a1" bindtap="go_url">
+        <navigator url="{{object.data[2].wxapp_imgurl}}" open-type="switchTab" class="s1_gk_a1"  wx:if="{{g_filter.has_char(object.data[2].wxapp_imgurl,'plugin')>=0}}">
+          <image src="{{object.data[2].src}}"></image>
+        </navigator>
+        <view data-url="{{object.data[2].wxapp_imgurl}}" open-type="switchTab" class="s1_gk_a1" bindtap="go_url" wx:else>
           <image src="{{object.data[2].src}}"></image>
         </view>
+
+
       </block>
     </view>
   </view>
@@ -134,9 +159,14 @@
         <text>200*200</text>
       </block>
       <block wx:if="{{object.data[0].src!=''}}">
-        <view data-url="{{object.data[0].wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url">
+        <navigator url="{{object.data[0].wxapp_imgurl}}" class="s1_gk_a1" wx:if="{{g_filter.has_char(object.data[0].wxapp_imgurl,'plugin')>=0}}">
+           <image src="{{object.data[0].src}}"></image>
+        </navigator>
+
+        <view data-url="{{object.data[0].wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url" wx:else>
           <image src="{{object.data[0].src}}"></image>
         </view>
+
       </block>
     </view>
     <view class='s6_gk6_2' style='margin-right:8rpx'>
@@ -144,9 +174,14 @@
         <text>400*200</text>
       </block>
       <block wx:if="{{object.data[1].src!=''}}">
-        <view data-url="{{object.data[1].wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url">
+        <navigator url="{{object.data[1].wxapp_imgurl}}" class="s1_gk_a1" wx:if="{{g_filter.has_char(object.data[1].wxapp_imgurl,'plugin')>=0}}">
+          <image src="{{object.data[1].src}}"></image>
+        </navigator>
+
+        <view data-url="{{object.data[1].wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url" wx:else>
           <image src="{{object.data[1].src}}"></image>
         </view>
+
       </block>
     </view>
   </view>
@@ -157,9 +192,14 @@
         <text>400*200</text>
       </block>
       <block wx:if="{{object.data[2].src!=''}}">
-        <view data-url="{{object.data[2].wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url">
+         <navigator url="{{object.data[2].wxapp_imgurl}}" class="s1_gk_a1" wx:if="{{g_filter.has_char(object.data[2].wxapp_imgurl,'plugin')>=0}}">
+           <image src="{{object.data[2].src}}"></image>
+         </navigator>
+
+        <view data-url="{{object.data[2].wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url" wx:else>
           <image src="{{object.data[2].src}}"></image>
         </view>
+
       </block>
     </view>
     <view class='s6_gk6_1' style='margin-right:8rpx'>
@@ -167,9 +207,14 @@
         <text>200*200</text>
       </block>
       <block wx:if="{{object.data[3].src!=''}}">
-        <view data-url="{{object.data[3].wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url">
+        <navigator url="{{object.data[3].wxapp_imgurl}}" class="s1_gk_a1"  wx:if="{{g_filter.has_char(object.data[3].wxapp_imgurl,'plugin')>=0}}">
+          <image src="{{object.data[3].src}}"></image>
+        </navigator>
+
+        <view data-url="{{object.data[3].wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url" wx:else>
           <image src="{{object.data[3].src}}"></image>
         </view>
+
       </block>
     </view>
   </view>
@@ -184,9 +229,14 @@
         <text>300*150</text>
       </block>
       <block wx:if="{{object.data[0].src!=''}}">
-        <view data-url="{{object.data[0].wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url">
+        <navigator url="{{object.data[0].wxapp_imgurl}}" class="s1_gk_a1" wx:if="{{g_filter.has_char(object.data[0].wxapp_imgurl,'plugin')>=0}}">
+          <image src="{{object.data[0].src}}"></image>
+        </navigator>
+
+        <view data-url="{{object.data[0].wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url" wx:else>
           <image src="{{object.data[0].src}}"></image>
         </view>
+
       </block>
     </view>
     <view class='s7_gk7_2'>
@@ -195,9 +245,13 @@
         <text>300*300</text>
       </block>
       <block wx:if="{{object.data[1].src!=''}}">
-        <view data-url="{{object.data[1].wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url">
+        <navigator url="{{object.data[1].wxapp_imgurl}}" class="s1_gk_a1" wx:if="{{g_filter.has_char(object.data[1].wxapp_imgurl,'plugin')>=0}}">
+          <image src="{{object.data[1].src}}"></image>
+        </navigator>
+        <view data-url="{{object.data[1].wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url" wx:else>
           <image src="{{object.data[1].src}}"></image>
         </view>
+
       </block>
 
     </view>
@@ -209,10 +263,14 @@
         <text>300*300</text>
       </block>
       <block wx:if="{{object.data[2].src!=''}}">
-        <view data-url="{{object.data[2].wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url">
-          <image src="{{object.data[2].src}}">
-          </image>
+        <navigator url="{{object.data[2].wxapp_imgurl}}" class="s1_gk_a1" wx:if="{{g_filter.has_char(object.data[2].wxapp_imgurl,'plugin')>=0}}">
+           <image src="{{object.data[2].src}}"></image>
+        </navigator>
+
+        <view data-url="{{object.data[2].wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url" wx:else>
+          <image src="{{object.data[2].src}}"></image>
         </view>
+
       </block>
     </view>
     <view class='s7_gk7_1'>
@@ -220,10 +278,14 @@
         <text>300*150</text>
       </block>
       <block wx:if="{{object.data[3].src!=''}}">
-        <view data-url="{{object.data[3].wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url">
-          <image src="{{object.data[3].src}}">
-          </image>
+        <navigator url="{{object.data[3].wxapp_imgurl}}" class="s1_gk_a1" wx:if="{{g_filter.has_char(object.data[3].wxapp_imgurl,'plugin')>=0}}">
+          <image src="{{object.data[3].src}}"></image>
+        </navigator>
+
+        <view data-url="{{object.data[3].wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url" wx:else>
+          <image src="{{object.data[3].src}}"></image>
         </view>
+
       </block>
     </view>
   </view>
@@ -233,38 +295,6 @@
 <!--第8 5个图-->
 <view class='s8' wx:if='{{object.style==8}}'>
 
-  <!-- <block wx:for="{{object.data}}" > -->
-  <!-- <view class='s8_gk8'> 
-
-            <view class='s8_gk1'>
-
-                <block wx:if="{{object.data[0].src==''}}">
-                    <text>200*200</text>
-                </block>
-                <block wx:if="{{object.data[0].src!=''}}">
-                    <view data-url="{{object.data[0].wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url">
-                        <image src="{{object.data[0].src}}">
-                        </image>
-                    </view>
-                </block>
-            </view> 
-            <view class='s8_gk1'>
-                <block wx:if="{{object.data[1].src==''}}">
-                    <text>200*200</text>
-                </block>
-                <block wx:if="{{object.data[1].src!=''}}">
-                    <view data-url="{{object.data[1].wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url">
-                        <image src="{{object.data[1].src}}" mode="widthFix">
-                        </image>
-                    </view>
-                </block>
-            </view>
-        </view> -->
-
-
-
-
-
 
   <view class='s8_gk8'>
     <view class='s8_gk1'>
@@ -272,10 +302,14 @@
         <text>200*200</text>
       </block>
       <block wx:if="{{object.data[0].src!=''}}">
-        <view data-url="{{object.data[0].wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url">
-          <image src="{{object.data[0].src}}" >
-          </image>
+        <navigator url="{{object.data[0].wxapp_imgurl}}" class="s1_gk_a1" wx:if="{{g_filter.has_char(object.data[0].wxapp_imgurl,'plugin')>=0}}">
+            <image src="{{object.data[0].src}}" ></image>
+        </navigator>
+        
+        <view data-url="{{object.data[0].wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url" wx:else>
+				  <image src="{{object.data[0].src}}" ></image>
         </view>
+
       </block>
     </view>
     <view class='s8_gk1'>
@@ -283,9 +317,12 @@
         <text>200*200</text>
       </block>
       <block wx:if="{{object.data[1].src!=''}}">
-        <view data-url="{{object.data[1].wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url">
-          <image src="{{object.data[1].src}}" >
-          </image>
+        <navigator url="{{object.data[1].wxapp_imgurl}}" class="s1_gk_a1" wx:if="{{g_filter.has_char(object.data[1].wxapp_imgurl,'plugin')>=0}}">
+          <image src="{{object.data[1].src}}" ></image>
+        </navigator>
+
+        <view data-url="{{object.data[1].wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url" wx:else>
+          <image src="{{object.data[1].src}}" ></image>
         </view>
       </block>
     </view>
@@ -298,10 +335,15 @@
         <text>200*200</text>
       </block>
       <block wx:if="{{object.data[2].src!=''}}">
-        <view data-url="{{object.data[2].wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url">
-          <image src="{{object.data[2].src}}" >
-          </image>
+        <navigator url="{{object.data[2].wxapp_imgurl}}" class="s1_gk_a1" wx:if="{{g_filter.has_char(object.data[2].wxapp_imgurl,'plugin')>=0}}">
+          <image src="{{object.data[2].src}}" ></image>
+        </navigator>
+
+        <view data-url="{{object.data[2].wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url" wx:else>
+          <image src="{{object.data[2].src}}" ></image>
         </view>
+
+
       </block>
     </view>
     <view class='s8_gk1'>
@@ -309,9 +351,12 @@
         <text>200*200</text>
       </block>
       <block wx:if="{{object.data[3].src!=''}}">
-        <view data-url="{{object.data[3].wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url">
-          <image src="{{object.data[3].src}}" >
-          </image>
+        <navigator url="{{object.data[3].wxapp_imgurl}}" class="s1_gk_a1" wx:if="{{g_filter.has_char(object.data[3].wxapp_imgurl,'plugin')>=0}}">
+          <image src="{{object.data[3].src}}" ></image>
+        </navigator>
+
+        <view data-url="{{object.data[3].wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url" wx:else>
+          <image src="{{object.data[3].src}}" ></image>
         </view>
       </block>
     </view>
@@ -325,10 +370,14 @@
         <text>200*420</text>
       </block>
       <block wx:if="{{object.data[4].src!=''}}">
-        <view data-url="{{object.data[4].wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url">
-          <image src="{{object.data[4].src}}" style='height:492rpx'>
-          </image>
+        <navigator url="{{object.data[4].wxapp_imgurl}}" class="s1_gk_a1" wx:if="{{g_filter.has_char(object.data[4].wxapp_imgurl,'plugin')>=0}}">
+          <image src="{{object.data[4].src}}" style='height:492rpx'></image>
+        </navigator>
+
+        <view data-url="{{object.data[4].wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url" wx:else>
+          <image src="{{object.data[4].src}}" style='height:492rpx'></image>
         </view>
+
       </block>
     </view>
   </view>
@@ -340,21 +389,20 @@
 <block wx:if='{{object.style==4}}'>
   <swiper class="swiper" indicator-dots="true" autoplay="{{autoplay}}" interval="{{interval}}" duration="{{duration}}" style="height:{{max_sw_height}}rpx" >
     <block wx:for="{{object.data}}" wx:for-index="index" >
-      <block wx:if="{{item.src!=''}}">
-        <view data-url="{{item.wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url">
-          <swiper-item>
-            <image src="{{item.src}}"  bindload="imageLoad"  data-index="{{index}}"   class="slide-image" mode="widthFix" />
-          </swiper-item>
-        </view>
-      </block>
-      <block wx:if="{{item.src==''}}">
-        <view url="{{item.wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url">
-          <swiper-item>
-            <image src="" class="slide-image" mode="aspectFill" />
-          </swiper-item>
+   
+
+        <navigator url="{{item.wxapp_imgurl}}" class="s1_gk_a1" wx:if="{{g_filter.has_char(item.wxapp_imgurl,'plugin')>=0}}">
+          <swiper-item><image src="{{item.src}}"  bindload="imageLoad"  data-index="{{index}}"   class="slide-image" mode="widthFix" /></swiper-item>
+        </navigator>
+
+        <view url="{{item.wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url" wx:else>
+          <swiper-item><image src="{{item.src}}"  bindload="imageLoad"  data-index="{{index}}"  class="slide-image" mode="widthFix" /></swiper-item>
         </view>
-      </block>
+
+
+      
+      
     </block>
   </swiper>
 
-</block>
\ No newline at end of file
+</block>
diff --git a/components/diy_advertising/diy_advertising.wxss b/components/diy_advertising/diy_advertising.wxss
index 6dbb494..60f24cc 100644
--- a/components/diy_advertising/diy_advertising.wxss
+++ b/components/diy_advertising/diy_advertising.wxss
@@ -273,6 +273,7 @@
   text-align: center;
   margin-right: 10rpx;
   margin-bottom: 8rpx;
+	height: 360rpx;
 }
 
 .s8 {
diff --git a/components/diy_nav/diy_nav.wxml b/components/diy_nav/diy_nav.wxml
index 7bd58f9..50e323b 100644
--- a/components/diy_nav/diy_nav.wxml
+++ b/components/diy_nav/diy_nav.wxml
@@ -1,26 +1,14 @@
+<wxs module="g_filter" src="../diy_notice/g_filter.wxs"></wxs>
+
 <block wx:if="{{object.style==1}}">
     <view class="{{object.seticon==1?'big':object.seticon==2?'big_one_two':'big_border_three'}}">
         <block wx:for="{{nav_list}}">
-            <view data-url="{{item.wxapp_url}}" class="s1_gk_a1" bindtap="go_url">
-                <view style='width:{{100/nav_list.length}}%'
-                    class="{{object.seticon==1?'big_view_one':object.seticon==2?'big_view_two':'bicder_picture'}}">
-                    <block wx:if="{{item.navicon==null}}">
-                        <image style='width:{{object.sliderExample*2}}rpx;height:{{object.sliderExample*2}}rpx;'
-                               class="{{object.seticon==1?'print_one':object.seticon==2?'print_two':'image_none'}}"
-                               src="{{imghost}}/miniapp/images/nav-icon.png"></image>
-                        <view class="{{object.seticon==1?'font_one':object.seticon==2?'font_bicder_two':'font_three'}}">
-                           {{item.title}}
-                        </view>
-                    </block>
-                    <block wx:if="{{item.navicon!=null}}">
-                        <image style='width:{{object.sliderExample*2}}rpx;height:{{object.sliderExample*2}}rpx;'
-                               class="{{object.seticon==1?'print_one':object.seticon==2?'print_two':'image_none'}}"
-                               src="{{item.navicon}}"></image>
-                        <view class="{{object.seticon==1?'font_one':object.seticon==2?'font_bicder_two':'font_three'}}">
-                           {{item.title}}
-                        </view>
-                    </block>
-                </view>
+            <navigator url="{{item.wxapp_url}}" class="s1_gk_a1"
+						   wx:if="{{g_filter.has_char(item.wxapp_url,'plugin')>=0}}">
+                 <include src="diy_nav_part1.wxml" />
+            </navigator>
+						<view data-url="{{item.wxapp_url}}" class="s1_gk_a1" bindtap="go_url" wx:else>
+                 <include src="diy_nav_part1.wxml" />
             </view>
         </block>
     </view>
@@ -30,24 +18,12 @@
     <view class="big_two">
         <!-- 图片一 -->
         <block wx:for="{{nav_list}}">
-            <view data-url="{{item.wxapp_url}}" class="s1_gk_a1" bindtap="go_url">
-                <view class="one_div">
-                    <view class="picture_one">
-                        <block wx:if="{{item.navicon!=null}}">
-                            <image style='width:{{object.sliderExample*2}}rpx;height:{{object.sliderExample*2}}rpx;'
-                                   src="{{item.navicon}}">
-                            </image>
-                        </block>
-
-                        <block wx:if="{{item.navicon==null}}">
-                            <image style='width:{{object.sliderExample*2}}rpx;height:{{object.sliderExample*2}}rpx;'
-                                 src="{{imghost}}/miniapp/images/nav-icon.png">
-                            </image>
-                        </block>
-
-                    </view>
-                    <view class="test">{{item.title}}</view>
-                </view>
+            <navigator data-url="{{item.wxapp_url}}" class="s1_gk_a1" bindtap="go_url"
+						     wx:if="{{g_filter.has_char(item.wxapp_url,'plugin')>=0}}">
+                 <include src="diy_nav_part2.wxml" />
+            </navigator>
+						<view data-url="{{item.wxapp_url}}" class="s1_gk_a1" bindtap="go_url" wx:else>
+                 <include src="diy_nav_part2.wxml" />
             </view>
         </block>
     </view>
diff --git a/components/diy_nav/diy_nav_part1.wxml b/components/diy_nav/diy_nav_part1.wxml
new file mode 100644
index 0000000..596ac72
--- /dev/null
+++ b/components/diy_nav/diy_nav_part1.wxml
@@ -0,0 +1,23 @@
+ <view style='width:{{100/nav_list.length}}%'
+                    class="{{object.seticon==1?'big_view_one':object.seticon==2?'big_view_two':'bicder_picture'}}">
+                    <block wx:if="{{item.navicon==null}}">
+                        <image style='width:{{object.sliderExample*2}}rpx;height:{{object.sliderExample*2}}rpx;'
+                               class="{{object.seticon==1?'print_one':object.seticon==2?'print_two':'image_none'}}"
+                               src="{{imghost}}/miniapp/images/nav-icon.png"></image>
+                        <view class="{{object.seticon==1?'font_one':object.seticon==2?'font_bicder_two':'font_three'}}">
+                           {{item.title}}
+                        </view>
+                    </block>
+                    <block wx:if="{{item.navicon!=null}}">
+                        <image style='width:{{object.sliderExample*2}}rpx;height:{{object.sliderExample*2}}rpx;'
+                               class="{{object.seticon==1?'print_one':object.seticon==2?'print_two':'image_none'}}"
+                               src="{{item.navicon}}"></image>
+                        <view class="{{object.seticon==1?'font_one':object.seticon==2?'font_bicder_two':'font_three'}}">
+                           {{item.title}}
+                        </view>
+                    </block>
+                </view>
+
+			
+
+
diff --git a/components/diy_nav/diy_nav_part2.wxml b/components/diy_nav/diy_nav_part2.wxml
new file mode 100644
index 0000000..ef8fae0
--- /dev/null
+++ b/components/diy_nav/diy_nav_part2.wxml
@@ -0,0 +1,17 @@
+ <view class="one_div">
+                    <view class="picture_one">
+                        <block wx:if="{{item.navicon!=null}}">
+                            <image style='width:{{object.sliderExample*2}}rpx;height:{{object.sliderExample*2}}rpx;'
+                                   src="{{item.navicon}}">
+                            </image>
+                        </block>
+
+                        <block wx:if="{{item.navicon==null}}">
+                            <image style='width:{{object.sliderExample*2}}rpx;height:{{object.sliderExample*2}}rpx;'
+                                 src="{{imghost}}/miniapp/images/nav-icon.png">
+                            </image>
+                        </block>
+
+                    </view>
+                    <view class="test">{{item.title}}</view>
+</view>
diff --git a/components/diy_picMax/diy_picMax.wxml b/components/diy_picMax/diy_picMax.wxml
index 8a645cd..27c644a 100644
--- a/components/diy_picMax/diy_picMax.wxml
+++ b/components/diy_picMax/diy_picMax.wxml
@@ -1,7 +1,14 @@
 <!--图片组合-->
-<!-- <view class="picMax" style="height: {{pic_height}}rpx"> -->
+<wxs module="g_filter" src="../diy_notice/g_filter.wxs"></wxs>
 <view class="picMax" >
     <view wx:for="{{object.data}}"  class="pic_item width_{{item.x_span}} height_{{item.y_span}} mar_x{{item.fir.x}} mar_y{{item.fir.y}}">
-        <image bindtap='gopage' data-url="{{item.wxapp_url}}" src="{{item.src}}" mode="widthFix" style="display: block;" ></image>
+        <block wx:if="{{g_filter.has_char(item.wxapp_url,'plugin')>=0}}" >	 
+				  <navigator url="{{item.wxapp_url}}">
+           <image src="{{item.src}}" mode="widthFix" style="display: block;" ></image>
+					 </navigator>
+        </block>
+        <block wx:else>
+          <image bindtap='gopage' data-url="{{item.wxapp_url}}" src="{{item.src}}" mode="widthFix" style="display: block;" ></image>
+        </block>
     </view>
 </view>
diff --git a/components/diy_title/diy_title.js b/components/diy_title/diy_title.js
index c932759..c6b3b9a 100644
--- a/components/diy_title/diy_title.js
+++ b/components/diy_title/diy_title.js
@@ -16,6 +16,14 @@ Component({
      go_url:function (e) {
         var url=e.currentTarget.dataset.url;
         getApp().goto(url);
-     }
+     },
+
+		berror:function(e){
+			 var iurl=getApp().globalData.setting.imghost;
+			 var ob={};
+			 var txt="object.title_img";
+		  	ob[txt] = iurl +'/miniapp/images/logo.png';
+			 this.setData(ob);
+		}
   }
-})
\ No newline at end of file
+})
diff --git a/components/diy_title/diy_title.wxml b/components/diy_title/diy_title.wxml
index f746fa6..e36c911 100644
--- a/components/diy_title/diy_title.wxml
+++ b/components/diy_title/diy_title.wxml
@@ -1,11 +1,18 @@
+<wxs module="g_filter" src="../diy_notice/g_filter.wxs"></wxs>
+<!--上下两块-->
 <view class="big_rim">
     <view class="rim">
-        <image class="image_one" src="{{object.title_img}}"></image>
+        <image class="image_one" src="{{object.title_img}}" binderror="berror"></image>
     </view>
-    <view data-url="{{object.wxapp_url}}" bindtap="go_url">
-        <view class="txet_rim">
-            <view class="text" style='color:{{object.title_namecolor}}'>{{object.title_name}}</view></view>
+
+    <navigator url="{{object.wxapp_url}}" wx:if="{{g_filter.has_char(object.wxapp_url,'plugin')>=0}}">
+        <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>
+
     <block wx:if="{{object.title_right!= ''}}">
         <view bindtap="go_url" data-url='{{object.wxapp_url}}'>
             <view class="right_rim">
@@ -16,4 +23,4 @@
             </view>
         </view>
     </block>
-</view>
\ No newline at end of file
+</view>
--
libgit2 0.21.4