diff --git a/pages/cart/cart2/c_filter.wxs b/pages/cart/cart2/c_filter.wxs
new file mode 100644
index 0000000..6a74c7e
--- /dev/null
+++ b/pages/cart/cart2/c_filter.wxs
@@ -0,0 +1,63 @@
+var filters = {
+        toFix:function(val,count){
+            return val.toFixed(count)
+        },
+        format_time:function(ts,isFull) {
+           var d = getDate(ts*1000)
+           var fm=[d.getFullYear(), d.getMonth()+1, d.getDate()].join('-');
+           if(isFull==1)
+              fm=fm + ' '+ [d.getHours(), d.getMinutes(), d.getSeconds()].join(':')
+           return fm;
+        },
+        setcolor:function(ind){
+          if (ind == 0 || ind ==null) return "red";
+          if(ind==1 ) return "green";
+          if(ind==2) return "blue";
+          if(ind==11) return "green";
+          if(ind==12) return "blue";
+          return "";
+        },
+      setbgcolor: function (ind) {
+        if (ind == 0 || ind == null) return "#ffa1b9";
+        if (ind == 1) return "#59e1d2";
+        if (ind == 2) return "#a3bcff";
+        if (ind == 11) return "#59e1d2";
+        if (ind == 12) return "#a3bcff";
+        return "";
+      },
+  
+        get_type:function(ind){
+          if (ind == 0 || ind == null) return "全场通用";
+          if (ind == 1) return "品牌";
+          if (ind == 2) return "品类";
+          if (ind == 11) return "用途";
+          if (ind == 12) return "分类1";
+          return "";
+        },
+         get_type_card:function(ind){
+           if (ind == 0 || ind == null) return "全场通用";
+                  if (ind == 1) return "指定品牌";
+                  if (ind == 2) return "指定品类";
+                  if (ind == 11) return "指定用途";
+                  if (ind == 12) return "指定分类1";
+                  return "";
+                },
+       format_huiche:function (text) {
+        if (!text) {
+          return "";
+        }
+        var reg = getRegExp('\\\\n', 'g')
+        return text.replace(reg, '\n')
+      }
+}
+
+module.exports = {
+  toFix: filters.toFix,
+	format_time:filters.format_time,
+	setcolor:filters.setcolor,
+  setbgcolor: filters.setbgcolor,
+  get_type: filters.get_type,
+  get_split_name: filters.get_split_name,
+  get_type_card: filters.get_type_card,
+  format_huiche: filters.format_huiche,
+}
\ No newline at end of file
diff --git a/pages/cart/cart2/filter.wxs b/pages/cart/cart2/filter.wxs
new file mode 100644
index 0000000..c0e8d13
--- /dev/null
+++ b/pages/cart/cart2/filter.wxs
@@ -0,0 +1,11 @@
+var format = function (text) {
+  if (!text) {
+    return
+  }
+  var reg = getRegExp('\\\\n', 'g')
+  return text.replace(reg, '\n')
+}
+
+module.exports = {
+  format: format
+}
diff --git a/pages/goods/categoryList/categoryList.js b/pages/goods/categoryList/categoryList.js
index 5da9416..0dac118 100644
--- a/pages/goods/categoryList/categoryList.js
+++ b/pages/goods/categoryList/categoryList.js
@@ -28,6 +28,7 @@ Page({
       is_country:1,
       //品牌的控制属性
       is_brand:1,
+      goodslist: [{ good_name: "你号", logo: "../../ggg.png" }, { good_name: "你号", logo: "../../ggg.png" }, { good_name: "你号", logo: "../../ggg.png" }, { good_name: "海泥面膜", logo: "../../ggg.png" }, { good_name: "男孩女孩", logo: "../../ggg.png" }, { good_name: "你间距", logo: "../../ggg.png" }, { good_name: "你号", logo: "../../ggg.png" }, { good_name: "谢谢谢谢下", logo: "../../ggg.png" }, { good_name: "你号", logo: "../../ggg.png"}],
       name: [{ names: "洗护用品" }, { names: "天天护理" }, { names: "共顺利" },{ names: "个人洗护" }, { names: "轻奢" }, { names: "路虎" }, { names: "身体护理" }, { names: "品牌" }, { names: "面部护理" }],
       //选择分类的控制属性
       select_classify_on:223,
@@ -338,9 +339,17 @@ Page({
   //图片失败，默认图片
    bind_bnerr: function (e) {
     var _errImg = e.target.dataset.errorimg;
+     console.log(_errImg, "品牌的图片来吗");
     var _errObj = {};
     _errObj[_errImg] = this.data.iurl+"/miniapp/images/default_g_img.gif";
-    this.setData(_errObj) //注意这里的赋值方式,只是将数据列表中的此项图片路径值替换掉 ;       
+    this.setData(_errObj) //注意这里的赋值方式,只是将数据列表中的此项图片路径值替换掉 ;  
+  },
+  //商品图片失败，默认图片
+  goods_bnerr: function (e) {
+    var _errImg = e.target.dataset.err; 
+    var _errObj = {};
+    _errObj[_errImg] = this.data.iurl + "/miniapp/images/no_cate_def.png";
+    this.setData(_errObj) //注意这里的赋值方式,只是将数据列表中的此项图片路径值替换掉 ;  
   },
 
   goseach:function(){
diff --git a/pages/goods/categoryList/categoryList.wxml b/pages/goods/categoryList/categoryList.wxml
index 1eb5d76..3e8e27e 100644
--- a/pages/goods/categoryList/categoryList.wxml
+++ b/pages/goods/categoryList/categoryList.wxml
@@ -29,7 +29,7 @@
 
               <block wx:for="{{catelist}}" wx:for-item="fitem" >
                 <view class='f_item'>
-                    <view  class="pic_view" bindtap="go_cate" data-cid="{{fitem.items.id}}" data-pid="0"><image class='fl_img' src='{{iurl}}{{fitem.items.image}}' binderror="bind_bnerr2"  data-errorimg="catelist[{{index}}].items.image"></image>
+                    <view  class="pic_view" bindtap="go_cate" data-cid="{{fitem.items.id}}" data-pid="0"><image class='fl_img' src='{{iurl}}{{fitem.items.image}}' binderror="bind_bnerr2"  data-errorimg="catelist[{{index}}].items.image"></image> 
                 <view class='over_view'></view> 
                         <text class='f_item_over_t'>{{fitem.items.name}}</text></view>
                     <view class='fenlei_text_v'>
@@ -68,8 +68,9 @@
                     <view class="group-users">
                       <view wx:for="{{group.array}}"   bindtap="go_brand" data-bid="{{user.id}}"   
                           wx:for-item="user" wx:for-index="idx" class="user box box-lr">    
-                          <image class="user-avatar-img" src="{{user.logo}}"   
-                              binderror="bind_bnerr" data-errorimg="groups[{{pidx}}].array[{{idx}}].logo"></image>          
+                          <image class="user-avatar-img" src="{{user.logo}}"  
+                           data-errorimg="groups[{{pidx}}].array[{{idx}}].logo" 
+                              binderror="bind_bnerr"></image>          
                       </view>
                     </view>
                   </view>
@@ -182,7 +183,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="brand_list[{{pidx}}].array[{{idx}}].logo" binderror="bind_bnerr"></image>
+       <image class="brand_img"src="{{user.logo}}"data-errorimg="groups[{{pidx}}].array[{{idx}}].logo" binderror="bind_bnerr"></image>
         <view class="brand_img_name fs24">{{user.name}}</view>
    </view>
  </view>
@@ -192,50 +193,14 @@
 <!-- 商品 -->
 <block wx:if="{{select_classify_on!=220&&select_classify_on!=223}}">
 <view class="classify_content-frame flex flex-wrap">
-  <view class="brand_img_frame t-c">
-     <image class="brand_img"src="../../../images/1.png"></image>
-   <view class="brand_img_name fs24">你好呃呃</view>
-  </view>
-
-  <view class="brand_img_frame t-c">
-     <image class="brand_img"src="../../../images/2.png"></image>
-   <view class="brand_img_name fs24">你好</view>
-  </view>
-
-  <view class="brand_img_frame t-c">
-     <image class="brand_img"src="../../../images/3.png"></image>
-   <view class="brand_img_name fs24">你好</view>
-  </view>
-
-  <view class="brand_img_frame t-c">
-     <image class="brand_img"src="../../../images/4.png"></image>
-   <view class="brand_img_name fs24">你好</view>
-  </view>
+  
 
-  <view class="brand_img_frame t-c">
-     <image class="brand_img"src="../../../images/5.png"></image>
-   <view class="brand_img_name fs24">你好</view>
+  <view class="brand_img_frame t-c"wx:for="{{goodslist}}" wx:for-index="index" wx:for-item="item" >
+     <image class="brand_img"src="{{item.logo}}"binderror="goods_bnerr" data-err="goodslist[{{index}}].logo"></image>
+   <view class="brand_img_name fs24">{{item.good_name}}</view>
   </view>
 
-  <view class="brand_img_frame t-c">
-     <image class="brand_img"src="../../../images/6.png"></image>
-   <view class="brand_img_name fs24">你好品牌</view>
-  </view>
-
-  <view class="brand_img_frame t-c">
-     <image class="brand_img"src="../../../images/7.png"></image>
-   <view class="brand_img_name fs24">你好慢慢</view>
-  </view>
-
-  <view class="brand_img_frame t-c">
-     <image class="brand_img"src="../../../images/8.png"></image>
-   <view class="brand_img_name fs24">你好</view>
-  </view>
-
-  <view class="brand_img_frame t-c">
-     <image class="brand_img"src="../../../images/9.png"></image>
-   <view class="brand_img_name fs24">你好匿名</view>
-  </view>
+  
 
 </view>
 </block>