From a78d19acd35936d2f6c6f9fce65bb7947a08682f Mon Sep 17 00:00:00 2001 From: yvan.ni Date: Thu, 29 Feb 2024 10:03:22 +0800 Subject: [PATCH] 122297 这一单 --- packageA/pages/goodsInfo/goodsInfo.js | 278 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------------------------------------------------------------------------------------------------------------------------------------- packageA/pages/serviceCard_pd/goodsInfo/goodsInfo.js | 12 +++++++++++- packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js | 16 +++++++++++++--- packageC/pages/presell/cardInfo/goodsInfo.js | 15 +++++++++++++-- packageC/pages/presell/goodsInfo/goodsInfo.js | 22 +++++++++++++++++++--- pages/goods/goodsInfo/goodsInfo.js | 26 ++++++++++++++++++++++++-- 6 files changed, 224 insertions(+), 145 deletions(-) diff --git a/packageA/pages/goodsInfo/goodsInfo.js b/packageA/pages/goodsInfo/goodsInfo.js index 10d2a0b..cf04126 100644 --- a/packageA/pages/goodsInfo/goodsInfo.js +++ b/packageA/pages/goodsInfo/goodsInfo.js @@ -1386,6 +1386,9 @@ Page({ }, openSpecModel: function(t) { + + if(this.data.get_sto_ing) return false; + var th=this; var open_store = t.currentTarget.dataset.ind; if(getApp().is_sp_hao() && open_store==1){ wx.showToast({ @@ -1657,6 +1660,8 @@ Page({ }) } + this.data.get_sto_ing=1; + var timer_get = setInterval(function() { if (th.data.is_get_local_ok == 0) return false; if (!th.data.fir_def_store) return false; @@ -1772,6 +1777,7 @@ Page({ th.deal_pickup(e); } else{ + th.data.get_sto_ing=0; th.setData({ isshow:1 }) @@ -1901,160 +1907,162 @@ Page({ orderType:'asc', }, success: function(ee) { - if (ee.data.code == 0) { - - 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 (ee.data.code == 0) { + + 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) { - 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; + + 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) { + 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; } - break; } - } - if(is_del_pk) continue; - - if (newarr.length > 0) { - var find = 0; - //如果有找到，那门店就在这个分组内，否则，分类就要排在其他 - if (find2 != 0) { - for (var ii = 0; ii < newarr.length; ii++) { - if (sto_arr[i].category_id == newarr[ii].cat_id) { - newarr[ii].s_arr.push(sto_arr[i]); - find = 1; - break; + if(is_del_pk) continue; + + if (newarr.length > 0) { + var find = 0; + //如果有找到，那门店就在这个分组内，否则，分类就要排在其他 + if (find2 != 0) { + for (var ii = 0; ii < newarr.length; ii++) { + if (sto_arr[i].category_id == newarr[ii].cat_id) { + newarr[ii].s_arr.push(sto_arr[i]); + find = 1; + break; + } + } + if (find == 0) { + var arr0 = new Array(); + arr0.push(sto_arr[i]); + var item = { + cat_id: find2, + name: find2name, + sort:sort, + s_arr: arr0 + }; + newarr.push(item); + } + } else { + qita.push(sto_arr[i]); + } + } else { + //如果有找到，那门店就在这个分组内，否则，分类就要排在其他 + if (find2 != 0) { + var arr0 = new Array(); + arr0.push(sto_arr[i]); + var item = { + cat_id: find2, + name: find2name, + sort:sort, + s_arr: arr0 + }; + newarr.push(item); + } else { + qita.push(sto_arr[i]); } } - if (find == 0) { - var arr0 = new Array(); - arr0.push(sto_arr[i]); - var item = { - cat_id: find2, - name: find2name, - sort:sort, - s_arr: arr0 - }; - newarr.push(item); + } + + 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]); } - } else { - qita.push(sto_arr[i]); + + 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; + } } - } else { - //如果有找到，那门店就在这个分组内，否则，分类就要排在其他 - if (find2 != 0) { - var arr0 = new Array(); - arr0.push(sto_arr[i]); + if(newarr.length>0) + newarr.sort(compare("sort")); + + //----安排其他的分类----- + if (qita.length > 0) { var item = { - cat_id: find2, - name: find2name, - sort:sort, - s_arr: arr0 + cat_id: -1, + name: "其他", + s_arr: qita }; newarr.push(item); - } else { - qita.push(sto_arr[i]); } - } - } - 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]); - } + 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({ + is_show_sto_cat: -1, + only_pk: e.data.data.pageData + }); + //-----如果没有默认门店，要取第一个门店作为默认店.此时没有门店分类的情况------ + if (!th.data.def_pick_store) { + th.setData({def_pick_store:e.data.data.pageData[0]}) + } + } + } else { th.setData({ - def_pickpu_list: def_arr, - pickpu_list: ee.data.data.pageData + is_show_sto_cat: -1, + only_pk: e.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) { - var item = { - cat_id: -1, - name: "其他", - s_arr: qita - }; - newarr.push(item); - } - - 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; + //-----如果没有默认门店，要取第一个门店作为默认店.此时没有门店分类的情况------ + if (!th.data.def_pick_store) { + th.setData({def_pick_store:e.data.data.pageData[0]}) } - th.setData(sd); - - } else { - th.setData({ - is_show_sto_cat: -1, - only_pk: e.data.data.pageData - }); - //-----如果没有默认门店，要取第一个门店作为默认店.此时没有门店分类的情况------ - if (!th.data.def_pick_store) { - th.setData({def_pick_store:e.data.data.pageData[0]}) } - } - } else { - th.setData({ - is_show_sto_cat: -1, - only_pk: e.data.data.pageData - }); - //-----如果没有默认门店，要取第一个门店作为默认店.此时没有门店分类的情况------ - if (!th.data.def_pick_store) { - th.setData({def_pick_store:e.data.data.pageData[0]}) - } - - } + th.data.get_sto_ing=0; } }); - } else { + } else { + th.data.get_sto_ing=0; + th.setData({ is_show_sto_cat: 0, only_pk: e.data.data.pageData @@ -3957,6 +3965,8 @@ Page({ openSpecModel_Nor: function () { var th=this; + if(th.data.get_sto_ing) return false; + // 是否授权登陆 var user_info = getApp().globalData.userInfo; if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) { diff --git a/packageA/pages/serviceCard_pd/goodsInfo/goodsInfo.js b/packageA/pages/serviceCard_pd/goodsInfo/goodsInfo.js index fda382d..e238c5c 100644 --- a/packageA/pages/serviceCard_pd/goodsInfo/goodsInfo.js +++ b/packageA/pages/serviceCard_pd/goodsInfo/goodsInfo.js @@ -1256,6 +1256,8 @@ Page({ }) } + this.data.get_sto_ing=1; + var timer_get = setInterval(function () { if (th.data.is_get_local_ok == 0) return false; if (!th.data.fir_def_store) return false; @@ -1374,13 +1376,19 @@ Page({ th.setData({all_pick_list: e.data.data.pageData}); th.deal_pickup(e); }else{ + th.data.get_sto_ing=0; th.setData({all_pick_list: null, only_pk:null,def_pickpu_list:null }); - wx.hideLoading(); } }, 800) } + else{ + th.data.get_sto_ing=0; + th.setData({all_pick_list: null, only_pk:null,def_pickpu_list:null }); + + wx.hideLoading(); + } }) }, 200) }, @@ -1554,9 +1562,11 @@ Page({ } } + th.data.get_sto_ing=0; } }); } else { + th.data.get_sto_ing=0; th.setData({ is_show_sto_cat: 0, only_pk: e.data.data.pageData diff --git a/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js b/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js index 34cd8ba..1bd9386 100644 --- a/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js +++ b/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js @@ -3129,6 +3129,7 @@ Page({ //---------拿出门店分类和门店------------ get_sto(e,func) { + var th = this, that = this; var is_normal = e; @@ -3137,12 +3138,13 @@ Page({ } else { th.setData({ is_normal: 0 }) } + th.data.get_sto_ing=1; var timer_get = setInterval(function () { if (th.data.is_get_local_ok == 0) return false; if (!th.data.fir_def_store) return false; var dd = null, i = getApp().request; - if (!th.data.sele_g) return false; + if (!th.data.sele_g){th.data.get_sto_ing=0; return false;} var g_distr_type = th.data.sele_g.distr_type; if (g_distr_type != 0) { @@ -3277,6 +3279,7 @@ Page({ } },err=>{ + th.data.get_sto_ing=0; ut.m_toast('网络繁忙，请稍后重试'); wx.hideLoading(); }) @@ -3403,12 +3406,15 @@ Page({ front_is_show_sto_cat:th.data.is_show_sto_cat, }) } + + this.data.get_sto_ing=0; + }, //------------处理门店--------------- deal_pickup(e) { var th = this; - if (!th.data.sele_g) return false + if (!th.data.sele_g){th.data.get_sto_ing=0;return false} var g_distr_type = th.data.sele_g.distr_type; wx.hideLoading(); @@ -3580,7 +3586,7 @@ Page({ //------------处理线下门店库存-------- deal_pickup_dline(e) { var pkno = [], th = this; - if (!th.data.sele_g) return false; + if (!th.data.sele_g){th.data.get_sto_ing=0;return false;} if (this.data.def_pick_store) { pkno.push(this.data.def_pick_store.pickup_no); @@ -3673,6 +3679,7 @@ Page({ } else { + th.data.get_sto_ing=0; th.setData({ all_sto: null, only_pk: null, @@ -3739,9 +3746,11 @@ Page({ //---把数组组装进去--- th.deal_pickup(em); } else { + th.data.get_sto_ing=0; th.setData({ def_pick_store: null, all_sto: null, only_pk: null, def_pickpu_list: null }) } } else { + th.data.get_sto_ing=0; th.setData({ def_pick_store: null, all_sto: null, only_pk: null, def_pickpu_list: null }) } }) @@ -4504,6 +4513,7 @@ Page({ // ind == 1 为普通购买 openSpecModel_pt: function (e) { + if(this.data.get_sto_ing) return false; this.setData({ open_ind_store: 9 }); // 判断是否有待支付订单 var aid = this.data.group_id; diff --git a/packageC/pages/presell/cardInfo/goodsInfo.js b/packageC/pages/presell/cardInfo/goodsInfo.js index cad10c2..5bafb14 100644 --- a/packageC/pages/presell/cardInfo/goodsInfo.js +++ b/packageC/pages/presell/cardInfo/goodsInfo.js @@ -1186,6 +1186,9 @@ Page({ }, openSpecModel: function(t) { + + if(this.data.get_sto_ing) return false; + var th=this; var open_store = t.currentTarget.dataset.ind; if(getApp().is_sp_hao() && open_store==1){ wx.showToast({ @@ -1443,6 +1446,8 @@ Page({ }) } + this.data.get_sto_ing=1; + var timer_get = setInterval(function() { if (th.data.is_get_local_ok == 0) return false; if (!th.data.fir_def_store) return false; @@ -1557,6 +1562,9 @@ Page({ th.deal_pickup(e); } else{ + + th.data.get_sto_ing=0; + th.setData({ isshow:1 }) @@ -1835,11 +1843,14 @@ Page({ if (!th.data.def_pick_store) { th.setData({def_pick_store:e.data.data.pageData[0]}) } - } + + th.data.get_sto_ing=0; } }); - } else { + } else { + + th.data.get_sto_ing=0; th.setData({ is_show_sto_cat: 0, only_pk: e.data.data.pageData diff --git a/packageC/pages/presell/goodsInfo/goodsInfo.js b/packageC/pages/presell/goodsInfo/goodsInfo.js index a43f787..5a29427 100644 --- a/packageC/pages/presell/goodsInfo/goodsInfo.js +++ b/packageC/pages/presell/goodsInfo/goodsInfo.js @@ -1439,6 +1439,9 @@ Page({ }, openSpecModel: function (t) { + + if(this.data.get_sto_ing) return false; + var th = this; var open_store = t.currentTarget.dataset.ind; this.setData({ @@ -1993,6 +1996,9 @@ Page({ //---------拿出门店分类和门店------------ get_sto(e) { + + this.data.get_sto_ing=1; + var th = this, is_normal = e; var that=th; @@ -2007,7 +2013,7 @@ Page({ if (!th.data.fir_def_store) return false; var dd = null, i = getApp().request; - if (!th.data.sele_g) return false; + if (!th.data.sele_g) {th.data.get_sto_ing=0; return false;} var g_distr_type = th.data.sele_g.distr_type; if (g_distr_type != 0) { @@ -2149,10 +2155,12 @@ Page({ } } else{ + th.data.get_sto_ing=0; wx.hideLoading(); } } else{ + th.data.get_sto_ing=0; wx.hideLoading(); } }) @@ -2263,7 +2271,7 @@ Page({ //------------处理门店--------------- deal_pickup(e) { var th = this; - if (!th.data.sele_g) return false + if (!th.data.sele_g) { th.data.get_sto_ing=0; return false } var g_distr_type = th.data.sele_g.distr_type; wx.hideLoading(); @@ -2419,6 +2427,9 @@ Page({ th.setData({ def_pick_store: e.data.data.pageData[0] }) } } + + th.data.get_sto_ing=0; + } else { th.setData({ is_show_sto_cat: -1, @@ -2429,10 +2440,12 @@ Page({ th.setData({ def_pick_store: e.data.data.pageData[0] }) } + th.data.get_sto_ing=0; } } }); } else { + th.data.get_sto_ing=0; th.setData({ is_show_sto_cat: 0, only_pk: e.data.data.pageData @@ -2453,7 +2466,7 @@ Page({ deal_pickup_dline(e) { var pkno = [], th = this; - if (!th.data.sele_g) return false; + if (!th.data.sele_g){ th.data.get_sto_ing=0; return false;} if (this.data.def_pick_store) { pkno.push(this.data.def_pick_store.pickup_no); @@ -2539,6 +2552,7 @@ Page({ } } else { + th.data.get_sto_ing=0; th.setData({ all_sto: null, only_pk: null, @@ -2613,6 +2627,7 @@ Page({ th.deal_pickup(em); } else { + th.data.get_sto_ing=0; th.setData({ all_sto: null, only_pk: null, @@ -2621,6 +2636,7 @@ Page({ } } else { + th.data.get_sto_ing=0; th.setData({ all_sto: null, only_pk: null, diff --git a/pages/goods/goodsInfo/goodsInfo.js b/pages/goods/goodsInfo/goodsInfo.js index 223b3f8..233be12 100644 --- a/pages/goods/goodsInfo/goodsInfo.js +++ b/pages/goods/goodsInfo/goodsInfo.js @@ -2761,6 +2761,8 @@ Page({ }, openSpecModel: function (t) { + + if(this.data.get_sto_ing) return false; var th = this; var open_store = t.currentTarget.dataset.ind; @@ -3748,6 +3750,7 @@ Page({ sp_seleing:0 }) + }, @@ -3758,6 +3761,8 @@ Page({ that = this; var is_normal = e; + th.data.get_sto_ing=1; + if (e == 1) { th.setData({ is_normal: 1 @@ -3772,9 +3777,10 @@ Page({ if (th.data.is_get_local_ok == 0) return false; if (!th.data.fir_def_store) return false; + var dd = null, i = getApp().request; - if (!th.data.sele_g) return false; + if (!th.data.sele_g) {th.data.get_sto_ing=0; return false; } var g_distr_type = th.data.sele_g.distr_type; if (g_distr_type != 0) { @@ -3959,12 +3965,14 @@ Page({ th.setData({sp_seleing:0}) wx.hideLoading(); th.data.fir_set_sto=0; + th.data.get_sto_ing=0; } } else { if(func) func(); th.setData({sp_seleing:0}) wx.hideLoading(); th.data.fir_set_sto=0; + th.data.get_sto_ing=0; } },err=>{ ut.m_toast('网络繁忙，请稍后重试'); @@ -3972,6 +3980,7 @@ Page({ th.setData({sp_seleing:0}) wx.hideLoading(); th.data.fir_set_sto=0; + th.data.get_sto_ing=0; }) }, 200) @@ -4105,6 +4114,7 @@ Page({ var th = this; if (!th.data.sele_g){ wx.hideLoading(); + th.data.get_sto_ing=0; return false } @@ -4337,6 +4347,8 @@ Page({ th.deal_front_pk(); } + th.data.get_sto_ing=0; + }, //------------处理线下门店库存-------- @@ -4443,6 +4455,7 @@ Page({ } else { + th.data.get_sto_ing=0; th.data.fir_set_sto=0; th.setData({ all_sto: null, @@ -4542,6 +4555,7 @@ Page({ } else { + th.data.get_sto_ing=0; th.data.fir_set_sto=0; th.setData({ all_sto: null, @@ -4552,6 +4566,7 @@ Page({ } else { + th.data.get_sto_ing=0; th.data.fir_set_sto=0; th.setData({ all_sto: null, @@ -5488,6 +5503,8 @@ Page({ //--点击弹起拼单-- openSpecModel_pt:function (e) { + if(this.data.get_sto_ing) return false; + this.setData({ open_ind_store: 4, goodsInputNum: 1 @@ -8559,7 +8576,8 @@ Page({ //-- 积分购购买弹出框 -- go_pay_integral: function () { - + + if(this.data.get_sto_ing) return false; //-- 在打开弹出框的时候，front_pk门店要赋值 -- this.setData({def_pick_store: ut.deep_cp(this.data.front_pick)}); @@ -8574,6 +8592,7 @@ Page({ //-- 积分购普通购买弹出框 -- go_pay_integral_normal:async function () { + if(this.data.get_sto_ing) return false; this.data.g_buy_num = new Map(); var th = this; @@ -9148,6 +9167,9 @@ Page({ //-- 秒杀的普通购买 -- openSpecModel_Nor: function () { + + if(this.data.get_sto_ing) return false; + this.data.g_buy_num = new Map(); var th = this; -- libgit2 0.21.4