diff --git a/components/diy_goodsGroup/diy_goodsGroup.js b/components/diy_goodsGroup/diy_goodsGroup.js
index 202374c..1aa3464 100644
--- a/components/diy_goodsGroup/diy_goodsGroup.js
+++ b/components/diy_goodsGroup/diy_goodsGroup.js
@@ -1,579 +1,584 @@
 var t = getApp(),
-  a = t.request,
-  o = t.globalData.setting,
-  os = o,
-  i = require("../../utils/util.js"),
-  ut = i,
-  s = require("../../utils/common.js");
+	a = t.request,
+	o = t.globalData.setting,
+	os = o,
+	i = require("../../utils/util.js"),
+	ut = i,
+	s = require("../../utils/common.js");
 var regeneratorRuntime = require('../../utils/runtime.js');
 
 Component({
-  properties: {
-    // 这里定义了innerText属性，属性值可以在组件使用时指定
-    object: {
-      type: Object,
-      value: null,
-    },
-
-  },
-  data: {
-    // 这里是一些组件内部数据
-    group: false,
-    imghost: o.imghost,
-    is_recommend: 0,
-    is_hot: 0,
-    is_new: 0,
-    baseUrl: "/api/weshop/goods/page",
-    resourceUrl: t.globalData.setting.resourceUrl,
-    url: t.globalData.setting.imghost,
-    currentPage: 1,
-    requestData: null,
-    requestUrl: "",
-    goods_array: null,
-    total: null,
-    prom_id: 0,
-    classstyle_id: null,
-    g_id: null,
-    wgroup: null,
-    goods_btn: null,
-    loadText: '加载更多',
-    someData: {},
-    goodscount: null,
-    firist_type_data: null,
-    firist_type_curr: 0,
-	is_nav:0,
-	nav_list:null,
-	title_index:0,
-	swiper_hei:0,
-	title_class:"",
-  },
-
-  ready: function () {},
-  
-  lifetimes: {
-    attached: function() {
-
-
-	  //要兼容性的写法，因为有些商家都还未更新商品分组的最新的效果~~3.0公众号的html页面所以不用兼容写法	
-	  var nav_item=this.data.object;					
-	  var nav_list=	this.data.object.nav_list;
-
-	  if(parseInt(nav_item.is_automore)){
-          if(!getApp().globalData.func_list) getApp().globalData.func_list=[];
-          getApp().globalData.func_list.push(this);
-	  }
-
-
-	  //最新的版本才有nav_list
-	  if(nav_list){
-		  nav_item=nav_list[0];
-		  //要算一下商品goodsid   
-		  for(var ij in nav_list){
-		  		  var item=nav_list[ij];
-		  		  var idlist="";
-		  		  //如果商品有手动选择的时候
-		  		  if(item.data && item.data.length>0){
-		  			  for(var im in item.data){
-		  				 idlist+= item.data[im]+",";
-		  			  }
-		  		  }
-		  		  if(idlist) idlist=ut.sub_last(idlist);
-		  		  nav_list[ij].idlist=idlist;
-		  }		  	  
-		  this.setData({nav_list:nav_list,is_nav:parseInt(this.data.object.is_nav)});
-	  }
-	   	   		
-      // 在组件实例进入页面节点树时执行
-	  if(nav_item) {
-		   this.data.classstyle_id = nav_item.classstyle;  
-		   this.data.wgroup =nav_item.wgroup;
-	  } 
-        
-      this.data.goodscount = this.data.object.goodscount;
-    
-	  
-	  var hei=280;
-	  if(this.data.object.goodstit) hei+=80;
-	  if(this.data.object.goodsprice) hei+=80;
-	  if(this.data.object.goodsnum)  hei+=80;
-  
-	  if(this.data.object.title_color){
-				this.data.title_class=`color:${this.data.object.title_color};`
-		}
+	properties: {
+		// 这里定义了innerText属性，属性值可以在组件使用时指定
+		object: {
+			type: Object,
+			value: null,
+		},
 
-		if(this.data.object.title_font_size){
-			this.data.title_class=this.data.title_class.concat(`font-size:${this.data.object.title_font_size}px;`)
-		}
-		this.setData({
-			swiper_hei:hei,
-			title_class:this.data.title_class,
-		});
-	  
-      if (nav_item && nav_item.goodsclass == 1) {
-        this.data.is_recommend = 1
-      }
-      if (nav_item && nav_item.goodsclass == 2) {
-        this.data.is_hot = 1
-      }
-      if (nav_item && nav_item.goodsclass == 3) {
-        this.data.is_new = 1
-      }
-	  
-      this.data.requestData = new Array();
-      this.data.g_id = nav_item.data;
-      var arr = [];
-
-      for (var i = 0; i < this.data.g_id.length; i += this.data.goodscount) {
-        arr.push(this.data.g_id.slice(i, i + this.data.goodscount));
-      }
-      this.data.firist_type_data = arr;
-      this.init(this.data.classstyle_id, this.data.wgroup);
-    },
-    detached: function() {
-      // 在组件实例被从页面节点树移除时执行
-    },
-  },
-
-  pageLifetimes: {
-    //游客登录后，只要更新卡的情况
-    show: function () {
-        //--初始化卡类--
-        this.card_init();
-    },
-  },
-
-  methods: {
-    // 这里是一个自定义方法
-    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;
-      if (classstyle_id == 1) {
-        //---手动选择的时候---
-        g_id = this.data.firist_type_data[th.data.firist_type_curr];
-        th.data.firist_type_curr++;
-      }
-
-      var th = this,
-          app = getApp(),
-          index = 0,
-          gdata = [];
-
-        var user_id=getApp().globalData.user_id;
-        if(!user_id) user_id=0;
-
-      //--初始化卡类--
-      th.card_init();
-      var os=getApp().globalData.setting;
-      classstyle_id = classstyle_id + "";
-      switch (classstyle_id) {
-        //---手动选择商品---
-        case "1":      
-          var str="";
-          for (var i = 0; i < g_id.length; i++) {
-            str += g_id[i].goodsid + ",";           
-          }
-          str=str.substring(0, str.length - 1);
-
-          await app.request.get("/api/weshop/goods/getgoodslistOrdby?store_id=" + os.stoid + "&goodsidlist=" + str,  {
-          	    data:{user_id:user_id},
-			    isShowLoading:false,  
-			    success: function(res) {
-                     th.data.loading=0;
-				
-					 if(res.data.code==0 && res.data.data){
-
-                            var goods = res.data.data;
-                            /*--
-						   var rData = th.data.requestData;
-						   if (rData == null) rData=[];
-						   var now=ut.gettimestamp();
-						   
-						   var new_arr=[];
-						   for (var ii in res.data.data){
-							    var item=res.data.data[ii];
-								item.goods_img=th.data.imghost + item.original_img;
-								if(item.e_time<now) {item.prom_type=0; item.prom_price=0;}
-							    if(item.warm_uptime>now) {item.prom_type=0; item.prom_price=0;}
-								new_arr.push(item);
-						   }   
-						   rData = rData.concat(new_arr);
-
-						   th.data.requestData = rData;
-						   
-						   if(th.data.object.column==5){
-							   var arr = new Array();
-							   //--三个三个一组---
-							   for(var i=0;i< rData.length;i+=3){
-							     arr.push(rData.slice(i,i+3));
-							   }
-							   th.setData({ goods_array: arr  });  
-						   }else{
-							   th.setData({ goods_array: rData  });  
-						   }--*/
-
-                         th.set_good(goods);
-
-						 //---控制有没有加载更多的按钮---
-						 if (th.data.firist_type_curr >= len) {th.setData({ goods_btn: [] }); }
-						 else  th.setData({ goods_btn: [1,2]});                   
+	},
+	data: {
+		// 这里是一些组件内部数据
+		group: false,
+		imghost: o.imghost,
+		is_recommend: 0,
+		is_hot: 0,
+		is_new: 0,
+		baseUrl: "/api/weshop/goods/page",
+		resourceUrl: t.globalData.setting.resourceUrl,
+		url: t.globalData.setting.imghost,
+		currentPage: 1,
+		requestData: null,
+		requestUrl: "",
+		goods_array: null,
+		total: null,
+		prom_id: 0,
+		classstyle_id: null,
+		g_id: null,
+		wgroup: null,
+		goods_btn: null,
+		loadText: '加载更多',
+		someData: {},
+		goodscount: null,
+		firist_type_data: null,
+		firist_type_curr: 0,
+		is_nav: 0,
+		nav_list: null,
+		title_index: 0,
+		swiper_hei: 0,
+		title_class: "",
+	},
+
+	ready: function () { },
+
+	lifetimes: {
+		attached: function () {
+
+
+			//要兼容性的写法，因为有些商家都还未更新商品分组的最新的效果~~3.0公众号的html页面所以不用兼容写法	
+			var nav_item = this.data.object;
+			var nav_list = this.data.object.nav_list;
+
+			if (parseInt(nav_item.is_automore)) {
+				if (!getApp().globalData.func_list) getApp().globalData.func_list = [];
+				getApp().globalData.func_list.push(this);
+			}
+
+
+			//最新的版本才有nav_list
+			if (nav_list) {
+				nav_item = nav_list[0];
+				//要算一下商品goodsid   
+				for (var ij in nav_list) {
+					var item = nav_list[ij];
+					var idlist = "";
+					//如果商品有手动选择的时候
+					if (item.data && item.data.length > 0) {
+						for (var im in item.data) {
+							idlist += item.data[im] + ",";
+						}
 					}
+					if (idlist) idlist = ut.sub_last(idlist);
+					nav_list[ij].idlist = idlist;
 				}
-			  
-		  })
-       
-          break;
-        case "2":
-          var item = {};
-           var  r_data={
-                    store_id: os.stoid ,
-                    pageSize: th.data.goodscount,
-                    page: th.data.currentPage,
-                    isonsale: 1,
-					orderField: "sort",
-					orderType: 'asc',
-            };
-           if(th.data.is_recommend) r_data.is_recommend=th.data.is_recommend;
-           if(th.data.is_hot) r_data.is_hot=th.data.is_hot;
-           if(th.data.is_new) r_data.is_new=th.data.is_new;
-
-            var user_id=getApp().globalData.user_id;
-            if(!user_id) user_id=0;
-            r_data.user_id=user_id;
-
-         await app.request.promiseGet("/api/weshop/goods/page", {
-              data:r_data
-          }).then(res => {
-            th.data.loading=0;
-            //商品地址
-            var goods = res.data.data.pageData;
-            th.setData({
-              goods_btn: res.data.data.pageData,
-              total: res.data.data.total
-            })
-            th.data.currentPage++;
-            //设置商品熏染
-            th.set_good(goods);
-
-          })
-          break;
-        case "3":
-          var item = {};
-          await app.request.promiseGet("/api/weshop/goodsGroup/pageGoodsList", {
-            data: {
-              store_id:os.stoid  ,
-              gpid: wgroup,
-              pageSize: th.data.goodscount,
-              page: th.data.currentPage,
-			  isonsale: 1,
-			  orderField: "sort",
-			  orderType: 'asc',
-			  user_id:user_id
-            }
-          }).then(res => {
-            th.data.loading=0;
-            //商品地址
-            var goods = res.data.data.pageData;
-            th.setData({
-              goods_btn: res.data.data.pageData, total: res.data.data.total
-            })
-
-            th.data.currentPage++;		
-			//设置商品熏染	
-			th.set_good(goods);
-            
-          })
-          break;
-      }
-    },
-
-    setLoading: function () {
-      var that = this;
-      if(this.data.loading) return false;
-      this.data.loading=1;
-      that.init(that.data.classstyle_id, that.data.wgroup);
-    },
-
-    //图片失败，默认图片
-    bind_bnerr3: function (e) {
-      var _errImg = e.target.dataset.errorimg;
-      var _errObj = {};
-      _errObj[_errImg] = this.data.imghost + "/public/images/default_goods_image_240.gif";
-      this.setData(_errObj) //注意这里的赋值方式,只是将数据列表中的此项图片路径值替换掉 ;
-    },
-	
-	//---卡的初始化----
-	card_init: function() {
-	  var th = this,os=getApp().globalData.setting;
-	  if(!getApp().globalData.user_id) return false;  
-	  getApp().request.get("/api/weshop/users/get/" + os.stoid + "/" + getApp().globalData.user_id, {
-		isShowLoading:false,  
-	    success: function(e) {
-	      getApp().globalData.userInfo = e.data.data;
-	      getApp().getConfig2(function(e) {
-	        var swithc_list = e.switch_list;
-	        var sw_arr = JSON.parse(swithc_list);
-	        //---如果后台又开等级卡的开关---
-	        if (sw_arr.rank_switch && sw_arr.rank_switch == "2") {
-	          th.setData({
-	            rank_switch: true
-	          });
-	          //---回调卡的列表---
-	          th.getPlusCardType(function(ob) {
-	            th.setData({
-	              card_list: ob.card_list
-	            });
-	            var ti = setInterval(function() {
-	              var user = getApp().globalData.userInfo;
-	              if (!user) return false;
-	              clearInterval(ti);
-	
-	              if (user.card_field && user['card_expiredate']) {
-	                var str = user['card_expiredate'].replace(/-/g, '/');
-	                var end = new Date(str);
-	                end = Date.parse(end) / 1000;
-	                var now = ut.gettimestamp();
-	
-	                //--- 判断是等级会员，且在有效期范围内 ---
-	                if (user.card_field && now < end) {
-	                  var card_name = ob.name_map.get(user.card_field);
-	                  if (card_name.length > 4) card_name = card_name.substring(0, 4);
-	                  th.setData({
-	                    card_field: user.card_field,
-	                    card_name: card_name,
-	                    card_list: ob.card_list
-	                  });
-	                }
-
-	              }
-
-	            }, 500)
-	          })
-	
-	        }
-	      })
-	    }
-	  })
-	
-	},
-	
-	//---  获取卡类列表 ---
-	getPlusCardType: function(func) {
-	  var storid = o.stoid;
-	  var th = this;
-	  getApp().request.promiseGet("/api/weshop/plus/vip/mem/bership/list?" + "storeId=" + storid, {}).then(res => {
-	    var plusCard = res.data.data;
-	    var arr = [1219, 2089, 3031];
-	    var new_arr = new Array();
-	    var card_name_map = new Map();
-		
-		  var user = getApp().globalData.userInfo;
-		  
-		  if(plusCard) {
-		
-			for (var i = 0; i < plusCard.length; i++) {
-			  if ((!user || user.card_field == null || user.card_field == "") && (plusCard[i].IsStopBuy == true)) {
-				continue;
-			  }
-				
-			  var name = "card" + plusCard[i].CorrPrice.toLowerCase();
-			  card_name_map.set(name, plusCard[i].CardName);
-			  new_arr.push(plusCard[i]);
+				this.setData({ nav_list: nav_list, is_nav: parseInt(this.data.object.is_nav) });
 			}
-		  }
-	
-	    var ob = {
-	      "card_list": new_arr,
-	      "name_map": card_name_map
-	    };
-	    func(ob);
-	  })
+
+			// 在组件实例进入页面节点树时执行
+			if (nav_item) {
+				this.data.classstyle_id = nav_item.classstyle;
+				this.data.wgroup = nav_item.wgroup;
+			}
+
+			this.data.goodscount = this.data.object.goodscount;
+
+
+			var hei = 280;
+			if (this.data.object.goodstit) hei += 80;
+			if (this.data.object.goodsprice) hei += 80;
+			if (this.data.object.goodsnum) hei += 80;
+
+			if (this.data.object.title_color) {
+				this.data.title_class = `color:${this.data.object.title_color};`
+			}
+
+			if (this.data.object.title_font_size) {
+				this.data.title_class = this.data.title_class.concat(`font-size:${this.data.object.title_font_size}px;`)
+			}
+			if (this.data.object.bg_color) {
+				this.setData({
+					bg_color:this.data.object.bg_color,
+				})
+			}
+			this.setData({
+				swiper_hei: hei,
+				title_class: this.data.title_class,
+			});
+
+			if (nav_item && nav_item.goodsclass == 1) {
+				this.data.is_recommend = 1
+			}
+			if (nav_item && nav_item.goodsclass == 2) {
+				this.data.is_hot = 1
+			}
+			if (nav_item && nav_item.goodsclass == 3) {
+				this.data.is_new = 1
+			}
+
+			this.data.requestData = new Array();
+			this.data.g_id = nav_item.data;
+			var arr = [];
+
+			for (var i = 0; i < this.data.g_id.length; i += this.data.goodscount) {
+				arr.push(this.data.g_id.slice(i, i + this.data.goodscount));
+			}
+			this.data.firist_type_data = arr;
+			this.init(this.data.classstyle_id, this.data.wgroup);
+		},
+		detached: function () {
+			// 在组件实例被从页面节点树移除时执行
+		},
 	},
-	
-	//--- 点击tab的事件 ---
-	gr_set_nav:function(e){
-		
-		var title_idx=e.currentTarget.dataset.index;
-		if(title_idx==this.data.title_index) return false;	
-		wx.showLoading();
-						
-		var nav_item=this.data.object.nav_list[title_idx];	
-		this.data.g_id =[];
-		if(this.data.object.nav_list && this.data.object.nav_list[title_idx] && this.data.object.nav_list[title_idx].data)
-		     this.data.g_id=this.data.object.nav_list[title_idx].data;
-		var arr = [];		
-		for (var i = 0; i < this.data.g_id.length; i += this.data.goodscount) {
-		  arr.push(this.data.g_id.slice(i, i + this.data.goodscount));
-		}
-		this.data.firist_type_data = arr;
-		this.data.firist_type_curr=0;		
-		this.data.requestData=[];
-				
-		// 在组件实例进入页面节点树时执行
-		if(nav_item){
-			this.data.classstyle_id = nav_item.classstyle;
-			this.data.wgroup =nav_item.wgroup;	
-		}
-		
-		
-		this.data.is_recommend = this.data.is_hot=this.data.is_new=0;		
-		//推荐，热卖，新品			
-		if (nav_item && nav_item.goodsclass == 1) {
-		  this.data.is_recommend = 1
-		}
-		if (nav_item && nav_item.goodsclass == 2) {
-		  this.data.is_hot = 1
-		}
-		if (nav_item && nav_item.goodsclass == 3) {
-		  this.data.is_new = 1
-		}		
-				
-				
-		this.data.currentPage=1;	
-		this.setData({goods_array:null,total:null,title_index:title_idx});	
-		//初始化 	
-		this.init(this.data.classstyle_id, this.data.wgroup);
-		setTimeout(function(){ wx.hideLoading();},1000) 
+
+	pageLifetimes: {
+		//游客登录后，只要更新卡的情况
+		show: function () {
+			//--初始化卡类--
+			this.card_init();
+		},
 	},
 
-    //--- 设置 ---
-    set_good:async function(goods){
-		var now=ut.gettimestamp();		
-		var th=this;		
-		if(!goods || goods.length==0) return false;
-        var user_id=getApp().globalData.userInfo.user_id;
-        if(!user_id) user_id=0;
-		for(var i in goods){		
-			var val=goods[i];
-			var item = {};
-			var prom_id = null;
-			//app.request.promiseGet("/api/weshop/goods/get/" + os.stoid + "/" + val.goods_id, {}).then(res => {
-
-            var url="/api/weshop/activitylist/getGoodActInfo";
-            var req_data={
-                store_id:os.stoid,goodsidlist:val.goods_id,is_detail:1,user_id:user_id
-            };
-
-            //获取商品的实际活动
-            await getApp().request.promiseGet(url, {data:req_data}).then(res=>{
-                if(res.data.code==0 && res.data.data && res.data.data.length==1){
-                    item.prom_type=res.data.data[0].prom_type;
-                    item.prom_id=res.data.data[0].act_id;
-                }
-            })
-
-			item.goods_name = val.goods_name;
-			item.goods_img = th.data.imghost + val.original_img;
-			item.market_price = val.market_price;
-			item.shop_price = val.shop_price;
-			item.sales_sum = val.sales_sum;
-			item.goods_id = val.goods_id;
-					
-			item.cardprice1 = val.cardprice1;
-			item.cardprice2 = val.cardprice2;
-			item.cardprice3 = val.cardprice3;
-			item.prom_type = val.prom_type;
-			item.prom_id = val.prom_id;
-
-			if(val.prom_price)    item.prom_price = val.prom_price;
-			if(val.prom_integral) item.prom_integral = val.prom_integral;
-							
-			prom_id = val.prom_id;
-					
-			var prom_type = val.prom_type; //0普通商品  1秒杀  6拼单 2团购 4积分购
-					
-			var url = "";
-
-			 switch (prom_type){
-			 	case 1:
-                    var user_id=getApp().globalData.user_id;
-                    if(!user_id) user_id=0;
-                    url = "/api/ms/flash_sale/getNew/" +os.stoid + "/" +user_id+"/"+ prom_id;
-			 		break;
-			 	case 2:
-                    url ="/api/weshop/goods/groupBuy/getActInfo/" +os.stoid + "/" +val.goods_id+"/"+ prom_id
-			 		break;
-                case 4:
-                    url ="/api/weshop/integralbuy/get/"+os.stoid +"/"+prom_id;
-                    break;
-                case 6:
-                     url = "/api/weshop/teamlist/get/" + os.stoid + "/" + prom_id;
-                     break;
-                case 8:
-                    var presell_id = prom_id;
-                    var url1 = "/api/weshop/marketing/marketingPresellList/list";
-                    var rd= {
-                        store_id: os.stoid,
-                        presell_id: presell_id,
-                        goods_id: val.goods_id
-                    }
-                    //------获取预售从表----------
-                    await getApp().request.promiseGet(url1, {
-                        data: rd
-                    }).then(res => {
-                        if (res.data.code == 0 && res.data.data && res.data.data.length > 0) {
-                            var arr = res.data.data[0];
-                            item.prom_price = arr.luck_goods_price;
-                            item.sales_sum=arr.buy_goodnum+(arr.virtual_qty?arr.virtual_qty:0);
-                        }
-                    })
-                    break;
-			 	default:
-			 	 	break
-			 }
-
-			if(url!=null && url!=''){
-			 await getApp().request.promiseGet(url, {}).then(res => {
-			    var prom =null;
-			    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;
-			        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;
-			        var vNum1=res.data.data.virtualNum?res.data.data.virtualNum:0;
-			        var vNum2=res.data.data.virtual?res.data.data.virtual:0;
-                    item.sales_sum=res.data.data.buy_num+(vNum+vNum1+vNum2);
-			    }else{
-			    	item.prom_type=0;
-			    	item.prom_id=0;
-			    	item.prom_price=null;
+	methods: {
+		// 这里是一个自定义方法
+		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;
+			if (classstyle_id == 1) {
+				//---手动选择的时候---
+				g_id = this.data.firist_type_data[th.data.firist_type_curr];
+				th.data.firist_type_curr++;
+			}
+
+			var th = this,
+				app = getApp(),
+				index = 0,
+				gdata = [];
+
+			var user_id = getApp().globalData.user_id;
+			if (!user_id) user_id = 0;
+
+			//--初始化卡类--
+			th.card_init();
+			var os = getApp().globalData.setting;
+			classstyle_id = classstyle_id + "";
+			switch (classstyle_id) {
+				//---手动选择商品---
+				case "1":
+					var str = "";
+					for (var i = 0; i < g_id.length; i++) {
+						str += g_id[i].goodsid + ",";
+					}
+					str = str.substring(0, str.length - 1);
+
+					await app.request.get("/api/weshop/goods/getgoodslistOrdby?store_id=" + os.stoid + "&goodsidlist=" + str, {
+						data: { user_id: user_id },
+						isShowLoading: false,
+						success: function (res) {
+							th.data.loading = 0;
+
+							if (res.data.code == 0 && res.data.data) {
+
+								var goods = res.data.data;
+								/*--
+							   var rData = th.data.requestData;
+							   if (rData == null) rData=[];
+							   var now=ut.gettimestamp();
+							   
+							   var new_arr=[];
+							   for (var ii in res.data.data){
+									var item=res.data.data[ii];
+									item.goods_img=th.data.imghost + item.original_img;
+									if(item.e_time<now) {item.prom_type=0; item.prom_price=0;}
+									if(item.warm_uptime>now) {item.prom_type=0; item.prom_price=0;}
+									new_arr.push(item);
+							   }   
+							   rData = rData.concat(new_arr);
+	
+							   th.data.requestData = rData;
+							   
+							   if(th.data.object.column==5){
+								   var arr = new Array();
+								   //--三个三个一组---
+								   for(var i=0;i< rData.length;i+=3){
+									 arr.push(rData.slice(i,i+3));
+								   }
+								   th.setData({ goods_array: arr  });  
+							   }else{
+								   th.setData({ goods_array: rData  });  
+							   }--*/
+
+								th.set_good(goods);
+
+								//---控制有没有加载更多的按钮---
+								if (th.data.firist_type_curr >= len) { th.setData({ goods_btn: [] }); }
+								else th.setData({ goods_btn: [1, 2] });
+							}
+						}
+
+					})
+
+					break;
+				case "2":
+					var item = {};
+					var r_data = {
+						store_id: os.stoid,
+						pageSize: th.data.goodscount,
+						page: th.data.currentPage,
+						isonsale: 1,
+						orderField: "sort",
+						orderType: 'asc',
+					};
+					if (th.data.is_recommend) r_data.is_recommend = th.data.is_recommend;
+					if (th.data.is_hot) r_data.is_hot = th.data.is_hot;
+					if (th.data.is_new) r_data.is_new = th.data.is_new;
+
+					var user_id = getApp().globalData.user_id;
+					if (!user_id) user_id = 0;
+					r_data.user_id = user_id;
+
+					await app.request.promiseGet("/api/weshop/goods/page", {
+						data: r_data
+					}).then(res => {
+						th.data.loading = 0;
+						//商品地址
+						var goods = res.data.data.pageData;
+						th.setData({
+							goods_btn: res.data.data.pageData,
+							total: res.data.data.total
+						})
+						th.data.currentPage++;
+						//设置商品熏染
+						th.set_good(goods);
+
+					})
+					break;
+				case "3":
+					var item = {};
+					await app.request.promiseGet("/api/weshop/goodsGroup/pageGoodsList", {
+						data: {
+							store_id: os.stoid,
+							gpid: wgroup,
+							pageSize: th.data.goodscount,
+							page: th.data.currentPage,
+							isonsale: 1,
+							orderField: "sort",
+							orderType: 'asc',
+							user_id: user_id
+						}
+					}).then(res => {
+						th.data.loading = 0;
+						//商品地址
+						var goods = res.data.data.pageData;
+						th.setData({
+							goods_btn: res.data.data.pageData, total: res.data.data.total
+						})
+
+						th.data.currentPage++;
+						//设置商品熏染	
+						th.set_good(goods);
+
+					})
+					break;
+			}
+		},
+
+		setLoading: function () {
+			var that = this;
+			if (this.data.loading) return false;
+			this.data.loading = 1;
+			that.init(that.data.classstyle_id, that.data.wgroup);
+		},
+
+		//图片失败，默认图片
+		bind_bnerr3: function (e) {
+			var _errImg = e.target.dataset.errorimg;
+			var _errObj = {};
+			_errObj[_errImg] = this.data.imghost + "/public/images/default_goods_image_240.gif";
+			this.setData(_errObj) //注意这里的赋值方式,只是将数据列表中的此项图片路径值替换掉 ;
+		},
+
+		//---卡的初始化----
+		card_init: function () {
+			var th = this, os = getApp().globalData.setting;
+			if (!getApp().globalData.user_id) return false;
+			getApp().request.get("/api/weshop/users/get/" + os.stoid + "/" + getApp().globalData.user_id, {
+				isShowLoading: false,
+				success: function (e) {
+					getApp().globalData.userInfo = e.data.data;
+					getApp().getConfig2(function (e) {
+						var swithc_list = e.switch_list;
+						var sw_arr = JSON.parse(swithc_list);
+						//---如果后台又开等级卡的开关---
+						if (sw_arr.rank_switch && sw_arr.rank_switch == "2") {
+							th.setData({
+								rank_switch: true
+							});
+							//---回调卡的列表---
+							th.getPlusCardType(function (ob) {
+								th.setData({
+									card_list: ob.card_list
+								});
+								var ti = setInterval(function () {
+									var user = getApp().globalData.userInfo;
+									if (!user) return false;
+									clearInterval(ti);
+
+									if (user.card_field && user['card_expiredate']) {
+										var str = user['card_expiredate'].replace(/-/g, '/');
+										var end = new Date(str);
+										end = Date.parse(end) / 1000;
+										var now = ut.gettimestamp();
+
+										//--- 判断是等级会员，且在有效期范围内 ---
+										if (user.card_field && now < end) {
+											var card_name = ob.name_map.get(user.card_field);
+											if (card_name.length > 4) card_name = card_name.substring(0, 4);
+											th.setData({
+												card_field: user.card_field,
+												card_name: card_name,
+												card_list: ob.card_list
+											});
+										}
+
+									}
+
+								}, 500)
+							})
+
+						}
+					})
 				}
+			})
+
+		},
 
-			    th.data.requestData.push(item);
-			  })
-			}else{
-			  th.data.requestData.push(item);
+		//---  获取卡类列表 ---
+		getPlusCardType: function (func) {
+			var storid = o.stoid;
+			var th = this;
+			getApp().request.promiseGet("/api/weshop/plus/vip/mem/bership/list?" + "storeId=" + storid, {}).then(res => {
+				var plusCard = res.data.data;
+				var arr = [1219, 2089, 3031];
+				var new_arr = new Array();
+				var card_name_map = new Map();
+
+				var user = getApp().globalData.userInfo;
+
+				if (plusCard) {
+
+					for (var i = 0; i < plusCard.length; i++) {
+						if ((!user || user.card_field == null || user.card_field == "") && (plusCard[i].IsStopBuy == true)) {
+							continue;
+						}
+
+						var name = "card" + plusCard[i].CorrPrice.toLowerCase();
+						card_name_map.set(name, plusCard[i].CardName);
+						new_arr.push(plusCard[i]);
+					}
+				}
+
+				var ob = {
+					"card_list": new_arr,
+					"name_map": card_name_map
+				};
+				func(ob);
+			})
+		},
+
+		//--- 点击tab的事件 ---
+		gr_set_nav: function (e) {
+
+			var title_idx = e.currentTarget.dataset.index;
+			if (title_idx == this.data.title_index) return false;
+			wx.showLoading();
+
+			var nav_item = this.data.object.nav_list[title_idx];
+			this.data.g_id = [];
+			if (this.data.object.nav_list && this.data.object.nav_list[title_idx] && this.data.object.nav_list[title_idx].data)
+				this.data.g_id = this.data.object.nav_list[title_idx].data;
+			var arr = [];
+			for (var i = 0; i < this.data.g_id.length; i += this.data.goodscount) {
+				arr.push(this.data.g_id.slice(i, i + this.data.goodscount));
+			}
+			this.data.firist_type_data = arr;
+			this.data.firist_type_curr = 0;
+			this.data.requestData = [];
+
+			// 在组件实例进入页面节点树时执行
+			if (nav_item) {
+				this.data.classstyle_id = nav_item.classstyle;
+				this.data.wgroup = nav_item.wgroup;
+			}
+
+
+			this.data.is_recommend = this.data.is_hot = this.data.is_new = 0;
+			//推荐，热卖，新品			
+			if (nav_item && nav_item.goodsclass == 1) {
+				this.data.is_recommend = 1
+			}
+			if (nav_item && nav_item.goodsclass == 2) {
+				this.data.is_hot = 1
+			}
+			if (nav_item && nav_item.goodsclass == 3) {
+				this.data.is_new = 1
+			}
+
+
+			this.data.currentPage = 1;
+			this.setData({ goods_array: null, total: null, title_index: title_idx });
+			//初始化 	
+			this.init(this.data.classstyle_id, this.data.wgroup);
+			setTimeout(function () { wx.hideLoading(); }, 1000)
+		},
+
+		//--- 设置 ---
+		set_good: async function (goods) {
+			var now = ut.gettimestamp();
+			var th = this;
+			if (!goods || goods.length == 0) return false;
+			var user_id = getApp().globalData.userInfo.user_id;
+			if (!user_id) user_id = 0;
+			for (var i in goods) {
+				var val = goods[i];
+				var item = {};
+				var prom_id = null;
+				//app.request.promiseGet("/api/weshop/goods/get/" + os.stoid + "/" + val.goods_id, {}).then(res => {
+
+				var url = "/api/weshop/activitylist/getGoodActInfo";
+				var req_data = {
+					store_id: os.stoid, goodsidlist: val.goods_id, is_detail: 1, user_id: user_id
+				};
+
+				//获取商品的实际活动
+				await getApp().request.promiseGet(url, { data: req_data }).then(res => {
+					if (res.data.code == 0 && res.data.data && res.data.data.length == 1) {
+						item.prom_type = res.data.data[0].prom_type;
+						item.prom_id = res.data.data[0].act_id;
+					}
+				})
+
+				item.goods_name = val.goods_name;
+				item.goods_img = th.data.imghost + val.original_img;
+				item.market_price = val.market_price;
+				item.shop_price = val.shop_price;
+				item.sales_sum = val.sales_sum;
+				item.goods_id = val.goods_id;
+
+				item.cardprice1 = val.cardprice1;
+				item.cardprice2 = val.cardprice2;
+				item.cardprice3 = val.cardprice3;
+				item.prom_type = val.prom_type;
+				item.prom_id = val.prom_id;
+
+				if (val.prom_price) item.prom_price = val.prom_price;
+				if (val.prom_integral) item.prom_integral = val.prom_integral;
+
+				prom_id = val.prom_id;
+
+				var prom_type = val.prom_type; //0普通商品  1秒杀  6拼单 2团购 4积分购
+
+				var url = "";
+
+				switch (prom_type) {
+					case 1:
+						var user_id = getApp().globalData.user_id;
+						if (!user_id) user_id = 0;
+						url = "/api/ms/flash_sale/getNew/" + os.stoid + "/" + user_id + "/" + prom_id;
+						break;
+					case 2:
+						url = "/api/weshop/goods/groupBuy/getActInfo/" + os.stoid + "/" + val.goods_id + "/" + prom_id
+						break;
+					case 4:
+						url = "/api/weshop/integralbuy/get/" + os.stoid + "/" + prom_id;
+						break;
+					case 6:
+						url = "/api/weshop/teamlist/get/" + os.stoid + "/" + prom_id;
+						break;
+					case 8:
+						var presell_id = prom_id;
+						var url1 = "/api/weshop/marketing/marketingPresellList/list";
+						var rd = {
+							store_id: os.stoid,
+							presell_id: presell_id,
+							goods_id: val.goods_id
+						}
+						//------获取预售从表----------
+						await getApp().request.promiseGet(url1, {
+							data: rd
+						}).then(res => {
+							if (res.data.code == 0 && res.data.data && res.data.data.length > 0) {
+								var arr = res.data.data[0];
+								item.prom_price = arr.luck_goods_price;
+								item.sales_sum = arr.buy_goodnum + (arr.virtual_qty ? arr.virtual_qty : 0);
+							}
+						})
+						break;
+					default:
+						break
+				}
+
+				if (url != null && url != '') {
+					await getApp().request.promiseGet(url, {}).then(res => {
+						var prom = null;
+						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;
+							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;
+							var vNum1 = res.data.data.virtualNum ? res.data.data.virtualNum : 0;
+							var vNum2 = res.data.data.virtual ? res.data.data.virtual : 0;
+							item.sales_sum = res.data.data.buy_num + (vNum + vNum1 + vNum2);
+						} else {
+							item.prom_type = 0;
+							item.prom_id = 0;
+							item.prom_price = null;
+						}
+
+						th.data.requestData.push(item);
+					})
+				} 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, });
+			} else {
+				th.setData({
+					goods_array: th.data.requestData,
+					page: th.data.currentPage - 1,
+				});
+			}
+
+		},
+
+		re_show: function () {
+			if (this.data.object.goodscount * this.data.page < this.data.total) {
+				this.setLoading()
 			}
 		}
-		
-		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, });  
-		}else{
-			th.setData({
-				goods_array: th.data.requestData,
-				page: th.data.currentPage - 1,
-			});
-		}
-				
-	},
 
-	re_show:function () {
-        if(this.data.object.goodscount *this.data.page <this.data.total ){
-            this.setLoading()
-        }
-    }
 
 
 
-	
-  }
+	}
 })
\ No newline at end of file
diff --git a/components/diy_goodsGroup/diy_goodsGroup.wxml b/components/diy_goodsGroup/diy_goodsGroup.wxml
index 910b23a..670e32c 100644
--- a/components/diy_goodsGroup/diy_goodsGroup.wxml
+++ b/components/diy_goodsGroup/diy_goodsGroup.wxml
@@ -4,33 +4,32 @@
 
 <!-- 要不要顶部标题 -->
 <block wx:if="{{is_nav}}">
-	 <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>
+    <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>
 </block>
 
 
 
-<!--1个列表的时候-->
-<view class="zs_goods_wai" wx:if='{{object.column==1}}'>
-       <block wx:for="{{goods_array}}" >
+<view style="background-color: {{bg_color}};">
+    <!--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"> -->
+                <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>
+                                <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>
+                            <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 wx:if="{{object.goodicon==3}}">
@@ -40,206 +39,500 @@
                             <image class='{{g_filter.get_class(object.column,object.position)}}' src=''></image>
                         </block>
                         <block wx:if="{{object.goodicon==2}}">
-                            <image class='{{g_filter.get_class(object.column,object.position)}}' wx:if="{{object.styleicon==1}}"
-                                   src='{{imghost}}/miniapp/images/Recommend.png'></image>
-                            <image class='{{g_filter.get_class(object.column,object.position)}}' wx:if="{{object.styleicon==2}}"
-                                   src='{{imghost}}/miniapp/images/hot.png'></image>
-                            <image class='{{g_filter.get_class(object.column,object.position)}}' wx:if="{{object.styleicon==3}}"
-                                   src='{{imghost}}/miniapp/images/new.png'></image>
-                            <image class='{{g_filter.get_class(object.column,object.position)}}' wx:if="{{object.styleicon==4}}"
-                                   src='{{imghost}}/miniapp/images/Promotion.png'></image>
+                            <image class='{{g_filter.get_class(object.column,object.position)}}' wx:if="{{object.styleicon==1}}" src='{{imghost}}/miniapp/images/Recommend.png'></image>
+                            <image class='{{g_filter.get_class(object.column,object.position)}}' wx:if="{{object.styleicon==2}}" src='{{imghost}}/miniapp/images/hot.png'></image>
+                            <image class='{{g_filter.get_class(object.column,object.position)}}' wx:if="{{object.styleicon==3}}" src='{{imghost}}/miniapp/images/new.png'></image>
+                            <image class='{{g_filter.get_class(object.column,object.position)}}' wx:if="{{object.styleicon==4}}" src='{{imghost}}/miniapp/images/Promotion.png'></image>
                         </block>
                     </view>
                     <view 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 class='del'>￥{{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 class="price flex xc-ash line_th">
-                                                     <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 class="price flex xc-ash line_th">
-                                                     <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 wz_red">￥</view>
-                                                     <view class="fs35 wz_red">{{filter.toFix(item.shop_price,2)}}</view>
-                                                 </view>
-                                                 <!-- 原价 -->
-                                                 <view class="price flex xc-ash line_th">
-                                                     <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">
-                                                     <view class="fs22">￥</view>
-                                                     <view class="fs22">{{item.market_price}}</view>
-                                                 </view>
-                                             </view>
-                                         </block>
-                                     </block>
-                                 </block>
-
-                                 <block wx:else>
+                            <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 class='del'>￥{{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 class="price flex xc-ash line_th">
+                                                    <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 class="price flex xc-ash line_th">
+                                                    <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 wz_red">￥</view>
+                                                    <view class="fs35 wz_red">{{filter.toFix(item.shop_price,2)}}</view>
+                                                </view>
+                                                <!-- 原价 -->
+                                                <view class="price flex xc-ash line_th">
+                                                    <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">
+                                                    <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 class='del'>￥{{item.market_price}}</view>
-                                 </block>
+                                </block>
 
-                             </block>      
+                            </block>
 
                         </view>
                         <view class='zs_wz5' wx:if="{{object.goodsnum}}">销量：{{item.sales_sum}}件</view>
-                        <view style="height: 10rpx;"></view>  
+                        <view style="height: 10rpx;"></view>
                     </view>
                 </navigator>
-             </view>
-              <view style="height:20rpx"></view>
+            </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[{{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 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 class='{{g_filter.get_class(object.column,object.position)}}' wx:if="{{object.styleicon==1}}" src='{{imghost}}/miniapp/images/Recommend.png'></image>
+                                    <image class='{{g_filter.get_class(object.column,object.position)}}' wx:if="{{object.styleicon==2 }}" src='{{imghost}}/miniapp/images/hot.png'></image>
+                                    <image class='{{g_filter.get_class(object.column,object.position)}}' wx:if="{{object.styleicon==3}}" src='{{imghost}}/miniapp/images/new.png'></image>
+                                    <image class='{{g_filter.get_class(object.column,object.position)}}' wx:if="{{object.styleicon==4 }}" src='{{imghost}}/miniapp/images/Promotion.png'></image>
+                                </block>
+                            </view>
+
+                            <view 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 class='del'>￥{{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 class="price flex xc-ash line_th">
+                                                            <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 class="price flex xc-ash line_th">
+                                                            <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 wz_red">￥</view>
+                                                            <view class="fs35 wz_red">{{filter.toFix(item.shop_price,2)}}</view>
+                                                        </view>
+                                                        <!-- 原价 -->
+                                                        <view class="price flex xc-ash line_th">
+                                                            <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">
+                                                            <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 class='del'>￥{{item.market_price}}</view>
+                                        </block>
+                                    </block>
+                                </view>
+                                <view class='zs_wz5_2l' wx:if="{{object.goodsnum}}">销量：{{item.sales_sum}}件</view>
+                                <view style="height: 10rpx;"></view>
+                            </view>
+                        </view>
+                    </view>
+
+                </view>
+            </navigator>
         </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'>
+        <view class="clear"></view>
+    </block>
+    <!--3个一列-->
+    <block wx:if='{{object.column==3}}'>
+        <view class="zwp_3 flex wrap jc-ar">
+            <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 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 class='{{g_filter.get_class(object.column,object.position)}}' wx:if="{{object.styleicon==1}}" src='{{imghost}}/miniapp/images/Recommend.png'></image>
+                                        <image class='{{g_filter.get_class(object.column,object.position)}}' wx:if="{{object.styleicon==2 }}" src='{{imghost}}/miniapp/images/hot.png'></image>
+                                        <image class='{{g_filter.get_class(object.column,object.position)}}' wx:if="{{object.styleicon==3}}" src='{{imghost}}/miniapp/images/new.png'></image>
+                                        <image class='{{g_filter.get_class(object.column,object.position)}}' wx:if="{{object.styleicon==4 }}" src='{{imghost}}/miniapp/images/Promotion.png'></image>
+                                    </block>
+                                </view>
+                                <view 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 class='del'>￥{{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 class="price flex xc-ash line_th">
+                                                                <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 class="price flex xc-ash line_th">
+                                                                <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 wz_red">￥</view>
+                                                                <view class="fs35 wz_red">{{filter.toFix(item.shop_price,2)}}</view>
+                                                            </view>
+                                                            <!-- 原价 -->
+                                                            <view class="price flex xc-ash line_th">
+                                                                <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">
+                                                                <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 class='del'>￥{{item.market_price}}</view>
+                                            </block>
+                                        </block>
+                                    </view>
+                                    <view class='zs_wz5_3l' wx:if="{{object.goodsnum}}">销量：{{item.sales_sum}}件</view>
+                                    <view style="height: 10rpx;"></view>
+                                </view>
+                            </view>
+                        </view>
+                    </view>
+                </navigator>
+            </block>
+        </view>
+        <view class="clear"></view>
+    </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">
+                <view class="{{object.noboder==0?'zs_goods_xiao_bottom':'zs_goods_xiao'}}">
+                    <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_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>
+                                <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>
                             </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>
+                            <!-- 原来的 -->
+                            <!-- <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>
                         </block>
 
                         <block wx:if="{{object.goodicon==3}}">
-                            <image class='{{g_filter.get_class(object.column,object.position)}}'
-                                   src='{{object.customicon}}'></image>
+                            <image class='{{g_filter.get_class(object.column,object.position)}}' src='{{object.customicon}}'></image>
                         </block>
                         <block wx:if="{{object.goodicon==1}}">
                             <image class='{{g_filter.get_class(object.column,object.position)}}' src=''></image>
                         </block>
                         <block wx:if="{{object.goodicon==2}}">
-                            <image class='{{g_filter.get_class(object.column,object.position)}}' wx:if="{{object.styleicon==1}}"
-                                   src='{{imghost}}/miniapp/images/Recommend.png'></image>
-                            <image class='{{g_filter.get_class(object.column,object.position)}}' wx:if="{{object.styleicon==2 }}"
-                                   src='{{imghost}}/miniapp/images/hot.png'></image>
-                            <image class='{{g_filter.get_class(object.column,object.position)}}' wx:if="{{object.styleicon==3}}"
-                                   src='{{imghost}}/miniapp/images/new.png'></image>
-                            <image class='{{g_filter.get_class(object.column,object.position)}}' wx:if="{{object.styleicon==4 }}"
-                                   src='{{imghost}}/miniapp/images/Promotion.png'></image>
+                            <image class='{{g_filter.get_class(object.column,object.position)}}' wx:if="{{object.styleicon==1}}" src='{{imghost}}/miniapp/images/Recommend.png'></image>
+                            <image class='{{g_filter.get_class(object.column,object.position)}}' wx:if="{{object.styleicon==2 }}" src='{{imghost}}/miniapp/images/hot.png'></image>
+                            <image class='{{g_filter.get_class(object.column,object.position)}}' wx:if="{{object.styleicon==3}}" src='{{imghost}}/miniapp/images/new.png'></image>
+                            <image class='{{g_filter.get_class(object.column,object.position)}}' wx:if="{{object.styleicon==4 }}" src='{{imghost}}/miniapp/images/Promotion.png'></image>
                         </block>
                     </view>
 
-                    <view 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}}">
+                    <view class='zs_center_x'>
+                        <view class='zs_wz1_x ellipsis-2' 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>
+                                    <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 class='del'>￥{{item.market_price}}</view>
                             </block>
+                            <!-- 不是活动的情况 -->
                             <block wx:else>
-                                <block wx:if="{{g_filter.is_has_rank(rank_switch,item)}}" >
+
+                                <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="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>
+                                                        <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 class="flex" style="line-height: 28rpx;">
                                                 <!-- 原价 -->
                                                 <view class="price flex xc-ash line_th">
                                                     <view class="fs22">￥</view>
@@ -248,14 +541,14 @@
                                             </view>
                                         </block>
                                         <blocK wx:else>
-                                            <view class="money flex" >
+                                            <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 class="fs24">￥</view>
+                                                    <view class="fs35">{{filter.toFix(item.shop_price,2)}}</view>
                                                 </view>
                                             </view>
-                                            <view class="flex" style="line-height: 28rpx;" >
+                                            <view class="flex" style="line-height: 28rpx;">
                                                 <!-- 原价 -->
                                                 <view class="price flex xc-ash line_th">
                                                     <view class="fs22">￥</view>
@@ -267,11 +560,11 @@
                                     <block wx:else>
                                         <!-- 如果商品有设置等级价大于0的 -->
                                         <block wx:if="{{g_filter.get_card_price(item,card_list,0)}}">
-                                            <view class="money flex" >
+                                            <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 class="fs24">￥</view>
+                                                    <view class="fs35">{{filter.toFix(item.shop_price,2)}}</view>
                                                 </view>
                                                 <!-- 原价 -->
                                                 <view class="price flex xc-ash line_th">
@@ -280,27 +573,26 @@
                                                 </view>
 
                                             </view>
-                                            <view class="flex" style="line-height: 28rpx;" >
+                                            <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="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="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="flex" style="line-height: 28rpx;">
                                                 <!-- 原价 -->
                                                 <view class="price flex xc-ash line_th">
                                                     <view class="fs22">￥</view>
@@ -310,521 +602,197 @@
                                         </block>
                                     </block>
                                 </block>
+
                                 <block wx:else>
-                                   <view class='wz_red'>￥{{item.shop_price}}</view>
-                                   <view class='del'>￥{{item.market_price}}</view>
+                                    <view class='wz_red'>￥{{item.shop_price}}</view>
+                                    <view class='del'>￥{{item.market_price}}</view>
                                 </block>
+
                             </block>
                         </view>
-                        <view class='zs_wz5_2l' wx:if="{{object.goodsnum}}">销量：{{item.sales_sum}}件</view>
-						<view style="height: 10rpx;"></view>
+                        <view class='zs_wz5_x' wx:if="{{object.goodsnum}}">销量：{{item.sales_sum}}件</view>
                     </view>
+
                 </view>
+            </navigator>
+        </block>
+        <view class="clear"></view>
+    </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>
+        </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">-- 没有更多 -- </view>
 
-        </view>
-    </navigator>
-</block>
-  <view class="clear"></view>
-</block>
-<!--3个一列-->
-<block wx:if='{{object.column==3}}'>
-   <view class="zwp_3 flex wrap jc-ar">
-    <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>
+    </block>
 
-                            <block wx:if="{{object.goodicon==3}}">
-                                <image 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 class='{{g_filter.get_class(object.column,object.position)}}' wx:if="{{object.styleicon==1}}"
-                                       src='{{imghost}}/miniapp/images/Recommend.png'></image>
-                                <image class='{{g_filter.get_class(object.column,object.position)}}' wx:if="{{object.styleicon==2 }}"
-                                       src='{{imghost}}/miniapp/images/hot.png'></image>
-                                <image class='{{g_filter.get_class(object.column,object.position)}}' wx:if="{{object.styleicon==3}}"
-                                       src='{{imghost}}/miniapp/images/new.png'></image>
-                                <image class='{{g_filter.get_class(object.column,object.position)}}' wx:if="{{object.styleicon==4 }}"
-                                       src='{{imghost}}/miniapp/images/Promotion.png'></image>
-                            </block>
-                        </view>
-                        <view class='zs_center_3l'>
 
+    <!--商品展示-->
+    <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%">
 
-                            <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 class='del'>￥{{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 class="price flex xc-ash line_th">
-                                                        <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 class="price flex xc-ash line_th">
-                                                        <view class="fs22">￥</view>
-                                                        <view class="fs22">{{item.market_price}}</view>
+                                    <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 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 class='{{g_filter.get_class(object.column,object.position)}}' wx:if="{{object.styleicon==1}}" src='{{imghost}}/miniapp/images/Recommend.png'></image>
+                                        <image class='{{g_filter.get_class(object.column,object.position)}}' wx:if="{{object.styleicon==2 }}" src='{{imghost}}/miniapp/images/hot.png'></image>
+                                        <image class='{{g_filter.get_class(object.column,object.position)}}' wx:if="{{object.styleicon==3}}" src='{{imghost}}/miniapp/images/new.png'></image>
+                                        <image class='{{g_filter.get_class(object.column,object.position)}}' wx:if="{{object.styleicon==4 }}" src='{{imghost}}/miniapp/images/Promotion.png'></image>
+                                    </block>
+
+                                </view>
+                                <view 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 class='del'>￥{{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>
-                                            </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 wz_red">￥</view>
-                                                        <view class="fs35 wz_red">{{filter.toFix(item.shop_price,2)}}</view>
+                                                    <view class="flex" style="line-height: 28rpx;">
+                                                        <!-- 原价 -->
+                                                        <view class="price flex xc-ash line_th">
+                                                            <view class="fs22">￥</view>
+                                                            <view class="fs22">{{aitem.market_price}}</view>
+                                                        </view>
                                                     </view>
-                                                    <!-- 原价 -->
-                                                    <view class="price flex xc-ash line_th">
-                                                        <view class="fs22">￥</view>
-                                                        <view class="fs22">{{item.market_price}}</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>
-                                                <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="flex" style="line-height: 28rpx;">
+                                                        <!-- 原价 -->
+                                                        <view class="price flex xc-ash line_th">
+                                                            <view class="fs22">￥</view>
+                                                            <view class="fs22">{{aitem.market_price}}</view>
+                                                        </view>
                                                     </view>
-                                                </view>
+                                                </blocK>
                                             </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>
+                                                <!-- 如果商品有设置等级价大于0的 -->
+                                                <block wx:if="{{g_filter.get_card_price(aitem,card_list,0)}}">
+                                                    <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 class="price flex xc-ash line_th">
+                                                            <view class="fs22">￥</view>
+                                                            <view class="fs22">{{aitem.market_price}}</view>
+                                                        </view>
+
                                                     </view>
-                                                </view>
-                                                <view class="flex" style="line-height: 28rpx;" >
-                                                    <!-- 原价 -->
-                                                    <view class="price flex xc-ash line_th">
-                                                        <view class="fs22">￥</view>
-                                                        <view class="fs22">{{item.market_price}}</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>
-                                                </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 class="price flex xc-ash line_th">
+                                                            <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 class='del'>￥{{aitem.market_price}}</view>
+                                        </block>
                                     </block>
-                                    <block wx:else>
-                                      <view class='wz_red'>￥{{item.shop_price}}</view>
-                                      <view class='del'>￥{{item.market_price}}</view>
-                                    </block>
-                                </block>
+                                </view>
+                                <view class='zs_wz5_3l' wx:if="{{object.goodsnum}}">销量：{{aitem.sales_sum}}件</view>
+                                <view style="height: 10rpx;"></view>
                             </view>
-                            <view class='zs_wz5_3l' wx:if="{{object.goodsnum}}">销量：{{item.sales_sum}}件</view>
-							<view style="height: 10rpx;"></view> 
-                        </view>
-                    </view>
-                </view>
-            </view>
-        </navigator>
-    </block>
-</view>
-   <view class="clear"></view>
-</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">
-            <view class="{{object.noboder==0?'zs_goods_xiao_bottom':'zs_goods_xiao'}}" >
-                <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>
-                        </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>
-                    </block>
-
-                    <block wx:if="{{object.goodicon==3}}">
-                        <image 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 class='{{g_filter.get_class(object.column,object.position)}}' wx:if="{{object.styleicon==1}}"
-                               src='{{imghost}}/miniapp/images/Recommend.png'></image>
-                        <image class='{{g_filter.get_class(object.column,object.position)}}' wx:if="{{object.styleicon==2 }}"
-                               src='{{imghost}}/miniapp/images/hot.png'></image>
-                        <image class='{{g_filter.get_class(object.column,object.position)}}' wx:if="{{object.styleicon==3}}"
-                               src='{{imghost}}/miniapp/images/new.png'></image>
-                        <image class='{{g_filter.get_class(object.column,object.position)}}' wx:if="{{object.styleicon==4 }}"
-                               src='{{imghost}}/miniapp/images/Promotion.png'></image>
-                    </block>
-                </view>
-
-                <view class='zs_center_x'>
-                    <view class='zs_wz1_x ellipsis-2' 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 class='del'>￥{{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 class="price flex xc-ash line_th">
-							                    <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 class="price flex xc-ash line_th">
-							                    <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 class="price flex xc-ash line_th">
-							                    <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">
-																								<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 class="price flex xc-ash line_th">
-							                    <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 class='del'>￥{{item.market_price}}</view>
-							</block>
-
-						</block>
-                    </view>
-                    <view class='zs_wz5_x' wx:if="{{object.goodsnum}}">销量：{{item.sales_sum}}件</view>
-                </view>
-
-            </view>
-        </navigator>
-    </block>
-    <view class="clear"></view>
-</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></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">-- 没有更多 -- </view>
-
-</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>
-
-                            <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 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 class='{{g_filter.get_class(object.column,object.position)}}' wx:if="{{object.styleicon==1}}"
-				             src='{{imghost}}/miniapp/images/Recommend.png'></image>
-				      <image class='{{g_filter.get_class(object.column,object.position)}}' wx:if="{{object.styleicon==2 }}"
-				             src='{{imghost}}/miniapp/images/hot.png'></image>
-				      <image class='{{g_filter.get_class(object.column,object.position)}}' wx:if="{{object.styleicon==3}}"
-				             src='{{imghost}}/miniapp/images/new.png'></image>
-				      <image class='{{g_filter.get_class(object.column,object.position)}}' wx:if="{{object.styleicon==4 }}"
-				             src='{{imghost}}/miniapp/images/Promotion.png'></image>
-				  </block>
-				  				  
-                </view>
-                <view 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 class='del'>￥{{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 class="price flex xc-ash line_th">
-                                            <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 class="price flex xc-ash line_th">
-                                            <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)}}">
-                                    <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 class="price flex xc-ash line_th">
-                                            <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 class="price flex xc-ash line_th">
-                                            <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 class='del'>￥{{aitem.market_price}}</view>
-                        </block>
-                    </block>
-                </view>
-                <view class='zs_wz5_3l' wx:if="{{object.goodsnum}}">销量：{{aitem.sales_sum}}件</view>
-                <view style="height: 10rpx;"></view>  
-              </view>
+                    </navigator>
+                </block>
+            </swiper-item>
+        </view>
+    </swiper>
 
-            </view>
-          </navigator>
-        </block>
-      </swiper-item>
-   </view>
-  </swiper>
\ No newline at end of file
+</view>
\ No newline at end of file
diff --git a/packageA/pages/jfbuy/jfbuy.wxss b/packageA/pages/jfbuy/jfbuy.wxss
index 9c86464..d7d08bc 100644
--- a/packageA/pages/jfbuy/jfbuy.wxss
+++ b/packageA/pages/jfbuy/jfbuy.wxss
@@ -192,7 +192,7 @@ page {
 	padding-left: 20rpx;
 }
 .name {
-	height: 76rpx;
+	/* height: 76rpx; */
 	overflow: hidden;
 }
 
diff --git a/pages/goods/goodsInfo/goodsInfo.js b/pages/goods/goodsInfo/goodsInfo.js
index 5e476db..29f041c 100644
--- a/pages/goods/goodsInfo/goodsInfo.js
+++ b/pages/goods/goodsInfo/goodsInfo.js
@@ -4322,8 +4322,33 @@ Page({
       if (quan_list) {
         for (var ind in quan_list) {
           var ep = quan_list[ind];
-          var start = ut.formatTime(ep.use_start_time, "yyyy-MM-dd");
-          var end = ut.formatTime(ep.use_end_time, "yyyy-MM-dd");
+          var start="";
+          var end="";
+          if( ep.starttype == 0 ){
+            if(ep.use_start_time){
+              start = ut.formatTime(ep.use_start_time, "yyyy-MM-dd");
+            }else{
+              start=ut.formatTime("","yyyy-MM-dd");
+            }
+          }else{
+            if(ep.startdays){
+              // start=ut.gettimestamp() + 3600*24*ep.startdays;
+              start=ut.formatTime(ut.gettimestamp() + 3600*24*ep.days,"yyyy-MM-dd");
+            }else{
+              start=ut.formatTime("","yyyy-MM-dd");
+              // start=ut.gettimestamp();
+            }
+          }
+          if( ep.endtype == 0){
+              end = ut.formatTime(ep.use_end_time, "yyyy-MM-dd");
+          }else{
+            if(ep.days){
+              end=ut.formatTime(ut.gettimestamp() + 3600*24*ep.days,"yyyy-MM-dd");
+            }else{
+              end="";
+              // end=ut.gettimestamp();
+            }
+          }
           start = start.replace("00:00:00", "");
           end = end.replace("00:00:00", "");
           quan_list[ind].start = start;
diff --git a/pages/goods/goodsInfo/goodsInfo.wxml b/pages/goods/goodsInfo/goodsInfo.wxml
index f43e314..41ece2e 100644
--- a/pages/goods/goodsInfo/goodsInfo.wxml
+++ b/pages/goods/goodsInfo/goodsInfo.wxml
@@ -1457,7 +1457,7 @@
                 <view class="xc-detail-coupon">
                   <view class="four-level-word">{{item.name}}</view>
                   <view class="four-level-word xc-below">
-                    {{filters.replace_time2(item.start)}} 至 {{filters.replace_time2(item.end)}}
+                    {{filters.replace_time2(item.start)}} 至 {{filters.replace_time2(item.end)?filters.replace_time2(item.end):'不限'}}
                   </view>
                 </view>
                 <view class="flex-vertical">
diff --git a/pages/goods/goodsList/goodsList.wxml b/pages/goods/goodsList/goodsList.wxml
index d398acf..1d43976 100644
--- a/pages/goods/goodsList/goodsList.wxml
+++ b/pages/goods/goodsList/goodsList.wxml
@@ -16,7 +16,7 @@
 	 <view wx:if="{{jieti_prom}}" class="fs30 ellipsis-1" style="padding: 20rpx">阶梯促销：{{jieti_prom}}</view>
 
   </view>
-	<view class="pd20 flex ai-center jc_sb">
+	<view class="pd20 flex ai-center jc_sb search_fixed">
 		<!-- 搜索框 -->
 		<view class="search-box f1">
 			<navigator hover-class="none" url="/pages/goods/search/search?ladder_id={{ladder_id}}"><text class="iconfont icon-sousuo pdr10"></text>搜索店铺商品</navigator>
diff --git a/pages/goods/goodsList/goodsList.wxss b/pages/goods/goodsList/goodsList.wxss
index b246e3c..45f9716 100644
--- a/pages/goods/goodsList/goodsList.wxss
+++ b/pages/goods/goodsList/goodsList.wxss
@@ -40,6 +40,14 @@ page {
   line-height: 0;
 }
 
+.search_fixed {
+  position: fixed;
+  top: 0;
+  width: 95%;
+  background-color: #f0f0f0;
+  z-index: 999;
+}
+
 .ico-dir {
   width: 16rpx;
   height: 22rpx;