Merge branch 'dev' into 'test'

品牌图片有本地图片和网络图片俩种的正确显示 See merge request !406

Merge branch 'dev' into 'test'
品牌图片有本地图片和网络图片俩种的正确显示 See merge request !406
后端研发-苏明海
2 parents 1a7d8010 80cade98
Showing 2 changed files with 2 additions and 3 deletions
pages/goods/categoryList/categoryList.js
pages/goods/categoryList/categoryList.wxml
@@ -389,8 +389,7 @@ Page({
           var dda = e.data.data.pageData;
        s.setData({brand_list:dda});
           for (var i = 0; i < dda.length; i++) {
-             
-              dda[i].logo = oo.imghost+dda[i].logo;
+              if(dda[i].logo && dda[i].logo.indexOf("http")<0)  dda[i].logo = oo.imghost+dda[i].logo;
               if (arr.length>0){
                 var find = 0;
                 //寻找字母在arr数组中是否存在，不存在就要添加，存在就在要这个数组添加元素
@@ -185,7 +185,7 @@
          <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}}" >
  
             <view class="brand_img t-c">
-               <image class=" brand_img" src="{{user.logo}}"data-errorimg="groups[{{pidx}}].array[{{idx}}].logo" binderror="bind_bnerr_pp"></image>
+               <image class=" brand_img" src="{{user.logo}}" data-errorimg="groups[{{pidx}}].array[{{idx}}].logo" binderror="bind_bnerr_pp"></image>
                 <view class="brand_img_name ellipsis-1 fs24">{{user.name}}</view>
            </view>
          </view>