Commit 7dfc2ede29e7425c68e539d774d3c2d8bdd8bf68
Merge branch 'test' into 'qa'
Test See merge request !763
Showing
1 changed file
with
9 additions
and
3 deletions
pages/goods/categoryList/categoryList.wxml
| ... | ... | @@ -48,7 +48,10 @@ |
| 48 | 48 | <view class='f_item' |
| 49 | 49 | bindtap="go_nation" data-nid="{{bitem.id}}" |
| 50 | 50 | wx:for="{{nationlist}}" wx:for-item="bitem" wx:for-index="pidx"> |
| 51 | - <view><image class='n_img' src='{{iurl}}{{bitem.logo}}'></image> | |
| 51 | + <view> | |
| 52 | + <image wx:if="{{bitem.imgtype==1}}" class='n_img' src='{{bitem.logo}}'></image> | |
| 53 | + <image wx:else class='n_img' src='{{iurl}}{{bitem.logo}}'></image> | |
| 54 | + | |
| 52 | 55 | <view class='nation_box'> |
| 53 | 56 | <view class='nt_1'><text class="nt_1_t">{{bitem.name}}</text></view> |
| 54 | 57 | <view class='nt_2'>{{bitem.enname}}</view> |
| ... | ... | @@ -165,7 +168,9 @@ |
| 165 | 168 | </view> |
| 166 | 169 | <view class=" classify_content-frame flex-space-between " > |
| 167 | 170 | <view bindtap="go_nation" class="country_img-frame rel outer_location"wx:for="{{nationlist}}" wx:for-item="bitem" wx:for-index="pidx" data-nid="{{bitem.id}}" > |
| 168 | - <image class="country_img" src="{{iurl}}{{bitem.logo}}"></image> | |
| 171 | + <image wx:if="{{bitem.imgtype==1}}" class="country_img" src="{{bitem.logo}}"></image> | |
| 172 | + <image wx:else class="country_img" src="{{iurl}}{{bitem.logo}}"></image> | |
| 173 | + | |
| 169 | 174 | <view class='nation_box abs box'> |
| 170 | 175 | <view class='nt_1 t-c line-height' style="height:50rpx"> |
| 171 | 176 | <text class="nation_z_name ellipsis-1 nt_1_t height fs24">{{bitem.name}}</text> |
| ... | ... | @@ -349,7 +354,8 @@ |
| 349 | 354 | </view> |
| 350 | 355 | <view class=" classify_content-frame flex-space-between " > |
| 351 | 356 | <view bindtap="go_nation" class="country_img-frame rel outer_location"wx:for="{{nationlist}}" wx:for-item="bitem" wx:for-index="pidx" data-nid="{{bitem.id}}" > |
| 352 | - <image class="country_img" src="{{iurl}}{{bitem.logo}}"></image> | |
| 357 | + <image wx:if="{{bitem.imgtype==1}}" class="country_img" src="{{bitem.logo}}"></image> | |
| 358 | + <image wx:else class="country_img" src="{{iurl}}{{bitem.logo}}"></image> | |
| 353 | 359 | <view class='nation_box abs box'> |
| 354 | 360 | <view class='nt_1 t-c line-height' style="height:50rpx"> |
| 355 | 361 | <text class="nation_z_name ellipsis-1 nt_1_t height fs24">{{bitem.name}}</text> | ... | ... |