wxd / MShopWeApp

Commit 48c8692dcfe33233b26a9fb5fecbe0344e1dd2c3

Authored by 后端研发-倪永富
1 parent 5252d1d3

自定义模板要显示 直播组件的修改

Inline Side-by-side
Showing 8 changed files with 223 additions and 136 deletions
components/diy_advertising/diy_advertising.wxml
  View file @48c8692
1   -<!--pages/diy_gk/diy_gk.wxml-->
  1 +<wxs module="g_filter" src="../diy_notice/g_filter.wxs"></wxs>
2 2 <!--上下两块-->
3 3 <block wx:if='{{object.style==0}}'>
4 4 <view class="zwp_s1">
... ... @@ -9,10 +9,13 @@
9 9 <text>建议宽度640</text>
10 10 </block>
11 11 <block wx:if="{{item.src!=''}}">
12   - <view data-url="{{item.wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url">
13   - <image src="{{item.src}}" mode="widthFix">
14   - </image>
15   - </view>
  12 + <navigator url="{{item.wxapp_imgurl}}" class="s1_gk_a1"
  13 + wx:if="{{g_filter.has_char(item.wxapp_imgurl,'plugin')>=0}}">
  14 + <image src="{{item.src}}" mode="widthFix"></image>
  15 + </navigator>
  16 + <view data-url="{{item.wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url" wx:else>
  17 + <image src="{{item.src}}" mode="widthFix"></image>
  18 + </view>
16 19 </block>
17 20 </view>
18 21  
... ... @@ -31,10 +34,14 @@
31 34 <text>建议宽度640</text>
32 35 </block>
33 36 <block wx:if="{{item.src!=''}}">
34   - <view data-url="{{item.wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url">
35   - <image src="{{item.src}}" mode="widthFix">
36   - </image>
  37 + <navigator url="{{item.wxapp_imgurl}}" class="s1_gk_a1" wx:if="{{g_filter.has_char(item.wxapp_imgurl,'plugin')>=0}}">
  38 + <image src="{{item.src}}" mode="widthFix"></image>
  39 + </navigator>
  40 +
  41 + <view data-url="{{item.wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url" wx:else>
  42 + <image src="{{item.src}}" mode="widthFix"></image>
37 43 </view>
  44 +
38 45 </block>
39 46  
40 47 </view>
... ... @@ -55,9 +62,15 @@
55 62 <text>300*300</text>
56 63 </block>
57 64 <block wx:if="{{item.src!=''}}">
58   - <view data-url="{{item.wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url">
  65 + <navigator url="{{item.wxapp_imgurl}}" class="s1_gk_a1" wx:if="{{g_filter.has_char(item.wxapp_imgurl,'plugin')>=0}}">
  66 + <image src="{{item.src}}" mode="widthFix"></image>
  67 + </navigator>
  68 +
  69 + <view data-url="{{item.wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url" wx:else>
59 70 <image src="{{item.src}}" mode="widthFix"></image>
60 71 </view>
  72 +
  73 +
61 74 </block>
62 75 </view>
63 76 </view>
... ... @@ -76,9 +89,8 @@
76 89 <text>200*200</text>
77 90 </block>
78 91 <block wx:if="{{item.src!=''}}">
79   - <view data-url="{{item.wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url">
80   - <image src="{{item.src}}" ></image>
81   - </view>
  92 + <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>
  93 + <view data-url="{{item.wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url" wx:else><image src="{{item.src}}" ></image></view>
82 94 </block>
83 95 </view>
84 96 </block>
... ... @@ -86,7 +98,6 @@
86 98 <view class="clear"></view>
87 99  
88 100  
89   -
90 101 <!--第5 3个图 -->
91 102 <view class='s5' wx:if='{{object.style==5}}'>
92 103  
... ... @@ -95,7 +106,10 @@
95 106 <text>300*300</text>
96 107 </block>
97 108 <block wx:if="{{object.data[0].src!=''}}">
98   - <view data-url="{{object.data[0].wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url">
  109 + <navigator url="{{object.data[0].wxapp_imgurl}}" class="s1_gk_a1" wx:if="{{g_filter.has_char(object.data[0].wxapp_imgurl,'plugin')>=0}}">>
  110 + <image src="{{object.data[0].src}}"></image>
  111 + </navigator>
  112 + <view data-url="{{object.data[0].wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url" wx:else>
99 113 <image src="{{object.data[0].src}}"></image>
100 114 </view>
101 115 </block>
... ... @@ -107,9 +121,15 @@
107 121 <text>300*150</text>
108 122 </block>
109 123 <block wx:if="{{object.data[1].src!=''}}">
110   - <view data-url="{{object.data[1].wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url">
  124 + <navigator url="{{object.data[1].wxapp_imgurl}}" class="s1_gk_a1" wx:if="{{g_filter.has_char(object.data[1].wxapp_imgurl,'plugin')>=0}}">
  125 + <image src="{{object.data[1].src}}"></image>
  126 + </navigator>
  127 +
  128 + <view data-url="{{object.data[1].wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url" wx:else>
111 129 <image src="{{object.data[1].src}}"></image>
112 130 </view>
  131 +
  132 +
113 133 </block>
114 134 </view>
115 135 <view class='s5_g5_2'>
... ... @@ -117,9 +137,14 @@
117 137 <text>300*150</text>
118 138 </block>
119 139 <block wx:if="{{object.data[2].src!=''}}">
120   - <view data-url="{{object.data[2].wxapp_imgurl}}" open-type="switchTab" class="s1_gk_a1" bindtap="go_url">
  140 + <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}}">
  141 + <image src="{{object.data[2].src}}"></image>
  142 + </navigator>
  143 + <view data-url="{{object.data[2].wxapp_imgurl}}" open-type="switchTab" class="s1_gk_a1" bindtap="go_url" wx:else>
121 144 <image src="{{object.data[2].src}}"></image>
122 145 </view>
  146 +
  147 +
123 148 </block>
124 149 </view>
125 150 </view>
... ... @@ -134,9 +159,14 @@
134 159 <text>200*200</text>
135 160 </block>
136 161 <block wx:if="{{object.data[0].src!=''}}">
137   - <view data-url="{{object.data[0].wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url">
  162 + <navigator url="{{object.data[0].wxapp_imgurl}}" class="s1_gk_a1" wx:if="{{g_filter.has_char(object.data[0].wxapp_imgurl,'plugin')>=0}}">
  163 + <image src="{{object.data[0].src}}"></image>
  164 + </navigator>
  165 +
  166 + <view data-url="{{object.data[0].wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url" wx:else>
138 167 <image src="{{object.data[0].src}}"></image>
139 168 </view>
  169 +
140 170 </block>
141 171 </view>
142 172 <view class='s6_gk6_2' style='margin-right:8rpx'>
... ... @@ -144,9 +174,14 @@
144 174 <text>400*200</text>
145 175 </block>
146 176 <block wx:if="{{object.data[1].src!=''}}">
147   - <view data-url="{{object.data[1].wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url">
  177 + <navigator url="{{object.data[1].wxapp_imgurl}}" class="s1_gk_a1" wx:if="{{g_filter.has_char(object.data[1].wxapp_imgurl,'plugin')>=0}}">
  178 + <image src="{{object.data[1].src}}"></image>
  179 + </navigator>
  180 +
  181 + <view data-url="{{object.data[1].wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url" wx:else>
148 182 <image src="{{object.data[1].src}}"></image>
149 183 </view>
  184 +
150 185 </block>
151 186 </view>
152 187 </view>
... ... @@ -157,9 +192,14 @@
157 192 <text>400*200</text>
158 193 </block>
159 194 <block wx:if="{{object.data[2].src!=''}}">
160   - <view data-url="{{object.data[2].wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url">
  195 + <navigator url="{{object.data[2].wxapp_imgurl}}" class="s1_gk_a1" wx:if="{{g_filter.has_char(object.data[2].wxapp_imgurl,'plugin')>=0}}">
  196 + <image src="{{object.data[2].src}}"></image>
  197 + </navigator>
  198 +
  199 + <view data-url="{{object.data[2].wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url" wx:else>
161 200 <image src="{{object.data[2].src}}"></image>
162 201 </view>
  202 +
163 203 </block>
164 204 </view>
165 205 <view class='s6_gk6_1' style='margin-right:8rpx'>
... ... @@ -167,9 +207,14 @@
167 207 <text>200*200</text>
168 208 </block>
169 209 <block wx:if="{{object.data[3].src!=''}}">
170   - <view data-url="{{object.data[3].wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url">
  210 + <navigator url="{{object.data[3].wxapp_imgurl}}" class="s1_gk_a1" wx:if="{{g_filter.has_char(object.data[3].wxapp_imgurl,'plugin')>=0}}">
  211 + <image src="{{object.data[3].src}}"></image>
  212 + </navigator>
  213 +
  214 + <view data-url="{{object.data[3].wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url" wx:else>
171 215 <image src="{{object.data[3].src}}"></image>
172 216 </view>
  217 +
173 218 </block>
174 219 </view>
175 220 </view>
... ... @@ -184,9 +229,14 @@
184 229 <text>300*150</text>
185 230 </block>
186 231 <block wx:if="{{object.data[0].src!=''}}">
187   - <view data-url="{{object.data[0].wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url">
  232 + <navigator url="{{object.data[0].wxapp_imgurl}}" class="s1_gk_a1" wx:if="{{g_filter.has_char(object.data[0].wxapp_imgurl,'plugin')>=0}}">
  233 + <image src="{{object.data[0].src}}"></image>
  234 + </navigator>
  235 +
  236 + <view data-url="{{object.data[0].wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url" wx:else>
188 237 <image src="{{object.data[0].src}}"></image>
189 238 </view>
  239 +
190 240 </block>
191 241 </view>
192 242 <view class='s7_gk7_2'>
... ... @@ -195,9 +245,13 @@
195 245 <text>300*300</text>
196 246 </block>
197 247 <block wx:if="{{object.data[1].src!=''}}">
198   - <view data-url="{{object.data[1].wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url">
  248 + <navigator url="{{object.data[1].wxapp_imgurl}}" class="s1_gk_a1" wx:if="{{g_filter.has_char(object.data[1].wxapp_imgurl,'plugin')>=0}}">
  249 + <image src="{{object.data[1].src}}"></image>
  250 + </navigator>
  251 + <view data-url="{{object.data[1].wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url" wx:else>
199 252 <image src="{{object.data[1].src}}"></image>
200 253 </view>
  254 +
201 255 </block>
202 256  
203 257 </view>
... ... @@ -209,10 +263,14 @@
209 263 <text>300*300</text>
210 264 </block>
211 265 <block wx:if="{{object.data[2].src!=''}}">
212   - <view data-url="{{object.data[2].wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url">
213   - <image src="{{object.data[2].src}}">
214   - </image>
  266 + <navigator url="{{object.data[2].wxapp_imgurl}}" class="s1_gk_a1" wx:if="{{g_filter.has_char(object.data[2].wxapp_imgurl,'plugin')>=0}}">
  267 + <image src="{{object.data[2].src}}"></image>
  268 + </navigator>
  269 +
  270 + <view data-url="{{object.data[2].wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url" wx:else>
  271 + <image src="{{object.data[2].src}}"></image>
215 272 </view>
  273 +
216 274 </block>
217 275 </view>
218 276 <view class='s7_gk7_1'>
... ... @@ -220,10 +278,14 @@
220 278 <text>300*150</text>
221 279 </block>
222 280 <block wx:if="{{object.data[3].src!=''}}">
223   - <view data-url="{{object.data[3].wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url">
224   - <image src="{{object.data[3].src}}">
225   - </image>
  281 + <navigator url="{{object.data[3].wxapp_imgurl}}" class="s1_gk_a1" wx:if="{{g_filter.has_char(object.data[3].wxapp_imgurl,'plugin')>=0}}">
  282 + <image src="{{object.data[3].src}}"></image>
  283 + </navigator>
  284 +
  285 + <view data-url="{{object.data[3].wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url" wx:else>
  286 + <image src="{{object.data[3].src}}"></image>
226 287 </view>
  288 +
227 289 </block>
228 290 </view>
229 291 </view>
... ... @@ -233,38 +295,6 @@
233 295 <!--第8 5个图-->
234 296 <view class='s8' wx:if='{{object.style==8}}'>
235 297  
236   - <!-- <block wx:for="{{object.data}}" > -->
237   - <!-- <view class='s8_gk8'>
238   -
239   - <view class='s8_gk1'>
240   -
241   - <block wx:if="{{object.data[0].src==''}}">
242   - <text>200*200</text>
243   - </block>
244   - <block wx:if="{{object.data[0].src!=''}}">
245   - <view data-url="{{object.data[0].wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url">
246   - <image src="{{object.data[0].src}}">
247   - </image>
248   - </view>
249   - </block>
250   - </view>
251   - <view class='s8_gk1'>
252   - <block wx:if="{{object.data[1].src==''}}">
253   - <text>200*200</text>
254   - </block>
255   - <block wx:if="{{object.data[1].src!=''}}">
256   - <view data-url="{{object.data[1].wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url">
257   - <image src="{{object.data[1].src}}" mode="widthFix">
258   - </image>
259   - </view>
260   - </block>
261   - </view>
262   - </view> -->
263   -
264   -
265   -
266   -
267   -
268 298  
269 299 <view class='s8_gk8'>
270 300 <view class='s8_gk1'>
... ... @@ -272,10 +302,14 @@
272 302 <text>200*200</text>
273 303 </block>
274 304 <block wx:if="{{object.data[0].src!=''}}">
275   - <view data-url="{{object.data[0].wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url">
276   - <image src="{{object.data[0].src}}" >
277   - </image>
  305 + <navigator url="{{object.data[0].wxapp_imgurl}}" class="s1_gk_a1" wx:if="{{g_filter.has_char(object.data[0].wxapp_imgurl,'plugin')>=0}}">
  306 + <image src="{{object.data[0].src}}" ></image>
  307 + </navigator>
  308 +
  309 + <view data-url="{{object.data[0].wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url" wx:else>
  310 + <image src="{{object.data[0].src}}" ></image>
278 311 </view>
  312 +
279 313 </block>
280 314 </view>
281 315 <view class='s8_gk1'>
... ... @@ -283,9 +317,12 @@
283 317 <text>200*200</text>
284 318 </block>
285 319 <block wx:if="{{object.data[1].src!=''}}">
286   - <view data-url="{{object.data[1].wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url">
287   - <image src="{{object.data[1].src}}" >
288   - </image>
  320 + <navigator url="{{object.data[1].wxapp_imgurl}}" class="s1_gk_a1" wx:if="{{g_filter.has_char(object.data[1].wxapp_imgurl,'plugin')>=0}}">
  321 + <image src="{{object.data[1].src}}" ></image>
  322 + </navigator>
  323 +
  324 + <view data-url="{{object.data[1].wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url" wx:else>
  325 + <image src="{{object.data[1].src}}" ></image>
289 326 </view>
290 327 </block>
291 328 </view>
... ... @@ -298,10 +335,15 @@
298 335 <text>200*200</text>
299 336 </block>
300 337 <block wx:if="{{object.data[2].src!=''}}">
301   - <view data-url="{{object.data[2].wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url">
302   - <image src="{{object.data[2].src}}" >
303   - </image>
  338 + <navigator url="{{object.data[2].wxapp_imgurl}}" class="s1_gk_a1" wx:if="{{g_filter.has_char(object.data[2].wxapp_imgurl,'plugin')>=0}}">
  339 + <image src="{{object.data[2].src}}" ></image>
  340 + </navigator>
  341 +
  342 + <view data-url="{{object.data[2].wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url" wx:else>
  343 + <image src="{{object.data[2].src}}" ></image>
304 344 </view>
  345 +
  346 +
305 347 </block>
306 348 </view>
307 349 <view class='s8_gk1'>
... ... @@ -309,9 +351,12 @@
309 351 <text>200*200</text>
310 352 </block>
311 353 <block wx:if="{{object.data[3].src!=''}}">
312   - <view data-url="{{object.data[3].wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url">
313   - <image src="{{object.data[3].src}}" >
314   - </image>
  354 + <navigator url="{{object.data[3].wxapp_imgurl}}" class="s1_gk_a1" wx:if="{{g_filter.has_char(object.data[3].wxapp_imgurl,'plugin')>=0}}">
  355 + <image src="{{object.data[3].src}}" ></image>
  356 + </navigator>
  357 +
  358 + <view data-url="{{object.data[3].wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url" wx:else>
  359 + <image src="{{object.data[3].src}}" ></image>
315 360 </view>
316 361 </block>
317 362 </view>
... ... @@ -325,10 +370,14 @@
325 370 <text>200*420</text>
326 371 </block>
327 372 <block wx:if="{{object.data[4].src!=''}}">
328   - <view data-url="{{object.data[4].wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url">
329   - <image src="{{object.data[4].src}}" style='height:492rpx'>
330   - </image>
  373 + <navigator url="{{object.data[4].wxapp_imgurl}}" class="s1_gk_a1" wx:if="{{g_filter.has_char(object.data[4].wxapp_imgurl,'plugin')>=0}}">
  374 + <image src="{{object.data[4].src}}" style='height:492rpx'></image>
  375 + </navigator>
  376 +
  377 + <view data-url="{{object.data[4].wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url" wx:else>
  378 + <image src="{{object.data[4].src}}" style='height:492rpx'></image>
331 379 </view>
  380 +
332 381 </block>
333 382 </view>
334 383 </view>
... ... @@ -340,21 +389,20 @@
340 389 <block wx:if='{{object.style==4}}'>
341 390 <swiper class="swiper" indicator-dots="true" autoplay="{{autoplay}}" interval="{{interval}}" duration="{{duration}}" style="height:{{max_sw_height}}rpx" >
342 391 <block wx:for="{{object.data}}" wx:for-index="index" >
343   - <block wx:if="{{item.src!=''}}">
344   - <view data-url="{{item.wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url">
345   - <swiper-item>
346   - <image src="{{item.src}}" bindload="imageLoad" data-index="{{index}}" class="slide-image" mode="widthFix" />
347   - </swiper-item>
348   - </view>
349   - </block>
350   - <block wx:if="{{item.src==''}}">
351   - <view url="{{item.wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url">
352   - <swiper-item>
353   - <image src="" class="slide-image" mode="aspectFill" />
354   - </swiper-item>
  392 +
  393 +
  394 + <navigator url="{{item.wxapp_imgurl}}" class="s1_gk_a1" wx:if="{{g_filter.has_char(item.wxapp_imgurl,'plugin')>=0}}">
  395 + <swiper-item><image src="{{item.src}}" bindload="imageLoad" data-index="{{index}}" class="slide-image" mode="widthFix" /></swiper-item>
  396 + </navigator>
  397 +
  398 + <view url="{{item.wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url" wx:else>
  399 + <swiper-item><image src="{{item.src}}" bindload="imageLoad" data-index="{{index}}" class="slide-image" mode="widthFix" /></swiper-item>
355 400 </view>
356   - </block>
  401 +
  402 +
  403 +
  404 +
357 405 </block>
358 406 </swiper>
359 407  
360   -</block>
361 408 \ No newline at end of file
  409 +</block>
... ...
components/diy_advertising/diy_advertising.wxss
  View file @48c8692
... ... @@ -273,6 +273,7 @@
273 273 text-align: center;
274 274 margin-right: 10rpx;
275 275 margin-bottom: 8rpx;
  276 + height: 360rpx;
276 277 }
277 278  
278 279 .s8 {
... ...
components/diy_nav/diy_nav.wxml
  View file @48c8692
  1 +<wxs module="g_filter" src="../diy_notice/g_filter.wxs"></wxs>
  2 +
1 3 <block wx:if="{{object.style==1}}">
2 4 <view class="{{object.seticon==1?'big':object.seticon==2?'big_one_two':'big_border_three'}}">
3 5 <block wx:for="{{nav_list}}">
4   - <view data-url="{{item.wxapp_url}}" class="s1_gk_a1" bindtap="go_url">
5   - <view style='width:{{100/nav_list.length}}%'
6   - class="{{object.seticon==1?'big_view_one':object.seticon==2?'big_view_two':'bicder_picture'}}">
7   - <block wx:if="{{item.navicon==null}}">
8   - <image style='width:{{object.sliderExample*2}}rpx;height:{{object.sliderExample*2}}rpx;'
9   - class="{{object.seticon==1?'print_one':object.seticon==2?'print_two':'image_none'}}"
10   - src="{{imghost}}/miniapp/images/nav-icon.png"></image>
11   - <view class="{{object.seticon==1?'font_one':object.seticon==2?'font_bicder_two':'font_three'}}">
12   - {{item.title}}
13   - </view>
14   - </block>
15   - <block wx:if="{{item.navicon!=null}}">
16   - <image style='width:{{object.sliderExample*2}}rpx;height:{{object.sliderExample*2}}rpx;'
17   - class="{{object.seticon==1?'print_one':object.seticon==2?'print_two':'image_none'}}"
18   - src="{{item.navicon}}"></image>
19   - <view class="{{object.seticon==1?'font_one':object.seticon==2?'font_bicder_two':'font_three'}}">
20   - {{item.title}}
21   - </view>
22   - </block>
23   - </view>
  6 + <navigator url="{{item.wxapp_url}}" class="s1_gk_a1"
  7 + wx:if="{{g_filter.has_char(item.wxapp_url,'plugin')>=0}}">
  8 + <include src="diy_nav_part1.wxml" />
  9 + </navigator>
  10 + <view data-url="{{item.wxapp_url}}" class="s1_gk_a1" bindtap="go_url" wx:else>
  11 + <include src="diy_nav_part1.wxml" />
24 12 </view>
25 13 </block>
26 14 </view>
... ... @@ -30,24 +18,12 @@
30 18 <view class="big_two">
31 19 <!-- 图片一 -->
32 20 <block wx:for="{{nav_list}}">
33   - <view data-url="{{item.wxapp_url}}" class="s1_gk_a1" bindtap="go_url">
34   - <view class="one_div">
35   - <view class="picture_one">
36   - <block wx:if="{{item.navicon!=null}}">
37   - <image style='width:{{object.sliderExample*2}}rpx;height:{{object.sliderExample*2}}rpx;'
38   - src="{{item.navicon}}">
39   - </image>
40   - </block>
41   -
42   - <block wx:if="{{item.navicon==null}}">
43   - <image style='width:{{object.sliderExample*2}}rpx;height:{{object.sliderExample*2}}rpx;'
44   - src="{{imghost}}/miniapp/images/nav-icon.png">
45   - </image>
46   - </block>
47   -
48   - </view>
49   - <view class="test">{{item.title}}</view>
50   - </view>
  21 + <navigator data-url="{{item.wxapp_url}}" class="s1_gk_a1" bindtap="go_url"
  22 + wx:if="{{g_filter.has_char(item.wxapp_url,'plugin')>=0}}">
  23 + <include src="diy_nav_part2.wxml" />
  24 + </navigator>
  25 + <view data-url="{{item.wxapp_url}}" class="s1_gk_a1" bindtap="go_url" wx:else>
  26 + <include src="diy_nav_part2.wxml" />
51 27 </view>
52 28 </block>
53 29 </view>
... ...
components/diy_nav/diy_nav_part1.wxml 0 → 100644
  View file @48c8692
  1 + <view style='width:{{100/nav_list.length}}%'
  2 + class="{{object.seticon==1?'big_view_one':object.seticon==2?'big_view_two':'bicder_picture'}}">
  3 + <block wx:if="{{item.navicon==null}}">
  4 + <image style='width:{{object.sliderExample*2}}rpx;height:{{object.sliderExample*2}}rpx;'
  5 + class="{{object.seticon==1?'print_one':object.seticon==2?'print_two':'image_none'}}"
  6 + src="{{imghost}}/miniapp/images/nav-icon.png"></image>
  7 + <view class="{{object.seticon==1?'font_one':object.seticon==2?'font_bicder_two':'font_three'}}">
  8 + {{item.title}}
  9 + </view>
  10 + </block>
  11 + <block wx:if="{{item.navicon!=null}}">
  12 + <image style='width:{{object.sliderExample*2}}rpx;height:{{object.sliderExample*2}}rpx;'
  13 + class="{{object.seticon==1?'print_one':object.seticon==2?'print_two':'image_none'}}"
  14 + src="{{item.navicon}}"></image>
  15 + <view class="{{object.seticon==1?'font_one':object.seticon==2?'font_bicder_two':'font_three'}}">
  16 + {{item.title}}
  17 + </view>
  18 + </block>
  19 + </view>
  20 +
  21 +
  22 +
  23 +
... ...
components/diy_nav/diy_nav_part2.wxml 0 → 100644
  View file @48c8692
  1 + <view class="one_div">
  2 + <view class="picture_one">
  3 + <block wx:if="{{item.navicon!=null}}">
  4 + <image style='width:{{object.sliderExample*2}}rpx;height:{{object.sliderExample*2}}rpx;'
  5 + src="{{item.navicon}}">
  6 + </image>
  7 + </block>
  8 +
  9 + <block wx:if="{{item.navicon==null}}">
  10 + <image style='width:{{object.sliderExample*2}}rpx;height:{{object.sliderExample*2}}rpx;'
  11 + src="{{imghost}}/miniapp/images/nav-icon.png">
  12 + </image>
  13 + </block>
  14 +
  15 + </view>
  16 + <view class="test">{{item.title}}</view>
  17 +</view>
... ...
components/diy_picMax/diy_picMax.wxml
  View file @48c8692
1 1 <!--图片组合-->
2   -<!-- <view class="picMax" style="height: {{pic_height}}rpx"> -->
  2 +<wxs module="g_filter" src="../diy_notice/g_filter.wxs"></wxs>
3 3 <view class="picMax" >
4 4 <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}}">
5   - <image bindtap='gopage' data-url="{{item.wxapp_url}}" src="{{item.src}}" mode="widthFix" style="display: block;" ></image>
  5 + <block wx:if="{{g_filter.has_char(item.wxapp_url,'plugin')>=0}}" >
  6 + <navigator url="{{item.wxapp_url}}">
  7 + <image src="{{item.src}}" mode="widthFix" style="display: block;" ></image>
  8 + </navigator>
  9 + </block>
  10 + <block wx:else>
  11 + <image bindtap='gopage' data-url="{{item.wxapp_url}}" src="{{item.src}}" mode="widthFix" style="display: block;" ></image>
  12 + </block>
6 13 </view>
7 14 </view>
... ...
components/diy_title/diy_title.js
  View file @48c8692
... ... @@ -16,6 +16,14 @@ Component({
16 16 go_url:function (e) {
17 17 var url=e.currentTarget.dataset.url;
18 18 getApp().goto(url);
19   - }
  19 + },
  20 +
  21 + berror:function(e){
  22 + var iurl=getApp().globalData.setting.imghost;
  23 + var ob={};
  24 + var txt="object.title_img";
  25 + ob[txt] = iurl +'/miniapp/images/logo.png';
  26 + this.setData(ob);
  27 + }
20 28 }
21   -})
22 29 \ No newline at end of file
  30 +})
... ...
components/diy_title/diy_title.wxml
  View file @48c8692
  1 +<wxs module="g_filter" src="../diy_notice/g_filter.wxs"></wxs>
  2 +<!--上下两块-->
1 3 <view class="big_rim">
2 4 <view class="rim">
3   - <image class="image_one" src="{{object.title_img}}"></image>
  5 + <image class="image_one" src="{{object.title_img}}" binderror="berror"></image>
4 6 </view>
5   - <view data-url="{{object.wxapp_url}}" bindtap="go_url">
6   - <view class="txet_rim">
7   - <view class="text" style='color:{{object.title_namecolor}}'>{{object.title_name}}</view></view>
  7 +
  8 + <navigator url="{{object.wxapp_url}}" wx:if="{{g_filter.has_char(object.wxapp_url,'plugin')>=0}}">
  9 + <view class="txet_rim"><view class="text" style='color:{{object.title_namecolor}}'>{{object.title_name}}</view></view>
  10 + </navigator>
  11 +
  12 + <view data-url="{{object.wxapp_url}}" bindtap="go_url" wx:else>
  13 + <view class="txet_rim"><view class="text" style='color:{{object.title_namecolor}}'>{{object.title_name}}</view></view>
8 14 </view>
  15 +
9 16 <block wx:if="{{object.title_right!= ''}}">
10 17 <view bindtap="go_url" data-url='{{object.wxapp_url}}'>
11 18 <view class="right_rim">
... ... @@ -16,4 +23,4 @@
16 23 </view>
17 24 </view>
18 25 </block>
19   -</view>
20 26 \ No newline at end of file
  27 +</view>
... ...