Merge branch 'dev_groupmoule_luo' into dev

WXD-SEASON\season
2 parents ec43b944 21141ccc
Showing 6 changed files with 1663 additions and 892 deletions
components/diy_goodsGroup/diy_goodsGroup.js
components/diy_goodsGroup/diy_goodsGroup.wxml
components/diy_goodsGroup/diy_goodsGroup.wxss
components/diy_goodsGroup/g_filter.wxs
pages/index/index/index.wxml
pages/template/index.wxml
@@ -6,6 +6,7 @@ var t = getApp(),
 	ut = i,
 	s = require("../../utils/common.js");
 var regeneratorRuntime = require('../../utils/runtime.js');
+var g_filter = require('./filter');
 Component({
 	properties: {
@@ -60,7 +61,8 @@ Component({
 		//判断接口是不是调用完成
 		is_get:0,
-		is_retail_price:0  //是否显示零售价
+    is_retail_price:0,  //是否显示零售价
+    // action_index:0, //选中的tab项
 	},
 	lifetimes: {
@@ -96,7 +98,8 @@ Component({
 					}
 					if (idlist) idlist = ut.sub_last(idlist);
 					nav_list[ij].idlist = idlist;
-				}
+        }
+        // console.error(nav_list);
 				this.setData({ nav_list: nav_list, is_nav: parseInt(this.data.object.is_nav) });
 			}
@@ -174,7 +177,7 @@ Component({
 		init: async function (classstyle_id, wgroup) {
 			this.setData({ classstyle_id: classstyle_id })
-
+      
 			var th = this;
 			var g_id = this.data.g_id;
 			var len = this.data.firist_type_data.length;
@@ -307,7 +310,7 @@ Component({
 		bind_bnerr3: function (e) {
 			var _errImg = e.target.dataset.errorimg;
 			var _errObj = {};
-			_errObj[_errImg] = this.data.imghost + "/public/images/default_goods_image_240.gif";
+      _errObj[_errImg] = this.data.imghost + "/public/images/default_goods_image_240.gif";
 			this.setData(_errObj) //注意这里的赋值方式,只是将数据列表中的此项图片路径值替换掉 ;
 		},
@@ -404,7 +407,7 @@ Component({
 				this.data.classstyle_id = nav_item.classstyle;
 				this.data.wgroup = nav_item.wgroup;
 			}
-
+      
 			 this.data.isyhgoods = this.data.is_recommend = this.data.is_hot = this.data.is_new = 0;
 			//推荐，热卖，新品			
@@ -519,8 +522,6 @@ Component({
 						if (res && res.data) prom = res.data.data;
 						if (prom != null && prom.is_end == 0 && prom.end_time > now && (prom.start_time < now || (prom.show_time && prom.show_time < now))) {
               item.prom_price = res.data.data.price;
-              console.log(res.data.data)
-              console.log('11111');
 							if (res.data.data.user_price) item.prom_price = res.data.data.user_price;
 							var vNum = res.data.data.virtual_num ? res.data.data.virtual_num : 0;
@@ -538,23 +539,73 @@ Component({
 				} else {
 					th.data.requestData.push(item);
 				}
-			}
-
-			if (th.data.object.column == 5) {
-				var arr = new Array();
-				var rData = th.data.requestData;
-				//--三个三个一组---
-				for (var i = 0; i < rData.length; i += 3) {
-					arr.push(rData.slice(i, i + 3));
-				}
-				th.setData({ goods_array: arr, page: th.data.currentPage - 1,is_get:1 });
-			} else {
-				th.setData({
-					goods_array: th.data.requestData,
-					page: th.data.currentPage - 1,
-					is_get:1
-				});
-			}
+      }
+      
+      // 新版组件价格处理
+      th.data.requestData.map(ite=>{
+        let price = 0
+        if (ite.prom_price || ite.prom_integral) {
+           price = ite.prom_price + ''
+        }else{
+          if (g_filter.is_has_rank(th.data.rank_switch,ite)) {
+            if (th.data.card_field) {
+              if (ite[th.data.card_field] > 0) {
+                price = ite[th.data.card_field] + ''
+              }else{
+                price = ite.shop_price + ''
+              }
+            }else{
+              price = ite.shop_price + ''
+            }
+          }else{
+             price = ite.shop_price + ''
+          }
+        }
+
+        if (price && price.indexOf('.') > -1) {
+          let priceArr = price.split(".")
+          ite.price_n = priceArr[0]
+          ite.price_xs = priceArr[1]
+        }else{
+          ite.price_n = price
+        }
+
+      })
+      console.error(th.data.requestData);
+      //-----------------------
+      if (th.data.object.column_action_name) {
+        if (th.data.object.style == 6 || th.data.object.style == 5) {
+          var arr = new Array();
+          var rData = th.data.requestData;
+          //--三个三个一组---         
+          for (var i = 0; i < rData.length; i += 3) {
+            arr.push(rData.slice(i, i + 3));
+          }
+          th.setData({ goods_array: arr, page: th.data.currentPage - 1,is_get:1 });
+        } else {
+          th.setData({
+            goods_array: th.data.requestData,
+            page: th.data.currentPage - 1,
+            is_get:1
+          });
+        }
+      }else{
+        if (th.data.object.column == 5) {
+          var arr = new Array();
+          var rData = th.data.requestData;
+          //--三个三个一组---
+          for (var i = 0; i < rData.length; i += 3) {
+            arr.push(rData.slice(i, i + 3));
+          }
+          th.setData({ goods_array: arr, page: th.data.currentPage - 1,is_get:1 });
+        } else {
+          th.setData({
+            goods_array: th.data.requestData,
+            page: th.data.currentPage - 1,
+            is_get:1
+          });
+        }
+      }
 		},
@@ -6,929 +6,1358 @@
 <!-- <mp-loading show ="{{goods_array.length== 0}}" type="circle"></mp-loading> -->
 <view id="container">
-	
-<block wx:if="{{is_nav}}">
-	<mp-sticky wx:if="{{sticky == 1}}" container="{{container}}">
-    <view class="flex gr_title_list" style="overflow-x: auto;">
-        <view class="gr_title_item" wx:for="{{nav_list}}" data-index="{{index}}" bindtap="gr_set_nav" data-idlist="{{item.idlist}}" data-wgroup="{{item.wgroup}}" data-classstyle="{{item.classstyle}}">
-            <text class="{{index==title_index?'t_red':''}}" style="{{title_class}}">{{item.title}}</text>
+  <block wx:if="{{object.column_action_name}}">
+    <view  class="{{'tabBox ' + (object.menu_style==2 ? 'tab2' :'')}}">
+      <!--样式一-->
+      <block wx:if="{{object.menu_style==1}}">
+        <view wx:if="{{object.show_all==1}}" style="padding: 0 35rpx;" class="{{'tab ' + (title_index == 10 ? 'clor ' :'')}}" >全部<span class="tab1" wx:if="{{10==title_index}}"></span></view>
+        <view wx:for="{{object.nav_list}}" style="padding: 0 35rpx;" data-index="{{index}}" bindtap="gr_set_nav" data-idlist="{{item.idlist}}" data-wgroup="{{item.wgroup}}" data-classstyle="{{item.classstyle}}" class="{{'tab ' + (index==title_index ? 'clor ' :'')}}">{{item.title}}<span class="tab1" wx:if="{{index==title_index}}"></span></view>
+      </block>
+      <!--样式二-->
+      <block wx:if="{{object.menu_style==2}}">       
+        <view wx:for="{{object.nav_list}}" data-index="{{index}}" bindtap="gr_set_nav" data-idlist="{{item.idlist}}" data-wgroup="{{item.wgroup}}" data-classstyle="{{item.classstyle}}"  class="{{'tab ' + (index==title_index ? 'tab_action' : '')}}"> {{item.title}}</view>
+      </block>
+      <!--样式三-->
+      <block wx:if="{{object.menu_style==3}}">
+        <view wx:for="{{object.nav_list}}"  class="tab ">
+          <view class="{{'tab3 ' + (index==title_index ? 'tab_action' : '')}}" data-index="{{index}}" bindtap="gr_set_nav" data-idlist="{{item.idlist}}" data-wgroup="{{item.wgroup}}" data-classstyle="{{item.classstyle}}">
+            {{item.title}}
+          </view>
         </view>
+      </block>
     </view>
-	</mp-sticky>
-	
-	<view class="flex gr_title_list" style="overflow-x: auto;" wx:else>
-	    <view class="gr_title_item" wx:for="{{nav_list}}" data-index="{{index}}" bindtap="gr_set_nav" data-idlist="{{item.idlist}}" data-wgroup="{{item.wgroup}}" data-classstyle="{{item.classstyle}}">
-	        <text class="{{index==title_index?'t_red':''}}" style="{{title_class}}">{{item.title}}</text>
-	    </view>
-	</view>
-</block>
-
- 
-<view style="background-color: {{bg_color}};" wx:if="{{goods_array.length > 0  }}">
-    <!--1个列表的时候-->
-    <view class="zs_goods_wai" wx:if='{{object.column==1}}'>
-        <block wx:for="{{goods_array}}">
-            <view class='zs_goods {{g_filter.get_border_type(object.big_order_type)}}'>
-                <navigator url="{{g_filter.get_url_by_type(item)}}" class="s1_gk_a1">
-                    <!-- <navigator url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}&prom_id={{item.prom_id}}&&prom_type={{item.prom_type}}" class="s1_gk_a1"> -->
-                    <view class='zs_top rel'>
-
-                        <block wx:if="{{object.big_order_type==3}}">
-                            <view style="position: relative; width: 100%; height: 100%">
-                                <image class='zs_t_img' src="{{object.pic_back}}" data-errorimg="object.pic_back" lazy-load="true" binderror="bind_bnerr3"></image>
-                                <image class="n_box" style="top: {{object.top}}%;left:{{object.left}}%;width: {{object.width}}%;height: {{object.width}}%" src="{{item.goods_img}}" data-errorimg="goods_array[{{index}}].goods_img" lazy-load="true" binderror="bind_bnerr3"></image>
-                            </view>
-                        </block>
-                        <block wx:else>
-                            <image class='zs_t_img' src="{{item.goods_img}}" data-errorimg="goods_array[{{index}}].goods_img" binderror="bind_bnerr3" lazy-load="true"></image>
-                        </block>
+  </block>
+  <block wx:else>
+    <block wx:if="{{is_nav}}">
+      <mp-sticky wx:if="{{sticky == 1}}" container="{{container}}">
+        <view class="flex gr_title_list" style="overflow-x: auto;">
+          <view class="gr_title_item" wx:for="{{nav_list}}" data-index="{{index}}" bindtap="gr_set_nav" data-idlist="{{item.idlist}}" data-wgroup="{{item.wgroup}}" data-classstyle="{{item.classstyle}}">
+            <text class="{{index==title_index?'t_red':''}}" style="{{title_class}}">{{item.title}}</text>
+          </view>
+        </view>
+      </mp-sticky>
-                        <block wx:if="{{object.goodicon==3}}">
-                            <image style="width: {{object.icon_width*1.2}}rpx;height: {{object.icon_width*1.2}}rpx"
-                                   class='{{g_filter.get_class(object.column,object.position)}}' src='{{object.customicon}}'></image>
-                        </block>
-                        <block wx:if="{{object.goodicon==1}}">
-                            <image style="width: {{object.icon_width*1.2}}rpx;height: {{object.icon_width*1.2}}rpx"
-                                   class='{{g_filter.get_class(object.column,object.position)}}' src=''></image>
-                        </block>
-                        <block wx:if="{{object.goodicon==2}}">
-                            <image style="width: {{object.icon_width*1.2}}rpx;height: {{object.icon_width*1.2}}rpx"
-                                   class='{{g_filter.get_class(object.column,object.position)}}' wx:if="{{object.styleicon==1}}" src='{{imghost}}/miniapp/images/Recommend.png'></image>
-                            <image style="width: {{object.icon_width*1.2}}rpx;height: {{object.icon_width*1.2}}rpx"
-                                   class='{{g_filter.get_class(object.column,object.position)}}' wx:if="{{object.styleicon==2}}" src='{{imghost}}/miniapp/images/hot.png'></image>
-                            <image style="width: {{object.icon_width*1.2}}rpx;height: {{object.icon_width*1.2}}rpx"
-                                   class='{{g_filter.get_class(object.column,object.position)}}' wx:if="{{object.styleicon==3}}" src='{{imghost}}/miniapp/images/new.png'></image>
-                            <image style="width: {{object.icon_width*1.2}}rpx;height: {{object.icon_width*1.2}}rpx"
-                                   class='{{g_filter.get_class(object.column,object.position)}}' wx:if="{{object.styleicon==4}}" src='{{imghost}}/miniapp/images/Promotion.png'></image>
-                        </block>
+      <view class="flex gr_title_list" style="overflow-x: auto;" wx:else>
+        <view class="gr_title_item" wx:for="{{nav_list}}" data-index="{{index}}" bindtap="gr_set_nav" data-idlist="{{item.idlist}}" data-wgroup="{{item.wgroup}}" data-classstyle="{{item.classstyle}}">
+          <text class="{{index==title_index?'t_red':''}}" style="{{title_class}}">{{item.title}}</text>
+        </view>
+      </view>
+    </block>
+  </block>
+  <!-- 新版 -->
+  <block wx:if="{{object.column_action_name}}">
+    <block wx:if="{{goods_array.length > 0  }}">
+      <!-- 大图模式 -->
+      <block wx:if="{{object.style==1}}">
+        <view style="{{'padding-left:'+object.page_margins+'px;padding-right:'+object.page_margins+'px;'}}" class="{{'new_item1_box '+ ((object.product_style==1 || object.product_style==3 )? ' bgf ':'')}}">
+          <!-- <block wx:for="{{goods_array}}"> -->
+          <view wx:for="{{goods_array}}" wx:for-item="aitem" wx:for-index="aind" class="{{'new_item1 ' + (object.product_style==2 ? ' boxsha ':'') + (object.product_style==3 ? ' aborder ':'')   + ((object.product_style==1 || object.product_style==3 )? ' bgf ':'') + (object.chamfer_of_main_drawing==2 ? ' but_radius5 ':'') }}" style="{{'margin-bottom:'+object.product_spacing+'px;'}}">
+            <navigator url="{{g_filter.get_url_by_type(aitem)}}" class="s1_gk_a1">
+              <view class="topBox">
+                <view class="imgBox">
+                  <!-- <image  mode="{{object.picture_fill==1 ? 'aspectFill' : 'scaleToFill'}}" class="{{'new_item1_image '+ 'aspect_ratio'+object.picture_scale}}" style="{{'width:'+img_width+';height:'+img_height}}" src="{{imghost+aitem.original_img}}" data-errorimg="goods_array[{{aind}}].goods_img" binderror="bind_bnerr3"></image> -->
+                  <view class="{{'container'+object.picture_scale}}" style="{{object.picture_fill==1 ? 'background-color: #fff;' : ''}}">
+                    <!-- <image  mode="{{object.picture_fill==1 ? 'aspectFit' : 'aspectFill'}}" class="{{'new_item1_image images1'}}"  src="{{imghost+aitem.original_img}}" data-errorimg="goods_array[{{aind}}].goods_img" binderror="bind_bnerr3"></image> -->
+                    <image mode="{{object.picture_fill==1 ? 'aspectFit' : 'aspectFill'}}" class="{{'new_item1_image images1'}}" src="{{aitem.goods_img}}" data-errorimg="goods_array[{{aind}}].goods_img" binderror="bind_bnerr3"></image>
+                  </view>
+
+                  <image class="imgBox_img" wx:if="{{object.subscript_style==5}}" src="{{object.subscript_diy_style}}"></image>
+                  <image class="imgBox_img" wx:if="{{object.subscript_style<=4}}" src="{{imghost+'/miniapp/images/component/j0'+object.subscript_style +'.png?v=1'}}"></image>
+                </view>
+              </view>
+              <view class="ellipsis-2n new_item1_goods_name" style="{{(object.text_style==2 ? 'font-weight: bold;':'') + (object.text_align==2 ? 'text-align:center;' :'' )}}" wx:if="{{object.trade_name}}">{{aitem.goods_name}}</view>
+              <view class="new_item1_price" style="{{'padding:10rpx 10rpx;'+(object.text_align==2 ? 'justify-content:center;flex-direction:column;' :'' )}}">
+                <view style="{{(object.text_style==2 ? 'font-weight: bold;':'')}}">
+                  <view class="clor7b">
+                    <text wx:if="{{object.seconds_num}}">销量：<text class="clor">{{aitem.sales_sum}}</text>件</text>
+                  </view>
+                  <view class="flex" style="{{'font-size: 24rpx; ' +(object.text_align==2 ? 'justify-content:center;' :'' ) }}">
+                    <view class="clor">
+                      <text wx:if="{{object.commodity_price}}">￥<text class="pricefs42">{{aitem.price_n}}</text><text wx:if="{{aitem.price_xs}}">.{{aitem.price_xs}}</text><text wx:if="{{aitem.prom_integral && (aitem.price_n || aitem.price_xs)}}">+</text> <text wx:if="{{aitem.prom_integral}}">{{aitem.prom_integral}}积分</text></text>
+                      <text style="margin-left: 5rpx;" wx:if="{{object.wholesale_price}}" class="clor7b">￥{{aitem.market_price}}</text>
+                    </view>
+                  </view>
+                </view>
+                <view>
+                  <image wx:if="{{object.purchase_button<=4}}" src="{{imghost+'/miniapp/images/component/0'+object.purchase_button+'.png?v=1'}}" class="imgbox1"></image>
+                  <view wx:if="{{ 5<=object.purchase_button && object.purchase_button<=8 }}" class="{{'new_item1_but ' + (object.purchase_button==5 ? 'new_item1_but1':'' )+ (object.purchase_button==7 ? 'new_item1_but2':'' )+ (object.purchase_button==8 ? 'new_item1_but3':'' )  }}">{{object.button_content}}</view>
+                </view>
+              </view>
+            </navigator>
+          </view>
+          <!-- </block> -->
+        </view>
+      </block>
+      <!-- 一行两个 -->
+      <block wx:if="{{object.style==2}}">
+        <view style="{{'padding-left:'+object.page_margins+'px;padding-right:'+object.page_margins+'px;'}}" class="{{'flex2 new_item1_box '+ ((object.product_style==1 || object.product_style==3 )? ' bgf ':'')  }}">
+          <!-- <block wx:for="{{goods_array}}"> -->
+            <view wx:for="{{goods_array}}" wx:for-item="aitem" wx:for-index="aind" class="{{'boxpad new_item1 ' + (object.product_style==2 ? ' boxsha ':'') + (object.product_style==3 ? ' aborder ':'')   + ((object.product_style==1 || object.product_style==3 )? ' bgf ':'')+ (object.chamfer_of_main_drawing==2 ? ' but_radius5 ':'')}}" style="{{'margin-bottom:'+object.product_spacing+'px; '+('width:calc(100%/2 - ' + object.product_spacing/2+'px)')}}">
+              <navigator url="{{g_filter.get_url_by_type(aitem)}}" class="s1_gk_a1">
+                <view class="topBox">
+                  <view class="imgBox">
+                    <!-- <image  mode="{{object.picture_fill==1 ? 'aspectFill' : 'scaleToFill'}}" class="{{'new_item1_image '+ 'aspect_ratio'+object.picture_scale}}" style="{{'width:'+img_width+';height:'+img_height}}" src="{{imghost+aitem.original_img}}" data-errorimg="goods_array[{{aind}}].goods_img" binderror="bind_bnerr3"></image> -->
+                    <view class="{{'container'+object.picture_scale}}" style="{{object.picture_fill==1 ? 'background-color: #fff;' : ''}}">
+                      <!-- <image  mode="{{object.picture_fill==1 ? 'aspectFit' : 'aspectFill'}}" class="{{'new_item1_image images1'}}"  src="{{imghost+aitem.original_img}}" data-errorimg="goods_array[{{aind}}].goods_img" binderror="bind_bnerr3"></image> -->
+                      <image mode="{{object.picture_fill==1 ? 'aspectFit' : 'aspectFill'}}" class="{{'new_item1_image images1 '}}" src="{{aitem.goods_img}}" data-errorimg="goods_array[{{aind}}].goods_img" binderror="bind_bnerr3"></image>
                     </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}}">
-                            <block wx:if="{{item.prom_price || item.prom_integral}}">
-                                <view class='wz_red'>
-                                    <text wx:if="{{item.prom_integral}}">{{item.prom_integral}}积分</text>
-                                    <text wx:if="{{item.prom_integral && item.prom_price}}">+</text>
-                                    <text wx:if="{{item.prom_price}}">￥{{item.prom_price}}</text>
-                                </view>
-                                <view wx:if="{{is_retail_price}}"  class='del ~no_line_x'>￥{{item.market_price}}</view>
-                            </block>
-                            <block wx:else>
-                                <block wx:if="{{g_filter.is_has_rank(rank_switch,item)}}">
-                                    <!-- 当会员是等级卡的时候 -->
-                                    <block wx:if="{{card_field}}">
-                                        <!-- 等级价>0 -->
-                                        <block wx:if="{{item[card_field]>0}}">
-                                            <view class="money flex ai_and">
-                                                <!-- 办卡价 -->
-                                                <view class="flex xc-wc ai_and">
-                                                    <view class="fs24 wz_red">￥</view>
-                                                    <view class="fs35 wz_red">{{filter.toFix(item[card_field],2)}}</view>
-                                                    <view class="card_bg ellipsis-1">
-                                                        <image src="{{url}}/miniapp/images/plus/dj_icon.png"></image>
-                                                        <text class="card_name">{{card_name}}</text>
-                                                    </view>
-                                                </view>
-                                            </view>
-                                            <view class="flex" style="line-height: 28rpx;">
-                                                <!-- 原价 -->
-                                                <view wx:if="{{is_retail_price}}"   class="price flex xc-ash line_th ~no_line_x">
-                                                    <view class="fs22">￥</view>
-                                                    <view class="fs22">{{item.market_price}}</view>
-                                                </view>
-                                            </view>
-                                        </block>
-                                        <block wx:else>
-                                            <view class="money flex">
-                                                <!-- 办卡价 -->
-                                                <view class="flex xc-wc">
-                                                    <view class="fs24 wz_red">￥</view>
-                                                    <view class="fs35 wz_red">{{filter.toFix(item.shop_price,2)}}</view>
-                                                </view>
-                                            </view>
-                                            <view class="flex" style="line-height: 28rpx;">
-                                                <!-- 原价 -->
-                                                <view  wx:if="{{is_retail_price}}" class="price flex xc-ash line_th ~no_line_x">
-                                                    <view class="fs22">￥</view>
-                                                    <view class="fs22">{{item.market_price}}</view>
-                                                </view>
-                                            </view>
-                                        </block>
-                                    </block>
-                                    <block wx:else>
-                                        <!-- 如果商品有设置等级价大于0的 -->
-                                        <block wx:if="{{g_filter.get_card_price(item,card_list,0) && is_no_plus}}">
-                                            <view class="money flex">
-                                                <!-- 办卡价 -->
-                                                <view class="flex xc-wc">
-                                                    <view class="fs24 wz_red">￥</view>
-                                                    <view class="fs35 wz_red">{{filter.toFix(item.shop_price,2)}}</view>
-                                                </view>
-                                                <!-- 原价 -->
-                                                <view  wx:if="{{is_retail_price}}" class="price flex xc-ash line_th ~no_line_x">
-                                                    <view class="fs22">￥</view>
-                                                    <view class="fs22">{{item.market_price}}</view>
-                                                </view>
-
-                                            </view>
-                                            <view class="flex" style="line-height: 28rpx;">
-                                                <!-- 等级价 -->
-                                                <view class="price flex ai_and">
-                                                    <view class="fs22">￥</view>
-                                                    <view class="fs28">{{filter.toFix(g_filter.get_card_price(item,card_list,0),2)}}</view>
-                                                    <view class="card_bg ellipsis-1">
-                                                        <image src="{{url}}/miniapp/images/plus/dj_icon.png"></image>
-                                                        <text class="card_name">{{g_filter.get_card_price(item,card_list,1)}}</text>
-                                                    </view>
-                                                </view>
-                                            </view>
-                                        </block>
-                                        <block wx:else>
-                                            <view class="money flex">
-                                                <!-- 办卡价 -->
-                                                <view class="flex xc-wc">
-                                                    <view class="fs24 wz_red">￥</view>
-                                                    <view class="fs35 wz_red">{{filter.toFix(item.shop_price,2)}}</view>
-                                                </view>
-                                            </view>
-                                            <view class="flex" style="line-height: 28rpx;">
-                                                <!-- 原价 -->
-                                                <view  wx:if="{{is_retail_price}}" class="price flex xc-ash line_th ~no_line_x">
-                                                    <view class="fs22">￥</view>
-                                                    <view class="fs22">{{item.market_price}}</view>
-                                                </view>
-                                            </view>
-                                        </block>
-                                    </block>
-                                </block>
-
-                                <block wx:else>
-                                    <view class='wz_red'>￥{{item.shop_price}}</view>
-                                    <view   wx:if="{{is_retail_price}}" class='del ~no_line_x'>￥{{item.market_price}}</view>
-                                </block>
+                    <image class="imgBox_img" wx:if="{{object.subscript_style==5}}" src="{{object.subscript_diy_style}}"></image>
+                    <image class="imgBox_img" wx:if="{{object.subscript_style<=4}}" src="{{imghost+'/miniapp/images/component/j0'+object.subscript_style +'.png?v=1'}}"></image>
+                  </view>
+                  <block wx:if="{{object.count_down}}">
+                    <view wx:if="{{aitem.residue==0}}" class="{{'new_item1_time '+(object.count_down_float ? 'item_float' : '')}}" style="justify-content: center;color: #fff;background-color:rgb(166,166,166);">
+                      <view>已售罄</view>
+                    </view>
+                    <!-- <view wx:else class="{{'new_item1_time '+(object.count_down_float ? 'item_float' : '')}}" style="{{'justify-content: center;background:'+(aitem.status ==0 ? object.scountdown_background_color : object.countdown_background_color)}}">
+                      <view>{{aitem.djs.day}}天{{aitem.djs.hou}}:{{aitem.djs.min}}:{{aitem.djs.sec}}</view>
+                    </view> -->
+                  </block>
+                </view>
+                <view class="ellipsis-2 new_item1_goods_name" style="{{'height:88rpx;font-size:24rpx; ' + (object.text_style==2 ? 'font-weight: bold;':'') + (object.text_align==2 ? 'text-align:center;' :'' )}}" wx:if="{{object.trade_name}}">{{aitem.goods_name}}</view>
+                <view wx:if="{{object.seconds_num || object.remaining_inventory}}" class="new_item1_price pdlf10 clor7b" style="{{'font-size:20rpx;' + 'display:block;'+(object.text_align==2 ?'text-align:center;':'')+(object.text_style==2 ? 'font-weight: bold;':'')}}">
+                  <text wx:if="{{object.seconds_num}}">销量：<text class="clor">{{aitem.sales_sum}}</text>件</text>
+                  <!-- <text wx:if="{{object.remaining_inventory}}">还剩余<text class="clor">{{aitem.residue}}</text>件</text> -->
+                </view>
+                <view class="new_item1_price pdlf10" style="{{(object.text_align==2 ? 'justify-content:center;flex-direction:column;' :'' )}}">
+                  <view style="{{(object.text_style==2 ? 'font-weight: bold;':'')}}">
+                    <view style="{{(object.text_align==2 ? 'justify-content:center;' :'' ) }}">
+                      <view class="clor" style="margin-right: 5rpx;" wx:if="{{object.commodity_price}}">￥<text class="pricefs42">{{aitem.price_n}}</text><text wx:if="{{aitem.price_xs}}">.{{aitem.price_xs}}</text><text wx:if="{{aitem.prom_integral && (aitem.price_n || aitem.price_xs)}}">+</text> <text wx:if="{{aitem.prom_integral}}">{{aitem.prom_integral}}积分</text></view>
+                      <view wx:if="{{object.wholesale_price}}" class="clor7b">￥{{aitem.market_price}}</view>
+                    </view>
+                  </view>
+                  <view>
+                    <image wx:if="{{object.purchase_button<=4}}" src="{{imghost+'/miniapp/images/component/0'+object.purchase_button+'.png?v=1'}}" style="width: 60rpx;height: 60rpx;"></image>
+                    <view wx:if="{{ 5<=object.purchase_button && object.purchase_button<=8 }}" class="{{'new_item1_but ' + (object.purchase_button==5 ? 'new_item1_but1':'' )+ (object.purchase_button==7 ? 'new_item1_but2':'' )+ (object.purchase_button==8 ? 'new_item1_but3':'' )  }}">{{object.button_content}}</view>
+                  </view>
+                </view>
+              </navigator>
+            </view>
+          <!-- </block> -->
+        </view>
+      </block>
+      <!-- 一行三个 -->
+      <block wx:if="{{object.style==3}}">
+        <view style="{{'padding-left:'+object.page_margins+'px;padding-right:'+object.page_margins+'px;'}}" class="{{'flex2 new_item1_box '+ ((object.product_style==1 || object.product_style==3 )? ' bgf ':'')}}">
+          <!-- <block wx:for="{{goods_array}}"> -->
+            <view wx:for="{{goods_array}}" wx:for-item="aitem" wx:for-index="aind" class="{{'boxpad new_item1 ' + (object.product_style==2 ? ' boxsha ':'') + (object.product_style==3 ? ' aborder ':'')   + ((object.product_style==1 || object.product_style==3 )? ' bgf ':'') + (object.chamfer_of_main_drawing==2 ? ' but_radius5 ':'') }}" style="{{'margin-bottom:'+object.product_spacing+'px; '+('width:calc(100%/3 - ' + (object.product_spacing*2)/3+'px)')}}">
+              <navigator url="{{g_filter.get_url_by_type(aitem)}}" class="s1_gk_a1">
+                <view class="topBox">
+                  <view class="imgBox">
+                    <!-- <image  mode="{{object.picture_fill==1 ? 'aspectFill' : 'scaleToFill'}}" class="{{'new_item1_image '+ 'aspect_ratio'+object.picture_scale}}" style="{{'width:'+img_width+';height:'+img_height}}" src="{{imghost+aitem.original_img}}" data-errorimg="goods_array[{{aind}}].goods_img" binderror="bind_bnerr3"></image> -->
+                    <view class="{{'container'+object.picture_scale}}" style="{{object.picture_fill==1 ? 'background-color: #fff;' : ''}}">
+                      <!-- <image  mode="{{object.picture_fill==1 ? 'aspectFit' : 'aspectFill'}}" class="{{'new_item1_image images1'}}"  src="{{imghost+aitem.original_img}}" data-errorimg="goods_array[{{aind}}].goods_img" binderror="bind_bnerr3"></image> -->
+                      <image mode="{{object.picture_fill==1 ? 'aspectFit' : 'aspectFill'}}" class="{{'new_item1_image images1 '}}" src="{{aitem.goods_img}}" data-errorimg="goods_array[{{aind}}].goods_img" binderror="bind_bnerr3"></image>
+                    </view>
-                            </block>
+                    <image class="imgBox_img" wx:if="{{object.subscript_style==5}}" src="{{object.subscript_diy_style}}"></image>
+                    <image class="imgBox_img" wx:if="{{object.subscript_style<=4}}" src="{{imghost+'/miniapp/images/component/j0'+object.subscript_style +'.png?v=1'}}"></image>
+                  </view>
+                  <block wx:if="{{object.count_down}}">
+                    <view wx:if="{{aitem.residue==0}}" class="{{'new_item1_time '+(object.count_down_float ? 'item_float' : '')}}" style="justify-content: center;color: #fff;background-color:rgb(166,166,166);">
+                      <view>已售罄</view>
+                    </view>
+                    <!-- <view wx:else class="{{'new_item1_time '+(object.count_down_float ? 'item_float' : '')}}" style="{{'justify-content: center;background:'+(aitem.status ==0 ? object.scountdown_background_color : object.countdown_background_color)}}">
+                      <view>{{aitem.djs.day}}天{{aitem.djs.hou}}:{{aitem.djs.min}}:{{aitem.djs.sec}}</view>
+                    </view> -->
+                  </block>
+                </view>
+                <view class="ellipsis-2 new_item1_goods_name " style="{{'height:88rpx;font-size:24rpx;' + (object.text_style==2 ? 'font-weight: bold;':'') + (object.text_align==2 ? 'text-align:center;' :'' )}}" wx:if="{{object.trade_name}}">{{aitem.goods_name}}</view>
+                <view wx:if="{{object.seconds_num || object.remaining_inventory}}" class="new_item1_price clor7b" style="{{'display:block;font-size:20rpx; '+(object.text_align==2 ?'text-align:center;':'')+(object.text_style==2 ? 'font-weight: bold;':'')}}">
+                  <text wx:if="{{object.seconds_num}}">销量<text class="clor">{{aitem.sales_sum}}</text>件</text>
+                  <!-- <text wx:if="{{object.remaining_inventory}}">剩<text class="clor">{{aitem.residue}}</text>件</text> -->
+                </view>
+                <view class="new_item1_price clor7b" style="{{(object.text_align==2 ? 'justify-content:center;flex-direction:column;' :'' )}}">
+                  <view style="{{(object.text_style==2 ? 'font-weight: bold;':'')}}">
+                    <view style="{{'font-size: 20rpx; ' +(object.text_align==2 ? 'justify-content:center;' :'' ) }}">
+                      <view class="clor" style="margin-right: 5rpx;" wx:if="{{object.commodity_price}}">￥<text class="pricefs38">{{aitem.price_n}}</text><text wx:if="{{aitem.price_xs}}">.{{aitem.price_xs}}</text><text wx:if="{{aitem.prom_integral && (aitem.price_n || aitem.price_xs)}}">+</text> <text wx:if="{{aitem.prom_integral}}">{{aitem.prom_integral}}积分</text></view>
+                      <view wx:if="{{object.wholesale_price}}">￥{{aitem.market_price}}</view>
+                    </view>
+                  </view>
+                  <view>
+                    <image wx:if="{{object.purchase_button<=4}}" src="{{imghost+'/miniapp/images/component/0'+object.purchase_button+'.png?v=1'}}" style="width: 50rpx;height: 50rpx;"></image>
+                    <!-- <view style="width: 90rpx;height: 50rpx;line-height: 50rpx;" wx:if="{{ 5<=object.purchase_button && object.purchase_button<=8 }}" class="{{'new_item1_but ' + (object.purchase_button==5 ? 'new_item1_but1':'' )+ (object.purchase_button==7 ? 'new_item1_but2':'' )+ (object.purchase_button==8 ? 'new_item1_but3':'' )  }}">{{object.button_content}}</view> -->
+                  </view>
+                </view>
+              </navigator>
+            </view>
+          <!-- </block> -->
+        </view>
+      </block>
+      <!-- 详细列表 -->
+      <block wx:if="{{object.style==4}}">
+        <view style="{{'padding-left:'+object.page_margins+'px;padding-right:'+object.page_margins+'px;'}}" class="{{'flex2 new_item1_box '+ ((object.product_style==1 || object.product_style==3 )? ' bgf ':'')  }}">
+          <!-- <block wx:for="{{goods_array}}"> -->
+            <view wx:for="{{goods_array}}" wx:for-item="aitem" wx:for-index="aind" class="{{'boxpad new_item1 ' + (object.product_style==2 ? ' boxsha ':'') + (object.product_style==3 ? ' aborder ':'')  + ((object.product_style==1 || object.product_style==3 )? ' bgf ':'') + (object.chamfer_of_main_drawing==2 ? ' but_radius5 ':'') }}" style="{{'margin-bottom:'+object.product_spacing+'px;'}}">
+              <navigator style="display: flex;" url="{{g_filter.get_url_by_type(aitem)}}" class="s1_gk_a1">
+                <view style="width: 33%;" class="topBox">
+                  <view class="imgBox">
+                    <view class="{{'container'+object.picture_scale}}" style="{{object.picture_fill==1 ? 'background-color: #fff;' : ''}}">
+                      <image mode="{{object.picture_fill==1 ? 'aspectFit' : 'aspectFill'}}" class="{{'new_item1_image images1'}}" src="{{aitem.goods_img}}" data-errorimg="goods_array[{{aind}}].goods_img" binderror="bind_bnerr3"></image>
+                    </view>
+
+                    <image class="imgBox_img" wx:if="{{object.subscript_style==5}}" src="{{object.subscript_diy_style}}"></image>
+                    <image class="imgBox_img" wx:if="{{object.subscript_style<=4}}" src="{{imghost+'/miniapp/images/component/j0'+object.subscript_style +'.png?v=1'}}"></image>
+                  </view>
+                  <block wx:if="{{object.count_down}}">
+                    <view wx:if="{{aitem.residue==0}}" class="{{'new_item1_time '+(object.count_down_float ? 'item_float' : '')}}" style="justify-content: center;color: #fff;background-color:rgb(166,166,166);">
+                      <view>已售罄</view>
+                    </view>
+                    <!-- <view wx:else class="{{'new_item1_time '+(object.count_down_float ? 'item_float' : '')}}" style="{{'justify-content: center;background:'+(aitem.status ==0 ? object.scountdown_background_color : object.countdown_background_color)}}">
+                      <view>{{aitem.djs.day}}天{{aitem.djs.hou}}:{{aitem.djs.min}}:{{aitem.djs.sec}}</view>
+                    </view> -->
+                  </block>
+                </view>
+                <view style="{{'width: 67%;display: flex;flex-wrap: wrap;padding-left: 10rpx;' + (object.text_align==2 ? 'justify-content:center;' :'' )}}">
+                  <view class="ellipsis-2 new_item1_goods_name" style="{{'font-size:28rpx;height:100rpx;'+(object.text_style==2 ? 'font-weight: bold;':'') + (object.text_align==2 ? 'text-align:center;' :'' )}}" wx:if="{{object.trade_name}}">{{aitem.goods_name}}</view>
+                  <view wx:if="{{object.seconds_num || object.remaining_inventory}}" class="new_item1_price clor7b" style="{{'font-size:24rpx;'+(object.text_align==2 ?'text-align:center;':'')+(object.text_style==2 ? 'font-weight: bold;':'')}}">
+                    <text wx:if="{{object.seconds_num}}">销量<text class="clor">{{aitem.sales_sum}}</text>件</text>
+                    <!-- <text wx:if="{{object.remaining_inventory}}">剩<text class="clor">{{aitem.residue}}</text>件</text> -->
+                  </view>
+                  <view class="new_item1_price clor7b" style="{{'width:100%;' + (object.text_align==2 ? 'justify-content:center;flex-direction:column;' :'' )}}">
+                    <view style="{{(object.text_style==2 ? 'font-weight: bold;':'')}}">
+                      <view style="{{'font-size: 24rpx; ' +(object.text_align==2 ? 'justify-content:center;' :'' ) }}">
+                        <view class="clor" style="margin-right: 5rpx;"><text wx:if="{{object.commodity_price}}">￥<text class="pricefs42">{{aitem.price_n}}</text><text wx:if="{{aitem.price_xs}}">.{{aitem.price_xs}}</text></text><text style="color: #7b7b7b;margin-left: 5rpx;" wx:if="{{object.wholesale_price}}">￥{{aitem.market_price}}</text><text wx:if="{{aitem.prom_integral && (aitem.price_n || aitem.price_xs)}}">+</text> <text wx:if="{{aitem.prom_integral}}">{{aitem.prom_integral}}积分</text></view>
+                      </view>
+                    </view>
+                    <view>
+                      <image wx:if="{{object.purchase_button<=4}}" src="{{imghost+'/miniapp/images/component/0'+object.purchase_button+'.png?v=1'}}" style="width:60rpx;height: 60rpx;"></image>
+                      <view style="width: 130rpx;height: 60rpx;line-height: 60rpx;" wx:if="{{ 5<=object.purchase_button && object.purchase_button<=8 }}" class="{{'new_item1_but ' + (object.purchase_button==5 ? 'new_item1_but1':'' )+ (object.purchase_button==7 ? 'new_item1_but2':'' )+ (object.purchase_button==8 ? 'new_item1_but3':'' )  }}">{{object.button_content}}</view>
+                    </view>
+                  </view>
+                </view>
+              </navigator>
+            </view>
+          <!-- </block> -->
+        </view>
+      </block>
+      <!-- 一大一小 -->
+      <block wx:if="{{object.style==5}}">
+        <view style="{{'padding-left:'+object.page_margins+'px;padding-right:'+object.page_margins+'px;'}}" class="{{'flex2 new_item1_box '+ ((object.product_style==1 || object.product_style==3 )? ' bgf ':'')}}">
+          <block wx:for="{{goods_array}}">
+            <block wx:for="{{item}}" wx:for-item="aitem" wx:for-index="aind">
+              <view wx:if="{{aind==0}}" class="{{'new_item1 ' + (object.product_style==2 ? ' boxsha ':'') + (object.product_style==3 ? ' aborder ':'')  + (object.chamfer_of_main_drawing==2 ? ' but_radius5 ':'')  + ((object.product_style==1 || object.product_style==3 )? ' bgf ':'')}}" style="{{'margin-bottom:'+object.product_spacing+'px;'}}">
+                <navigator url="{{g_filter.get_url_by_type(aitem)}}" class="s1_gk_a1">
+                  <view class="topBox">
+                    <view class="imgBox">
+                      <view class="{{'container'+object.picture_scale}}" style="{{object.picture_fill==1 ? 'background-color: #fff;' : ''}}">
+                        <image mode="{{object.picture_fill==1 ? 'aspectFit' : 'aspectFill'}}" class="{{'new_item1_image images1'}}" src="{{aitem.goods_img}}" data-errorimg="goods_array[{{aind}}].goods_img" binderror="bind_bnerr3"></image>
+                      </view>
+                      <image class="imgBox_img" wx:if="{{object.subscript_style==5}}" src="{{object.subscript_diy_style}}"></image>
+                      <image class="imgBox_img" wx:if="{{object.subscript_style<=4}}" src="{{imghost+'/miniapp/images/component/j0'+object.subscript_style +'.png?v=1'}}"></image>
+                    </view>
+                    <block wx:if="{{object.count_down}}">
+                      <view wx:if="{{aitem.residue==0 || aitem.status==2}}" class="{{(object.count_down_float ? 'item_float' : '')}}" style="height: 70rpx;line-height: 70rpx;color: #fff;background-color:rgb(166,166,166);text-align: center;">
+                        已售罄
+                      </view>
+                      <!-- <view wx:else class="{{'new_item1_time ' + (object.count_down_float ? 'item_float' : '')}}" style="{{'box-sizing: border-box;height: 70rpx;padding: 10rpx 30rpx;background:'+ (aitem.status ==0 ? object.scountdown_background_color : object.countdown_background_color)}}">
+                        <image src="{{imghost+'/miniapp/images/component/seckill.png'}}"></image>
+                        <view style="text-align: center;line-height: 30rpx;">
+                          <view wx:if="{{aitem.status == 1}}">距结束时间</view>
+                          <view wx:if="{{aitem.status == 0}}">距开始时间</view>
+                          <view>{{aitem.djs.day}}天{{aitem.djs.hou}}:{{aitem.djs.min}}:{{aitem.djs.sec}}</view>
+                          <view>30天21:59:40</view>
                         </view>
-                        <!-- <view class='zs_wz5' wx:if="{{object.goodsnum}}">销量：{{item.sales_sum}}件</view> -->
-												<view class="flex jc-sb ai-center">
-													<view class='zs_wz5_x' wx:if="{{object.goodsnum}}">销量：{{item.sales_sum}}件</view>
-													
-													<!-- 购物车图标 -->
-													<view class="icon-box" wx:if="{{object.goodcaricon != 1}}">
-														<!-- 系统图标 -->
-														<block wx:if="{{object.goodcaricon == 2}}">
-															<image class="icon" src="{{url + '/miniapp/images/cart/group_goods_car_1.png'}}" wx:if="{{object.stylecaricon == 1}}" mode="widthFix"></image>
-															<image class="icon" src="{{url + '/miniapp/images/cart/group_goods_car_2.png'}}" wx:if="{{object.stylecaricon == 2}}" mode="widthFix"></image>
-															<text class="icon-text" wx:if="{{object.stylecaricon == 3}}">马上抢</text>
-															<text class="icon-text" wx:if="{{object.stylecaricon == 4}}">立即购买</text>
-														</block>
-														<!-- 自定义图标 -->
-														<block wx:if="{{object.goodcaricon == 3}}">
-															<image class="icon icon2" src="{{object.customcaricon}}" mode="widthFix"></image>
-														</block>
-													</view>
-												</view>
-                        <view style="height: 10rpx;"></view>
+                      </view>  -->
+                    </block>
+                  </view>
+                  <view class="ellipsis-2n new_item1_goods_name" style="{{(object.text_style==2 ? 'font-weight: bold;':'') + (object.text_align==2 ? 'text-align:center;' :'' )}}" wx:if="{{object.trade_name}}">{{aitem.goods_name}}</view>
+                  <view class="new_item1_price" style="{{'padding:10rpx 10rpx;'+(object.text_align==2 ? 'justify-content:center;flex-direction:column;' :'' )}}">
+                    <view style="{{(object.text_style==2 ? 'font-weight: bold;':'')}}">
+                      <view class="clor7b">
+                        <text wx:if="{{object.seconds_num}}">销量：<text class="clor">{{aitem.sales_sum}}</text>件</text>
+                        <!-- <text wx:if="{{object.remaining_inventory}}">还剩余<text class="clor">{{aitem.status==2 ? '0' : aitem.residue}}</text>件</text> -->
+                      </view>
+                      <view class="flex" style="{{'font-size: 24rpx; ' +(object.text_align==2 ? 'justify-content:center;' :'' ) }}">
+                        <view class="clor">
+                          <text wx:if="{{object.commodity_price}}">￥<text class="pricefs42">{{aitem.price_n}}</text><text wx:if="{{aitem.price_xs}}">.{{aitem.price_xs}}</text><text wx:if="{{aitem.prom_integral && (aitem.price_n || aitem.price_xs)}}">+</text> <text wx:if="{{aitem.prom_integral}}">{{aitem.prom_integral}}积分</text></text>
+                          <text style="margin-left: 5rpx;" wx:if="{{object.wholesale_price}}" class="clor7b">￥{{aitem.market_price}}</text>
+                        </view>
+                      </view>
+                    </view>
+                    <view>
+                      <image wx:if="{{object.purchase_button<=4}}" src="{{imghost+'/miniapp/images/component/0'+object.purchase_button+'.png?v=1'}}" class="imgbox1"></image>
+                      <view wx:if="{{ 5<=object.purchase_button && object.purchase_button<=8 }}" class="{{'new_item1_but ' + (object.purchase_button==5 ? 'new_item1_but1':'' )+ (object.purchase_button==7 ? 'new_item1_but2':'' )+ (object.purchase_button==8 ? 'new_item1_but3':'' )  }}">{{object.button_content}}</view>
+                    </view>
+                  </view>
+                </navigator>
+              </view>
+              <view wx:if="{{aind==1}}" class="{{'boxpad new_item1 ' + (object.product_style==2 ? ' boxsha ':'') + (object.product_style==3 ? ' aborder ':'')  + ((object.product_style==1 || object.product_style==3 )? ' bgf ':'') + (object.chamfer_of_main_drawing==2 ? ' but_radius5 ':'')}}" style="{{'margin-bottom:'+object.product_spacing+'px; '+('width:calc(100%/2 - ' + object.product_spacing/2+'px)')}}">
+                <navigator url="{{g_filter.get_url_by_type(aitem)}}" class="s1_gk_a1">
+                  <view class="topBox">
+                    <view class="imgBox">
+                      <view class="{{'container'+object.picture_scale}}" style="{{object.picture_fill==1 ? 'background-color: #fff;' : ''}}">
+                        <image mode="{{object.picture_fill==1 ? 'aspectFit' : 'aspectFill'}}" class="{{'new_item1_image images1 '}}" src="{{aitem.goods_img}}" data-errorimg="goods_array[{{aind}}].goods_img" binderror="bind_bnerr3"></image>
+                      </view>
+                      <image class="imgBox_img" wx:if="{{object.subscript_style==5}}" src="{{object.subscript_diy_style}}"></image>
+                      <image class="imgBox_img" wx:if="{{object.subscript_style<=4}}" src="{{imghost+'/miniapp/images/component/j0'+object.subscript_style +'.png?v=1'}}"></image>
+                    </view>
+                    <block wx:if="{{object.count_down}}">
+                      <view wx:if="{{aitem.residue==0}}" class="{{'new_item1_time '+(object.count_down_float ? 'item_float' : '')}}" style="justify-content: center;color: #fff;background-color:rgb(166,166,166);">
+                        <view>已售罄</view>
+                      </view>
+                      <!-- <view wx:else class="{{'new_item1_time '+(object.count_down_float ? 'item_float' : '')}}" style="{{'justify-content: center;background:'+(aitem.status ==0 ? object.scountdown_background_color : object.countdown_background_color)}}">
+                        <view>{{aitem.djs.day}}天{{aitem.djs.hou}}:{{aitem.djs.min}}:{{aitem.djs.sec}}</view>
+                      </view> -->
+                    </block>
+                  </view>
+                  <view class="ellipsis-2 new_item1_goods_name" style="{{'height:88rpx;font-size:24rpx; ' + (object.text_style==2 ? 'font-weight: bold;':'') + (object.text_align==2 ? 'text-align:center;' :'' )}}" wx:if="{{object.trade_name}}">{{aitem.goods_name}}</view>
+                  <view wx:if="{{object.seconds_num || object.remaining_inventory}}" class="new_item1_price pdlf10 clor7b" style="{{'font-size:20rpx;' + 'display:block;'+(object.text_align==2 ?'text-align:center;':'')+(object.text_style==2 ? 'font-weight: bold;':'')}}">
+                    <text wx:if="{{object.seconds_num}}">销量：<text class="clor">{{aitem.sales_sum}}</text>件</text>
+                    <!-- <text wx:if="{{object.remaining_inventory}}">还剩余<text class="clor">{{aitem.residue}}</text>件</text> -->
+                  </view>
+                  <view class="new_item1_price pdlf10" style="{{(object.text_align==2 ? 'justify-content:center;flex-direction:column;' :'' )}}">
+                    <view style="{{(object.text_style==2 ? 'font-weight: bold;':'')}}">
+                      <view style="{{(object.text_align==2 ? 'justify-content:center;' :'' ) }}">
+                        <view class="clor" style="margin-right: 5rpx;" wx:if="{{object.commodity_price}}">￥<text class="pricefs42">{{aitem.price_n}}</text><text wx:if="{{aitem.price_xs}}">.{{aitem.price_xs}}</text><text wx:if="{{aitem.prom_integral && (aitem.price_n || aitem.price_xs)}}">+</text> <text wx:if="{{aitem.prom_integral}}">{{aitem.prom_integral}}积分</text></view>
+                        <view wx:if="{{object.wholesale_price}}" class="clor7b">￥{{aitem.market_price}}</view>
+                      </view>
+                    </view>
+                    <view>
+                      <image wx:if="{{object.purchase_button<=4}}" src="{{imghost+'/miniapp/images/component/0'+object.purchase_button+'.png?v=1'}}" style="width: 60rpx;height: 60rpx;"></image>
+                      <view wx:if="{{ 5<=object.purchase_button && object.purchase_button<=8 }}" class="{{'new_item1_but ' + (object.purchase_button==5 ? 'new_item1_but1':'' )+ (object.purchase_button==7 ? 'new_item1_but2':'' )+ (object.purchase_button==8 ? 'new_item1_but3':'' )  }}">{{object.button_content}}</view>
                     </view>
+                  </view>
                 </navigator>
+              </view>
+              <view wx:if="{{aind==2}}" class="{{'boxpad new_item1 ' + (object.product_style==2 ? ' boxsha ':'') + (object.product_style==3 ? ' aborder ':'')   + ((object.product_style==1 || object.product_style==3 )? ' bgf ':'')  + (object.chamfer_of_main_drawing==2 ? ' but_radius5 ':'') }}" style="{{'margin-bottom:'+object.product_spacing+'px; '+('width:calc(100%/2 - ' + object.product_spacing/2+'px)')}}">
+                <navigator url="{{g_filter.get_url_by_type(aitem)}}" class="s1_gk_a1">
+                  <view class="topBox">
+                    <view class="imgBox">
+                      <view class="{{'container'+object.picture_scale}}" style="{{object.picture_fill==1 ? 'background-color: #fff;' : ''}}">
+                        <image mode="{{object.picture_fill==1 ? 'aspectFit' : 'aspectFill'}}" class="{{'new_item1_image images1 '}}" src="{{aitem.goods_img}}" data-errorimg="goods_array[{{aind}}].goods_img" binderror="bind_bnerr3"></image>
+                      </view>
+                      <image class="imgBox_img" wx:if="{{object.subscript_style==5}}" src="{{object.subscript_diy_style}}"></image>
+                      <image class="imgBox_img" wx:if="{{object.subscript_style<=4}}" src="{{imghost+'/miniapp/images/component/j0'+object.subscript_style +'.png?v=1'}}"></image>
+                    </view>
+                    <block wx:if="{{object.count_down}}">
+                      <view wx:if="{{aitem.residue==0}}" class="{{'new_item1_time '+(object.count_down_float ? 'item_float' : '')}}" style="justify-content: center;color: #fff;background-color:rgb(166,166,166);">
+                        <view>已售罄</view>
+                      </view>
+                      <!-- <view wx:else class="{{'new_item1_time '+(object.count_down_float ? 'item_float' : '')}}" style="{{'justify-content: center;background:'+(aitem.status ==0 ? object.scountdown_background_color : object.countdown_background_color)}}">
+                        <view>{{aitem.djs.day}}天{{aitem.djs.hou}}:{{aitem.djs.min}}:{{aitem.djs.sec}}</view>
+                      </view> -->
+                    </block>
+                  </view>
+                  <view class="ellipsis-2 new_item1_goods_name" style="{{'height:88rpx;font-size:24rpx; ' + (object.text_style==2 ? 'font-weight: bold;':'') + (object.text_align==2 ? 'text-align:center;' :'' )}}" wx:if="{{object.trade_name}}">{{aitem.goods_name}}</view>
+                  <view wx:if="{{object.seconds_num || object.remaining_inventory}}" class="new_item1_price pdlf10 clor7b" style="{{'font-size:20rpx;' + 'display:block;'+(object.text_align==2 ?'text-align:center;':'')+(object.text_style==2 ? 'font-weight: bold;':'')}}">
+                    <text wx:if="{{object.seconds_num}}">销量：<text class="clor">{{aitem.sales_sum}}</text>件</text>
+                    <!-- <text wx:if="{{object.remaining_inventory}}">还剩余<text class="clor">{{aitem.residue}}</text>件</text> -->
+                  </view>
+                  <view class="new_item1_price pdlf10" style="{{(object.text_align==2 ? 'justify-content:center;flex-direction:column;' :'' )}}">
+                    <view style="{{(object.text_style==2 ? 'font-weight: bold;':'')}}">
+                      <view style="{{(object.text_align==2 ? 'justify-content:center;' :'' ) }}">
+                        <view class="clor" style="margin-right: 5rpx;" wx:if="{{object.commodity_price}}">￥<text class="pricefs42">{{aitem.price_n}}</text><text wx:if="{{aitem.price_xs}}">.{{aitem.price_xs}}</text><text wx:if="{{aitem.prom_integral && (aitem.price_n || aitem.price_xs)}}">+</text> <text wx:if="{{aitem.prom_integral}}">{{aitem.prom_integral}}积分</text></view>
+                        <view wx:if="{{object.wholesale_price}}" class="clor7b">￥{{aitem.market_price}}</view>
+                      </view>
+                    </view>
+                    <view>
+                      <image wx:if="{{object.purchase_button<=4}}" src="{{imghost+'/miniapp/images/component/0'+object.purchase_button+'.png?v=1'}}" style="width: 60rpx;height: 60rpx;"></image>
+                      <view wx:if="{{ 5<=object.purchase_button && object.purchase_button<=8 }}" class="{{'new_item1_but ' + (object.purchase_button==5 ? 'new_item1_but1':'' )+ (object.purchase_button==7 ? 'new_item1_but2':'' )+ (object.purchase_button==8 ? 'new_item1_but3':'' )  }}">{{object.button_content}}</view>
+                    </view>
+                  </view>
+                </navigator>
+              </view>
+            </block>
+          </block>
+        </view>
+      </block>
+      <!-- 横向滑动 2个-->
+      <block wx:if="{{object.style==7}}">
+        <!-- <swiper indicator-dots circular> -->
+        <swiper indicator-dots style="{{'padding-left:'+object.page_margins+'px;padding-right:'+object.page_margins+'px;'+(swiperHeight ? ('height:'+swiperHeight+';'):'' )}}" class="{{' new_item1_box '+ ((object.product_style==1 || object.product_style==3 )? ' bgf ':'')}}">
+          <swiper-item wx:for="{{goods_array}}" class="flex2" style="padding: 5rpx;">
+            <view wx:for="{{item}}" wx:for-item="aitem" wx:for-index="aind" class="{{'boxpad swiper_h new_item1 ' + (object.product_style==2 ? ' boxsha ':'') + (object.product_style==3 ? ' aborder ':'')  + ((object.product_style==1 || object.product_style==3 )? ' bgf ':'') + (object.chamfer_of_main_drawing==2 ? ' but_radius5 ':'') }}" style="{{'margin-bottom:'+object.product_spacing+'px; '+('width:calc(100%/2 - ' + object.product_spacing/2+'px)')}}">
+              <navigator url="{{g_filter.get_url_by_type(aitem)}}" class="s1_gk_a1">
+                <view class="imgBox">
+                  <!-- <image  mode="{{object.picture_fill==1 ? 'aspectFill' : 'scaleToFill'}}" class="{{'new_item1_image '+ 'aspect_ratio'+object.picture_scale}}" style="{{'width:'+img_width+';height:'+img_height}}" src="{{imghost+aitem.original_img}}" data-errorimg="goods_array[{{aind}}].goods_img" binderror="bind_bnerr3"></image> -->
+                  <view class="{{'container'+object.picture_scale}}" style="{{object.picture_fill==1 ? 'background-color: #fff;' : ''}}">
+                    <!-- <image  mode="{{object.picture_fill==1 ? 'aspectFit' : 'aspectFill'}}" class="{{'new_item1_image images1'}}"  src="{{imghost+aitem.original_img}}" data-errorimg="goods_array[{{aind}}].goods_img" binderror="bind_bnerr3"></image> -->
+                    <image mode="{{object.picture_fill==1 ? 'aspectFit' : 'aspectFill'}}" class="{{'new_item1_image images1 '  }}" src="{{imghost+aitem.original_img}}" data-errorimg="goods_array[{{aind}}].goods_img" binderror="bind_bnerr3"></image>
+                  </view>
+
+                  <image class="imgBox_img" wx:if="{{object.subscript_style==5}}" src="{{object.subscript_diy_style}}"></image>
+                  <image class="imgBox_img" wx:if="{{object.subscript_style<=4}}" src="{{imghost+'/miniapp/images/component/j0'+object.subscript_style +'.png'}}"></image>
+                </view>
+                <view class="new_item1_time" wx:if="{{object.count_down}}" style="{{'justify-content: center;background:'+(aitem.status ==0 ? object.scountdown_background_color : object.countdown_background_color)}}">
+                  <!-- <image src="{{imghost+'/miniapp/images/component/seckill.png'}}"></image> -->
+                  <!-- <view style="text-align: center;">
+                      <view>距结束时间</view> -->
+                  <view>{{aitem.djs.day}}天{{aitem.djs.hou}}:{{aitem.djs.min}}:{{aitem.djs.sec}}</view>
+                  <!-- </view> -->
+                </view>
+                <view class="ellipsis-2 new_item1_goods_name" style="{{(object.text_style==2 ? 'font-weight: bold;':'') + (object.text_align==2 ? 'text-align:center;' :'' )}}" wx:if="{{object.trade_name}}">{{aitem.goods_name}}</view>
+                <view wx:if="{{object.seconds_num || object.remaining_inventory}}" class="new_item1_price" style="{{'display:block;color: rgb(56, 56, 56); '+(object.text_align==2 ?'text-align:center;':'')+(object.text_style==2 ? 'font-weight: bold;':'')}}">
+                  <text wx:if="{{object.seconds_num}}">已秒<text class="clor">{{aitem.sales_sum}}</text>件</text>
+                  <text wx:if="{{object.remaining_inventory}}">还剩余<text class="clor">{{aitem.residue}}</text>件</text>
+                </view>
+                <view class="new_item1_price" style="{{(object.text_align==2 ? 'justify-content:center;flex-direction:column;' :'' )}}">
+                  <view style="{{(object.text_style==2 ? 'font-weight: bold;':'')}}">
+                    <view style="{{'font-size: 28rpx; ' +(object.text_align==2 ? 'justify-content:center;' :'' ) }}">
+                      <view class="clor" style="margin-right: 5rpx;" wx:if="{{object.commodity_price}}">￥<text style="font-size:42rpx;">{{aitem.price}}</text></view>
+                      <view wx:if="{{object.wholesale_price}}">￥{{aitem.market_price}}</view>
+                    </view>
+                  </view>
+                  <view>
+                    <image wx:if="{{object.purchase_button<=4}}" src="{{imghost+'/miniapp/images/component/0'+object.purchase_button+'.png'}}" style="width: 100rpx;height: 100rpx;"></image>
+                    <view wx:if="{{ 5<=object.purchase_button && object.purchase_button<=8 }}" class="{{'new_item1_but ' + (object.purchase_button==5 ? 'new_item1_but1':'' )+ (object.purchase_button==7 ? 'new_item1_but2':'' )+ (object.purchase_button==8 ? 'new_item1_but3':'' )  }}">{{object.button_content}}</view>
+                  </view>
+                </view>
+              </navigator>
+            </view>
+          </swiper-item>
+        </swiper>
+        <!-- </swiper> -->
+
+      </block>
+      <!-- 横向滑动 3个-->
+      <block wx:if="{{object.style==6}}">
+        <!-- <swiper indicator-dots circular> -->
+        <swiper indicator-dots style="{{'padding-left:'+object.page_margins+'px;padding-right:'+object.page_margins+'px;'+(swiperHeight ? ('height:'+swiperHeight+';'):'' )}}" class="{{' new_item1_box '+ ((object.product_style==1 || object.product_style==3 )? ' bgf ':'')}}">
+          <swiper-item wx:for="{{goods_array}}"  class="flex2" style="padding: 5rpx;">
+            <view  wx:for="{{item}}" wx:for-item="aitem" wx:for-index="aind" class="{{'boxpad swiper_h new_item1 ' + (object.product_style==2 ? ' boxsha ':'') + (object.product_style==3 ? ' aborder ':'')   + ((object.product_style==1 || object.product_style==3 )? ' bgf ':'') + (object.chamfer_of_main_drawing==2 ? ' but_radius5 ':'') }}" style="{{'margin-bottom:'+object.product_spacing+'px; '+('width:calc(100%/3 - ' + (object.product_spacing*2)/3+'px)')}}">
+              <navigator url="{{g_filter.get_url_by_type(aitem)}}" class="s1_gk_a1">
+                <view class="topBox">
+                  <view class="imgBox">
+                    <view class="{{'container'+object.picture_scale}}" style="{{object.picture_fill==1 ? 'background-color: #fff;' : ''}}">
+                      <image mode="{{object.picture_fill==1 ? 'aspectFit' : 'aspectFill'}}" class="{{'new_item1_image images1 '}}" src="{{aitem.goods_img}}" data-errorimg="goods_array[{{index}}][{{aind}}].goods_img" binderror="bind_bnerr3"></image>
+                    </view>
+                    <image class="imgBox_img" wx:if="{{object.subscript_style==5}}" src="{{object.subscript_diy_style}}"></image>
+                    <image class="imgBox_img" wx:if="{{object.subscript_style<=4}}" src="{{imghost+'/miniapp/images/component/j0'+object.subscript_style +'.png?v=1'}}"></image>
+                  </view>
+                  <block wx:if="{{object.count_down}}">
+                    <view wx:if="{{aitem.residue==0}}" class="{{'new_item1_time '+(object.count_down_float ? 'item_float' : '')}}" style="justify-content: center;color: #fff;background-color:rgb(166,166,166);">
+                      <view>已售罄</view>
+                    </view>
+                    <!-- <view wx:else class="{{'new_item1_time '+(object.count_down_float ? 'item_float' : '')}}" style="{{'justify-content: center;background:'+(aitem.status ==0 ? object.scountdown_background_color : object.countdown_background_color)}}">
+                      <view>{{aitem.djs.day}}天{{aitem.djs.hou}}:{{aitem.djs.min}}:{{aitem.djs.sec}}</view>
+                    </view> -->
+                  </block>
+                </view>
+                <view class="ellipsis-2 new_item1_goods_name " style="{{'height:88rpx;font-size:24rpx;' + (object.text_style==2 ? 'font-weight: bold;':'') + (object.text_align==2 ? 'text-align:center;' :'' )}}" wx:if="{{object.trade_name}}">{{aitem.goods_name}}</view>
+                <view wx:if="{{object.seconds_num || object.remaining_inventory}}" class="new_item1_price clor7b" style="{{'display:block;font-size:20rpx; '+(object.text_align==2 ?'text-align:center;':'')+(object.text_style==2 ? 'font-weight: bold;':'')}}">
+                  <text wx:if="{{object.seconds_num}}">销量：<text class="clor">{{aitem.sales_sum}}</text>件</text>
+                  <!-- <text wx:if="{{object.remaining_inventory}}">剩<text class="clor">{{aitem.residue}}</text>件</text> -->
+                </view>
+                <view class="new_item1_price clor7b" style="{{(object.text_align==2 ? 'justify-content:center;flex-direction:column;' :'' )}}">
+                  <view style="{{(object.text_style==2 ? 'font-weight: bold;':'')}}">
+                    <view style="{{'font-size: 20rpx; ' +(object.text_align==2 ? 'justify-content:center;' :'' ) }}">
+                      <view class="clor" style="margin-right: 5rpx;" wx:if="{{object.commodity_price}}">￥<text class="pricefs38">{{aitem.price_n}}</text><text wx:if="{{aitem.price_xs}}">.{{aitem.price_xs}}</text><text wx:if="{{aitem.prom_integral && (aitem.price_n || aitem.price_xs)}}">+</text> <text wx:if="{{aitem.prom_integral}}">{{aitem.prom_integral}}积分</text></view>
+                      <view wx:if="{{object.wholesale_price}}">￥{{aitem.market_price}}</view>
+                    </view>
+                  </view>
+                  <view>
+                    <image wx:if="{{object.purchase_button<=4}}" src="{{imghost+'/miniapp/images/component/0'+object.purchase_button+'.png?v=1'}}" style="width: 50rpx;height: 50rpx;"></image>
+                    <!-- <view style="width: 90rpx;height: 50rpx;line-height: 50rpx;" wx:if="{{ 5<=object.purchase_button && object.purchase_button<=8 }}" class="{{'new_item1_but ' + (object.purchase_button==5 ? 'new_item1_but1':'' )+ (object.purchase_button==7 ? 'new_item1_but2':'' )+ (object.purchase_button==8 ? 'new_item1_but3':'' )  }}">{{object.button_content}}</view> -->
+                  </view>
+                </view>
+              </navigator>
+            </view>
+          </swiper-item>
+        </swiper>
+        <!-- </swiper> -->
+
+      </block>
+
+      <block wx:if="{{object.style!=6}}">
+        <block wx:if="{{classstyle_id=='1' }}">
+          <view class="button-wrapper" wx:if="{{goods_btn.length!=0 }}" style="border: none">
+            <view  loading="{{loading}}" disabled="{{disabled}}" bindtap="setLoading" style="background-color: rgba(0,0,0,0);border:none;text-align: center;">
+             <image style="width:30rpx;height:30rpx;" src="{{imghost+'/miniapp/images/component/loading.png'}}"></image> {{loadText}}
             </view>
-            <view style="height:20rpx"></view>
+          </view>
         </block>
+        <block wx:if="{{classstyle_id!='1' }}">
+          <view class="button-wrapper" wx:if="{{object.goodscount * page <total }}" style="border: none">
+            <view  loading="{{loading}}" disabled="{{disabled}}" bindtap="setLoading" style="background-color: rgba(0,0,0,0);border:none;text-align: center;">
+              <image style="width:30rpx;height:30rpx;"  src="{{imghost+'/miniapp/images/component/loading.png'}}"></image> {{loadText}}
+            </view>
+          </view>
+          <!-- <view class="fs28" wx:if="{{object.goodscount * page >=total }}" style="color:{{object.nomore_color}};text-align: center; padding: 20rpx 0">&#45;&#45; 没有更多 &#45;&#45; </view>-->
+        </block>
+      </block>
+    </block>
+    <view class="nodata-title" wx:elif="{{is_get}}">暂无数据</view>
+    <view class="flex jcc loader" wx:else>
+      <image style="width: 40rpx; height: 40rpx; " src="{{url}}/miniapp/images/loader.gif"></image>
     </view>
-    <!--2个一列-->
-    <block wx:if="{{object.column==2}}">
+  </block>
+  <!-- 旧版 -->
+  <block wx:else>
+    <view style="background-color: {{bg_color}};" wx:if="{{goods_array.length > 0  }}">
+      <!--1个列表的时候-->
+      <view class="zs_goods_wai" wx:if='{{object.column==1}}'>
         <block wx:for="{{goods_array}}">
+          <view class='zs_goods {{g_filter.get_border_type(object.big_order_type)}}'>
             <navigator url="{{g_filter.get_url_by_type(item)}}" class="s1_gk_a1">
-                <view class="zs_goods_wai_ban {{g_filter.get_border_type(object.big_order_type)}}">
-                    <view class="zs_goods_ban">
-                        <view class='zs_goods_2l'>
-                            <view class='zs_top_2l rel'>
-
-                                <block wx:if="{{object.big_order_type==3}}">
-                                    <view style="position: relative; width: 100%; height: 100%">
-                                        <image class='zs_t_img_2l' src="{{object.pic_back}}" data-errorimg="object.pic_back" lazy-load="true" binderror="bind_bnerr3"></image>
-                                        <image class="n_box" style="top: {{object.top}}%;left:{{object.left}}%;width: {{object.width}}%;height: {{object.width}}%" src="{{item.goods_img}}" data-errorimg="goods_array[{{index}}].goods_img" lazy-load="true" binderror="bind_bnerr3"></image>
-                                    </view>
-                                </block>
-                                <block wx:else>
-                                    <image class='zs_t_img_2l' src="{{item.goods_img}}" data-errorimg="goods_array[{{index}}].goods_img" lazy-load="true" binderror="bind_bnerr3"></image>
-                                </block>
-
-                                <block wx:if="{{object.goodicon==3}}">
-                                    <image style="width: {{object.icon_width*1.2}}rpx;height: {{object.icon_width*1.2}}rpx"
-                                            class='{{g_filter.get_class(object.column,object.position)}}' 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 style="width: {{object.icon_width*1.2}}rpx;height: {{object.icon_width*1.2}}rpx"
-                                           class='{{g_filter.get_class(object.column,object.position)}}' wx:if="{{object.styleicon==1}}" src='{{imghost}}/miniapp/images/Recommend.png'></image>
-                                    <image style="width: {{object.icon_width*1.2}}rpx;height: {{object.icon_width*1.2}}rpx"
-                                           class='{{g_filter.get_class(object.column,object.position)}}' wx:if="{{object.styleicon==2 }}" src='{{imghost}}/miniapp/images/hot.png'></image>
-                                    <image style="width: {{object.icon_width*1.2}}rpx;height: {{object.icon_width*1.2}}rpx"
-                                            class='{{g_filter.get_class(object.column,object.position)}}' wx:if="{{object.styleicon==3}}" src='{{imghost}}/miniapp/images/new.png'></image>
-                                    <image style="width: {{object.icon_width*1.2}}rpx;height: {{object.icon_width*1.2}}rpx"
-                                            class='{{g_filter.get_class(object.column,object.position)}}' wx:if="{{object.styleicon==4 }}" src='{{imghost}}/miniapp/images/Promotion.png'></image>
-                                </block>
+              <!-- <navigator url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}&prom_id={{item.prom_id}}&&prom_type={{item.prom_type}}" class="s1_gk_a1"> -->
+              <view class='zs_top rel'>
+
+                <block wx:if="{{object.big_order_type==3}}">
+                  <view style="position: relative; width: 100%; height: 100%">
+                    <image class='zs_t_img' src="{{object.pic_back}}" data-errorimg="object.pic_back" lazy-load="true" binderror="bind_bnerr3"></image>
+                    <image class="n_box" style="top: {{object.top}}%;left:{{object.left}}%;width: {{object.width}}%;height: {{object.width}}%" src="{{item.goods_img}}" data-errorimg="goods_array[{{aind}}].goods_img" lazy-load="true" binderror="bind_bnerr3"></image>
+                  </view>
+                </block>
+                <block wx:else>
+                  <image class='zs_t_img' src="{{item.goods_img}}" data-errorimg="goods_array[{{aind}}].goods_img" binderror="bind_bnerr3" lazy-load="true"></image>
+                </block>
+
+                <block wx:if="{{object.goodicon==3}}">
+                  <image style="width: {{object.icon_width*1.2}}rpx;height: {{object.icon_width*1.2}}rpx" class='{{g_filter.get_class(object.column,object.position)}}' src='{{object.customicon}}'></image>
+                </block>
+                <block wx:if="{{object.goodicon==1}}">
+                  <image style="width: {{object.icon_width*1.2}}rpx;height: {{object.icon_width*1.2}}rpx" class='{{g_filter.get_class(object.column,object.position)}}' src=''></image>
+                </block>
+                <block wx:if="{{object.goodicon==2}}">
+                  <image style="width: {{object.icon_width*1.2}}rpx;height: {{object.icon_width*1.2}}rpx" class='{{g_filter.get_class(object.column,object.position)}}' wx:if="{{object.styleicon==1}}" src='{{imghost}}/miniapp/images/Recommend.png'></image>
+                  <image style="width: {{object.icon_width*1.2}}rpx;height: {{object.icon_width*1.2}}rpx" class='{{g_filter.get_class(object.column,object.position)}}' wx:if="{{object.styleicon==2}}" src='{{imghost}}/miniapp/images/hot.png'></image>
+                  <image style="width: {{object.icon_width*1.2}}rpx;height: {{object.icon_width*1.2}}rpx" class='{{g_filter.get_class(object.column,object.position)}}' wx:if="{{object.styleicon==3}}" src='{{imghost}}/miniapp/images/new.png'></image>
+                  <image style="width: {{object.icon_width*1.2}}rpx;height: {{object.icon_width*1.2}}rpx" 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}}">
+                  <block wx:if="{{item.prom_price || item.prom_integral}}">
+                    <view class='wz_red'>
+                      <text wx:if="{{item.prom_integral}}">{{item.prom_integral}}积分</text>
+                      <text wx:if="{{item.prom_integral && item.prom_price}}">+</text>
+                      <text wx:if="{{item.prom_price}}">￥{{item.prom_price}}</text>
+                    </view>
+                    <view wx:if="{{is_retail_price}}" class='del ~no_line_x'>￥{{item.market_price}}</view>
+                  </block>
+                  <block wx:else>
+
+                    <block wx:if="{{g_filter.is_has_rank(rank_switch,item)}}">
+                      <!-- 当会员是等级卡的时候 -->
+                      <block wx:if="{{card_field}}">
+                        <!-- 等级价>0 -->
+                        <block wx:if="{{item[card_field]>0}}">
+                          <view class="money flex ai_and">
+                            <!-- 办卡价 -->
+                            <view class="flex xc-wc ai_and">
+                              <view class="fs24 wz_red">￥</view>
+                              <view class="fs35 wz_red">{{filter.toFix(item[card_field],2)}}</view>
+                              <view class="card_bg ellipsis-1">
+                                <image src="{{url}}/miniapp/images/plus/dj_icon.png"></image>
+                                <text class="card_name">{{card_name}}</text>
+                              </view>
+                            </view>
+                          </view>
+                          <view class="flex" style="line-height: 28rpx;">
+                            <!-- 原价 -->
+                            <view wx:if="{{is_retail_price}}" class="price flex xc-ash line_th ~no_line_x">
+                              <view class="fs22">￥</view>
+                              <view class="fs22">{{item.market_price}}</view>
+                            </view>
+                          </view>
+                        </block>
+                        <block wx:else>
+                          <view class="money flex">
+                            <!-- 办卡价 -->
+                            <view class="flex xc-wc">
+                              <view class="fs24 wz_red">￥</view>
+                              <view class="fs35 wz_red">{{filter.toFix(item.shop_price,2)}}</view>
+                            </view>
+                          </view>
+                          <view class="flex" style="line-height: 28rpx;">
+                            <!-- 原价 -->
+                            <view wx:if="{{is_retail_price}}" class="price flex xc-ash line_th ~no_line_x">
+                              <view class="fs22">￥</view>
+                              <view class="fs22">{{item.market_price}}</view>
+                            </view>
+                          </view>
+                        </block>
+                      </block>
+                      <block wx:else>
+                        <!-- 如果商品有设置等级价大于0的 -->
+                        <block wx:if="{{g_filter.get_card_price(item,card_list,0) && is_no_plus}}">
+                          <view class="money flex">
+                            <!-- 办卡价 -->
+                            <view class="flex xc-wc">
+                              <view class="fs24 wz_red">￥</view>
+                              <view class="fs35 wz_red">{{filter.toFix(item.shop_price,2)}}</view>
+                            </view>
+                            <!-- 原价 -->
+                            <view wx:if="{{is_retail_price}}" class="price flex xc-ash line_th ~no_line_x">
+                              <view class="fs22">￥</view>
+                              <view class="fs22">{{item.market_price}}</view>
                             </view>
-                            <view class='zs_center_2l'>
-                                <view class='zs_wz1_2l ellipsis-2' wx:if="{{object.goodstit}}">{{item.goods_name}}</view>
-                                <view class='zs_wz2_2l' wx:if="{{object.goodsprice}}">
-
-                                    <block wx:if="{{item.prom_price || item.prom_integral}}">
-                                        <view class='wz_red'>
-                                            <text wx:if="{{item.prom_integral}}">{{item.prom_integral}}积分</text>
-                                            <text wx:if="{{item.prom_integral && item.prom_price}}">+</text>
-                                            <text wx:if="{{item.prom_price}}">￥{{item.prom_price}}</text>
-                                        </view>
-                                        <view  wx:if="{{is_retail_price}}" class='del ~no_line_x'>￥{{item.market_price}}</view>
-                                    </block>
-                                    <block wx:else>
-                                        <block wx:if="{{g_filter.is_has_rank(rank_switch,item)}}">
-                                            <!-- 当会员是等级卡的时候 -->
-                                            <block wx:if="{{card_field}}">
-                                                <!-- 等级价>0 -->
-                                                <block wx:if="{{item[card_field]>0}}">
-                                                    <view class="money flex">
-                                                        <!-- 办卡价 -->
-                                                        <view class="flex xc-wc ai_and">
-                                                            <view class="fs24 wz_red">￥</view>
-                                                            <view class="fs35 wz_red">{{filter.toFix(item[card_field],2)}}</view>
-                                                            <view class="card_bg ellipsis-1">
-                                                                <image src="{{url}}/miniapp/images/plus/dj_icon.png"></image>
-                                                                <view class="card_name">{{card_name}}</view>
-                                                            </view>
-                                                        </view>
-                                                    </view>
-                                                    <view class="flex" style="line-height: 28rpx;">
-                                                        <!-- 原价 -->
-                                                        <view  wx:if="{{is_retail_price}}" class="price flex xc-ash line_th ~no_line_x">
-                                                            <view class="fs22">￥</view>
-                                                            <view class="fs22">{{item.market_price}}</view>
-                                                        </view>
-                                                    </view>
-                                                </block>
-                                                <block wx:else>
-                                                    <view class="money flex">
-                                                        <!-- 办卡价 -->
-                                                        <view class="flex xc-wc">
-                                                            <view class="fs24 wz_red">￥</view>
-                                                            <view class="fs35 wz_red">{{filter.toFix(item.shop_price,2)}}</view>
-                                                        </view>
-                                                    </view>
-                                                    <view class="flex" style="line-height: 28rpx;">
-                                                        <!-- 原价 -->
-                                                        <view  wx:if="{{is_retail_price}}" class="price flex xc-ash line_th ~no_line_x">
-                                                            <view class="fs22">￥</view>
-                                                            <view class="fs22">{{item.market_price}}</view>
-                                                        </view>
-                                                    </view>
-                                                </block>
-                                            </block>
-                                            <block wx:else>
-                                                <!-- 如果商品有设置等级价大于0的 -->
-                                                <block wx:if="{{g_filter.get_card_price(item,card_list,0) && is_no_plus}}">
-                                                    <view class="money flex">
-                                                        <!-- 办卡价 -->
-                                                        <view class="flex xc-wc">
-                                                            <view class="fs24 wz_red">￥</view>
-                                                            <view class="fs35 wz_red">{{filter.toFix(item.shop_price,2)}}</view>
-                                                        </view>
-                                                        <!-- 原价 -->
-                                                        <view  wx:if="{{is_retail_price}}" class="price flex xc-ash line_th ~no_line_x">
-                                                            <view class="fs22">￥</view>
-                                                            <view class="fs22">{{item.market_price}}</view>
-                                                        </view>
-
-                                                    </view>
-                                                    <view class="flex" style="line-height: 28rpx;">
-                                                        <!-- 等级价 -->
-                                                        <view class="price flex ai_and">
-                                                            <view class="fs22">￥</view>
-                                                            <view class="fs28">{{filter.toFix(g_filter.get_card_price(item,card_list,0),2)}}</view>
-                                                            <view class="card_bg ellipsis-1">
-                                                                <image src="{{url}}/miniapp/images/plus/dj_icon.png"></image>
-                                                                <text class="card_name">{{g_filter.get_card_price(item,card_list,1)}}</text>
-                                                            </view>
-                                                        </view>
-                                                    </view>
-                                                </block>
-                                                <block wx:else>
-                                                    <view class="money flex">
-                                                        <!-- 办卡价 -->
-                                                        <view class="flex xc-wc">
-                                                            <view class="fs24 wz_red">￥</view>
-                                                            <view class="fs35 wz_red">{{filter.toFix(item.shop_price,2)}}</view>
-                                                        </view>
-                                                    </view>
-                                                    <view class="flex" style="line-height: 28rpx;">
-                                                        <!-- 原价 -->
-                                                        <view  wx:if="{{is_retail_price}}" class="price flex xc-ash line_th ~no_line_x">
-                                                            <view class="fs22">￥</view>
-                                                            <view class="fs22">{{item.market_price}}</view>
-                                                        </view>
-                                                    </view>
-                                                </block>
-                                            </block>
-                                        </block>
-                                        <block wx:else>
-                                            <view class='wz_red'>￥{{item.shop_price}}</view>
-                                            <view  wx:if="{{is_retail_price}}" class='del ~no_line_x'>￥{{item.market_price}}</view>
-                                        </block>
-                                    </block>
-                                </view>
-                                <!-- <view class='zs_wz5_2l' wx:if="{{object.goodsnum}}">销量：{{item.sales_sum}}件</view> -->
-                                <view class="flex jc-sb ai-center">
-                                	<view class='zs_wz5_x' wx:if="{{object.goodsnum}}">销量：{{item.sales_sum}}件</view>
-                                	
-                                	<!-- 购物车图标 -->
-                                	<view class="icon-box" wx:if="{{object.goodcaricon != 1}}">
-                                		<!-- 系统图标 -->
-                                		<block wx:if="{{object.goodcaricon == 2}}">
-                                			<image class="icon" src="{{url + '/miniapp/images/cart/group_goods_car_1.png'}}" wx:if="{{object.stylecaricon == 1}}" mode="widthFix"></image>
-                                			<image class="icon" src="{{url + '/miniapp/images/cart/group_goods_car_2.png'}}" wx:if="{{object.stylecaricon == 2}}" mode="widthFix"></image>
-                                			<text class="icon-text" wx:if="{{object.stylecaricon == 3}}">马上抢</text>
-                                			<text class="icon-text" wx:if="{{object.stylecaricon == 4}}">立即购买</text>
-                                		</block>
-                                		<!-- 自定义图标 -->
-                                		<block wx:if="{{object.goodcaricon == 3}}">
-                                			<image class="icon icon2" src="{{object.customcaricon}}" mode="widthFix"></image>
-                                		</block>
-                                	</view>
-                                </view>
-																
-																<view style="height: 10rpx;"></view>
+                          </view>
+                          <view class="flex" style="line-height: 28rpx;">
+                            <!-- 等级价 -->
+                            <view class="price flex ai_and">
+                              <view class="fs22">￥</view>
+                              <view class="fs28">{{filter.toFix(g_filter.get_card_price(item,card_list,0),2)}}</view>
+                              <view class="card_bg ellipsis-1">
+                                <image src="{{url}}/miniapp/images/plus/dj_icon.png"></image>
+                                <text class="card_name">{{g_filter.get_card_price(item,card_list,1)}}</text>
+                              </view>
                             </view>
+                          </view>
+                        </block>
+                        <block wx:else>
+                          <view class="money flex">
+                            <!-- 办卡价 -->
+                            <view class="flex xc-wc">
+                              <view class="fs24 wz_red">￥</view>
+                              <view class="fs35 wz_red">{{filter.toFix(item.shop_price,2)}}</view>
+                            </view>
+                          </view>
+                          <view class="flex" style="line-height: 28rpx;">
+                            <!-- 原价 -->
+                            <view wx:if="{{is_retail_price}}" class="price flex xc-ash line_th ~no_line_x">
+                              <view class="fs22">￥</view>
+                              <view class="fs22">{{item.market_price}}</view>
+                            </view>
+                          </view>
+                        </block>
+                      </block>
+                    </block>
+
+                    <block wx:else>
+                      <view class='wz_red'>￥{{item.shop_price}}</view>
+                      <view wx:if="{{is_retail_price}}" class='del ~no_line_x'>￥{{item.market_price}}</view>
+                    </block>
+
+                  </block>
+
+                </view>
+                <!-- <view class='zs_wz5' wx:if="{{object.goodsnum}}">销量：{{item.sales_sum}}件</view> -->
+                <view class="flex jc-sb ai-center">
+                  <view class='zs_wz5_x' wx:if="{{object.goodsnum}}">销量：{{item.sales_sum}}件</view>
+
+                  <!-- 购物车图标 -->
+                  <view class="icon-box" wx:if="{{object.goodcaricon != 1}}">
+                    <!-- 系统图标 -->
+                    <block wx:if="{{object.goodcaricon == 2}}">
+                      <image class="icon" src="{{url + '/miniapp/images/cart/group_goods_car_1.png'}}" wx:if="{{object.stylecaricon == 1}}" mode="widthFix"></image>
+                      <image class="icon" src="{{url + '/miniapp/images/cart/group_goods_car_2.png'}}" wx:if="{{object.stylecaricon == 2}}" mode="widthFix"></image>
+                      <text class="icon-text" wx:if="{{object.stylecaricon == 3}}">马上抢</text>
+                      <text class="icon-text" wx:if="{{object.stylecaricon == 4}}">立即购买</text>
+                    </block>
+                    <!-- 自定义图标 -->
+                    <block wx:if="{{object.goodcaricon == 3}}">
+                      <image class="icon icon2" src="{{object.customcaricon}}" mode="widthFix"></image>
+                    </block>
+                  </view>
+                </view>
+                <view style="height: 10rpx;"></view>
+              </view>
+            </navigator>
+          </view>
+          <view style="height:20rpx"></view>
+        </block>
+
+      </view>
+      <!--2个一列-->
+      <block wx:if="{{object.column==2}}">
+        <block wx:for="{{goods_array}}">
+          <navigator url="{{g_filter.get_url_by_type(item)}}" class="s1_gk_a1">
+            <view class="zs_goods_wai_ban {{g_filter.get_border_type(object.big_order_type)}}">
+              <view class="zs_goods_ban">
+                <view class='zs_goods_2l'>
+                  <view class='zs_top_2l rel'>
+
+                    <block wx:if="{{object.big_order_type==3}}">
+                      <view style="position: relative; width: 100%; height: 100%">
+                        <image class='zs_t_img_2l' src="{{object.pic_back}}" data-errorimg="object.pic_back" lazy-load="true" binderror="bind_bnerr3"></image>
+                        <image class="n_box" style="top: {{object.top}}%;left:{{object.left}}%;width: {{object.width}}%;height: {{object.width}}%" src="{{item.goods_img}}" data-errorimg="goods_array[{{aind}}].goods_img" lazy-load="true" binderror="bind_bnerr3"></image>
+                      </view>
+                    </block>
+                    <block wx:else>
+                      <image class='zs_t_img_2l' src="{{item.goods_img}}" data-errorimg="goods_array[{{aind}}].goods_img" lazy-load="true" binderror="bind_bnerr3"></image>
+                    </block>
+
+                    <block wx:if="{{object.goodicon==3}}">
+                      <image style="width: {{object.icon_width*1.2}}rpx;height: {{object.icon_width*1.2}}rpx" class='{{g_filter.get_class(object.column,object.position)}}' 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 style="width: {{object.icon_width*1.2}}rpx;height: {{object.icon_width*1.2}}rpx" class='{{g_filter.get_class(object.column,object.position)}}' wx:if="{{object.styleicon==1}}" src='{{imghost}}/miniapp/images/Recommend.png'></image>
+                      <image style="width: {{object.icon_width*1.2}}rpx;height: {{object.icon_width*1.2}}rpx" class='{{g_filter.get_class(object.column,object.position)}}' wx:if="{{object.styleicon==2 }}" src='{{imghost}}/miniapp/images/hot.png'></image>
+                      <image style="width: {{object.icon_width*1.2}}rpx;height: {{object.icon_width*1.2}}rpx" class='{{g_filter.get_class(object.column,object.position)}}' wx:if="{{object.styleicon==3}}" src='{{imghost}}/miniapp/images/new.png'></image>
+                      <image style="width: {{object.icon_width*1.2}}rpx;height: {{object.icon_width*1.2}}rpx" 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_2l'>
+                    <view class='zs_wz1_2l ellipsis-2' wx:if="{{object.goodstit}}">{{item.goods_name}}</view>
+                    <view class='zs_wz2_2l' wx:if="{{object.goodsprice}}">
+
+                      <block wx:if="{{item.prom_price || item.prom_integral}}">
+                        <view class='wz_red'>
+                          <text wx:if="{{item.prom_integral}}">{{item.prom_integral}}积分</text>
+                          <text wx:if="{{item.prom_integral && item.prom_price}}">+</text>
+                          <text wx:if="{{item.prom_price}}">￥{{item.prom_price}}</text>
                         </view>
+                        <view wx:if="{{is_retail_price}}" class='del ~no_line_x'>￥{{item.market_price}}</view>
+                      </block>
+                      <block wx:else>
+                        <block wx:if="{{g_filter.is_has_rank(rank_switch,item)}}">
+                          <!-- 当会员是等级卡的时候 -->
+                          <block wx:if="{{card_field}}">
+                            <!-- 等级价>0 -->
+                            <block wx:if="{{item[card_field]>0}}">
+                              <view class="money flex">
+                                <!-- 办卡价 -->
+                                <view class="flex xc-wc ai_and">
+                                  <view class="fs24 wz_red">￥</view>
+                                  <view class="fs35 wz_red">{{filter.toFix(item[card_field],2)}}</view>
+                                  <view class="card_bg ellipsis-1">
+                                    <image src="{{url}}/miniapp/images/plus/dj_icon.png"></image>
+                                    <view class="card_name">{{card_name}}</view>
+                                  </view>
+                                </view>
+                              </view>
+                              <view class="flex" style="line-height: 28rpx;">
+                                <!-- 原价 -->
+                                <view wx:if="{{is_retail_price}}" class="price flex xc-ash line_th ~no_line_x">
+                                  <view class="fs22">￥</view>
+                                  <view class="fs22">{{item.market_price}}</view>
+                                </view>
+                              </view>
+                            </block>
+                            <block wx:else>
+                              <view class="money flex">
+                                <!-- 办卡价 -->
+                                <view class="flex xc-wc">
+                                  <view class="fs24 wz_red">￥</view>
+                                  <view class="fs35 wz_red">{{filter.toFix(item.shop_price,2)}}</view>
+                                </view>
+                              </view>
+                              <view class="flex" style="line-height: 28rpx;">
+                                <!-- 原价 -->
+                                <view wx:if="{{is_retail_price}}" class="price flex xc-ash line_th ~no_line_x">
+                                  <view class="fs22">￥</view>
+                                  <view class="fs22">{{item.market_price}}</view>
+                                </view>
+                              </view>
+                            </block>
+                          </block>
+                          <block wx:else>
+                            <!-- 如果商品有设置等级价大于0的 -->
+                            <block wx:if="{{g_filter.get_card_price(item,card_list,0) && is_no_plus}}">
+                              <view class="money flex">
+                                <!-- 办卡价 -->
+                                <view class="flex xc-wc">
+                                  <view class="fs24 wz_red">￥</view>
+                                  <view class="fs35 wz_red">{{filter.toFix(item.shop_price,2)}}</view>
+                                </view>
+                                <!-- 原价 -->
+                                <view wx:if="{{is_retail_price}}" class="price flex xc-ash line_th ~no_line_x">
+                                  <view class="fs22">￥</view>
+                                  <view class="fs22">{{item.market_price}}</view>
+                                </view>
+
+                              </view>
+                              <view class="flex" style="line-height: 28rpx;">
+                                <!-- 等级价 -->
+                                <view class="price flex ai_and">
+                                  <view class="fs22">￥</view>
+                                  <view class="fs28">{{filter.toFix(g_filter.get_card_price(item,card_list,0),2)}}</view>
+                                  <view class="card_bg ellipsis-1">
+                                    <image src="{{url}}/miniapp/images/plus/dj_icon.png"></image>
+                                    <text class="card_name">{{g_filter.get_card_price(item,card_list,1)}}</text>
+                                  </view>
+                                </view>
+                              </view>
+                            </block>
+                            <block wx:else>
+                              <view class="money flex">
+                                <!-- 办卡价 -->
+                                <view class="flex xc-wc">
+                                  <view class="fs24 wz_red">￥</view>
+                                  <view class="fs35 wz_red">{{filter.toFix(item.shop_price,2)}}</view>
+                                </view>
+                              </view>
+                              <view class="flex" style="line-height: 28rpx;">
+                                <!-- 原价 -->
+                                <view wx:if="{{is_retail_price}}" class="price flex xc-ash line_th ~no_line_x">
+                                  <view class="fs22">￥</view>
+                                  <view class="fs22">{{item.market_price}}</view>
+                                </view>
+                              </view>
+                            </block>
+                          </block>
+                        </block>
+                        <block wx:else>
+                          <view class='wz_red'>￥{{item.shop_price}}</view>
+                          <view wx:if="{{is_retail_price}}" class='del ~no_line_x'>￥{{item.market_price}}</view>
+                        </block>
+                      </block>
                     </view>
+                    <!-- <view class='zs_wz5_2l' wx:if="{{object.goodsnum}}">销量：{{item.sales_sum}}件</view> -->
+                    <view class="flex jc-sb ai-center">
+                      <view class='zs_wz5_x' wx:if="{{object.goodsnum}}">销量：{{item.sales_sum}}件</view>
+                      <!-- 购物车图标 -->
+                      <view class="icon-box" wx:if="{{object.goodcaricon != 1}}">
+                        <!-- 系统图标 -->
+                        <block wx:if="{{object.goodcaricon == 2}}">
+                          <image class="icon" src="{{url + '/miniapp/images/cart/group_goods_car_1.png'}}" wx:if="{{object.stylecaricon == 1}}" mode="widthFix"></image>
+                          <image class="icon" src="{{url + '/miniapp/images/cart/group_goods_car_2.png'}}" wx:if="{{object.stylecaricon == 2}}" mode="widthFix"></image>
+                          <text class="icon-text" wx:if="{{object.stylecaricon == 3}}">马上抢</text>
+                          <text class="icon-text" wx:if="{{object.stylecaricon == 4}}">立即购买</text>
+                        </block>
+                        <!-- 自定义图标 -->
+                        <block wx:if="{{object.goodcaricon == 3}}">
+                          <image class="icon icon2" src="{{object.customcaricon}}" mode="widthFix"></image>
+                        </block>
+                      </view>
+                    </view>
+
+                    <view style="height: 10rpx;"></view>
+                  </view>
                 </view>
-            </navigator>
+              </view>
+
+            </view>
+          </navigator>
         </block>
         <view class="clear"></view>
-    </block>
-    <!--3个一列-->
-    <block wx:if='{{object.column==3}}'>
+      </block>
+      <!--3个一列-->
+      <block wx:if='{{object.column==3}}'>
         <view class="zwp_3 flex wrap">
-            <block wx:for="{{goods_array}}">
-                <navigator url="{{g_filter.get_url_by_type(item)}}" class="s1_gk_a1">
-                    <view class="zs_goods_wai_san {{g_filter.get_border_type(object.big_order_type)}}">
-                        <view class="zs_goods_san">
-                            <view class='zs_goods_3l'>
-                                <view class='zs_top_3l rel'>
-                                    <block wx:if="{{object.big_order_type==3}}">
-                                        <view style="position: relative; width: 100%; height: 100%">
-                                            <image class='zs_t_img_3l' src="{{object.pic_back}}" data-errorimg="object.pic_back" lazy-load="true" binderror="bind_bnerr3"></image>
-                                            <image class="n_box" style="top: {{object.top}}%;left:{{object.left}}%;width: {{object.width}}%;height: {{object.width}}%" src="{{item.goods_img}}" data-errorimg="goods_array[{{index}}].goods_img" lazy-load="true" binderror="bind_bnerr3"></image>
-                                        </view>
-                                    </block>
-                                    <block wx:else>
-                                        <image class='zs_t_img_3l' src="{{item.goods_img}}" data-errorimg="goods_array[{{index}}].goods_img" lazy-load="true" binderror="bind_bnerr3"></image>
-                                    </block>
-
-                                    <block wx:if="{{object.goodicon==3}}">
-                                        <image style="width: {{object.icon_width*1.2}}rpx;height: {{object.icon_width*1.2}}rpx"
-                                                class='{{g_filter.get_class(object.column,object.position)}}' src='{{object.customicon}}'></image>
-                                    </block>
-                                    <block wx:if="{{object.goodicon==1}}">
-                                        <image style="width: {{object.icon_width*1.2}}rpx;height: {{object.icon_width*1.2}}rpx"
-                                                class='{{g_filter.get_class(object.column,object.position)}}' src=''></image>
-                                    </block>
-                                    <block wx:if="{{object.goodicon==2}}">
-                                        <image style="width: {{object.icon_width*1.2}}rpx;height: {{object.icon_width*1.2}}rpx"
-                                                class='{{g_filter.get_class(object.column,object.position)}}' wx:if="{{object.styleicon==1}}" src='{{imghost}}/miniapp/images/Recommend.png'></image>
-                                        <image style="width: {{object.icon_width*1.2}}rpx;height: {{object.icon_width*1.2}}rpx"
-                                                class='{{g_filter.get_class(object.column,object.position)}}' wx:if="{{object.styleicon==2 }}" src='{{imghost}}/miniapp/images/hot.png'></image>
-                                        <image style="width: {{object.icon_width*1.2}}rpx;height: {{object.icon_width*1.2}}rpx"
-                                                class='{{g_filter.get_class(object.column,object.position)}}' wx:if="{{object.styleicon==3}}" src='{{imghost}}/miniapp/images/new.png'></image>
-                                        <image style="width: {{object.icon_width*1.2}}rpx;height: {{object.icon_width*1.2}}rpx"
-                                                class='{{g_filter.get_class(object.column,object.position)}}' wx:if="{{object.styleicon==4 }}" src='{{imghost}}/miniapp/images/Promotion.png'></image>
-                                    </block>
+          <block wx:for="{{goods_array}}">
+            <navigator url="{{g_filter.get_url_by_type(item)}}" class="s1_gk_a1">
+              <view class="zs_goods_wai_san {{g_filter.get_border_type(object.big_order_type)}}">
+                <view class="zs_goods_san">
+                  <view class='zs_goods_3l'>
+                    <view class='zs_top_3l rel'>
+                      <block wx:if="{{object.big_order_type==3}}">
+                        <view style="position: relative; width: 100%; height: 100%">
+                          <image class='zs_t_img_3l' src="{{object.pic_back}}" data-errorimg="object.pic_back" lazy-load="true" binderror="bind_bnerr3"></image>
+                          <image class="n_box" style="top: {{object.top}}%;left:{{object.left}}%;width: {{object.width}}%;height: {{object.width}}%" src="{{item.goods_img}}" data-errorimg="goods_array[{{aind}}].goods_img" lazy-load="true" binderror="bind_bnerr3"></image>
+                        </view>
+                      </block>
+                      <block wx:else>
+                        <image class='zs_t_img_3l' src="{{item.goods_img}}" data-errorimg="goods_array[{{aind}}].goods_img" lazy-load="true" binderror="bind_bnerr3"></image>
+                      </block>
+
+                      <block wx:if="{{object.goodicon==3}}">
+                        <image style="width: {{object.icon_width*1.2}}rpx;height: {{object.icon_width*1.2}}rpx" class='{{g_filter.get_class(object.column,object.position)}}' src='{{object.customicon}}'></image>
+                      </block>
+                      <block wx:if="{{object.goodicon==1}}">
+                        <image style="width: {{object.icon_width*1.2}}rpx;height: {{object.icon_width*1.2}}rpx" class='{{g_filter.get_class(object.column,object.position)}}' src=''></image>
+                      </block>
+                      <block wx:if="{{object.goodicon==2}}">
+                        <image style="width: {{object.icon_width*1.2}}rpx;height: {{object.icon_width*1.2}}rpx" class='{{g_filter.get_class(object.column,object.position)}}' wx:if="{{object.styleicon==1}}" src='{{imghost}}/miniapp/images/Recommend.png'></image>
+                        <image style="width: {{object.icon_width*1.2}}rpx;height: {{object.icon_width*1.2}}rpx" class='{{g_filter.get_class(object.column,object.position)}}' wx:if="{{object.styleicon==2 }}" src='{{imghost}}/miniapp/images/hot.png'></image>
+                        <image style="width: {{object.icon_width*1.2}}rpx;height: {{object.icon_width*1.2}}rpx" class='{{g_filter.get_class(object.column,object.position)}}' wx:if="{{object.styleicon==3}}" src='{{imghost}}/miniapp/images/new.png'></image>
+                        <image style="width: {{object.icon_width*1.2}}rpx;height: {{object.icon_width*1.2}}rpx" 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_3l'>
+
+
+                      <view class='zs_wz1_3l' wx:if="{{object.goodstit}}">{{item.goods_name}}</view>
+                      <view class='zs_wz2_3l' wx:if="{{object.goodsprice}}">
+                        <block wx:if="{{item.prom_price || item.prom_integral}}">
+                          <view class='wz_red'>
+                            <text wx:if="{{item.prom_integral}}">{{item.prom_integral}}积分</text>
+                            <text wx:if="{{item.prom_integral && item.prom_price}}">+</text>
+                            <text wx:if="{{item.prom_price}}">￥{{item.prom_price}}</text>
+                          </view>
+                          <view wx:if="{{is_retail_price}}" class='del ~no_line_x'>￥{{item.market_price}}</view>
+                        </block>
+                        <block wx:else>
+                          <block wx:if="{{g_filter.is_has_rank(rank_switch,item)}}">
+                            <!-- 当会员是等级卡的时候 -->
+                            <block wx:if="{{card_field}}">
+                              <!-- 等级价>0 -->
+                              <block wx:if="{{item[card_field]>0}}">
+                                <view class="money flex">
+                                  <!-- 办卡价 -->
+                                  <view class="flex xc-wc ai_and">
+                                    <view class="fs24 wz_red">￥</view>
+                                    <view class="fs35 wz_red">{{filter.toFix(item[card_field],2)}}</view>
+                                    <view class="card_bg ellipsis-1">
+                                      <image src="{{url}}/miniapp/images/plus/dj_icon.png"></image>
+                                      <text class="card_name">{{card_name}}</text>
+                                    </view>
+                                  </view>
+                                </view>
+                                <view class="flex" style="line-height: 28rpx;">
+                                  <!-- 原价 -->
+                                  <view wx:if="{{is_retail_price}}" class="price flex xc-ash line_th ~no_line_x">
+                                    <view class="fs22">￥</view>
+                                    <view class="fs22">{{item.market_price}}</view>
+                                  </view>
+                                </view>
+                              </block>
+                              <block wx:else>
+                                <view class="money flex">
+                                  <!-- 办卡价 -->
+                                  <view class="flex xc-wc">
+                                    <view class="fs24 wz_red">￥</view>
+                                    <view class="fs35 wz_red">{{filter.toFix(item.shop_price,2)}}</view>
+                                  </view>
                                 </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}}">
-                                        <block wx:if="{{item.prom_price || item.prom_integral}}">
-                                            <view class='wz_red'>
-                                                <text wx:if="{{item.prom_integral}}">{{item.prom_integral}}积分</text>
-                                                <text wx:if="{{item.prom_integral && item.prom_price}}">+</text>
-                                                <text wx:if="{{item.prom_price}}">￥{{item.prom_price}}</text>
-                                            </view>
-                                            <view  wx:if="{{is_retail_price}}" class='del ~no_line_x'>￥{{item.market_price}}</view>
-                                        </block>
-                                        <block wx:else>
-                                            <block wx:if="{{g_filter.is_has_rank(rank_switch,item)}}">
-                                                <!-- 当会员是等级卡的时候 -->
-                                                <block wx:if="{{card_field}}">
-                                                    <!-- 等级价>0 -->
-                                                    <block wx:if="{{item[card_field]>0}}">
-                                                        <view class="money flex">
-                                                            <!-- 办卡价 -->
-                                                            <view class="flex xc-wc ai_and">
-                                                                <view class="fs24 wz_red">￥</view>
-                                                                <view class="fs35 wz_red">{{filter.toFix(item[card_field],2)}}</view>
-                                                                <view class="card_bg ellipsis-1">
-                                                                    <image src="{{url}}/miniapp/images/plus/dj_icon.png"></image>
-                                                                    <text class="card_name">{{card_name}}</text>
-                                                                </view>
-                                                            </view>
-                                                        </view>
-                                                        <view class="flex" style="line-height: 28rpx;">
-                                                            <!-- 原价 -->
-                                                            <view  wx:if="{{is_retail_price}}" class="price flex xc-ash line_th ~no_line_x">
-                                                                <view class="fs22">￥</view>
-                                                                <view class="fs22">{{item.market_price}}</view>
-                                                            </view>
-                                                        </view>
-                                                    </block>
-                                                    <block wx:else>
-                                                        <view class="money flex">
-                                                            <!-- 办卡价 -->
-                                                            <view class="flex xc-wc">
-                                                                <view class="fs24 wz_red">￥</view>
-                                                                <view class="fs35 wz_red">{{filter.toFix(item.shop_price,2)}}</view>
-                                                            </view>
-                                                        </view>
-                                                        <view class="flex" style="line-height: 28rpx;">
-                                                            <!-- 原价 -->
-                                                            <view  wx:if="{{is_retail_price}}" class="price flex xc-ash line_th ~no_line_x">
-                                                                <view class="fs22">￥</view>
-                                                                <view class="fs22">{{item.market_price}}</view>
-                                                            </view>
-                                                        </view>
-                                                    </block>
-                                                </block>
-                                                <block wx:else>
-                                                    <!-- 如果商品有设置等级价大于0的 -->
-                                                    <block wx:if="{{g_filter.get_card_price(item,card_list,0) && is_no_plus}}">
-                                                        <view class="money flex">
-                                                            <!-- 办卡价 -->
-                                                            <view class="flex xc-wc">
-                                                                <view class="fs24 wz_red">￥</view>
-                                                                <view class="fs35 wz_red">{{filter.toFix(item.shop_price,2)}}</view>
-                                                            </view>
-                                                            <!-- 原价 -->
-                                                            <view  wx:if="{{is_retail_price}}" class="price flex xc-ash line_th ~no_line_x">
-                                                                <view class="fs22">￥</view>
-                                                                <view class="fs22">{{item.market_price}}</view>
-                                                            </view>
-
-                                                        </view>
-                                                        <view class="flex" style="line-height: 28rpx;">
-                                                            <!-- 等级价 -->
-                                                            <view class="price flex ai_and">
-                                                                <view class="fs22">￥</view>
-                                                                <view class="fs28">{{filter.toFix(g_filter.get_card_price(item,card_list,0),2)}}</view>
-                                                                <view class="card_bg ellipsis-1">
-                                                                    <image src="{{url}}/miniapp/images/plus/dj_icon.png"></image>
-                                                                    <text class="card_name">{{g_filter.get_card_price(item,card_list,1)}}</text>
-                                                                </view>
-                                                            </view>
-                                                        </view>
-                                                    </block>
-                                                    <block wx:else>
-                                                        <view class="money flex">
-                                                            <!-- 办卡价 -->
-                                                            <view class="flex xc-wc">
-                                                                <view class="fs24 wz_red">￥</view>
-                                                                <view class="fs35 wz_red">{{filter.toFix(item.shop_price,2)}}</view>
-                                                            </view>
-                                                        </view>
-                                                        <view class="flex" style="line-height: 28rpx;">
-                                                            <!-- 原价 -->
-                                                            <view class="price flex xc-ash line_th ~no_line_x">
-                                                                <view class="fs22">￥</view>
-                                                                <view class="fs22">{{item.market_price}}</view>
-                                                            </view>
-                                                        </view>
-                                                    </block>
-                                                </block>
-                                            </block>
-                                            <block wx:else>
-                                                <view class='wz_red'>￥{{item.shop_price}}</view>
-                                                <view  wx:if="{{is_retail_price}}" class='del ~no_line_x'>￥{{item.market_price}}</view>
-                                            </block>
-                                        </block>
+                                <view class="flex" style="line-height: 28rpx;">
+                                  <!-- 原价 -->
+                                  <view wx:if="{{is_retail_price}}" class="price flex xc-ash line_th ~no_line_x">
+                                    <view class="fs22">￥</view>
+                                    <view class="fs22">{{item.market_price}}</view>
+                                  </view>
+                                </view>
+                              </block>
+                            </block>
+                            <block wx:else>
+                              <!-- 如果商品有设置等级价大于0的 -->
+                              <block wx:if="{{g_filter.get_card_price(item,card_list,0) && is_no_plus}}">
+                                <view class="money flex">
+                                  <!-- 办卡价 -->
+                                  <view class="flex xc-wc">
+                                    <view class="fs24 wz_red">￥</view>
+                                    <view class="fs35 wz_red">{{filter.toFix(item.shop_price,2)}}</view>
+                                  </view>
+                                  <!-- 原价 -->
+                                  <view wx:if="{{is_retail_price}}" class="price flex xc-ash line_th ~no_line_x">
+                                    <view class="fs22">￥</view>
+                                    <view class="fs22">{{item.market_price}}</view>
+                                  </view>
+
+                                </view>
+                                <view class="flex" style="line-height: 28rpx;">
+                                  <!-- 等级价 -->
+                                  <view class="price flex ai_and">
+                                    <view class="fs22">￥</view>
+                                    <view class="fs28">{{filter.toFix(g_filter.get_card_price(item,card_list,0),2)}}</view>
+                                    <view class="card_bg ellipsis-1">
+                                      <image src="{{url}}/miniapp/images/plus/dj_icon.png"></image>
+                                      <text class="card_name">{{g_filter.get_card_price(item,card_list,1)}}</text>
                                     </view>
-                                    <!-- <view class='zs_wz5_3l' wx:if="{{object.goodsnum}}">销量：{{item.sales_sum}}件</view> -->
-																		<view class="flex jc-sb ai-center">
-																			<view class='zs_wz5_x' wx:if="{{object.goodsnum}}">销量：{{item.sales_sum}}件</view>
-																			
-																			<!-- 购物车图标 -->
-																			<view class="icon-box" wx:if="{{object.goodcaricon != 1}}">
-																				<!-- 系统图标 -->
-																				<block wx:if="{{object.goodcaricon == 2}}">
-																					<image class="icon" src="{{url + '/miniapp/images/cart/group_goods_car_1.png'}}" wx:if="{{object.stylecaricon == 1}}" mode="widthFix"></image>
-																					<image class="icon" src="{{url + '/miniapp/images/cart/group_goods_car_2.png'}}" wx:if="{{object.stylecaricon == 2}}" mode="widthFix"></image>
-																					<text class="icon-text" wx:if="{{object.stylecaricon == 3}}">马上抢</text>
-																					<text class="icon-text" wx:if="{{object.stylecaricon == 4}}">立即购买</text>
-																				</block>
-																				<!-- 自定义图标 -->
-																				<block wx:if="{{object.goodcaricon == 3}}">
-																					<image class="icon icon2" src="{{object.customcaricon}}" mode="widthFix"></image>
-																				</block>
-																			</view>
-																		</view>
-                                    <view style="height: 10rpx;"></view>
+                                  </view>
                                 </view>
-                            </view>
+                              </block>
+                              <block wx:else>
+                                <view class="money flex">
+                                  <!-- 办卡价 -->
+                                  <view class="flex xc-wc">
+                                    <view class="fs24 wz_red">￥</view>
+                                    <view class="fs35 wz_red">{{filter.toFix(item.shop_price,2)}}</view>
+                                  </view>
+                                </view>
+                                <view class="flex" style="line-height: 28rpx;">
+                                  <!-- 原价 -->
+                                  <view class="price flex xc-ash line_th ~no_line_x">
+                                    <view class="fs22">￥</view>
+                                    <view class="fs22">{{item.market_price}}</view>
+                                  </view>
+                                </view>
+                              </block>
+                            </block>
+                          </block>
+                          <block wx:else>
+                            <view class='wz_red'>￥{{item.shop_price}}</view>
+                            <view wx:if="{{is_retail_price}}" class='del ~no_line_x'>￥{{item.market_price}}</view>
+                          </block>
+                        </block>
+                      </view>
+                      <!-- <view class='zs_wz5_3l' wx:if="{{object.goodsnum}}">销量：{{item.sales_sum}}件</view> -->
+                      <view class="flex jc-sb ai-center">
+                        <view class='zs_wz5_x' wx:if="{{object.goodsnum}}">销量：{{item.sales_sum}}件</view>
+
+                        <!-- 购物车图标 -->
+                        <view class="icon-box" wx:if="{{object.goodcaricon != 1}}">
+                          <!-- 系统图标 -->
+                          <block wx:if="{{object.goodcaricon == 2}}">
+                            <image class="icon" src="{{url + '/miniapp/images/cart/group_goods_car_1.png'}}" wx:if="{{object.stylecaricon == 1}}" mode="widthFix"></image>
+                            <image class="icon" src="{{url + '/miniapp/images/cart/group_goods_car_2.png'}}" wx:if="{{object.stylecaricon == 2}}" mode="widthFix"></image>
+                            <text class="icon-text" wx:if="{{object.stylecaricon == 3}}">马上抢</text>
+                            <text class="icon-text" wx:if="{{object.stylecaricon == 4}}">立即购买</text>
+                          </block>
+                          <!-- 自定义图标 -->
+                          <block wx:if="{{object.goodcaricon == 3}}">
+                            <image class="icon icon2" src="{{object.customcaricon}}" mode="widthFix"></image>
+                          </block>
                         </view>
+                      </view>
+                      <view style="height: 10rpx;"></view>
                     </view>
-                </navigator>
-            </block>
+                  </view>
+                </view>
+              </view>
+            </navigator>
+          </block>
         </view>
         <view class="clear"></view>
-    </block>
-    <!-- 列表显示 -->
-    <view class="zs_goods_xiao_wai" wx:if='{{object.column==4}}'>
+      </block>
+      <!-- 列表显示 -->
+      <view class="zs_goods_xiao_wai" wx:if='{{object.column==4}}'>
         <block wx:for="{{goods_array}}">
-            <navigator url="{{g_filter.get_url_by_type(item)}}" class="s1_gk_a1 {{object.noboder==0?'list_border':'' }}">
-                <view class="zs_goods_xiao_bottom {{g_filter.get_border_type(object.big_order_type)}}">
-                    <view class='zs_top_x'>
-                        <block wx:if="{{object.big_order_type==3}}">
-                            <view style="position: relative; width: 100%; height: 100%">
-                                <image class='zs_t_img_x' src="{{object.pic_back}}" data-errorimg="object.pic_back" lazy-load="true" binderror="bind_bnerr3"></image>
-                                <image class="n_box" style="top: {{object.top}}%;left:{{object.left}}%;width: {{object.width}}%;height: {{object.width}}%" src="{{item.goods_img}}" data-errorimg="goods_array[{{index}}].goods_img" lazy-load="true" binderror="bind_bnerr3"></image>
+          <navigator url="{{g_filter.get_url_by_type(item)}}" class="s1_gk_a1 {{object.noboder==0?'list_border':'' }}">
+            <view class="zs_goods_xiao_bottom {{g_filter.get_border_type(object.big_order_type)}}">
+              <view class='zs_top_x'>
+                <block wx:if="{{object.big_order_type==3}}">
+                  <view style="position: relative; width: 100%; height: 100%">
+                    <image class='zs_t_img_x' src="{{object.pic_back}}" data-errorimg="object.pic_back" lazy-load="true" binderror="bind_bnerr3"></image>
+                    <image class="n_box" style="top: {{object.top}}%;left:{{object.left}}%;width: {{object.width}}%;height: {{object.width}}%" src="{{item.goods_img}}" data-errorimg="goods_array[{{aind}}].goods_img" lazy-load="true" binderror="bind_bnerr3"></image>
+                  </view>
+                </block>
+
+                <block wx:else>
+                  <!-- 原来的 -->
+                  <!-- <image class="zs_t_img_x {{object.big_order_type==0?'zj':''}}{{object.big_order_type==1?'yj':''}}"
+                                src="{{item.goods_img}}" data-errorimg="goods_array[{{aind}}].goods_img"  lazy-load="true"
+                                binderror="bind_bnerr3" mode="widthFix" style='max-height:290rpx'></image> -->
+
+                  <!-- 2021.11.27修改		 -->
+                  <image class="block zs_t_img_x {{object.big_order_type==0?'zj':''}}{{object.big_order_type==1?'yj':''}}" src="{{item.goods_img}}" data-errorimg="goods_array[{{aind}}].goods_img" lazy-load="true" binderror="bind_bnerr3"></image>
+                </block>
+
+                <block wx:if="{{object.goodicon==3}}">
+                  <image style="width: {{object.icon_width*1.2}}rpx;height: {{object.icon_width*1.2}}rpx" class='{{g_filter.get_class(object.column,object.position)}}' src='{{object.customicon}}'></image>
+                </block>
+                <block wx:if="{{object.goodicon==1}}">
+                  <image style="width: {{object.icon_width*1.2}}rpx;height: {{object.icon_width*1.2}}rpx" class='{{g_filter.get_class(object.column,object.position)}}' src=''></image>
+                </block>
+                <block wx:if="{{object.goodicon==2}}">
+                  <image style="width: {{object.icon_width*1.2}}rpx;height: {{object.icon_width*1.2}}rpx" class='{{g_filter.get_class(object.column,object.position)}}' wx:if="{{object.styleicon==1}}" src='{{imghost}}/miniapp/images/Recommend.png'></image>
+                  <image style="width: {{object.icon_width*1.2}}rpx;height: {{object.icon_width*1.2}}rpx" class='{{g_filter.get_class(object.column,object.position)}}' wx:if="{{object.styleicon==2 }}" src='{{imghost}}/miniapp/images/hot.png'></image>
+                  <image style="width: {{object.icon_width*1.2}}rpx;height: {{object.icon_width*1.2}}rpx" class='{{g_filter.get_class(object.column,object.position)}}' wx:if="{{object.styleicon==3}}" src='{{imghost}}/miniapp/images/new.png'></image>
+                  <image style="width: {{object.icon_width*1.2}}rpx;height: {{object.icon_width*1.2}}rpx" 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_x'>
+                <view class='zs_wz1_x ellipsis-2' style="width: 360rpx; margin-top: 10rpx" wx:if="{{object.goodstit}}">{{item.goods_name}}</view>
+                <view class='zs_wz2_x' wx:if="{{object.goodsprice}}">
+
+                  <block wx:if="{{item.prom_price || item.prom_integral}}">
+                    <view class='wz_red'>
+                      <text wx:if="{{item.prom_integral}}">{{item.prom_integral}}积分</text>
+                      <text wx:if="{{item.prom_integral && item.prom_price}}">+</text>
+                      <text wx:if="{{item.prom_price}}">￥{{item.prom_price}}</text>
+                    </view>
+                    <view wx:if="{{is_retail_price}}" class='del ~no_line_x'>￥{{item.market_price}}</view>
+                  </block>
+                  <!-- 不是活动的情况 -->
+                  <block wx:else>
+
+                    <block wx:if="{{g_filter.is_has_rank(rank_switch,item)}}">
+                      <!-- 当会员是等级卡的时候 -->
+                      <block wx:if="{{card_field}}">
+                        <!-- 等级价>0 -->
+                        <block wx:if="{{item[card_field]>0}}">
+                          <view class="money flex">
+                            <!-- 办卡价 -->
+                            <view class="flex xc-wc ai_and">
+                              <view class="fs24 wz_red">￥</view>
+                              <view class="fs35 wz_red">{{filter.toFix(item[card_field],2)}}</view>
+                              <view class="card_bg ellipsis-1">
+                                <image src="{{url}}/miniapp/images/plus/dj_icon.png"></image>
+                                <text class="card_name">{{card_name}}</text>
+                              </view>
+                            </view>
+                          </view>
+                          <view class="flex" style="line-height: 28rpx;">
+                            <!-- 原价 -->
+                            <view wx:if="{{is_retail_price}}" class="price flex xc-ash line_th ~no_line_x">
+                              <view class="fs22">￥</view>
+                              <view class="fs22">{{item.market_price}}</view>
                             </view>
+                          </view>
                         </block>
-
                         <block wx:else>
-                            <!-- 原来的 -->
-                            <!-- <image class="zs_t_img_x {{object.big_order_type==0?'zj':''}}{{object.big_order_type==1?'yj':''}}"
-											       src="{{item.goods_img}}" data-errorimg="goods_array[{{index}}].goods_img"  lazy-load="true"
-											       binderror="bind_bnerr3" mode="widthFix" style='max-height:290rpx'></image> -->
-
-                            <!-- 2021.11.27修改		 -->
-                            <image class="block zs_t_img_x {{object.big_order_type==0?'zj':''}}{{object.big_order_type==1?'yj':''}}" src="{{item.goods_img}}" data-errorimg="goods_array[{{index}}].goods_img" lazy-load="true" binderror="bind_bnerr3"></image>
+                          <view class="money flex">
+                            <!-- 办卡价 -->
+                            <view class="flex xc-wc">
+                              <view class="fs24">￥</view>
+                              <view class="fs35">{{filter.toFix(item.shop_price,2)}}</view>
+                            </view>
+                          </view>
+                          <view class="flex" style="line-height: 28rpx;">
+                            <!-- 原价 -->
+                            <view wx:if="{{is_retail_price}}" class="price flex xc-ash line_th ~no_line_x">
+                              <view class="fs22">￥</view>
+                              <view class="fs22">{{item.market_price}}</view>
+                            </view>
+                          </view>
                         </block>
+                      </block>
+                      <block wx:else>
+                        <!-- 如果商品有设置等级价大于0的 -->
+                        <block wx:if="{{g_filter.get_card_price(item,card_list,0)}}">
+                          <view class="money flex">
+                            <!-- 办卡价 -->
+                            <view class="flex xc-wc">
+                              <view class="fs24">￥</view>
+                              <view class="fs35">{{filter.toFix(item.shop_price,2)}}</view>
+                            </view>
+                            <!-- 原价 -->
+                            <view wx:if="{{is_retail_price}}" class="price flex xc-ash line_th ~no_line_x">
+                              <view class="fs22">￥</view>
+                              <view class="fs22">{{item.market_price}}</view>
+                            </view>
-                        <block wx:if="{{object.goodicon==3}}">
-                            <image style="width: {{object.icon_width*1.2}}rpx;height: {{object.icon_width*1.2}}rpx"
-                                    class='{{g_filter.get_class(object.column,object.position)}}' src='{{object.customicon}}'></image>
-                        </block>
-                        <block wx:if="{{object.goodicon==1}}">
-                            <image style="width: {{object.icon_width*1.2}}rpx;height: {{object.icon_width*1.2}}rpx"
-                                    class='{{g_filter.get_class(object.column,object.position)}}' src=''></image>
+                          </view>
+                          <view class="flex" style="line-height: 28rpx;">
+                            <!-- 等级价 -->
+                            <view class="price flex ai_and">
+                              <view class="fs22">￥</view>
+                              <view class="fs28">{{filter.toFix(g_filter.get_card_price(item,card_list,0),2) && is_no_plus}}</view>
+                              <view class="card_bg">
+                                <image src="{{url}}/miniapp/images/plus/dj_icon.png"></image>{{g_filter.get_card_price(item,card_list,1)}}
+                              </view>
+                            </view>
+                          </view>
                         </block>
-                        <block wx:if="{{object.goodicon==2}}">
-                            <image style="width: {{object.icon_width*1.2}}rpx;height: {{object.icon_width*1.2}}rpx"
-                                    class='{{g_filter.get_class(object.column,object.position)}}' wx:if="{{object.styleicon==1}}" src='{{imghost}}/miniapp/images/Recommend.png'></image>
-                            <image style="width: {{object.icon_width*1.2}}rpx;height: {{object.icon_width*1.2}}rpx"
-                                    class='{{g_filter.get_class(object.column,object.position)}}' wx:if="{{object.styleicon==2 }}" src='{{imghost}}/miniapp/images/hot.png'></image>
-                            <image style="width: {{object.icon_width*1.2}}rpx;height: {{object.icon_width*1.2}}rpx"
-                                    class='{{g_filter.get_class(object.column,object.position)}}' wx:if="{{object.styleicon==3}}" src='{{imghost}}/miniapp/images/new.png'></image>
-                            <image style="width: {{object.icon_width*1.2}}rpx;height: {{object.icon_width*1.2}}rpx"
-                                    class='{{g_filter.get_class(object.column,object.position)}}' wx:if="{{object.styleicon==4 }}" src='{{imghost}}/miniapp/images/Promotion.png'></image>
+                        <block wx:else>
+                          <view class="money flex">
+                            <!-- 办卡价 -->
+                            <view class="flex xc-wc">
+                              <view class="fs24 wz_red">￥</view>
+                              <view class="fs35 wz_red">{{filter.toFix(item.shop_price,2)}}</view>
+                            </view>
+                          </view>
+                          <view class="flex" style="line-height: 28rpx;">
+                            <!-- 原价 -->
+                            <view wx:if="{{is_retail_price}}" class="price flex xc-ash line_th ~no_line_x">
+                              <view class="fs22">￥</view>
+                              <view class="fs22">{{item.market_price}}</view>
+                            </view>
+                          </view>
                         </block>
-                    </view>
-                    <view class='zs_center_x'>
-                        <view class='zs_wz1_x ellipsis-2' style="width: 360rpx; margin-top: 10rpx" wx:if="{{object.goodstit}}">{{item.goods_name}}</view>
-                        <view class='zs_wz2_x' wx:if="{{object.goodsprice}}">
+                      </block>
+                    </block>
-                            <block wx:if="{{item.prom_price || item.prom_integral}}">
-                                <view class='wz_red'>
-                                    <text wx:if="{{item.prom_integral}}">{{item.prom_integral}}积分</text>
-                                    <text wx:if="{{item.prom_integral && item.prom_price}}">+</text>
-                                    <text wx:if="{{item.prom_price}}">￥{{item.prom_price}}</text>
-                                </view>
-                                <view  wx:if="{{is_retail_price}}" class='del ~no_line_x'>￥{{item.market_price}}</view>
-                            </block>
-                            <!-- 不是活动的情况 -->
-                            <block wx:else>
+                    <block wx:else>
+                      <view class='wz_red'>￥{{item.shop_price}}</view>
+                      <view wx:if="{{is_retail_price}}" class='del ~no_line_x'>￥{{item.market_price}}</view>
+                    </block>
+
+                  </block>
+                </view>
-                                <block wx:if="{{g_filter.is_has_rank(rank_switch,item)}}">
-                                    <!-- 当会员是等级卡的时候 -->
-                                    <block wx:if="{{card_field}}">
-                                        <!-- 等级价>0 -->
-                                        <block wx:if="{{item[card_field]>0}}">
-                                            <view class="money flex">
-                                                <!-- 办卡价 -->
-                                                <view class="flex xc-wc ai_and">
-                                                    <view class="fs24 wz_red">￥</view>
-                                                    <view class="fs35 wz_red">{{filter.toFix(item[card_field],2)}}</view>
-                                                    <view class="card_bg ellipsis-1">
-                                                        <image src="{{url}}/miniapp/images/plus/dj_icon.png"></image>
-                                                        <text class="card_name">{{card_name}}</text>
-                                                    </view>
-                                                </view>
-                                            </view>
-                                            <view class="flex" style="line-height: 28rpx;">
-                                                <!-- 原价 -->
-                                                <view  wx:if="{{is_retail_price}}" class="price flex xc-ash line_th ~no_line_x">
-                                                    <view class="fs22">￥</view>
-                                                    <view class="fs22">{{item.market_price}}</view>
-                                                </view>
-                                            </view>
-                                        </block>
-                                        <block wx:else>
-                                            <view class="money flex">
-                                                <!-- 办卡价 -->
-                                                <view class="flex xc-wc">
-                                                    <view class="fs24">￥</view>
-                                                    <view class="fs35">{{filter.toFix(item.shop_price,2)}}</view>
-                                                </view>
-                                            </view>
-                                            <view class="flex" style="line-height: 28rpx;">
-                                                <!-- 原价 -->
-                                                <view  wx:if="{{is_retail_price}}" class="price flex xc-ash line_th ~no_line_x">
-                                                    <view class="fs22">￥</view>
-                                                    <view class="fs22">{{item.market_price}}</view>
-                                                </view>
-                                            </view>
-                                        </block>
-                                    </block>
-                                    <block wx:else>
-                                        <!-- 如果商品有设置等级价大于0的 -->
-                                        <block wx:if="{{g_filter.get_card_price(item,card_list,0)}}">
-                                            <view class="money flex">
-                                                <!-- 办卡价 -->
-                                                <view class="flex xc-wc">
-                                                    <view class="fs24">￥</view>
-                                                    <view class="fs35">{{filter.toFix(item.shop_price,2)}}</view>
-                                                </view>
-                                                <!-- 原价 -->
-                                                <view  wx:if="{{is_retail_price}}" class="price flex xc-ash line_th ~no_line_x">
-                                                    <view class="fs22">￥</view>
-                                                    <view class="fs22">{{item.market_price}}</view>
-                                                </view>
-
-                                            </view>
-                                            <view class="flex" style="line-height: 28rpx;">
-                                                <!-- 等级价 -->
-                                                <view class="price flex ai_and">
-                                                    <view class="fs22">￥</view>
-                                                    <view class="fs28">{{filter.toFix(g_filter.get_card_price(item,card_list,0),2) && is_no_plus}}</view>
-                                                    <view class="card_bg">
-                                                        <image src="{{url}}/miniapp/images/plus/dj_icon.png"></image>{{g_filter.get_card_price(item,card_list,1)}}
-                                                    </view>
-                                                </view>
-                                            </view>
-                                        </block>
-                                        <block wx:else>
-                                            <view class="money flex">
-                                                <!-- 办卡价 -->
-                                                <view class="flex xc-wc">
-                                                    <view class="fs24 wz_red">￥</view>
-                                                    <view class="fs35 wz_red">{{filter.toFix(item.shop_price,2)}}</view>
-                                                </view>
-                                            </view>
-                                            <view class="flex" style="line-height: 28rpx;">
-                                                <!-- 原价 -->
-                                                <view  wx:if="{{is_retail_price}}" class="price flex xc-ash line_th ~no_line_x">
-                                                    <view class="fs22">￥</view>
-                                                    <view class="fs22">{{item.market_price}}</view>
-                                                </view>
-                                            </view>
-                                        </block>
-                                    </block>
-                                </block>
-
-                                <block wx:else>
-                                    <view class='wz_red'>￥{{item.shop_price}}</view>
-                                    <view  wx:if="{{is_retail_price}}" class='del ~no_line_x'>￥{{item.market_price}}</view>
-                                </block>
+                <view class="flex jc-sb ai-center">
+                  <view class='zs_wz5_x' wx:if="{{object.goodsnum}}">销量：{{item.sales_sum}}件</view>
-                            </block>
-                        </view>
-												
-												<view class="flex jc-sb ai-center">
-													<view class='zs_wz5_x' wx:if="{{object.goodsnum}}">销量：{{item.sales_sum}}件</view>
-													
-													<!-- 购物车图标 -->
-													<view class="icon-box" wx:if="{{object.goodcaricon != 1}}">
-														<!-- 系统图标 -->
-														<block wx:if="{{object.goodcaricon == 2}}">
-															<image class="icon" src="{{url + '/miniapp/images/cart/group_goods_car_1.png'}}" wx:if="{{object.stylecaricon == 1}}" mode="widthFix"></image>
-															<image class="icon" src="{{url + '/miniapp/images/cart/group_goods_car_2.png'}}" wx:if="{{object.stylecaricon == 2}}" mode="widthFix"></image>
-															<text class="icon-text" wx:if="{{object.stylecaricon == 3}}">马上抢</text>
-															<text class="icon-text" wx:if="{{object.stylecaricon == 4}}">立即购买</text>
-														</block>
-														<!-- 自定义图标 -->
-														<block wx:if="{{object.goodcaricon == 3}}">
-															<image class="icon icon2" src="{{object.customcaricon}}" mode="widthFix"></image>
-														</block>
-													</view>
-												</view>
-                        
-                    </view>
+                  <!-- 购物车图标 -->
+                  <view class="icon-box" wx:if="{{object.goodcaricon != 1}}">
+                    <!-- 系统图标 -->
+                    <block wx:if="{{object.goodcaricon == 2}}">
+                      <image class="icon" src="{{url + '/miniapp/images/cart/group_goods_car_1.png'}}" wx:if="{{object.stylecaricon == 1}}" mode="widthFix"></image>
+                      <image class="icon" src="{{url + '/miniapp/images/cart/group_goods_car_2.png'}}" wx:if="{{object.stylecaricon == 2}}" mode="widthFix"></image>
+                      <text class="icon-text" wx:if="{{object.stylecaricon == 3}}">马上抢</text>
+                      <text class="icon-text" wx:if="{{object.stylecaricon == 4}}">立即购买</text>
+                    </block>
+                    <!-- 自定义图标 -->
+                    <block wx:if="{{object.goodcaricon == 3}}">
+                      <image class="icon icon2" src="{{object.customcaricon}}" mode="widthFix"></image>
+                    </block>
+                  </view>
                 </view>
-            </navigator>
+
+              </view>
+            </view>
+          </navigator>
         </block>
         <view class="clear"></view>
-    </view>
-
-
-    <!-- 商品的显示不是左右 -->
-    <block wx:if="{{object.column!=5}}">
+      </view>
+      <!-- 商品的显示不是左右 -->
+      <block wx:if="{{object.column!=5}}">
         <block wx:if="{{classstyle_id=='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>
+          <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>
         <block wx:if="{{classstyle_id!='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>
-<!--            <view class="fs28" wx:if="{{object.goodscount * page >=total }}" style="color:{{object.nomore_color}};text-align: center; padding: 20rpx 0">&#45;&#45; 没有更多 &#45;&#45; </view>-->
+          <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>
+          <!--            <view class="fs28" wx:if="{{object.goodscount * page >=total }}" style="color:{{object.nomore_color}};text-align: center; padding: 20rpx 0">&#45;&#45; 没有更多 &#45;&#45; </view>-->
         </block>
-    </block>
+      </block>
+      <!--商品展示-->
+      <swiper class="s_prom" indicator-active-color='red' indicator-dots="false" wx:if="{{object.column==5}}" style="height: {{swiper_hei}}rpx;">
+        <view class="sp">
+          <swiper-item class="s_it" wx:for="{{goods_array}}">
+            <block wx:for="{{item}}" wx:for-item="aitem" wx:for-index="aind">
+              <navigator url="{{g_filter.get_url_by_type(aitem)}}" style="width: 32%">
+                <view class="one {{object.big_order_type==0?'zj':''}}{{object.big_order_type==1?'yj':''}} " style="margin-left: 10rpx">
+                  <view class='sp_top'>
+                    <view class='s_img' style="position: relative; width: 100%">
+                      <block wx:if="{{object.big_order_type==3}}">
+                        <view style="position: relative; width: 100%; height: 100%">
+                          <image src="{{object.pic_back}}" data-errorimg="object.pic_back" lazy-load="true" binderror="bind_bnerr3"></image>
-    <!--商品展示-->
-    <swiper class="s_prom" indicator-active-color='red' indicator-dots="false" wx:if="{{object.column==5}}" style="height: {{swiper_hei}}rpx;">
-        <view class="sp">
-            <swiper-item class="s_it" wx:for="{{goods_array}}">
-                <block wx:for="{{item}}" wx:for-item="aitem" wx:for-index="aind">
-                    <navigator url="{{g_filter.get_url_by_type(aitem)}}" style="width: 32%">
-                        <view class="one {{object.big_order_type==0?'zj':''}}{{object.big_order_type==1?'yj':''}} " style="margin-left: 10rpx">
-                            <view class='sp_top'>
-                                <view class='s_img' style="position: relative; width: 100%">
-
-                                    <block wx:if="{{object.big_order_type==3}}">
-                                        <view style="position: relative; width: 100%; height: 100%">
-                                            <image src="{{object.pic_back}}" data-errorimg="object.pic_back" lazy-load="true" binderror="bind_bnerr3"></image>
-
-                                            <image class="n_box" style="top: {{object.top}}%;left:{{object.left}}%;width: {{object.width}}%;height: {{object.width}}%" src="{{aitem.goods_img}}" data-errorimg="goods_array[{{index}}].goods_img" lazy-load="true" binderror="bind_bnerr3"></image>
-                                        </view>
-                                    </block>
-
-                                    <block wx:else>
-                                        <image src="{{aitem.goods_img}}" data-errorimg="goods_array[{{index}}][{{aind}}].goods_img" binderror="bind_bnerr3" lazy-load="true" style="width: 100%"></image>
-                                    </block>
-
-
-                                    <block wx:if="{{object.goodicon==3}}">
-                                        <image style="width: {{object.icon_width*1.2}}rpx;height: {{object.icon_width*1.2}}rpx"
-                                                class='{{g_filter.get_class(object.column,object.position)}}' src='{{object.customicon}}'></image>
-                                    </block>
-                                    <block wx:if="{{object.goodicon==1}}">
-                                        <image style="width: {{object.icon_width*1.2}}rpx;height: {{object.icon_width*1.2}}rpx"
-                                                class='{{g_filter.get_class(object.column,object.position)}}' src=''></image>
-                                    </block>
-                                    <block wx:if="{{object.goodicon==2}}">
-                                        <image style="width: {{object.icon_width*1.2}}rpx;height: {{object.icon_width*1.2}}rpx"
-                                                class='{{g_filter.get_class(object.column,object.position)}}' wx:if="{{object.styleicon==1}}" src='{{imghost}}/miniapp/images/Recommend.png'></image>
-                                        <image style="width: {{object.icon_width*1.2}}rpx;height: {{object.icon_width*1.2}}rpx"
-                                                class='{{g_filter.get_class(object.column,object.position)}}' wx:if="{{object.styleicon==2 }}" src='{{imghost}}/miniapp/images/hot.png'></image>
-                                        <image style="width: {{object.icon_width*1.2}}rpx;height: {{object.icon_width*1.2}}rpx"
-                                                class='{{g_filter.get_class(object.column,object.position)}}' wx:if="{{object.styleicon==3}}" src='{{imghost}}/miniapp/images/new.png'></image>
-                                        <image style="width: {{object.icon_width*1.2}}rpx;height: {{object.icon_width*1.2}}rpx"
-                                                class='{{g_filter.get_class(object.column,object.position)}}' wx:if="{{object.styleicon==4 }}" src='{{imghost}}/miniapp/images/Promotion.png'></image>
-                                    </block>
+                          <image class="n_box" style="top: {{object.top}}%;left:{{object.left}}%;width: {{object.width}}%;height: {{object.width}}%" src="{{aitem.goods_img}}" data-errorimg="goods_array[{{aind}}].goods_img" lazy-load="true" binderror="bind_bnerr3"></image>
+                        </view>
+                      </block>
+
+                      <block wx:else>
+                        <image src="{{aitem.goods_img}}" data-errorimg="goods_array[{{index}}][{{aind}}].goods_img" binderror="bind_bnerr3" lazy-load="true" style="width: 100%"></image>
+                      </block>
+
+
+                      <block wx:if="{{object.goodicon==3}}">
+                        <image style="width: {{object.icon_width*1.2}}rpx;height: {{object.icon_width*1.2}}rpx" class='{{g_filter.get_class(object.column,object.position)}}' src='{{object.customicon}}'></image>
+                      </block>
+                      <block wx:if="{{object.goodicon==1}}">
+                        <image style="width: {{object.icon_width*1.2}}rpx;height: {{object.icon_width*1.2}}rpx" class='{{g_filter.get_class(object.column,object.position)}}' src=''></image>
+                      </block>
+                      <block wx:if="{{object.goodicon==2}}">
+                        <image style="width: {{object.icon_width*1.2}}rpx;height: {{object.icon_width*1.2}}rpx" class='{{g_filter.get_class(object.column,object.position)}}' wx:if="{{object.styleicon==1}}" src='{{imghost}}/miniapp/images/Recommend.png'></image>
+                        <image style="width: {{object.icon_width*1.2}}rpx;height: {{object.icon_width*1.2}}rpx" class='{{g_filter.get_class(object.column,object.position)}}' wx:if="{{object.styleicon==2 }}" src='{{imghost}}/miniapp/images/hot.png'></image>
+                        <image style="width: {{object.icon_width*1.2}}rpx;height: {{object.icon_width*1.2}}rpx" class='{{g_filter.get_class(object.column,object.position)}}' wx:if="{{object.styleicon==3}}" src='{{imghost}}/miniapp/images/new.png'></image>
+                        <image style="width: {{object.icon_width*1.2}}rpx;height: {{object.icon_width*1.2}}rpx" 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='clear'></view>
+                  </view>
+                  <view class='sp_wz'>
+                    <view class='zs_wz1_3l' wx:if="{{object.goodstit}}">{{aitem.goods_name}}</view>
+                    <view class='zs_wz2_3l' wx:if="{{object.goodsprice}}">
+                      <block wx:if="{{aitem.prom_price || aitem.prom_integral }}">
+                        <view class='wz_red'>
+                          <text wx:if="{{aitem.prom_integral}}">{{aitem.prom_integral}}</text>
+                          <text wx:if="{{aitem.prom_integral && aitem.prom_price}}">+</text>
+                          <text wx:if="{{aitem.prom_price}}">￥{{aitem.prom_price}}</text>
+                        </view>
+                        <view wx:if="{{is_retail_price}}" class='del ~no_line_x'>￥{{aitem.market_price}}</view>
+                      </block>
+                      <block wx:else>
+                        <block wx:if="{{g_filter.is_has_rank(rank_switch,aitem)}}">
+                          <!-- 当会员是等级卡的时候 -->
+                          <block wx:if="{{card_field}}">
+                            <!-- 等级价>0 -->
+                            <block wx:if="{{aitem[card_field]>0}}">
+                              <view class="money flex">
+                                <!-- 办卡价 -->
+                                <view class="flex xc-wc ai_and">
+                                  <view class="fs24 wz_red">￥</view>
+                                  <view class="fs35 wz_red">{{filter.toFix(aitem[card_field],2)}}</view>
+                                  <view class="card_bg ellipsis-1">
+                                    <image src="{{url}}/miniapp/images/plus/dj_icon.png"></image>
+                                    <text class="card_name">{{card_name}}</text>
+                                  </view>
+                                </view>
+                              </view>
+                              <view class="flex" style="line-height: 28rpx;">
+                                <!-- 原价 -->
+                                <view wx:if="{{is_retail_price}}" class="price flex xc-ash line_th ~no_line_x">
+                                  <view class="fs22">￥</view>
+                                  <view class="fs22">{{aitem.market_price}}</view>
+                                </view>
+                              </view>
+                            </block>
+                            <block wx:else>
+                              <view class="money flex">
+                                <!-- 办卡价 -->
+                                <view class="flex xc-wc">
+                                  <view class="fs24 wz_red">￥</view>
+                                  <view class="fs35 wz_red">{{filter.toFix(aitem.shop_price,2)}}</view>
+                                </view>
+                              </view>
+                              <view class="flex" style="line-height: 28rpx;">
+                                <!-- 原价 -->
+                                <view wx:if="{{is_retail_price}}" class="price flex xc-ash line_th ~no_line_x">
+                                  <view class="fs22">￥</view>
+                                  <view class="fs22">{{aitem.market_price}}</view>
+                                </view>
+                              </view>
+                            </block>
+                          </block>
+                          <block wx:else>
+                            <!-- 如果商品有设置等级价大于0的 -->
+                            <block wx:if="{{g_filter.get_card_price(aitem,card_list,0) && is_no_plus}}">
+                              <view class="money flex">
+                                <!-- 办卡价 -->
+                                <view class="flex xc-wc">
+                                  <view class="fs24 wz_red">￥</view>
+                                  <view class="fs35 wz_red">{{filter.toFix(aitem.shop_price,2)}}</view>
+                                </view>
+                                <!-- 原价 -->
+                                <view wx:if="{{is_retail_price}}" class="price flex xc-ash line_th ~no_line_x">
+                                  <view class="fs22">￥</view>
+                                  <view class="fs22">{{aitem.market_price}}</view>
                                 </view>
-                                <view class='clear'></view>
-                            </view>
-                            <view class='sp_wz'>
-                                <view class='zs_wz1_3l' wx:if="{{object.goodstit}}">{{aitem.goods_name}}</view>
-                                <view class='zs_wz2_3l' wx:if="{{object.goodsprice}}">
-                                    <block wx:if="{{aitem.prom_price || aitem.prom_integral }}">
-                                        <view class='wz_red'>
-                                            <text wx:if="{{aitem.prom_integral}}">{{aitem.prom_integral}}</text>
-                                            <text wx:if="{{aitem.prom_integral && aitem.prom_price}}">+</text>
-                                            <text wx:if="{{aitem.prom_price}}">￥{{aitem.prom_price}}</text>
-                                        </view>
-                                        <view  wx:if="{{is_retail_price}}" class='del ~no_line_x'>￥{{aitem.market_price}}</view>
-                                    </block>
-                                    <block wx:else>
-                                        <block wx:if="{{g_filter.is_has_rank(rank_switch,aitem)}}">
-                                            <!-- 当会员是等级卡的时候 -->
-                                            <block wx:if="{{card_field}}">
-                                                <!-- 等级价>0 -->
-                                                <block wx:if="{{aitem[card_field]>0}}">
-                                                    <view class="money flex">
-                                                        <!-- 办卡价 -->
-                                                        <view class="flex xc-wc ai_and">
-                                                            <view class="fs24 wz_red">￥</view>
-                                                            <view class="fs35 wz_red">{{filter.toFix(aitem[card_field],2)}}</view>
-                                                            <view class="card_bg ellipsis-1">
-                                                                <image src="{{url}}/miniapp/images/plus/dj_icon.png"></image>
-                                                                <text class="card_name">{{card_name}}</text>
-                                                            </view>
-                                                        </view>
-                                                    </view>
-                                                    <view class="flex" style="line-height: 28rpx;">
-                                                        <!-- 原价 -->
-                                                        <view  wx:if="{{is_retail_price}}"  class="price flex xc-ash line_th ~no_line_x">
-                                                            <view class="fs22">￥</view>
-                                                            <view class="fs22">{{aitem.market_price}}</view>
-                                                        </view>
-                                                    </view>
-                                                </block>
-                                                <block wx:else>
-                                                    <view class="money flex">
-                                                        <!-- 办卡价 -->
-                                                        <view class="flex xc-wc">
-                                                            <view class="fs24 wz_red">￥</view>
-                                                            <view class="fs35 wz_red">{{filter.toFix(aitem.shop_price,2)}}</view>
-                                                        </view>
-                                                    </view>
-                                                    <view class="flex" style="line-height: 28rpx;">
-                                                        <!-- 原价 -->
-                                                        <view  wx:if="{{is_retail_price}}"  class="price flex xc-ash line_th ~no_line_x">
-                                                            <view class="fs22">￥</view>
-                                                            <view class="fs22">{{aitem.market_price}}</view>
-                                                        </view>
-                                                    </view>
-                                                </block>
-                                            </block>
-                                            <block wx:else>
-                                                <!-- 如果商品有设置等级价大于0的 -->
-                                                <block wx:if="{{g_filter.get_card_price(aitem,card_list,0) && is_no_plus}}">
-                                                    <view class="money flex">
-                                                        <!-- 办卡价 -->
-                                                        <view class="flex xc-wc">
-                                                            <view class="fs24 wz_red">￥</view>
-                                                            <view class="fs35 wz_red">{{filter.toFix(aitem.shop_price,2)}}</view>
-                                                        </view>
-                                                        <!-- 原价 -->
-                                                        <view  wx:if="{{is_retail_price}}"  class="price flex xc-ash line_th ~no_line_x">
-                                                            <view class="fs22">￥</view>
-                                                            <view class="fs22">{{aitem.market_price}}</view>
-                                                        </view>
-
-                                                    </view>
-                                                    <view class="flex" style="line-height: 28rpx;">
-                                                        <!-- 等级价 -->
-                                                        <view class="price flex ai_and">
-                                                            <view class="fs22">￥</view>
-                                                            <view class="fs28">{{filter.toFix(g_filter.get_card_price(aitem,card_list,0),2)}}</view>
-                                                            <view class="card_bg ellipsis-1">
-                                                                <image src="{{url}}/miniapp/images/plus/dj_icon.png"></image>
-                                                                <text class="card_name">{{g_filter.get_card_price(aitem,card_list,1)}}</text>
-                                                            </view>
-                                                        </view>
-                                                    </view>
-                                                </block>
-                                                <block wx:else>
-                                                    <view class="money flex">
-                                                        <!-- 办卡价 -->
-                                                        <view class="flex xc-wc">
-                                                            <view class="fs24 wz_red">￥</view>
-                                                            <view class="fs35 wz_red">{{filter.toFix(aitem.shop_price,2)}}</view>
-                                                        </view>
-                                                    </view>
-                                                    <view class="flex" style="line-height: 28rpx;">
-                                                        <!-- 原价 -->
-                                                        <view  wx:if="{{is_retail_price}}"  class="price flex xc-ash line_th ~no_line_x">
-                                                            <view class="fs22">￥</view>
-                                                            <view class="fs22">{{aitem.market_price}}</view>
-                                                        </view>
-                                                    </view>
-                                                </block>
-                                            </block>
-                                        </block>
-                                        <block wx:else>
-                                            <view class='wz_red'>￥{{aitem.shop_price}}</view>
-                                            <view  wx:if="{{is_retail_price}}"  class='del ~no_line_x'>￥{{aitem.market_price}}</view>
-                                        </block>
-                                    </block>
+                              </view>
+                              <view class="flex" style="line-height: 28rpx;">
+                                <!-- 等级价 -->
+                                <view class="price flex ai_and">
+                                  <view class="fs22">￥</view>
+                                  <view class="fs28">{{filter.toFix(g_filter.get_card_price(aitem,card_list,0),2)}}</view>
+                                  <view class="card_bg ellipsis-1">
+                                    <image src="{{url}}/miniapp/images/plus/dj_icon.png"></image>
+                                    <text class="card_name">{{g_filter.get_card_price(aitem,card_list,1)}}</text>
+                                  </view>
                                 </view>
-                                <!-- <view class='zs_wz5_3l' wx:if="{{object.goodsnum}}">销量：{{aitem.sales_sum}}件</view> -->
-																<view class="flex jc-sb ai-center">
-																	<view class='zs_wz5_x' wx:if="{{object.goodsnum}}">销量：{{aitem.sales_sum}}件</view>
-																	
-																	<!-- 购物车图标 -->
-																	<view class="icon-box" wx:if="{{object.goodcaricon != 1}}">
-																		<!-- 系统图标 -->
-																		<block wx:if="{{object.goodcaricon == 2}}">
-																			<image class="icon" src="{{url + '/miniapp/images/cart/group_goods_car_1.png'}}" wx:if="{{object.stylecaricon == 1}}" mode="widthFix"></image>
-																			<image class="icon" src="{{url + '/miniapp/images/cart/group_goods_car_2.png'}}" wx:if="{{object.stylecaricon == 2}}" mode="widthFix"></image>
-																			<text class="icon-text" wx:if="{{object.stylecaricon == 3}}">马上抢</text>
-																			<text class="icon-text" wx:if="{{object.stylecaricon == 4}}">立即购买</text>
-																		</block>
-																		<!-- 自定义图标 -->
-																		<block wx:if="{{object.goodcaricon == 3}}">
-																			<image class="icon icon2" src="{{object.customcaricon}}" mode="widthFix"></image>
-																		</block>
-																	</view>
-																</view>
-                                <view style="height: 10rpx;"></view>
-                            </view>
+                              </view>
+                            </block>
+                            <block wx:else>
+                              <view class="money flex">
+                                <!-- 办卡价 -->
+                                <view class="flex xc-wc">
+                                  <view class="fs24 wz_red">￥</view>
+                                  <view class="fs35 wz_red">{{filter.toFix(aitem.shop_price,2)}}</view>
+                                </view>
+                              </view>
+                              <view class="flex" style="line-height: 28rpx;">
+                                <!-- 原价 -->
+                                <view wx:if="{{is_retail_price}}" class="price flex xc-ash line_th ~no_line_x">
+                                  <view class="fs22">￥</view>
+                                  <view class="fs22">{{aitem.market_price}}</view>
+                                </view>
+                              </view>
+                            </block>
+                          </block>
+                        </block>
+                        <block wx:else>
+                          <view class='wz_red'>￥{{aitem.shop_price}}</view>
+                          <view wx:if="{{is_retail_price}}" class='del ~no_line_x'>￥{{aitem.market_price}}</view>
+                        </block>
+                      </block>
+                    </view>
+                    <!-- <view class='zs_wz5_3l' wx:if="{{object.goodsnum}}">销量：{{aitem.sales_sum}}件</view> -->
+                    <view class="flex jc-sb ai-center">
+                      <view class='zs_wz5_x' wx:if="{{object.goodsnum}}">销量：{{aitem.sales_sum}}件</view>
-                        </view>
-                    </navigator>
-                </block>
-            </swiper-item>
-        </view>
-    </swiper>
+                      <!-- 购物车图标 -->
+                      <view class="icon-box" wx:if="{{object.goodcaricon != 1}}">
+                        <!-- 系统图标 -->
+                        <block wx:if="{{object.goodcaricon == 2}}">
+                          <image class="icon" src="{{url + '/miniapp/images/cart/group_goods_car_1.png'}}" wx:if="{{object.stylecaricon == 1}}" mode="widthFix"></image>
+                          <image class="icon" src="{{url + '/miniapp/images/cart/group_goods_car_2.png'}}" wx:if="{{object.stylecaricon == 2}}" mode="widthFix"></image>
+                          <text class="icon-text" wx:if="{{object.stylecaricon == 3}}">马上抢</text>
+                          <text class="icon-text" wx:if="{{object.stylecaricon == 4}}">立即购买</text>
+                        </block>
+                        <!-- 自定义图标 -->
+                        <block wx:if="{{object.goodcaricon == 3}}">
+                          <image class="icon icon2" src="{{object.customcaricon}}" mode="widthFix"></image>
+                        </block>
+                      </view>
+                    </view>
+                    <view style="height: 10rpx;"></view>
+                  </view>
-</view>
-<view class="nodata-title" wx:elif="{{is_get}}">暂无数据</view>
-<view class="flex jcc loader" wx:else>
-    <image style="width: 40rpx; height: 40rpx; " src="{{url}}/miniapp/images/loader.gif"></image>
-</view>
+                </view>
+              </navigator>
+            </block>
+          </swiper-item>
+        </view>
+      </swiper>
+    </view>
+    <view class="nodata-title" wx:elif="{{is_get}}">暂无数据</view>
+    <view class="flex jcc loader" wx:else>
+      <image style="width: 40rpx; height: 40rpx; " src="{{url}}/miniapp/images/loader.gif"></image>
+    </view>
+  </block>
 </view>
 \ No newline at end of file
@@ -919,3 +919,291 @@ top: 10rpx;
 .jcc{ justify-content: center;}
 .loader{ width:750rpx; margin:20rpx 0}
+.ellipsis-2n {
+ 
+  /* height: 97rpx; */
+  overflow: hidden;
+  text-overflow: ellipsis;
+  display: -webkit-box;
+  -webkit-box-orient: vertical;
+  -webkit-line-clamp: 2;
+}
+.pdlf10{
+  padding: 0 10rpx;
+}
+.new_item1{
+  width: 100%;
+  overflow: hidden;
+}
+
+.new_item1_image{
+  width: 100%;
+  /* max-width: 100%;
+  max-height: 100%; */ 
+}
+.new_item1_time{
+  height: 50rpx;
+  background: #f23030;
+  color: #fff;
+  /* font-size: 25rpx; */
+  font-size: 24rpx;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  opacity:.8;
+  /* padding: 0rpx 30rpx; */
+  
+}
+.new_item1_time image{
+  width: 188rpx;
+  height: 52rpx;
+}
+.new_item1_goods_name{
+  padding: 10rpx 10rpx 0rpx;
+  /* font-size: 26rpx; */
+  font-size: 28rpx;
+  width: 100%;
+  box-sizing: border-box;
+  color: #333333;
+}
+.new_item1_price{
+  display: flex;
+  /* padding: 0 10rpx; */
+  align-items: center;
+  justify-content: space-between;
+  /* font-size: 26rpx; */
+  font-size: 24rpx;
+  padding: 0 10rpx 10rpx;
+}
+.clor{
+  /* color: rgba(196, 24, 45, 1); */
+  color: #ec0022 !important;
+}
+.clor7b{
+  color: #7b7b7b;
+}
+.new_item1_but{
+  width: 130rpx;
+  height: 60rpx;
+  color: #fff;
+  background-color: #f23030;
+  line-height: 60rpx;
+  text-align: center;
+  border-radius: 15rpx;
+}
+.new_item1_but1{
+  border-radius: 50rpx !important;
+}
+.new_item1_but2{
+  border-radius: 50rpx !important;
+  background-color: rgba(0, 0, 0, 0) !important;
+  color: #f23030 !important;
+  border: 1rpx solid #f23030 !important;
+}
+.new_item1_but3{
+  background-color: rgba(0, 0, 0, 0) !important;
+  color: #f23030 !important;
+  border: 1rpx solid #f23030 !important;
+}
+
+
+
+
+.new_item1_box{
+  /* padding-top: 17rpx; */
+  width: 100%;
+  box-sizing: border-box;
+  overflow: hidden;
+}
+
+.aborder{
+  border: 1px solid #e8e8e8;
+}
+.bgf{
+  background-color: #fff;
+}
+.boxsha{
+  /* box-shadow: 0px 2px 2px 0px rgba(0, 0, 0, 0.25); */
+  /* box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.2), 0 6px 20px 0 rgba(0, 0, 0, 0.19); */
+  box-shadow: 0 2px 4px 0 rgba(0, 0, 0, 0.2), 0 3px 10px 0 rgba(0, 0, 0, 0.19);
+}
+.but_radius85{
+  border-radius:289rpx;
+}
+.but_radius5{
+  border-radius:8px;
+}
+.imgBox{
+  position: relative;
+}
+.imgBox_img{
+  position: absolute;
+  left: 0;
+  top: 0;
+  width: 74rpx;
+  height: 70rpx;
+  
+}
+
+.aspect_ratio1{
+  aspect-ratio:1/1;
+}
+.aspect_ratio2{
+  aspect-ratio:16/9;
+}
+.aspect_ratio3{
+  aspect-ratio:3/2;
+}
+.aspect_ratio4{
+  aspect-ratio:3/4;
+}
+.container1 {
+  position: relative;
+  width:100%;
+  padding-top: 100%; 
+  overflow: hidden; 
+}
+.container2 {
+  position: relative;
+  width:100%;
+  padding-top: 56.25%; 
+  overflow: hidden; 
+}
+.container3 {
+  position: relative;
+  width:100%;
+  padding-top: 66.67%; 
+  overflow: hidden; 
+}
+.container4 {
+  position: relative;
+  width:100%;
+  padding-top: 133.33%; 
+  overflow: hidden; 
+  
+}
+
+.images1 {
+  display: block;
+  position: absolute;
+  width: 100%;
+  height: 100%;
+  top: 0;
+  bottom: 0;
+  left: 0;
+  right: 0;
+  object-fit: cover;
+  
+}
+
+.flex2{
+  display: flex;
+  /* align-items: center; */
+  justify-content: space-between;
+  flex-wrap: wrap;
+  box-sizing: border-box;
+}
+.flex2:after {
+  content: "";
+  width: 30%;
+  height: 0px;
+  visibility: hidden;
+  }
+
+  .boxpad{
+    /* padding:11rpx 9rpx; */
+    box-sizing: border-box;
+  }
+  .pricefs28{
+    font-size: 28rpx !important;
+  }
+  .pricefs42{
+    font-size: 42rpx !important;
+  }
+  .pricefs38{
+    font-size: 38rpx !important;
+  }
+  .imgbox1{
+    width: 60rpx;
+    height: 60rpx;
+  }
+  .topBox{
+    position: relative;
+  }
+
+  .item_float{
+    position: absolute;
+    bottom: 0;
+    left: 0;
+    width: 100%;
+    box-sizing: border-box;
+  }
+
+
+  /* 新版tab样式 */
+  .tabBox{
+		min-width: 100%;
+		/*height: 30px;*/
+		padding: 10rpx 0;
+		display: flex;
+		align-items: center;
+		/*justify-content: space-around;*/
+		font-size: 28rpx;
+		font-weight: bold;
+    overflow-x: auto;
+    margin-bottom: 20rpx;
+		/* min-width: 25%; */
+  }
+   
+/* 不显示滚动条 */
+.tabBox::-webkit-scrollbar {
+  display: none;
+}
+	.tab{
+		/*flex-grow: 1;*/
+		flex-shrink: 0;
+		/*color: #f23030;*/
+		padding: 0 20rpx;
+		/* padding: 0 35rpx; */
+		color: rgba(166, 166, 166, 1);
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		height: 100%;
+		position: relative;
+		margin: auto;
+		/* min-width: 25%; */
+	}
+	.tab1{
+		position: absolute;
+		bottom: -8rpx;
+		left: 0;
+		right: 0;
+		margin: auto;
+		width: 40%;
+		height: 4rpx;
+    /* background-color: rgba(196,24,45,.8); */
+    background-color: #f23030;
+    opacity: .8;
+	}
+	.tab_action{
+		background-color: #f23030;
+    color: #fff;
+    border: none !important;
+    opacity: .8;
+		/* border-color: #f23030 !important; */
+	}
+	.tab2{
+		padding: 0 !important;
+	}
+	.tab2 view{
+		padding: 10rpx 35rpx;
+		flex-grow: 1;
+	}
+	.tab3{
+		padding: 6rpx 16rpx;
+		border: 1px solid rgba(166, 166, 166, 1);
+    border-radius: 20rpx;
+    box-sizing: border-box;
+	}
+
@@ -23,7 +23,7 @@ var g_filters = {
 				case 1: return "border_yuanjiao";   
 			}
 			return "";
-		}
+		},
 	    //-- 判断是不是有等级价 --
 	    is_has_rank:function(rank_switch,item){
@@ -456,7 +456,7 @@
           <advertising object="{{item.content}}"></advertising>
         </block>
         <!--商品分组-->
-        <block wx:if="{{item.ename=='goodsGroup'}}">
+        <block wx:if="{{item.ename=='goodsGroup' || item.ename=='goodsGroupNew'}}">
           <goodsGroup class="{{'goodsGroup' + index}}" object="{{item.content}}" sticky="{{template_arr[0].content.is_top}}"></goodsGroup>
         </block>
@@ -13,10 +13,13 @@
       <block wx:if="{{item.ename=='advertising'}}">
         <advertising object="{{item.content}}"></advertising>
       </block>
-      <!--商品分组-->
-      <block wx:if="{{item.ename=='goodsGroup'}}">
+      <!--商品分组--> 
+      <block wx:if="{{item.ename=='goodsGroup' || item.ename=='goodsGroupNew'}}">
         <goodsGroup class="{{'goodsGroup' + index}}" object="{{item.content}}"></goodsGroup>
       </block>
+      <!-- <block wx:if="{{item.ename=='goodsGroupNew'}}">
+        <diy_public class="{{'goodsGroup' + index}}" object="{{item.content}}" prom_type="21"></diy_public>
+      </block> -->
       <!--通知-->
       <block wx:if="{{item.ename=='notice'}}">
         <notice object="{{item.content}}"></notice>