Commit 76a8a45786e3fe54ab48cdfa727e668e6fe076a4
Merge branch 'qa' into 'master'
Qa See merge request !408
Showing
2 changed files
with
2 additions
and
3 deletions
pages/goods/categoryList/categoryList.js
| @@ -389,8 +389,7 @@ Page({ | @@ -389,8 +389,7 @@ Page({ | ||
| 389 | var dda = e.data.data.pageData; | 389 | var dda = e.data.data.pageData; |
| 390 | s.setData({brand_list:dda}); | 390 | s.setData({brand_list:dda}); |
| 391 | for (var i = 0; i < dda.length; i++) { | 391 | for (var i = 0; i < dda.length; i++) { |
| 392 | - | ||
| 393 | - dda[i].logo = oo.imghost+dda[i].logo; | 392 | + if(dda[i].logo && dda[i].logo.indexOf("http")<0) dda[i].logo = oo.imghost+dda[i].logo; |
| 394 | if (arr.length>0){ | 393 | if (arr.length>0){ |
| 395 | var find = 0; | 394 | var find = 0; |
| 396 | //寻找字母在arr数组中是否存在，不存在就要添加，存在就在要这个数组添加元素 | 395 | //寻找字母在arr数组中是否存在，不存在就要添加，存在就在要这个数组添加元素 |
pages/goods/categoryList/categoryList.wxml
| @@ -185,7 +185,7 @@ | @@ -185,7 +185,7 @@ | ||
| 185 | <view class="brand_img_frame "wx:for="{{brand_list.array}}"wx:for-item="user" wx:for-index="idx" bindtap="go_brand" data-bid="{{user.id}}" > | 185 | <view class="brand_img_frame "wx:for="{{brand_list.array}}"wx:for-item="user" wx:for-index="idx" bindtap="go_brand" data-bid="{{user.id}}" > |
| 186 | 186 | ||
| 187 | <view class="brand_img t-c"> | 187 | <view class="brand_img t-c"> |
| 188 | - <image class=" brand_img" src="{{user.logo}}"data-errorimg="groups[{{pidx}}].array[{{idx}}].logo" binderror="bind_bnerr_pp"></image> | 188 | + <image class=" brand_img" src="{{user.logo}}" data-errorimg="groups[{{pidx}}].array[{{idx}}].logo" binderror="bind_bnerr_pp"></image> |
| 189 | <view class="brand_img_name ellipsis-1 fs24">{{user.name}}</view> | 189 | <view class="brand_img_name ellipsis-1 fs24">{{user.name}}</view> |
| 190 | </view> | 190 | </view> |
| 191 | </view> | 191 | </view> |