diff --git a/components/diy_goodsGroup/diy_goodsGroup.js b/components/diy_goodsGroup/diy_goodsGroup.js
index a4467ba..c70b433 100644
--- a/components/diy_goodsGroup/diy_goodsGroup.js
+++ b/components/diy_goodsGroup/diy_goodsGroup.js
@@ -25,6 +25,7 @@ Component({
     is_new: 0,
     baseUrl: "/api/weshop/goods/page",
     resourceUrl: t.globalData.setting.resourceUrl,
+    url: t.globalData.setting.imghost,
     currentPage: 1,
     requestData: null,
     requestUrl: "",
@@ -43,37 +44,80 @@ Component({
   },
 
   ready: function () {
-    console.log("ready");
-    this.data.classstyle_id = this.data.object.classstyle;
-    this.data.goodscount = this.data.object.goodscount;
-    console.log(this.data.classstyle_id);
-    this.data.wgroup = this.data.object.wgroup;
-    console.log(this.data.wgroup);
-    this.setData({
-      classstyle_id: this.data.object.classstyle
-    })
-    if (this.data.object.goodsclass == 1) {
-      this.data.is_recommend = 1
-    }
-    if (this.data.object.goodsclass == 2) {
-      this.data.is_hot = 1
-    }
-    if (this.data.object.goodsclass == 3) {
-      this.data.is_new = 1
-    }
-    this.data.requestData = new Array();
-    this.data.g_id = this.data.object.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;
-    console.log("firist_type_data");
-    console.log(this.data.firist_type_data);
-    this.init(this.data.classstyle_id, this.data.wgroup);
 
   },
+
+
+  lifetimes: {
+    attached: function() {
+      // 在组件实例进入页面节点树时执行
+      this.data.classstyle_id = this.data.object.classstyle;
+      this.data.goodscount = this.data.object.goodscount;
+      this.data.wgroup = this.data.object.wgroup;
+
+      this.setData({
+        classstyle_id: this.data.object.classstyle
+      })
+      if (this.data.object.goodsclass == 1) {
+        this.data.is_recommend = 1
+      }
+      if (this.data.object.goodsclass == 2) {
+        this.data.is_hot = 1
+      }
+      if (this.data.object.goodsclass == 3) {
+        this.data.is_new = 1
+      }
+      this.data.requestData = new Array();
+      this.data.g_id = this.data.object.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.data.firist_type_curr=1,
+      this.data.currentPage=1,
+      this.setData({ goods_array: null})
+
+      // 页面被展示
+      // 在组件实例进入页面节点树时执行
+      this.data.classstyle_id = this.data.object.classstyle;
+      this.data.goodscount = this.data.object.goodscount;
+      this.data.wgroup = this.data.object.wgroup;
+
+      this.setData({
+        classstyle_id: this.data.object.classstyle
+      })
+      if (this.data.object.goodsclass == 1) {
+        this.data.is_recommend = 1
+      }
+      if (this.data.object.goodsclass == 2) {
+        this.data.is_hot = 1
+      }
+      if (this.data.object.goodsclass == 3) {
+        this.data.is_new = 1
+      }
+      this.data.requestData = new Array();
+      this.data.g_id = this.data.object.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);
+    },
+  },
+
   methods: {
     // 这里是一个自定义方法
     init: function (classstyle_id, wgroup) {
@@ -90,6 +134,11 @@ Component({
           index = 0,
           gdata = [];
 
+      //--初始化卡类--
+      th.card_init();
+
+      var os=getApp().globalData.setting;
+
       classstyle_id = classstyle_id + "";
       switch (classstyle_id) {
         case "1":
@@ -110,14 +159,18 @@ Component({
               item.shop_price = goods.shop_price;
               item.sales_sum = goods.sales_sum;
               item.goods_id = goods.goods_id;
+              item.cardprice1 = val.cardprice1;
+              item.cardprice2 = val.cardprice2;
+              item.cardprice3 = val.cardprice3;
+
               prom_id = res.data.data.prom_id;
 
               var prom_type = res.data.data.prom_type; //0普通商品  1秒杀  6拼单
 
               var url = "";
-              if (prom_type == 1) {
+              if (prom_type == 6) {
                 url = "/api/weshop/teamlist/get/" + os.stoid + "/" + prom_id;
-              } else if (prom_type == 6) {
+              } else if (prom_type == 1) {
                 url = "/api/ms/flash_sale/get/" + os.stoid + "/" + prom_id;
               }
               if(url==""){
@@ -130,12 +183,12 @@ Component({
                 return app.request.promiseGet(url, {})
               }
 
-
             }).then(res => {
               index++;
               var prom = res.data.data;
-              if (prom != null) {
-                item.shop_price = res.data.data.price;
+              var now=ut.gettimestamp();
+              if (prom != null && prom.is_end==0 && prom.end_time>now && prom.show_time<now) {
+                item.prom_price = res.data.data.price;
               }
               th.data.requestData.push(item);
               th.setData({
@@ -170,8 +223,9 @@ Component({
               total: res.data.data.total
             })
             th.data.currentPage++;
+            var now=ut.gettimestamp();
 
-            goods.forEach(function (val, ind) {
+            goods.forEach(async function (val, ind) {
               var item = {};
               var prom_id = null;
               console.log(val.goodsid);
@@ -185,21 +239,26 @@ Component({
               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;
+
               prom_id = val.prom_id;
 
-              var prom_type = res.data.data.prom_type; //0普通商品  1秒杀  6拼单
+              var prom_type = val.prom_type; //0普通商品  1秒杀  6拼单
 
               var url = "";
-              if (prom_type == 1) {
+              if (prom_type == 6) {
                 url = "/api/weshop/teamlist/get/" + os.stoid + "/" + prom_id;
-              } else if (prom_type == 6) {
+              } else if (prom_type == 1) {
                 url = "/api/ms/flash_sale/get/" + os.stoid + "/" + prom_id;
               }
               if(url!="") {
-                app.request.promiseGet(url, {}).then(res => {
+               await app.request.promiseGet(url, {}).then(res => {
                   var prom = res.data.data;
-                  if (prom != null) {
-                    item.shop_price = res.data.data.price;
+                  if (prom != null && prom.is_end==0 && prom.end_time>now && prom.show_time<now) {
+                    item.prom_price = res.data.data.price;
                   }
                   th.data.requestData.push(item);
                   th.setData({
@@ -237,40 +296,42 @@ Component({
             })
 
             th.data.currentPage++;
-            goods.forEach(function (val, ind) {
+            var now=ut.gettimestamp();
+            goods.forEach(async function (val, ind) {
               var item = {};
               var prom_id = null;
               console.log(val.goodsid);
               //app.request.promiseGet("/api/weshop/goods/get/" + os.stoid + "/" + val.goods_id, {}).then(res => {
               //商品地址
               var goods = res.data.data;
-              console.log("goods");
-              console.log(goods);
-              // th.setData({
-              //   goods_btn: res.data.data
-              // })
+
               item.goods_name = val.goods_name;
               item.goods_img = th.data.imghost + val.original_img;
               item.market_price = val.market_price;
               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;
+
               prom_id = val.prom_id;
 
               var prom_type = res.data.data.prom_type; //0普通商品  1秒杀  6拼单
 
               var url = "";
-              if (prom_type == 1) {
+              if (prom_type == 6) {
                 url = "/api/weshop/teamlist/get/" + os.stoid + "/" + prom_id;
-              } else if (prom_type == 6) {
+              } else if (prom_type == 1) {
                 url = "/api/ms/flash_sale/get/" + os.stoid + "/" + prom_id;
               }
 
               if(url!=null){
-                app.request.promiseGet(url, {}).then(res => {
+               await app.request.promiseGet(url, {}).then(res => {
                   var prom = res.data.data;
-                  if (prom != null) {
-                    item.shop_price = res.data.data.price;
+                  if (prom != null && prom.is_end==0 && prom.end_time>now && prom.show_time<now) {
+                    item.prom_price = res.data.data.price;
                   }
                   th.data.requestData.push(item);
                   th.setData({
@@ -303,6 +364,83 @@ Component({
       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;
+	  getApp().request.get("/api/weshop/users/get/" + os.stoid + "/" + getApp().globalData.user_id, {
+	    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) {
+	                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();
+	    for (var i = 0; i < plusCard.length; i++) {
+	      var name = "card" + plusCard[i].CorrPrice.toLowerCase();
+	      card_name_map.set(name, plusCard[i].CardName);
+	    }
+	
+	    var ob = {
+	      "card_list": plusCard,
+	      "name_map": card_name_map
+	    };
+	    func(ob);
+	  })
+	},
+	
+	
   }
 })
\ No newline at end of file
diff --git a/components/diy_goodsGroup/diy_goodsGroup.wxml b/components/diy_goodsGroup/diy_goodsGroup.wxml
index 1b21d89..51b7200 100644
--- a/components/diy_goodsGroup/diy_goodsGroup.wxml
+++ b/components/diy_goodsGroup/diy_goodsGroup.wxml
@@ -1,464 +1,168 @@
 <!--pages/diy_zs/diy_zs.wxml-->
-<!--1个-->
-<view class="zs_goods_wai">
-    <!--右下角-->
-
-    <block wx:if='{{object.column==1 && object.position==4}}'>
-        <block wx:for="{{goods_array}}" >
+<wxs module="filter" src="../../utils/filter.wxs"></wxs>
+<wxs module="g_filter" src="g_filter.wxs"></wxs>
+<!--1个列表的时候-->
+<view class="zs_goods_wai" wx:if='{{object.column==1}}'>
+       <block wx:for="{{goods_array}}" >
             <view class='zs_goods'>
                 <navigator url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}" class="s1_gk_a1">
-                    <view class='zs_top'>
-                        <block>
+                    <view class='zs_top rel'>
                         <image class='zs_t_img' src="{{item.goods_img}}"
                                data-errorimg="goods_array[{{index}}].goods_img"
                                binderror="bind_bnerr3"
-                        ></image></block>
+                        ></image>
 
                         <block wx:if="{{object.goodicon==3}}">
-                            <image class='zs_t1' wx:if="{{ object.position==4}}"
-                                   src='{{object.customicon}}'></image>
-                            <!--<image class='zs_t1' wx:if="{{object.position==1}}"-->
-                                   <!--src='{{object.customicon}}'></image>-->
-                            <!--<image class='zs_t1' wx:if="{{ object.position==1}}"-->
-                                   <!--src='{{object.customicon}}'></image>-->
-                            <!--<image class='zs_t1' wx:if="{{object.position==1}}"-->
-                                   <!--src='{{object.customicon}}'></image>-->
+                            <image class='{{g_filter.get_class(object.column,object.position)}}' src='{{object.customicon}}'></image>
                         </block>
                         <block wx:if="{{object.goodicon==1}}">
-                            <image class='zs_t1' src=''></image>
+                            <image class='{{g_filter.get_class(object.column,object.position)}}' src=''></image>
                         </block>
                         <block wx:if="{{object.goodicon==2}}">
-                            <image class='zs_t1' wx:if="{{object.styleicon==1}}"
+                            <image class='{{g_filter.get_class(object.column,object.position)}}' wx:if="{{object.styleicon==1}}"
                                    src='{{imghost}}/miniapp/images/Recommend.png'></image>
-                            <image class='zs_t1' wx:if="{{object.styleicon==2}}"
+                            <image class='{{g_filter.get_class(object.column,object.position)}}' wx:if="{{object.styleicon==2}}"
                                    src='{{imghost}}/miniapp/images/hot.png'></image>
-                            <image class='zs_t1' wx:if="{{object.styleicon==3}}"
+                            <image class='{{g_filter.get_class(object.column,object.position)}}' wx:if="{{object.styleicon==3}}"
                                    src='{{imghost}}/miniapp/images/new.png'></image>
-                            <image class='zs_t1' wx:if="{{object.styleicon==4}}"
+                            <image class='{{g_filter.get_class(object.column,object.position)}}' wx:if="{{object.styleicon==4}}"
                                    src='{{imghost}}/miniapp/images/Promotion.png'></image>
                         </block>
                     </view>
                     <view class='zs_center'>
-
                         <view class='zs_wz1' wx:if="{{object.goodstit}}">{{item.goods_name}}</view>
+                        <!--如果有显示价格 -->
                         <view class='zs_wz2' wx:if="{{object.goodsprice}}">
-                            <view class='wz_red'>￥{{item.shop_price}}</view>
-                            <view class='del'>￥{{item.market_price}}</view>
+                             <block wx:if="{{item.prom_price}}">
+                                 <view class='wz_red'>￥{{item.prom_price}}</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">
+                                                     <view class="fs24">￥</view>
+                                                     <view class="fs35">{{filter.toFix(item[card_field],2)}}</view>
+                                                     <view class="card_bg"><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">￥</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">
+                                                     <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">￥</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>
+
+                                 <block wx:else>
+                                    <view class='wz_red'>￥{{item.shop_price}}</view>
+                                    <view class='del'>￥{{item.market_price}}</view>
+                                 </block>
+
+                             </block>      
+
                         </view>
-                        <!-- <view class='zs_wz3'>美妆价：¥9.00</view>
-                  <view class='zs_wz4'>等级价：¥8.00</view> -->
                         <view class='zs_wz5' wx:if="{{object.goodsnum}}">销量：{{item.sales_sum}}件</view>
 
                     </view>
                 </navigator>
-            </view>
+             </view>
+              <view style="height:20rpx"></view>
         </block>
-    </block>
-
-    <!-- 右上角 -->
-    <block wx:if='{{object.column==1 && object.position==2}}'>
-    <block wx:for="{{goods_array}}" >
-        <view class='zs_goods' >
-            <navigator url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}" class="s1_gk_a1">
-                <view class='zs_top'>
-
-                    <block>
-                        <image class='zs_t_img' src="{{item.goods_img}}" data-errorimg="goods_array[{{index}}].goods_img"
-                               binderror="bind_bnerr3"></image>
-                    </block>
-
-                    <!-- <image class='zs_t2' src='http://jmh.xinda100.cn/public/static/images/model/Recommend.png'></image> -->
-                    <block wx:if="{{object.goodicon==3}}">
-                        <image class='zs_t2' wx:if="{{object.position==2}}"
-                               src='{{object.customicon}}'></image>
-                        <!--<image class='zs_t2' wx:if="{{object.styleicon==2 && object.position==2}}"-->
-                               <!--src='{{object.customicon}}'></image>-->
-                        <!--<image class='zs_t2' wx:if="{{object.styleicon==3 && object.position==2}}"-->
-                               <!--src='{{object.customicon}}'></image>-->
-                        <!--<image class='zs_t2' wx:if="{{object.styleicon==4 && object.position==2}}"-->
-                               <!--src='{{object.customicon}}'></image>-->
-                    </block>
-                    <block wx:if="{{object.goodicon==1}}">
-                        <image class='zs_t2' src=''></image>
-                    </block>
-                    <block wx:if="{{object.goodicon==2}}">
-                        <image class='zs_t2' wx:if="{{object.styleicon==1}}"
-                               src='{{imghost}}/miniapp/images/Recommend.png'></image>
-                        <image class='zs_t2' wx:if="{{object.styleicon==2 }}"
-                               src='{{imghost}}/miniapp/images/hot.png'></image>
-                        <image class='zs_t2' wx:if="{{object.styleicon==3}}"
-                               src='{{imghost}}/miniapp/images/new.png'></image>
-                        <image class='zs_t2' wx:if="{{object.styleicon==4 }}"
-                               src='{{imghost}}/miniapp/images/Promotion.png'></image>
-                    </block>
-                </view>
-
-                <view class='zs_center'>
-                    <view class='zs_wz1' wx:if="{{object.goodstit}}">{{item.goods_name}}</view>
-                    <view class='zs_wz2' wx:if="{{object.goodsprice}}">
-                        <view class='wz_red'>￥{{item.shop_price}}</view>
-                        <view class='del'>￥{{item.market_price}}</view>
-                    </view>
-                    <view class='zs_wz5' wx:if="{{object.goodsnum}}">销量：{{item.sales_sum}}件</view>
-
-                </view>
-            </navigator>
-
-        </view>
-    </block>
-    </block>
-    <!-- 左上角 -->
-    <block  wx:if='{{object.column==1 && object.position==1}}'>
-    <block wx:for="{{goods_array}}">
-        <view class='zs_goods'>
-            <navigator url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}" class="s1_gk_a1">
-                <view class='zs_top'>
-
-                    <block>
-                        <image class='zs_t_img' src="{{item.goods_img}}" data-errorimg="goods_array[{{index}}].goods_img"
-                               binderror="bind_bnerr3"></image>
-                    </block>
-                    <!-- <image class='zs_t3' src='http://jmh.xinda100.cn/public/static/images/model/hot.png'></image> -->
-                    <block wx:if="{{object.goodicon==3}}">
-                        <image class='zs_t3' wx:if="{{ object.position==1}}"
-                               src='{{object.customicon}}'></image>
-                        <!--<image class='zs_t3' wx:if="{{object.styleicon==2 && object.position==3}}"-->
-                               <!--src='{{object.customicon}}'></image>-->
-                        <!--<image class='zs_t3' wx:if="{{object.styleicon==3 && object.position==3}}"-->
-                               <!--src='{{object.customicon}}'></image>-->
-                        <!--<image class='zs_t3' wx:if="{{object.styleicon==4 && object.position==3}}"-->
-                               <!--src='{{object.customicon}}'></image>-->
-                    </block>
-                    <block wx:if="{{object.goodicon==1}}">
-                        <image class='zs_t3' src=''></image>
-                    </block>
-                    <block wx:if="{{object.goodicon==2}}">
-                        <image class='zs_t3' wx:if="{{object.styleicon==1}}"
-                               src='{{imghost}}/miniapp/images/Recommend.png'></image>
-                        <image class='zs_t3' wx:if="{{object.styleicon==2 }}"
-                               src='{{imghost}}/miniapp/images/hot.png'></image>
-                        <image class='zs_t3' wx:if="{{object.styleicon==3}}"
-                               src='{{imghost}}/miniapp/images/new.png'></image>
-                        <image class='zs_t3' wx:if="{{object.styleicon==4 }}"
-                               src='{{imghost}}/miniapp/images/Promotion.png'></image>
-                    </block>
-                </view>
-
-                <view class='zs_center'>
-
-                    <view class='zs_wz1' wx:if="{{object.goodstit}}">{{item.goods_name}}</view>
-                    <view class='zs_wz2' wx:if="{{object.goodsprice}}">
-                        <view class='wz_red'>￥{{item.shop_price}}</view>
-                        <view class='del'>￥{{item.market_price}}</view>
-                    </view>
-                    <view class='zs_wz5' wx:if="{{object.goodsnum}}">销量：{{item.sales_sum}}件</view>
-
-                </view>
-            </navigator>
-
-        </view>
-    </block>
-    </block>
-    <!-- 左下角 -->
-    <block wx:if='{{object.column==1 && object.position==3}}'>
-    <block wx:for="{{goods_array}}" >
-        <view class='zs_goods' >
-            <navigator url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}" class="s1_gk_a1">
-                <view class='zs_top'>
-
-                    <block>
-                        <image class='zs_t_img' src="{{item.goods_img}}" data-errorimg="goods_array[{{index}}].goods_img"
-                               binderror="bind_bnerr3"></image>
-                    </block>
-                    <!-- <image class='zs_t4' src='http://jmh.xinda100.cn/public/static/images/model/new.png'></image> -->
-
-                    <block wx:if="{{object.goodicon==3}}">
-                        <image class='zs_t4' wx:if="{{ object.position==3}}"
-                               src='{{object.customicon}}'></image>
-                        <!--<image class='zs_t4' wx:if="{{object.styleicon==2 && object.position==4}}"-->
-                               <!--src='{{object.customicon}}'></image>-->
-                        <!--<image class='zs_t4' wx:if="{{object.styleicon==3 && object.position==4}}"-->
-                               <!--src='{{object.customicon}}'></image>-->
-                        <!--<image class='zs_t4' wx:if="{{object.styleicon==4 && object.position==4}}"-->
-                               <!--src='{{object.customicon}}'></image>-->
-                    </block>
-                    <block wx:if="{{object.goodicon==1}}">
-                        <image class='zs_t4' src=''></image>
-                    </block>
-                    <block wx:if="{{object.goodicon==2}}">
-                        <image class='zs_t4' wx:if="{{object.styleicon==1}}"
-                               src='{{imghost}}/miniapp/images/Recommend.png'></image>
-                        <image class='zs_t4' wx:if="{{object.styleicon==2 }}"
-                               src='{{imghost}}/miniapp/images/hot.png'></image>
-                        <image class='zs_t4' wx:if="{{object.styleicon==3}}"
-                               src='{{imghost}}/miniapp/images/new.png'></image>
-                        <image class='zs_t4' wx:if="{{object.styleicon==4 }}"
-                               src='{{imghost}}/miniapp/images/Promotion.png'></image>
-                    </block>
-                </view>
-
-                <view class='zs_center'>
-                    <view class='zs_wz1' wx:if="{{object.goodstit}}">{{item.goods_name}}</view>
-                    <view class='zs_wz2' wx:if="{{object.goodsprice}}">
-                        <view class='wz_red'>￥{{item.shop_price}}</view>
-                        <view class='del'>￥{{item.market_price}}</view>
-                    </view>
-                    <view class='zs_wz5' wx:if="{{object.goodsnum}}">销量：{{item.sales_sum}}件</view>
-
-                </view>
-            </navigator>
-        </view>
-    </block>
-    </block>
+ 
 </view>
-
-
-<!-- 列表显示 -->
-<view class="zs_goods_xiao_wai">
-    <!--右上角-->
-    <block  wx:if='{{object.column==4  && object.position==2}}'>
-    <block wx:for="{{goods_array}}" >
-        <navigator url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}" class="s1_gk_a1">
-            <view class="{{object.noboder==0?'zs_goods_xiao_bottom':'zs_goods_xiao'}}" >
-                <view class='zs_top_x'>
-                    <!--<image class='zs_t_img_x'></image>-->
-                    <block>
-                        <image class='zs_t_img_x' src="{{item.goods_img}}" data-errorimg="goods_array[{{index}}].goods_img"
-                               binderror="bind_bnerr3" mode="widthFix" style='max-height:290rpx'></image>
-                    </block>
-
-                    <block wx:if="{{object.goodicon==3}}">
-                        <image class='zs_t1_x' wx:if="{{object.position==2}}"
-                               src='{{object.customicon}}'></image>
-                        <!--<image class='zs_t1_x' wx:if="{{object.styleicon==2 && object.position==1}}"-->
-                               <!--src='{{object.customicon}}'></image>-->
-                        <!--<image class='zs_t1_x' wx:if="{{object.styleicon==3 && object.position==1}}"-->
-                               <!--src='{{object.customicon}}'></image>-->
-                        <!--<image class='zs_t1_x' wx:if="{{object.styleicon==4 && object.position==1}}"-->
-                               <!--src='{{object.customicon}}'></image>-->
-                    </block>
-                    <block wx:if="{{object.goodicon==1}}">
-                        <image class='zs_t1_x' src=''></image>
-                    </block>
-                    <block wx:if="{{object.goodicon==2}}">
-                        <image class='zs_t1_x' wx:if="{{object.styleicon==1}}"
-                               src='{{imghost}}/miniapp/images/Recommend.png'></image>
-                        <image class='zs_t1_x' wx:if="{{object.styleicon==2 }}"
-                               src='{{imghost}}/miniapp/images/hot.png'></image>
-                        <image class='zs_t1_x' wx:if="{{object.styleicon==3}}"
-                               src='{{imghost}}/miniapp/images/new.png'></image>
-                        <image class='zs_t1_x' wx:if="{{object.styleicon==4 }}"
-                               src='{{imghost}}/miniapp/images/Promotion.png'></image>
-                    </block>
-                </view>
-
-                <view class='zs_center_x'>
-
-
-                    <view class='zs_wz1_x' wx:if="{{object.goodstit}}">{{item.goods_name}}</view>
-                    <view class='zs_wz2_x' wx:if="{{object.goodsprice}}">
-                        <view class='wz_red'>￥{{item.shop_price}}</view>
-                        <view class='del'>￥{{item.market_price}}</view>
-                    </view>
-                    <view class='zs_wz5_x' wx:if="{{object.goodsnum}}">销量：{{item.sales_sum}}件</view>
-
-
-                </view>
-
-            </view>
-        </navigator>
-    </block>
-    </block>
-    <!-- 左上角 -->
-    <block wx:if='{{object.column==4 && object.position==1}}'>
-    <block wx:for="{{goods_array}}" >
-        <navigator url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}" class="s1_gk_a1">
-            <view class="{{object.noboder==0?'zs_goods_xiao_bottom':'zs_goods_xiao'}}"  >
-                <view class='zs_top_x'>
-
-                    <block wx:if="{{item.goods_img!=''}}">
-                        <image class='zs_t_img_x' src="{{item.goods_img}}" data-errorimg="goods_array[{{index}}].goods_img"
-                               binderror="bind_bnerr3" mode="widthFix" style='max-height:290rpx'></image>
-                    </block>
-
-                    <block wx:if="{{object.goodicon==3}}">
-                        <image class='zs_t1_x1' wx:if="{{ object.position==1}}"
-                               src='{{object.customicon}}'></image>
-                        <!--<image class='zs_t1_x1' wx:if="{{object.styleicon==2 && object.position==2}}"-->
-                               <!--src='{{object.customicon}}'></image>-->
-                        <!--<image class='zs_t1_x1' wx:if="{{object.styleicon==3 && object.position==2}}"-->
-                               <!--src='{{object.customicon}}'></image>-->
-                        <!--<image class='zs_t1_x1' wx:if="{{object.styleicon==4 && object.position==2}}"-->
-                               <!--src='{{object.customicon}}'></image>-->
-                    </block>
-                    <block wx:if="{{object.goodicon==1}}">
-                        <image class='zs_t1_x1' src=''></image>
-                    </block>
-                    <block wx:if="{{object.goodicon==2}}">
-                        <image class='zs_t1_x1' wx:if="{{object.styleicon==1}}"
-                               src='{{imghost}}/miniapp/images/Recommend.png'></image>
-                        <image class='zs_t1_x1' wx:if="{{object.styleicon==2 }}"
-                               src='{{imghost}}/miniapp/images/hot.png'></image>
-                        <image class='zs_t1_x1' wx:if="{{object.styleicon==3}}"
-                               src='{{imghost}}/miniapp/images/new.png'></image>
-                        <image class='zs_t1_x1' wx:if="{{object.styleicon==4 }}"
-                               src='{{imghost}}/miniapp/images/Promotion.png'></image>
-                    </block>
-                </view>
-                <view class='zs_center_x'>
-                    <view class='zs_wz1_x' wx:if="{{object.goodstit}}">{{item.goods_name}}</view>
-                    <view class='zs_wz2_x' wx:if="{{object.goodsprice}}">
-                        <view class='wz_red'>￥{{item.shop_price}}</view>
-                        <view class='del'>￥{{item.market_price}}</view>
-                    </view>
-                    <view class='zs_wz5_x' wx:if="{{object.goodsnum}}">销量：{{item.sales_sum}}件</view>
-                </view>
-
-            </view>
-        </navigator>
-    </block>
-    </block>
-    <!-- 右下角 -->
-    <block  wx:if='{{object.column==4 && object.position==4}}'>
-    <block wx:for="{{goods_array}}" >
-        <navigator url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}" class="s1_gk_a1">
-            <view class="{{object.noboder==0?'zs_goods_xiao_bottom':'zs_goods_xiao'}}" >
-                <view class='zs_top_x'>
-
-                    <block>
-                        <image class='zs_t_img_x' src="{{item.goods_img}}" data-errorimg="goods_array[{{index}}].goods_img"
-                               binderror="bind_bnerr3" mode="widthFix" style='max-height:290rpx'></image>
-                    </block>
-
-                    <block wx:if="{{object.goodicon==3}}">
-                        <image class='zs_t1_x2' wx:if="{{object.position==4}}"
-                               src='{{object.customicon}}'></image>
-                        <!--<image class='zs_t1_x2' wx:if="{{object.styleicon==2 && object.position==3}}"-->
-                               <!--src='{{object.customicon}}'></image>-->
-                        <!--<image class='zs_t1_x2' wx:if="{{object.styleicon==3 && object.position==3}}"-->
-                               <!--src='{{object.customicon}}'></image>-->
-                        <!--<image class='zs_t1_x2' wx:if="{{object.styleicon==4 && object.position==3}}"-->
-                               <!--src='{{object.customicon}}'></image>-->
-                    </block>
-                    <block wx:if="{{object.goodicon==1}}">
-                        <image class='zs_t1_x2' src=''></image>
-                    </block>
-                    <block wx:if="{{object.goodicon==2}}">
-                        <image class='zs_t1_x2' wx:if="{{object.styleicon==1}}"
-                               src='{{imghost}}/miniapp/images/Recommend.png'></image>
-                        <image class='zs_t1_x2' wx:if="{{object.styleicon==2 }}"
-                               src='{{imghost}}/miniapp/images/hot.png'></image>
-                        <image class='zs_t1_x2' wx:if="{{object.styleicon==3}}"
-                               src='{{imghost}}/miniapp/images/new.png'></image>
-                        <image class='zs_t1_x2' wx:if="{{object.styleicon==4 }}"
-                               src='{{imghost}}/miniapp/images/Promotion.png'></image>
-                    </block>
-                </view>
-
-                <view class='zs_center_x'>
-                    <view class='zs_wz1_x' wx:if="{{object.goodstit}}">{{item.goods_name}}</view>
-                    <view class='zs_wz2_x' wx:if="{{object.goodsprice}}">
-                        <view class='wz_red'>￥{{item.shop_price}}</view>
-                        <view class='del'>￥{{item.market_price}}</view>
-                    </view>
-                    <view class='zs_wz5_x' wx:if="{{object.goodsnum}}">销量：{{item.sales_sum}}件</view>
-
-                </view>
-
-            </view>
-        </navigator>
-    </block>
-    </block>
-    <!-- 左下角 -->
-    <block  wx:if='{{object.column==4  && object.position==3}}'>
-    <block wx:for="{{goods_array}}" >
-        <navigator url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}" class="s1_gk_a1">
-            <view class="{{object.noboder==0?'zs_goods_xiao_bottom':'zs_goods_xiao'}}" >
-                <view class='zs_top_x'>
-                    <block wx:if="{{item.goods_img!=''}}">
-                        <image class='zs_t_img_x' src="{{item.goods_img}}" data-errorimg="goods_array[{{index}}].goods_img"
-                               binderror="bind_bnerr3" mode="widthFix" style='max-height:290rpx'></image>
-                    </block>
-
-                    <block wx:if="{{object.goodicon==3}}">
-                        <image class='zs_t1_x3' wx:if="{{object.position==3}}"
-                               src='{{object.customicon}}'></image>
-                        <!--<image class='zs_t1_x3' wx:if="{{object.styleicon==2 && object.position==4}}"-->
-                               <!--src='{{object.customicon}}'></image>-->
-                        <!--<image class='zs_t1_x3' wx:if="{{object.styleicon==3 && object.position==4}}"-->
-                               <!--src='{{object.customicon}}'></image>-->
-                        <!--<image class='zs_t1_x3' wx:if="{{object.styleicon==4 && object.position==4}}"-->
-                               <!--src='{{object.customicon}}'></image>-->
-                    </block>
-                    <block wx:if="{{object.goodicon==1}}">
-                        <image class='zs_t1_x3' src=''></image>
-                    </block>
-                    <block wx:if="{{object.goodicon==2}}">
-                        <image class='zs_t1_x3' wx:if="{{object.styleicon==1}}"
-                               src='{{imghost}}/miniapp/images/Recommend.png'></image>
-                        <image class='zs_t1_x3' wx:if="{{object.styleicon==2 }}"
-                               src='{{imghost}}/miniapp/images/hot.png'></image>
-                        <image class='zs_t1_x3' wx:if="{{object.styleicon==3}}"
-                               src='{{imghost}}/miniapp/images/new.png'></image>
-                        <image class='zs_t1_x3' wx:if="{{object.styleicon==4 }}"
-                               src='{{imghost}}/miniapp/images/Promotion.png'></image>
-                    </block>
-                </view>
-                <view class='zs_center_x'>
-
-                    <view class='zs_wz1_x' wx:if="{{object.goodstit}}">{{item.goods_name}}</view>
-                    <view class='zs_wz2_x' wx:if="{{object.goodsprice}}">
-                        <view class='wz_red'>￥{{item.shop_price}}</view>
-                        <view class='del'>￥{{item.market_price}}</view>
-                    </view>
-                    <view class='zs_wz5_x' wx:if="{{object.goodsnum}}">销量：{{item.sales_sum}}件</view>
-                </view>
-
-            </view>
-        </navigator>
-    </block>
-    </block>
-</view>
-
-
 <!--2个一列-->
-<!--左上角-->
-<block  wx:if="{{object.column==2  && object.position==1}}">
-<block wx:for="{{goods_array}}" >
+<block  wx:if="{{object.column==2}}">
+  <block wx:for="{{goods_array}}" >
     <navigator url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}" class="s1_gk_a1">
-
         <view class="zs_goods_wai_ban">
             <view class="zs_goods_ban">
                 <view class='zs_goods_2l'>
-
-                    <view class='zs_top_2l'>
-                        <!--<image class='zs_t_img_2l'></image>-->
-                        <block wx:if="{{item.goods_img!=''}}">
-                            <image class='zs_t_img_2l' src="{{item.goods_img}}" data-errorimg="goods_array[{{index}}].goods_img"
+                    <view class='zs_top_2l rel'>
+                        <image class='zs_t_img_2l' src="{{item.goods_img}}" data-errorimg="goods_array[{{index}}].goods_img"
                                    binderror="bind_bnerr3"></image>
-                        </block>
-
                         <block wx:if="{{object.goodicon==3}}">
-                            <image class='zs_t1_2l' wx:if="{{object.position==1}}"
+                            <image class='{{g_filter.get_class(object.column,object.position)}}' wx:if="{{object.position==1}}"
                                    src='{{object.customicon}}'></image>
-                            <!--<image class='zs_t1_2l' wx:if="{{object.styleicon==2 && object.position==1}}"-->
-                                   <!--src='{{object.customicon}}'></image>-->
-                            <!--<image class='zs_t1_2l' wx:if="{{object.styleicon==3 && object.position==1}}"-->
-                                   <!--src='{{object.customicon}}'></image>-->
-                            <!--<image class='zs_t1_2l' wx:if="{{object.styleicon==4 && object.position==1}}"-->
-                                   <!--src='{{object.customicon}}'></image>-->
                         </block>
                         <block wx:if="{{object.goodicon==1}}">
-                            <image class='zs_t1_2l' src=''></image>
+                            <image class='{{g_filter.get_class(object.column,object.position)}}' src=''></image>
                         </block>
                         <block wx:if="{{object.goodicon==2}}">
-                            <image class='zs_t1_2l' wx:if="{{object.styleicon==1}}"
+                            <image class='{{g_filter.get_class(object.column,object.position)}}' wx:if="{{object.styleicon==1}}"
                                    src='{{imghost}}/miniapp/images/Recommend.png'></image>
-                            <image class='zs_t1_2l' wx:if="{{object.styleicon==2 }}"
+                            <image class='{{g_filter.get_class(object.column,object.position)}}' wx:if="{{object.styleicon==2 }}"
                                    src='{{imghost}}/miniapp/images/hot.png'></image>
-                            <image class='zs_t1_2l' wx:if="{{object.styleicon==3}}"
+                            <image class='{{g_filter.get_class(object.column,object.position)}}' wx:if="{{object.styleicon==3}}"
                                    src='{{imghost}}/miniapp/images/new.png'></image>
-                            <image class='zs_t1_2l' wx:if="{{object.styleicon==4 }}"
+                            <image class='{{g_filter.get_class(object.column,object.position)}}' wx:if="{{object.styleicon==4 }}"
                                    src='{{imghost}}/miniapp/images/Promotion.png'></image>
                         </block>
                     </view>
@@ -466,187 +170,100 @@
                     <view class='zs_center_2l'>
                         <view class='zs_wz1_2l' wx:if="{{object.goodstit}}">{{item.goods_name}}</view>
                         <view class='zs_wz2_2l' wx:if="{{object.goodsprice}}">
-                            <view class='wz_red'>￥{{item.shop_price}}</view>
-                            <view class='del'>￥{{item.market_price}}</view>
-                        </view>
-                        <view class='zs_wz5_2l' wx:if="{{object.goodsnum}}">销量：{{item.sales_sum}}件</view>
-                    </view>
-                </view>
-            </view>
-
-        </view>
-    </navigator>
-</block>
 
-<view class="clear"></view>
-</block>
-<!--右上角-->
-<block wx:if='{{object.column==2   && object.position==2}}'>
-<block wx:for="{{goods_array}}" >
-    <navigator url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}" class="s1_gk_a1">
-        <view class="zs_goods_wai_ban" >
-            <view class="zs_goods_ban">
-                <view class='zs_goods_2l'>
-
-                    <view class='zs_top_2l'>
-                        <!--<image class='zs_t_img_2l'></image>-->
-                        <block>
-                            <image class='zs_t_img_2l' src="{{item.goods_img}}" data-errorimg="goods_array[{{index}}].goods_img"
-                                   binderror="bind_bnerr3"></image>
-                        </block>
-                        <block wx:if="{{object.goodicon==3}}">
-                            <image class='zs_t2_2l' wx:if="{{ object.position==2}}"
-                                   src='{{object.customicon}}'></image>
-                            <!--<image class='zs_t2_2l' wx:if="{{object.styleicon==2 && object.position==2}}"-->
-                                   <!--src='{{object.customicon}}'></image>-->
-                            <!--<image class='zs_t2_2l' wx:if="{{object.styleicon==3 && object.position==2}}"-->
-                                   <!--src='{{object.customicon}}'></image>-->
-                            <!--<image class='zs_t2_2l' wx:if="{{object.styleicon==4 && object.position==2}}"-->
-                                   <!--src='{{object.customicon}}'></image>-->
-                        </block>
-                        <block wx:if="{{object.goodicon==1}}">
-                            <image class='zs_t2_2l' src=''></image>
-                        </block>
-                        <block wx:if="{{object.goodicon==2}}">
-                            <image class='zs_t2_2l' wx:if="{{object.styleicon==1}}"
-                                   src='{{imghost}}/miniapp/images/Recommend.png'></image>
-                            <image class='zs_t2_2l' wx:if="{{object.styleicon==2 }}"
-                                   src='{{imghost}}/miniapp/images/hot.png'></image>
-                            <image class='zs_t2_2l' wx:if="{{object.styleicon==3}}"
-                                   src='{{imghost}}/miniapp/images/new.png'></image>
-                            <image class='zs_t2_2l' wx:if="{{object.styleicon==4 }}"
-                                   src='{{imghost}}/miniapp/images/Promotion.png'></image>
-                        </block>
-                    </view>
-                    <view class='zs_center_2l'>
-
-
-                        <view class='zs_wz1_2l' wx:if="{{object.goodstit}}">{{item.goods_name}}</view>
-                        <view class='zs_wz2_2l' wx:if="{{object.goodsprice}}">
-                            <view class='wz_red'>￥{{item.shop_price}}</view>
-                            <view class='del'>￥{{item.market_price}}</view>
-                        </view>
-                        <view class='zs_wz5_2l' wx:if="{{object.goodsnum}}">销量：{{item.sales_sum}}件</view>
-
-                    </view>
-                </view>
-            </view>
-
-        </view>
-    </navigator>
-</block>
-
-<view class="clear"></view>
-</block>
-<!--右下角-->
-<block wx:if='{{object.column==2  && object.position==4}}'>
-<block wx:for="{{goods_array}}" >
-    <navigator url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}" class="s1_gk_a1">
-        <view class="zs_goods_wai_ban" >
-            <view class="zs_goods_ban">
-                <view class='zs_goods_2l'>
-
-                    <view class='zs_top_2l'>
-                        <!--<image class='zs_t_img_2l'></image>-->
-                        <block>
-                            <image class='zs_t_img_2l' src="{{item.goods_img}}" data-errorimg="goods_array[{{index}}].goods_img"
-                                   binderror="bind_bnerr3"></image>
-                        </block>
-
-                        <block wx:if="{{object.goodicon==3}}">
-                            <image class='zs_t3_2l' wx:if="{{ object.position==4}}"
-                                   src='{{object.customicon}}'></image>
-                            <!--<image class='zs_t3_2l' wx:if="{{object.styleicon==2 && object.position==3}}"-->
-                                   <!--src='{{object.customicon}}'></image>-->
-                            <!--<image class='zs_t3_2l' wx:if="{{object.styleicon==3 && object.position==3}}"-->
-                                   <!--src='{{object.customicon}}'></image>-->
-                            <!--<image class='zs_t3_2l' wx:if="{{object.styleicon==4 && object.position==3}}"-->
-                                   <!--src='{{object.customicon}}'></image>-->
-                        </block>
-                        <block wx:if="{{object.goodicon==1}}">
-                            <image class='zs_t3_2l' src=''></image>
-                        </block>
-                        <block wx:if="{{object.goodicon==2}}">
-                            <image class='zs_t3_2l' wx:if="{{object.styleicon==1}}"
-                                   src='{{imghost}}/miniapp/images/Recommend.png'></image>
-                            <image class='zs_t3_2l' wx:if="{{object.styleicon==2 }}"
-                                   src='{{imghost}}/miniapp/images/hot.png'></image>
-                            <image class='zs_t3_2l' wx:if="{{object.styleicon==3}}"
-                                   src='{{imghost}}/miniapp/images/new.png'></image>
-                            <image class='zs_t3_2l' wx:if="{{object.styleicon==4 }}"
-                                   src='{{imghost}}/miniapp/images/Promotion.png'></image>
-                        </block>
-                    </view>
-
-                    <view class='zs_center_2l'>
-
-                        <view class='zs_wz1_2l' wx:if="{{object.goodstit}}">{{item.goods_name}}</view>
-                        <view class='zs_wz2_2l' wx:if="{{object.goodsprice}}">
-                            <view class='wz_red'>￥{{item.shop_price}}</view>
-                            <view class='del'>￥{{item.market_price}}</view>
-                        </view>
-                        <view class='zs_wz5_2l' wx:if="{{object.goodsnum}}">销量：{{item.sales_sum}}件</view>
-                    </view>
-
-                </view>
-            </view>
-
-
-        </view>
-    </navigator>
-</block>
-
-<view class="clear"></view>
-</block>
-<!--左下角-->
-<block wx:if='{{object.column==2   && object.position==3}}'>
-<block wx:for="{{goods_array}}" >
-    <navigator url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}" class="s1_gk_a1">
-        <view class="zs_goods_wai_ban" >
-            <view class="zs_goods_ban">
-                <view class='zs_goods_2l'>
-
-                    <view class='zs_top_2l'>
-                        <!--<image class='zs_t_img_2l'></image>-->
-                        <block>
-                            <image class='zs_t_img_2l' src="{{item.goods_img}}" data-errorimg="goods_array[{{index}}].goods_img"
-                                   binderror="bind_bnerr3"></image>
-                        </block>
-
-                        <block wx:if="{{object.goodicon==3}}">
-                            <image class='zs_t4_2l' wx:if="{{ object.position==3}}"
-                                   src='{{object.customicon}}'></image>
-                            <!--<image class='zs_t4_2l' wx:if="{{object.styleicon==2 && object.position==4}}"-->
-                                   <!--src='{{object.customicon}}'></image>-->
-                            <!--<image class='zs_t4_2l' wx:if="{{object.styleicon==3 && object.position==4}}"-->
-                                   <!--src='{{object.customicon}}'></image>-->
-                            <!--<image class='zs_t4_2l' wx:if="{{object.styleicon==4 && object.position==4}}"-->
-                                   <!--src='{{object.customicon}}'></image>-->
-                        </block>
-                        <block wx:if="{{object.goodicon==1}}">
-                            <image class='zs_t4_2l' src=''></image>
-                        </block>
-                        <block wx:if="{{object.goodicon==2}}">
-                            <image class='zs_t4_2l' wx:if="{{object.styleicon==1}}"
-                                   src='{{imghost}}/miniapp/images/Recommend.png'></image>
-                            <image class='zs_t4_2l' wx:if="{{object.styleicon==2 }}"
-                                   src='{{imghost}}/miniapp/images/hot.png'></image>
-                            <image class='zs_t4_2l' wx:if="{{object.styleicon==3}}"
-                                   src='{{imghost}}/miniapp/images/new.png'></image>
-                            <image class='zs_t4_2l' wx:if="{{object.styleicon==4 }}"
-                                   src='{{imghost}}/miniapp/images/Promotion.png'></image>
-                        </block>
-                    </view>
-
-                    <view class='zs_center_2l'>
-
-                        <view class='zs_wz1_2l' wx:if="{{object.goodstit}}">{{item.goods_name}}</view>
-                        <view class='zs_wz2_2l' wx:if="{{object.goodsprice}}">
-                            <view class='wz_red'>￥{{item.shop_price}}</view>
-                            <view class='del'>￥{{item.market_price}}</view>
+                            <block wx:if="{{item.prom_price}}">
+                                <view class='wz_red'>￥{{item.prom_price}}</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">
+                                                    <view class="fs24"></view>
+                                                    <view class="fs35">{{filter.toFix(item[card_field],2)}}</view>
+                                                    <view class="card_bg"><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">￥</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">
+                                                    <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">￥</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>
+                                <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>
                 </view>
             </view>
@@ -654,46 +271,34 @@
         </view>
     </navigator>
 </block>
-
-<view class="clear"></view>
+  <view class="clear"></view>
 </block>
-
 <!--3个一列-->
-<!--左上角-->
-<block wx:if='{{object.column==3  && object.position==1}}'>
-<view class="zwp_3">
+<block wx:if='{{object.column==3}}'>
+   <view class="zwp_3">
     <block wx:for="{{goods_array}}" >
         <navigator url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}" class="s1_gk_a1">
             <view class="zs_goods_wai_san" >
                 <view class="zs_goods_san">
                     <view class='zs_goods_3l'>
-                        <view class='zs_top_3l'>
-                            <block>
-                                <image class='zs_t_img_3l' src="{{item.goods_img}}" data-errorimg="goods_array[{{index}}].goods_img"
+                        <view class='zs_top_3l rel'>                       
+                            <image class='zs_t_img_3l' src="{{item.goods_img}}" data-errorimg="goods_array[{{index}}].goods_img"
                                        binderror="bind_bnerr3"></image>
-                            </block>
-
                             <block wx:if="{{object.goodicon==3}}">
-                                <image class='zs_t1_3l' wx:if="{{ object.position==1}}"
-                                       src='{{object.customicon}}'></image>
-                                <!-- <image class='zs_t1_3l' wx:if="{{object.styleicon==2 && object.position==1}}"
+                                <image class='{{g_filter.get_class(object.column,object.position)}}' wx:if="{{ object.position==1}}"
                                        src='{{object.customicon}}'></image>
-                                <image class='zs_t1_3l' wx:if="{{object.styleicon==3 && object.position==1}}"
-                                       src='{{object.customicon}}'></image>
-                                <image class='zs_t1_3l' wx:if="{{object.styleicon==4 && object.position==1}}"
-                                       src='{{object.customicon}}'></image> -->
                             </block>
                             <block wx:if="{{object.goodicon==1}}">
-                                <image class='zs_t1_3l' src=''></image>
+                                <image class='{{g_filter.get_class(object.column,object.position)}}' src=''></image>
                             </block>
                             <block wx:if="{{object.goodicon==2}}">
-                                <image class='zs_t1_3l' wx:if="{{object.styleicon==1}}"
+                                <image class='{{g_filter.get_class(object.column,object.position)}}' wx:if="{{object.styleicon==1}}"
                                        src='{{imghost}}/miniapp/images/Recommend.png'></image>
-                                <image class='zs_t1_3l' wx:if="{{object.styleicon==2 }}"
+                                <image class='{{g_filter.get_class(object.column,object.position)}}' wx:if="{{object.styleicon==2 }}"
                                        src='{{imghost}}/miniapp/images/hot.png'></image>
-                                <image class='zs_t1_3l' wx:if="{{object.styleicon==3}}"
+                                <image class='{{g_filter.get_class(object.column,object.position)}}' wx:if="{{object.styleicon==3}}"
                                        src='{{imghost}}/miniapp/images/new.png'></image>
-                                <image class='zs_t1_3l' wx:if="{{object.styleicon==4 }}"
+                                <image class='{{g_filter.get_class(object.column,object.position)}}' wx:if="{{object.styleicon==4 }}"
                                        src='{{imghost}}/miniapp/images/Promotion.png'></image>
                             </block>
                         </view>
@@ -702,8 +307,97 @@
 
                             <view class='zs_wz1_3l' wx:if="{{object.goodstit}}">{{item.goods_name}}</view>
                             <view class='zs_wz2_3l' wx:if="{{object.goodsprice}}">
-                                <view class='wz_red'>￥{{item.shop_price}}</view>
-                                <view class='del'>￥{{item.market_price}}</view>
+                                <block wx:if="{{item.prom_price}}">
+                                    <view class='wz_red'>￥{{item.prom_price}}</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">
+                                                        <view class="fs24">￥</view>
+                                                        <view class="fs35">{{filter.toFix(item[card_field],2)}}</view>
+                                                        <view class="card_bg"><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">￥</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">
+                                                        <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">￥</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>
+                                    <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>
@@ -713,212 +407,145 @@
         </navigator>
     </block>
 </view>
-<view class="clear"></view>
+   <view class="clear"></view>
 </block>
-<!--右上角-->
-<block wx:if='{{object.column==3  && object.position==2}}'>
-<block wx:for="{{goods_array}}" >
-    <navigator url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}" class="s1_gk_a1">
-        <view class="zs_goods_wai_san" >
-            <view class="zs_goods_san">
-                <view class='zs_goods_3l'>
-                    <view class='zs_top_3l'>
-                        <!--<image class='zs_t_img_3l'></image>-->
-                        <block>
-                            <image class='zs_t_img_3l' src="{{item.goods_img}}" data-errorimg="goods_array[{{index}}].goods_img"
-                                   binderror="bind_bnerr3"></image>
-                        </block>
-
-                        <block wx:if="{{object.goodicon==3}}">
-                            <image class='zs_t2_3l' wx:if="{{ object.position==2}}"
-                                   src='{{object.customicon}}'></image>
-                            <!--<image class='zs_t2_3l' wx:if="{{object.styleicon==2 && object.position==2}}"-->
-                                   <!--src='{{object.customicon}}'></image>-->
-                            <!--<image class='zs_t2_3l' wx:if="{{object.styleicon==3 && object.position==2}}"-->
-                                   <!--src='{{object.customicon}}'></image>-->
-                            <!--<image class='zs_t2_3l' wx:if="{{object.styleicon==4 && object.position==2}}"-->
-                                   <!--src='{{object.customicon}}'></image>-->
-                        </block>
-                        <block wx:if="{{object.goodicon==1}}">
-                            <image class='zs_t2_3l' src=''></image>
-                        </block>
-                        <block wx:if="{{object.goodicon==2}}">
-                            <image class='zs_t2_3l' wx:if="{{object.styleicon==1}}"
-                                   src='{{imghost}}/miniapp/images/Recommend.png'></image>
-                            <image class='zs_t2_3l' wx:if="{{object.styleicon==2 }}"
-                                   src='{{imghost}}/miniapp/images/hot.png'></image>
-                            <image class='zs_t2_3l' wx:if="{{object.styleicon==3}}"
-                                   src='{{imghost}}/miniapp/images/new.png'></image>
-                            <image class='zs_t2_3l' wx:if="{{object.styleicon==4 }}"
-                                   src='{{imghost}}/miniapp/images/Promotion.png'></image>
-                        </block>
-                    </view>
-                    <view class='zs_center_3l'>
-
-
-                        <view class='zs_wz1_3l' wx:if="{{object.goodstit}}">{{item.goods_name}}</view>
-                        <view class='zs_wz2_3l' wx:if="{{object.goodsprice}}">
-                            <view class='wz_red'>￥{{item.shop_price}}</view>
-                            <view class='del'>￥{{item.market_price}}</view>
-                        </view>
-                        <view class='zs_wz5_3l' wx:if="{{object.goodsnum}}">销量：{{item.sales_sum}}件</view>
-
-                        <!--<view class='zs_wz3_3l'>美妆价：¥9.00</view>-->
-                        <!--<view class='zs_wz4_3l'>等级价：¥8.00</view>-->
+<!-- 列表显示 -->
+<view class="zs_goods_xiao_wai" wx:if='{{object.column==4 }}'>
+    <block wx:for="{{goods_array}}" >
+        <navigator url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}" class="s1_gk_a1">
+            <view class="{{object.noboder==0?'zs_goods_xiao_bottom':'zs_goods_xiao'}}" >
+                <view class='zs_top_x'>
+                    <!--<image class='zs_t_img_x'></image>-->
+                    <block>
+                        <image class='zs_t_img_x' src="{{item.goods_img}}" data-errorimg="goods_array[{{index}}].goods_img"
+                               binderror="bind_bnerr3" mode="widthFix" style='max-height:290rpx'></image>
+                    </block>
 
-                    </view>
+                    <block wx:if="{{object.goodicon==3}}">
+                        <image class='{{g_filter.get_class(object.column,object.position)}}' wx:if="{{object.position==2}}"
+                               src='{{object.customicon}}'></image>
+                    </block>
+                    <block wx:if="{{object.goodicon==1}}">
+                        <image class='{{g_filter.get_class(object.column,object.position)}}' src=''></image>
+                    </block>
+                    <block wx:if="{{object.goodicon==2}}">
+                        <image class='{{g_filter.get_class(object.column,object.position)}}' wx:if="{{object.styleicon==1}}"
+                               src='{{imghost}}/miniapp/images/Recommend.png'></image>
+                        <image class='{{g_filter.get_class(object.column,object.position)}}' wx:if="{{object.styleicon==2 }}"
+                               src='{{imghost}}/miniapp/images/hot.png'></image>
+                        <image class='{{g_filter.get_class(object.column,object.position)}}' wx:if="{{object.styleicon==3}}"
+                               src='{{imghost}}/miniapp/images/new.png'></image>
+                        <image class='{{g_filter.get_class(object.column,object.position)}}' wx:if="{{object.styleicon==4 }}"
+                               src='{{imghost}}/miniapp/images/Promotion.png'></image>
+                    </block>
                 </view>
-            </view>
-        </view>
-    </navigator>
-</block>
-<view class="clear"></view>
-</block>
-<!--右下角-->
-
-<block wx:if='{{object.column==3  && object.position==4}}'>
-<block wx:for="{{goods_array}}" >
-    <navigator url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}" class="s1_gk_a1">
-        <view class="zs_goods_wai_san" >
-            <view class="zs_goods_san">
-                <view class='zs_goods_3l'>
-                    <view class='zs_top_3l'>
 
-                        <block>
-                            <image class='zs_t_img_3l' src="{{item.goods_img}}" data-errorimg="goods_array[{{index}}].goods_img"
-                                   binderror="bind_bnerr3"></image>
+                <view class='zs_center_x'>
+                    <view class='zs_wz1_x' wx:if="{{object.goodstit}}">{{item.goods_name}}</view>
+                    <view class='zs_wz2_x' wx:if="{{object.goodsprice}}">
+                        <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">
+                                            <view class="fs24">￥</view>
+                                            <view class="fs35">{{filter.toFix(item[card_field],2)}}</view>
+                                            <view class="card_bg"><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">￥</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">
+                                            <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">￥</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>
 
-                        <block wx:if="{{object.goodicon==3}}">
-                            <image class='zs_t3_3l' wx:if="{{ object.position==4}}"
-                                   src='{{object.customicon}}'></image>
-                            <!--<image class='zs_t3_3l' wx:if="{{object.styleicon==2 && object.position==3}}"-->
-                                   <!--src='{{object.customicon}}'></image>-->
-                            <!--<image class='zs_t3_3l' wx:if="{{object.styleicon==3 && object.position==3}}"-->
-                                   <!--src='{{object.customicon}}'></image>-->
-                            <!--<image class='zs_t3_3l' wx:if="{{object.styleicon==4 && object.position==3}}"-->
-                                   <!--src='{{object.customicon}}'></image>-->
-                        </block>
-                        <block wx:if="{{object.goodicon==1}}">
-                            <image class='zs_t3_3l' src=''></image>
-                        </block>
-                        <block wx:if="{{object.goodicon==2}}">
-                            <image class='zs_t3_3l' wx:if="{{object.styleicon==1}}"
-                                   src='{{imghost}}/miniapp/images/Recommend.png'></image>
-                            <image class='zs_t3_3l' wx:if="{{object.styleicon==2 }}"
-                                   src='{{imghost}}/miniapp/images/hot.png'></image>
-                            <image class='zs_t3_3l' wx:if="{{object.styleicon==3}}"
-                                   src='{{imghost}}/miniapp/images/new.png'></image>
-                            <image class='zs_t3_3l' wx:if="{{object.styleicon==4 }}"
-                                   src='{{imghost}}/miniapp/images/Promotion.png'></image>
+                        <block wx:else>
+                           <view class='wz_red'>￥{{item.shop_price}}</view>
+                           <view class='del'>￥{{item.market_price}}</view>
                         </block>
                     </view>
-                    <view class='zs_center_3l'>
-
-
-                        <view class='zs_wz1_3l' wx:if="{{object.goodstit}}">{{item.goods_name}}</view>
-                        <view class='zs_wz2_3l' wx:if="{{object.goodsprice}}">
-                            <view class='wz_red'>￥{{item.shop_price}}</view>
-                            <view class='del'>￥{{item.market_price}}</view>
-                        </view>
-                        <view class='zs_wz5_3l' wx:if="{{object.goodsnum}}">销量：{{item.sales_sum}}件</view>
-                        <!--<view class='zs_wz3_3l'>美妆价：¥9.00</view>-->
-                        <!--<view class='zs_wz4_3l'>等级价：¥8.00</view>-->
-                    </view>
+                    <view class='zs_wz5_x' wx:if="{{object.goodsnum}}">销量：{{item.sales_sum}}件</view>
                 </view>
-            </view>
-
-        </view>
-    </navigator>
-</block>
-
-
-<view class="clear"></view>
-</block>
-<!--左下角-->
-<block wx:if='{{object.column==3  && object.position==3}}'>
-<block wx:for="{{goods_array}}" >
-    <navigator url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}" class="s1_gk_a1">
-        <view class="zs_goods_wai_san" >
-            <view class="zs_goods_san">
-                <view class='zs_goods_3l'>
-
-                    <view class='zs_top_3l'>
-
-                        <block>
-                            <image class='zs_t_img_3l' src="{{item.goods_img}}" data-errorimg="goods_array[{{index}}].goods_img"
-                                   binderror="bind_bnerr3"></image>
-                        </block>
-
-                        <block wx:if="{{object.goodicon==3}}">
-                            <image class='zs_t4_3l' wx:if="{{object.position==3}}"
-                                   src='{{object.customicon}}'></image>
-                            <!--<image class='zs_t4_3l' wx:if="{{ object.position==4}}"-->
-                                   <!--src='{{object.customicon}}'></image>-->
-                            <!--<image class='zs_t4_3l' wx:if="{{object.position==4}}"-->
-                                   <!--src='{{object.customicon}}'></image>-->
-                            <!--<image class='zs_t4_3l' wx:if="{{ object.position==4}}"-->
-                                   <!--src='{{object.customicon}}'></image>-->
-                        </block>
-                        <block wx:if="{{object.goodicon==1}}">
-                            <image class='zs_t4_3l' src=''></image>
-                        </block>
-                        <block wx:if="{{object.goodicon==2}}">
-                            <image class='zs_t4_3l' wx:if="{{object.styleicon==1}}"
-                                   src='{{imghost}}/miniapp/images/Recommend.png'></image>
-                            <image class='zs_t4_3l' wx:if="{{object.styleicon==2 }}"
-                                   src='{{imghost}}/miniapp/images/hot.png'></image>
-                            <image class='zs_t4_3l' wx:if="{{object.styleicon==3}}"
-                                   src='{{imghost}}/miniapp/images/new.png'></image>
-                            <image class='zs_t4_3l' wx:if="{{object.styleicon==4 }}"
-                                   src='{{imghost}}/miniapp/images/Promotion.png'></image>
-                        </block>
-                    </view>
-
-                    <view class='zs_center_3l'>
 
-                        <view class='zs_wz1_3l' wx:if="{{object.goodstit}}">{{item.goods_name}}</view>
-                        <view class='zs_wz2_3l' wx:if="{{object.goodsprice}}">
-                            <view class='wz_red'>￥{{item.shop_price}}</view>
-                            <view class='del'>￥{{item.market_price}}</view>
-                        </view>
-                        <view class='zs_wz5_3l' wx:if="{{object.goodsnum}}">销量：{{item.sales_sum}}件</view>
-
-
-                    </view>
-
-
-                </view>
             </view>
-
-        </view>
-    </navigator>
-</block>
-<view class="clear"></view>
-</block>
-
-
-<!-- <block wx:if="{{object.classstyle=='2' }}">
-<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>
+        </navigator>
+    </block>
+    <view class="clear"></view>
 </view>
-</block> -->
 
-<block wx:if="{{object.classstyle=='1' }}">
-<view class="button-wrapper" wx:if="{{goods_btn.length!=0 }}" style="border: none">
+<block wx:if="{{object.classstyle=='1' }}"><view class="button-wrapper" wx:if="{{goods_btn.length!=0 }}" style="border: none">
     <button type="default" size="default" loading="{{loading}}" disabled="{{disabled}}" bindtap="setLoading" style="background-color: rgba(0,0,0,0);border:none">
       {{loadText}}
     </button>
-</view>
-</block>
-
+</view></block>
 <block wx:if="{{object.classstyle!='1' }}">
- <view class="button-wrapper" wx:if="{{object.goodscount * page <total }}" style="border: none">
-    <button type="default" size="default" loading="{{loading}}" disabled="{{disabled}}" bindtap="setLoading" style="background-color: rgba(0,0,0,0);border:none">
-      {{loadText}}
-    </button>
-</view> 
-
- </block>
\ No newline at end of file
+  <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>
+</block>
\ No newline at end of file
diff --git a/components/diy_goodsGroup/diy_goodsGroup.wxss b/components/diy_goodsGroup/diy_goodsGroup.wxss
index ad4e535..7adea90 100644
--- a/components/diy_goodsGroup/diy_goodsGroup.wxss
+++ b/components/diy_goodsGroup/diy_goodsGroup.wxss
@@ -1,42 +1,30 @@
 /* pages/diy_zs/diy_zs.wxss */
-
+.zwp_3{ margin-top: 10rpx}
 .zs_goods{
-  width: 100%;
-  min-height: 500rpx;
-border: 2rpx #ddd solid;
-margin: 0 auto;
-}
-
-.zwp_3{
-  /* width: 30%; */
+  width: 700rpx;
+  border: 1rpx #ddd solid;
+  margin-bottom: 10rpx;
+  margin: 0 auto;
+  
 }
-
 .s1_gk_a1{
   display: inline;
   width: auto;
   height: auto;
 }
-.clear{
-  clear: both;
-}
+.clear{ clear: both;}
 .zs_top{
   width: 100%;
   min-height: 700rpx;
   margin: 0 auto;
-  padding-left:22rpx;
-padding-bottom:30rpx;
-
-display: flex;
-/* padding-left: 6rpx; */
-/* padding-right: 30rpx; */
+  margin-bottom:30rpx;
+  display: flex;
 }
 
 .zs_t_img {
-   width: 700rpx;
-  height: 700rpx;
-  /* margin: 0 auto; */
-  /* background-color: bisque; */
-
+  width: 698rpx;
+  height: 698rpx;
+  margin: 1rpx auto;
 }
 
 .zs_center{
@@ -53,8 +41,9 @@ display: flex;
   overflow: hidden;
     text-overflow: ellipsis;
     margin-bottom:10rpx;
-font-size:28rpx;
+    font-size:28rpx;
     white-space: nowrap;
+    width: 640rpx
 }
 
 
@@ -95,52 +84,44 @@ font-size:28rpx;
     font-size: 32rpx;
 }
 
-.del{
-      font-size: 24rpx;
-    color: #999;
-    text-decoration: line-through;
-}
+
 
 .zs_t1{
   width: 56rpx;
   height: 56rpx;
-  position: relative;
-  right: 58rpx;
-  bottom: -640rpx;
+  position: absolute;
+  left: 0rpx;
+  top: 10rpx;
 }
 
 
 .zs_t2{
   width: 56rpx;
   height: 56rpx;
-  position: relative;
-  right: 58rpx;
-  bottom: -2rpx;
+  position: absolute;
+  right: 0rpx;
+  top: 10rpx;
 }
 
 .zs_t3{
   width: 56rpx;
   height: 56rpx;
-  position: relative;
-  right: 692rpx;
-  bottom: -4rpx;
+  position: absolute;
+  left: 0rpx;
+  bottom: 10rpx;
 }
 
 
 .zs_t4{
   width: 56rpx;
   height: 56rpx;
-  position: relative;
-  right: 692rpx;
-  bottom: -642rpx;
+  position: absolute;
+  right: 20rpx;
+  bottom: 10rpx;
 }
 
 
 
-
-/* xiao */
-
-
 .zs_goods_xiao_bottom{
   width: 100%;
   min-height: 300rpx;
@@ -165,24 +146,15 @@ font-size:28rpx;
 .zs_top_x{
   width: 400rpx;
   height: 318rpx;
-  margin-top: 20rpx; 
- /* /*  padding-top:30rpx;
-padding-bottom:30rpx; */
-
-display: flex;
-
+  margin-top: 20rpx;  
+  display: flex;
 }
 
-/* .zs_goods_xiao{
-  background-color: white;
-} */
-
 .zs_t_img_x {
    width: 290rpx;
   height: 290rpx;
   margin-left: 20rpx;
-  /* background-color: bisque; */
-
+  
 }
 
 .zs_center_x{
@@ -243,10 +215,9 @@ font-size:28rpx;
 }
 
 .del{
-      font-size: 24rpx;
+    font-size: 24rpx;
     color: #999;
     text-decoration: line-through;
-    margin-left: 10rpx;
     margin-top: 8rpx;
 }
 
@@ -381,61 +352,57 @@ top: 234rpx;
 }
 
 
+
+/*---俩列图片位置---*/
 .zs_t1_2l{
   width: 56rpx;
   height: 56rpx;
-  position: relative;
-  right: -2rpx;
-  top: -310rpx;
+  position: absolute;
+  left: 0rpx;
+  top: 10rpx;
 }
 
-
 .zs_t2_2l{
   width: 56rpx;
   height: 56rpx;
-  position: relative;
-  right: -294rpx;
-  bottom: 310rpx;
+  position: absolute;
+  right: 0rpx;
+  top: 10rpx;
 }
 
 .zs_t3_2l{
   width: 56rpx;
   height: 56rpx;
-  position: relative;
-  right:  -294rpx;
-  bottom: 68rpx;
+  position: absolute;
+  left:  0rpx;
+  bottom: 10rpx;
 }
 
 
 .zs_t4_2l{
   width: 56rpx;
   height: 56rpx;
-  position: relative;
-  right: -2rpx;
-  bottom: 68rpx;
+  position: absolute;
+  right: 0rpx;
+  bottom: 10rpx;
 }
 
+
+
 /*一个3列*/
 .zs_goods_wai_san{
-  width: 240rpx;
+  width: 230rpx;
   display: flex;
-  margin-left: 8rpx;
+  margin-left: 10rpx;
   float: left;
   margin-bottom: 8rpx;
- background-color:white;
- 
+  background-color:white;
 }
 
 .zs_goods_san{
   width: 240rpx;
   
 }
-
-
-
-
-
-
 .zs_goods_3l{
   width: 240rpx;
   min-height: 300rpx;
@@ -445,22 +412,15 @@ top: 234rpx;
 }
 
 .zs_top_3l{
-  width: 240rpx;
-  height:  240rpx;
-
-
-
-
-
-
+  width: 232rpx;
+  height:  232rpx;
 }
 
 .zs_t_img_3l {
-  width:237rpx;
-  height: 240rpx;
+  width:232rpx;
+  height: 232rpx;
   margin: 0 auto;
   background-color: bisque;
-
 }
 
 .zs_center_3l{
@@ -469,27 +429,28 @@ top: 234rpx;
   font-size: 28rpx;
   color: #333;
   text-align: left;
-	padding: 0 10rpx;
+  padding: 0 10rpx;
 }
 
 .zs_wz1_3l{
-  overflow: hidden;
-  text-overflow: ellipsis;
+  
   margin-bottom:10rpx;
   font-size:30rpx;
   height: 80rpx;
-  width: 227rpx;
-    /* white-space: nowrap; */
+  width: 220rpx;
+
+    overflow: hidden;
+    text-overflow: ellipsis;
+    display: -webkit-box;
+    -webkit-box-orient: vertical;
+    -webkit-line-clamp: 2;
 }
 
 
 .zs_wz2_3l{
-  /* overflow: hidden;
-  text-overflow: ellipsis; */
   margin-bottom:10rpx;
   font-size:30rpx;
-    /* white-space: nowrap; */
-    display: flex;
+  display: flex;
 }
 
 .zs_wz3_3l{
@@ -497,7 +458,7 @@ top: 234rpx;
   text-overflow: ellipsis;
   margin-bottom:10rpx;
   font-size:30rpx;
-    white-space: nowrap;
+  white-space: nowrap;
 }
 
 .zs_wz4_3l{
@@ -505,7 +466,7 @@ top: 234rpx;
   text-overflow: ellipsis;
   margin-bottom:10rpx;
   font-size:30rpx;
-    white-space: nowrap;
+  white-space: nowrap;
 }
 
 .zs_wz5_3l{
@@ -519,38 +480,58 @@ top: 234rpx;
 .zs_t1_3l{
   width: 56rpx;
   height: 56rpx;
-  position: relative;
-  right: 0rpx;
-  top: -250rpx;
+  position: absolute;
+  left: 0rpx;
+  top: 10rpx;
 }
 
 
 .zs_t2_3l{
   width: 56rpx;
   height: 56rpx;
-  position: relative;
-  right: -177rpx;
-  bottom: 250rpx;
+  position: absolute;
+  right: 0rpx;
+  top: 10rpx;
 }
 
 .zs_t3_3l{
   width: 56rpx;
   height: 56rpx;
-  position: relative;
-  right: -177rpx;
-  bottom: 67rpx;
+  position: absolute;
+  left: 0rpx;
+  bottom: 10rpx;
 }
 
 
 .zs_t4_3l{
   width: 56rpx;
   height: 56rpx;
-  position: relative;
+  position: absolute;
   right: 0rpx;
-  bottom: 67rpx;
+  bottom: 10rpx;
 }
 
 .zs_goods_wai{
   background-color: white;
   margin-top: 10rpx;
-}
\ No newline at end of file
+}
+
+.rel{position: relative}
+.flex{display: flex}
+.fs24{font-size: 24rpx}
+.fs35{font-size: 35rpx}
+.xc-wc{ align-items: center}
+
+.price.xc-ash{
+  font-size: 24rpx;
+  color: #999;
+  text-decoration: line-through;
+  margin-top: 8rpx;
+}
+
+
+.line_th{ text-decoration: line-through}
+.card_bg {display: flex; padding: 2rpx 10rpx;height: 28rpx; align-items: center; border-radius: 26rpx; font-size: 19rpx;line-height: 28rpx;max-width: 110rpx;
+  background: #333; color: #fff; justify-content: center; margin-left: 2rpx;}
+.card_bg image{ width: 19rpx; height: 19rpx; margin-right: 1rpx;}
+.card_bg .card_name{ max-width: 76rpx; width: auto;overflow: hidden; white-space:nowrap; }
\ No newline at end of file
diff --git a/components/diy_goodsGroup/g_filter.wxs b/components/diy_goodsGroup/g_filter.wxs
new file mode 100644
index 0000000..8bba9f3
--- /dev/null
+++ b/components/diy_goodsGroup/g_filter.wxs
@@ -0,0 +1,84 @@
+//获取样式
+var get_class = function(column,position) {
+    //--列的情况
+    if(column==1){ return "zs_t"+position; }
+    //--俩列的情况
+    if(column==2){ return "zs_t"+position+"_2l"; }
+    //--三列的情况
+    if(column==3){ return "zs_t"+position+"_3l"; }
+    //----列表的情况-----
+    if(column==4 ){ return "zs_t1_x"+position; }
+
+}
+
+
+var g_filters = {
+	    //-- 判断是不是有等级价 --
+	    is_has_rank:function(rank_switch,item){
+	    	 if(!rank_switch) return false;
+	    	 if(item.cardprice1 || item.cardprice2 || item.cardprice3) {return true}
+	    	 return false;
+	    },
+
+	    //-- 判断,不是等级会员时候，要显示的最低等级价和名称 --
+		get_card_price:function(goods,all_card,type){
+			     var price1=parseFloat(goods['cardprice1']);
+           var price2 = parseFloat(goods['cardprice2']);
+           var price3 = parseFloat(goods['cardprice3']);
+			     if(!all_card){
+			         if(type==0) return 0;
+			         return "";
+			     }
+
+			     var min_price=null;
+				 var min_name=null;
+			     //---设置对应的价格名字----
+				 for(var i=0;i<3;i++) {
+					var vl=all_card[i];
+					if(vl['CorrPrice']=="Price1" && price1>0)
+					{
+					   if(min_price==null) {
+						     min_price=price1;min_name=vl['CardName'];
+					   }
+					   else if(price1<min_price) {
+							min_price=price1;min_name=vl['CardName'];
+					   }
+					}
+					if(vl['CorrPrice']=="Price2" && price2>0)
+					{
+						if(min_price==null) {
+							min_price=price2;min_name=vl['CardName'];
+						}
+						else if(price2<min_price) {
+							min_price=price2;min_name=vl['CardName'];
+						}
+					}
+
+					if(vl['CorrPrice']=="Price3" && price3>0)
+					{
+						if(min_price==null) {
+							min_price=price3;min_name=vl['CardName'];
+						}
+						else if(price3<min_price) {
+							min_price=price3;min_name=vl['CardName'];
+						}
+					}
+
+				 }
+				 if(min_price==null){
+					 if(type==0) return 0;
+					 return "";
+				 }
+
+			     if(type==0) return min_price;
+				 if(min_name.length>4 )	min_name=min_name.substring(0, 4);
+			     return min_name;
+		},
+}
+
+
+module.exports = {
+   get_class: get_class,
+   is_has_rank:g_filters.is_has_rank,
+   get_card_price:g_filters.get_card_price,
+}
diff --git a/components/goods_list/goods_list.js b/components/goods_list/goods_list.js
index 11e118c..4d1e801 100644
--- a/components/goods_list/goods_list.js
+++ b/components/goods_list/goods_list.js
@@ -1,139 +1,165 @@
-var  t = getApp(), a = t.request, o = t.globalData.setting, os = o,
-  i = require("../../utils/util.js"), ut = i, s = require("../../utils/common.js");
+var t = getApp(),
+  a = t.request,
+  o = t.globalData.setting,
+  os = o,
+  i = require("../../utils/util.js"),
+  ut = i,
+  s = require("../../utils/common.js");
 
 Component({
   data: {
     url: o.imghost,
     object: null,
-    curPage:1,
-    is_no_more:1,//加载完所有数据的控制器
-    load_complete:0,//加载完成,
-	rank_switch:false,
-	card_field:"",
-	card_name:"",
-	max_card_field:"",
-	card_list:null
+    curPage: 1,
+    is_no_more: 1, //加载完所有数据的控制器
+    load_complete: 0,   //加载完成,
+    rank_switch: false, //等级卡开关
+    card_field: "",     //等级卡
+    card_name: "",      //卡的名称
+    max_card_field: "", //
+    card_list: null
   },
   properties: {
     // 这里定义了innerText属性，属性值可以在组件使用时指定
   },
-  ready: function () {
-   	 
+  ready: function() {
+
   },
 
-  methods: { 
-       init:function(){
-         var th = this;   
-         getApp().request.get("/api/weshop/users/get/" + os.stoid + "/" + getApp().globalData.user_id, {
-           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) {
-                            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)  
-                   })
-               
-               }
-             })
-           }
-         })
-
-       },
-
-
-       get_list:function(){      
-         var that = this;
-         if (that.data.is_no_more == 0) return false;
-         var curPage = that.data.curPage;
-         getApp().request.get('/api/weshop/goods/page?page', {
-           data: {
-             is_mainshow: 1, isonsale: 1,
-             is_recommend: 1, is_on_sale: 1,
-             store_id: o.stoid,
-             page: curPage,
-             pageSize: 6,
-           },
-           success: function (res) {
-             var data = res.data;
-             var total = data.data.total;
-             if (total <= curPage * 6) {
-               that.setData({ is_no_more: 0 });
-             } else {
-               that.data.curPage++;
-             }
-
-             //加载完成
-             if (data.data.pageData) {
-               that.setData({ load_complete: 1 });
-             }
-             if (that.data.recommend != null) {
-               var ra = that.data.recommend.concat(data.data.pageData);
-               that.setData({ recommend: ra });
-             } else {
-               that.setData({ recommend: data.data.pageData });
-             }
-           }
-         })      
-       },
-
-          
-    bind_bnerr_xc: function (e) {
-        var _errImg = e.target.dataset.errorimg;
-        var _errurl = e.target.dataset.url;    
-        var _errObj = {};
-        _errObj[_errImg] = "/miniapp/images/default_g_img.gif";
-        this.setData(_errObj) //注意这里的赋值方式,只是将数据列表中的此项图片路径值替换掉 ;      
+  methods: {
+    init: function() {
+      var th = this;
+      getApp().request.get("/api/weshop/users/get/" + os.stoid + "/" + getApp().globalData.user_id, {
+        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) {
+                    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)
+              })
+
+            }
+          })
+        }
+      })
+
     },
- 
-       reset:function(){
-         curPage=1;
-       },
-	   
-	   //---  获取卡类列表 ---
-	   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();
-	        for (var i = 0; i < plusCard.length; i++) {	       
-	   			var name="card"+plusCard[i].CorrPrice.toLowerCase();
-	   			card_name_map.set(name,plusCard[i].CardName);				       
-	        }
-	     			  
-	   		  var ob={"card_list":plusCard,"name_map":card_name_map};
-	   		  func(ob);	
-	      })
-	    },
-	   
+
+
+    get_list: function() {
+      var that = this;
+      if (that.data.is_no_more == 0) return false;
+      var curPage = that.data.curPage;
+      getApp().request.get('/api/weshop/goods/page?page', {
+        data: {
+          is_mainshow: 1,
+          isonsale: 1,
+          is_recommend: 1,
+          is_on_sale: 1,
+          store_id: o.stoid,
+          page: curPage,
+          pageSize: 6,
+        },
+        success: function(res) {
+          var data = res.data;
+          var total = data.data.total;
+          if (total <= curPage * 6) {
+            that.setData({
+              is_no_more: 0
+            });
+          } else {
+            that.data.curPage++;
+          }
+
+          //加载完成
+          if (data.data.pageData) {
+            that.setData({
+              load_complete: 1
+            });
+          }
+          if (that.data.recommend != null) {
+            var ra = that.data.recommend.concat(data.data.pageData);
+            that.setData({
+              recommend: ra
+            });
+          } else {
+            that.setData({
+              recommend: data.data.pageData
+            });
+          }
+        }
+      })
+    },
+
+
+    bind_bnerr_xc: function(e) {
+      var _errImg = e.target.dataset.errorimg;
+      var _errurl = e.target.dataset.url;
+      var _errObj = {};
+      _errObj[_errImg] = "/miniapp/images/default_g_img.gif";
+      this.setData(_errObj) //注意这里的赋值方式,只是将数据列表中的此项图片路径值替换掉 ;      
     },
-	
-	
-	
+
+    reset: function() {
+      curPage = 1;
+    },
+
+    //---  获取卡类列表 ---
+    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();
+        for (var i = 0; i < plusCard.length; i++) {
+          var name = "card" + plusCard[i].CorrPrice.toLowerCase();
+          card_name_map.set(name, plusCard[i].CardName);
+        }
+
+        var ob = {
+          "card_list": plusCard,
+          "name_map": card_name_map
+        };
+        func(ob);
+      })
+    },
+
+  },
+
+
+
 })
\ No newline at end of file
diff --git a/components/goods_list/goods_list.wxml b/components/goods_list/goods_list.wxml
index 13a075c..969cb95 100644
--- a/components/goods_list/goods_list.wxml
+++ b/components/goods_list/goods_list.wxml
@@ -1,128 +1,145 @@
-   <!-- 商品列表 -->
-   <wxs module="filter" src="../../utils/filter.wxs"></wxs>
-   <wxs module="g_filter" src="g_filter.wxs"></wxs>
-    <view class="collects">
-      <view class="hang ">
-        <!-- 商品详情 --> 
-        <view class="collect ib"  wx:for="{{recommend}}" bindtap="go_url" data-url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}">
-            <navigator url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}">
-          <!-- 商品图片 -->  
-          <image class="sp" src="{{url+item.original_img}}" mode="scaleToFill"  binderror="bind_bnerr_xc" data-url="{{item.original_img}}" data-errorimg="recommend[{{index}}].original_img"></image>
-          <view class="bottom">
-            <!-- 商品名称 -->
-            <view class="goods_name ellipsis-2 fs28">{{item.goods_name}}</view>
-					
-			<!-- 商品价格,先判断下是后又等级价-->	
-			<block wx:if="{{g_filter.is_has_rank(rank_switch,item)}}" >	
-					<!-- 当会员是等级卡的时候 -->
-					<block wx:if="{{card_field}}">						         
-						        <!-- 等级价>0 -->
-								<block wx:if="{{item[card_field]>0}}">
-								         <view class="money flex" >
-								           <!-- 办卡价 -->
-								           <view class="flex xc-wc">
-								         	<view class="fs24">￥</view>
-								         	<view class="fs35">{{filter.toFix(item[card_field],2)}}</view>
-											<view class="card_bg"><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">￥</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">
-							          	<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">￥</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>
-					
-			<!-- 商品压根就没有等级价 -->
-			<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>	
-						
-          </view>
-            </navigator>
+<!-- 商品列表 -->
+<wxs module="filter" src="../../utils/filter.wxs"></wxs>
+<wxs module="g_filter" src="g_filter.wxs"></wxs>
+<view class="collects">
+  <view class="hang ">
+    <!-- 商品详情 -->
+    <view class="collect ib" wx:for="{{recommend}}" bindtap="go_url" data-url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}">
+      <navigator url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}">
+        <!-- 商品图片 -->
+        <image class="sp" src="{{url+item.original_img}}" mode="scaleToFill" binderror="bind_bnerr_xc" data-url="{{item.original_img}}" data-errorimg="recommend[{{index}}].original_img"></image>
+        <view class="bottom">
+          <!-- 商品名称 -->
+          <view class="goods_name ellipsis-2 fs28">{{item.goods_name}}</view>
+          <block wx:if="{{item.prom_price}}">
+            <view class="money flex">
+              <!-- 活动价 -->
+              <view class="flex xc-wc">
+                <view class="fs24">￥</view>
+                <view class="fs35">{{filter.toFix(item.prom_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 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">
+                      <view class="fs24">￥</view>
+                      <view class="fs35">{{filter.toFix(item[card_field],2)}}</view>
+                      <view class="card_bg">
+                        <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">￥</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">
+                      <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">￥</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>
+
+            <!-- 商品压根就没有等级价 -->
+            <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>
         </view>
-      </view>
-      <view class="nothing flex-center" wx:if="{{is_no_more==0}}">
-          <view class="Foil"></view>
-          <view class="no_content fs24">没有更多内容了</view>
-          <view class="Foil"></view>
-      </view>
-      </view>
-  
-        
- 
\ No newline at end of file
+      </navigator>
+    </view>
+  </view>
+  <view class="nothing flex-center" wx:if="{{is_no_more==0}}">
+    <view class="Foil"></view>
+    <view class="no_content fs24">没有更多内容了</view>
+    <view class="Foil"></view>
+  </view>
+</view>
\ No newline at end of file
diff --git a/pages/goods/goodsInfo/goodsInfo.wxml b/pages/goods/goodsInfo/goodsInfo.wxml
index b26cc8c..d24fb9b 100644
--- a/pages/goods/goodsInfo/goodsInfo.wxml
+++ b/pages/goods/goodsInfo/goodsInfo.wxml
@@ -262,7 +262,7 @@
 
 	<!-- 等级卡的价格,不是等级卡会员，且商品又有设置等级级价，商家后台有开通升级卡同能 -->
 
-            <view class="flex ai_and" wx:if="{{!card_field && g_filters.is_has_rank(rank_switch,data)}}">
+            <view class="flex ai_and" wx:if="{{!card_field && g_filters.is_has_rank(rank_switch,data) && !prom_type}}">
            
                   <view class="flex ai-center  grade-card-frame card-frame" >
 					    	<image class="img" src="{{iurl}}/miniapp/images/userinfo/userinfo/privilege_t.png"></image>
@@ -278,7 +278,7 @@
               
 			<block wx:if="{{g_filters.is_has_rank(rank_switch,data)}}">	
          
-            <view wx:if="{{!card_field }}">
+            <view wx:if="{{!card_field && !prom_type }}">
 			   <view class="beauty-makeup-frame flex ai-center">
 				   <view class="left flex ai-center">
 					   <view class="flex ai-center  grade-card-frame card-frame advert-card"style="max-width:32%;width:auto" >
diff --git a/pages/goods/goodsList/goodsList.wxml b/pages/goods/goodsList/goodsList.wxml
index 688da7e..42d5523 100644
--- a/pages/goods/goodsList/goodsList.wxml
+++ b/pages/goods/goodsList/goodsList.wxml
@@ -1,141 +1,154 @@
 <wxs module="g_filter" src="g_filter.wxs"></wxs>
 <view class="container">
-    <view class="nav">
-        <navigator bindtap="changeTab" class="nav-item" data-href="goods_id" data-ad="{{adname}}">综合
-            <view class="ico-dg" wx:if="{{tabname=='goods_id'}}">
-               <image class="wh100" src="{{iurl}}/miniapp/images/dg.png" wx:if="{{adname=='desc'}}"></image>
-               <image class="wh100" src="{{iurl}}/miniapp/images/up_s.png" wx:if="{{adname=='asc'}}"></image>
-            </view>
-        </navigator>
-        <navigator bindtap="changeTab" class="nav-item" data-href="sales_sum" data-ad="{{adname}}">销量
-            <view class="ico-dg" wx:if="{{tabname=='sales_sum'}}">
-                  <image class="wh100" src="{{iurl}}/miniapp/images/dg.png" wx:if="{{adname=='desc'}}"></image>
-                  <image class="wh100" src="{{iurl}}/miniapp/images/up_s.png" wx:if="{{adname=='asc'}}"></image>
-            </view>
-   
-        </navigator>
-        <navigator bindtap="changeTab" class="nav-item" data-href="shop_price" data-ad="{{adname}}">
-            价格
-            <view class="ico-dg" wx:if="{{tabname=='shop_price'}}">
-                <image class="wh100" src="{{iurl}}/miniapp/images/dg.png" wx:if="{{adname=='desc'}}"></image>
-                <image class="wh100" src="{{iurl}}/miniapp/images/up_s.png" wx:if="{{adname=='asc'}}"></image>
-            </view>
-        </navigator>
-        <!-- <navigator bindtap="openFilterModal" class="nav-item">筛选<view class="ico-filter">
+  <view class="nav">
+    <navigator bindtap="changeTab" class="nav-item" data-href="goods_id" data-ad="{{adname}}">综合
+      <view class="ico-dg" wx:if="{{tabname=='goods_id'}}">
+        <image class="wh100" src="{{iurl}}/miniapp/images/dg.png" wx:if="{{adname=='desc'}}"></image>
+        <image class="wh100" src="{{iurl}}/miniapp/images/up_s.png" wx:if="{{adname=='asc'}}"></image>
+      </view>
+    </navigator>
+    <navigator bindtap="changeTab" class="nav-item" data-href="sales_sum" data-ad="{{adname}}">销量
+      <view class="ico-dg" wx:if="{{tabname=='sales_sum'}}">
+        <image class="wh100" src="{{iurl}}/miniapp/images/dg.png" wx:if="{{adname=='desc'}}"></image>
+        <image class="wh100" src="{{iurl}}/miniapp/images/up_s.png" wx:if="{{adname=='asc'}}"></image>
+      </view>
+
+    </navigator>
+    <navigator bindtap="changeTab" class="nav-item" data-href="shop_price" data-ad="{{adname}}">
+      价格
+      <view class="ico-dg" wx:if="{{tabname=='shop_price'}}">
+        <image class="wh100" src="{{iurl}}/miniapp/images/dg.png" wx:if="{{adname=='desc'}}"></image>
+        <image class="wh100" src="{{iurl}}/miniapp/images/up_s.png" wx:if="{{adname=='asc'}}"></image>
+      </view>
+    </navigator>
+    <!-- <navigator bindtap="openFilterModal" class="nav-item">筛选<view class="ico-filter">
                 <image class="wh100" src="{{iurl}}/miniapp/images/xx.png"></image>
             </view>
         </navigator> -->
 
-        <navigator  class="nav-item search" url="/pages/goods/search/search">
-            <image class="wh100 search-img" src="{{iurl}}/miniapp/images/search.png"></image>
-        </navigator>
-    </view>
-    <view class="choice_list">
-        <navigator class="choice_item" url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}" wx:for="{{requestData}}" wx:key="{{index}}">
-            <view class="img-wrap">
-                <image src="{{item.original_img}}" binderror="bind_bnerr2" data-url="{{item.original_img}}"  lazy-load="true"
-                       data-errorimg="requestData[{{index}}].original_img"></image>
+    <navigator class="nav-item search" url="/pages/goods/search/search">
+      <image class="wh100 search-img" src="{{iurl}}/miniapp/images/search.png"></image>
+    </navigator>
+  </view>
+  <view class="choice_list">
+    <navigator class="choice_item" url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}" wx:for="{{requestData}}" wx:key="{{index}}">
+      <view class="img-wrap">
+        <image src="{{item.original_img}}" binderror="bind_bnerr2" data-url="{{item.original_img}}" lazy-load="true" data-errorimg="requestData[{{index}}].original_img"></image>
+      </view>
+      <view class="item-cont">
+        <view class="title">{{item.goods_name}}</view>
+        <!-- 判断是否有活动价 -->
+        <block wx:if="{{item.prom_price>0}}">
+             <!-- 活动价 -->
+            <view class="price">￥{{item.prom_price}}</view>
+            <view class="comment flex jc_sb">
+              <view class="word-line xc-ash">￥{{item.market_price}}</view>
+              <view>评论{{item.comment_count}} 已售{{item.sales_sum}}</view>
             </view>
-            <view class="item-cont">
-                <view class="title">{{item.goods_name}}</view>
-				
-                <!-- 商品价格,先判断下是后又等级价-->
-                <block wx:if="{{g_filter.is_has_rank(rank_switch,item)}}" >
-                	       <!-- 当会员是等级卡的时候 -->
-                	       <block wx:if="{{card_field}}">	
-                		         <!-- 等级价>0 -->
-                		         <block wx:if="{{item[card_field]>0}}">
-                				       <view class="flex ai-center">
-                				          <view class="price">￥{{item[card_field]}}</view>
-                						  <view class="card_bg"><image src="{{url}}/miniapp/images/plus/dj_icon.png"></image>
-                              <view class="card_name">{{card_name}}</view></view>
-                					   </view>
-                				       <view class="comment flex jc_sb">
-                				          <view class="word-line xc-ash">￥{{item.market_price}}</view>	
-                				          <view>评论{{item.comment_count}}  已售{{item.sales_sum}}</view>	
-                				       </view>	 								 
-                				 </block>
-                				 <block wx:else>
-                					    <view class="price">￥{{item.shop_price}}</view>
-                					    <view class="comment flex jc_sb">
-                					       <view class="word-line xc-ash">￥{{item.market_price}}</view>	
-                					       <view>评论{{item.comment_count}}  已售{{item.sales_sum}}</view>	
-                					    </view>		
-                				 </block>						      
-                		   </block>
-                		   <block wx:else>
-                			    <block wx:if="{{g_filter.get_card_price(item,card_list,0)}}">
-                					 <view class="flex ai-center">
-                					    <view class="price">￥{{item.shop_price}}</view>
-                						<view class="word-line xc-ash mk_price">￥{{item.market_price}}</view>
-                					 </view> 
-                					 <view class="comment flex jc_sb">
-                						<view class="flex">
-                					       <view class="">￥{{g_filter.get_card_price(item,card_list,0)}}</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>评论{{item.comment_count}}  已售{{item.sales_sum}}</view>	
-                					 </view>	
-                				</block>
-                				<block wx:else>
-                					 <view class="price">￥{{item.shop_price}}</view>
-                					 <view class="comment flex jc_sb">
-                			  		    <view class="word-line xc-ash">￥{{item.market_price}}</view>	
-                					    <view>评论{{item.comment_count}}  已售{{item.sales_sum}}</view>	
-                					 </view>	
-                				</block>	   						   
-                		   </block>					
-                </block>
-                <block wx:else>			
-                	<view class="price">￥{{item.shop_price}}</view>
-                	<view class="comment flex jc_sb">
-                	   <view class="word-line xc-ash">￥{{item.market_price}}</view>	
-                	   <view>评论{{item.comment_count}}  已售{{item.sales_sum}}</view>	
-                	</view>
-                </block>
+        </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="flex ai-center">
+                  <view class="price">￥{{item[card_field]}}</view>
+                  <view class="card_bg">
+                    <image src="{{url}}/miniapp/images/plus/dj_icon.png"></image>
+                    <view class="card_name">{{card_name}}</view>
+                  </view>
+                </view>
+                <view class="comment flex jc_sb">
+                  <view class="word-line xc-ash">￥{{item.market_price}}</view>
+                  <view>评论{{item.comment_count}} 已售{{item.sales_sum}}</view>
+                </view>
+              </block>
+              <block wx:else>
+                <view class="price">￥{{item.shop_price}}</view>
+                <view class="comment flex jc_sb">
+                  <view class="word-line xc-ash">￥{{item.market_price}}</view>
+                  <view>评论{{item.comment_count}} 已售{{item.sales_sum}}</view>
+                </view>
+              </block>
+            </block>
+            <block wx:else>
+              <block wx:if="{{g_filter.get_card_price(item,card_list,0)}}">
+                <view class="flex ai-center">
+                  <view class="price">￥{{item.shop_price}}</view>
+                  <view class="word-line xc-ash mk_price">￥{{item.market_price}}</view>
+                </view>
+                <view class="comment flex jc_sb">
+                  <view class="flex">
+                    <view class="">￥{{g_filter.get_card_price(item,card_list,0)}}</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>评论{{item.comment_count}} 已售{{item.sales_sum}}</view>
+                </view>
+              </block>
+              <block wx:else>
+                <view class="price">￥{{item.shop_price}}</view>
+                <view class="comment flex jc_sb">
+                  <view class="word-line xc-ash">￥{{item.market_price}}</view>
+                  <view>评论{{item.comment_count}} 已售{{item.sales_sum}}</view>
+                </view>
+              </block>
+            </block>
+          </block>
+          <block wx:else>
+            <view class="price">￥{{item.shop_price}}</view>
+            <view class="comment flex jc_sb">
+              <view class="word-line xc-ash">￥{{item.market_price}}</view>
+              <view>评论{{item.comment_count}} 已售{{item.sales_sum}}</view>
             </view>
-        </navigator>
-    </view>
-    <view class="no-data" wx:if="{{(!requestData||requestData.length==0) && is_go}}">
-        <image class="cart-image" src="{{iurl}}/miniapp/images/cart-null.png"></image>
-        <view class="no-data-title">没有相关的数据</view>
-        <navigator class="lookat" openType="switchTab" url="/pages/index/index/index"> 去逛逛 </navigator>
-    </view>
+          </block>
+        </block>
+      </view>
+    </navigator>
+  </view>
+  <view class="no-data" wx:if="{{(!requestData||requestData.length==0) && is_go}}">
+    <image class="cart-image" src="{{iurl}}/miniapp/images/cart-null.png"></image>
+    <view class="no-data-title">没有相关的数据</view>
+    <navigator class="lookat" openType="switchTab" url="/pages/index/index/index"> 去逛逛 </navigator>
+  </view>
 </view>
 <view hidden="{{!openFilterModal}}">
-    <view bindtap="closeFilterModal" class="cover-layer"></view>
-    <view class="filter-modal">
-        <icon bindtap="closeFilterModal" class="modal-close" color="gray" size="22" type="cancel"></icon>
-        <button bindtap="restoreData" class="viewall-btn">显示全部分类</button>
-        <view class="filter-box" wx:for="{{requestData.filter_spec}}" wx:key="{{index}}">
-            <view class="filter-name">{{item.name}}</view>
-            <view class="filter-items">
-                <view bindtap="filterGoods" class="filter-item" data-href="{{item.href}}" wx:for="{{item.item}}" wx:key="{{index}}">
-                {{item.name}}</view>
-            </view>
-        </view>
-        <view class="filter-box" wx:for="{{requestData.filter_attr}}" wx:key="{{index}}">
-            <view class="filter-name">{{item.name}}</view>
-            <view class="filter-items">
-                <view bindtap="filterGoods" class="filter-item" data-href="{{item.href}}" wx:for="{{item.item}}" wx:key="{{index}}">
-                {{item.name}}</view>
-            </view>
-        </view>
-        <view class="filter-box" wx:if="{{requestData.filter_brand.length>0}}">
-            <view class="filter-name">相关品牌</view>
-            <view class="filter-items">
-                <view bindtap="filterGoods" class="filter-item" data-href="{{item.href}}" wx:for="{{requestData.filter_brand}}" wx:key="{{index}}">
-                {{item.name}}</view>
-            </view>
-        </view>
-        <view class="filter-box" wx:if="{{requestData.filter_price.length>0}}">
-            <view class="filter-name">价格区间</view>
-            <view class="filter-items">
-                <view bindtap="filterGoods" class="filter-item" data-href="{{item.href}}" wx:for="{{requestData.filter_price}}" wx:key="{{index}}">
-                {{item.name}}</view>
-            </view>
-        </view>
+  <view bindtap="closeFilterModal" class="cover-layer"></view>
+  <view class="filter-modal">
+    <icon bindtap="closeFilterModal" class="modal-close" color="gray" size="22" type="cancel"></icon>
+    <button bindtap="restoreData" class="viewall-btn">显示全部分类</button>
+    <view class="filter-box" wx:for="{{requestData.filter_spec}}" wx:key="{{index}}">
+      <view class="filter-name">{{item.name}}</view>
+      <view class="filter-items">
+        <view bindtap="filterGoods" class="filter-item" data-href="{{item.href}}" wx:for="{{item.item}}" wx:key="{{index}}">
+          {{item.name}}</view>
+      </view>
     </view>
-</view>
+    <view class="filter-box" wx:for="{{requestData.filter_attr}}" wx:key="{{index}}">
+      <view class="filter-name">{{item.name}}</view>
+      <view class="filter-items">
+        <view bindtap="filterGoods" class="filter-item" data-href="{{item.href}}" wx:for="{{item.item}}" wx:key="{{index}}">
+          {{item.name}}</view>
+      </view>
+    </view>
+    <view class="filter-box" wx:if="{{requestData.filter_brand.length>0}}">
+      <view class="filter-name">相关品牌</view>
+      <view class="filter-items">
+        <view bindtap="filterGoods" class="filter-item" data-href="{{item.href}}" wx:for="{{requestData.filter_brand}}" wx:key="{{index}}">
+          {{item.name}}</view>
+      </view>
+    </view>
+    <view class="filter-box" wx:if="{{requestData.filter_price.length>0}}">
+      <view class="filter-name">价格区间</view>
+      <view class="filter-items">
+        <view bindtap="filterGoods" class="filter-item" data-href="{{item.href}}" wx:for="{{requestData.filter_price}}" wx:key="{{index}}">
+          {{item.name}}</view>
+      </view>
+    </view>
+  </view>
+</view>
\ No newline at end of file
diff --git a/pages/goods/search/search.wxml b/pages/goods/search/search.wxml
index 39df1db..a7f6cc4 100644
--- a/pages/goods/search/search.wxml
+++ b/pages/goods/search/search.wxml
@@ -1,158 +1,170 @@
 <wxs module="g_filter" src="g_filter.wxs"></wxs>
 <view class="container">
-    <view class="nav">
-        <navigator bindtap="changeTab" class="nav-item" data-href="goods_id" data-ad="{{adname}}">综合
-             <view class="ico-dg" wx:if="{{tabname=='goods_id'}}">
-               <image class="wh100" src="{{url}}/miniapp/images/dg.png" wx:if="{{adname=='desc'}}"></image>
-               <image class="wh100" src="{{url}}/miniapp/images/up_s.png" wx:if="{{adname=='asc'}}"></image>
-            </view>
-        </navigator>
-        <navigator bindtap="changeTab" class="nav-item" data-href="sales_sum" data-ad="{{adname}}" >销量
-             <view class="ico-dg" wx:if="{{tabname=='sales_sum'}}">
-               <image class="wh100" src="{{url}}/miniapp/images/dg.png" wx:if="{{adname=='desc'}}"></image>
-               <image class="wh100" src="{{url}}/miniapp/images/up_s.png" wx:if="{{adname=='asc'}}"></image>
-            </view>   
-        </navigator>
-        <navigator bindtap="changeTab" class="nav-item" data-href="shop_price" data-ad="{{adname}}" >价格
-               <view class="ico-dg" wx:if="{{tabname=='shop_price'}}">
-               <image class="wh100" src="{{url}}/miniapp/images/dg.png" wx:if="{{adname=='desc'}}"></image>
-               <image class="wh100" src="{{url}}/miniapp/images/up_s.png" wx:if="{{adname=='asc'}}"></image>
-            </view>
-        </navigator>
-        <!-- <navigator bindtap="openFilterModal" class="nav-item">筛选<view class="ico-filter">
+  <view class="nav">
+    <navigator bindtap="changeTab" class="nav-item" data-href="goods_id" data-ad="{{adname}}">综合
+      <view class="ico-dg" wx:if="{{tabname=='goods_id'}}">
+        <image class="wh100" src="{{url}}/miniapp/images/dg.png" wx:if="{{adname=='desc'}}"></image>
+        <image class="wh100" src="{{url}}/miniapp/images/up_s.png" wx:if="{{adname=='asc'}}"></image>
+      </view>
+    </navigator>
+    <navigator bindtap="changeTab" class="nav-item" data-href="sales_sum" data-ad="{{adname}}">销量
+      <view class="ico-dg" wx:if="{{tabname=='sales_sum'}}">
+        <image class="wh100" src="{{url}}/miniapp/images/dg.png" wx:if="{{adname=='desc'}}"></image>
+        <image class="wh100" src="{{url}}/miniapp/images/up_s.png" wx:if="{{adname=='asc'}}"></image>
+      </view>
+    </navigator>
+    <navigator bindtap="changeTab" class="nav-item" data-href="shop_price" data-ad="{{adname}}">价格
+      <view class="ico-dg" wx:if="{{tabname=='shop_price'}}">
+        <image class="wh100" src="{{url}}/miniapp/images/dg.png" wx:if="{{adname=='desc'}}"></image>
+        <image class="wh100" src="{{url}}/miniapp/images/up_s.png" wx:if="{{adname=='asc'}}"></image>
+      </view>
+    </navigator>
+    <!-- <navigator bindtap="openFilterModal" class="nav-item">筛选<view class="ico-filter">
                 <image class="wh100" src="{{url}}/miniapp/images/xx.png"></image>
             </view>
         </navigator> -->
-        <navigator bindtap="openSearchModal" class="nav-item nav-search">
-            <image class="wh100 search-img" src="{{url}}/miniapp/images/search.png"></image>
-        </navigator>
-    </view>
-    <view class="choice_list">
-        <navigator class="choice_item" url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}" wx:for="{{requestData}}" wx:key="{{index}}">
-            <view class="img-wrap">
-                <image src="{{item.original_img}}" lazy-load="true"
-                    binderror="bind_bnerr" data-errorimg="requestData[{{index}}].original_img"></image>
+    <navigator bindtap="openSearchModal" class="nav-item nav-search">
+      <image class="wh100 search-img" src="{{url}}/miniapp/images/search.png"></image>
+    </navigator>
+  </view>
+  <view class="choice_list">
+    <navigator class="choice_item" url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}" wx:for="{{requestData}}" wx:key="{{index}}">
+      <view class="img-wrap">
+        <image src="{{item.original_img}}" lazy-load="true" binderror="bind_bnerr" data-errorimg="requestData[{{index}}].original_img"></image>
+      </view>
+      <view class="item-cont">
+        <view class="title">{{item.goods_name}}</view>
+        <!-- 判断是否有活动价 -->
+        <block wx:if="{{item.prom_price>0}}">
+               <!-- 活动价 -->
+            <view class="price">￥{{item.prom_price}}</view>
+            <view class="comment flex jc_sb">
+              <view class="word-line xc-ash">￥{{item.market_price}}</view>
+              <view>评论{{item.comment_count}} 已售{{item.sales_sum}}</view>
             </view>
-            <view class="item-cont">
-                <view class="title">{{item.goods_name}}</view>
-				<!-- 商品价格,先判断下是后又等级价-->	
-				<block wx:if="{{g_filter.is_has_rank(rank_switch,item)}}" >
-					       <!-- 当会员是等级卡的时候 -->
-					       <block wx:if="{{card_field}}">	
-						         <!-- 等级价>0 -->
-						         <block wx:if="{{item[card_field]>0}}">
-								       <view class="flex ai-center">
-								          <view class="price">￥{{item[card_field]}}</view>
-										  <view class="card_bg"><image src="{{url}}/miniapp/images/plus/dj_icon.png"></image>
-                     <view class="card_name">{{card_name}}</view> 
-                      </view>
-									   </view>
-								       <view class="comment flex jc_sb">
-								          <view class="word-line xc-ash">￥{{item.market_price}}</view>	
-								          <view>评论{{item.comment_count}}  已售{{item.sales_sum}}</view>	
-								       </view>	 								 
-								 </block>
-								 <block wx:else>
-									    <view class="price">￥{{item.shop_price}}</view>
-									    <view class="comment flex jc_sb">
-									       <view class="word-line xc-ash">￥{{item.market_price}}</view>	
-									       <view>评论{{item.comment_count}}  已售{{item.sales_sum}}</view>	
-									    </view>		
-								 </block>						      
-						   </block>
-						   <block wx:else>
-							    <block wx:if="{{g_filter.get_card_price(item,card_list,0)}}">
-									 <view class="flex ai-center">
-									    <view class="price">￥{{item.shop_price}}</view>
-										<view class="word-line xc-ash mk_price">￥{{item.market_price}}</view>
-									 </view> 
-									 <view class="comment flex jc_sb">
-										<view class="flex">
-									       <view class="">￥{{g_filter.get_card_price(item,card_list,0)}}</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>评论{{item.comment_count}}  已售{{item.sales_sum}}</view>	
-									 </view>	
-								</block>
-								<block wx:else>
-									 <view class="price">￥{{item.shop_price}}</view>
-									 <view class="comment flex jc_sb">
-									    <view class="word-line xc-ash">￥{{item.market_price}}</view>	
-									    <view>评论{{item.comment_count}}  已售{{item.sales_sum}}</view>	
-									 </view>	
-								</block>	   						   
-						   </block>					
-				</block>
-				<block wx:else>			
-					<view class="price">￥{{item.shop_price}}</view>
-					<view class="comment flex jc_sb">
-					   <view class="word-line xc-ash">￥{{item.market_price}}</view>	
-					   <view>评论{{item.comment_count}}  已售{{item.sales_sum}}</view>	
-					</view>
-				</block>
+        </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="flex ai-center">
+                  <view class="price">￥{{item[card_field]}}</view>
+                  <view class="card_bg">
+                    <image src="{{url}}/miniapp/images/plus/dj_icon.png"></image>
+                    <view class="card_name">{{card_name}}</view>
+                  </view>
+                </view>
+                <view class="comment flex jc_sb">
+                  <view class="word-line xc-ash">￥{{item.market_price}}</view>
+                  <view>评论{{item.comment_count}} 已售{{item.sales_sum}}</view>
+                </view>
+              </block>
+              <block wx:else>
+                <view class="price">￥{{item.shop_price}}</view>
+                <view class="comment flex jc_sb">
+                  <view class="word-line xc-ash">￥{{item.market_price}}</view>
+                  <view>评论{{item.comment_count}} 已售{{item.sales_sum}}</view>
+                </view>
+              </block>
+            </block>
+            <block wx:else>
+              <block wx:if="{{g_filter.get_card_price(item,card_list,0)}}">
+                <view class="flex ai-center">
+                  <view class="price">￥{{item.shop_price}}</view>
+                  <view class="word-line xc-ash mk_price">￥{{item.market_price}}</view>
+                </view>
+                <view class="comment flex jc_sb">
+                  <view class="flex">
+                    <view class="">￥{{g_filter.get_card_price(item,card_list,0)}}</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>评论{{item.comment_count}} 已售{{item.sales_sum}}</view>
+                </view>
+              </block>
+              <block wx:else>
+                <view class="price">￥{{item.shop_price}}</view>
+                <view class="comment flex jc_sb">
+                  <view class="word-line xc-ash">￥{{item.market_price}}</view>
+                  <view>评论{{item.comment_count}} 已售{{item.sales_sum}}</view>
+                </view>
+              </block>
+            </block>
+          </block>
+          <block wx:else>
+            <view class="price">￥{{item.shop_price}}</view>
+            <view class="comment flex jc_sb">
+              <view class="word-line xc-ash">￥{{item.market_price}}</view>
+              <view>评论{{item.comment_count}} 已售{{item.sales_sum}}</view>
             </view>
-        </navigator>
-    </view>
-    <view class="no-data" wx:if="{{!requestData||requestData.length==0}}">
-        <image class="cart-image" src="{{url}}/miniapp/images/cart-null.png"></image>
-        <view class="no-data-title">没有相关的数据</view>
-        <navigator class="lookat" openType="switchTab" url="/pages/index/index/index"> 去逛逛 </navigator>
-    </view>
+          </block>
+        </block>
+      </view>
+    </navigator>
+  </view>
+  <view class="no-data" wx:if="{{!requestData||requestData.length==0}}">
+    <image class="cart-image" src="{{url}}/miniapp/images/cart-null.png"></image>
+    <view class="no-data-title">没有相关的数据</view>
+    <navigator class="lookat" openType="switchTab" url="/pages/index/index/index"> 去逛逛 </navigator>
+  </view>
 </view>
 <view hidden="{{!openFilterModal}}">
-    <view bindtap="closeFilterModal" class="cover-layer"></view>
-    <view class="filter-modal">
-        <icon bindtap="closeFilterModal" class="modal-close" color="gray" size="22" type="cancel"></icon>
-        <button bindtap="restoreData" class="viewall-btn">显示全部分类</button>
-        <view class="filter-box" wx:for="{{requestData.filter_spec}}" wx:key="{{index}}">
-            <view class="filter-name">{{item.name}}</view>
-            <view class="filter-items">
-                <view bindtap="filterGoods" class="filter-item" data-href="{{item.href}}" wx:for="{{item.item}}" wx:key="{{index}}">
-                {{item.name}}</view>
-            </view>
-        </view>
-        <view class="filter-box" wx:for="{{requestData.filter_attr}}" wx:key="{{index}}">
-            <view class="filter-name">{{item.name}}</view>
-            <view class="filter-items">
-                <view bindtap="filterGoods" class="filter-item" data-href="{{item.href}}" wx:for="{{item.item}}" wx:key="{{index}}">
-                {{item.name}}</view>
-            </view>
-        </view>
-        <view class="filter-box" wx:if="{{requestData.filter_brand.length>0}}">
-            <view class="filter-name">相关品牌</view>
-            <view class="filter-items">
-                <view bindtap="filterGoods" class="filter-item" data-href="{{item.href}}" wx:for="{{requestData.filter_brand}}" wx:key="{{index}}">
-                {{item.name}}</view>
-            </view>
-        </view>
-        <view class="filter-box" wx:if="{{requestData.filter_price.length>0}}">
-            <view class="filter-name">价格区间</view>
-            <view class="filter-items">
-                <view bindtap="filterGoods" class="filter-item" data-href="{{item.href}}" wx:for="{{requestData.filter_price}}" wx:key="{{index}}">
-                {{item.name}}</view>
-            </view>
-        </view>
+  <view bindtap="closeFilterModal" class="cover-layer"></view>
+  <view class="filter-modal">
+    <icon bindtap="closeFilterModal" class="modal-close" color="gray" size="22" type="cancel"></icon>
+    <button bindtap="restoreData" class="viewall-btn">显示全部分类</button>
+    <view class="filter-box" wx:for="{{requestData.filter_spec}}" wx:key="{{index}}">
+      <view class="filter-name">{{item.name}}</view>
+      <view class="filter-items">
+        <view bindtap="filterGoods" class="filter-item" data-href="{{item.href}}" wx:for="{{item.item}}" wx:key="{{index}}">
+          {{item.name}}</view>
+      </view>
+    </view>
+    <view class="filter-box" wx:for="{{requestData.filter_attr}}" wx:key="{{index}}">
+      <view class="filter-name">{{item.name}}</view>
+      <view class="filter-items">
+        <view bindtap="filterGoods" class="filter-item" data-href="{{item.href}}" wx:for="{{item.item}}" wx:key="{{index}}">
+          {{item.name}}</view>
+      </view>
+    </view>
+    <view class="filter-box" wx:if="{{requestData.filter_brand.length>0}}">
+      <view class="filter-name">相关品牌</view>
+      <view class="filter-items">
+        <view bindtap="filterGoods" class="filter-item" data-href="{{item.href}}" wx:for="{{requestData.filter_brand}}" wx:key="{{index}}">
+          {{item.name}}</view>
+      </view>
+    </view>
+    <view class="filter-box" wx:if="{{requestData.filter_price.length>0}}">
+      <view class="filter-name">价格区间</view>
+      <view class="filter-items">
+        <view bindtap="filterGoods" class="filter-item" data-href="{{item.href}}" wx:for="{{requestData.filter_price}}" wx:key="{{index}}">
+          {{item.name}}</view>
+      </view>
     </view>
+  </view>
 </view>
 <view wx:if="{{openSearchModal}}">
-    <view class="search-modal">
-        <view class="search-bar">
-            <form bindsubmit="submitSearch">
-                <input autoFocus class="search-input" name="word" placeholder="搜索商品"></input>
-                <button class="search-btn" formType="submit">
-                    <image class="wh100 search-img" src="{{url}}/miniapp/images/sea.png"></image>
-                </button>
-            </form>
-        </view>
-        <view class="search-hot">
-            <view class="hot-title">热门搜索</view>
-            <block wx:if="{{hotWords.length>0}}">
-            <view class="hot-row" wx:for="{{hotWords}}" wx:key="{{index}}">
-                <view bindtap="searchHotWord" class="hot-item" data-word="{{item}}" wx:for="{{item}}" wx:key="{{index}}">{{item}}</view>
-            </view>
-            </block>
+  <view class="search-modal">
+    <view class="search-bar">
+      <form bindsubmit="submitSearch">
+        <input autoFocus class="search-input" name="word" placeholder="搜索商品"></input>
+        <button class="search-btn" formType="submit">
+          <image class="wh100 search-img" src="{{url}}/miniapp/images/sea.png"></image>
+        </button>
+      </form>
+    </view>
+    <view class="search-hot">
+      <view class="hot-title">热门搜索</view>
+      <block wx:if="{{hotWords.length>0}}">
+        <view class="hot-row" wx:for="{{hotWords}}" wx:key="{{index}}">
+          <view bindtap="searchHotWord" class="hot-item" data-word="{{item}}" wx:for="{{item}}" wx:key="{{index}}">{{item}}</view>
         </view>
+      </block>
     </view>
-</view>
+  </view>
+</view>
\ No newline at end of file