From 80cade987c99a0581def91569aa8a4858ca75351 Mon Sep 17 00:00:00 2001
From: yvan.ni <765199919@qq.com>
Date: Tue, 5 May 2020 10:43:24 +0800
Subject: [PATCH] 品牌图片有本地图片和网络图片俩种的正确显示

---
 pages/goods/categoryList/categoryList.js   | 3 +--
 pages/goods/categoryList/categoryList.wxml | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/pages/goods/categoryList/categoryList.js b/pages/goods/categoryList/categoryList.js
index 04fba8c..301ed31 100644
--- a/pages/goods/categoryList/categoryList.js
+++ b/pages/goods/categoryList/categoryList.js
@@ -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数组中是否存在，不存在就要添加，存在就在要这个数组添加元素
diff --git a/pages/goods/categoryList/categoryList.wxml b/pages/goods/categoryList/categoryList.wxml
index 5d394f9..f5c8974 100644
--- a/pages/goods/categoryList/categoryList.wxml
+++ b/pages/goods/categoryList/categoryList.wxml
@@ -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>
--
libgit2 0.21.4