diff --git a/components/diy_goodsGroup/diy_goodsGroup.js b/components/diy_goodsGroup/diy_goodsGroup.js index e34e511..8d10972 100644 --- a/components/diy_goodsGroup/diy_goodsGroup.js +++ b/components/diy_goodsGroup/diy_goodsGroup.js @@ -443,7 +443,9 @@ Component({ item.cardprice1 = val.cardprice1; item.cardprice2 = val.cardprice2; item.cardprice3 = val.cardprice3; - + item.prom_type = val.prom_type; + item.prom_id = val.prom_id; + if(val.prom_price) item.prom_price = val.prom_price; if(val.prom_integral) item.prom_integral = val.prom_integral; diff --git a/components/diy_goodsGroup/diy_goodsGroup.wxml b/components/diy_goodsGroup/diy_goodsGroup.wxml index 2c0e9bc..849c7a7 100644 --- a/components/diy_goodsGroup/diy_goodsGroup.wxml +++ b/components/diy_goodsGroup/diy_goodsGroup.wxml @@ -15,7 +15,7 @@ - + @@ -169,7 +169,7 @@ - + @@ -328,7 +328,7 @@ - + @@ -485,7 +485,7 @@ - + @@ -662,7 +662,7 @@ - + diff --git a/components/diy_seckill/diy_seckill.js b/components/diy_seckill/diy_seckill.js index 49cea03..0559c57 100644 --- a/components/diy_seckill/diy_seckill.js +++ b/components/diy_seckill/diy_seckill.js @@ -81,7 +81,7 @@ Component({ //--调用接口,读取秒杀-- app.request.promiseGet("/api/ms/flash_sale/getGoodsList?store_id=" - + os.stoid + "&goodsidlist=" + goodsidlist+"&user_id"+user_id, {}).then(res => { + + os.stoid + "&goodsidlist=" + goodsidlist+"&user_id="+user_id, {}).then(res => { console.log(res); //如果秒杀的数组为空的时候 var goodslist = res.data.data; diff --git a/components/goods_list/goods_list.js b/components/goods_list/goods_list.js index cb4fb85..8b1ccfc 100644 --- a/components/goods_list/goods_list.js +++ b/components/goods_list/goods_list.js @@ -26,6 +26,12 @@ Component({ //要处理一下，游客登录后的界面的变化,主要还该是改变会员 show: function () { this.init(); + if(getApp().globalData.login_back==1){ + getApp().globalData.login_back==0; + this.data.curPage=1; + this.setData({ recommend: [] }); + this.get_list(); + } } }, @@ -98,6 +104,9 @@ Component({ get_list: function () { var that = this; if (that.data.is_no_more == 0) return false; + var user_id=getApp().globalData.user_id; + if(!user_id) user_id=0; + var curPage = that.data.curPage; getApp().request.get('/api/weshop/goods/page?page', { isShowLoading: false, @@ -111,6 +120,7 @@ Component({ pageSize: 6, orderField: "sort", orderType: 'asc', + user_id: user_id, }, success: function (res) { var data = res.data; @@ -124,6 +134,13 @@ Component({ } //加载完成 if (data.data.pageData) { + + for(let i in data.data.pageData){ + let item=data.data.pageData[i]; + if(item.user_price) + item.prom_price=item.user_price; + } + that.setData({ load_complete: 1 }); diff --git a/packageA/pages/goodsInfo/goodsInfo.js b/packageA/pages/goodsInfo/goodsInfo.js index 57eb50d..0fcc18b 100644 --- a/packageA/pages/goodsInfo/goodsInfo.js +++ b/packageA/pages/goodsInfo/goodsInfo.js @@ -958,44 +958,54 @@ Page({ getApp().request.get("/api/weshop/storagecategory/page", { data: { store_id: o.stoid, - is_show: 1, pageSize: 1000, orderField:"sort", orderType:'asc', }, success: function(ee) { if (ee.data.code == 0) { - - if (ee.data.data && ee.data.data.pageData && ee.data.data.pageData.length > 0) { - var def_arr = new Array(); - var ishas = 0; - //-- 开始就看5个门店 -- - for (var k = 0; k < 5; k++) { - if (k == e.data.data.pageData.length) break; - def_arr.push(e.data.data.pageData[k]); + + var check_all_cate=0; + if (ee.data.data && ee.data.data.pageData && ee.data.data.pageData.length > 0){ + for(let i in ee.data.data.pageData){ + let item=ee.data.data.pageData[i]; + if(item.is_show==1){ + check_all_cate=1;break + } + } } + + if (check_all_cate) { + - th.setData({ - def_pickpu_list: def_arr, - pickpu_list: ee.data.data.pageData - }); var sto_cate = ee.data.data.pageData; var sto_arr = e.data.data.pageData; var newarr = new Array(); var qita = new Array(); + var is_del_pk=0; + //----要进行门店分组-------- for (var i = 0; i < sto_arr.length; i++) { //找一下这个门店有没有在分类数组内 var find2 = 0, find2name = "",sort=0; + is_del_pk=0; for (var m = 0; m < sto_cate.length; m++) { - if (sto_arr[i].category_id == sto_cate[m].cat_id) { - find2 = sto_cate[m].cat_id; - find2name = sto_cate[m].cat_name; - sort = sto_cate[m].sort; - break; - } + if (sto_arr[i].category_id == sto_cate[m].cat_id) { + if (sto_cate[m].is_show != 1) { + is_del_pk = 1; + sto_arr.splice(i, 1); + i--; + } else { + find2 = sto_cate[m].cat_id; + find2name = sto_cate[m].cat_name; + sort = sto_cate[m].sort; + is_del_pk = 0; + } + break; + } } + if(is_del_pk) continue; if (newarr.length > 0) { var find = 0; @@ -1039,6 +1049,18 @@ Page({ } } } + + var def_arr = new Array(); + //-- 开始就看10个门店 -- + for (var k = 0; k < 10; k++) { + if (k == sto_arr.length) break; + def_arr.push(sto_arr[k]); + } + + th.setData({ + def_pickpu_list: def_arr, + pickpu_list: ee.data.data.pageData + }); //门店分类要排序下 function compare(property){ @@ -1060,11 +1082,16 @@ Page({ }; newarr.push(item); } - - th.setData({ - is_show_sto_cat: 1, - all_sto: newarr - }); + + var sd={ + all_sto: newarr, + is_show_sto_cat:1 + } + if(!sto_arr || sto_arr.length<=10){ + sd.is_show_sto_cat=-1; + sd.only_pk=sto_arr; + } + th.setData(sd); } else { th.setData({ diff --git a/packageA/pages/goodsInfo/goodsInfo.wxml b/packageA/pages/goodsInfo/goodsInfo.wxml index cf27336..9b55593 100644 --- a/packageA/pages/goodsInfo/goodsInfo.wxml +++ b/packageA/pages/goodsInfo/goodsInfo.wxml @@ -340,9 +340,9 @@ - - {{choice_sort_store==0?'更多门店':'返回'}} - + + {{choice_sort_store==0?'更多门店':'返回'}} + diff --git a/packageA/pages/profile/profile.js b/packageA/pages/profile/profile.js index 2524de5..19609b7 100644 --- a/packageA/pages/profile/profile.js +++ b/packageA/pages/profile/profile.js @@ -284,43 +284,53 @@ Page({ if (e.data.data.total > 10 && ishas_cate) { i.get("/api/weshop/storagecategory/page", { data: { - store_id: r.stoid, - is_show: 1, - pageSize: 300 + store_id: r.stoid, + pageSize: 1000, + orderField:"sort", + orderType:'asc', }, success: function(ee) { if (ee.data.code == 0) { - if (ee.data.data.pageData.length > 0) { - var def_arr = new Array(); - var ishas = 0; - //-- 开始就看5个门店 -- - for (var k = 0; k < 5; k++) { - if (k == e.data.data.pageData.length) break; - def_arr.push(e.data.data.pageData[k]); - } - - th.setData({ - def_pickpu_list: def_arr, - pickpu_list: ee.data.data.pageData - }); + + var check_all_cate=0; + if (ee.data.data && ee.data.data.pageData && ee.data.data.pageData.length > 0){ + for(let i in ee.data.data.pageData){ + let item=ee.data.data.pageData[i]; + if(item.is_show==1){ + check_all_cate=1;break + } + } + } + + if (check_all_cate) { + var sto_cate = ee.data.data.pageData; var sto_arr = e.data.data.pageData; var newarr = new Array(); var qita = new Array(); - + + var is_del_pk=0; //----要进行门店分组-------- for (var i = 0; i < sto_arr.length; i++) { //找一下这个门店有没有在分类数组内 - var find2 = 0, - find2name = ""; + var find2 = 0,find2name = "",sort=0; + is_del_pk=0; for (var m = 0; m < sto_cate.length; m++) { if (sto_arr[i].category_id == sto_cate[m].cat_id) { - find2 = sto_cate[m].cat_id; - find2name = sto_cate[m].cat_name; + if(sto_cate[m].is_show!=1){ + is_del_pk=1; sto_arr.splice(i,1); + i--; + }else { + find2 = sto_cate[m].cat_id; + find2name = sto_cate[m].cat_name; + sort = sto_cate[m].sort; + is_del_pk=0; + } break; } } - + if(is_del_pk) continue; + if (newarr.length > 0) { var find = 0; //如果有找到，那门店就在这个分组内，否则，分类就要排在其他 @@ -338,6 +348,7 @@ Page({ var item = { cat_id: find2, name: find2name, + sort:sort, s_arr: arr0 }; newarr.push(item); @@ -353,6 +364,7 @@ Page({ var item = { cat_id: find2, name: find2name, + sort:sort, s_arr: arr0 }; newarr.push(item); @@ -361,6 +373,30 @@ Page({ } } } + + var def_arr = new Array(); + //-- 开始就看10个门店 -- + for (var k = 0; k < 10; k++) { + if (k == e.data.data.pageData.length) break; + def_arr.push(e.data.data.pageData[k]); + } + + th.setData({ + def_pickpu_list: def_arr, + pickpu_list: ee.data.data.pageData + }); + + //门店分类要排序下 + function compare(property){ + return function(a,b){ + var value1 = a[property]; + var value2 = b[property]; + return value1 - value2; + } + } + if(newarr.length>0) + newarr.sort(compare("sort")); + //----安排其他的分类----- if (qita.length > 0) { diff --git a/packageA/pages/profile/profile.wxml b/packageA/pages/profile/profile.wxml index 359f88d..45b7d0a 100644 --- a/packageA/pages/profile/profile.wxml +++ b/packageA/pages/profile/profile.wxml @@ -211,8 +211,8 @@ - - {{choice_sort_store==0?'更多门店':'返回'}} + + {{choice_sort_store==0?'更多门店':'返回'}} diff --git a/packageA/pages/prom_list/prom_list.js b/packageA/pages/prom_list/prom_list.js index f97efbd..e3638ab 100644 --- a/packageA/pages/prom_list/prom_list.js +++ b/packageA/pages/prom_list/prom_list.js @@ -650,8 +650,11 @@ Page({ th.data.def_pick_store.is_no_dis=1; th.setData({def_pick_store:th.data.def_pick_store}); }else{ - th.data.def_pick_store.is_no_dis=0; - th.setData({def_pick_store:th.data.def_pick_store}); + if(th.data.def_pick_store){ + th.data.def_pick_store.is_no_dis=0; + th.setData({def_pick_store:th.data.def_pick_store}); + } + } } } @@ -823,43 +826,51 @@ Page({ getApp().request.get("/api/weshop/storagecategory/page", { data: { store_id: o.stoid, - is_show: 1, pageSize: 1000, orderField:"sort", orderType:'asc', }, success: function(ee) { if (ee.data.code == 0) { - if (ee.data.data && ee.data.data.pageData && ee.data.data.pageData.length > 0) { - var def_arr = new Array(); - var ishas = 0; - //-- 开始就看5个门店 -- - for (var k = 0; k < 5; k++) { - if (k == e.data.data.pageData.length) break; - def_arr.push(e.data.data.pageData[k]); - } - - th.setData({ - def_pickpu_list: def_arr, - pickpu_list: ee.data.data.pageData - }); + + var check_all_cate=0; + if (ee.data.data && ee.data.data.pageData && ee.data.data.pageData.length > 0){ + for(let i in ee.data.data.pageData){ + let item=ee.data.data.pageData[i]; + if(item.is_show==1){ + check_all_cate=1;break + } + } + } + + if (check_all_cate) { + var sto_cate = ee.data.data.pageData; var sto_arr = e.data.data.pageData; var newarr = new Array(); var qita = new Array(); - + + var is_del_pk=0; //----要进行门店分组-------- for (var i = 0; i < sto_arr.length; i++) { //找一下这个门店有没有在分类数组内 var find2 = 0, find2name = "",sort=0; + is_del_pk=0; for (var m = 0; m < sto_cate.length; m++) { - if (sto_arr[i].category_id == sto_cate[m].cat_id) { - find2 = sto_cate[m].cat_id; - find2name = sto_cate[m].cat_name; - sort=sto_cate[m].sort; - break; - } + if (sto_arr[i].category_id == sto_cate[m].cat_id) { + if(sto_cate[m].is_show!=1){ + is_del_pk=1; sto_arr.splice(i,1); + i--; + }else { + find2 = sto_cate[m].cat_id; + find2name = sto_cate[m].cat_name; + sort = sto_cate[m].sort; + is_del_pk=0; + } + break; + } } + if(is_del_pk) continue; if (newarr.length > 0) { var find = 0; @@ -903,8 +914,19 @@ Page({ } } } - - //门店分类要排序下 + + var def_arr = new Array(); + //-- 开始就看10个门店 -- + for (var k = 0; k < 10; k++) { + if (k == sto_arr.length) break; + def_arr.push(sto_arr[k]); + } + th.setData({ + def_pickpu_list: def_arr, + pickpu_list: ee.data.data.pageData + }); + + //门店分类要排序下 function compare(property){ return function(a,b){ var value1 = a[property]; @@ -925,10 +947,17 @@ Page({ }; newarr.push(item); } - th.setData({ - is_show_sto_cat: 1, - all_sto: newarr - }); + + + var sd={ + all_sto: newarr, + is_show_sto_cat:1 + } + if(!sto_arr || sto_arr.length<=10){ + sd.is_show_sto_cat=-1; + sd.only_pk=sto_arr; + } + th.setData(sd); } else { th.setData({ diff --git a/packageA/pages/prom_list/prom_list.wxml b/packageA/pages/prom_list/prom_list.wxml index 09192b3..6687e41 100644 --- a/packageA/pages/prom_list/prom_list.wxml +++ b/packageA/pages/prom_list/prom_list.wxml @@ -214,9 +214,9 @@ - - {{choice_sort_store==0?'更多门店':'返回'}} - + + {{choice_sort_store==0?'更多门店':'返回'}} + diff --git a/packageA/pages/prom_list/prom_list.wxss b/packageA/pages/prom_list/prom_list.wxss index 7bdbf97..4d5aad5 100644 --- a/packageA/pages/prom_list/prom_list.wxss +++ b/packageA/pages/prom_list/prom_list.wxss @@ -175,7 +175,7 @@ margin-right: 10rpx; } .address{ - width: 90%; + width: 99%; margin-top: 25rpx; margin-bottom: 5rpx; } diff --git a/packageB/pages/zuhegou/index/index.js b/packageB/pages/zuhegou/index/index.js index 6caec3f..3f6253e 100644 --- a/packageB/pages/zuhegou/index/index.js +++ b/packageB/pages/zuhegou/index/index.js @@ -441,6 +441,23 @@ Page({ }, /** + * 用户分享朋友圈 + */ + onShareTimeline(){ + var title = this.data.act.name; + var url= "/packageB/pages/zuhegou/index/index?id="+this.data.act.id; + if (getApp().globalData.user_id) { + url += "&first_leader=" + getApp().globalData.user_id; + } + var ob = { + title:title, + path: url, + }; + if(this.data.act.img_url) + ob.imageUrl=this.data.iurl+this.data.act.img_url; + return ob; + }, + /** * 点击规则详情,弹出规则 */ showRule() { @@ -1272,42 +1289,52 @@ Page({ getApp().request.get("/api/weshop/storagecategory/page", { data: { store_id: os.stoid, - is_show: 1, pageSize: 1000, orderField: "sort", orderType: 'asc', }, success: function (ee) { if (ee.data.code == 0) { - if (ee.data.data && ee.data.data.pageData && ee.data.data.pageData.length > 0) { - var def_arr = new Array(); - //-- 开始就看5个门店 -- - for (var k = 0; k < 5; k++) { - if (k == e.data.data.pageData.length) break; - def_arr.push(e.data.data.pageData[k]); + + var check_all_cate=0; + if (ee.data.data && ee.data.data.pageData && ee.data.data.pageData.length > 0){ + for(let i in ee.data.data.pageData){ + let item=ee.data.data.pageData[i]; + if(item.is_show==1){ + check_all_cate=1;break + } } + } + + if (check_all_cate) { - th.setData({ - def_pickpu_list: def_arr, - pickpu_list: ee.data.data.pageData - }); var sto_cate = ee.data.data.pageData; var sto_arr = e.data.data.pageData; var newarr = new Array(); var qita = new Array(); + var is_del_pk=0; //----要进行门店分组-------- for (var i = 0; i < sto_arr.length; i++) { //找一下这个门店有没有在分类数组内 var find2 = 0, find2name = "", sort = 0; + is_del_pk=0; for (var m = 0; m < sto_cate.length; m++) { if (sto_arr[i].category_id == sto_cate[m].cat_id) { - find2 = sto_cate[m].cat_id; - find2name = sto_cate[m].cat_name; - sort = sto_cate[m].sort; + if (sto_cate[m].is_show != 1) { + is_del_pk = 1; + sto_arr.splice(i, 1); + i--; + } else { + find2 = sto_cate[m].cat_id; + find2name = sto_cate[m].cat_name; + sort = sto_cate[m].sort; + is_del_pk = 0; + } break; } } + if(is_del_pk) continue; if (newarr.length > 0) { var find = 0; @@ -1352,6 +1379,18 @@ Page({ } } + var def_arr = new Array(); + //-- 开始就看10个门店 -- + for (var k = 0; k < 10; k++) { + if (k == sto_arr.length) break; + def_arr.push(sto_arr[k]); + } + + th.setData({ + def_pickpu_list: def_arr, + pickpu_list: ee.data.data.pageData + }); + //门店分类要排序下 function compare(property) { return function (a, b) { @@ -1372,10 +1411,17 @@ Page({ }; newarr.push(item); } - th.setData({ - is_show_sto_cat: 1, - all_sto: newarr - }); + + + var sd={ + all_sto: newarr, + is_show_sto_cat:1 + } + if(!sto_arr || sto_arr.length<=10){ + sd.is_show_sto_cat=-1; + sd.only_pk=sto_arr; + } + th.setData(sd); } else { th.setData({ diff --git a/packageB/pages/zuhegou/index/index.wxml b/packageB/pages/zuhegou/index/index.wxml index 3528c56..dc70551 100644 --- a/packageB/pages/zuhegou/index/index.wxml +++ b/packageB/pages/zuhegou/index/index.wxml @@ -167,9 +167,9 @@ - - {{choice_sort_store==0?'更多门店':'返回'}} - + + {{choice_sort_store==0?'更多门店':'返回'}} + diff --git a/packageC/pages/presell/goodsInfo/goodsInfo.js b/packageC/pages/presell/goodsInfo/goodsInfo.js index 8fdfb8f..a6981e8 100644 --- a/packageC/pages/presell/goodsInfo/goodsInfo.js +++ b/packageC/pages/presell/goodsInfo/goodsInfo.js @@ -1877,7 +1877,6 @@ Page({ getApp().request.get("/api/weshop/storagecategory/page", { data: { store_id: o.stoid, - is_show: 1, pageSize: 1000, orderField: "sort", orderType: 'asc', @@ -1885,37 +1884,47 @@ Page({ success: function (ee) { if (ee.data.code == 0) { - if (ee.data.data && ee.data.data.pageData && ee.data.data.pageData.length > 0) { - var def_arr = new Array(); - var ishas = 0; - //-- 开始就看5个门店 -- - for (var k = 0; k < 5; k++) { - if (k == e.data.data.pageData.length) break; - def_arr.push(e.data.data.pageData[k]); + var check_all_cate=0; + if (ee.data.data && ee.data.data.pageData && ee.data.data.pageData.length > 0){ + for(let i in ee.data.data.pageData){ + let item=ee.data.data.pageData[i]; + if(item.is_show==1){ + check_all_cate=1;break + } + } } - th.setData({ - def_pickpu_list: def_arr, - pickpu_list: ee.data.data.pageData - }); + if (check_all_cate) { + var sto_cate = ee.data.data.pageData; var sto_arr = e.data.data.pageData; var newarr = new Array(); var qita = new Array(); + var is_del_pk=0; //----要进行门店分组-------- for (var i = 0; i < sto_arr.length; i++) { //找一下这个门店有没有在分类数组内 var find2 = 0, find2name = "", sort = 0; + is_del_pk=0; for (var m = 0; m < sto_cate.length; m++) { - if (sto_arr[i].category_id == sto_cate[m].cat_id) { - find2 = sto_cate[m].cat_id; - find2name = sto_cate[m].cat_name; - sort = sto_cate[m].sort; - break; - } + if (sto_arr[i].category_id == sto_cate[m].cat_id) { + if (sto_cate[m].is_show != 1) { + is_del_pk = 1; + sto_arr.splice(i, 1); + i--; + } else { + find2 = sto_cate[m].cat_id; + find2name = sto_cate[m].cat_name; + sort = sto_cate[m].sort; + is_del_pk = 0; + } + break; + } } + if(is_del_pk) continue; + if (newarr.length > 0) { var find = 0; //如果有找到，那门店就在这个分组内，否则，分类就要排在其他 @@ -1959,6 +1968,18 @@ Page({ } } + + var def_arr = new Array(); + //-- 开始就看10个门店 -- + for (var k = 0; k < 10; k++) { + if (k == sto_arr.length) break; + def_arr.push(sto_arr[k]); + } + + th.setData({ + def_pickpu_list: def_arr, + pickpu_list: ee.data.data.pageData + }); //门店分类要排序下 function compare(property) { return function (a, b) { @@ -1981,10 +2002,16 @@ Page({ newarr.push(item); } - th.setData({ - is_show_sto_cat: 1, - all_sto: newarr - }); + + var sd={ + all_sto: newarr, + is_show_sto_cat:1 + } + if(!sto_arr || sto_arr.length<=10){ + sd.is_show_sto_cat=-1; + sd.only_pk=sto_arr; + } + th.setData(sd); } else { th.setData({ diff --git a/packageC/pages/presell/goodsInfo/goodsInfo.wxml b/packageC/pages/presell/goodsInfo/goodsInfo.wxml index 9bb3a48..7b80a41 100644 --- a/packageC/pages/presell/goodsInfo/goodsInfo.wxml +++ b/packageC/pages/presell/goodsInfo/goodsInfo.wxml @@ -788,9 +788,9 @@ - - {{choice_sort_store==0?'更多门店':'返回'}} - + + {{choice_sort_store==0?'更多门店':'返回'}} + diff --git a/pages/goods/categoryList/categoryList.js b/pages/goods/categoryList/categoryList.js index 548ef2f..291b636 100644 --- a/pages/goods/categoryList/categoryList.js +++ b/pages/goods/categoryList/categoryList.js @@ -856,9 +856,7 @@ Page({ 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(e.data.data.pageData) - s.setData({ - dataLength: e.data.data.pageData.length, - }); + if (e.data.data.pageData.length > 0) { s.setData({ msgStatus: false,is_no_more:0 @@ -886,6 +884,10 @@ Page({ }) } } + + s.setData({ + dataLength: s.data.requestData.length, + }); } else { //没有数据页面显示暂无数据 @@ -911,9 +913,7 @@ Page({ }); s.style(s.data.stylePage, dataArray[index + 1]['items']['id']) } - - - + }else{ //没有数据而且是第一页的时候 s.setData({ diff --git a/pages/goods/goodsInfo/goodsInfo.js b/pages/goods/goodsInfo/goodsInfo.js index ad88c50..94c7353 100644 --- a/pages/goods/goodsInfo/goodsInfo.js +++ b/pages/goods/goodsInfo/goodsInfo.js @@ -2594,44 +2594,49 @@ Page({ getApp().request.get("/api/weshop/storagecategory/page", { data: { store_id: o.stoid, - is_show: 1, pageSize: 1000, orderField: "sort", orderType: 'asc', }, success: function (ee) { if (ee.data.code == 0) { - - if (ee.data.data && ee.data.data.pageData && ee.data.data.pageData.length > 0) { - var def_arr = new Array(); - var ishas = 0; - //-- 开始就看5个门店 -- - for (var k = 0; k < 10; k++) { - if (k == e.data.data.pageData.length) break; - def_arr.push(e.data.data.pageData[k]); - } - - th.setData({ - def_pickpu_list: def_arr, - pickpu_list: ee.data.data.pageData - }); + var check_all_cate=0; + if (ee.data.data && ee.data.data.pageData && ee.data.data.pageData.length > 0){ + for(let i in ee.data.data.pageData){ + let item=ee.data.data.pageData[i]; + if(item.is_show==1){ + check_all_cate=1;break + } + } + } + if (check_all_cate) { var sto_cate = ee.data.data.pageData; var sto_arr = e.data.data.pageData; var newarr = new Array(); var qita = new Array(); + + var is_del_pk=0; //----要进行门店分组-------- for (var i = 0; i < sto_arr.length; i++) { //找一下这个门店有没有在分类数组内 var find2 = 0, find2name = "", sort = 0; + is_del_pk=0; for (var m = 0; m < sto_cate.length; m++) { if (sto_arr[i].category_id == sto_cate[m].cat_id) { - find2 = sto_cate[m].cat_id; - find2name = sto_cate[m].cat_name; - sort = sto_cate[m].sort; + if(sto_cate[m].is_show!=1){ + is_del_pk=1; sto_arr.splice(i,1); + i--; + }else { + find2 = sto_cate[m].cat_id; + find2name = sto_cate[m].cat_name; + sort = sto_cate[m].sort; + is_del_pk=0; + } break; } } + if(is_del_pk) continue; if (newarr.length > 0) { var find = 0; @@ -2676,6 +2681,19 @@ Page({ } } + var def_arr = new Array(); + //-- 开始就看10个门店 -- + for (var k = 0; k < 10; k++) { + if (k == sto_arr.length) break; + def_arr.push(sto_arr[k]); + } + + th.setData({ + def_pickpu_list: def_arr, + pickpu_list: ee.data.data.pageData + }); + + //门店分类要排序下 function compare(property) { return function (a, b) { @@ -2698,10 +2716,15 @@ Page({ newarr.push(item); } - th.setData({ - is_show_sto_cat: 1, - all_sto: newarr - }); + var sd={ + all_sto: newarr, + is_show_sto_cat:1 + } + if(!sto_arr || sto_arr.length<=10){ + sd.is_show_sto_cat=-1; + sd.only_pk=sto_arr; + } + th.setData(sd); } else { th.setData({ @@ -2710,7 +2733,12 @@ Page({ }); //-----如果没有默认门店，要取第一个门店作为默认店.此时没有门店分类的情况------ if (!th.data.def_pick_store) { - th.setData({ def_pick_store: e.data.data.pageData[0] }) + th.setData({ + def_pick_store: e.data.data.pageData[0], + sto_sele_name: e.data.data.pageData[0].pickup_name, + sto_sele_id: e.data.data.pageData[0].pickup_id, + sto_sele_distr: e.data.data.pageData[0].distr_type + }) } } } else { @@ -2720,7 +2748,12 @@ Page({ }); //-----如果没有默认门店，要取第一个门店作为默认店.此时没有门店分类的情况------ if (!th.data.def_pick_store) { - th.setData({ def_pick_store: e.data.data.pageData[0] }) + th.setData({ + def_pick_store: e.data.data.pageData[0], + sto_sele_name: e.data.data.pageData[0].pickup_name, + sto_sele_id: e.data.data.pageData[0].pickup_id, + sto_sele_distr: e.data.data.pageData[0].distr_type + }) } } @@ -4441,7 +4474,7 @@ Page({ var pri0 = th.data.data.shop_price; if (th.data.prom_act) - pri0 = th.data.prom_act.price; + pri0 = th.data.prom_price; pri0 = parseFloat(pri0).toFixed(2); var wd1 = th.data.screenWidth - ut.measureText(pri0, 31 * unit) - 25; context.fillText("￥", wd1 - 15, 185 * unit); diff --git a/pages/goods/goodsInfo/goodsInfo.wxml b/pages/goods/goodsInfo/goodsInfo.wxml index 3c7a5f3..4fbfc7f 100644 --- a/pages/goods/goodsInfo/goodsInfo.wxml +++ b/pages/goods/goodsInfo/goodsInfo.wxml @@ -188,26 +188,11 @@ - - 还差 - {{prom_act.max_ct_num - item.open_num}} - 人享最低优惠 - + 还差{{prom_act.max_ct_num - item.open_num}}人享最低优惠 您已经享最低优惠 - - 还差 - {{prom_act.ct_num - item.open_num}} - 人成团 - - - 剩余 - {{timer[t_ind].day}}天: - {{timer[t_ind].hou}} - : - {{timer[t_ind].min}} - : - {{timer[t_ind].sec}} + 还差{{prom_act.ct_num - item.open_num}}人成团 + 剩余{{timer[t_ind].day}}天:{{timer[t_ind].hou}}:{{timer[t_ind].min}}:{{timer[t_ind].sec}} @@ -1457,8 +1442,8 @@ - - {{choice_sort_store==0?'更多门店':'返回'}} + + {{choice_sort_store==0?'更多门店':'返回'}} diff --git a/pages/team/team_show/team_show.js b/pages/team/team_show/team_show.js index 1dc7344..9da6870 100644 --- a/pages/team/team_show/team_show.js +++ b/pages/team/team_show/team_show.js @@ -1178,43 +1178,53 @@ Page({ getApp().request.get("/api/weshop/storagecategory/page", { data: { store_id: o.stoid, - is_show: 1, pageSize: 1000, orderField:"sort", orderType:'asc', }, success: function(ee) { if (ee.data.code == 0) { - if (ee.data.data && ee.data.data.pageData && ee.data.data.pageData.length > 0) { - var def_arr = new Array(); - var ishas = 0; - //-- 开始就看5个门店 -- - for (var k = 0; k < 5; k++) { - if (k == e.data.data.pageData.length) break; - def_arr.push(e.data.data.pageData[k]); - } - - th.setData({ - def_pickpu_list: def_arr, - pickpu_list: ee.data.data.pageData - }); + + var check_all_cate=0; + if (ee.data.data && ee.data.data.pageData && ee.data.data.pageData.length > 0){ + for(let i in ee.data.data.pageData){ + let item=ee.data.data.pageData[i]; + if(item.is_show==1){ + check_all_cate=1;break + } + } + } + + + + if (check_all_cate) { + var sto_cate = ee.data.data.pageData; var sto_arr = e.data.data.pageData; var newarr = new Array(); var qita = new Array(); - + + var is_del_pk=0; //----要进行门店分组-------- for (var i = 0; i < sto_arr.length; i++) { //找一下这个门店有没有在分类数组内 var find2 = 0,find2name = "",sort=0; + is_del_pk=0; for (var m = 0; m < sto_cate.length; m++) { if (sto_arr[i].category_id == sto_cate[m].cat_id) { - find2 = sto_cate[m].cat_id; - find2name = sto_cate[m].cat_name; - sort=sto_cate[m].sort; - break; + if(sto_cate[m].is_show!=1){ + is_del_pk=1; sto_arr.splice(i,1); + i--; + }else { + find2 = sto_cate[m].cat_id; + find2name = sto_cate[m].cat_name; + sort = sto_cate[m].sort; + is_del_pk=0; + } + break; } } + if(is_del_pk) continue; if (newarr.length > 0) { var find = 0; @@ -1258,8 +1268,20 @@ Page({ } } } - - //门店分类要排序下 + + var def_arr = new Array(); + //-- 开始就看10个门店 -- + for (var k = 0; k < 10; k++) { + if (k == sto_arr.length) break; + def_arr.push(sto_arr[k]); + } + + th.setData({ + def_pickpu_list: def_arr, + pickpu_list: ee.data.data.pageData + }); + + //门店分类要排序下 function compare(property){ return function(a,b){ var value1 = a[property]; @@ -1280,10 +1302,16 @@ Page({ }; newarr.push(item); } - th.setData({ - is_show_sto_cat: 1, - all_sto: newarr - }); + + var sd={ + all_sto: newarr, + is_show_sto_cat:1 + } + if(!sto_arr || sto_arr.length<=10){ + sd.is_show_sto_cat=-1; + sd.only_pk=sto_arr; + } + th.setData(sd); } else { th.setData({ diff --git a/pages/team/team_show/team_show.wxml b/pages/team/team_show/team_show.wxml index c9e51ce..05e6b00 100644 --- a/pages/team/team_show/team_show.wxml +++ b/pages/team/team_show/team_show.wxml @@ -291,9 +291,9 @@ - - {{choice_sort_store==0?'更多门店':'返回'}} - + + {{choice_sort_store==0?'更多门店':'返回'}} + diff --git a/pages/togoin/togoin.js b/pages/togoin/togoin.js index 56c47b6..77c8f4c 100644 --- a/pages/togoin/togoin.js +++ b/pages/togoin/togoin.js @@ -105,7 +105,8 @@ Page({ wx.setStorageSync("userinfo",e.data.data); setTimeout(function () { - wx.navigateBack({ delta: 1}) //返回上一页 + getApp().globalData.login_back=1; + wx.navigateBack({ delta: 1}) //返回上一页 },1000) }else{ getApp().globalData.sessionKey=e.data.data.sessionKey; @@ -200,7 +201,9 @@ Page({ var need_go=0; var t_user=e.data.data; - + + + getApp().globalData.login_back=1; wx.setStorageSync("userinfo",e.data.data); wx.setStorageSync("isAuth", !0), app.globalData.userInfo = e.data.data, app.globalData.userInfo.head_pic = t.getFullUrl(a.globalData.userInfo.head_pic); @@ -272,7 +275,8 @@ Page({ wx.setStorageSync("userinfo",e.data.data); setTimeout(function () { - wx.navigateBack({ delta: 1}) //返回上一页 + getApp().globalData.login_back=1; + wx.navigateBack({ delta: 1}) //返回上一页 },1000) }else{ getApp().globalData.sessionKey=e.data.data.sessionKey; diff --git a/pages/user/order_detail/order_detail.js b/pages/user/order_detail/order_detail.js index 277b338..65902ab 100644 --- a/pages/user/order_detail/order_detail.js +++ b/pages/user/order_detail/order_detail.js @@ -654,23 +654,13 @@ Page({ th.toast(content); return false; } - }else{ - var redis_num = 0; - //------判断活动是否抢光----- - await getApp().request.promiseGet("/api/weshop/activitylist/getActLen/" + - os.stoid + "/" + goodsinfo.prom_type + "/" + goodsinfo.prom_id, { - }).then(res => { - redis_num = res.data.data; - }); - - if (good.goods_num > redis_num) { - - var content=gg.goods_name+'超出商品活动库存,请取消订单'; - th.toast(content); - return false; - } - } - + }else if(goodsinfo.prom_type == 1 || goodsinfo.prom_type == 2 || goodsinfo.prom_type == 6 ) { + if(order.add_time+5*60 { - redis_num = res.data.data; - }); - - if (good.goods_num > redis_num) { - - var content = gg.goods_name + '超出商品活动库存,请取消订单'; + } else if(goodsinfo.prom_type == 1 || goodsinfo.prom_type == 2 || goodsinfo.prom_type == 6 ) { + if(order.add_time+5*60 5) { + if (e.data.data.total > 10) { i.get("/api/weshop/storagecategory/page", { data: { - store_id: r.stoid, - is_show: 1, - pageSize: 300 + store_id: r.stoid, + pageSize: 1000, + orderField:"sort", + orderType:'asc', }, success: function(ee) { if (ee.data.code == 0) { - if (ee.data.data.pageData.length > 0) { - var def_arr = new Array(); - var ishas = 0; - //-- 开始就看5个门店 -- - for (var k = 0; k < 5; k++) { - if (k == e.data.data.pageData.length) break; - def_arr.push(e.data.data.pageData[k]); - } - - th.setData({ - def_pickpu_list: def_arr, - pickpu_list: ee.data.data.pageData - }); + + var check_all_cate=0; + if (ee.data.data && ee.data.data.pageData && ee.data.data.pageData.length > 0){ + for(let i in ee.data.data.pageData){ + let item=ee.data.data.pageData[i]; + if(item.is_show==1){ + check_all_cate=1;break + } + } + } + + + if (check_all_cate) { + var sto_cate = ee.data.data.pageData; var sto_arr = e.data.data.pageData; var newarr = new Array(); var qita = new Array(); - + + var is_del_pk=0; //----要进行门店分组-------- for (var i = 0; i < sto_arr.length; i++) { //找一下这个门店有没有在分类数组内 - var find2 = 0, - find2name = ""; + var find2 = 0, find2name = "",sort=0; + is_del_pk=0; for (var m = 0; m < sto_cate.length; m++) { if (sto_arr[i].category_id == sto_cate[m].cat_id) { - find2 = sto_cate[m].cat_id; - find2name = sto_cate[m].cat_name; + if(sto_cate[m].is_show!=1){ + is_del_pk=1; sto_arr.splice(i,1); + i--; + }else { + find2 = sto_cate[m].cat_id; + find2name = sto_cate[m].cat_name; + sort = sto_cate[m].sort; + is_del_pk=0; + } break; } } - + + if(is_del_pk) continue; if (newarr.length > 0) { var find = 0; //如果有找到，那门店就在这个分组内，否则，分类就要排在其他 @@ -374,6 +385,7 @@ Page({ var item = { cat_id: find2, name: find2name, + sort:sort, s_arr: arr0 }; newarr.push(item); @@ -389,6 +401,7 @@ Page({ var item = { cat_id: find2, name: find2name, + sort:sort, s_arr: arr0 }; newarr.push(item); @@ -397,6 +410,29 @@ Page({ } } } + + var def_arr = new Array(); + //-- 开始就看10个门店 -- + for (var k = 0; k < 10; k++) { + if (k == e.data.data.pageData.length) break; + def_arr.push(e.data.data.pageData[k]); + } + + th.setData({ + def_pickpu_list: def_arr, + pickpu_list: ee.data.data.pageData + }); + + //门店分类要排序下 + function compare(property){ + return function(a,b){ + var value1 = a[property]; + var value2 = b[property]; + return value1 - value2; + } + } + if(newarr.length>0) + newarr.sort(compare("sort")); //----安排其他的分类----- if (qita.length > 0) { diff --git a/pages/user/userinfo/userinfo.wxml b/pages/user/userinfo/userinfo.wxml index 456c8dd..b26b2f6 100644 --- a/pages/user/userinfo/userinfo.wxml +++ b/pages/user/userinfo/userinfo.wxml @@ -287,8 +287,8 @@ - - {{choice_sort_store==0?'更多门店':'返回'}} + + {{choice_sort_store==0?'更多门店':'返回'}}