Commit 04f3cdc8cfcb9232f0f9c96b84083b04885031d5
Merge branch 'test' into 'qa'
Test See merge request !306
Showing
2 changed files
with
29 additions
and
0 deletions
components/diy_notice/diy_notice.wxml
| 1 | +<wxs module="g_filter" src="g_filter.wxs"></wxs> | |
| 1 | 2 | <block wx:if="{{object.style==1}}"> |
| 3 | + <block wx:if="{{g_filter.has_char(object.wxapp_url,'plugin')>=0}}"> | |
| 4 | + <navigator url="{{object.wxapp_url}}" class="s1_gk_a1 pd_top10" style="background-color: {{object.notice_bgcolor}}"> | |
| 5 | + <view class="big_border"> | |
| 6 | + <image class="image_c" src="/public/static/images/model/notice.png"></image> | |
| 7 | + <view class="marquee"> | |
| 8 | + <view class="content"> | |
| 9 | + <text style="color: {{object.notice_color}}">{{object.noticetxt}}</text> <text style="display: inline-block; width: 590rpx;line-height:30rpx;"></text> | |
| 10 | + <text style="color: {{object.notice_color}}">{{object.noticetxt}}</text> <text style="display: inline-block; width: 590rpx;line-height:30rpx;"></text> | |
| 11 | + <text style="color: {{object.notice_color}}">{{object.noticetxt}}</text> <text style="display: inline-block; width: 590rpx;line-height:30rpx;"></text> | |
| 12 | + </view> | |
| 13 | + </view> | |
| 14 | + </view> | |
| 15 | + </navigator> | |
| 16 | + </block> | |
| 17 | + | |
| 18 | + <block wx:else> | |
| 2 | 19 | <view data-url="{{object.wxapp_url}}" class="s1_gk_a1 pd_top10" bindtap="go_url" style="background-color: {{object.notice_bgcolor}}"> |
| 3 | 20 | <view class="big_border"> |
| 4 | 21 | <image class="image_c" src="/public/static/images/model/notice.png"></image> |
| ... | ... | @@ -11,6 +28,10 @@ |
| 11 | 28 | </view> |
| 12 | 29 | </view> |
| 13 | 30 | </view> |
| 31 | + </block> | |
| 32 | + | |
| 33 | + | |
| 34 | + | |
| 14 | 35 | </block> |
| 15 | 36 | |
| 16 | 37 | ... | ... |