OA单小程序商城里的分类，拉到最下面的时候，商品还没看完就跳到下一个分类去了

前端开发-罗建龙
1 parent 9bb19c17
Showing 3 changed files with 1369 additions and 1278 deletions
pages/goods/categoryList/categoryList.js
pages/goods/categoryList/categoryList.wxml
pages/user/assistance/task_assistance.wxml
@@ -5,21 +5,26 @@ var i = function (i) {
   };
 }(require("../../../utils/LoadMore.js")), a = new i.default(), ut = require("../../../utils/util.js");
 //t = i,e = t
+var nextTimeOff=null
 Page({
   data: {
-    is_date:true,
+    is_date: true,
     scrollHeight: 0,
-    currentTab:-1,
-    abc:0,
-    windowHeight:0,
+    currentTab: -1,
+    abc: 0,
+    windowHeight: 0,
     windowWidth: 0,
-    eachLetterHeight:0,
-    lettersPosition:0, 
-    catelist:null,   //分类读取
+    eachLetterHeight: 0,
+    lettersPosition: 0,
+    catelist: null,   //分类读取
     nationlist: null,//国家读取
     groups: null,    //品牌读取
     iurl: oo.imghost,//图片地址
-
+    nextShow:false, //是否跳转下个类型
+    nextShow2:false, //是否跳转下个类型
+    toupper:true,
+    sClientY:0,   //滑动初始值
+    eClientY:0,  //滑动终值
     // 当前选择的导航字母
     selected: 0,
     // 选择字母视图滚动的位置id
@@ -27,55 +32,55 @@ Page({
     // 导航字母
     letters: ['A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T',
       'U', 'V', 'W', 'X', 'Y', 'Z'],
-   //控制新旧分类版本
-    is_used_share:0,
+    //控制新旧分类版本
+    is_used_share: 0,
     //国家的控制属性
-    is_country:1,
+    is_country: 1,
     //品牌的控制属性
-    is_brand:1,
+    is_brand: 1,
     //选择分类的控制属性
-    select_classify_on:223,
-    index:223,
-    classify_name:"国家",//项目类型
-    brand_list:null,//品牌列表
-
-    one_level_classify:[],// 新的版本左边的边分类1级
-    is_level_three:0,//判断有没有3级
-    cat_id:0,
+    select_classify_on: 223,
+    index: 223,
+    classify_name: "国家",//项目类型
+    brand_list: null,//品牌列表
+
+    one_level_classify: [],// 新的版本左边的边分类1级
+    is_level_three: 0,//判断有没有3级
+    cat_id: 0,
     pl_timer: null,//只有品类的定时器
-    is_pl_time:0,
-    requestData:null, //风格三的商品数据列表 分页
-    stylePage:1, //商品列表分页标识
+    is_pl_time: 0,
+    requestData: null, //风格三的商品数据列表 分页
+    stylePage: 1, //商品列表分页标识
  
     //风格三使用
     url: t.globalData.setting.imghost,
     currentPage: 1,
     allData: null,
     openFilterModal: !1,
-    baseUrl: "api/weshop/goods/page?1=1&cat_id=1&parent_id=0&orderField=sort&orderType=asc&page=1&is_mainshow=1&isonsale=1&store_id="+oo.stoid+"&is_recommend=1",
+    baseUrl: "api/weshop/goods/page?1=1&cat_id=1&parent_id=0&orderField=sort&orderType=asc&page=1&is_mainshow=1&isonsale=1&store_id=" + oo.stoid + "&is_recommend=1",
     requestUrl: "",
     tabname: "goods_id",   //排序的字段
     adname: "desc",        //升降的字段
     is_new: 0,
     is_hot: 0,
-    msgStatus:false,  //页面显示暂无数据状态
+    msgStatus: false,  //页面显示暂无数据状态
     countDownNum: 3,
     timer: null, //定时器
-    lastMsg:false,
-    toView:"",
-    is_show_class:false,//是否添加新样式
-    status_show:0,
+    lastMsg: false,
+    toView: "",
+    is_show_class: false,//是否添加新样式
+    status_show: 0,
     currentTab: 0, //预设当前项的值
-	
-    load:0,
+
+    load: 0,
     xmlist: null,
-  
+
  
   },
  
  
   //判断当前滚动超过一屏时，设置tab标题滚动条。
-  checkCor: function() {
+  checkCor: function () {
     let that = this;
     //这里计算按照实际情况进行修改，动态数据要进行动态分析
     //思路：窗体高度/单个分类高度 200rpx 转px计算 =>得到一屏幕所显示的个数，结合后台传回分类总数进行计算
@@ -92,413 +97,418 @@ Page({
   },
  
  
-    onLoad: function(tt) { 
-      var that = this;
-	  var first_leader=tt.first_leader;  
-	  if(first_leader){
-	  	 //--  user_id代过来免登录 --
-	     getApp().globalData.first_leader=first_leader;	  
-	  }
+  onLoad: function (tt) {
+    // wx.createSelectorQuery().select('#sview').boundingClientRect(function(rect){
+    //   console.log('显示下滑区域');
+    //   console.log(rect);
+    // }).exec()
  
-	  if(tt.type) this.data.type= parseInt(tt.type);
-      that.get_brand();
-	 
-      clearInterval(that.data.timer);
-      that.setData({ countDownNum: 3, stylePage: 1 });
+    var that = this;
+    var first_leader = tt.first_leader;
+    if (first_leader) {
+      //--  user_id代过来免登录 --
+      getApp().globalData.first_leader = first_leader;
+    }
  
-      const res = wx.getSystemInfoSync(),
-        letters = this.data.letters;
-      this.setData({
-        abc: t.globalData.heigth-88-88-16,
-        windowHeight: res.windowHeight,
-        windowWidth: res.windowWidth,
-    
-      });
+    if (tt.type) this.data.type = parseInt(tt.type);
+    that.get_brand();
  
-      var bli = res.windowWidth/750;
-      //--------第一个字母距离顶部高度，单位使用的是rpx,须除以bli------
-      //才能与touch事件中的数值相加减，css中定义nav高度为94%，所以 *0.94
-        const eachLetterHeight = 35.4*bli,
-        comTop = (88+88) * bli,
-        temp = [];
+    clearInterval(that.data.timer);
+    that.setData({ countDownNum: 3, stylePage: 1 });
  
-      this.setData({
-        eachLetterHeight: eachLetterHeight
-      });
-      //---------求各字母距离设备左上角所处位置---------
-      for (let i = 0, len = letters.length; i < len; i++) {
-        const x = (this.data.windowWidth - (30 + 50)) * bli,
-          y = comTop + (i * eachLetterHeight);
-        temp.push([x, y]);
+    const res = wx.getSystemInfoSync(),
+      letters = this.data.letters;
+    this.setData({
+      abc: t.globalData.heigth - 88 - 88 - 16,
+      windowHeight: res.windowHeight,
+      windowWidth: res.windowWidth,
+
+    });
+
+    var bli = res.windowWidth / 750;
+    //--------第一个字母距离顶部高度，单位使用的是rpx,须除以bli------
+    //才能与touch事件中的数值相加减，css中定义nav高度为94%，所以 *0.94
+    const eachLetterHeight = 35.4 * bli,
+      comTop = (88 + 88) * bli,
+      temp = [];
+
+    this.setData({
+      eachLetterHeight: eachLetterHeight
+    });
+    //---------求各字母距离设备左上角所处位置---------
+    for (let i = 0, len = letters.length; i < len; i++) {
+      const x = (this.data.windowWidth - (30 + 50)) * bli,
+        y = comTop + (i * eachLetterHeight);
+      temp.push([x, y]);
+    }
+    this.setData({
+      lettersPosition: temp
+    });
+
+    if (this.data.is_used_share == 0) {
+      this.get_nation();
+      this.getServiceCategory();
+    }
+
+    //风格三
+    //t = i,e = t
+    var th = this;
+    a.init(this, "", "requestData");
+    var url = this.data.baseUrl;
+    this.data.is_new = i.is_new;
+    this.data.is_hot = i.is_hot;
+    if (0 != this.data.cat_id) {
+      url += "&cat_id=" + this.data.cat_id;
+    }
+
+    // this.requestGoodsList(url);
+    getApp().getConfig2(function (rs) {
+      //计算等级价相关
+      var swithc_list = rs.switch_list;
+      var sw_arr = JSON.parse(swithc_list);
+      //---如果后台又开等级卡的开关---
+      if (sw_arr.rank_switch && sw_arr.rank_switch == "2") {
+        th.setData({ rank_switch: true });
+        var user = getApp().globalData.userInfo;
+        var ti = setInterval(function () {
+          if (!user) return false;
+          clearInterval(ti);
+          //---回调卡的列表---
+          th.getPlusCardType(function (ob) {
+            th.setData({ card_list: ob.card_list });
+            if (user.card_field && user['card_expiredate']) {
+              var str = user['card_expiredate'].replace(/-/g, '/');
+              var end = new Date(str);
+              end = Date.parse(end) / 1000;
+              var now = ut.gettimestamp();
+
+              //--- 判断是等级会员，且在有效期范围内 ---
+              if (user.card_field && now < end) {
+                var card_name = ob.name_map.get(user.card_field);
+                //if (card_name.length > 4) card_name = card_name.substring(0, 4);
+                th.setData({ card_field: user.card_field, card_name: card_name, card_list: ob.card_list });
+              }
+            }
+          })
+        }, 500)
       }
-      this.setData({
-        lettersPosition: temp
+    });
+  },
+  onShow: function () {
+    getApp().check_can_share();
+
+    if (typeof this.getTabBar === 'function' && this.getTabBar()) {
+      var index = getApp().getPageIndex(this);
+      this.getTabBar().setData({
+        active: index //数字是当前页面在tabbar的索引
       });
-   
-      if (this.data.is_used_share==0){  
-        this.get_nation();
-        this.getServiceCategory();
+      getApp().requestCardNum(this);
+    }
+
+
+    var that = this;
+    //调用底部导航
+    //t.editTabBar(that,getApp().globalData.setting.stoid,getApp().globalData.url);
+    //this.requestFirstCategoris();
+    setTimeout(function () {
+      //if (getApp().globalData.user_id) getApp().requestCardNum(that);
+    }, 500)
+
+    if (this.data.load) return false;
+
+    getApp().getConfig2(function (e) {
+      console.log('card------------>>>>', e);
+      var data = e;
+      var switch_list_data = data.switch_list;
+      var switch_list = JSON.parse(switch_list_data);
+      var is_newsgoodstype = switch_list.is_newsgoodstype;
+      if (is_newsgoodstype == undefined) {
+        is_newsgoodstype = 0;
       }
-      
-      //风格三
-      //t = i,e = t
-      var th = this;
-      a.init(this, "", "requestData");
-      var url = this.data.baseUrl;
-      this.data.is_new = i.is_new;
-      this.data.is_hot = i.is_hot;
-      if (0 != this.data.cat_id) {
-        url += "&cat_id=" + this.data.cat_id;
+      that.setData({ is_used_share: is_newsgoodstype });
+      if (e.categoryset.indexOf("," + 1 + ",") != -1) { that.setData({ is_show_pl: 1 }); }
+      if (e.categoryset.indexOf("," + 3 + ",") != -1) { that.setData({ is_show_pp: 1 }); }
+      if (e.categoryset.indexOf("," + 2 + ",") != -1) { that.setData({ is_show_gb: 1 }); }
+      if (e.categoryset.indexOf("," + 4 + ",") != -1) { that.setData({ is_show_xm: 1 }); }
+      that.setData({ store_config: e, is_do: 1 });
+
+      //---有勾品类---
+      if (that.data.is_show_pl) {
+        that.requestFirstCategoris();
       }
-  
-     // this.requestGoodsList(url);
-      getApp().getConfig2(function (rs) {
-        //计算等级价相关
-        var swithc_list = rs.switch_list;
-        var sw_arr = JSON.parse(swithc_list);
-        //---如果后台又开等级卡的开关---
-        if (sw_arr.rank_switch && sw_arr.rank_switch == "2") {
-          th.setData({ rank_switch: true });
-          var user = getApp().globalData.userInfo;
-          var ti = setInterval(function () {
-            if (!user) return false;
-            clearInterval(ti);
-            //---回调卡的列表---
-            th.getPlusCardType(function (ob) {
-              th.setData({ card_list: ob.card_list });
-              if (user.card_field && user['card_expiredate']) {
-                var str = user['card_expiredate'].replace(/-/g, '/');
-                var end = new Date(str);
-                end = Date.parse(end) / 1000;
-                var now = ut.gettimestamp();
-
-                //--- 判断是等级会员，且在有效期范围内 ---
-                if (user.card_field && now < end) {
-                  var card_name = ob.name_map.get(user.card_field);
-                  //if (card_name.length > 4) card_name = card_name.substring(0, 4);
-                  th.setData({ card_field: user.card_field, card_name: card_name, card_list: ob.card_list });
-                }
+      if (that.data.is_show_xm != 1 && that.data.is_show_gb != 1 && that.data.is_show_pp != 1 && that.data.is_show_pl) {
+        that.data.pl_timer = setInterval(function () {
+          if (that.data.one_level_classify.length > 0) {
+            var item = that.data.one_level_classify[0], arr = item.array;
+            //----如果有下级的时候-----
+            if (item.array && item.array.length > 0) {
+              var is_lev_thr = 0
+              for (var i = 0; i < arr.length; i++) {
+                if (arr[i].arrays.length > 0) { is_lev_thr = 1; break; }
               }
-            })
-          }, 500)
-        }
-      });
-    },
-    onShow:function(){
-        getApp().check_can_share();
-		
-		 if (typeof this.getTabBar === 'function' && this.getTabBar()) {
-			  var index=getApp().getPageIndex(this);			 
-		      this.getTabBar().setData({
-		        active: index //数字是当前页面在tabbar的索引
-		      });
-			  getApp().requestCardNum(this);
-         }
-		
-			
-      var that=this;
-      //调用底部导航
-      //t.editTabBar(that,getApp().globalData.setting.stoid,getApp().globalData.url);
-      //this.requestFirstCategoris();
-        setTimeout(function () {
-            //if (getApp().globalData.user_id) getApp().requestCardNum(that);
-        },500)
-		
-		if(this.data.load) return false;
-
-        getApp().getConfig2(function (e) {
-				console.log('card------------>>>>', e);
-        var data=e;
-        var switch_list_data = data.switch_list;
-        var switch_list = JSON.parse(switch_list_data);
-        var is_newsgoodstype = switch_list.is_newsgoodstype;
-        if (is_newsgoodstype==undefined)
-        {
-          is_newsgoodstype=0;
-        }
-        that.setData({ is_used_share :is_newsgoodstype});
-        if (e.categoryset.indexOf("," + 1 + ",") != -1) { that.setData({ is_show_pl: 1 }); }
-        if (e.categoryset.indexOf("," + 3 + ",") != -1) { that.setData({ is_show_pp: 1 }); }
-        if (e.categoryset.indexOf("," + 2 + ",") != -1) { that.setData({ is_show_gb: 1 }); }
-        if (e.categoryset.indexOf("," + 4 + ",") != -1) { that.setData({ is_show_xm: 1 }); }
-        that.setData({ store_config: e,is_do:1 });
-
-        //---有勾品类---
-        if (that.data.is_show_pl){
-           that.requestFirstCategoris();
-        }
-        if (that.data.is_show_xm != 1 && that.data.is_show_gb != 1 && that.data.is_show_pp != 1 && that.data.is_show_pl){     
-            that.data.pl_timer = setInterval(function () {
-                 if (that.data.one_level_classify.length>0){
-                     var item=that.data.one_level_classify[0],arr=item.array;
-                     //----如果有下级的时候-----
-                     if(item.array && item.array.length>0){
-                         var is_lev_thr=0
-                         for(var i=0;i<arr.length;i++){
-                             if (arr[i].arrays.length>0) {is_lev_thr=1;break; }
-                         }
-                         that.setData({ is_level_three: is_lev_thr });
-                         if (is_lev_thr!=1) {
-                          that.setData({ select_classify_on: 0, index: 0, classify_name: item.items.name,cat_id: item.items.id,goodslist: item.array });
-                          console.log("id:="+item.items.id)
-                          that.style(that.data.stylePage,that.data.cat_id);
-                     } else {
-                          that.setData({ select_classify_on: 0, index: 0, classify_name: item.items.name,cat_id: item.items.id,goodslist: arr });
-                          console.log("id:="+item.items.id)
-                          that.style(that.data.stylePage,that.data.cat_id);
-                     }
-                     }
-                     else{
-                         that.setData({ select_classify_on: 0, index: 0, goodslist: null,classify_name:item.items.name,is_level_three: 0});
-                     }
-                     clearInterval(that.data.pl_timer);
-                 }
-            },1000);
-
-        } else if (that.data.is_show_gb != 1 && that.data.is_show_pp  ){
-            that.setData({ select_classify_on: 220, classify_name: "品牌" });
-        }
-       
-
-        var one_level_classify = that.data.one_level_classify;
-
-        if (that.data.is_show_pl) that.setData({ currentTab: 0 });
-        else if (that.data.is_show_gb){ that.setData({ currentTab: 1 });that.get_nation();  }
-        else if (that.data.is_show_pp) {that.setData({ currentTab: 2 });that.get_brand(); }
-        else if (that.data.is_show_xm) {that.setData({ currentTab: 3 });that.getServiceCategory(); }
-
-
-        var t_type=that.data.type;
-        //----求传参过来的控制-----
-        if (t_type == 1 && that.data.is_show_gb ) {
-          that.setData({ currentTab: 1,select_classify_on:223 });
-          that.get_nation();
-        } else if (t_type == 2 && that.data.is_show_pp ) {
-          that.setData({ currentTab: 2,select_classify_on:220});
-          that.get_brand();
-        } else if (t_type == 3 && that.data.is_show_xm ) {
-          that.setData({ currentTab: 3,select_classify_on:221 });
-          that.getServiceCategory();
-        } else if (that.data.is_show_pl) {
-          that.setData({ currentTab: 0,select_classify_on:0 });
-        }
-        // 获取默认选中的第一个
-        if(that.data.is_show_gb && that.data.select_classify_on == 223){
-          that.setData({ status_show: 1 });
-        }else if(that.data.is_show_pp && that.data.select_classify_on == 220){
-          that.setData({ status_show: 2 });
+              that.setData({ is_level_three: is_lev_thr });
+              if (is_lev_thr != 1) {
+                that.setData({ select_classify_on: 0, index: 0, classify_name: item.items.name, cat_id: item.items.id, goodslist: item.array });
+                console.log("id:=" + item.items.id)
+                that.style(that.data.stylePage, that.data.cat_id);
+              } else {
+                that.setData({ select_classify_on: 0, index: 0, classify_name: item.items.name, cat_id: item.items.id, goodslist: arr });
+                console.log("id:=" + item.items.id)
+                that.style(that.data.stylePage, that.data.cat_id);
+              }
+            }
+            else {
+              that.setData({ select_classify_on: 0, index: 0, goodslist: null, classify_name: item.items.name, is_level_three: 0 });
+            }
+            clearInterval(that.data.pl_timer);
+          }
+        }, 1000);
+
+      } else if (that.data.is_show_gb != 1 && that.data.is_show_pp) {
+        that.setData({ select_classify_on: 220, classify_name: "品牌" });
+      }
+
+
+      var one_level_classify = that.data.one_level_classify;
+
+      if (that.data.is_show_pl) that.setData({ currentTab: 0 });
+      else if (that.data.is_show_gb) { that.setData({ currentTab: 1 }); that.get_nation(); }
+      else if (that.data.is_show_pp) { that.setData({ currentTab: 2 }); that.get_brand(); }
+      else if (that.data.is_show_xm) { that.setData({ currentTab: 3 }); that.getServiceCategory(); }
+
+
+      var t_type = that.data.type;
+      //----求传参过来的控制-----
+      if (t_type == 1 && that.data.is_show_gb) {
+        that.setData({ currentTab: 1, select_classify_on: 223 });
+        that.get_nation();
+      } else if (t_type == 2 && that.data.is_show_pp) {
+        that.setData({ currentTab: 2, select_classify_on: 220 });
+        that.get_brand();
+      } else if (t_type == 3 && that.data.is_show_xm) {
+        that.setData({ currentTab: 3, select_classify_on: 221 });
+        that.getServiceCategory();
+      } else if (that.data.is_show_pl) {
+        that.setData({ currentTab: 0, select_classify_on: 0 });
+      }
+      // 获取默认选中的第一个
+      if (that.data.is_show_gb && that.data.select_classify_on == 223) {
+        that.setData({ status_show: 1 });
+      } else if (that.data.is_show_pp && that.data.select_classify_on == 220) {
+        that.setData({ status_show: 2 });
+      }
+
+      that.data.load = 1;
+    })
+
+  },
+
+  //---------------分类请求接口,数据进行拼装------------------
+  requestFirstCategoris: function () {
+    var t = this;
+    e.get("/api/weshop/goodscategory/page", {
+      data: { store_id: oo.stoid, pageSize: 6600, is_show: 1 },
+      success: function (e) {
+        var arr = new Array();
+        var dda = e.data.data.pageData;
+        if (dda != null && dda != "" && dda != undefined) {
+          t.setData({ is_pl_time: 1 });
         }
-		
-      that.data.load=1;
-      })
-    
-    },
-
-    //---------------分类请求接口,数据进行拼装------------------
-    requestFirstCategoris: function() {
-        var t = this;
-        e.get("/api/weshop/goodscategory/page", {
-            data: { store_id: oo.stoid,pageSize:6600,is_show:1},
-            success: function(e) {   
-                var arr=new Array();
-                var dda = e.data.data.pageData;
-              if (dda != null && dda !=""&&dda!=undefined){
-                t.setData({is_pl_time:1});
+
+        if (t.data.is_used_share == 0) {//is_used_share控制新旧版本
+          for (var i = 0; i < dda.length; i++) {
+            if (parseInt(dda[i].level) == 1) {
+              var item = { items: dda[i], array: new Array() }
+              arr.push(item);
+            } else if (parseInt(dda[i].level) == 2) {
+              for (var j = 0; j < arr.length; j++) {
+                if (parseInt(dda[i].parent_id) == parseInt(arr[j].items.id)) {
+                  arr[j].array.push(dda[i]); break;
+                }
               }
-           
-              if (t.data.is_used_share == 0) {//is_used_share控制新旧版本
-                for(var i=0;i<dda.length;i++){
-                  if (parseInt(dda[i].level)==1){
-                       var item = {items: dda[i], array: new Array()}
-                       arr.push(item);
-                  } else if (parseInt(dda[i].level) == 2){
-                      for (var j = 0; j < arr.length;j++ ){
-                         if (parseInt(dda[i].parent_id) == parseInt(arr[j].items.id)){
-                            arr[j].array.push(dda[i]); break;
-                         }
-                      }
-                  }else{
-                     continue;
-                  }
+            } else {
+              continue;
+            }
+          }
+          t.setData({ catelist: arr });
+        } else if (t.data.is_used_share == 1 || t.data.is_used_share == 2) {
+
+          //---------新的版本----------------
+          for (var i = 0; i < dda.length; i++) {
+            //--要排队的元素---
+            var need_to_insert = dda[i];
+            if (parseInt(need_to_insert.level) == 1) {
+              var item = { items: need_to_insert, array: new Array() }//判断数组的长度看看有没有2级菜单
+              arr.push(item);
+            } else if (parseInt(need_to_insert.level) == 2) {
+
+              for (var j = 0; j < arr.length; j++) {
+
+
+                if (parseInt(need_to_insert.parent_id) == parseInt(arr[j].items.id)) {
+
+                  var ishaf_two = { items: need_to_insert, arrays: new Array() };
+                  arr[j].array.push(ishaf_two); arr.ishaf_two = 0;
                 }
-                t.setData({ catelist: arr});
-              } else if (t.data.is_used_share == 1 || t.data.is_used_share == 2){
-
-                //---------新的版本----------------
-                for (var i = 0; i < dda.length; i++) { 
-                  //--要排队的元素---
-                  var need_to_insert=dda[i];
-                  if (parseInt(need_to_insert.level) == 1) {
-                    var item = { items: need_to_insert, array: new Array() }//判断数组的长度看看有没有2级菜单
-                    arr.push(item);
-                  } else if (parseInt(need_to_insert.level) == 2) {
-                  
-                     for (var j = 0; j < arr.length; j++) {
-                    
-                  
-                        if (parseInt(need_to_insert.parent_id) == parseInt(arr[j].items.id)) {
-                  
-                           var ishaf_two = { items: need_to_insert, arrays: new Array() };
-                            arr[j].array.push(ishaf_two); arr.ishaf_two = 0;
-                        }
-                     }
-                  } else if (parseInt(need_to_insert.level) == 3) {//判断有3级的时候在二级里添加一个数组
-                    
-                     for (var dd = 0; dd < arr.length; dd++) {           
-                        for (var pp = 0; pp < arr[dd].array.length; pp++) {
-                          //--判断二级--
-                          var two_item = arr[dd].array;
-                         
-                          if (two_item && two_item.length>0){
-                            
-                            if (parseInt(need_to_insert.parent_id) == parseInt(two_item[pp].items.id)) {
-                                
-                               arr[dd].array[pp].arrays.push(need_to_insert); arr.ishaf_three = 0; break;
-                          }
-                      }
+              }
+            } else if (parseInt(need_to_insert.level) == 3) {//判断有3级的时候在二级里添加一个数组
+
+              for (var dd = 0; dd < arr.length; dd++) {
+                for (var pp = 0; pp < arr[dd].array.length; pp++) {
+                  //--判断二级--
+                  var two_item = arr[dd].array;
+
+                  if (two_item && two_item.length > 0) {
+
+                    if (parseInt(need_to_insert.parent_id) == parseInt(two_item[pp].items.id)) {
+
+                      arr[dd].array[pp].arrays.push(need_to_insert); arr.ishaf_three = 0; break;
                     }
                   }
                 }
               }
-              for(var i=0;i<arr.length;i++){
-                arr[i]['items']['is_show_class'] = false;
-                var mobile_name = arr[i]['items']['name']
-                //if(mobile_name.length > 4){
-                  //arr[i]['items']['name'] = mobile_name.substring(0, 4)
-                //}
-              }
-              if(t.data.is_show_pl==1 && t.data.is_show_pp != 1 && t.data.is_show_gb != 1){
-                arr[0]['items']['is_show_class'] = true;
-              }
-              //console.log(arr)
-                t.setData({one_level_classify:arr});
-                if(t.data.select_classify_on==0){
-                    var item=arr[0];
+            }
+          }
+          for (var i = 0; i < arr.length; i++) {
+            arr[i]['items']['is_show_class'] = false;
+            var mobile_name = arr[i]['items']['name']
+            //if(mobile_name.length > 4){
+            //arr[i]['items']['name'] = mobile_name.substring(0, 4)
+            //}
+          }
+          if (t.data.is_show_pl == 1 && t.data.is_show_pp != 1 && t.data.is_show_gb != 1) {
+            arr[0]['items']['is_show_class'] = true;
+          }
+          //console.log(arr)
+          t.setData({ one_level_classify: arr });
+          if (t.data.select_classify_on == 0) {
+            var item = arr[0];
  
-                    var name = item.items.name;
-                    var cid = item.items.id;
-                    var arr = item.array;
+            var name = item.items.name;
+            var cid = item.items.id;
+            var arr = item.array;
  
-                    console.log("11111",item);
+            console.log("11111", item);
  
  
-                    if (arr.length == 0) {
-                        t.setData({
-                            select_classify_on: 0, index: 0, classify_name: name, cat_id: cid,
-                            goodslist: null, is_level_three: 0
-                        });
+            if (arr.length == 0) {
+              t.setData({
+                select_classify_on: 0, index: 0, classify_name: name, cat_id: cid,
+                goodslist: null, is_level_three: 0
+              });
  
-                        if(t.data.is_used_share == 2)
-                            t.style(t.data.stylePage, cid)
+              if (t.data.is_used_share == 2)
+                t.style(t.data.stylePage, cid)
  
-                        return false;
-                    }
-                    if (arr.length != 0) {
-                        var is_lev_thr = 0
-                        for (var i = 0; i < arr.length; i++) {
-                            if (arr[i].arrays.length > 0) { is_lev_thr = 1; break; }
-                        }
-                        t.setData({ is_level_three: is_lev_thr });
-
-                        if (this.data.is_level_three != 1) {
-                            t.setData({ index: 0, classify_name: name, goodslist: arr });
-                        } else {
-                            t.setData({ index: 0, goodslist: arr });
-                        }
-                    }
+              return false;
+            }
+            if (arr.length != 0) {
+              var is_lev_thr = 0
+              for (var i = 0; i < arr.length; i++) {
+                if (arr[i].arrays.length > 0) { is_lev_thr = 1; break; }
+              }
+              t.setData({ is_level_three: is_lev_thr });
  
-                    t.style(t.data.stylePage, cid)
+              if (this.data.is_level_three != 1) {
+                t.setData({ index: 0, classify_name: name, goodslist: arr });
+              } else {
+                t.setData({ index: 0, goodslist: arr });
+              }
+            }
  
-                }
+            t.style(t.data.stylePage, cid)
  
-              } 
-            }
-        });
-    },
-
-    requestCategories: function(t) {
-        var s = this;
-        e.get("/api/goods/goodsSecAndThirdCategoryList", {
-            data: {
-                parent_id: t
-            },
-            success: function(e) {
-                s.setData({
-                    categories: e.data.result,
-                    currentCategoryId: t
-                });
-            }
-        });
-    },
+          }
  
-    switchFirstCategory: function(t) {
-        this.requestCategories(t.currentTarget.dataset.id);
-    },
+        }
+      }
+    });
+  },
  
-    //-----------滑动切换----------
-    swiperTab: function (e) {
-      var that = this;
-      if (e.detail.source == "touch") {
-        this.setData({
-          currentTab: e.detail.current,
+  requestCategories: function (t) {
+    var s = this;
+    e.get("/api/goods/goodsSecAndThirdCategoryList", {
+      data: {
+        parent_id: t
+      },
+      success: function (e) {
+        s.setData({
+          categories: e.data.result,
+          currentCategoryId: t
         });
       }
+    });
+  },
  
-      //获取国别
-      if (e.detail.current == 1 && that.data.nationlist == null) {
-        that.get_nation();
-      }
-      //获取品牌
-      if (e.detail.current == 2 && that.data.groups == null) {
-        that.get_brand();
-      }
+  switchFirstCategory: function (t) {
+    this.requestCategories(t.currentTarget.dataset.id);
+  },
  
-      //获取服务卡项
-      if (e.detail.current == 3 && that.data.xmlist == null) {
-        that.getServiceCategory();
-      }
+  //-----------滑动切换----------
+  swiperTab: function (e) {
+    var that = this;
+    if (e.detail.source == "touch") {
+      this.setData({
+        currentTab: e.detail.current,
+      });
+    }
  
+    //获取国别
+    if (e.detail.current == 1 && that.data.nationlist == null) {
+      that.get_nation();
+    }
+    //获取品牌
+    if (e.detail.current == 2 && that.data.groups == null) {
+      that.get_brand();
+    }
  
-    },
-    //-----------点击切换-----------
-    clickTab: function (e) {
-        var that = this;
-        if (this.data.currentTab === e.target.dataset.current) {
-            return false;
-        } else {
-            that.setData({
-                currentTab: e.target.dataset.current
-            })
-        }
-        //获取国别
-        if (e.detail.current == 1 && that.data.nationlist == null) {
-          that.get_nation();
-        }
+    //获取服务卡项
+    if (e.detail.current == 3 && that.data.xmlist == null) {
+      that.getServiceCategory();
+    }
  
-        //获取品牌
-        if (e.detail.current == 2 && that.data.groups == null) {
-           that.get_brand();
-        }
  
-        //获取服务卡项
-        if (e.detail.current == 3 && that.data.xmlist == null) {
-          that.getServiceCategory();
-       }
+  },
+  //-----------点击切换-----------
+  clickTab: function (e) {
+    var that = this;
+    if (this.data.currentTab === e.target.dataset.current) {
+      return false;
+    } else {
+      that.setData({
+        currentTab: e.target.dataset.current
+      })
+    }
+    //获取国别
+    if (e.detail.current == 1 && that.data.nationlist == null) {
+      that.get_nation();
+    }
  
-    },
+    //获取品牌
+    if (e.detail.current == 2 && that.data.groups == null) {
+      that.get_brand();
+    }
+
+    //获取服务卡项
+    if (e.detail.current == 3 && that.data.xmlist == null) {
+      that.getServiceCategory();
+    }
+
+  },
  
   tabLetter(e) {
-      const index = e.currentTarget.dataset.index;
-      this.setData({
-        selected: index,
-        scrollIntoView: index
-      })
-      this.cleanAcitvedStatus();
+    const index = e.currentTarget.dataset.index;
+    this.setData({
+      selected: index,
+      scrollIntoView: index
+    })
+    this.cleanAcitvedStatus();
   },
   //-------------------清除字母选中状态---------------
   cleanAcitvedStatus() {
     setTimeout(() => {
-      this.setData({selected: 0}) }, 500);
+      this.setData({ selected: 0 })
+    }, 500);
   },
  
   //------------手指滑动------------------
@@ -530,19 +540,19 @@ Page({
   },
  
   //跳转到分类的商品列表
-  go_cate:function(t){
-     var cid=  t.currentTarget.dataset.cid;
-     var pid = t.currentTarget.dataset.pid;
-     var lurl = "/pages/goods/goodsList/goodsList?cat_id=" + cid;
-     lurl+="&pid="+pid;
-     wx.navigateTo({ url: lurl});   
+  go_cate: function (t) {
+    var cid = t.currentTarget.dataset.cid;
+    var pid = t.currentTarget.dataset.pid;
+    var lurl = "/pages/goods/goodsList/goodsList?cat_id=" + cid;
+    lurl += "&pid=" + pid;
+    wx.navigateTo({ url: lurl });
   },
  
   //跳转到品牌的商品列表
   go_brand: function (t) {
     var cid = t.currentTarget.dataset.bid;
     var lurl = "/pages/goods/goodsList/goodsList?brand_id=" + cid;
-    wx.navigateTo({ url: lurl});
+    wx.navigateTo({ url: lurl });
   },
  
   //跳转到国别的商品列表
@@ -551,24 +561,24 @@ Page({
     var lurl = "/pages/goods/goodsList/goodsList?nation_id=" + cid;
     wx.navigateTo({ url: lurl });
   },
-  
+
   //获取国别
-  get_nation:function() {
+  get_nation: function () {
     var s = this;
     e.get("/api/weshop/nation/page", {
       data: {
         is_hot: 1,
-        store_id:oo.stoid,
-        pageSize:300,
+        store_id: oo.stoid,
+        pageSize: 300,
       },
       success: function (e) {
         var dda = e.data.data.pageData;
-        s.setData({ nationlist:dda})
+        s.setData({ nationlist: dda })
       }
     });
   },
  
-   //获取品牌
+  //获取品牌
   get_brand: function () {
     var compare = function (prop) {
       return function (obj1, obj2) {
@@ -576,8 +586,10 @@ Page({
         if (!isNaN(Number(val1)) && !isNaN(Number(val2))) {
           val1 = Number(val1); val2 = Number(val2);
         }
-        if (val1 < val2) { return -1;
-        } else if (val1 > val2) { return 1;
+        if (val1 < val2) {
+          return -1;
+        } else if (val1 > val2) {
+          return 1;
         } else { return 0; }
       }
     }
@@ -590,77 +602,77 @@ Page({
         pageSize: 10000,
       },
       success: function (e) {
-          var arr=new Array();
-          var dda = e.data.data.pageData;
-          s.setData({brand_list:dda});
-		  
-		  
-			  for (var i = 0; i < dda.length; i++) {
-			    	//console.log(dda[i].logo)				
-					if(dda[i].logo==""){
-						 dda[i].logo= s.data.iurl+"/miniapp/images/no_brand_def.jpg";
-					}else if(dda[i].logo && dda[i].logo.indexOf("http")<0){
-						dda[i].logo = oo.imghost+dda[i].logo;
-					}
-				  				  
-				  //进行排序，只有是默认排序的时候，才按首字母排序
-				  // if(parseInt(s.data.is_used_share)!=0) continue;
-				  
-				  if (arr.length>0){
-					var find = 0;
-					//寻找字母在arr数组中是否存在，不存在就要添加，存在就在要这个数组添加元素
-					for (var k = 0; k < arr.length;k++){
-						if(dda[i].zm == arr[k].zm){ find=k+1; break;}   
-					}
-					if (find == 0) {
-						var item = { zm: dda[i].zm, array: new Array() }
-						item.array.push(dda[i]);
-						arr.push(item);
-					} else{
-					   arr[find - 1].array.push(dda[i]);
-					} 
-				  }else{
-					  var item = { zm: dda[i].zm, array: new Array() }
-					  item.array.push(dda[i]);
-					  arr.push(item);
-				  }
-			  }  			  
-			  // if(parseInt(s.data.is_used_share)==0){
-				 //  arr.sort(compare("zm"));		
-			  // }else{
-				 //  var ob={array:dda};
-				 //  arr.push(ob);
-			  // }
-			  
-				arr.sort(compare("zm"));
-		         
-          s.setData({ groups: arr });              
-          //console.log(s.data.groups)
+        var arr = new Array();
+        var dda = e.data.data.pageData;
+        s.setData({ brand_list: dda });
+
+
+        for (var i = 0; i < dda.length; i++) {
+          //console.log(dda[i].logo)				
+          if (dda[i].logo == "") {
+            dda[i].logo = s.data.iurl + "/miniapp/images/no_brand_def.jpg";
+          } else if (dda[i].logo && dda[i].logo.indexOf("http") < 0) {
+            dda[i].logo = oo.imghost + dda[i].logo;
+          }
+
+          //进行排序，只有是默认排序的时候，才按首字母排序
+          // if(parseInt(s.data.is_used_share)!=0) continue;
+
+          if (arr.length > 0) {
+            var find = 0;
+            //寻找字母在arr数组中是否存在，不存在就要添加，存在就在要这个数组添加元素
+            for (var k = 0; k < arr.length; k++) {
+              if (dda[i].zm == arr[k].zm) { find = k + 1; break; }
+            }
+            if (find == 0) {
+              var item = { zm: dda[i].zm, array: new Array() }
+              item.array.push(dda[i]);
+              arr.push(item);
+            } else {
+              arr[find - 1].array.push(dda[i]);
+            }
+          } else {
+            var item = { zm: dda[i].zm, array: new Array() }
+            item.array.push(dda[i]);
+            arr.push(item);
+          }
+        }
+        // if(parseInt(s.data.is_used_share)==0){
+        //  arr.sort(compare("zm"));		
+        // }else{
+        //  var ob={array:dda};
+        //  arr.push(ob);
+        // }
+
+        arr.sort(compare("zm"));
+
+        s.setData({ groups: arr });
+        //console.log(s.data.groups)
       }
     });
   },
  
  
   // 获取服务卡项分类
-  getServiceCategory: function() {
+  getServiceCategory: function () {
     var s = this;
     e.get("/api/weshop/serviceCategory/page", {
       data: {
         is_show: 1,
-        store_id:oo.stoid,
-				pageSize: 1000,
+        store_id: oo.stoid,
+        pageSize: 1000,
       },
       success: function (e) {
         var dda = e.data.data.pageData;
-        s.setData({ 
-					xmlist:dda,
-				});
+        s.setData({
+          xmlist: dda,
+        });
       }
     });
   },
  
-  
-  goServiceCategoryList: function(t) {
+
+  goServiceCategoryList: function (t) {
     var cid = t.currentTarget.dataset.cid;
     var lurl = "/packageA/pages/cardList/cardList?cat_id=" + cid;
     wx.navigateTo({ url: lurl });
@@ -668,45 +680,45 @@ Page({
  
   //---------分享配置--------
   onShareAppMessage: function (e) {
-      getApp().globalData.no_clear=1;
-	var url="pages/goods/categoryList/categoryList";  
-	var userInfo=getApp().globalData.userInfo;
-	//是分销商才带
-	if(userInfo){
-	  url+="?first_leader="+userInfo.user_id;
-	}  		
-	console.log("--分类分享---分享--");
-	console.log(url);
-	  
+    getApp().globalData.no_clear = 1;
+    var url = "pages/goods/categoryList/categoryList";
+    var userInfo = getApp().globalData.userInfo;
+    //是分销商才带
+    if (userInfo) {
+      url += "?first_leader=" + userInfo.user_id;
+    }
+    console.log("--分类分享---分享--");
+    console.log(url);
+
     return {
-       title: "商品分类",
-	   path:url,
+      title: "商品分类",
+      path: url,
     }
   },
   //图片失败，默认图片
-   bind_bnerr: function (e) {
+  bind_bnerr: function (e) {
     var _errImg = e.target.dataset.errorimg;
     var _errObj = {};
-    _errObj[_errImg] = this.data.iurl+"/miniapp/images/default_g_img.gif";
+    _errObj[_errImg] = this.data.iurl + "/miniapp/images/default_g_img.gif";
     this.setData(_errObj) //注意这里的赋值方式,只是将数据列表中的此项图片路径值替换掉 ;  
   },
-    //图片失败，默认图片
-    bind_bnerr_pp: function (e) {
-        var list = this.data.groups
-        var _errImg = e.target.dataset.errorimg;
-        var idx = e.target.dataset.idx;
-        var pix = e.target.dataset.pix;
-
-    },
-    //商品图片失败，默认图片
+  //图片失败，默认图片
+  bind_bnerr_pp: function (e) {
+    var list = this.data.groups
+    var _errImg = e.target.dataset.errorimg;
+    var idx = e.target.dataset.idx;
+    var pix = e.target.dataset.pix;
+
+  },
+  //商品图片失败，默认图片
   goods_bnerr: function (e) {
-    var _errImg = e.target.dataset.err; 
+    var _errImg = e.target.dataset.err;
     var _errObj = {};
     _errObj[_errImg] = this.data.iurl + "/miniapp/images/no_cate_def.png";
     this.setData(_errObj) //注意这里的赋值方式,只是将数据列表中的此项图片路径值替换掉 ;  
   },
  
-  goseach:function(){
+  goseach: function () {
     wx.navigateTo({
       url: "/pages/goods/search/search"
     });
@@ -714,106 +726,108 @@ Page({
  
   //图片失败，默认图片
   bind_bnerr2: function (e) {
-      var _errImg = e.target.dataset.errorimg; 
-      var _errObj = {};
-       _errObj[_errImg] = "/public/images/category.png";
-      this.setData(_errObj) //注意这里的赋值方式,只是将数据列表中的此项图片路径值替换掉 ; 
-  
+    var _errImg = e.target.dataset.errorimg;
+    var _errObj = {};
+    _errObj[_errImg] = "/public/images/category.png";
+    this.setData(_errObj) //注意这里的赋值方式,只是将数据列表中的此项图片路径值替换掉 ; 
+
   },
  
  
-    //图片失败，默认图片
-    bind_bnerr_t3: function (e) {
-        var _errImg = e.target.dataset.errorimg;
-        var _errObj = {};
-        _errObj[_errImg] = "/miniapp/images/default_g_img.gif";
-        this.setData(_errObj) //注意这里的赋值方式,只是将数据列表中的此项图片路径值替换掉 ;
+  //图片失败，默认图片
+  bind_bnerr_t3: function (e) {
+    var _errImg = e.target.dataset.errorimg;
+    var _errObj = {};
+    _errObj[_errImg] = "/miniapp/images/default_g_img.gif";
+    this.setData(_errObj) //注意这里的赋值方式,只是将数据列表中的此项图片路径值替换掉 ;
  
-    },
+  },
  
  
  
   // 新的版本分类点击一级分类
- click_classify:function(e){
-  // 在风格三的时候，才会有current
-	clearInterval(this.data.timer);
-	
-  let cur = e.currentTarget.dataset.current;
-  if(cur) {
+  click_classify: function (e) {
+    // 在风格三的时候，才会有current
+    clearInterval(this.data.timer);
+    this.setData({
+      toupper:true
+    })
+    let cur = e.currentTarget.dataset.current;
+    if (cur) {
       if (this.data.currentTab == cur) {
-          if (this.data.select_classify_on != 220 && this.data.select_classify_on != 221 && this.data.select_classify_on != 223) {
-              return false;
-          } else if (cur != 0) {
-              return false;
-          }
+        if (this.data.select_classify_on != 220 && this.data.select_classify_on != 221 && this.data.select_classify_on != 223) {
+          return false;
+        } else if (cur != 0) {
+          return false;
+        }
       } else {
-          wx.pageScrollTo({
-              scrollTop: 0
-          })
-          this.setData({
-              currentTab: cur,
-              select_classify_on: cur
-          })
-          this.checkCor();
+        wx.pageScrollTo({
+          scrollTop: 0
+        })
+        this.setData({
+          currentTab: cur,
+          select_classify_on: cur
+        })
+        this.checkCor();
       }
-  }
-	this.setData({
-		countDownNum: 3,
-	});
-
-   var arr2 = this.data.one_level_classify
-   for(var i=0;i<arr2.length;i++){
-     if(i == e.currentTarget.dataset.index){
-      arr2[i]['items']['is_show_class'] = true
-     }else{
-      arr2[i]['items']['is_show_class'] = false
-     }
-   }
-   this.setData({ one_level_classify: arr2});
-   //this.data.one_level_classify[e.currentTarget.dataset.index]['items']['is_show_class'] = true
-  // console.log(e.currentTarget.dataset.index)
-   clearInterval(this.data.timer);
-   this.setData({ countDownNum: 3, stylePage: 1, scrollTop: 0});
-   this.data.ishaf_three = 0;
-   var indexs = e.currentTarget.dataset.index;
-   var name = e.currentTarget.dataset.name;
-   var cid = e.currentTarget.dataset.cid;
-   var pid = e.currentTarget.dataset.pid;
-   var arr = e.currentTarget.dataset.arr;
-   console.log("cid:=" + name)
-   if (indexs == 220) { this.get_brand(); }
-   //==2的时候 请求数据为商品，不为分类
-   if (this.data.is_used_share == 2) {
-    this.setData({ select_classify_on: indexs, index: indexs, classify_name: name, cat_id: cid,lastMsg: false, });
-    console.log("edqdqw:="+this.data.select_classify_on)
-    this.style(this.data.stylePage, cid)
-   }else{
-     if (arr != "undefined" && arr != undefined) {
-       if (arr.length == 0) {
-         this.setData({
-           select_classify_on: indexs, index: indexs, classify_name: name, cat_id: cid,
-           goodslist: null, is_level_three: 0
-         });
-         return false;
-       }
-       if (arr.length != 0) {
-         var is_lev_thr = 0
-         for (var i = 0; i < arr.length; i++) {
-           if (arr[i].arrays.length > 0) { is_lev_thr = 1; break; }
-         }
-         this.setData({ is_level_three: is_lev_thr });
-
-         if (this.data.is_level_three != 1) {
-          this.setData({ select_classify_on: indexs, index: indexs, classify_name: name, goodslist: arr });
-        } else {
-          this.setData({ select_classify_on: indexs, index: indexs, goodslist: arr });
+    }
+    this.setData({
+      countDownNum: 3,
+    });
+
+    var arr2 = this.data.one_level_classify
+    for (var i = 0; i < arr2.length; i++) {
+      if (i == e.currentTarget.dataset.index) {
+        arr2[i]['items']['is_show_class'] = true
+      } else {
+        arr2[i]['items']['is_show_class'] = false
+      }
+    }
+    this.setData({ one_level_classify: arr2 });
+    //this.data.one_level_classify[e.currentTarget.dataset.index]['items']['is_show_class'] = true
+    // console.log(e.currentTarget.dataset.index)
+    clearInterval(this.data.timer);
+    this.setData({ countDownNum: 3, stylePage: 1, scrollTop: 0 });
+    this.data.ishaf_three = 0;
+    var indexs = e.currentTarget.dataset.index;
+    var name = e.currentTarget.dataset.name;
+    var cid = e.currentTarget.dataset.cid;
+    var pid = e.currentTarget.dataset.pid;
+    var arr = e.currentTarget.dataset.arr;
+    console.log("cid:=" + name)
+    if (indexs == 220) { this.get_brand(); }
+    //==2的时候 请求数据为商品，不为分类
+    if (this.data.is_used_share == 2) {
+      this.setData({ select_classify_on: indexs, index: indexs, classify_name: name, cat_id: cid, lastMsg: false, });
+      console.log("edqdqw:=" + this.data.select_classify_on)
+      this.style(this.data.stylePage, cid)
+    } else {
+      if (arr != "undefined" && arr != undefined) {
+        if (arr.length == 0) {
+          this.setData({
+            select_classify_on: indexs, index: indexs, classify_name: name, cat_id: cid,
+            goodslist: null, is_level_three: 0
+          });
+          return false;
+        }
+        if (arr.length != 0) {
+          var is_lev_thr = 0
+          for (var i = 0; i < arr.length; i++) {
+            if (arr[i].arrays.length > 0) { is_lev_thr = 1; break; }
+          }
+          this.setData({ is_level_three: is_lev_thr });
+
+          if (this.data.is_level_three != 1) {
+            this.setData({ select_classify_on: indexs, index: indexs, classify_name: name, goodslist: arr });
+          } else {
+            this.setData({ select_classify_on: indexs, index: indexs, goodslist: arr });
+          }
         }
-       }
-     }
-     this.setData({ select_classify_on: indexs, index: indexs, classify_name: name, cat_id: cid, stylePage: 1,lastMsg: false,});
-   }
-   
- },
+      }
+      this.setData({ select_classify_on: indexs, index: indexs, classify_name: name, cat_id: cid, stylePage: 1, lastMsg: false, });
+    }
+
+  },
  
  
   //图片失败
@@ -825,34 +839,34 @@ Page({
     _errObj[_errImg] = "/miniapp/images/default_g_img.gif";
     this.setData(_errObj) //注意这里的赋值方式,只是将数据列表中的此项图片路径值替换掉 ;
   },
-	
-	
+
+
   //选择更多
-  select_more:function(e){ 
+  select_more: function (e) {
     var cid = e.currentTarget.dataset.cid;
     var pid = e.currentTarget.dataset.pid;
     var lurl = "/pages/goods/goodsList/goodsList?cat_id=" + cid + "&pid=" + pid;
     wx.navigateTo({ url: lurl });
-   
+
   },
-	
-	
-//扫一扫
-  getScancode:function(){
-      var _this = this;
-      getApp().globalData.no_clear=1;
+
+
+  //扫一扫
+  getScancode: function () {
+    var _this = this;
+    getApp().globalData.no_clear = 1;
     // 允许从相机和相册扫码
     wx.scanCode({
       success: (res) => {
-          var result = res.result;
-          wx.navigateTo({
-              url: "/pages/goods/search/search?s_key="+result,
-          });
+        var result = res.result;
+        wx.navigateTo({
+          url: "/pages/goods/search/search?s_key=" + result,
+        });
       }
     })
   },
-	
-	
+
+
   onUnload: function () {
     //this.destroyActivityTimer();
   },
@@ -882,30 +896,93 @@ Page({
         console.log(data.data.data.pageData)
         that.setData({
           requestData: data.data.data.pageData,
-          is_go: 1 
+          is_go: 1
         });
         that.setData({ is_go: 1 });
-        that.data.stylePage++ , null == that.data.allData && (that.data.allData = Object.assign({}, data.data.data.pageData)),
+        that.data.stylePage++, null == that.data.allData && (that.data.allData = Object.assign({}, data.data.data.pageData)),
           wx.stopPullDownRefresh();
       }
     });
  
   },
  
-  
+
   // 左侧更新
   scrollLower: function (data) {
-    if(this.data.is_no_more) return false;
+    if (this.data.is_no_more) return false;
     var that = this;
     clearInterval(that.data.timer);
     that.setData({
       stylePage: that.data.stylePage + 1,
       countDownNum: 3,
       lastMsg: false,
-      });
-    that.style(that.data.stylePage, that.data.cat_id);
+    });
+    if (nextTimeOff) {
+      clearTimeout(nextTimeOff)
+    }
+    nextTimeOff = setTimeout(()=>{
+      that.style(that.data.stylePage, that.data.cat_id);
+    },1000)    
+  },
+  scrolltoupper(){
+    console.log('到顶部--------');
+    this.setData({
+      toupper:true
+    })
+  },
+  bScroll(even){
+    console.log('滑动开始');
+    console.log(even);
+    this.setData({
+      sClientY:even.changedTouches.length>0 ? even.changedTouches[0].clientY : 0
+    })
+  },
+  btouMove(even){
+    console.log('滑动结束');
+    console.log(even);
+    let eClientY = even.changedTouches.length>0 ? even.changedTouches[0].clientY : 0
+    let sClientY = this.data.sClientY
+    console.log(eClientY - sClientY);
+    if (eClientY - sClientY > 0) {
+      console.log('下滑');
+      if (this.data.toupper) {
+        this.setData({msgStatus:false,is_no_more:false})
+        clearInterval(this.data.timer);
+        this.nextCategory(true)
+      }else{
+        this.disNexCat()
+      }
+    }else{
+      console.log('上滑');
+      this.setData({
+        toupper:false
+      })
+      this.disNexCat()
+    }
+  },
+  disNexCat(){
+    let that = this
+    const { windowHeight } = wx.getSystemInfoSync()
+    wx.createSelectorQuery().select('#sview').boundingClientRect(function(rect){
+      if (rect) {        
+        const { top,height }  = rect
+        if ((top < windowHeight) && (top + height >0) ) {
+          let nextShow2 = that.data.nextShow2
+          if (nextShow2) {
+            that.nextCategory()
+          }else{
+            that.setData({
+              nextShow2:true
+            })
+          }
+        }else{
+          that.setData({
+            nextShow2:false
+          })
+        }
+      }
+    }).exec()
   },
-
   //页面版面风格三的时候请求推荐商品 返回 
   style: function (page, cid) {
     console.log("page:=" + page)
@@ -913,26 +990,28 @@ Page({
     e.get("/api/weshop/goods/page?1=1", {
       data: { page: page, cat_id: cid, parent_id: 0, orderField: 'sort', orderType: 'asc', is_mainshow: 1, isonsale: 1, store_id: oo.stoid, is_recommend: 1 },
       success: function (e) {
+        console.log('上拉加载。。。。。。。。。');
         console.log(e.data.data.pageData)
  
         if (e.data.data.pageData.length > 0) {
+          clearInterval(s.data.timer);
           s.setData({
-            msgStatus: false,is_no_more:0
+            msgStatus: false, is_no_more: 0,nextShow:false,nextShow2:false
           });
           //如果有数据 判断分页为第一页的时候直接渲染数据
           if (page > 1) {
             //如果分页不是在第一页 那么就把返回的数据追加到原有数据后面
             var arr = s.data.requestData
-          
-            for (var i = 0; i < e.data.data.pageData.length;i++){
+
+            for (var i = 0; i < e.data.data.pageData.length; i++) {
               arr.push(e.data.data.pageData[i]);
             }
-            
+
             s.setData({
               requestData: arr
             });
-            
-          }else{
+
+          } else {
             s.setData({
               requestData: e.data.data.pageData
             });
@@ -940,39 +1019,24 @@ Page({
               wx.pageScrollTo({
                 scrollTop: 0
               })
-            } 
+            }
           }
  
-            s.setData({
-                dataLength: s.data.requestData.length,
-            });
-         
+          s.setData({
+            dataLength: s.data.requestData.length,
+          });
+
         } else {
           //没有数据页面显示暂无数据
           if (page != 1) {
-            var dataArray = s.data.one_level_classify
-            var index = s.data.index
-            dataArray[index]['items']['is_show_class'] = false		
-			//没有下一个类别的时候
-			if(index+1>=dataArray.length){
-				s.setData({is_no_more:1});
-			}else{
-				dataArray[index+1]['items']['is_show_class'] = true
-				console.log(dataArray[index + 1]['items'])
-				s.setData({
-				  msgStatus: true,
-				  stylePage: 1,
-				  index: index + 1,
-				  select_classify_on: index + 1,
-				  cat_id: dataArray[index + 1]['items']['id'],
-				  classify_name: dataArray[index + 1]['items']['name'],
-				  one_level_classify: dataArray,
-				  is_no_more:0
-				});
-				s.style(s.data.stylePage, dataArray[index + 1]['items']['id'])
-			}
-
-          }else{
+            let nextShow = s.data.nextShow
+           
+            if (!nextShow) {
+              s.setData({
+                nextShow:true
+              })
+           }
+          } else {
             //没有数据而且是第一页的时候
             s.setData({
               stylePage: 1,
@@ -982,9 +1046,10 @@ Page({
               msgStatus: true,
               countDownNum: countDownNum,
               requestData: [],
-			  is_no_more:0,
+              is_no_more: 0,
             });
-            s.data.timer=setInterval(function () {
+            clearInterval(s.data.timer);
+            s.data.timer = setInterval(function () {
               if (countDownNum == 0) {
                 clearInterval(s.data.timer);
                 //关闭定时器之后，可作其他处理   
@@ -997,50 +1062,82 @@ Page({
                 var dataArray = s.data.one_level_classify
                 var index = s.data.index
                 console.log(dataArray[index + 1])
-                if (dataArray[index + 1] == undefined || dataArray[index + 1] == "undefined"){
+                if (dataArray[index + 1] == undefined || dataArray[index + 1] == "undefined") {
                   console.log("dataArray[index + 1] = undefined")
                   s.setData({
                     stylePage: 1,
                     msgStatus: true,
                     lastMsg: true
                   });
-                }else{
+                } else {
                   dataArray[index]['items']['is_show_class'] = false
-                  dataArray[index+1]['items']['is_show_class'] = true
+                  dataArray[index + 1]['items']['is_show_class'] = true
                   s.setData({
                     stylePage: 1,
                     index: index + 1,
                     select_classify_on: index + 1,
                     cat_id: dataArray[index + 1]['items']['id'],
                     classify_name: dataArray[index + 1]['items']['name'],
-                    one_level_classify:dataArray
+                    one_level_classify: dataArray
                   });
                   s.style(s.data.stylePage, dataArray[index + 1]['items']['id']);
                 }
-                
+
               }
               countDownNum--;
               s.setData({
                 countDownNum: countDownNum
               })
               var arr2 = s.data.one_level_classify
-              for(var i=0;i<arr2.length;i++){
-                if(i == s.data.index){
-                arr2[i]['items']['is_show_class'] = true
-                }else{
-                arr2[i]['items']['is_show_class'] = false
+              for (var i = 0; i < arr2.length; i++) {
+                if (i == s.data.index) {
+                  arr2[i]['items']['is_show_class'] = true
+                } else {
+                  arr2[i]['items']['is_show_class'] = false
                 }
               }
-              s.setData({ one_level_classify: arr2});
+              s.setData({ one_level_classify: arr2 });
             }, 1000)
           }
-          
-          
+
+
         }
       }
     });
   },
-
+  //下一个品类
+  nextCategory(up=false){
+    console.log('跳转下一个页面');
+    clearInterval(this.data.timer);
+    this.setData({
+      nextShow:false
+    })
+    var dataArray = this.data.one_level_classify
+    var index = this.data.index
+    let s = 1
+    if (up) {
+      s = -1
+    }
+    dataArray[index]['items']['is_show_class'] = false
+    //没有下一个类别的时候
+    if (index + s >= dataArray.length || index+s < 0) {
+      this.setData({ is_no_more: 1 });
+    } else {
+      dataArray[index + s]['items']['is_show_class'] = true
+      console.log(dataArray[index + s]['items'])
+      this.setData({
+        msgStatus: false,
+        stylePage: 1,
+        index: index + s,
+        select_classify_on: index + s,
+        cat_id: dataArray[index + s]['items']['id'],
+        classify_name: dataArray[index + s]['items']['name'],
+        one_level_classify: dataArray,
+        is_no_more: 0
+      });
+      this.style(this.data.stylePage, dataArray[index + 1]['items']['id'])
+    }
+  },
  
   openFilterModal: function () {
     this.setData({
@@ -1090,28 +1187,28 @@ Page({
       func(ob);
     })
   },
-  
+
   //导航跳转
-  nav_goto:function(e){
-  		  var url=e.currentTarget.dataset.url;
-  		  if(!url || url=='') return; 
-  		  if(url[0]!='/') url='/'+url;
-  		  getApp().goto(url);
-   },
-
-    onShareTimeline(){
-        getApp().globalData.no_clear=1;
-        var store_name=getApp().globalData.config?getApp().globalData.config.store_name:'';
-        if(!store_name)
-            store_name=getApp().globalData.setting.appName;
-
-        var user_id=getApp().globalData.user_id;
-        if(!user_id) user_id=0;
-
-        return {
-            title:'商品分类-'+store_name,
-            query: "first_leader=" + user_id
-        }
+  nav_goto: function (e) {
+    var url = e.currentTarget.dataset.url;
+    if (!url || url == '') return;
+    if (url[0] != '/') url = '/' + url;
+    getApp().goto(url);
+  },
+
+  onShareTimeline() {
+    getApp().globalData.no_clear = 1;
+    var store_name = getApp().globalData.config ? getApp().globalData.config.store_name : '';
+    if (!store_name)
+      store_name = getApp().globalData.setting.appName;
+
+    var user_id = getApp().globalData.user_id;
+    if (!user_id) user_id = 0;
+
+    return {
+      title: '商品分类-' + store_name,
+      query: "first_leader=" + user_id
     }
+  }
  
 });
 \ No newline at end of file
@@ -5,231 +5,219 @@
 <!-- 风格1 -->
 <block wx:if="{{is_used_share==0}}">
   <view class='top_view' wx:if="{{is_show_pl || is_show_gb || is_show_pp }}">
-    <view class="swiper-tab" >
-        <view wx:if="{{is_show_pl}}" class="swiper-tab-item {{currentTab==0?'active':''}}" 
-              data-current="0" bindtap="clickTab">分类</view>
-        <view wx:if="{{is_show_gb}}" class="swiper-tab-item {{currentTab==1?'active':''}}" 
-              data-current="1" bindtap="clickTab">国家</view>
-        <view  wx:if="{{is_show_pp}}" class="swiper-tab-item {{currentTab==2?'active':''}}" 
-              data-current="2" bindtap="clickTab">品牌</view>
-				<view  wx:if="{{is_show_xm}}" class="swiper-tab-item {{currentTab==3?'active':''}}" 
-				      data-current="3" bindtap="clickTab">项目</view>
-    </view> 
+    <view class="swiper-tab">
+      <view wx:if="{{is_show_pl}}" class="swiper-tab-item {{currentTab==0?'active':''}}" data-current="0" bindtap="clickTab">分类</view>
+      <view wx:if="{{is_show_gb}}" class="swiper-tab-item {{currentTab==1?'active':''}}" data-current="1" bindtap="clickTab">国家</view>
+      <view wx:if="{{is_show_pp}}" class="swiper-tab-item {{currentTab==2?'active':''}}" data-current="2" bindtap="clickTab">品牌</view>
+      <view wx:if="{{is_show_xm}}" class="swiper-tab-item {{currentTab==3?'active':''}}" data-current="3" bindtap="clickTab">项目</view>
+    </view>
   </view>
-  <view class="search-box "  bindtap="goseach">
-        <view class="search-inner">
-            <view class="search-img">
-                <image class="wh100" src="{{iurl}}/miniapp/images/search.png"></image>
-            </view>
-            <input bindfocus="goseach" class="search-cont" placeholder="寻找好口碑" type="text"></input>
-        </view>
+  <view class="search-box " bindtap="goseach">
+    <view class="search-inner">
+      <view class="search-img">
+        <image class="wh100" src="{{iurl}}/miniapp/images/search.png"></image>
+      </view>
+      <input bindfocus="goseach" class="search-cont" placeholder="寻找好口碑" type="text"></input>
+    </view>
   </view>
   <block wx:if="{{is_show_pl || is_show_gb || is_show_pp || is_show_xm}}">
-   <swiper current="{{currentTab}}" duration="300"  bindanimationfinish="swiperTab" style="height:{{abc}}rpx;margin-bottom:120rpx">
+    <swiper current="{{currentTab}}" duration="300" bindanimationfinish="swiperTab" style="height:{{abc}}rpx;margin-bottom:120rpx">
       <!--------分类---------->
-      <swiper-item >
-            <scroll-view scroll-y="true" class="fenlei-list" 
-            scroll-with-animation="true" lower-threshold="1" bindscrolltolower="scrolltolower"  style="height: {{abc}}rpx;" >
-              <block wx:for="{{catelist}}" wx:for-item="fitem" >
-                <view class='f_item'>
-                    <view  class="pic_view" bindtap="go_cate" data-cid="{{fitem.items.id}}" data-pid="0"><image class='fl_img' src='{{iurl}}{{fitem.items.image}}' binderror="bind_bnerr2"  data-errorimg="catelist[{{index}}].items.image"></image> 
-                <view class='over_view'></view> 
-                        <text class='f_item_over_t'>{{fitem.items.name}}</text></view>
-                    <view class='fenlei_text_v'>
-                        <view class='f_text'  wx:for="{{fitem.array}}" wx:for-item="item"
-                          bindtap="go_cate" data-cid="{{item.id}}" data-pid="{{item.parent_id}}">{{item.name}}</view>
-                    </view>
-                </view> 
-                </block>
-            </scroll-view>
+      <swiper-item>
+        <scroll-view scroll-y="true" class="fenlei-list" scroll-with-animation="true" lower-threshold="1" bindscrolltolower="scrolltolower" style="height: {{abc}}rpx;">
+          <block wx:for="{{catelist}}" wx:for-item="fitem">
+            <view class='f_item'>
+              <view class="pic_view" bindtap="go_cate" data-cid="{{fitem.items.id}}" data-pid="0">
+                <image class='fl_img' src='{{iurl}}{{fitem.items.image}}' binderror="bind_bnerr2" data-errorimg="catelist[{{index}}].items.image"></image>
+                <view class='over_view'></view>
+                <text class='f_item_over_t'>{{fitem.items.name}}</text>
+              </view>
+              <view class='fenlei_text_v'>
+                <view class='f_text' wx:for="{{fitem.array}}" wx:for-item="item" bindtap="go_cate" data-cid="{{item.id}}" data-pid="{{item.parent_id}}">{{item.name}}</view>
+              </view>
+            </view>
+          </block>
+        </scroll-view>
       </swiper-item>
       <!-------国别---------->
       <swiper-item>
-          <scroll-view scroll-y="true" class="fenlei-list" 
-            scroll-with-animation="true" lower-threshold="1" bindscrolltolower="scrolltolower"  style="height: {{abc}}rpx;" >
-                <view class='f_item' 
-                      bindtap="go_nation" data-nid="{{bitem.id}}"
-                      wx:for="{{nationlist}}" wx:for-item="bitem" wx:for-index="pidx">
-                    <view>
-                        <image wx:if="{{bitem.imgtype==1}}" class='n_img' src='{{bitem.logo}}'></image>
-                        <image wx:else class='n_img' src='{{iurl}}{{bitem.logo}}'></image>
-
-                        <view class='nation_box'>
-                            <view class='nt_1'><text class="nt_1_t">{{bitem.name}}</text></view>
-                            <view class='nt_2'>{{bitem.enname}}</view>
-                        </view>
-                    </view>
-                </view>             
-            </scroll-view>    
+        <scroll-view scroll-y="true" class="fenlei-list" scroll-with-animation="true" lower-threshold="1" bindscrolltolower="scrolltolower" style="height: {{abc}}rpx;">
+          <view class='f_item' bindtap="go_nation" data-nid="{{bitem.id}}" wx:for="{{nationlist}}" wx:for-item="bitem" wx:for-index="pidx">
+            <view>
+              <image wx:if="{{bitem.imgtype==1}}" class='n_img' src='{{bitem.logo}}'></image>
+              <image wx:else class='n_img' src='{{iurl}}{{bitem.logo}}'></image>
+
+              <view class='nation_box'>
+                <view class='nt_1'><text class="nt_1_t">{{bitem.name}}</text></view>
+                <view class='nt_2'>{{bitem.enname}}</view>
+              </view>
+            </view>
+          </view>
+        </scroll-view>
       </swiper-item>
       <!--  品牌  -->
       <swiper-item>
-            <scroll-view scroll-y="true" class="fenlei-list" 
-                style="height: {{abc}}rpx;"  scroll-into-view="{{scrollIntoView}}">
-                <block wx:for="{{groups}}" wx:for-item="group" wx:for-index="pidx">
-                  <view >
-                    <view id="{{group.zm}}" class="group-name">{{group.zm}}</view>
-                    <view class="group-users">
-                      <view wx:for="{{group.array}}"   bindtap="go_brand" data-bid="{{user.id}}"   
-                          wx:for-item="user" wx:for-index="idx" class="user box box-lr">    
-                          <image class="user-avatar-img" src="{{user.logo}}"  
-                           data-errorimg="groups[{{pidx}}].array[{{idx}}].logo" 
-                              binderror="bind_bnerr"></image>          
-                      </view>
-                    </view>
-                  </view>
-                </block>     
-            </scroll-view>
-
-            <view class="nav box box-tb my-nav" catchtouchmove="touchmove" catchtouchend="touchend" >
-<!-- 							<image src="/images/up.png" style="width:36rpx;height:36rpx;margin-right:10rpx;"></image> -->
-									<!-- <icon color="icon-close" color="#000" size="30" type="icon-shangjiantou" style=""></icon> -->
-							<view class="iconfont icon-shangjiantou"></view>
-              <view bindtap="tabLetter" data-index="{{item.zm}}" wx:for="{{groups}}"    
-                class="flex box box-align-center box-pack-center letter">
-                <text class="letter-text {{selected == item.zm ? 'letter-actived' : ''}}" wx:if="{{item.zm}}">{{item.zm}}</text>
+        <scroll-view scroll-y="true" class="fenlei-list" style="height: {{abc}}rpx;" scroll-into-view="{{scrollIntoView}}">
+          <block wx:for="{{groups}}" wx:for-item="group" wx:for-index="pidx">
+            <view>
+              <view id="{{group.zm}}" class="group-name">{{group.zm}}</view>
+              <view class="group-users">
+                <view wx:for="{{group.array}}" bindtap="go_brand" data-bid="{{user.id}}" wx:for-item="user" wx:for-index="idx" class="user box box-lr">
+                  <image class="user-avatar-img" src="{{user.logo}}" data-errorimg="groups[{{pidx}}].array[{{idx}}].logo" binderror="bind_bnerr"></image>
+                </view>
               </view>
             </view>
+          </block>
+        </scroll-view>
+
+        <view class="nav box box-tb my-nav" catchtouchmove="touchmove" catchtouchend="touchend">
+          <!-- 							<image src="/images/up.png" style="width:36rpx;height:36rpx;margin-right:10rpx;"></image> -->
+          <!-- <icon color="icon-close" color="#000" size="30" type="icon-shangjiantou" style=""></icon> -->
+          <view class="iconfont icon-shangjiantou"></view>
+          <view bindtap="tabLetter" data-index="{{item.zm}}" wx:for="{{groups}}" class="flex box box-align-center box-pack-center letter">
+            <text class="letter-text {{selected == item.zm ? 'letter-actived' : ''}}" wx:if="{{item.zm}}">{{item.zm}}</text>
+          </view>
+        </view>
       </swiper-item>
-			<!-------项目---------->
-			<swiper-item wx:if="{{is_show_xm}}">
-				<scroll-view scroll-y="true" class="fenlei-list" 
-				scroll-with-animation="true" lower-threshold="1" bindscrolltolower="scrolltolower"  style="height: {{abc}}rpx;" >
-					<block wx:if="{{xmlist && xmlist.length != 0}}">
-						<block wx:for="{{xmlist}}" wx:for-item="fitem" >
-							<view class='f_item'>
-									<view  class="pic_view" bindtap="goServiceCategoryList" data-cid="{{fitem.id}}" data-pid="0">
-						
-										<image wx:if="{{fitem.showImgType==1}}" binderror="bind_bnerr2" class='fl_img' data-errorimg="xmlist[{{index}}].showImg" src='{{fitem.showImg}}'></image>
-										<image wx:else class='fl_img' binderror="bind_bnerr2" data-errorimg="xmlist[{{index}}].showImg" src='{{iurl}}{{fitem.showImg}}'></image>
-										
-							<view class='over_view'></view> 
-								<text class='f_item_over_t'>{{fitem.name}}</text></view>
-								<view class='fenlei_text_v'>
-									<view class='f_text'  wx:for="{{fitem.array}}" wx:for-item="item" bindtap="goServiceCategoryList" data-cid="{{item.id}}" data-pid="{{item.parent_id}}">{{item.name}}</view>
-								</view>
-							</view> 
-							</block>
-					</block>
-					
-						
-						<view wx:else class="t-c fs28 c-9 pdt50">暂无项目</view>
-				</scroll-view>
-			</swiper-item>
-   </swiper>
-   <view class="no-data" wx:if="{{!is_date}}">
+      <!-------项目---------->
+      <swiper-item wx:if="{{is_show_xm}}">
+        <scroll-view scroll-y="true" class="fenlei-list" scroll-with-animation="true" lower-threshold="1" bindscrolltolower="scrolltolower" style="height: {{abc}}rpx;">
+          <block wx:if="{{xmlist && xmlist.length != 0}}">
+            <block wx:for="{{xmlist}}" wx:for-item="fitem">
+              <view class='f_item'>
+                <view class="pic_view" bindtap="goServiceCategoryList" data-cid="{{fitem.id}}" data-pid="0">
+
+                  <image wx:if="{{fitem.showImgType==1}}" binderror="bind_bnerr2" class='fl_img' data-errorimg="xmlist[{{index}}].showImg" src='{{fitem.showImg}}'></image>
+                  <image wx:else class='fl_img' binderror="bind_bnerr2" data-errorimg="xmlist[{{index}}].showImg" src='{{iurl}}{{fitem.showImg}}'></image>
+
+                  <view class='over_view'></view>
+                  <text class='f_item_over_t'>{{fitem.name}}</text>
+                </view>
+                <view class='fenlei_text_v'>
+                  <view class='f_text' wx:for="{{fitem.array}}" wx:for-item="item" bindtap="goServiceCategoryList" data-cid="{{item.id}}" data-pid="{{item.parent_id}}">{{item.name}}</view>
+                </view>
+              </view>
+            </block>
+          </block>
+
+
+          <view wx:else class="t-c fs28 c-9 pdt50">暂无项目</view>
+        </scroll-view>
+      </swiper-item>
+    </swiper>
+    <view class="no-data" wx:if="{{!is_date}}">
       <image class="cart-image" src="{{iurl}}/miniapp/images/cart-null.png"></image>
       <view class="no-data-title">暂无分类</view>
       <navigator class="lookat" url="/pages/index/index/index">去逛逛</navigator>
-   </view>
+    </view>
   </block>
   <block wx:elif="{{is_do}}">
-    <view class="no-data" >
+    <view class="no-data">
       <image class="cart-image" src="{{iurl}}/miniapp/images/cart-null.png"></image>
       <view class="no-data-title">商家暂未设置分类</view>
       <navigator class="lookat" url="/pages/index/index/index">去逛逛</navigator>
-   </view>
+    </view>
   </block>
 </block>
 <!-- 风格2 -->
 <block wx:elif="{{is_used_share == 1}}">
-    <block wx:if="{{is_show_pl || is_show_gb || is_show_pp || is_show_xm}}">
-			<!-- 新版分类头部 -->
-			<view class="xc-search-box flex jc_sb ai-center" style="position:fixed;top:0;z-index:99">
-				<!-- <view class="xc-search-inner ">
+  <block wx:if="{{is_show_pl || is_show_gb || is_show_pp || is_show_xm}}">
+    <!-- 新版分类头部 -->
+    <view class="xc-search-box flex jc_sb ai-center" style="position:fixed;top:0;z-index:99">
+      <!-- <view class="xc-search-inner ">
 					<view class="search-img left">
 						<image class="wh100" src="{{iurl}}/miniapp/images/search.png"></image>
 					</view>
 					<input bindfocus="goseach" class="search-cont" placeholder="搜索店铺商品" type="text"></input>
 				</view> -->
-				<!-- 搜索框 -->
-				<view class="search-container f1">
-					<view bindtap="goseach"><text class="iconfont icon-sousuo pdr10"></text>搜索店铺商品</view>
-				</view>
-				<view class="pdl30" bindtap="getScancode" >
-					<image class="scanning_black-img"src="{{iurl}}/miniapp/images/goodscategory/scanning_black.png"></image>
-				<!-- <view class="fs24">扫一扫</view> -->
-				</view>
-				
-		</view>
-        
-        
-          <!-- 分类项目内容  22 -->
-          <view class="flex project_height" style="height:100%;box-sizing:border-box;padding-bottom:100rpx;padding-top:108rpx;"  id="two_type">
-               <!-- 分类项目的类型 -->
-           <view class="project_type" style="background-color:#f4f4f4;overflow-y:auto;position:fixed;left:0;z-index:99;top:108rpx;">
-           <view class="project_type-frame" style="margin-bottom:120rpx;">
-							<view wx:if="{{is_show_gb}}" class="{{status_show == 1?'':''}}">
-           <!-- <view  style="{{status_show == 1?'position: absolute;height: 52rpx;width: 6rpx;background-color: red;left: 0; margin-top: 24rpx;':''}}"></view> -->
-								<view  bindtap="click_classify"  style="{{status_show == 1?'margin-top:0':'margin-top:40rpx'}}" class="fs30  {{select_classify_on==223?'select_classify':''}}" data-index="223" data-name="国家" wx:if="{{is_country}}">
-							
-								<!-- <view  class="tab-bar-item sort-name ellipsis-1" style="letter-spacing:50rpx;">国家</view> -->
-								<view class="tab-bar-item sort-name ellipsis-1" style="">国家</view>
-
-								</view>
-              </view>
-							
-              <view wx:if="{{is_show_pp}}">
-              <!-- <view  style="{{status_show == 2?'position: absolute;height: 52rpx;width: 6rpx;background-color: red;left: 0; margin-top: 24rpx;':''}}"></view> -->
-                <view bindtap="click_classify" class="{{select_classify_on==220?'select_classify':''}} fs30" wx:if="{{is_brand}}" data-index="220" data-name="品牌">
-              
-								<!-- <view  class="tab-bar-item sort-name ellipsis-1" style="letter-spacing:50rpx;">品牌</view> -->
-									<view  class="tab-bar-item sort-name ellipsis-1" style="">品牌</view>
-								</view>
+      <!-- 搜索框 -->
+      <view class="search-container f1">
+        <view bindtap="goseach"><text class="iconfont icon-sousuo pdr10"></text>搜索店铺商品</view>
+      </view>
+      <view class="pdl30" bindtap="getScancode">
+        <image class="scanning_black-img" src="{{iurl}}/miniapp/images/goodscategory/scanning_black.png"></image>
+        <!-- <view class="fs24">扫一扫</view> -->
+      </view>
+
+    </view>
+
+
+    <!-- 分类项目内容  22 -->
+    <view class="flex project_height" style="height:100%;box-sizing:border-box;padding-bottom:100rpx;padding-top:108rpx;" id="two_type">
+      <!-- 分类项目的类型 -->
+      <view class="project_type" style="background-color:#f4f4f4;overflow-y:auto;position:fixed;left:0;z-index:99;top:108rpx;">
+        <view class="project_type-frame" style="margin-bottom:120rpx;">
+          <view wx:if="{{is_show_gb}}" class="{{status_show == 1?'':''}}">
+            <!-- <view  style="{{status_show == 1?'position: absolute;height: 52rpx;width: 6rpx;background-color: red;left: 0; margin-top: 24rpx;':''}}"></view> -->
+            <view bindtap="click_classify" style="{{status_show == 1?'margin-top:0':'margin-top:40rpx'}}" class="fs30  {{select_classify_on==223?'select_classify':''}}" data-index="223" data-name="国家" wx:if="{{is_country}}">
+
+              <!-- <view  class="tab-bar-item sort-name ellipsis-1" style="letter-spacing:50rpx;">国家</view> -->
+              <view class="tab-bar-item sort-name ellipsis-1" style="">国家</view>
+
+            </view>
+          </view>
+
+          <view wx:if="{{is_show_pp}}">
+            <!-- <view  style="{{status_show == 2?'position: absolute;height: 52rpx;width: 6rpx;background-color: red;left: 0; margin-top: 24rpx;':''}}"></view> -->
+            <view bindtap="click_classify" class="{{select_classify_on==220?'select_classify':''}} fs30" wx:if="{{is_brand}}" data-index="220" data-name="品牌">
+
+              <!-- <view  class="tab-bar-item sort-name ellipsis-1" style="letter-spacing:50rpx;">品牌</view> -->
+              <view class="tab-bar-item sort-name ellipsis-1" style="">品牌</view>
+            </view>
+          </view>
+
+          <!-- 项目 -->
+          <view wx:if="{{is_show_xm}}">
+            <view bindtap="click_classify" class="fs30 {{select_classify_on==221?'select_classify':''}}" data-index="221" data-name="项目">
+              <view class="tab-bar-item sort-name ellipsis-1">项目</view>
+            </view>
+          </view>
+
+
+          <!-- 品类 -->
+          <view wx:if="{{is_show_pl}}">
+            <view wx:for="{{one_level_classify}}" wx:for-item="ittms">
+              <view class="{{ittms.items.is_show_class == true?'is_show_class':''}}">
+                <!-- 添加左边红色条 -->
+                <!-- <view  style="{{ittms.items.is_show_class == true?'position: absolute;height: 52rpx;width: 6rpx;background-color: red;left: 0; margin-top: 24rpx;':''}}"></view> -->
+                <view bindtap="click_classify" data-arr="{{ittms.array}}" data-cid="{{ittms.items.id}}" data-pid="0" class="{{select_classify_on==index?'select_classify width80':''}}  fs30 t-c  {{select_classify_on==index&&ittms.items.name.length==2?'':''}} {{select_classify_on==index&&ittms.items.name.length==3?'':''}}" data-index="{{index}}" data-name="{{ittms.items.mobile_name}}">
+                  <view class="tab-bar-item sort-name ellipsis-1">{{ittms.items.name}}</view>
+                </view>
               </view>
-							
-							<!-- 项目 -->
-							<view wx:if="{{is_show_xm}}">
-							  <view  bindtap="click_classify" class="fs30 {{select_classify_on==221?'select_classify':''}}" data-index="221" data-name="项目">
-									<view  class="tab-bar-item sort-name ellipsis-1">项目</view>
-								</view>
-							</view>
-							
-							
-							<!-- 品类 -->
-              <view wx:if="{{is_show_pl}}">
-                <view wx:for="{{one_level_classify}}" wx:for-item="ittms">
-									<view class="{{ittms.items.is_show_class == true?'is_show_class':''}}">
-									 <!-- 添加左边红色条 -->
-									 <!-- <view  style="{{ittms.items.is_show_class == true?'position: absolute;height: 52rpx;width: 6rpx;background-color: red;left: 0; margin-top: 24rpx;':''}}"></view> -->
-									 <view bindtap="click_classify" data-arr="{{ittms.array}}" data-cid="{{ittms.items.id}}" data-pid="0" class="{{select_classify_on==index?'select_classify width80':''}}  fs30 t-c  {{select_classify_on==index&&ittms.items.name.length==2?'':''}} {{select_classify_on==index&&ittms.items.name.length==3?'':''}}" data-index="{{index}}" data-name="{{ittms.items.mobile_name}}">
-										 <view  class="tab-bar-item sort-name ellipsis-1">{{ittms.items.name}}</view>
-									 </view>
-									</view>
-								</view>
-							</view>
-							
+            </view>
           </view>
  
         </view>
-               <!-- 分类项目的内容 -->
-                <view class="classify_content" style="padding-left:196rpx;">
+
+      </view>
+      <!-- 分类项目的内容 -->
+      <view class="classify_content" style="padding-left:196rpx;">
         <!-- 国家的样式 -->
         <block wx:if="{{select_classify_on==223&&is_show_gb}}">
-        <view class="classify_name fs28 flex-space-between">
-        <view>{{ishaf_three==1?good_list.name:classify_name}}</view>
+          <view class="classify_name fs28 flex-space-between">
+            <view>{{ishaf_three==1?good_list.name:classify_name}}</view>
  
-        </view>
-          <view class=" classify_content-frame flex-space-between " >
-             <view bindtap="go_nation" class="country_img-frame rel outer_location"wx:for="{{nationlist}}" wx:for-item="bitem" wx:for-index="pidx" data-nid="{{bitem.id}}" >
-                        <image wx:if="{{bitem.imgtype==1}}" class="country_img" src="{{bitem.logo}}"></image>
-                        <image wx:else class="country_img" src="{{iurl}}{{bitem.logo}}"></image>
-
-                        <view class='nation_box abs box'>
-                            <view class='nt_1 t-c line-height' style="height:50rpx">
-                               <text class="nation_z_name ellipsis-1 nt_1_t height fs24">{{bitem.name}}</text>
-                            </view>
-                            <view class='nt_2 t-c line-height fs24' style="line-height: 50rpx">
-                                <text class="nation_y_name ellipsis-1 nt_1_t height fs24">{{bitem.enname}}</text>
-                            </view>
-                        </view>
-                       <!--<view class='nation_box abs box' style="top:20rpx">-->
-                       <!--</view>-->
-               </view>
-        </view>
+          </view>
+          <view class=" classify_content-frame flex-space-between ">
+            <view bindtap="go_nation" class="country_img-frame rel outer_location" wx:for="{{nationlist}}" wx:for-item="bitem" wx:for-index="pidx" data-nid="{{bitem.id}}">
+              <image wx:if="{{bitem.imgtype==1}}" class="country_img" src="{{bitem.logo}}"></image>
+              <image wx:else class="country_img" src="{{iurl}}{{bitem.logo}}"></image>
+
+              <view class='nation_box abs box'>
+                <view class='nt_1 t-c line-height' style="height:50rpx">
+                  <text class="nation_z_name ellipsis-1 nt_1_t height fs24">{{bitem.name}}</text>
+                </view>
+                <view class='nt_2 t-c line-height fs24' style="line-height: 50rpx">
+                  <text class="nation_y_name ellipsis-1 nt_1_t height fs24">{{bitem.enname}}</text>
+                </view>
+              </view>
+              <!--<view class='nation_box abs box' style="top:20rpx">-->
+              <!--</view>-->
+            </view>
+          </view>
         </block>
         <!-- 品牌 -->
-<!--        <block wx:if="{{select_classify_on==220&&is_show_pp}}">
+        <!--        <block wx:if="{{select_classify_on==220&&is_show_pp}}">
  
         <view class="classify_name fs28 flex-space-between">
            <view>{{classify_name}}</view>
@@ -250,136 +238,134 @@
         </block>
         </view>
         </block> -->
-				<block wx:if="{{select_classify_on==220&&is_show_pp}}">
-					<scroll-view scroll-y="true" class="fenlei-list"
-							style="height: 100%;padding-bottom:100rpx;"  scroll-into-view="{{scrollIntoView}}">
-						<view class="classify_name fs28 flex-space-between">
-							 <view>{{classify_name}}</view>
-						</view>
-						<block wx:for="{{groups}}" wx:for-item="brand_list" wx:for-index="pidx">
-							<view id="{{brand_list.zm}}" class="group-name">{{brand_list.zm}}</view>
-								<view class="classify_content-frame flex flex-wrap">
-								<view class="brand_img_frame "wx:for="{{brand_list.array}}" wx:for-item="user" wx:for-index="idx" bindtap="go_brand" data-bid="{{user.id}}" >
-									<view class="t-c">
-										 <image class="brand_img" src="{{user.logo}}" data-pix="{{pidx}}" data-idx="{{idx}}" data-errorimg="groups[{{pidx}}].array[{{idx}}].logo" binderror="bind_bnerr_pp"></image>
-											<view class="brand_img_name ellipsis-1 fs24">{{user.name}}</view>
-									</view>
-								</view>
-							</view>
-						</block>
-					</scroll-view>
-					<view class="nav box box-tb my-nav" style="top:140rpx;" catchtouchmove="touchmove" catchtouchend="touchend" >
-						<view class="iconfont icon-shangjiantou"></view>
-						<view bindtap="tabLetter" data-index="{{item.zm}}" wx:for="{{groups}}"    
-							class="flex box box-align-center box-pack-center letter">
-							<text class="letter-text {{selected == item.zm ? 'letter-actived' : ''}}" wx:if="{{item.zm}}">{{item.zm}}</text>
-						</view>
-					</view>
-				</block>
-				
-				
-				
-				
-				<!-- 卡项 -->
-				<!-- <block wx:if="{{select_classify_on==220&&is_show_xm}}"> -->
-				<block wx:if="{{select_classify_on==221&&is_show_xm}}">
-					<block wx:if="{{xmlist && xmlist.length != 0}}">
-						<view class="classify_name fs28 flex-space-between">
-							 <view>{{classify_name}}</view>
-						</view>
-						
-						<view class="classify_content-frame flex flex-wrap" style="padding-bottom: 130rpx;">
-						 <block wx:for="{{xmlist}}">
-							 <view class="brand_img_frame" bindtap="goServiceCategoryList" data-cid="{{item.id}}" >
-									<view class="t-c">
-										<image wx:if="{{item.ico}}" class="brand_img" src="{{item.ico}}" mode="heightFix"></image>
-										<image wx:else class="brand_img" src="{{iurl + '/miniapp/images/no_cate_def.png'}}" mode="heightFix"></image>
-										<view class="brand_img_name ellipsis-1 fs24">{{item.name}}</view>
-								  </view>
-							 </view>
-						</block>
-						</view>
-					</block>
-
-					<view wx:else class="t-c fs28 c-9 pdt50">暂无项目</view>
-				</block>
-				
-        <!-- 品类-->
-        <block  wx:if="{{is_show_pl&&select_classify_on!=221&&select_classify_on!=220&&select_classify_on!=223}}">
-				<block wx:if="{{select_classify_on!=221&&select_classify_on!=220&&select_classify_on!=223&&is_level_three!=1}}">
-        <!-- <block wx:if="{{select_classify_on == 0&&is_level_three!=1}}"> -->
-             <view class="my-container">
-                 <view class="classify_name fs28 flex-space-between ai-center" data-pid="0" data-cid="{{cat_id}}" bindtap='select_more'>
-            <view class="classify_title ellipsis-1">{{classify_name}}</view>
-              <view class="flex select_more ai-center" >
-                <view class="red-co fs24" >更多</view>
-                <view class="bg_right width_height" style="margin-top: 0;"></view>
+        <block wx:if="{{select_classify_on==220&&is_show_pp}}">
+          <scroll-view scroll-y="true" class="fenlei-list" style="height: 100%;padding-bottom:100rpx;" scroll-into-view="{{scrollIntoView}}">
+            <view class="classify_name fs28 flex-space-between">
+              <view>{{classify_name}}</view>
+            </view>
+            <block wx:for="{{groups}}" wx:for-item="brand_list" wx:for-index="pidx">
+              <view id="{{brand_list.zm}}" class="group-name">{{brand_list.zm}}</view>
+              <view class="classify_content-frame flex flex-wrap">
+                <view class="brand_img_frame " wx:for="{{brand_list.array}}" wx:for-item="user" wx:for-index="idx" bindtap="go_brand" data-bid="{{user.id}}">
+                  <view class="t-c">
+                    <image class="brand_img" src="{{user.logo}}" data-pix="{{pidx}}" data-idx="{{idx}}" data-errorimg="groups[{{pidx}}].array[{{idx}}].logo" binderror="bind_bnerr_pp"></image>
+                    <view class="brand_img_name ellipsis-1 fs24">{{user.name}}</view>
+                  </view>
+                </view>
               </view>
+            </block>
+          </scroll-view>
+          <view class="nav box box-tb my-nav" style="top:140rpx;" catchtouchmove="touchmove" catchtouchend="touchend">
+            <view class="iconfont icon-shangjiantou"></view>
+            <view bindtap="tabLetter" data-index="{{item.zm}}" wx:for="{{groups}}" class="flex box box-align-center box-pack-center letter">
+              <text class="letter-text {{selected == item.zm ? 'letter-actived' : ''}}" wx:if="{{item.zm}}">{{item.zm}}</text>
             </view>
-             <!-- 显示2级列表 -->
-             <view class="classify_content-frame flex-wrap">
-                 <block wx:if="{{goodslist && goodslist.length>0}}">
-                     <block  wx:for="{{goodslist}}" wx:for-item="goods" wx:for-index="indx">
-                        <view  class="type_img_frame t-c ib" data-cid="{{goods.items.id}}" data-pid="{{goods.items.parent_id}}" bindtap="go_cate">
-                          <image class=" type_img" src="{{goods.items.icoimg==null||goods.items.icoimg==''?iurl+'/miniapp/images/no_cate_def.png':goods.items.icoimg}}" binderror="goods_bnerr" data-err="goodslist[{{index}}].logo"></image>
-                            <view class="brand_img_name fs24 ellipsis-1 pdh10">{{goods.items.name}}</view>
-                        </view>
-                     </block>
-                 </block>
-                 <block wx:else>
-                        <view class="no_child_lev fs28">该类别无子级</view>
-                 </block>
-             </view>
+          </view>
+        </block>
+
+
  
+
+        <!-- 卡项 -->
+        <!-- <block wx:if="{{select_classify_on==220&&is_show_xm}}"> -->
+        <block wx:if="{{select_classify_on==221&&is_show_xm}}">
+          <block wx:if="{{xmlist && xmlist.length != 0}}">
+            <view class="classify_name fs28 flex-space-between">
+              <view>{{classify_name}}</view>
             </view>
+
+            <view class="classify_content-frame flex flex-wrap" style="padding-bottom: 130rpx;">
+              <block wx:for="{{xmlist}}">
+                <view class="brand_img_frame" bindtap="goServiceCategoryList" data-cid="{{item.id}}">
+                  <view class="t-c">
+                    <image wx:if="{{item.ico}}" class="brand_img" src="{{item.ico}}" mode="heightFix"></image>
+                    <image wx:else class="brand_img" src="{{iurl + '/miniapp/images/no_cate_def.png'}}" mode="heightFix"></image>
+                    <view class="brand_img_name ellipsis-1 fs24">{{item.name}}</view>
+                  </view>
+                </view>
+              </block>
+            </view>
+          </block>
+
+          <view wx:else class="t-c fs28 c-9 pdt50">暂无项目</view>
         </block>
  
-        <!-- 商品 含有3级的-->
-        <block wx:if="{{select_classify_on!=220&&select_classify_on!=221&&select_classify_on!=223&&is_level_three==1}}">
-        <block wx:for="{{goodslist}}" wx:for-item="goods" wx:for-index="inds">
-        <view>
+        <!-- 品类-->
+        <block wx:if="{{is_show_pl&&select_classify_on!=221&&select_classify_on!=220&&select_classify_on!=223}}">
+          <block wx:if="{{select_classify_on!=221&&select_classify_on!=220&&select_classify_on!=223&&is_level_three!=1}}">
+            <!-- <block wx:if="{{select_classify_on == 0&&is_level_three!=1}}"> -->
+            <view class="my-container">
+              <view class="classify_name fs28 flex-space-between ai-center" data-pid="0" data-cid="{{cat_id}}" bindtap='select_more'>
+                <view class="classify_title ellipsis-1">{{classify_name}}</view>
+                <view class="flex select_more ai-center">
+                  <view class="red-co fs24">更多</view>
+                  <view class="bg_right width_height" style="margin-top: 0;"></view>
+                </view>
+              </view>
+              <!-- 显示2级列表 -->
+              <view class="classify_content-frame flex-wrap">
+                <block wx:if="{{goodslist && goodslist.length>0}}">
+                  <block wx:for="{{goodslist}}" wx:for-item="goods" wx:for-index="indx">
+                    <view class="type_img_frame t-c ib" data-cid="{{goods.items.id}}" data-pid="{{goods.items.parent_id}}" bindtap="go_cate">
+                      <image class=" type_img" src="{{goods.items.icoimg==null||goods.items.icoimg==''?iurl+'/miniapp/images/no_cate_def.png':goods.items.icoimg}}" binderror="goods_bnerr" data-err="goodslist[{{index}}].logo"></image>
+                      <view class="brand_img_name fs24 ellipsis-1 pdh10">{{goods.items.name}}</view>
+                    </view>
+                  </block>
+                </block>
+                <block wx:else>
+                  <view class="no_child_lev fs28">该类别无子级</view>
+                </block>
+              </view>
+
+            </view>
+          </block>
  
-        <view class="classify_name fs28 flex-space-between ai-center"data-pid="{{goods.items.parent_id}}" data-cid="{{goods.items.id}}" bindtap='select_more'>
+          <!-- 商品 含有3级的-->
+          <block wx:if="{{select_classify_on!=220&&select_classify_on!=221&&select_classify_on!=223&&is_level_three==1}}">
+            <block wx:for="{{goodslist}}" wx:for-item="goods" wx:for-index="inds">
+              <view>
  
-        <view class="classify_title ellipsis-1">{{goods.items.name}}</view>
-        <view class="flex select_more ai-center" >
-          <view class="red-co fs24" >更多</view>
+                <view class="classify_name fs28 flex-space-between ai-center" data-pid="{{goods.items.parent_id}}" data-cid="{{goods.items.id}}" bindtap='select_more'>
+
+                  <view class="classify_title ellipsis-1">{{goods.items.name}}</view>
+                  <view class="flex select_more ai-center">
+                    <view class="red-co fs24">更多</view>
                     <view class="bg_right width_height" style="margin-top: 0;"></view>
-        </view>
-        </view>
+                  </view>
+                </view>
  
-        <block wx:if="{{goods.arrays.length>0}}">
-        <view class="classify_content-frame  flex-wrap">
-          <view  class="type_img_frame t-c ib" data-cid="{{item.id}}" data-pid="three"  wx:for="{{goods.arrays}}" wx:for-index="index" wx:for-item="item" bindtap="go_cate">
-             <image class=" type_img"src="{{item.icoimg==null||item.icoimg==''?iurl+'/miniapp/images/no_cate_def.png':item.icoimg}}"binderror="goods_bnerr" data-err="goodslist[{{index}}].logo"></image>
-           <view class="brand_img_name fs24 ellipsis-1 pdh10">{{item.name}}</view>
-          </view>
-        </view>
-        <!-- <view class="divider_line"></view> -->
-        </block>
+                <block wx:if="{{goods.arrays.length>0}}">
+                  <view class="classify_content-frame  flex-wrap">
+                    <view class="type_img_frame t-c ib" data-cid="{{item.id}}" data-pid="three" wx:for="{{goods.arrays}}" wx:for-index="index" wx:for-item="item" bindtap="go_cate">
+                      <image class=" type_img" src="{{item.icoimg==null||item.icoimg==''?iurl+'/miniapp/images/no_cate_def.png':item.icoimg}}" binderror="goods_bnerr" data-err="goodslist[{{index}}].logo"></image>
+                      <view class="brand_img_name fs24 ellipsis-1 pdh10">{{item.name}}</view>
+                    </view>
+                  </view>
+                  <!-- <view class="divider_line"></view> -->
+                </block>
  
-        </view>
-        </block>
-        </block>
+              </view>
+            </block>
+          </block>
         </block>
-        </view>
-           </view>
-    </block>
-    <block wx:elif="{{is_do}}">
-        <view class="no-data" >
-            <image class="cart-image" src="{{iurl}}/miniapp/images/cart-null.png"></image>
-            <view class="no-data-title">商家暂未设置分类</view>
-            <navigator class="lookat"  url="/pages/index/index/index">去逛逛</navigator>
-        </view>
-    </block>
+      </view>
+    </view>
+  </block>
+  <block wx:elif="{{is_do}}">
+    <view class="no-data">
+      <image class="cart-image" src="{{iurl}}/miniapp/images/cart-null.png"></image>
+      <view class="no-data-title">商家暂未设置分类</view>
+      <navigator class="lookat" url="/pages/index/index/index">去逛逛</navigator>
+    </view>
+  </block>
  
 </block>
 <!-- 风格3 -->
 <block wx:elif="{{is_used_share == 2}}">
-    <block wx:if="{{is_show_pl || is_show_gb || is_show_pp || is_show_xm}}">
-      <!-- 头部 -->
-      <view class="xc-search-box flex-center white_b" id="navbar" style="position:fixed;top:0;z-index:99">
-            <!-- <view class="share-height t-c" bindtap="getScancode" >
+  <block wx:if="{{is_show_pl || is_show_gb || is_show_pp || is_show_xm}}">
+    <!-- 头部 -->
+    <view class="xc-search-box flex-center white_b" id="navbar" style="position:fixed;top:0;z-index:99">
+      <!-- <view class="share-height t-c" bindtap="getScancode" >
               <image class="scanning_black-img"src="{{iurl}}/miniapp/images/goodscategory/scanning_black.png"></image>
               <view class="fs24">
               扫一扫
@@ -391,50 +377,50 @@
                 </view>
                 <input bindfocus="goseach" class="search-cont" placeholder="请输入您所搜索的商品" type="text"></input>
             </view> -->
-						
-						<!-- 搜索框 -->
-						<view class="search-container f1">
-							<view bindtap="goseach"><text class="iconfont icon-sousuo pdr10"></text>搜索店铺商品</view>
-						</view>
-						<view class="pdl30" bindtap="getScancode" >
-							<image class="scanning_black-img"src="{{iurl}}/miniapp/images/goodscategory/scanning_black.png"></image>
-						<!-- <view class="fs24">扫一扫</view> -->
-						</view>
+
+      <!-- 搜索框 -->
+      <view class="search-container f1">
+        <view bindtap="goseach"><text class="iconfont icon-sousuo pdr10"></text>搜索店铺商品</view>
       </view>
-      <!-- /头部 -->
-          <!-- 分类项目内容 -->
-          <view class="flex project_height" style="">
-            <!-- 分类项目的类型 -->
-            <view class="project_type" style="background-color:#f4f4f4;overflow-y:auto;position:fixed;left:0;z-index:99;top:108rpx;" id="thress_type3">
-              <view class="project_type-frame" style="margin-bottom:120rpx;">
-                <view wx:if="{{is_show_gb}}">
-                  <view  bindtap="click_classify"  class="tab-bar-item {{select_classify_on==223 ? 'active' : ''}}" data-index="223" data-name="国家" wx:if="{{is_country}}" data-current="223">
-                    <text style="">国家</text>
-                  </view>
-                </view>
-								
-                <view wx:if="{{is_show_pp}}">
-                  <view bindtap="click_classify"  class="tab-bar-item {{select_classify_on==220 ? 'active' : ''}}" wx:if="{{is_brand}}"  data-index="220" data-name="品牌" data-current="220">
-                    <text style="">品牌</text>
-                   </view>
-                </view>
-								
-								
-								<!-- 卡项 -->
-								<view wx:if="{{is_show_xm}}">
-								  <view bindtap="click_classify" class="tab-bar-item {{select_classify_on == 221 ? 'active' : ''}}" data-index="221" data-name="项目" data-current="221">
-								    <text>项目</text>
-								  </view>
-								</view>
-								
-								
-								
-                <view wx:if="{{is_show_pl}}">
-                  <!-- <view wx:for="{{one_level_classify}}" wx:for-item="ittms" class="class_set_height"> -->
-                  <!-- <view class="{{ittms.items.is_show_class == true?'is_show_class':''}}"> -->
-                    <!-- 添加左边红色条 -->
-                    <!-- <view  style="{{ittms.items.is_show_class == true?'position: absolute;height: 52rpx;width: 6rpx;background-color: red;left: 0; margin-top: 24rpx;':''}}"></view> -->
-                    <!-- <view bindtap="click_classify"  style="{{status_show == 0 && ittms == 0 ?'margin-top:0':'margin-top:0rpx'}}" data-arr="{{ittms.array}}" data-cid="{{ittms.items.id}}" data-pid="0" class="{{select_classify_on==index?'select_classify width80':''}} share_type fs30 t-c {{ittms.items.name.length==2? 'world_sn':''}} {{select_classify_on==index&&ittms.items.name.length==2?'text-indent':''}} {{select_classify_on==index&&ittms.items.name.length==3?'text3':''}}"data-index="{{index}}"data-name="{{ittms.items.mobile_name}}">
+      <view class="pdl30" bindtap="getScancode">
+        <image class="scanning_black-img" src="{{iurl}}/miniapp/images/goodscategory/scanning_black.png"></image>
+        <!-- <view class="fs24">扫一扫</view> -->
+      </view>
+    </view>
+    <!-- /头部 -->
+    <!-- 分类项目内容 -->
+    <view class="flex project_height" style="">
+      <!-- 分类项目的类型 -->
+      <view class="project_type" style="background-color:#f4f4f4;overflow-y:auto;position:fixed;left:0;z-index:99;top:108rpx;" id="thress_type3">
+        <view class="project_type-frame" style="margin-bottom:120rpx;">
+          <view wx:if="{{is_show_gb}}">
+            <view bindtap="click_classify" class="tab-bar-item {{select_classify_on==223 ? 'active' : ''}}" data-index="223" data-name="国家" wx:if="{{is_country}}" data-current="223">
+              <text style="">国家</text>
+            </view>
+          </view>
+
+          <view wx:if="{{is_show_pp}}">
+            <view bindtap="click_classify" class="tab-bar-item {{select_classify_on==220 ? 'active' : ''}}" wx:if="{{is_brand}}" data-index="220" data-name="品牌" data-current="220">
+              <text style="">品牌</text>
+            </view>
+          </view>
+
+
+          <!-- 卡项 -->
+          <view wx:if="{{is_show_xm}}">
+            <view bindtap="click_classify" class="tab-bar-item {{select_classify_on == 221 ? 'active' : ''}}" data-index="221" data-name="项目" data-current="221">
+              <text>项目</text>
+            </view>
+          </view>
+
+
+
+          <view wx:if="{{is_show_pl}}">
+            <!-- <view wx:for="{{one_level_classify}}" wx:for-item="ittms" class="class_set_height"> -->
+            <!-- <view class="{{ittms.items.is_show_class == true?'is_show_class':''}}"> -->
+            <!-- 添加左边红色条 -->
+            <!-- <view  style="{{ittms.items.is_show_class == true?'position: absolute;height: 52rpx;width: 6rpx;background-color: red;left: 0; margin-top: 24rpx;':''}}"></view> -->
+            <!-- <view bindtap="click_classify"  style="{{status_show == 0 && ittms == 0 ?'margin-top:0':'margin-top:0rpx'}}" data-arr="{{ittms.array}}" data-cid="{{ittms.items.id}}" data-pid="0" class="{{select_classify_on==index?'select_classify width80':''}} share_type fs30 t-c {{ittms.items.name.length==2? 'world_sn':''}} {{select_classify_on==index&&ittms.items.name.length==2?'text-indent':''}} {{select_classify_on==index&&ittms.items.name.length==3?'text3':''}}"data-index="{{index}}"data-name="{{ittms.items.mobile_name}}">
                       <view class="{{ittms.items.name.length==3?'flex-center-around':'flex-space-between'}}" wx:if="{{ittms.items.name.length<4}}">
                         <view wx:for="{{ittms.items.name}}" wx:for-item="name"wx:for-index="index">
                           <view>
@@ -444,11 +430,11 @@
                       </view>
                       <view wx:else class="sort-name ellipsis-1">{{ittms.items.name}}</view>
                     </view> -->
-                  <!-- </view> -->
-                  <scroll-view scroll-y scroll-with-animation class="tab-view" scroll-top="{{scrollTop}}" style="height:88%">
-                    <view wx:for="{{one_level_classify}}" wx:for-item="ittms" wx:key="{{index}}" class="tab-bar-item {{select_classify_on==index ? 'active' : ''}}" data-current="{{index}}" catchtap="click_classify" data-arr="{{ittms.array}}" data-cid="{{ittms.items.id}}" data-pid="0" data-index="{{index}}"data-name="{{ittms.items.mobile_name}}">
-                      <text>{{ittms.items.name}}</text>
-                      <!-- <view class="{{ittms.items.name.length==3?'flex-center-around':'flex-space-between'}}" wx:if="{{ittms.items.name.length<4}}">
+            <!-- </view> -->
+            <scroll-view scroll-y scroll-with-animation class="tab-view" scroll-top="{{scrollTop}}" style="height:88%">
+              <view wx:for="{{one_level_classify}}" wx:for-item="ittms" wx:key="{{index}}" class="tab-bar-item {{select_classify_on==index ? 'active' : ''}}" data-current="{{index}}" catchtap="click_classify" data-arr="{{ittms.array}}" data-cid="{{ittms.items.id}}" data-pid="0" data-index="{{index}}" data-name="{{ittms.items.mobile_name}}">
+                <text>{{ittms.items.name}}</text>
+                <!-- <view class="{{ittms.items.name.length==3?'flex-center-around':'flex-space-between'}}" wx:if="{{ittms.items.name.length<4}}">
                         <view wx:for="{{ittms.items.name}}" wx:for-item="name"wx:for-index="index">
                           <text>
                           {{name}}
@@ -456,45 +442,45 @@
                         </view>
                       </view>
                       <text wx:else class="sort-name ellipsis-1">{{ittms.items.name}}</text> -->
-                    </view>
-                  </scroll-view>
-                  
-                <!-- </view> -->
               </view>
-							
-							
-							
-            </view>
-             </view>
-            <!-- 分类项目的内容 -->
-            <view class="classify_content" style="padding-left:26%;padding-top:108rpx;box-sizing: border-box;">
+            </scroll-view>
+
+            <!-- </view> -->
+          </view>
+
+
+
+        </view>
+      </view>
+      <!-- 分类项目的内容 -->
+      <view  class="classify_content" style="padding-left:26%;padding-top:108rpx;box-sizing: border-box;" bindtouchstart="bScroll" bindtouchend="btouMove">
         <!-- 国家的样式 -->
         <block wx:if="{{select_classify_on==223&&is_show_gb}}">
-        <view class="classify_name fs28 flex-space-between">
-        <view>{{ishaf_three==1?good_list.name:classify_name}}</view>
+          <view class="classify_name fs28 flex-space-between">
+            <view>{{ishaf_three==1?good_list.name:classify_name}}</view>
  
-        </view>
-          <view class=" classify_content-frame flex-space-between " >
-             <view bindtap="go_nation" class="country_img-frame rel outer_location"wx:for="{{nationlist}}" wx:for-item="bitem" wx:for-index="pidx" data-nid="{{bitem.id}}" >
-                        <image wx:if="{{bitem.imgtype==1}}" class="country_img" src="{{bitem.logo}}"></image>
-                        <image wx:else class="country_img" src="{{iurl}}{{bitem.logo}}"></image>
-                        <view class='nation_box abs box'>
-                            <view class='nt_1 t-c line-height' style="height:50rpx">
-                               <text class="nation_z_name ellipsis-1 nt_1_t height fs24">{{bitem.name}}</text>
-                            </view>
-                            <view class='nt_2 t-c line-height fs24' style="line-height: 50rpx">
-                                <text class="nation_y_name ellipsis-1 nt_1_t height fs24">{{bitem.enname}}</text>
-                            </view>
-                        </view>
-                       <!--<view class='nation_box abs box' style="top:20rpx">-->
-                       <!--</view>-->
-               </view>
-        </view>
+          </view>
+          <view class=" classify_content-frame flex-space-between ">
+            <view bindtap="go_nation" class="country_img-frame rel outer_location" wx:for="{{nationlist}}" wx:for-item="bitem" wx:for-index="pidx" data-nid="{{bitem.id}}">
+              <image wx:if="{{bitem.imgtype==1}}" class="country_img" src="{{bitem.logo}}"></image>
+              <image wx:else class="country_img" src="{{iurl}}{{bitem.logo}}"></image>
+              <view class='nation_box abs box'>
+                <view class='nt_1 t-c line-height' style="height:50rpx">
+                  <text class="nation_z_name ellipsis-1 nt_1_t height fs24">{{bitem.name}}</text>
+                </view>
+                <view class='nt_2 t-c line-height fs24' style="line-height: 50rpx">
+                  <text class="nation_y_name ellipsis-1 nt_1_t height fs24">{{bitem.enname}}</text>
+                </view>
+              </view>
+              <!--<view class='nation_box abs box' style="top:20rpx">-->
+              <!--</view>-->
+            </view>
+          </view>
         </block>
-				
-				
+
+
         <!-- 品牌 -->
-<!--        <block wx:if="{{select_classify_on==220&&is_show_pp}}">
+        <!--        <block wx:if="{{select_classify_on==220&&is_show_pp}}">
  
         <view class="classify_name fs28 flex-space-between">
            <view>{{classify_name}}</view>
@@ -513,237 +499,239 @@
         </block>
         </view>
         </block> -->
-								
-				<!-- 品牌 -->
-				<block wx:if="{{select_classify_on==220&&is_show_pp}}">
-					<scroll-view scroll-y="true" class="fenlei-list"
-							style="height: 100%;padding-bottom:100rpx;"  scroll-into-view="{{scrollIntoView}}">
-						<view class="classify_name fs28 flex-space-between">
-							 <view>{{classify_name}}</view>
-						</view>
-						<block wx:for="{{groups}}" wx:for-item="brand_list" wx:for-index="pidx">
-							<view id="{{brand_list.zm}}" class="group-name">{{brand_list.zm}}</view>
-								<view class="classify_content-frame flex flex-wrap">
-								<view class="brand_img_frame "wx:for="{{brand_list.array}}" wx:for-item="user" wx:for-index="idx" bindtap="go_brand" data-bid="{{user.id}}" >
-									<view class="t-c">
-										 <image class="brand_img" src="{{user.logo}}" data-pix="{{pidx}}" data-idx="{{idx}}" data-errorimg="groups[{{pidx}}].array[{{idx}}].logo" binderror="bind_bnerr_pp"></image>
-											<view class="brand_img_name ellipsis-1 fs24">{{user.name}}</view>
-									</view>
-								</view>
-							</view>
-						</block>
-					</scroll-view>
-					<view class="nav box box-tb my-nav" style="top:140rpx;" catchtouchmove="touchmove" catchtouchend="touchend" >
-						<!-- <image src="/images/up.png" style="width:36rpx;height:36rpx;margin-right:10rpx;"></image> -->
-						<view class="iconfont icon-shangjiantou"></view>
-						<view bindtap="tabLetter" data-index="{{item.zm}}" wx:for="{{groups}}"    
-							class="flex box box-align-center box-pack-center letter">
-							<text class="letter-text {{selected == item.zm ? 'letter-actived' : ''}}" wx:if="{{item.zm}}">{{item.zm}}</text>
-						</view>
-					</view>
-				</block>
-				
-				
-				
-				
-				<!-- 卡项 -->
-				<block wx:if="{{select_classify_on==221&&is_show_xm}}">
-					<block wx:if="{{xmlist && xmlist.length != 0}}">
-						<view class="classify_name fs28 flex-space-between">
-							 <view>{{classify_name}}</view>
-						</view>
-						
-						<view class="classify_content-frame flex flex-wrap" style="padding-bottom: 130rpx;">
-						 <block wx:for="{{xmlist}}">
-							 <view class="brand_img_frame" bindtap="goServiceCategoryList" data-cid="{{item.id}}">
-									<view class="t-c">
-										<image wx:if="{{item.ico}}" class="brand_img" src="{{item.ico}}" mode="heightFix"></image>
-										<image wx:else class="brand_img" src="{{iurl + '/miniapp/images/no_cate_def.png'}}" mode="heightFix"></image>
-										<view class="brand_img_name ellipsis-1 fs24">{{item.name}}</view>
-								 </view>
-							 </view>
-							</block>
-						</view>
-					</block>
-					
-					<view wx:else class="t-c fs28 c-9 pdt50">暂无项目</view>
-					
-				</block>
-				
-				
+
+        <!-- 品牌 -->
+        <block wx:if="{{select_classify_on==220&&is_show_pp}}">
+          <scroll-view scroll-y="true" class="fenlei-list" style="height: 100%;padding-bottom:100rpx;" scroll-into-view="{{scrollIntoView}}">
+            <view class="classify_name fs28 flex-space-between">
+              <view>{{classify_name}}</view>
+            </view>
+            <block wx:for="{{groups}}" wx:for-item="brand_list" wx:for-index="pidx">
+              <view id="{{brand_list.zm}}" class="group-name">{{brand_list.zm}}</view>
+              <view class="classify_content-frame flex flex-wrap">
+                <view class="brand_img_frame " wx:for="{{brand_list.array}}" wx:for-item="user" wx:for-index="idx" bindtap="go_brand" data-bid="{{user.id}}">
+                  <view class="t-c">
+                    <image class="brand_img" src="{{user.logo}}" data-pix="{{pidx}}" data-idx="{{idx}}" data-errorimg="groups[{{pidx}}].array[{{idx}}].logo" binderror="bind_bnerr_pp"></image>
+                    <view class="brand_img_name ellipsis-1 fs24">{{user.name}}</view>
+                  </view>
+                </view>
+              </view>
+            </block>
+          </scroll-view>
+          <view class="nav box box-tb my-nav" style="top:140rpx;" catchtouchmove="touchmove" catchtouchend="touchend">
+            <!-- <image src="/images/up.png" style="width:36rpx;height:36rpx;margin-right:10rpx;"></image> -->
+            <view class="iconfont icon-shangjiantou"></view>
+            <view bindtap="tabLetter" data-index="{{item.zm}}" wx:for="{{groups}}" class="flex box box-align-center box-pack-center letter">
+              <text class="letter-text {{selected == item.zm ? 'letter-actived' : ''}}" wx:if="{{item.zm}}">{{item.zm}}</text>
+            </view>
+          </view>
+        </block>
+
+
+
+
+        <!-- 卡项 -->
+        <block wx:if="{{select_classify_on==221&&is_show_xm}}">
+          <block wx:if="{{xmlist && xmlist.length != 0}}">
+            <view class="classify_name fs28 flex-space-between">
+              <view>{{classify_name}}</view>
+            </view>
+
+            <view class="classify_content-frame flex flex-wrap" style="padding-bottom: 130rpx;">
+              <block wx:for="{{xmlist}}">
+                <view class="brand_img_frame" bindtap="goServiceCategoryList" data-cid="{{item.id}}">
+                  <view class="t-c">
+                    <image wx:if="{{item.ico}}" class="brand_img" src="{{item.ico}}" mode="heightFix"></image>
+                    <image wx:else class="brand_img" src="{{iurl + '/miniapp/images/no_cate_def.png'}}" mode="heightFix"></image>
+                    <view class="brand_img_name ellipsis-1 fs24">{{item.name}}</view>
+                  </view>
+                </view>
+              </block>
+            </view>
+          </block>
+
+          <view wx:else class="t-c fs28 c-9 pdt50">暂无项目</view>
+
+        </block>
+
+
         <!-- 品类-->
-				<!-- <block  wx:if="{{select_classify_on==0&&is_show_pl}}"> -->
-        <block  wx:if="{{is_show_pl&&select_classify_on!=220&&select_classify_on!=223&&select_classify_on!=221}}">
-					<!-- <block wx:if="{{select_classify_on!=220&&select_classify_on!=223}}"> -->
+        <!-- <block  wx:if="{{select_classify_on==0&&is_show_pl}}"> -->
+        <block wx:if="{{is_show_pl&&select_classify_on!=220&&select_classify_on!=223&&select_classify_on!=221}}" >
+          <!-- <block wx:if="{{select_classify_on!=220&&select_classify_on!=223}}"> -->
           <block wx:if="{{select_classify_on!=220&&select_classify_on!=223&&select_classify_on!=221}}">
-              <view style="width:100%;height:100%;position: relative;">
-                <view class="classify_name fs28 flex ai-center flex-space-between" id="header" data-pid="0" data-cid="{{cat_id}}" bindtap='select_more' style="box-sizing:border-box;position:fixed;z-index: 999;width:74%;background-color:#ffffff;padding:0 20rpx;">
-                  <view class="classify_title ellipsis-1">{{classify_name}}</view>
-                  <view class="flex select_more ai-center" >
-                    <view class="red-co fs24" >更多</view>
-                    <view class="bg_right width_height" style="margin-top: 0;"></view>
-                  </view>
+            <view style="width:100%;height:100%;position: relative;">
+              <view class="classify_name fs28 flex ai-center flex-space-between" id="header" data-pid="0" data-cid="{{cat_id}}" bindtap='select_more' style="box-sizing:border-box;position:fixed;z-index: 999;width:74%;background-color:#ffffff;padding:0 20rpx;">
+                <view class="classify_title ellipsis-1">{{classify_name}}</view>
+                <view class="flex select_more ai-center">
+                  <view class="red-co fs24">更多</view>
+                  <view class="bg_right width_height" style="margin-top: 0;"></view>
                 </view>
-                <!-- 显示商品列表开始 -->
-                <!-- <view class="classify_content-frame flex-wrap" style="width:100%;overflow:hidden;heigth:100%;"> -->
-               
-               <!-- <view class="null" style="width:100%;margin-top:70rpx;"></view> -->
-                <scroll-view scroll-y scroll-top="{{scrollTop}}" bindscrolltolower='scrollLower' style="height:{{windowHeight}};position:absolute;margin-top:70rpx;top:0;bottom:0;left:0;width:100%;margin-bottom: 80rpx;">
+              </view>
+              <!-- 显示商品列表开始 -->
+              <!-- <view class="classify_content-frame flex-wrap" style="width:100%;overflow:hidden;heigth:100%;"> -->
+
+              <!-- <view class="null" style="width:100%;margin-top:70rpx;"></view> -->
+              <scroll-view   scroll-y scroll-top="{{scrollTop}}"  bindscrolltolower='scrollLower' bindscrolltoupper='scrolltoupper' style="height:{{windowHeight}};position:absolute;margin-top:70rpx;top:0;bottom:0;left:0;width:100%;">
                 <view class="null" style="width:100%;height:1px;"></view>
                 <!-- goodslist -->
-                    <view class="choice_list" style="height:{{msgStatus != true?'100%':''}}">
-                      
-                      <navigator class="choice_item" style="margin-bottom:{{dataLength -1 == index?'100px':'0'}}" url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}" wx:for="{{requestData}}" data-id="{{index}}" wx:key="{{index}}">
-                              <view class="img-wrap">
-                                <image src="{{url+item.original_img}}" binderror="bind_bnerr_t3" data-url="{{url+item.original_img}}" lazy-load="true" data-errorimg="requestData[{{index}}].original_img"></image>
+                <view class="choice_list" style="height:{{msgStatus != true?'100%':''}}">
+
+                  <navigator class="choice_item" style="margin-bottom:{{dataLength -1 == index?'50px':'0'}}" url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}" wx:for="{{requestData}}" data-id="{{index}}" wx:key="{{index}}">
+                    <view class="img-wrap">
+                      <image src="{{url+item.original_img}}" binderror="bind_bnerr_t3" data-url="{{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 || item.prom_integral}}">
+                        <view class="flex ai-center">
+                          <!-- 活动价 -->
+                          <view class="price">
+                            <text wx:if="{{item.prom_integral}}">{{item.prom_integral}}积分</text>
+                            <text wx:if="{{item.prom_integral && item.prom_price}}">+</text>
+                            <text wx:if="{{item.prom_price}}" class="rmb">{{item.prom_price}}</text>
+                          </view>
+                          <!--                      							<view class="word-line xc-ash rmb mgl10 fs24">{{item.market_price}}</view>-->
+                        </view>
+
+                        <view class="comment">
+
+                          <view class="fs22 pdt10 t-r">
+                            <span>评论{{item.comment_count}}</span>
+                            <span class="pdl30">已售{{item.sales_sum}}</span>
+                          </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="flex ai_and">
+                                <view class="price rmb">{{item[card_field]}}</view>
+                                <view class="card_bg ellipsis-1">
+                                  <image src="{{url}}/miniapp/images/plus/dj_icon.png"></image>
+                                  <view class="card_name">{{card_name}}</view>
+                                </view>
                               </view>
-                              <view class="item-cont">
-                                <view class="title">{{item.goods_name}}</view>
-                                  <!-- 判断是否有活动价 -->
-                                  <block wx:if="{{item.prom_price>0 || item.prom_integral}}">
-                      						<view class="flex ai-center">
-                      							<!-- 活动价 -->
-                      							<view class="price">
-                      								<text wx:if="{{item.prom_integral}}">{{item.prom_integral}}积分</text>
-                      								<text wx:if="{{item.prom_integral && item.prom_price}}">+</text> 
-                      								<text wx:if="{{item.prom_price}}" class="rmb">{{item.prom_price}}</text> 							
-                      							</view>
-<!--                      							<view class="word-line xc-ash rmb mgl10 fs24">{{item.market_price}}</view>-->
-                      						</view>
-                                     
-                                      <view class="comment">
-                                        
-                                        <view class="fs22 pdt10 t-r">
-                      										<span>评论{{item.comment_count}}</span>
-                      										<span class="pdl30">已售{{item.sales_sum}}</span>
-                      									</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="flex ai_and">
-                                            <view class="price rmb">{{item[card_field]}}</view>
-                                            <view class="card_bg ellipsis-1">
-                                              <image src="{{url}}/miniapp/images/plus/dj_icon.png"></image>
-                                              <view class="card_name">{{card_name}}</view>
-                                            </view>
-                                          </view>
-                                          <view class="comment flex jc_sb">
-<!--                                            <view class="word-line xc-ash rmb fs24">{{item.market_price}}</view>-->
-                                            <view class="fs22 pdt10 t-r">
-                      												<span>评论{{item.comment_count}}</span>
-                      												<span class="pdl30">已售{{item.sales_sum}}</span>
-                      											</view>
-                                          </view>
-                                        </block>
-                                        <block wx:else>
-                      										<view class="flex ai-center">
-                      											<view class="price rmb">{{item.shop_price}}</view>
-<!--                      											<view class="word-line xc-ash rmb fs24 mgl10">{{item.market_price}}</view>-->
-                      										</view>
-                                          
-                                          <view class="comment">
-                                            <view class="fs22 pdt10 t-r">
-                      												<span>评论{{item.comment_count}}</span>
-                      												<span class="pdl30">已售{{item.sales_sum}}</span>
-                      											</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 rmb">{{item.shop_price}}</view>
-<!--                                            <view class="word-line xc-ash mk_price rmb fs24 mgl10">{{item.market_price}}</view>-->
-                                          </view>
-                                          <view class="comment">
-                                            <view class="flex ai-center">
-                                              <view class="rmb">{{g_filter.get_card_price(item,card_list,0)}}</view>
-                                              <view class="card_bg ellipsis-1">
-                                                <image src="{{url}}/miniapp/images/plus/dj_icon.png"></image>
-                                                <view class="card_name">{{g_filter.get_card_price(item,card_list,1)}}</view>
-                                              </view>
-                                            </view>
-                                          </view>
-                      	
-                      	<view class="fs22 t-r" style="color:#999;">
-                      		<span>评论{{item.comment_count}}</span>
-                      		<span class="pdl30">已售{{item.sales_sum}}</span>
-                      	</view>
-                      	
-                      	
-                                        </block>
-                                        <block wx:else>
-                      										<view class="flex ai-center">
-                      											<view class="price rmb">{{item.shop_price}}</view>
-<!--                      											<view class="word-line xc-ash rmb fs24 mgl10">{{item.market_price}}</view>-->
-                      										</view>
-                                          <!-- <view class="price">￥{{item.shop_price}}</view> -->
-                                          <view class="comment">
-                                            <!-- <view class="word-line xc-ash">￥{{item.market_price}}</view> -->
-                                            <view class="fs22 pdt10 t-r">
-                      												<span>评论{{item.comment_count}}</span>
-                      												<span class="pdl30">已售{{item.sales_sum}}</span>
-                      											</view>
-                                          </view>
-                                        </block>
-                                      </block>
-                                    </block>
-                                    <block wx:else>
-                      								<view class="flex ai-center">
-                      									<view class="price rmb">{{item.shop_price}}</view>
-<!--                      									<view class="word-line xc-ash rmb fs24 mgl10">{{item.market_price}}</view>-->
-                      								</view>
-                                      <!-- <view class="price">￥{{item.shop_price}}</view> -->
-                                      <view class="comment">
-                                        <!-- <view class="word-line xc-ash">￥{{item.market_price}}</view> -->
-                                        <view class="fs22 pdt10 t-r">
-                      										<span>评论{{item.comment_count}}</span>
-                      										<span class="pdl30">已售{{item.sales_sum}}</span>
-                      									</view>
-                                      </view>
-                                    </block>
-                                  </block>
+                              <view class="comment flex jc_sb">
+                                <!--                                            <view class="word-line xc-ash rmb fs24">{{item.market_price}}</view>-->
+                                <view class="fs22 pdt10 t-r">
+                                  <span>评论{{item.comment_count}}</span>
+                                  <span class="pdl30">已售{{item.sales_sum}}</span>
                                 </view>
-                            </navigator>
-					  <!-- 暂无更多 -->
-					  <view style="height: 30rpx;line-height: 30rpx;margin-top: 20rpx;font-size: 25rpx; text-align: center;" 
-					        wx:if="{{is_no_more}}">暂无更多</view>					  
-                    </view>
-                    <view class="no-data" wx:if="{{msgStatus == true}}">
-                      <!-- <image class="cart-image" src="{{iurl}}/miniapp/images/cart-null.png"></image> -->
+                              </view>
+                            </block>
+                            <block wx:else>
+                              <view class="flex ai-center">
+                                <view class="price rmb">{{item.shop_price}}</view>
+                                <!--                      											<view class="word-line xc-ash rmb fs24 mgl10">{{item.market_price}}</view>-->
+                              </view>
+
+                              <view class="comment">
+                                <view class="fs22 pdt10 t-r">
+                                  <span>评论{{item.comment_count}}</span>
+                                  <span class="pdl30">已售{{item.sales_sum}}</span>
+                                </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 rmb">{{item.shop_price}}</view>
+                                <!--                                            <view class="word-line xc-ash mk_price rmb fs24 mgl10">{{item.market_price}}</view>-->
+                              </view>
+                              <view class="comment">
+                                <view class="flex ai-center">
+                                  <view class="rmb">{{g_filter.get_card_price(item,card_list,0)}}</view>
+                                  <view class="card_bg ellipsis-1">
+                                    <image src="{{url}}/miniapp/images/plus/dj_icon.png"></image>
+                                    <view class="card_name">{{g_filter.get_card_price(item,card_list,1)}}</view>
+                                  </view>
+                                </view>
+                              </view>
+
+                              <view class="fs22 t-r" style="color:#999;">
+                                <span>评论{{item.comment_count}}</span>
+                                <span class="pdl30">已售{{item.sales_sum}}</span>
+                              </view>
+
  
-                      <view wx:if="{{msgStatus == true && lastMsg == false}}" class="no-data-title" style="text-align:center;margin-top:100px">
-                      <view style="color:#444;line-height:30px;">该类别暂无推荐商品</view><view style="color:#444;line-height:30px;"> {{countDownNum}} 秒后自动跳到下一个类别</view> </view>
-                      <view wx:elif="{{lastMsg == true && msgStatus == true}}" class="no-data-title" style="text-align:center;margin-top:100px">该类别暂无推荐商品</view>
-                      <!-- <navigator class="lookat"  url="/pages/index/index/index"> 去逛逛 </navigator> -->					  					 
+                            </block>
+                            <block wx:else>
+                              <view class="flex ai-center">
+                                <view class="price rmb">{{item.shop_price}}</view>
+                                <!--                      											<view class="word-line xc-ash rmb fs24 mgl10">{{item.market_price}}</view>-->
+                              </view>
+                              <!-- <view class="price">￥{{item.shop_price}}</view> -->
+                              <view class="comment">
+                                <!-- <view class="word-line xc-ash">￥{{item.market_price}}</view> -->
+                                <view class="fs22 pdt10 t-r">
+                                  <span>评论{{item.comment_count}}</span>
+                                  <span class="pdl30">已售{{item.sales_sum}}</span>
+                                </view>
+                              </view>
+                            </block>
+                          </block>
+                        </block>
+                        <block wx:else>
+                          <view class="flex ai-center">
+                            <view class="price rmb">{{item.shop_price}}</view>
+                            <!--                      									<view class="word-line xc-ash rmb fs24 mgl10">{{item.market_price}}</view>-->
+                          </view>
+                          <!-- <view class="price">￥{{item.shop_price}}</view> -->
+                          <view class="comment">
+                            <!-- <view class="word-line xc-ash">￥{{item.market_price}}</view> -->
+                            <view class="fs22 pdt10 t-r">
+                              <span>评论{{item.comment_count}}</span>
+                              <span class="pdl30">已售{{item.sales_sum}}</span>
+                            </view>
+                          </view>
+                        </block>
+                      </block>
                     </view>
-					
-                    
-                </scroll-view>
-                <!-- /goodslist -->
-              </view>
-              <!-- 商品列表结束 -->
-              
+                  </navigator>
+                  <!-- 暂无更多 -->
+                  <view style="height: 30rpx;line-height: 30rpx;margin-top: 20rpx;font-size: 25rpx; text-align: center;" wx:if="{{is_no_more}}">暂无更多</view>
+                  <view id="sview" style="height: 420rpx;width: 100%;text-align: center;font-size: 18rpx;" wx:if="{{nextShow}}">
+                    <text >上滑查看下一个分类</text>
+                  </view>
+                </view>
+                <view class="no-data" wx:if="{{msgStatus == true}}">
+                  <!-- <image class="cart-image" src="{{iurl}}/miniapp/images/cart-null.png"></image> -->
+
+                  <view wx:if="{{msgStatus == true && lastMsg == false}}" class="no-data-title" style="text-align:center;margin-top:100px">
+                    <view style="color:#444;line-height:30px;">该类别暂无推荐商品</view>
+                    <view style="color:#444;line-height:30px;"> {{countDownNum}} 秒后自动跳到下一个类别</view>
+                  </view>
+                  <view wx:elif="{{lastMsg == true && msgStatus == true}}" class="no-data-title" style="text-align:center;margin-top:100px">该类别暂无推荐商品</view>
+                  <!-- <navigator class="lookat"  url="/pages/index/index/index"> 去逛逛 </navigator> -->
+                </view>
+
+
+              </scroll-view>
+              <!-- /goodslist -->
+            </view>
+            <!-- 商品列表结束 -->
+
           </block>
         </block>
-        </view>
-           </view>
-    </block>
-    <block wx:elif="{{is_do}}">
-        <view class="no-data" >
-            <image class="cart-image" src="{{iurl}}/miniapp/images/cart-null.png"></image>
-            <view class="no-data-title">商家暂未设置分类</view>
-            <navigator class="lookat"  url="/pages/index/index/index">去逛逛</navigator>
-        </view>
-    </block>
-</block>
+      </view>
+    </view>
+  </block>
+  <block wx:elif="{{is_do}}">
+    <view class="no-data">
+      <image class="cart-image" src="{{iurl}}/miniapp/images/cart-null.png"></image>
+      <view class="no-data-title">商家暂未设置分类</view>
+      <navigator class="lookat" url="/pages/index/index/index">去逛逛</navigator>
+    </view>
+  </block>
+</block>
 \ No newline at end of file
@@ -59,6 +59,12 @@
 		style="background-color:#{{btn_color ? btn_color:'fbda0e'}};color:{{font_color?('#'+font_color):'white'}};">
 	    好友拆一拆
 	  </view>
+    <!-- 任务超时失效 -->
+    <!-- <view wx:if="{{is_user_task!=null&&is_user_task.status==0}}">
+      <text>距离失效</text>
+      <view><text>15</text>:<text>45</text>:<text>10</text></view>
+    </view> -->
+
 	  <view wx:if="{{is_user_task!=null&&is_user_task.status==1}}" class="task_clike fs40 t-c flex-center" data-libaoid="{{is_user_task.helpListGiftBagId}}"data-taskingid="{{is_user_task.id}}" bindtap="redeem_now"
 		style="background-color:#{{btn_color ? btn_color:'fbda0e'}};color:{{font_color?('#'+font_color):'white'}};">
 	   立即兑换