Commit b780af08f7f12c4e86d2b6b27531c26fda5e5adf
Merge branch 'dev' of http://git.vipzhuang.cn/wxd/MShopWeApp into dev
Showing
2 changed files
with
8 additions
and
2 deletions
components/diy_picMax/diy_picMax.wxml
| @@ -9,6 +9,11 @@ | @@ -9,6 +9,11 @@ | ||
| 9 | <image src="{{item.src}}" style="display: block; height: 100%; width: 100%;"></image> | 9 | <image src="{{item.src}}" style="display: block; height: 100%; width: 100%;"></image> |
| 10 | </navigator> | 10 | </navigator> |
| 11 | </block> | 11 | </block> |
| 12 | + <block wx:elif="{{item.AppId}}"> | ||
| 13 | + <navigator target="miniProgram" app-id="{{item.AppId}}" path="{{item.wxapp_url}}"> | ||
| 14 | + <image src="{{item.src}}" mode="widthFix" style="display: block;"></image> | ||
| 15 | + </navigator> | ||
| 16 | + </block> | ||
| 12 | <block wx:else> | 17 | <block wx:else> |
| 13 | <image bindtap='gopage' wx:if="{{item.wxapp_url}}" data-url="{{item.wxapp_url}}" src="{{item.src}}" style="display: block; height: 100%; width: 100%;"></image> | 18 | <image bindtap='gopage' wx:if="{{item.wxapp_url}}" data-url="{{item.wxapp_url}}" src="{{item.src}}" style="display: block; height: 100%; width: 100%;"></image> |
| 14 | <image bindtap='previewImage' wx:else data-src="{{item.src}}" src="{{item.src}}" style="display: block; height: 100%; width: 100%;"></image> | 19 | <image bindtap='previewImage' wx:else data-src="{{item.src}}" src="{{item.src}}" style="display: block; height: 100%; width: 100%;"></image> |
| @@ -25,11 +30,12 @@ | @@ -25,11 +30,12 @@ | ||
| 25 | </navigator> | 30 | </navigator> |
| 26 | </block> | 31 | </block> |
| 27 | <block wx:elif="{{item.AppId}}"> | 32 | <block wx:elif="{{item.AppId}}"> |
| 28 | - <navigator target="miniProgram" app-id="{{item.AppId}}" path="{{item.wxapp_url}}"> | 33 | + <navigator target="miniProgram" app-id="{{item.AppId}}" path="{{item.wxapp_url}}"> |
| 29 | <image src="{{item.src}}" mode="widthFix" style="display: block;"></image> | 34 | <image src="{{item.src}}" mode="widthFix" style="display: block;"></image> |
| 30 | </navigator> | 35 | </navigator> |
| 31 | </block> | 36 | </block> |
| 32 | <block wx:else> | 37 | <block wx:else> |
| 38 | + | ||
| 33 | <image bindtap='gopage' wx:if="{{item.wxapp_url}}" data-url="{{item.wxapp_url}}" src="{{item.src}}" mode="widthFix" style="display: block;"></image> | 39 | <image bindtap='gopage' wx:if="{{item.wxapp_url}}" data-url="{{item.wxapp_url}}" src="{{item.src}}" mode="widthFix" style="display: block;"></image> |
| 34 | <image bindtap='previewImage' wx:else data-src="{{item.src}}" src="{{item.src}}" style="display: block;" mode="widthFix"></image> | 40 | <image bindtap='previewImage' wx:else data-src="{{item.src}}" src="{{item.src}}" style="display: block;" mode="widthFix"></image> |
| 35 | </block> | 41 | </block> |