diff --git a/pages/goods/categoryList/categoryList.js b/pages/goods/categoryList/categoryList.js index 4e464eb..844176f 100644 --- a/pages/goods/categoryList/categoryList.js +++ b/pages/goods/categoryList/categoryList.js @@ -173,7 +173,7 @@ Page({ if (0 != this.data.cat_id) { url += "&cat_id=" + this.data.cat_id; } - + // this.requestGoodsList(url); getApp().getConfig2(function (rs) { //计算等级价相关 @@ -202,9 +202,9 @@ Page({ //调用底部导航 //t.editTabBar(that,getApp().globalData.setting.stoid,getApp().globalData.url); //this.requestFirstCategoris(); - setTimeout(function () { + // setTimeout(function () { //if (getApp().globalData.user_id) getApp().requestCardNum(that); - }, 500) + // }, 500) if (this.data.load) return false; @@ -228,11 +228,17 @@ Page({ 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 }); - + //请求自定义分类数据 + // that.requestFirstCategoris_diy() //---有勾品类--- if (that.data.is_show_pl) { - that.requestFirstCategoris(); + if (is_newsgoodstype==1) { //如果是风格2，则请求自定义分类 + that.requestFirstCategoris_diy(); + }else{ + 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) { @@ -300,17 +306,159 @@ Page({ }, + + //---------------自定义分类请求接口,数据进行拼装------------------ + requestFirstCategoris_diy: function () { + var t = this; + let that=this; + e.get("/api/weshop/customizeCategory/page", { + data: { store_id: oo.stoid, pageSize: 6600, is_show: 1 }, + success: function (e) { + + if (e.data.code !=0) { + that.requestFirstCategoris(); + return + } + 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(),diy_class:1 } //增加一个diy_class 标识表示为自定义分类 + 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; + } + } + 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) { + //判断数组的长度看看有没有2级菜单 + var item = { items: need_to_insert, array: new Array(),diy_class:1 } //增加一个diy_class 标识表示为自定义分类 + 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(),diy_class:1 }; + 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; + } + } + } + } + } + } + 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 (that.data.is_show_pl) { + that.requestFirstCategoris(); + // } + 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; + + console.log("11111", item); + console.log(arr.length); + + 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) + + 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 ,cat_id:cid}); + + if (this.data.is_level_three != 1) { + t.setData({ index: 0, classify_name: name, goodslist: arr }); + // t.setData({ index: 0, classify_name: name }); + } else { + // t.setData({ index: 0}); + t.setData({ index: 0, goodslist: arr }); + } + } + + if (t.data.is_used_share == 2){ + t.style(t.data.stylePage, cid) + } + + } + + } + } + }); + }, + //---------------分类请求接口,数据进行拼装------------------ requestFirstCategoris: function () { + var t = this; e.get("/api/weshop/goodscategory/page", { data: { store_id: oo.stoid, pageSize: 6600, is_show: 1 }, success: function (e) { + if (e.data.code !=0) { + return + } 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++) { @@ -377,46 +525,53 @@ Page({ 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; - - console.log("11111", item); - console.log(arr.length); - - 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) - - 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; } + if (t.data.one_level_classify.length>0) { + let one_level_classify = t.data.one_level_classify; + one_level_classify.push(...arr) + t.setData({ one_level_classify: one_level_classify }); + }else{ + 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; + + console.log("11111", item); + console.log(arr.length); + + 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) + + 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 ,cat_id: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.setData({ is_level_three: is_lev_thr ,cat_id:cid}); + if (t.data.is_used_share == 2){ - 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) } + } - - t.style(t.data.stylePage, cid) - } - } } }); @@ -914,6 +1069,7 @@ Page({ requestGoodsList: function (t) { var that = this; that.data.requestUrl = t; + console.error(666666); e.get("/api/weshop/goods/page?1=1", { data: { page: that.data.stylePage, cat_id: that.data.cat_id, parent_id: 0, orderField: 'sort', orderType: 'asc', is_mainshow: 1, isonsale: 1, store_id: oo.stoid, is_recommend: 1 }, success: function (data) { diff --git a/pages/goods/categoryList/categoryList.wxml b/pages/goods/categoryList/categoryList.wxml index f6fb886..954d239 100644 --- a/pages/goods/categoryList/categoryList.wxml +++ b/pages/goods/categoryList/categoryList.wxml @@ -306,9 +306,9 @@ - + {{classify_name}} - + 更多 @@ -340,10 +340,10 @@ - + {{goods.items.name}} - + 更多 @@ -351,7 +351,7 @@ - + {{item.name}} @@ -365,7 +365,7 @@ - + {{item.items.name}}