diff --git a/components/diy_goodsGroup/diy_goodsGroup.js b/components/diy_goodsGroup/diy_goodsGroup.js
index 4298060..f0a1954 100644
--- a/components/diy_goodsGroup/diy_goodsGroup.js
+++ b/components/diy_goodsGroup/diy_goodsGroup.js
@@ -115,9 +115,9 @@ Component({
               var prom_type = res.data.data.prom_type; //0普通商品  1秒杀  6拼单
 
               var url = "";
-              if (prom_type == 1) {
+              if (prom_type == 6) {
                 url = "/api/weshop/teamlist/get/" + os.stoid + "/" + prom_id;
-              } else if (prom_type == 6) {
+              } else if (prom_type == 1) {
                 url = "/api/ms/flash_sale/get/" + os.stoid + "/" + prom_id;
               }
               if(url==""){
@@ -130,11 +130,11 @@ Component({
                 return app.request.promiseGet(url, {})
               }
 
-
             }).then(res => {
               index++;
               var prom = res.data.data;
-              if (prom != null) {
+              var now=ut.gettimestamp();
+              if (prom != null && prom.is_end==0 && prom.end_time>now && prom.show_time<now) {
                 item.shop_price = res.data.data.price;
               }
               th.data.requestData.push(item);
@@ -170,8 +170,9 @@ Component({
               total: res.data.data.total
             })
             th.data.currentPage++;
+            var now=ut.gettimestamp();
 
-            goods.forEach(function (val, ind) {
+            goods.forEach(async function (val, ind) {
               var item = {};
               var prom_id = null;
               console.log(val.goodsid);
@@ -187,18 +188,18 @@ Component({
               item.goods_id = val.goods_id;
               prom_id = val.prom_id;
 
-              var prom_type = res.data.data.prom_type; //0普通商品  1秒杀  6拼单
+              var prom_type = val.prom_type; //0普通商品  1秒杀  6拼单
 
               var url = "";
-              if (prom_type == 1) {
+              if (prom_type == 6) {
                 url = "/api/weshop/teamlist/get/" + os.stoid + "/" + prom_id;
-              } else if (prom_type == 6) {
+              } else if (prom_type == 1) {
                 url = "/api/ms/flash_sale/get/" + os.stoid + "/" + prom_id;
               }
               if(url!="") {
-                app.request.promiseGet(url, {}).then(res => {
+               await app.request.promiseGet(url, {}).then(res => {
                   var prom = res.data.data;
-                  if (prom != null) {
+                  if (prom != null && prom.is_end==0 && prom.end_time>now && prom.show_time<now) {
                     item.shop_price = res.data.data.price;
                   }
                   th.data.requestData.push(item);
@@ -237,18 +238,15 @@ Component({
             })
 
             th.data.currentPage++;
-            goods.forEach(function (val, ind) {
+            var now=ut.gettimestamp();
+            goods.forEach(async function (val, ind) {
               var item = {};
               var prom_id = null;
               console.log(val.goodsid);
               //app.request.promiseGet("/api/weshop/goods/get/" + os.stoid + "/" + val.goods_id, {}).then(res => {
               //商品地址
               var goods = res.data.data;
-              console.log("goods");
-              console.log(goods);
-              // th.setData({
-              //   goods_btn: res.data.data
-              // })
+
               item.goods_name = val.goods_name;
               item.goods_img = th.data.imghost + val.original_img;
               item.market_price = val.market_price;
@@ -260,16 +258,16 @@ Component({
               var prom_type = res.data.data.prom_type; //0普通商品  1秒杀  6拼单
 
               var url = "";
-              if (prom_type == 1) {
+              if (prom_type == 6) {
                 url = "/api/weshop/teamlist/get/" + os.stoid + "/" + prom_id;
-              } else if (prom_type == 6) {
+              } else if (prom_type == 1) {
                 url = "/api/ms/flash_sale/get/" + os.stoid + "/" + prom_id;
               }
 
               if(url!=null){
-                app.request.promiseGet(url, {}).then(res => {
+               await app.request.promiseGet(url, {}).then(res => {
                   var prom = res.data.data;
-                  if (prom != null) {
+                  if (prom != null && prom.is_end==0 && prom.end_time>now && prom.show_time<now) {
                     item.shop_price = res.data.data.price;
                   }
                   th.data.requestData.push(item);
@@ -306,7 +304,7 @@ Component({
     },
 	
 	//---卡的初始化----
-	card_init: function() {
+	card_init: function(func) {
 	  var th = this;
 	  getApp().request.get("/api/weshop/users/get/" + os.stoid + "/" + getApp().globalData.user_id, {
 	    success: function(e) {
@@ -345,7 +343,11 @@ Component({
 	                    card_list: ob.card_list
 	                  });
 	                }
+	                //---回调----
+                    if(func)  func()
 	              }
+                  //---回调----
+                  if(func) func()
 	            }, 500)
 	          })
 	
diff --git a/components/diy_goodsGroup/diy_goodsGroup.wxml b/components/diy_goodsGroup/diy_goodsGroup.wxml
index ce84f14..74ac9b8 100644
--- a/components/diy_goodsGroup/diy_goodsGroup.wxml
+++ b/components/diy_goodsGroup/diy_goodsGroup.wxml
@@ -1,463 +1,79 @@
 <!--pages/diy_zs/diy_zs.wxml-->
-<!--1个-->
-<view class="zs_goods_wai">
-    <!--右下角-->
-    <block wx:if='{{object.column==1 && object.position==4}}'>
-        <block wx:for="{{goods_array}}" >
+<wxs module="filter" src="../../utils/filter.wxs"></wxs>
+<wxs module="g_filter" src="g_filter.wxs"></wxs>
+<!--1个列表的时候-->
+<view class="zs_goods_wai" wx:if='{{object.column==1}}'>
+       <block wx:for="{{goods_array}}" >
             <view class='zs_goods'>
                 <navigator url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}" class="s1_gk_a1">
-                    <view class='zs_top'>
-                        <block>
+                    <view class='zs_top rel'>
                         <image class='zs_t_img' src="{{item.goods_img}}"
                                data-errorimg="goods_array[{{index}}].goods_img"
                                binderror="bind_bnerr3"
-                        ></image></block>
+                        ></image>
 
                         <block wx:if="{{object.goodicon==3}}">
-                            <image class='zs_t1' wx:if="{{ object.position==4}}"
-                                   src='{{object.customicon}}'></image>
-                            <!--<image class='zs_t1' wx:if="{{object.position==1}}"-->
-                                   <!--src='{{object.customicon}}'></image>-->
-                            <!--<image class='zs_t1' wx:if="{{ object.position==1}}"-->
-                                   <!--src='{{object.customicon}}'></image>-->
-                            <!--<image class='zs_t1' wx:if="{{object.position==1}}"-->
-                                   <!--src='{{object.customicon}}'></image>-->
+                            <image class='{{g_filter.get_class(object.column,object.position)}}' src='{{object.customicon}}'></image>
                         </block>
                         <block wx:if="{{object.goodicon==1}}">
-                            <image class='zs_t1' src=''></image>
+                            <image class='{{g_filter.get_class(object.column,object.position)}}' src=''></image>
                         </block>
                         <block wx:if="{{object.goodicon==2}}">
-                            <image class='zs_t1' wx:if="{{object.styleicon==1}}"
+                            <image class='{{g_filter.get_class(object.column,object.position)}}' wx:if="{{object.styleicon==1}}"
                                    src='{{imghost}}/miniapp/images/Recommend.png'></image>
-                            <image class='zs_t1' wx:if="{{object.styleicon==2}}"
+                            <image class='{{g_filter.get_class(object.column,object.position)}}' wx:if="{{object.styleicon==2}}"
                                    src='{{imghost}}/miniapp/images/hot.png'></image>
-                            <image class='zs_t1' wx:if="{{object.styleicon==3}}"
+                            <image class='{{g_filter.get_class(object.column,object.position)}}' wx:if="{{object.styleicon==3}}"
                                    src='{{imghost}}/miniapp/images/new.png'></image>
-                            <image class='zs_t1' wx:if="{{object.styleicon==4}}"
+                            <image class='{{g_filter.get_class(object.column,object.position)}}' wx:if="{{object.styleicon==4}}"
                                    src='{{imghost}}/miniapp/images/Promotion.png'></image>
                         </block>
                     </view>
                     <view class='zs_center'>
-
                         <view class='zs_wz1' wx:if="{{object.goodstit}}">{{item.goods_name}}</view>
+                        <!--如果有显示价格 -->
                         <view class='zs_wz2' wx:if="{{object.goodsprice}}">
-                            <view class='wz_red'>￥{{item.shop_price}}</view>
+
+                             <block>    
+                                 <view class='wz_red'>￥{{item.shop_price}}</view>
+                             </block>      
+                           
                             <view class='del'>￥{{item.market_price}}</view>
                         </view>
-                        <!-- <view class='zs_wz3'>美妆价：¥9.00</view>
-                  <view class='zs_wz4'>等级价：¥8.00</view> -->
                         <view class='zs_wz5' wx:if="{{object.goodsnum}}">销量：{{item.sales_sum}}件</view>
 
                     </view>
                 </navigator>
-            </view>
+             </view>
+              <view style="height:20rpx"></view>
         </block>
-    </block>
-
-    <!-- 右上角 -->
-    <block wx:if='{{object.column==1 && object.position==2}}'>
-    <block wx:for="{{goods_array}}" >
-        <view class='zs_goods' >
-            <navigator url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}" class="s1_gk_a1">
-                <view class='zs_top'>
-
-                    <block>
-                        <image class='zs_t_img' src="{{item.goods_img}}" data-errorimg="goods_array[{{index}}].goods_img"
-                               binderror="bind_bnerr3"></image>
-                    </block>
-
-                    <!-- <image class='zs_t2' src='http://jmh.xinda100.cn/public/static/images/model/Recommend.png'></image> -->
-                    <block wx:if="{{object.goodicon==3}}">
-                        <image class='zs_t2' wx:if="{{object.position==2}}"
-                               src='{{object.customicon}}'></image>
-                        <!--<image class='zs_t2' wx:if="{{object.styleicon==2 && object.position==2}}"-->
-                               <!--src='{{object.customicon}}'></image>-->
-                        <!--<image class='zs_t2' wx:if="{{object.styleicon==3 && object.position==2}}"-->
-                               <!--src='{{object.customicon}}'></image>-->
-                        <!--<image class='zs_t2' wx:if="{{object.styleicon==4 && object.position==2}}"-->
-                               <!--src='{{object.customicon}}'></image>-->
-                    </block>
-                    <block wx:if="{{object.goodicon==1}}">
-                        <image class='zs_t2' src=''></image>
-                    </block>
-                    <block wx:if="{{object.goodicon==2}}">
-                        <image class='zs_t2' wx:if="{{object.styleicon==1}}"
-                               src='{{imghost}}/miniapp/images/Recommend.png'></image>
-                        <image class='zs_t2' wx:if="{{object.styleicon==2 }}"
-                               src='{{imghost}}/miniapp/images/hot.png'></image>
-                        <image class='zs_t2' wx:if="{{object.styleicon==3}}"
-                               src='{{imghost}}/miniapp/images/new.png'></image>
-                        <image class='zs_t2' wx:if="{{object.styleicon==4 }}"
-                               src='{{imghost}}/miniapp/images/Promotion.png'></image>
-                    </block>
-                </view>
-
-                <view class='zs_center'>
-                    <view class='zs_wz1' wx:if="{{object.goodstit}}">{{item.goods_name}}</view>
-                    <view class='zs_wz2' wx:if="{{object.goodsprice}}">
-                        <view class='wz_red'>￥{{item.shop_price}}</view>
-                        <view class='del'>￥{{item.market_price}}</view>
-                    </view>
-                    <view class='zs_wz5' wx:if="{{object.goodsnum}}">销量：{{item.sales_sum}}件</view>
-
-                </view>
-            </navigator>
-
-        </view>
-    </block>
-    </block>
-    <!-- 左上角 -->
-    <block  wx:if='{{object.column==1 && object.position==1}}'>
-    <block wx:for="{{goods_array}}">
-        <view class='zs_goods'>
-            <navigator url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}" class="s1_gk_a1">
-                <view class='zs_top'>
-
-                    <block>
-                        <image class='zs_t_img' src="{{item.goods_img}}" data-errorimg="goods_array[{{index}}].goods_img"
-                               binderror="bind_bnerr3"></image>
-                    </block>
-                    <!-- <image class='zs_t3' src='http://jmh.xinda100.cn/public/static/images/model/hot.png'></image> -->
-                    <block wx:if="{{object.goodicon==3}}">
-                        <image class='zs_t3' wx:if="{{ object.position==1}}"
-                               src='{{object.customicon}}'></image>
-                        <!--<image class='zs_t3' wx:if="{{object.styleicon==2 && object.position==3}}"-->
-                               <!--src='{{object.customicon}}'></image>-->
-                        <!--<image class='zs_t3' wx:if="{{object.styleicon==3 && object.position==3}}"-->
-                               <!--src='{{object.customicon}}'></image>-->
-                        <!--<image class='zs_t3' wx:if="{{object.styleicon==4 && object.position==3}}"-->
-                               <!--src='{{object.customicon}}'></image>-->
-                    </block>
-                    <block wx:if="{{object.goodicon==1}}">
-                        <image class='zs_t3' src=''></image>
-                    </block>
-                    <block wx:if="{{object.goodicon==2}}">
-                        <image class='zs_t3' wx:if="{{object.styleicon==1}}"
-                               src='{{imghost}}/miniapp/images/Recommend.png'></image>
-                        <image class='zs_t3' wx:if="{{object.styleicon==2 }}"
-                               src='{{imghost}}/miniapp/images/hot.png'></image>
-                        <image class='zs_t3' wx:if="{{object.styleicon==3}}"
-                               src='{{imghost}}/miniapp/images/new.png'></image>
-                        <image class='zs_t3' wx:if="{{object.styleicon==4 }}"
-                               src='{{imghost}}/miniapp/images/Promotion.png'></image>
-                    </block>
-                </view>
-
-                <view class='zs_center'>
-
-                    <view class='zs_wz1' wx:if="{{object.goodstit}}">{{item.goods_name}}</view>
-                    <view class='zs_wz2' wx:if="{{object.goodsprice}}">
-                        <view class='wz_red'>￥{{item.shop_price}}</view>
-                        <view class='del'>￥{{item.market_price}}</view>
-                    </view>
-                    <view class='zs_wz5' wx:if="{{object.goodsnum}}">销量：{{item.sales_sum}}件</view>
-
-                </view>
-            </navigator>
-
-        </view>
-    </block>
-    </block>
-    <!-- 左下角 -->
-    <block wx:if='{{object.column==1 && object.position==3}}'>
-    <block wx:for="{{goods_array}}" >
-        <view class='zs_goods' >
-            <navigator url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}" class="s1_gk_a1">
-                <view class='zs_top'>
-
-                    <block>
-                        <image class='zs_t_img' src="{{item.goods_img}}" data-errorimg="goods_array[{{index}}].goods_img"
-                               binderror="bind_bnerr3"></image>
-                    </block>
-                    <!-- <image class='zs_t4' src='http://jmh.xinda100.cn/public/static/images/model/new.png'></image> -->
-
-                    <block wx:if="{{object.goodicon==3}}">
-                        <image class='zs_t4' wx:if="{{ object.position==3}}"
-                               src='{{object.customicon}}'></image>
-                        <!--<image class='zs_t4' wx:if="{{object.styleicon==2 && object.position==4}}"-->
-                               <!--src='{{object.customicon}}'></image>-->
-                        <!--<image class='zs_t4' wx:if="{{object.styleicon==3 && object.position==4}}"-->
-                               <!--src='{{object.customicon}}'></image>-->
-                        <!--<image class='zs_t4' wx:if="{{object.styleicon==4 && object.position==4}}"-->
-                               <!--src='{{object.customicon}}'></image>-->
-                    </block>
-                    <block wx:if="{{object.goodicon==1}}">
-                        <image class='zs_t4' src=''></image>
-                    </block>
-                    <block wx:if="{{object.goodicon==2}}">
-                        <image class='zs_t4' wx:if="{{object.styleicon==1}}"
-                               src='{{imghost}}/miniapp/images/Recommend.png'></image>
-                        <image class='zs_t4' wx:if="{{object.styleicon==2 }}"
-                               src='{{imghost}}/miniapp/images/hot.png'></image>
-                        <image class='zs_t4' wx:if="{{object.styleicon==3}}"
-                               src='{{imghost}}/miniapp/images/new.png'></image>
-                        <image class='zs_t4' wx:if="{{object.styleicon==4 }}"
-                               src='{{imghost}}/miniapp/images/Promotion.png'></image>
-                    </block>
-                </view>
-
-                <view class='zs_center'>
-                    <view class='zs_wz1' wx:if="{{object.goodstit}}">{{item.goods_name}}</view>
-                    <view class='zs_wz2' wx:if="{{object.goodsprice}}">
-                        <view class='wz_red'>￥{{item.shop_price}}</view>
-                        <view class='del'>￥{{item.market_price}}</view>
-                    </view>
-                    <view class='zs_wz5' wx:if="{{object.goodsnum}}">销量：{{item.sales_sum}}件</view>
-
-                </view>
-            </navigator>
-        </view>
-    </block>
-    </block>
+ 
 </view>
-
-
-<!-- 列表显示 -->
-<view class="zs_goods_xiao_wai">
-    <!--右上角-->
-    <block  wx:if='{{object.column==4  && object.position==2}}'>
-    <block wx:for="{{goods_array}}" >
-        <navigator url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}" class="s1_gk_a1">
-            <view class="{{object.noboder==0?'zs_goods_xiao_bottom':'zs_goods_xiao'}}" >
-                <view class='zs_top_x'>
-                    <!--<image class='zs_t_img_x'></image>-->
-                    <block>
-                        <image class='zs_t_img_x' src="{{item.goods_img}}" data-errorimg="goods_array[{{index}}].goods_img"
-                               binderror="bind_bnerr3" mode="widthFix" style='max-height:290rpx'></image>
-                    </block>
-
-                    <block wx:if="{{object.goodicon==3}}">
-                        <image class='zs_t1_x' wx:if="{{object.position==2}}"
-                               src='{{object.customicon}}'></image>
-                        <!--<image class='zs_t1_x' wx:if="{{object.styleicon==2 && object.position==1}}"-->
-                               <!--src='{{object.customicon}}'></image>-->
-                        <!--<image class='zs_t1_x' wx:if="{{object.styleicon==3 && object.position==1}}"-->
-                               <!--src='{{object.customicon}}'></image>-->
-                        <!--<image class='zs_t1_x' wx:if="{{object.styleicon==4 && object.position==1}}"-->
-                               <!--src='{{object.customicon}}'></image>-->
-                    </block>
-                    <block wx:if="{{object.goodicon==1}}">
-                        <image class='zs_t1_x' src=''></image>
-                    </block>
-                    <block wx:if="{{object.goodicon==2}}">
-                        <image class='zs_t1_x' wx:if="{{object.styleicon==1}}"
-                               src='{{imghost}}/miniapp/images/Recommend.png'></image>
-                        <image class='zs_t1_x' wx:if="{{object.styleicon==2 }}"
-                               src='{{imghost}}/miniapp/images/hot.png'></image>
-                        <image class='zs_t1_x' wx:if="{{object.styleicon==3}}"
-                               src='{{imghost}}/miniapp/images/new.png'></image>
-                        <image class='zs_t1_x' wx:if="{{object.styleicon==4 }}"
-                               src='{{imghost}}/miniapp/images/Promotion.png'></image>
-                    </block>
-                </view>
-
-                <view class='zs_center_x'>
-
-
-                    <view class='zs_wz1_x' wx:if="{{object.goodstit}}">{{item.goods_name}}</view>
-                    <view class='zs_wz2_x' wx:if="{{object.goodsprice}}">
-                        <view class='wz_red'>￥{{item.shop_price}}</view>
-                        <view class='del'>￥{{item.market_price}}</view>
-                    </view>
-                    <view class='zs_wz5_x' wx:if="{{object.goodsnum}}">销量：{{item.sales_sum}}件</view>
-
-
-                </view>
-
-            </view>
-        </navigator>
-    </block>
-    </block>
-    <!-- 左上角 -->
-    <block wx:if='{{object.column==4 && object.position==1}}'>
-    <block wx:for="{{goods_array}}" >
-        <navigator url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}" class="s1_gk_a1">
-            <view class="{{object.noboder==0?'zs_goods_xiao_bottom':'zs_goods_xiao'}}"  >
-                <view class='zs_top_x'>
-
-                    <block wx:if="{{item.goods_img!=''}}">
-                        <image class='zs_t_img_x' src="{{item.goods_img}}" data-errorimg="goods_array[{{index}}].goods_img"
-                               binderror="bind_bnerr3" mode="widthFix" style='max-height:290rpx'></image>
-                    </block>
-
-                    <block wx:if="{{object.goodicon==3}}">
-                        <image class='zs_t1_x1' wx:if="{{ object.position==1}}"
-                               src='{{object.customicon}}'></image>
-                        <!--<image class='zs_t1_x1' wx:if="{{object.styleicon==2 && object.position==2}}"-->
-                               <!--src='{{object.customicon}}'></image>-->
-                        <!--<image class='zs_t1_x1' wx:if="{{object.styleicon==3 && object.position==2}}"-->
-                               <!--src='{{object.customicon}}'></image>-->
-                        <!--<image class='zs_t1_x1' wx:if="{{object.styleicon==4 && object.position==2}}"-->
-                               <!--src='{{object.customicon}}'></image>-->
-                    </block>
-                    <block wx:if="{{object.goodicon==1}}">
-                        <image class='zs_t1_x1' src=''></image>
-                    </block>
-                    <block wx:if="{{object.goodicon==2}}">
-                        <image class='zs_t1_x1' wx:if="{{object.styleicon==1}}"
-                               src='{{imghost}}/miniapp/images/Recommend.png'></image>
-                        <image class='zs_t1_x1' wx:if="{{object.styleicon==2 }}"
-                               src='{{imghost}}/miniapp/images/hot.png'></image>
-                        <image class='zs_t1_x1' wx:if="{{object.styleicon==3}}"
-                               src='{{imghost}}/miniapp/images/new.png'></image>
-                        <image class='zs_t1_x1' wx:if="{{object.styleicon==4 }}"
-                               src='{{imghost}}/miniapp/images/Promotion.png'></image>
-                    </block>
-                </view>
-                <view class='zs_center_x'>
-                    <view class='zs_wz1_x' wx:if="{{object.goodstit}}">{{item.goods_name}}</view>
-                    <view class='zs_wz2_x' wx:if="{{object.goodsprice}}">
-                        <view class='wz_red'>￥{{item.shop_price}}</view>
-                        <view class='del'>￥{{item.market_price}}</view>
-                    </view>
-                    <view class='zs_wz5_x' wx:if="{{object.goodsnum}}">销量：{{item.sales_sum}}件</view>
-                </view>
-
-            </view>
-        </navigator>
-    </block>
-    </block>
-    <!-- 右下角 -->
-    <block  wx:if='{{object.column==4 && object.position==4}}'>
-    <block wx:for="{{goods_array}}" >
-        <navigator url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}" class="s1_gk_a1">
-            <view class="{{object.noboder==0?'zs_goods_xiao_bottom':'zs_goods_xiao'}}" >
-                <view class='zs_top_x'>
-
-                    <block>
-                        <image class='zs_t_img_x' src="{{item.goods_img}}" data-errorimg="goods_array[{{index}}].goods_img"
-                               binderror="bind_bnerr3" mode="widthFix" style='max-height:290rpx'></image>
-                    </block>
-
-                    <block wx:if="{{object.goodicon==3}}">
-                        <image class='zs_t1_x2' wx:if="{{object.position==4}}"
-                               src='{{object.customicon}}'></image>
-                        <!--<image class='zs_t1_x2' wx:if="{{object.styleicon==2 && object.position==3}}"-->
-                               <!--src='{{object.customicon}}'></image>-->
-                        <!--<image class='zs_t1_x2' wx:if="{{object.styleicon==3 && object.position==3}}"-->
-                               <!--src='{{object.customicon}}'></image>-->
-                        <!--<image class='zs_t1_x2' wx:if="{{object.styleicon==4 && object.position==3}}"-->
-                               <!--src='{{object.customicon}}'></image>-->
-                    </block>
-                    <block wx:if="{{object.goodicon==1}}">
-                        <image class='zs_t1_x2' src=''></image>
-                    </block>
-                    <block wx:if="{{object.goodicon==2}}">
-                        <image class='zs_t1_x2' wx:if="{{object.styleicon==1}}"
-                               src='{{imghost}}/miniapp/images/Recommend.png'></image>
-                        <image class='zs_t1_x2' wx:if="{{object.styleicon==2 }}"
-                               src='{{imghost}}/miniapp/images/hot.png'></image>
-                        <image class='zs_t1_x2' wx:if="{{object.styleicon==3}}"
-                               src='{{imghost}}/miniapp/images/new.png'></image>
-                        <image class='zs_t1_x2' wx:if="{{object.styleicon==4 }}"
-                               src='{{imghost}}/miniapp/images/Promotion.png'></image>
-                    </block>
-                </view>
-
-                <view class='zs_center_x'>
-                    <view class='zs_wz1_x' wx:if="{{object.goodstit}}">{{item.goods_name}}</view>
-                    <view class='zs_wz2_x' wx:if="{{object.goodsprice}}">
-                        <view class='wz_red'>￥{{item.shop_price}}</view>
-                        <view class='del'>￥{{item.market_price}}</view>
-                    </view>
-                    <view class='zs_wz5_x' wx:if="{{object.goodsnum}}">销量：{{item.sales_sum}}件</view>
-
-                </view>
-
-            </view>
-        </navigator>
-    </block>
-    </block>
-    <!-- 左下角 -->
-    <block  wx:if='{{object.column==4  && object.position==3}}'>
-    <block wx:for="{{goods_array}}" >
-        <navigator url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}" class="s1_gk_a1">
-            <view class="{{object.noboder==0?'zs_goods_xiao_bottom':'zs_goods_xiao'}}" >
-                <view class='zs_top_x'>
-                    <block wx:if="{{item.goods_img!=''}}">
-                        <image class='zs_t_img_x' src="{{item.goods_img}}" data-errorimg="goods_array[{{index}}].goods_img"
-                               binderror="bind_bnerr3" mode="widthFix" style='max-height:290rpx'></image>
-                    </block>
-
-                    <block wx:if="{{object.goodicon==3}}">
-                        <image class='zs_t1_x3' wx:if="{{object.position==3}}"
-                               src='{{object.customicon}}'></image>
-                        <!--<image class='zs_t1_x3' wx:if="{{object.styleicon==2 && object.position==4}}"-->
-                               <!--src='{{object.customicon}}'></image>-->
-                        <!--<image class='zs_t1_x3' wx:if="{{object.styleicon==3 && object.position==4}}"-->
-                               <!--src='{{object.customicon}}'></image>-->
-                        <!--<image class='zs_t1_x3' wx:if="{{object.styleicon==4 && object.position==4}}"-->
-                               <!--src='{{object.customicon}}'></image>-->
-                    </block>
-                    <block wx:if="{{object.goodicon==1}}">
-                        <image class='zs_t1_x3' src=''></image>
-                    </block>
-                    <block wx:if="{{object.goodicon==2}}">
-                        <image class='zs_t1_x3' wx:if="{{object.styleicon==1}}"
-                               src='{{imghost}}/miniapp/images/Recommend.png'></image>
-                        <image class='zs_t1_x3' wx:if="{{object.styleicon==2 }}"
-                               src='{{imghost}}/miniapp/images/hot.png'></image>
-                        <image class='zs_t1_x3' wx:if="{{object.styleicon==3}}"
-                               src='{{imghost}}/miniapp/images/new.png'></image>
-                        <image class='zs_t1_x3' wx:if="{{object.styleicon==4 }}"
-                               src='{{imghost}}/miniapp/images/Promotion.png'></image>
-                    </block>
-                </view>
-                <view class='zs_center_x'>
-
-                    <view class='zs_wz1_x' wx:if="{{object.goodstit}}">{{item.goods_name}}</view>
-                    <view class='zs_wz2_x' wx:if="{{object.goodsprice}}">
-                        <view class='wz_red'>￥{{item.shop_price}}</view>
-                        <view class='del'>￥{{item.market_price}}</view>
-                    </view>
-                    <view class='zs_wz5_x' wx:if="{{object.goodsnum}}">销量：{{item.sales_sum}}件</view>
-                </view>
-
-            </view>
-        </navigator>
-    </block>
-    </block>
-</view>
-
-
 <!--2个一列-->
-<!--左上角-->
-<block  wx:if="{{object.column==2  && object.position==1}}">
-<block wx:for="{{goods_array}}" >
+<block  wx:if="{{object.column==2}}">
+  <block wx:for="{{goods_array}}" >
     <navigator url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}" class="s1_gk_a1">
-
         <view class="zs_goods_wai_ban">
             <view class="zs_goods_ban">
                 <view class='zs_goods_2l'>
-
-                    <view class='zs_top_2l'>
-                        <!--<image class='zs_t_img_2l'></image>-->
-                        <block wx:if="{{item.goods_img!=''}}">
-                            <image class='zs_t_img_2l' src="{{item.goods_img}}" data-errorimg="goods_array[{{index}}].goods_img"
+                    <view class='zs_top_2l rel'>
+                        <image class='zs_t_img_2l' src="{{item.goods_img}}" data-errorimg="goods_array[{{index}}].goods_img"
                                    binderror="bind_bnerr3"></image>
-                        </block>
-
                         <block wx:if="{{object.goodicon==3}}">
-                            <image class='zs_t1_2l' wx:if="{{object.position==1}}"
+                            <image class='{{g_filter.get_class(object.column,object.position)}}' wx:if="{{object.position==1}}"
                                    src='{{object.customicon}}'></image>
-                            <!--<image class='zs_t1_2l' wx:if="{{object.styleicon==2 && object.position==1}}"-->
-                                   <!--src='{{object.customicon}}'></image>-->
-                            <!--<image class='zs_t1_2l' wx:if="{{object.styleicon==3 && object.position==1}}"-->
-                                   <!--src='{{object.customicon}}'></image>-->
-                            <!--<image class='zs_t1_2l' wx:if="{{object.styleicon==4 && object.position==1}}"-->
-                                   <!--src='{{object.customicon}}'></image>-->
                         </block>
                         <block wx:if="{{object.goodicon==1}}">
-                            <image class='zs_t1_2l' src=''></image>
+                            <image class='{{g_filter.get_class(object.column,object.position)}}' src=''></image>
                         </block>
                         <block wx:if="{{object.goodicon==2}}">
-                            <image class='zs_t1_2l' wx:if="{{object.styleicon==1}}"
+                            <image class='{{g_filter.get_class(object.column,object.position)}}' wx:if="{{object.styleicon==1}}"
                                    src='{{imghost}}/miniapp/images/Recommend.png'></image>
-                            <image class='zs_t1_2l' wx:if="{{object.styleicon==2 }}"
+                            <image class='{{g_filter.get_class(object.column,object.position)}}' wx:if="{{object.styleicon==2 }}"
                                    src='{{imghost}}/miniapp/images/hot.png'></image>
-                            <image class='zs_t1_2l' wx:if="{{object.styleicon==3}}"
+                            <image class='{{g_filter.get_class(object.column,object.position)}}' wx:if="{{object.styleicon==3}}"
                                    src='{{imghost}}/miniapp/images/new.png'></image>
-                            <image class='zs_t1_2l' wx:if="{{object.styleicon==4 }}"
+                            <image class='{{g_filter.get_class(object.column,object.position)}}' wx:if="{{object.styleicon==4 }}"
                                    src='{{imghost}}/miniapp/images/Promotion.png'></image>
                         </block>
                     </view>
@@ -476,223 +92,34 @@
         </view>
     </navigator>
 </block>
-
-<view class="clear"></view>
+  <view class="clear"></view>
 </block>
-<!--右上角-->
-<block wx:if='{{object.column==2   && object.position==2}}'>
-<block wx:for="{{goods_array}}" >
-    <navigator url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}" class="s1_gk_a1">
-        <view class="zs_goods_wai_ban" >
-            <view class="zs_goods_ban">
-                <view class='zs_goods_2l'>
-
-                    <view class='zs_top_2l'>
-                        <!--<image class='zs_t_img_2l'></image>-->
-                        <block>
-                            <image class='zs_t_img_2l' src="{{item.goods_img}}" data-errorimg="goods_array[{{index}}].goods_img"
-                                   binderror="bind_bnerr3"></image>
-                        </block>
-                        <block wx:if="{{object.goodicon==3}}">
-                            <image class='zs_t2_2l' wx:if="{{ object.position==2}}"
-                                   src='{{object.customicon}}'></image>
-                            <!--<image class='zs_t2_2l' wx:if="{{object.styleicon==2 && object.position==2}}"-->
-                                   <!--src='{{object.customicon}}'></image>-->
-                            <!--<image class='zs_t2_2l' wx:if="{{object.styleicon==3 && object.position==2}}"-->
-                                   <!--src='{{object.customicon}}'></image>-->
-                            <!--<image class='zs_t2_2l' wx:if="{{object.styleicon==4 && object.position==2}}"-->
-                                   <!--src='{{object.customicon}}'></image>-->
-                        </block>
-                        <block wx:if="{{object.goodicon==1}}">
-                            <image class='zs_t2_2l' src=''></image>
-                        </block>
-                        <block wx:if="{{object.goodicon==2}}">
-                            <image class='zs_t2_2l' wx:if="{{object.styleicon==1}}"
-                                   src='{{imghost}}/miniapp/images/Recommend.png'></image>
-                            <image class='zs_t2_2l' wx:if="{{object.styleicon==2 }}"
-                                   src='{{imghost}}/miniapp/images/hot.png'></image>
-                            <image class='zs_t2_2l' wx:if="{{object.styleicon==3}}"
-                                   src='{{imghost}}/miniapp/images/new.png'></image>
-                            <image class='zs_t2_2l' wx:if="{{object.styleicon==4 }}"
-                                   src='{{imghost}}/miniapp/images/Promotion.png'></image>
-                        </block>
-                    </view>
-                    <view class='zs_center_2l'>
-
-
-                        <view class='zs_wz1_2l' wx:if="{{object.goodstit}}">{{item.goods_name}}</view>
-                        <view class='zs_wz2_2l' wx:if="{{object.goodsprice}}">
-                            <view class='wz_red'>￥{{item.shop_price}}</view>
-                            <view class='del'>￥{{item.market_price}}</view>
-                        </view>
-                        <view class='zs_wz5_2l' wx:if="{{object.goodsnum}}">销量：{{item.sales_sum}}件</view>
-
-                    </view>
-                </view>
-            </view>
-
-        </view>
-    </navigator>
-</block>
-
-<view class="clear"></view>
-</block>
-<!--右下角-->
-<block wx:if='{{object.column==2  && object.position==4}}'>
-<block wx:for="{{goods_array}}" >
-    <navigator url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}" class="s1_gk_a1">
-        <view class="zs_goods_wai_ban" >
-            <view class="zs_goods_ban">
-                <view class='zs_goods_2l'>
-
-                    <view class='zs_top_2l'>
-                        <!--<image class='zs_t_img_2l'></image>-->
-                        <block>
-                            <image class='zs_t_img_2l' src="{{item.goods_img}}" data-errorimg="goods_array[{{index}}].goods_img"
-                                   binderror="bind_bnerr3"></image>
-                        </block>
-
-                        <block wx:if="{{object.goodicon==3}}">
-                            <image class='zs_t3_2l' wx:if="{{ object.position==4}}"
-                                   src='{{object.customicon}}'></image>
-                            <!--<image class='zs_t3_2l' wx:if="{{object.styleicon==2 && object.position==3}}"-->
-                                   <!--src='{{object.customicon}}'></image>-->
-                            <!--<image class='zs_t3_2l' wx:if="{{object.styleicon==3 && object.position==3}}"-->
-                                   <!--src='{{object.customicon}}'></image>-->
-                            <!--<image class='zs_t3_2l' wx:if="{{object.styleicon==4 && object.position==3}}"-->
-                                   <!--src='{{object.customicon}}'></image>-->
-                        </block>
-                        <block wx:if="{{object.goodicon==1}}">
-                            <image class='zs_t3_2l' src=''></image>
-                        </block>
-                        <block wx:if="{{object.goodicon==2}}">
-                            <image class='zs_t3_2l' wx:if="{{object.styleicon==1}}"
-                                   src='{{imghost}}/miniapp/images/Recommend.png'></image>
-                            <image class='zs_t3_2l' wx:if="{{object.styleicon==2 }}"
-                                   src='{{imghost}}/miniapp/images/hot.png'></image>
-                            <image class='zs_t3_2l' wx:if="{{object.styleicon==3}}"
-                                   src='{{imghost}}/miniapp/images/new.png'></image>
-                            <image class='zs_t3_2l' wx:if="{{object.styleicon==4 }}"
-                                   src='{{imghost}}/miniapp/images/Promotion.png'></image>
-                        </block>
-                    </view>
-
-                    <view class='zs_center_2l'>
-
-                        <view class='zs_wz1_2l' wx:if="{{object.goodstit}}">{{item.goods_name}}</view>
-                        <view class='zs_wz2_2l' wx:if="{{object.goodsprice}}">
-                            <view class='wz_red'>￥{{item.shop_price}}</view>
-                            <view class='del'>￥{{item.market_price}}</view>
-                        </view>
-                        <view class='zs_wz5_2l' wx:if="{{object.goodsnum}}">销量：{{item.sales_sum}}件</view>
-                    </view>
-
-                </view>
-            </view>
-
-
-        </view>
-    </navigator>
-</block>
-
-<view class="clear"></view>
-</block>
-<!--左下角-->
-<block wx:if='{{object.column==2   && object.position==3}}'>
-<block wx:for="{{goods_array}}" >
-    <navigator url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}" class="s1_gk_a1">
-        <view class="zs_goods_wai_ban" >
-            <view class="zs_goods_ban">
-                <view class='zs_goods_2l'>
-
-                    <view class='zs_top_2l'>
-                        <!--<image class='zs_t_img_2l'></image>-->
-                        <block>
-                            <image class='zs_t_img_2l' src="{{item.goods_img}}" data-errorimg="goods_array[{{index}}].goods_img"
-                                   binderror="bind_bnerr3"></image>
-                        </block>
-
-                        <block wx:if="{{object.goodicon==3}}">
-                            <image class='zs_t4_2l' wx:if="{{ object.position==3}}"
-                                   src='{{object.customicon}}'></image>
-                            <!--<image class='zs_t4_2l' wx:if="{{object.styleicon==2 && object.position==4}}"-->
-                                   <!--src='{{object.customicon}}'></image>-->
-                            <!--<image class='zs_t4_2l' wx:if="{{object.styleicon==3 && object.position==4}}"-->
-                                   <!--src='{{object.customicon}}'></image>-->
-                            <!--<image class='zs_t4_2l' wx:if="{{object.styleicon==4 && object.position==4}}"-->
-                                   <!--src='{{object.customicon}}'></image>-->
-                        </block>
-                        <block wx:if="{{object.goodicon==1}}">
-                            <image class='zs_t4_2l' src=''></image>
-                        </block>
-                        <block wx:if="{{object.goodicon==2}}">
-                            <image class='zs_t4_2l' wx:if="{{object.styleicon==1}}"
-                                   src='{{imghost}}/miniapp/images/Recommend.png'></image>
-                            <image class='zs_t4_2l' wx:if="{{object.styleicon==2 }}"
-                                   src='{{imghost}}/miniapp/images/hot.png'></image>
-                            <image class='zs_t4_2l' wx:if="{{object.styleicon==3}}"
-                                   src='{{imghost}}/miniapp/images/new.png'></image>
-                            <image class='zs_t4_2l' wx:if="{{object.styleicon==4 }}"
-                                   src='{{imghost}}/miniapp/images/Promotion.png'></image>
-                        </block>
-                    </view>
-
-                    <view class='zs_center_2l'>
-
-                        <view class='zs_wz1_2l' wx:if="{{object.goodstit}}">{{item.goods_name}}</view>
-                        <view class='zs_wz2_2l' wx:if="{{object.goodsprice}}">
-                            <view class='wz_red'>￥{{item.shop_price}}</view>
-                            <view class='del'>￥{{item.market_price}}</view>
-                        </view>
-                        <view class='zs_wz5_2l' wx:if="{{object.goodsnum}}">销量：{{item.sales_sum}}件</view>
-
-                    </view>
-                </view>
-            </view>
-
-        </view>
-    </navigator>
-</block>
-
-<view class="clear"></view>
-</block>
-
 <!--3个一列-->
-<!--左上角-->
-<block wx:if='{{object.column==3  && object.position==1}}'>
-<view class="zwp_3">
+<block wx:if='{{object.column==3}}'>
+   <view class="zwp_3">
     <block wx:for="{{goods_array}}" >
         <navigator url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}" class="s1_gk_a1">
             <view class="zs_goods_wai_san" >
                 <view class="zs_goods_san">
                     <view class='zs_goods_3l'>
-                        <view class='zs_top_3l'>
-                            <block>
-                                <image class='zs_t_img_3l' src="{{item.goods_img}}" data-errorimg="goods_array[{{index}}].goods_img"
+                        <view class='zs_top_3l rel'>                       
+                            <image class='zs_t_img_3l' src="{{item.goods_img}}" data-errorimg="goods_array[{{index}}].goods_img"
                                        binderror="bind_bnerr3"></image>
-                            </block>
-
                             <block wx:if="{{object.goodicon==3}}">
-                                <image class='zs_t1_3l' wx:if="{{ object.position==1}}"
-                                       src='{{object.customicon}}'></image>
-                                <!-- <image class='zs_t1_3l' wx:if="{{object.styleicon==2 && object.position==1}}"
+                                <image class='{{g_filter.get_class(object.column,object.position)}}' wx:if="{{ object.position==1}}"
                                        src='{{object.customicon}}'></image>
-                                <image class='zs_t1_3l' wx:if="{{object.styleicon==3 && object.position==1}}"
-                                       src='{{object.customicon}}'></image>
-                                <image class='zs_t1_3l' wx:if="{{object.styleicon==4 && object.position==1}}"
-                                       src='{{object.customicon}}'></image> -->
                             </block>
                             <block wx:if="{{object.goodicon==1}}">
-                                <image class='zs_t1_3l' src=''></image>
+                                <image class='{{g_filter.get_class(object.column,object.position)}}' src=''></image>
                             </block>
                             <block wx:if="{{object.goodicon==2}}">
-                                <image class='zs_t1_3l' wx:if="{{object.styleicon==1}}"
+                                <image class='{{g_filter.get_class(object.column,object.position)}}' wx:if="{{object.styleicon==1}}"
                                        src='{{imghost}}/miniapp/images/Recommend.png'></image>
-                                <image class='zs_t1_3l' wx:if="{{object.styleicon==2 }}"
+                                <image class='{{g_filter.get_class(object.column,object.position)}}' wx:if="{{object.styleicon==2 }}"
                                        src='{{imghost}}/miniapp/images/hot.png'></image>
-                                <image class='zs_t1_3l' wx:if="{{object.styleicon==3}}"
+                                <image class='{{g_filter.get_class(object.column,object.position)}}' wx:if="{{object.styleicon==3}}"
                                        src='{{imghost}}/miniapp/images/new.png'></image>
-                                <image class='zs_t1_3l' wx:if="{{object.styleicon==4 }}"
+                                <image class='{{g_filter.get_class(object.column,object.position)}}' wx:if="{{object.styleicon==4 }}"
                                        src='{{imghost}}/miniapp/images/Promotion.png'></image>
                             </block>
                         </view>
@@ -712,203 +139,61 @@
         </navigator>
     </block>
 </view>
-<view class="clear"></view>
+   <view class="clear"></view>
 </block>
-<!--右上角-->
-<block wx:if='{{object.column==3  && object.position==2}}'>
-<block wx:for="{{goods_array}}" >
-    <navigator url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}" class="s1_gk_a1">
-        <view class="zs_goods_wai_san" >
-            <view class="zs_goods_san">
-                <view class='zs_goods_3l'>
-                    <view class='zs_top_3l'>
-                        <!--<image class='zs_t_img_3l'></image>-->
-                        <block>
-                            <image class='zs_t_img_3l' src="{{item.goods_img}}" data-errorimg="goods_array[{{index}}].goods_img"
-                                   binderror="bind_bnerr3"></image>
-                        </block>
-
-                        <block wx:if="{{object.goodicon==3}}">
-                            <image class='zs_t2_3l' wx:if="{{ object.position==2}}"
-                                   src='{{object.customicon}}'></image>
-                            <!--<image class='zs_t2_3l' wx:if="{{object.styleicon==2 && object.position==2}}"-->
-                                   <!--src='{{object.customicon}}'></image>-->
-                            <!--<image class='zs_t2_3l' wx:if="{{object.styleicon==3 && object.position==2}}"-->
-                                   <!--src='{{object.customicon}}'></image>-->
-                            <!--<image class='zs_t2_3l' wx:if="{{object.styleicon==4 && object.position==2}}"-->
-                                   <!--src='{{object.customicon}}'></image>-->
-                        </block>
-                        <block wx:if="{{object.goodicon==1}}">
-                            <image class='zs_t2_3l' src=''></image>
-                        </block>
-                        <block wx:if="{{object.goodicon==2}}">
-                            <image class='zs_t2_3l' wx:if="{{object.styleicon==1}}"
-                                   src='{{imghost}}/miniapp/images/Recommend.png'></image>
-                            <image class='zs_t2_3l' wx:if="{{object.styleicon==2 }}"
-                                   src='{{imghost}}/miniapp/images/hot.png'></image>
-                            <image class='zs_t2_3l' wx:if="{{object.styleicon==3}}"
-                                   src='{{imghost}}/miniapp/images/new.png'></image>
-                            <image class='zs_t2_3l' wx:if="{{object.styleicon==4 }}"
-                                   src='{{imghost}}/miniapp/images/Promotion.png'></image>
-                        </block>
-                    </view>
-                    <view class='zs_center_3l'>
-
-
-                        <view class='zs_wz1_3l' wx:if="{{object.goodstit}}">{{item.goods_name}}</view>
-                        <view class='zs_wz2_3l' wx:if="{{object.goodsprice}}">
-                            <view class='wz_red'>￥{{item.shop_price}}</view>
-                            <view class='del'>￥{{item.market_price}}</view>
-                        </view>
-                        <view class='zs_wz5_3l' wx:if="{{object.goodsnum}}">销量：{{item.sales_sum}}件</view>
-
-                        <!--<view class='zs_wz3_3l'>美妆价：¥9.00</view>-->
-                        <!--<view class='zs_wz4_3l'>等级价：¥8.00</view>-->
+<!-- 列表显示 -->
+<view class="zs_goods_xiao_wai" wx:if='{{object.column==4 }}'>
+    <block wx:for="{{goods_array}}" >
+        <navigator url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}" class="s1_gk_a1">
+            <view class="{{object.noboder==0?'zs_goods_xiao_bottom':'zs_goods_xiao'}}" >
+                <view class='zs_top_x'>
+                    <!--<image class='zs_t_img_x'></image>-->
+                    <block>
+                        <image class='zs_t_img_x' src="{{item.goods_img}}" data-errorimg="goods_array[{{index}}].goods_img"
+                               binderror="bind_bnerr3" mode="widthFix" style='max-height:290rpx'></image>
+                    </block>
 
-                    </view>
+                    <block wx:if="{{object.goodicon==3}}">
+                        <image class='{{g_filter.get_class(object.column,object.position)}}' wx:if="{{object.position==2}}"
+                               src='{{object.customicon}}'></image>
+                    </block>
+                    <block wx:if="{{object.goodicon==1}}">
+                        <image class='{{g_filter.get_class(object.column,object.position)}}' src=''></image>
+                    </block>
+                    <block wx:if="{{object.goodicon==2}}">
+                        <image class='{{g_filter.get_class(object.column,object.position)}}' wx:if="{{object.styleicon==1}}"
+                               src='{{imghost}}/miniapp/images/Recommend.png'></image>
+                        <image class='{{g_filter.get_class(object.column,object.position)}}' wx:if="{{object.styleicon==2 }}"
+                               src='{{imghost}}/miniapp/images/hot.png'></image>
+                        <image class='{{g_filter.get_class(object.column,object.position)}}' wx:if="{{object.styleicon==3}}"
+                               src='{{imghost}}/miniapp/images/new.png'></image>
+                        <image class='{{g_filter.get_class(object.column,object.position)}}' wx:if="{{object.styleicon==4 }}"
+                               src='{{imghost}}/miniapp/images/Promotion.png'></image>
+                    </block>
                 </view>
-            </view>
-        </view>
-    </navigator>
-</block>
-<view class="clear"></view>
-</block>
-<!--右下角-->
-
-<block wx:if='{{object.column==3  && object.position==4}}'>
-<block wx:for="{{goods_array}}" >
-    <navigator url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}" class="s1_gk_a1">
-        <view class="zs_goods_wai_san" >
-            <view class="zs_goods_san">
-                <view class='zs_goods_3l'>
-                    <view class='zs_top_3l'>
-
-                        <block>
-                            <image class='zs_t_img_3l' src="{{item.goods_img}}" data-errorimg="goods_array[{{index}}].goods_img"
-                                   binderror="bind_bnerr3"></image>
-                        </block>
-
-                        <block wx:if="{{object.goodicon==3}}">
-                            <image class='zs_t3_3l' wx:if="{{ object.position==4}}"
-                                   src='{{object.customicon}}'></image>
-                            <!--<image class='zs_t3_3l' wx:if="{{object.styleicon==2 && object.position==3}}"-->
-                                   <!--src='{{object.customicon}}'></image>-->
-                            <!--<image class='zs_t3_3l' wx:if="{{object.styleicon==3 && object.position==3}}"-->
-                                   <!--src='{{object.customicon}}'></image>-->
-                            <!--<image class='zs_t3_3l' wx:if="{{object.styleicon==4 && object.position==3}}"-->
-                                   <!--src='{{object.customicon}}'></image>-->
-                        </block>
-                        <block wx:if="{{object.goodicon==1}}">
-                            <image class='zs_t3_3l' src=''></image>
-                        </block>
-                        <block wx:if="{{object.goodicon==2}}">
-                            <image class='zs_t3_3l' wx:if="{{object.styleicon==1}}"
-                                   src='{{imghost}}/miniapp/images/Recommend.png'></image>
-                            <image class='zs_t3_3l' wx:if="{{object.styleicon==2 }}"
-                                   src='{{imghost}}/miniapp/images/hot.png'></image>
-                            <image class='zs_t3_3l' wx:if="{{object.styleicon==3}}"
-                                   src='{{imghost}}/miniapp/images/new.png'></image>
-                            <image class='zs_t3_3l' wx:if="{{object.styleicon==4 }}"
-                                   src='{{imghost}}/miniapp/images/Promotion.png'></image>
-                        </block>
-                    </view>
-                    <view class='zs_center_3l'>
 
-
-                        <view class='zs_wz1_3l' wx:if="{{object.goodstit}}">{{item.goods_name}}</view>
-                        <view class='zs_wz2_3l' wx:if="{{object.goodsprice}}">
-                            <view class='wz_red'>￥{{item.shop_price}}</view>
-                            <view class='del'>￥{{item.market_price}}</view>
-                        </view>
-                        <view class='zs_wz5_3l' wx:if="{{object.goodsnum}}">销量：{{item.sales_sum}}件</view>
-                        <!--<view class='zs_wz3_3l'>美妆价：¥9.00</view>-->
-                        <!--<view class='zs_wz4_3l'>等级价：¥8.00</view>-->
+                <view class='zs_center_x'>
+                    <view class='zs_wz1_x' wx:if="{{object.goodstit}}">{{item.goods_name}}</view>
+                    <view class='zs_wz2_x' wx:if="{{object.goodsprice}}">
+                        <view class='wz_red'>￥{{item.shop_price}}</view>
+                        <view class='del'>￥{{item.market_price}}</view>
                     </view>
+                    <view class='zs_wz5_x' wx:if="{{object.goodsnum}}">销量：{{item.sales_sum}}件</view>
                 </view>
-            </view>
 
-        </view>
-    </navigator>
-</block>
-
-
-<view class="clear"></view>
-</block>
-<!-- ----左下角---- -->
-<block wx:if='{{object.column==3  && object.position==3}}'>
-<block wx:for="{{goods_array}}" >
-    <navigator url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}" class="s1_gk_a1">
-        <view class="zs_goods_wai_san" >
-            <view class="zs_goods_san">
-                <view class='zs_goods_3l'>
-
-                    <view class='zs_top_3l'>
-
-                        <block>
-                            <image class='zs_t_img_3l' src="{{item.goods_img}}" data-errorimg="goods_array[{{index}}].goods_img"
-                                   binderror="bind_bnerr3"></image>
-                        </block>
-
-                        <block wx:if="{{object.goodicon==3}}">
-                            <image class='zs_t4_3l' wx:if="{{object.position==3}}"
-                                   src='{{object.customicon}}'></image>
-                            <!--<image class='zs_t4_3l' wx:if="{{ object.position==4}}"-->
-                                   <!--src='{{object.customicon}}'></image>-->
-                            <!--<image class='zs_t4_3l' wx:if="{{object.position==4}}"-->
-                                   <!--src='{{object.customicon}}'></image>-->
-                            <!--<image class='zs_t4_3l' wx:if="{{ object.position==4}}"-->
-                                   <!--src='{{object.customicon}}'></image>-->
-                        </block>
-                        <block wx:if="{{object.goodicon==1}}">
-                            <image class='zs_t4_3l' src=''></image>
-                        </block>
-                        <block wx:if="{{object.goodicon==2}}">
-                            <image class='zs_t4_3l' wx:if="{{object.styleicon==1}}"
-                                   src='{{imghost}}/miniapp/images/Recommend.png'></image>
-                            <image class='zs_t4_3l' wx:if="{{object.styleicon==2 }}"
-                                   src='{{imghost}}/miniapp/images/hot.png'></image>
-                            <image class='zs_t4_3l' wx:if="{{object.styleicon==3}}"
-                                   src='{{imghost}}/miniapp/images/new.png'></image>
-                            <image class='zs_t4_3l' wx:if="{{object.styleicon==4 }}"
-                                   src='{{imghost}}/miniapp/images/Promotion.png'></image>
-                        </block>
-                    </view>
-
-                    <view class='zs_center_3l'>
-
-                        <view class='zs_wz1_3l' wx:if="{{object.goodstit}}">{{item.goods_name}}</view>
-                        <view class='zs_wz2_3l' wx:if="{{object.goodsprice}}">
-                            <view class='wz_red'>￥{{item.shop_price}}</view>
-                            <view class='del'>￥{{item.market_price}}</view>
-                        </view>
-                        <view class='zs_wz5_3l' wx:if="{{object.goodsnum}}">销量：{{item.sales_sum}}件</view>
-
-
-                    </view>
-
-
-                </view>
             </view>
+        </navigator>
+    </block>
+    <view class="clear"></view>
+</view>
 
-        </view>
-    </navigator>
-</block>
-<view class="clear"></view>
-</block>
-
-
-<block wx:if="{{object.classstyle=='1' }}">
-<view class="button-wrapper" wx:if="{{goods_btn.length!=0 }}" style="border: none">
+<block wx:if="{{object.classstyle=='1' }}"><view class="button-wrapper" wx:if="{{goods_btn.length!=0 }}" style="border: none">
     <button type="default" size="default" loading="{{loading}}" disabled="{{disabled}}" bindtap="setLoading" style="background-color: rgba(0,0,0,0);border:none">
       {{loadText}}
     </button>
-</view>
-</block>
-
+</view></block>
 <block wx:if="{{object.classstyle!='1' }}">
   <view class="button-wrapper" wx:if="{{object.goodscount * page <total }}" style="border: none">
-     <button type="default" size="default" loading="{{loading}}" disabled="{{disabled}}" bindtap="setLoading" style="background-color: rgba(0,0,0,0);border:none">
-       {{loadText}}
-     </button>
- </view> 
+     <button type="default" size="default" loading="{{loading}}" disabled="{{disabled}}" bindtap="setLoading" style="background-color: rgba(0,0,0,0);border:none">{{loadText}}</button>
+  </view>
 </block>
\ No newline at end of file
diff --git a/components/diy_goodsGroup/diy_goodsGroup.wxss b/components/diy_goodsGroup/diy_goodsGroup.wxss
index ad4e535..850342e 100644
--- a/components/diy_goodsGroup/diy_goodsGroup.wxss
+++ b/components/diy_goodsGroup/diy_goodsGroup.wxss
@@ -1,42 +1,30 @@
 /* pages/diy_zs/diy_zs.wxss */
-
+.zwp_3{ margin-top: 10rpx}
 .zs_goods{
-  width: 100%;
-  min-height: 500rpx;
-border: 2rpx #ddd solid;
-margin: 0 auto;
-}
-
-.zwp_3{
-  /* width: 30%; */
+  width: 700rpx;
+  border: 1rpx #ddd solid;
+  margin-bottom: 10rpx;
+  margin: 0 auto;
+  
 }
-
 .s1_gk_a1{
   display: inline;
   width: auto;
   height: auto;
 }
-.clear{
-  clear: both;
-}
+.clear{ clear: both;}
 .zs_top{
   width: 100%;
   min-height: 700rpx;
   margin: 0 auto;
-  padding-left:22rpx;
-padding-bottom:30rpx;
-
-display: flex;
-/* padding-left: 6rpx; */
-/* padding-right: 30rpx; */
+  margin-bottom:30rpx;
+  display: flex;
 }
 
 .zs_t_img {
-   width: 700rpx;
-  height: 700rpx;
-  /* margin: 0 auto; */
-  /* background-color: bisque; */
-
+  width: 698rpx;
+  height: 698rpx;
+  margin: 1rpx auto;
 }
 
 .zs_center{
@@ -53,8 +41,9 @@ display: flex;
   overflow: hidden;
     text-overflow: ellipsis;
     margin-bottom:10rpx;
-font-size:28rpx;
+    font-size:28rpx;
     white-space: nowrap;
+    width: 640rpx
 }
 
 
@@ -104,43 +93,39 @@ font-size:28rpx;
 .zs_t1{
   width: 56rpx;
   height: 56rpx;
-  position: relative;
-  right: 58rpx;
-  bottom: -640rpx;
+  position: absolute;
+  left: 0rpx;
+  top: 10rpx;
 }
 
 
 .zs_t2{
   width: 56rpx;
   height: 56rpx;
-  position: relative;
-  right: 58rpx;
-  bottom: -2rpx;
+  position: absolute;
+  right: 0rpx;
+  top: 10rpx;
 }
 
 .zs_t3{
   width: 56rpx;
   height: 56rpx;
-  position: relative;
-  right: 692rpx;
-  bottom: -4rpx;
+  position: absolute;
+  left: 0rpx;
+  bottom: 10rpx;
 }
 
 
 .zs_t4{
   width: 56rpx;
   height: 56rpx;
-  position: relative;
-  right: 692rpx;
-  bottom: -642rpx;
+  position: absolute;
+  right: 20rpx;
+  bottom: 10rpx;
 }
 
 
 
-
-/* xiao */
-
-
 .zs_goods_xiao_bottom{
   width: 100%;
   min-height: 300rpx;
@@ -165,24 +150,15 @@ font-size:28rpx;
 .zs_top_x{
   width: 400rpx;
   height: 318rpx;
-  margin-top: 20rpx; 
- /* /*  padding-top:30rpx;
-padding-bottom:30rpx; */
-
-display: flex;
-
+  margin-top: 20rpx;  
+  display: flex;
 }
 
-/* .zs_goods_xiao{
-  background-color: white;
-} */
-
 .zs_t_img_x {
    width: 290rpx;
   height: 290rpx;
   margin-left: 20rpx;
-  /* background-color: bisque; */
-
+  
 }
 
 .zs_center_x{
@@ -381,61 +357,57 @@ top: 234rpx;
 }
 
 
+
+/*---俩列图片位置---*/
 .zs_t1_2l{
   width: 56rpx;
   height: 56rpx;
-  position: relative;
-  right: -2rpx;
-  top: -310rpx;
+  position: absolute;
+  left: 0rpx;
+  top: 10rpx;
 }
 
-
 .zs_t2_2l{
   width: 56rpx;
   height: 56rpx;
-  position: relative;
-  right: -294rpx;
-  bottom: 310rpx;
+  position: absolute;
+  right: 0rpx;
+  top: 10rpx;
 }
 
 .zs_t3_2l{
   width: 56rpx;
   height: 56rpx;
-  position: relative;
-  right:  -294rpx;
-  bottom: 68rpx;
+  position: absolute;
+  left:  0rpx;
+  bottom: 10rpx;
 }
 
 
 .zs_t4_2l{
   width: 56rpx;
   height: 56rpx;
-  position: relative;
-  right: -2rpx;
-  bottom: 68rpx;
+  position: absolute;
+  right: 0rpx;
+  bottom: 10rpx;
 }
 
+
+
 /*一个3列*/
 .zs_goods_wai_san{
-  width: 240rpx;
+  width: 230rpx;
   display: flex;
-  margin-left: 8rpx;
+  margin-left: 10rpx;
   float: left;
   margin-bottom: 8rpx;
- background-color:white;
- 
+  background-color:white;
 }
 
 .zs_goods_san{
   width: 240rpx;
   
 }
-
-
-
-
-
-
 .zs_goods_3l{
   width: 240rpx;
   min-height: 300rpx;
@@ -445,22 +417,15 @@ top: 234rpx;
 }
 
 .zs_top_3l{
-  width: 240rpx;
-  height:  240rpx;
-
-
-
-
-
-
+  width: 232rpx;
+  height:  232rpx;
 }
 
 .zs_t_img_3l {
-  width:237rpx;
-  height: 240rpx;
+  width:232rpx;
+  height: 232rpx;
   margin: 0 auto;
   background-color: bisque;
-
 }
 
 .zs_center_3l{
@@ -469,27 +434,28 @@ top: 234rpx;
   font-size: 28rpx;
   color: #333;
   text-align: left;
-	padding: 0 10rpx;
+  padding: 0 10rpx;
 }
 
 .zs_wz1_3l{
-  overflow: hidden;
-  text-overflow: ellipsis;
+  
   margin-bottom:10rpx;
   font-size:30rpx;
   height: 80rpx;
-  width: 227rpx;
-    /* white-space: nowrap; */
+  width: 220rpx;
+
+    overflow: hidden;
+    text-overflow: ellipsis;
+    display: -webkit-box;
+    -webkit-box-orient: vertical;
+    -webkit-line-clamp: 2;
 }
 
 
 .zs_wz2_3l{
-  /* overflow: hidden;
-  text-overflow: ellipsis; */
   margin-bottom:10rpx;
   font-size:30rpx;
-    /* white-space: nowrap; */
-    display: flex;
+  display: flex;
 }
 
 .zs_wz3_3l{
@@ -497,7 +463,7 @@ top: 234rpx;
   text-overflow: ellipsis;
   margin-bottom:10rpx;
   font-size:30rpx;
-    white-space: nowrap;
+  white-space: nowrap;
 }
 
 .zs_wz4_3l{
@@ -505,7 +471,7 @@ top: 234rpx;
   text-overflow: ellipsis;
   margin-bottom:10rpx;
   font-size:30rpx;
-    white-space: nowrap;
+  white-space: nowrap;
 }
 
 .zs_wz5_3l{
@@ -519,38 +485,40 @@ top: 234rpx;
 .zs_t1_3l{
   width: 56rpx;
   height: 56rpx;
-  position: relative;
-  right: 0rpx;
-  top: -250rpx;
+  position: absolute;
+  left: 0rpx;
+  top: 10rpx;
 }
 
 
 .zs_t2_3l{
   width: 56rpx;
   height: 56rpx;
-  position: relative;
-  right: -177rpx;
-  bottom: 250rpx;
+  position: absolute;
+  right: 0rpx;
+  top: 10rpx;
 }
 
 .zs_t3_3l{
   width: 56rpx;
   height: 56rpx;
-  position: relative;
-  right: -177rpx;
-  bottom: 67rpx;
+  position: absolute;
+  left: 0rpx;
+  bottom: 10rpx;
 }
 
 
 .zs_t4_3l{
   width: 56rpx;
   height: 56rpx;
-  position: relative;
+  position: absolute;
   right: 0rpx;
-  bottom: 67rpx;
+  bottom: 10rpx;
 }
 
 .zs_goods_wai{
   background-color: white;
   margin-top: 10rpx;
-}
\ No newline at end of file
+}
+
+.rel{position: relative}
\ No newline at end of file
diff --git a/components/diy_goodsGroup/g_filter.wxs b/components/diy_goodsGroup/g_filter.wxs
new file mode 100644
index 0000000..8bba9f3
--- /dev/null
+++ b/components/diy_goodsGroup/g_filter.wxs
@@ -0,0 +1,84 @@
+//获取样式
+var get_class = function(column,position) {
+    //--列的情况
+    if(column==1){ return "zs_t"+position; }
+    //--俩列的情况
+    if(column==2){ return "zs_t"+position+"_2l"; }
+    //--三列的情况
+    if(column==3){ return "zs_t"+position+"_3l"; }
+    //----列表的情况-----
+    if(column==4 ){ return "zs_t1_x"+position; }
+
+}
+
+
+var g_filters = {
+	    //-- 判断是不是有等级价 --
+	    is_has_rank:function(rank_switch,item){
+	    	 if(!rank_switch) return false;
+	    	 if(item.cardprice1 || item.cardprice2 || item.cardprice3) {return true}
+	    	 return false;
+	    },
+
+	    //-- 判断,不是等级会员时候，要显示的最低等级价和名称 --
+		get_card_price:function(goods,all_card,type){
+			     var price1=parseFloat(goods['cardprice1']);
+           var price2 = parseFloat(goods['cardprice2']);
+           var price3 = parseFloat(goods['cardprice3']);
+			     if(!all_card){
+			         if(type==0) return 0;
+			         return "";
+			     }
+
+			     var min_price=null;
+				 var min_name=null;
+			     //---设置对应的价格名字----
+				 for(var i=0;i<3;i++) {
+					var vl=all_card[i];
+					if(vl['CorrPrice']=="Price1" && price1>0)
+					{
+					   if(min_price==null) {
+						     min_price=price1;min_name=vl['CardName'];
+					   }
+					   else if(price1<min_price) {
+							min_price=price1;min_name=vl['CardName'];
+					   }
+					}
+					if(vl['CorrPrice']=="Price2" && price2>0)
+					{
+						if(min_price==null) {
+							min_price=price2;min_name=vl['CardName'];
+						}
+						else if(price2<min_price) {
+							min_price=price2;min_name=vl['CardName'];
+						}
+					}
+
+					if(vl['CorrPrice']=="Price3" && price3>0)
+					{
+						if(min_price==null) {
+							min_price=price3;min_name=vl['CardName'];
+						}
+						else if(price3<min_price) {
+							min_price=price3;min_name=vl['CardName'];
+						}
+					}
+
+				 }
+				 if(min_price==null){
+					 if(type==0) return 0;
+					 return "";
+				 }
+
+			     if(type==0) return min_price;
+				 if(min_name.length>4 )	min_name=min_name.substring(0, 4);
+			     return min_name;
+		},
+}
+
+
+module.exports = {
+   get_class: get_class,
+   is_has_rank:g_filters.is_has_rank,
+   get_card_price:g_filters.get_card_price,
+}
diff --git a/pages/goods/goodsInfo/goodsInfo.wxml b/pages/goods/goodsInfo/goodsInfo.wxml
index 86f83c8..f2e6a4a 100644
--- a/pages/goods/goodsInfo/goodsInfo.wxml
+++ b/pages/goods/goodsInfo/goodsInfo.wxml
@@ -262,7 +262,7 @@
 
 	<!-- 等级卡的价格,不是等级卡会员，且商品又有设置等级级价，商家后台有开通升级卡同能 -->
 
-            <view class="flex ai_and" wx:if="{{!card_field && g_filters.is_has_rank(rank_switch,data)}}">
+            <view class="flex ai_and" wx:if="{{!card_field && g_filters.is_has_rank(rank_switch,data) && !prom_type}}">
            
                   <view class="flex ai-center  grade-card-frame card-frame" >
 					    	<image class="img" src="{{iurl}}/miniapp/images/userinfo/userinfo/privilege_t.png"></image>
@@ -278,7 +278,7 @@
               
 			<block wx:if="{{g_filters.is_has_rank(rank_switch,data)}}">	
          
-            <view wx:if="{{!card_field }}">
+            <view wx:if="{{!card_field && !prom_type }}">
 			   <view class="beauty-makeup-frame flex ai-center">
 				   <view class="left flex ai-center">
 					   <view class="flex ai-center  grade-card-frame card-frame advert-card"style="max-width:32%;width:auto" >