diff --git a/app.js b/app.js index f235b5c..6280ec0 100644 --- a/app.js +++ b/app.js @@ -1453,10 +1453,94 @@ App({ }) } return cx_arr; - }, + }, + + //-- 获取判断注册成功后，是跳转等级卡，还是新人有礼 -- + async go_to_page(is_reg,func){ + if(!is_reg) { + func(); + return false; + } + //如果是从企业专属导购跳过来的话，就要返回专属导购处理页面 + let qyzsdg = wx.getStorageSync('qyzsdg') //如果是专属导购 + if (qyzsdg) { + wx.reLaunch({ + url: `/packageE/pages/qy/contactMe/contactMe?scene=${qyzsdg}`, + }) + return + } + //新判断新人有礼 + var res= await getApp().request.promiseGet("/api/weshop/marketing/newpeople/act/judge", { + data: { + storeId: os.stoid, + userId: this.globalData.user_id + } + }); + + if (res.data.code == 0) { + var actid = res.data.data.id; //活动id + var giftBagId = res.data.data.giftBagId; //礼包id + var new_nav = "/pages/giftpack/newvipgift/newvipgift?actId=" + actid + '&' + 'actType=' + 1 + '&' + 'giftBagId=' + giftBagId; + wx.redirectTo({ + url:new_nav + }) + return false; + } + //如果已经是等级卡了就跳过 + if(this.globalData.userInfo.card_field){ + //没有等级卡和新人有礼的时候 + if(func) func(); + return false; + } + + var dj_buy=await getApp().promiseGet("/store/storemoduleendtime/page?store_id=" + this.globalData.setting.stoid+ "&type=3", {}); + var ob = { isout: 0, isbuy: 0 }; + if (dj_buy.data.code == 0) { + var arr = dj_buy.data.data.pageData; + //----如果数组不为空---- + if (arr.length > 0) { + arr.forEach(function (val, ind) { + if (val.is_sy == 0 || val.is_sy == 1) { + ob.isbuy = 1; + var now = ut.gettimestamp(); + if (now > val.end_time) ob.isout = 1; + return false; + } + }) + } + } + + //-- 获取等级卡,直接去买等级卡 -- + if(ob.isbuy && !ob.isout){ + //-- 获取等级卡购买的数量 -- + var conf=await getApp().promiseGet("/api/weshop/storeconfig/get/" + this.globalData.setting.stoid, {}); + //-- 获取等级卡的会员已经购买的数量 --- + var dj=await getApp().promiseGet("/api/weshop/users/getUserCard/" + this.globalData.setting.stoid, {}); + var dj_num=0; + if(dj.data.code==0){ + dj_num=dj.data.data?dj.data.data:0; + } + + var sw_list= conf.data.data.switch_list; + if(sw_list){ + sw_list=JSON.parse(sw_list); + } + + + if (sw_list && sw_list.rank_switch==2 && conf.data.code == 0 && conf.data.data.dj_num>0 && conf.data.data.dj_num>dj_num) { + var nav = "/pages/user/plus/plus"; + wx.redirectTo({ + url:nav + }) + return false; + } + } + //没有等级卡和新人有礼的时候 + if(func) func(); + } - }); +}); diff --git a/packageA/pages/details_serviceCard/details_serviceCard.js b/packageA/pages/details_serviceCard/details_serviceCard.js index eb36139..a94af0f 100644 --- a/packageA/pages/details_serviceCard/details_serviceCard.js +++ b/packageA/pages/details_serviceCard/details_serviceCard.js @@ -605,7 +605,7 @@ Page({ let order_sn = this.data.details.order_sn; let order_id = this.data.details.order_id; let store_id = app.globalData.setting.stoid; - let user_id = os.user_id; + let user_id = getApp().globalData.user_id; let flag = true; // 如果是普通购买或单独购买，不用判断 @@ -648,7 +648,7 @@ Page({ var t_now = ut.gettimestamp(); - if (act_details.is_end == 0 && act_details.start_time < t_now && act_details.end_time > t_now) { + if (act_details.is_end == 1 || act_details.start_time > t_now || act_details.end_time < t_now) { wx.showModal({ title: '提示', content: '活动发生了变化,无法支付,请取消订单,重新购买！', @@ -658,10 +658,23 @@ Page({ return false; } + //指定门店的控制 + if (act_details.pick_up_lists) { + var idx0=act_details.pick_up_lists.findIndex(function (e){ + return e.pickup_id==it.pickup_id; + }) + if(idx0<0){ + getApp().confirmBox(it.service_name + "秒杀活动的门店不可售"); + th.setData({ paying: 0 }); + flag = false; + return false; + } + } + }; }); - if(act_details.buy_limit>0 && flag){ + if(act_details && act_details.buy_limit>0 && flag){ await getApp().request.promiseGet("/api/weshop/rechargeServicelist/getUserBuyGoodsNum", { data: { store_id: store_id, diff --git a/packageA/pages/goodsInfo/buy_flash_normal.wxml b/packageA/pages/goodsInfo/buy_flash_normal.wxml index 42280d9..9d2b13d 100644 --- a/packageA/pages/goodsInfo/buy_flash_normal.wxml +++ b/packageA/pages/goodsInfo/buy_flash_normal.wxml @@ -30,7 +30,7 @@ - + {{def_pick_store.pickup_name}} 距离:{{def_pick_store.distance>1000?filters.toFix(def_pick_store.distance/1000,2)+"km":filters.toFix(def_pick_store.distance,0)+"m"}} @@ -50,7 +50,7 @@ (库存不足) - (配送不匹配) + (该店不可售) (库存不足) @@ -97,7 +97,7 @@ - 配送不匹配 + 该店不可售 diff --git a/packageA/pages/goodsInfo/goodsInfo.js b/packageA/pages/goodsInfo/goodsInfo.js index 02760e7..f25da78 100644 --- a/packageA/pages/goodsInfo/goodsInfo.js +++ b/packageA/pages/goodsInfo/goodsInfo.js @@ -431,53 +431,7 @@ Page({ // gallery = g; // }) - - // ----> 秒杀 - let prom_type = this.data.options.prom_type; - - let goods_id = this.data.options.goods_id; - if(!goods_id) goods_id = this.data.data.goods_id; - - if(prom_type) { // 进入商品详情页地址传参有带goods_id、prom_type、prom_id参数, 即从秒杀入口进入 - let prom_id = this.data.options.prom_id; - // 检查活动是否开始 - this.check_prom(goods_id, prom_type, prom_id); - - } else { // 从非秒杀入口进入,地址不带prom_type、prom_id参数 - getApp().request.promiseGet('/api/weshop/activitylist/listGoodActInfo2', { - data: { - store_id: os.stoid, - goods_id: goods_id, - goods_type: 1, - user_id: oo.user_id, - } - }).then(res => { - if (res.data.code == 0) { - let result = res.data.data; - let resLength = result.length; - if(resLength == 1) { // 如果数组长度为1，则直接显示当前活动 - let goods_id = this.data.options.goods_id; - let prom_type = result[0].prom_type; - let prom_id = result[0].act_id; - this.setData({ - 'options.prom_type': prom_type, - 'options.prom_id': prom_id, - }); - // 检查活动是否开始 - this.check_prom(goods_id, prom_type, prom_id); - } else if(resLength > 1) { //如果数组长度大于1，表示当前商品参加多个活动，以列表形式显示多活动 - this.setData({ - actList: res.data.data, - }); - }; - - }else{ - this.setData({ - actList: res.data.data, - }); - } - }); - }; + // <---- 秒杀 //------是否收藏---------- @@ -625,26 +579,20 @@ Page({ //获取用户的默认门店 th.check_guide(()=>{ getApp().get_user_store(function(e) { - console.log('get_user_store'); - console.log("999999999"); - - if(!e) { th.data.fir_def_store={}; //赋值空对象 return false; } - console.log("000000"); - if(getApp().globalData.is_dj_pk) th.setData({has_def:1}) var ee=JSON.parse(JSON.stringify(e)); - - console.log(e); //--定时器推迟一下-- - setTimeout(function () { + var appd=getApp().globalData; + var w_time = setInterval(function() { + if (that.data.is_get_local_ok == 0) return false; if(!th.data.data){ return false; } @@ -654,77 +602,74 @@ Page({ ee.is_no_dis=1; } - var appd=getApp().globalData; - var w_time = setInterval(function() { - if (that.data.is_get_local_ok == 0) return false; - clearInterval(w_time); - var distance = null; - var e=JSON.parse(JSON.stringify(ee)); - - //如果有开启近距离的话,同时距离优不一样了 - if (that.data.lat != null) { - //如果经纬度有变化的话 - if(e && appd.lat==that.data.lat && appd.lon==that.data.lon && e.distance>0 ){ - that.data.fir_def_store=e; - that.setData({ - def_pick_store: e, - sto_sele_name: e.pickup_name, - sto_sele_id: e.pickup_id, - sto_sele_distr: e.distr_type, - sto_sele_keyid:e.keyid, - }) - }else{ - //要用接口是获取距离，js的计算不准 - getApp().request.promiseGet("/api/weshop/pickup/list",{ - data:{store_id:os.stoid,pickup_id:e.pickup_id,lat:th.data.lat,lon: th.data.lon, is_pos: 1}, - }).then(res=>{ - if(ut.ajax_ok(res)){ - e=res.data.data.pageData[0]; - if (e){ - e.is_no_dis=ee.is_no_dis; - appd.pk_store=e; - that.data.fir_def_store=e; - - console.log('get_user_store--2'); - console.log(e); - - that.setData({ - def_pick_store: e, - sto_sele_name: e.pickup_name, - sto_sele_id: e.pickup_id, - sto_sele_distr: e.distr_type, - sto_sele_keyid:e.keyid, - }) - } + clearInterval(w_time); + var distance = null; + var e=JSON.parse(JSON.stringify(ee)); + + //如果有开启近距离的话,同时距离优不一样了 + if (that.data.lat != null) { + //如果经纬度有变化的话 + if(e && appd.lat==that.data.lat && appd.lon==that.data.lon && e.distance>0 ){ + that.data.fir_def_store=e; + that.setData({ + def_pick_store: e, + sto_sele_name: e.pickup_name, + sto_sele_id: e.pickup_id, + sto_sele_distr: e.distr_type, + sto_sele_keyid:e.keyid, + }) + }else{ + //要用接口是获取距离，js的计算不准 + getApp().request.promiseGet("/api/weshop/pickup/list",{ + data:{store_id:os.stoid,pickup_id:e.pickup_id,lat:th.data.lat,lon: th.data.lon, is_pos: 1}, + }).then(res=>{ + if(ut.ajax_ok(res)){ + e=res.data.data.pageData[0]; + if (e){ + e.is_no_dis=ee.is_no_dis; + appd.pk_store=e; + that.data.fir_def_store=e; + + console.log('get_user_store--2'); + console.log(e); + + that.setData({ + def_pick_store: e, + sto_sele_name: e.pickup_name, + sto_sele_id: e.pickup_id, + sto_sele_distr: e.distr_type, + sto_sele_keyid:e.keyid, + }) } - }) - } - - //e.distance = distance; - appd.lat=that.data.lat; - appd.lon=that.data.lon; - - } else { - if (e) { - - console.log('get_user_store3---'); - console.log(e); + } + }) + } - e.distance = null; - that.data.fir_def_store=e; - that.setData({ - def_pick_store: e, - sto_sele_name: e.pickup_name, - sto_sele_id: e.pickup_id, - sto_sele_distr: e.distr_type, - sto_sele_keyid:e.keyid, - }) - } + //e.distance = distance; + appd.lat=that.data.lat; + appd.lon=that.data.lon; + + } else { + if (e) { + + console.log('get_user_store3---'); + console.log(e); + + e.distance = null; + that.data.fir_def_store=e; + that.setData({ + def_pick_store: e, + sto_sele_name: e.pickup_name, + sto_sele_id: e.pickup_id, + sto_sele_distr: e.distr_type, + sto_sele_keyid:e.keyid, + }) } - }, 500) - },1500) + } + }, 200) + }); }) @@ -773,11 +718,55 @@ Page({ // mapurl: t.data.data.listServiceVideos[0].video_url, // mapurl_f_img: t.data.data.listServiceVideos[0].video_img, //listServiceItem: t.data.data.listServiceItem, - 'isshow':1 - }); that.getTaohe(); + // ----> 秒杀 + let prom_type = th.data.options.prom_type; + + let goods_id = th.data.options.goods_id; + if(!goods_id) goods_id = th.data.data.goods_id; + + if(prom_type) { // 进入商品详情页地址传参有带goods_id、prom_type、prom_id参数, 即从秒杀入口进入 + let prom_id = th.data.options.prom_id; + // 检查活动是否开始 + th.check_prom(goods_id, prom_type, prom_id); + + } else { // 从非秒杀入口进入,地址不带prom_type、prom_id参数 + getApp().request.promiseGet('/api/weshop/activitylist/listGoodActInfo2', { + data: { + store_id: os.stoid, + goods_id: goods_id, + goods_type: 1, + user_id: oo.user_id, + } + }).then(res => { + if (res.data.code == 0) { + let result = res.data.data; + let resLength = result.length; + if(resLength == 1) { // 如果数组长度为1，则直接显示当前活动 + let goods_id = th.data.options.goods_id; + let prom_type = result[0].prom_type; + let prom_id = result[0].act_id; + th.setData({ + 'options.prom_type': prom_type, + 'options.prom_id': prom_id, + }); + // 检查活动是否开始 + th.check_prom(goods_id, prom_type, prom_id); + } else if(resLength > 1) { //如果数组长度大于1，表示当前商品参加多个活动，以列表形式显示多活动 + th.setData({ + actList: res.data.data, + }); + }; + + }else{ + th.setData({ + actList: res.data.data, + }); + } + }); + }; // console.log('0xxxxx999999', t.data.data); //-----商品详情--- @@ -808,7 +797,8 @@ Page({ }); th.data.enterAddressPage && (this.data.enterAddressPage = !1); - th.get_sto(); + //没有互动，就调用默认的门店 + if(!th.data.prom_type) th.get_sto(); }) @@ -1612,9 +1602,9 @@ Page({ if(th.data.sele_g && th.data.sele_g.share_imgurl) { img = th.data.iurl + th.data.sele_g.share_imgurl; ob.imageUrl = img; - }; - }; - + } + } + return ob; }, @@ -1639,9 +1629,22 @@ Page({ //---------拿出门店分类和门店------------ get_sto(e) { + var is_normal=e; var th = this,that=this; + + if (e == 1) { + th.setData({ + is_normal: 1 + }) + } else { + th.setData({ + is_normal: 0 + }) + } + var timer_get = setInterval(function() { if (th.data.is_get_local_ok == 0) return false; + if (!th.data.fir_def_store) return false; var i = getApp().request; if (!th.data.data) return false; var dd= { @@ -1691,34 +1694,76 @@ Page({ //删除 e.data.data.pageData.splice(k--, 1); } - } - } + } - //如果有开启距离的功能，没有设置默认门店，要用最近的门店作为默认门店 - if(dd.lat && (!th.data.def_pick_store || JSON.stringify(th.data.def_pick_store)=='{}') && th.data.bconfig && th.data.bconfig.is_sort_storage){ - 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, - sto_sele_keyid: e.data.data.pageData[0].keyid, - }); - th.data.fir_def_store=e.data.data.pageData[0]; } - //-- 如果有默认选择门店的时候，要把默认门店放在第一位，修改不要配送方式的判断 -- - if (th.data.def_pick_store && JSON.stringify(th.data.def_pick_store)!='{}'){ - for (var k = 0; k < e.data.data.pageData.length; k++) { - if (e.data.data.pageData[k].pickup_id == th.data.def_pick_store.pickup_id) { - e.data.data.pageData.splice(k, 1); //删除 - break; - } - } - e.data.data.pageData.splice(0, 0, th.data.def_pick_store); //添加 - } - - th.setData({all_pick_list:e.data.data.pageData}); - th.deal_pickup(e); + //如果有秒杀的指定门店 + if(th.data.prom_type==1 && th.data.prom_act && th.data.prom_act.pick_up_lists && e.data.data.pageData.length && !is_normal){ + var pick_up_lists=th.data.prom_act.pick_up_lists; + for (var kq = 0; kq < e.data.data.pageData.length; kq++) { + var it0=e.data.data.pageData[kq]; + var idx0=pick_up_lists.findIndex(function (e){ + return e.pickup_id==it0.pickup_id; + }) + if (idx0<0) { + //删除 + e.data.data.pageData.splice(kq--, 1); + } + } + + if (th.data.def_pick_store && JSON.stringify(th.data.def_pick_store)!='{}'){ + //-- 查找一下门店有没有在 -- + var idx1=pick_up_lists.findIndex(function (e){ + return e.pickup_id==th.data.def_pick_store.pickup_id; + }) + if(idx1<0){ + //如果是秒杀的指定门店，就要设置秒杀的 + th.data.def_pick_store.is_no_dis_act=1; + that.setData({ + def_pick_store: th.data.def_pick_store + }) + } + } + + } + + //-- 如果门店过滤后，还会是数量 -- + if(e.data.data.pageData.length){ + //如果有开启距离的功能，没有设置默认门店，要用最近的门店作为默认门店 + if(dd.lat && (!th.data.def_pick_store || JSON.stringify(th.data.def_pick_store)=='{}') && th.data.bconfig && th.data.bconfig.is_sort_storage){ + 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, + sto_sele_keyid: e.data.data.pageData[0].keyid, + }); + th.data.fir_def_store=e.data.data.pageData[0]; + } + + //-- 如果有默认选择门店的时候，要把默认门店放在第一位，修改不要配送方式的判断 -- + if (th.data.def_pick_store && JSON.stringify(th.data.def_pick_store)!='{}'){ + for (var k = 0; k < e.data.data.pageData.length; k++) { + if (e.data.data.pageData[k].pickup_id == th.data.def_pick_store.pickup_id) { + e.data.data.pageData.splice(k, 1); //删除 + break; + } + } + e.data.data.pageData.splice(0, 0, th.data.def_pick_store); //添加 + } + + th.setData({all_pick_list:e.data.data.pageData,isshow:1}); + th.deal_pickup(e); + } + else{ + th.setData({ + isshow:1 + }) + wx.hideLoading(); + } + + },800) } @@ -2666,16 +2711,16 @@ Page({ return false; } if(!th.data.only_pk && !th.data.def_pickpu_list){ - getApp().confirmBox("门店库存不足", null, 25000, !1); + getApp().confirmBox("暂无可售门店", null, 25000, !1); return false; } if(th.data.only_pk && !th.data.only_pk.length){ - getApp().confirmBox("门店库存不足", null, 25000, !1); + getApp().confirmBox("暂无可售门店", null, 25000, !1); return false; } if(th.data.def_pickpu_list && !th.data.def_pickpu_list.length){ - getApp().confirmBox("门店库存不足", null, 25000, !1); + getApp().confirmBox("暂无可售门店", null, 25000, !1); return false; } @@ -3158,7 +3203,8 @@ Page({ } var title= th.data.data.goods_name; - var img=th.data.data.original_img; + // var img=th.data.data.original_img; + var img=th.data.iurl+th.data.data.image_url; if(th.data.prom_type==6){ title=th.data.prom_act.share_title; img=th.data.iurl+th.data.prom_act.share_imgurl; @@ -3177,6 +3223,13 @@ Page({ url+="&room_id="+getApp().globalData.room_id+"&room_user_share=1"; } + // 如果服务卡参加秒杀活动，且后台设置了分享标题和分享图片 + if(th.data.prom_type == 1) { + if(th.data.sele_g && th.data.sele_g.share_imgurl) { + img = th.data.iurl + th.data.sele_g.share_imgurl; + }; + }; + return { title:price + "元 " +title, imageUrl:img, @@ -3515,7 +3568,6 @@ Page({ get_normal(gid) { this.setData({ prom_type: 0, - isshow: 1, }); // this.get_sku(os.stoid, this.data.data, gid); this.get_sto(); @@ -3550,7 +3602,7 @@ Page({ if (prom_type == 1 && prom_id == 0) { this.setData({ - prom_type: 0, isshow: 1, + prom_type: 0 }); //获取门店 @@ -3619,7 +3671,6 @@ Page({ prom_act: t.data.data, prom_end_time: prom_end_time, prom_start_time: prom_start_time, - isshow: 1, }); ee.get_sto(); @@ -3893,18 +3944,18 @@ Page({ // 是否授权登陆 var user_info = getApp().globalData.userInfo; - if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) { - wx.navigateTo({ - url: '/packageE/pages/togoin/togoin', - }) - return false; - } - + if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) { + wx.navigateTo({ + url: '/packageE/pages/togoin/togoin', + }) + return false; + } this.data.g_buy_num = new Map(); var th = this; this.setData({open_ind_store: 5, goodsInputNum: 1});//拼团直接给4 - this.setData({openSpecModal_flash_normal: 1}); + this.setData({openSpecModal_flash_normal: 1}); + this.get_sto(1) // if (th.data.sku_g_pt) { @@ -3922,7 +3973,7 @@ Page({ }, closeSpecModal_flash_normal: function () { - this.setData({openSpecModal_flash_normal: 0}); + this.setData({openSpecModal_flash_normal: 0,is_normal:0}); }, diff --git a/packageA/pages/goodsInfo/goodsInfo.wxml b/packageA/pages/goodsInfo/goodsInfo.wxml index 1962e91..f6ef259 100644 --- a/packageA/pages/goodsInfo/goodsInfo.wxml +++ b/packageA/pages/goodsInfo/goodsInfo.wxml @@ -172,8 +172,9 @@ (未找到门店) (未找到门店) + (该店不可售) - (配送不匹配) + (该店不可售) @@ -665,8 +666,8 @@ - - {{def_pick_store.pickup_name}} + + {{def_pick_store.pickup_name}} 距离:{{def_pick_store.distance>1000?filters.toFix(def_pick_store.distance/1000,2)+"km":filters.toFix(def_pick_store.distance,0)+"m"}} @@ -685,7 +686,8 @@ (库存不足) - (配送不匹配) + (该店不可售) + (该店不可售) (库存不足) @@ -708,7 +710,8 @@ - 配送不匹配 + 该店不可售 + 该店不可售 @@ -831,9 +834,10 @@ {{item.pickup_name}} - - (配送不匹配) + + (该店不可售) + (该店不可售1) @@ -862,9 +866,10 @@ {{item.pickup_name}} - - (配送不匹配) + + (该店不可售) + (该店不可售) @@ -894,9 +899,10 @@ {{item.pickup_name}} - - (配送不匹配) + + (该店不可售) + (该店不可售) diff --git a/packageA/pages/goodsInfo/goodsInfo.wxss b/packageA/pages/goodsInfo/goodsInfo.wxss index 875222b..938bc20 100644 --- a/packageA/pages/goodsInfo/goodsInfo.wxss +++ b/packageA/pages/goodsInfo/goodsInfo.wxss @@ -2417,9 +2417,7 @@ height: 90rpx; margin: auto; */ } -.shop_name{ -} .stores-img{ width: 28rpx; height: 28rpx; @@ -2427,6 +2425,7 @@ margin: auto; */ } .shop_name{ margin-right: 10rpx; + max-width: 375rpx; } .address{ /* width: 100%; @@ -2543,6 +2542,7 @@ margin-left: 17rpx; } .address_name{ margin-right: 10rpx; + max-width: 390rpx; } .address-val{ diff --git a/packageA/pages/profile/profile.js b/packageA/pages/profile/profile.js index a7dc0c7..e0b63cf 100644 --- a/packageA/pages/profile/profile.js +++ b/packageA/pages/profile/profile.js @@ -600,6 +600,10 @@ Page({ let url3 = '/api/weshop/users/getErpvipidPickup'; url1 += r.stoid; + if(t.is_reg){ + this.data.is_reg=1; + } + var uu = getApp().globalData.zc_dd; if (uu) { this.setData({head_pic: uu.head_pic, nickname: uu.nickname}) @@ -1006,15 +1010,17 @@ Page({ if (this.data.is_lable_set) { getApp().globalData.zc_dd = post_data; + var g_url="/packageE/pages/user/labels/labels?pageType=1"; + if(th.data.is_reg){ + g_url+="&is_reg=1"; + } wx.redirectTo({ - url: "/packageE/pages/user/labels/labels?pageType=1" + url:g_url }) }else{ this.zu_ce(post_data); } - - }, @@ -1040,7 +1046,11 @@ Page({ 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 = s.getFullUrl(a.globalData.userInfo.head_pic); - wx.navigateBack({delta: 1}) + //wx.navigateBack({delta: 1}) + //-- 看情况,是跳转等级卡，还是跳转到新人有礼 -- + getApp().go_to_page(th.data.is_reg,function (){ + wx.navigateBack({ delta: 1 }) + }) }, failStatus: function (t) { @@ -1404,9 +1414,15 @@ Page({ if (this.data.is_lable_set) { getApp().globalData.zc_dd = post_data; - wx.redirectTo({ - url: "/packageE/pages/user/labels/labels?pageType=1" - }) + + var g_url="/packageE/pages/user/labels/labels?pageType=1"; + if(th.data.is_reg){ + g_url+="&is_reg=1"; + } + + wx.redirectTo({ + url: g_url + }) }else{ this.zu_ce(post_data); } diff --git a/packageA/pages/quan_pro/quan_pro.js b/packageA/pages/quan_pro/quan_pro.js index d9d13c6..ce95aab 100644 --- a/packageA/pages/quan_pro/quan_pro.js +++ b/packageA/pages/quan_pro/quan_pro.js @@ -2,7 +2,7 @@ var t = require("../../../utils/util.js"), ut = t, e = require("../../../utils/common.js"), oo = getApp().globalData, os = getApp().globalData.setting; - var utils = require('../../../utils/util.js'),ut=utils; + Page({ data: { @@ -44,23 +44,66 @@ Page({ }, //---展示,显示券的信息--- - onShow: function() { + onShow:async function() { //检查能不能分享 getApp().check_can_share(); - var th=this; - var user_id=getApp().globalData.user_id; - getApp().request.promiseGet("/api/weshop/prom/coupon/pageCouponList", { - data:{store_id:os.stoid,type:1,id:th.data.id,user_id:user_id} - }).then(res => { - th.setData({is_get:1}); - if(res.data.code==0 && res.data.data && res.data.data.pageData && res.data.data.pageData.length){ - th.setData({q_data:res.data.data.pageData[0]}); - } - }); - th.setData({getcurday:ut.gettimestamp()}); + + var rs=await getApp().request.promiseGet("/api/weshop/prom/coupon/get/"+th.data.id, {}) + if(!rs){ + th.setData({is_get:1}); + return false; + } + if(rs.data.code!=0){ + th.setData({is_get:1}); + return false; + } + var r_data=rs.data.data; + //如果只限定链接的时候，要取消分享按钮 + if(r_data.is_share){ + wx.hideShareMenu(); + } + + if(r_data.store_id!=os.stoid){ + th.setData({is_get:1}); + return false; + } + if(r_data.type!=1){ + th.setData({is_get:2}); + return false; + } + + var now=ut.gettimestamp(); + + if(r_data.send_start_time>now){ + th.setData({is_get:3}); + return false; + } + + if(r_data.send_end_time { + // th.setData({is_get:1}); + // if(res.data.code==0 && res.data.data && res.data.data.pageData && res.data.data.pageData.length){ + // th.setData({q_data:res.data.data.pageData[0]}); + // } + // }); + + }, onHide: function() { diff --git a/packageA/pages/quan_pro/quan_pro.wxml b/packageA/pages/quan_pro/quan_pro.wxml index e1e45dc..664a246 100644 --- a/packageA/pages/quan_pro/quan_pro.wxml +++ b/packageA/pages/quan_pro/quan_pro.wxml @@ -11,7 +11,10 @@ {{q_data.name}} - 不存在此微券或数量已领取完 + 不存在此微券或数量已领取完 + 该优惠券不是免费发放类型 + 活动未开始暂时无法领取优惠券 + 优惠券已过期 @@ -45,7 +48,10 @@ - 不存在此微券或数量已领取完 + 不存在此微券或数量已领取完 + 该优惠券不是免费发放类型 + 活动未开始暂时无法领取优惠券 + 优惠券已过期 diff --git a/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js b/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js index 8eebb31..26f0375 100644 --- a/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js +++ b/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js @@ -287,6 +287,8 @@ Page({ is_get_guide:0, keyword:'', //门店搜索 sec_i:-1,//选中分类门店 下标 + + adding:0 //避免重复点击 }, //------初始化加载---------- @@ -896,6 +898,9 @@ Page({ //---展示--- onShow: async function () { + //添加购物车的控制要清理0 + this.data.adding=0; + getApp().check_can_share(this); // console.log('onshow'); var goods_list = null, th = this, that = this; @@ -1435,7 +1440,6 @@ Page({ open_ind_store: ind }); - th.add_cart_func(t); }, @@ -4687,6 +4691,14 @@ Page({ s.my_warnning("还未登录！", 0, this); return; } + + if(this.data.adding) return false; + this.data.adding=1; + + wx.showLoading({ + mask:true + }); + var e = this, th = e, o = this.data.sele_g; @@ -4698,6 +4710,8 @@ Page({ //---判断商品是否超出限购--- if (th.data.g_buy_num != null && th.data.sele_g.viplimited > 0) { if (th.data.goodsInputNum + th.data.g_buy_num.get(th.data.sele_g.goods_id) > th.data.sele_g.viplimited) { + wx.hideLoading(); + th.data.adding=0; wx.showModal({ title: '提示', content: '超出商品限购' @@ -4718,7 +4732,11 @@ Page({ sto_sele_name: "" }); - if (th.data.sto_sele_name == "") return s.my_warnning("请选择门店", 0, th); + if (th.data.sto_sele_name == ""){ + wx.hideLoading(); + th.data.adding=0; + return s.my_warnning("请选择门店", 0, th); + } //--------------此时操作的数据------------ var newd = { @@ -4789,8 +4807,9 @@ Page({ th.check_CanOutQty(th.data.sele_g, pick, function (CanOutQty) { if (CanOutQty) { - if (CanOutQty < e.data.goodsInputNum) { + wx.hideLoading(); + th.data.adding=0; wx.showToast({ title: '库存不足！', icon: 'none', @@ -4800,6 +4819,8 @@ Page({ th.by_next_func(newd); } else { + wx.hideLoading(); + th.data.adding=0; wx.showToast({ title: '库存不足！', icon: 'none', @@ -4810,6 +4831,8 @@ Page({ } else { if (o.store_count <= 0) { + wx.hideLoading(); + th.data.adding=0; wx.showToast({ title: '库存已为空！', icon: 'none', @@ -4819,6 +4842,8 @@ Page({ } if (o.store_count < e.data.goodsInputNum) { + wx.hideLoading(); + th.data.adding=0; wx.showToast({ title: '库存不足！', icon: 'none', @@ -6870,10 +6895,11 @@ Page({ if (getApp().globalData.groupchat_id) { pagePath+="&groupchat_id="+getApp().globalData.groupchat_id } - + let imgPath = this.data.iurl + this.data.luckGoInfo.original_img; return { title: this.data.data.goods_name + '-' + store_name, - imageUrl: this.data.gallery[0].image_url, + // imageUrl: this.data.gallery[0].image_url, + imageUrl: imgPath, query: pagePath } }, diff --git a/packageC/pages/presell/goodsInfo/goodsInfo.js b/packageC/pages/presell/goodsInfo/goodsInfo.js index 34f98c0..a2825ec 100644 --- a/packageC/pages/presell/goodsInfo/goodsInfo.js +++ b/packageC/pages/presell/goodsInfo/goodsInfo.js @@ -4492,11 +4492,12 @@ Page({ if (getApp().globalData.groupchat_id) { url+="&groupchat_id="+getApp().globalData.groupchat_id } - + let img = this.data.data.original_img; return { title: this.data.data.goods_name + '-' + store_name, query: 'first_leader='+user_id+url, - imageUrl: this.data.gallery[0].image_url, + // imageUrl: this.data.gallery[0].image_url, + imageUrl: img } }, diff --git a/packageE/pages/cart/cart2/cart2.js b/packageE/pages/cart/cart2/cart2.js index ecc3fb7..64912a4 100644 --- a/packageE/pages/cart/cart2/cart2.js +++ b/packageE/pages/cart/cart2/cart2.js @@ -4876,6 +4876,9 @@ Page({ var zh_map_count={}; var check_map = {}; let groupchat_ids=[] + + + //-------------让商品添加到商品列表-------------------- for (var k = 0; k < t_item.goods.length; k++) { @@ -4893,7 +4896,12 @@ Page({ 'store_id': oo.stoid, }; - + if (g_item.is_pd_normal) { + goods.is_pd_normal = 1; + } + if (g_item.is_integral_normal) { + goods.is_integral_normal = 1; + } if (getApp().globalData.skinface_id) { goods.skinface_id = getApp().globalData.skinface_id; @@ -4942,11 +4950,15 @@ Page({ } break; case 5: - goods.prom_type = 5; - goods.prom_id = g_item.prom_id; - if (g_item.is_collocation) { - goods.is_collocation = g_item.is_collocation; + //看一下有没有搭配商品 + if(th.has_collocation(t_item.goods,g_item.prom_id)){ + goods.prom_type = 5; + goods.prom_id = g_item.prom_id; + if (g_item.is_collocation) { + goods.is_collocation = g_item.is_collocation; + } } + break case 7: goods.prom_type = 7; @@ -5367,6 +5379,14 @@ Page({ }) }, + //看一下有没有选择搭配的商品 + has_collocation(goods,prom_id){ + var idx=goods.findIndex(function (e){ + return e.prom_type==5 && e.prom_id==prom_id && e.is_collocation; + }) + return idx>0; + }, + //---确认线下门店的数量足不足--- async check_store_num(goods_id, pick, goods_num, func) { var lock = 0, pick_no, plist, erpwareid; diff --git a/packageE/pages/qy/contactMe/contactMe.js b/packageE/pages/qy/contactMe/contactMe.js index 63d8f63..dfa0224 100644 --- a/packageE/pages/qy/contactMe/contactMe.js +++ b/packageE/pages/qy/contactMe/contactMe.js @@ -92,7 +92,29 @@ Page({ this.setData({ id: f_arr[2] }) - this.getopenuserid(f_arr[2]) + //判断是否有注册，如果没有注册必须先注册 + let userinfo = wx.getStorageSync('userinfo'); + if (!userinfo) { + wx.setStorageSync('qyzsdg', tt.scene) + wx.navigateTo({ + url: '/packageE/pages/togoin/togoin', + }) + }else{ + if (userinfo && userinfo.mobile) { + wx.removeStorageSync('qyzsdg') + this.setData({ + phone:userinfo.mobile + }) + this.getopenuserid(f_arr[2]) + }else{ + wx.removeStorageSync('userinfo') + wx.setStorageSync('qyzsdg', tt.scene) + wx.navigateTo({ + url: '/packageE/pages/togoin/togoin', + }) + } + } + // getApp().globalData.groupchat_id = f_arr[2]; } @@ -145,7 +167,18 @@ Page({ // } // }) }, - + onShow:function(){ + let userinfo = wx.getStorageSync('userinfo'); + if (userinfo && userinfo.mobile) { + this.setData({ + phone:userinfo.mobile + }) + // wx.removeStorageSync('qyzsdg') + } + if (this.data.id) { + this.getopenuserid(this.data.id) + } + }, getopenuserid(id) { let url = `/api/weshop/qyWeChat/qywxStaffcode/get/${id}` getApp().request.promiseGet(url, { data: {} }).then(res => { @@ -158,6 +191,10 @@ Page({ openuserid, skip_verify }) + if (this.data.phone) { + + this.befgetqy() + } // if (this.data.phone) { // this.getqy() // } diff --git a/packageE/pages/togoin/togoin.js b/packageE/pages/togoin/togoin.js index d7501ef..4f82ffc 100644 --- a/packageE/pages/togoin/togoin.js +++ b/packageE/pages/togoin/togoin.js @@ -20,6 +20,12 @@ Page({ }) } getApp().globalData.isLoad_ad = 1; + + + if(options.is_reg){ + this.data.is_reg=1; + } + //--判断是否有接受到邀请人的ID-- if (options.first_leader) { this.setData({ first_leader: options.first_leader }); @@ -277,8 +283,13 @@ Page({ if (res.data.code == 0) { dd.mobile = res.data.data; getApp().globalData.zc_dd = dd; + + var g_url="/packageA/pages/profile/profile?is_back=1"; + if(th.data.is_reg){ + g_url+="&is_reg=1"; + } wx.redirectTo({ - url: "/packageA/pages/profile/profile?is_back=1" + url:g_url }) } }) @@ -306,9 +317,13 @@ Page({ if (res.data.code == 0) { dd.mobile = res.data.data; getApp().globalData.zc_dd = dd; - wx.redirectTo({ - url: "/packageE/pages/user/labels/labels?pageType=1" - }) + + var g_url="/packageE/pages/user/labels/labels?pageType=1"; + if(th.data.is_reg){ + g_url+="&is_reg=1"; + } + + wx.redirectTo({ url: g_url }) } }) } else { @@ -357,7 +372,12 @@ Page({ } }) - wx.navigateBack({ delta: 1 }) + //-- 看情况,是跳转等级卡，还是跳转到新人有礼 -- + getApp().go_to_page(th.data.is_reg,function (){ + wx.navigateBack({ delta: 1 }) + }) + + }, failStatus: function (t) { diff --git a/packageE/pages/user/labels/labels.js b/packageE/pages/user/labels/labels.js index f8e918f..f2c92d5 100644 --- a/packageE/pages/user/labels/labels.js +++ b/packageE/pages/user/labels/labels.js @@ -111,9 +111,18 @@ Page({ var pages = getCurrentPages(); var prevPage = pages[pages.length - 2]; //上一个页面 //直接调用上一个页面的setData()方法，把数据存到上一个页面中去 - prevPage.setData({ - is_zy: 1 - }) + try { + prevPage.setData({ + is_zy: 1 + }) + } catch (error) { + + } + + if(options.is_reg){ + this.data.is_reg=1; + } + th.query_nolabels(); th.get_config(); }, @@ -273,9 +282,14 @@ Page({ // check_label: arr // }) // th.goto(); - wx.reLaunch({ - url: '/pages/user/index/index', + // wx.reLaunch({ + // url: '/pages/user/index/index', + // }) + //-- 看情况,是跳转等级卡，还是跳转到新人有礼 -- + getApp().go_to_page(th.data.is_reg,function (){ + wx.navigateBack({ delta: 1 }) }) + }, 2000); } else { getApp().my_warnning("系统繁忙,请稍后再试", 0, th); @@ -286,9 +300,13 @@ Page({ } }) }else{ - wx.reLaunch({ - url: '/pages/user/index/index', + getApp().go_to_page(th.data.is_reg,function (){ + // wx.navigateBack({ delta: 1 }) + wx.reLaunch({ + url: '/pages/user/index/index', + }) }) + } }, diff --git a/packageE/pages/user/monthgiftbag/giftpackinfo/giftpackinfo.js b/packageE/pages/user/monthgiftbag/giftpackinfo/giftpackinfo.js index d847d98..85fbbe5 100644 --- a/packageE/pages/user/monthgiftbag/giftpackinfo/giftpackinfo.js +++ b/packageE/pages/user/monthgiftbag/giftpackinfo/giftpackinfo.js @@ -301,6 +301,7 @@ Page({ arr2[j].giftTitle=arr2[j].act_name arr2[j].virtualsales=arr2[j].virtualSales arr2[j].lbnum=arr2[j].lbNum + } if(arr2.length>0){ var monthgiftbag =arr2[0]; @@ -320,6 +321,7 @@ Page({ isStart, monthgiftbag: monthgiftbag, sele_g: monthgiftbag, + default_color:monthgiftbag.bg_color }) th.init() }else{ diff --git a/packageF/pages/free_delivery/free_delivery.wxss b/packageF/pages/free_delivery/free_delivery.wxss index d290d51..dc9f31e 100644 --- a/packageF/pages/free_delivery/free_delivery.wxss +++ b/packageF/pages/free_delivery/free_delivery.wxss @@ -72,7 +72,7 @@ background-size: 100% 100%; position: relative; border: 1rpx solid rgb(194, 194, 194); - border-radius: 5rpx; + border-radius: 15rpx; overflow: hidden; text-align: center; line-height: 80rpx; diff --git a/pages/cart/cart/cart.js b/pages/cart/cart/cart.js index f23c841..006304b 100644 --- a/pages/cart/cart/cart.js +++ b/pages/cart/cart/cart.js @@ -672,14 +672,25 @@ Page({ }) //只有一种活动，但是又是秒杀之类是互动，就要失效。不能是普通购买 - if (prom && prom.length == 1 && [1, 2, 4, 6, 8, 9].indexOf(prom.prom_type) > -1 && !prom.is_integral_normal && !prom.is_pd_normal) { + if (prom && prom.length == 1 && [1, 2, 4, 6, 8, 9].indexOf(prom[0].prom_type) > -1 && !item.is_integral_normal && !item.is_pd_normal) { th.disInvalid(item); continue; } + //只有秒杀和积分购的时候，不能是普通购买 - if (prom && prom.length == 2 && [1, 4].indexOf(prom.prom_type) > -1 && [1, 4].indexOf(prom.prom_type) > -1 && !prom.is_integral_normal && !prom.is_pd_normal) { - th.disInvalid(item); - continue; + if (prom && prom.length == 2 && !item.is_integral_normal && !item.is_pd_normal) { + var idx=prom.findIndex(function (e){ + return e.prom_type==1; + }) + var idx2=prom.findIndex(function (e){ + return e.prom_type==4; + }) + //--如果是有秒杀和积分的时候-- + if(idx>-1 && idx2>-1){ + th.disInvalid(item); + continue; + } + } } @@ -724,6 +735,8 @@ Page({ //商品已经下架 continue; } + //把活动写入 + item.prom=prom; //判断秒杀的限购 if (item.goods_num + promgoodsbuynum > prom.buy_limit && prom.buy_limit > 0) { @@ -984,6 +997,8 @@ Page({ }, 0, 1); continue; } + + item.prom=prom; //判断秒杀的限购 var msNum = 0 await getApp().request.promiseGet("/api/weshop/rechargeServicelist/getUserBuyGoodsNum", { @@ -3327,6 +3342,18 @@ Page({ if (res.data.code == 0) gd = res.data.data; }) + //判断秒杀的指定门店 + if(py_type==1 && i_arr[j].prom && i_arr[j].prom.pick_up_lists){ + var idx0=i_arr[j].prom.pick_up_lists.findIndex(function (e){ + return e.pickup_id==i_arr[j].pick_id; + }) + if(idx0<0){ + getApp().confirmBox(i_arr[j].goods_name + "秒杀活动的门店不可售"); + wx.hideLoading(); + return false; + } + } + if ([0, 3, 5, 7, 10].indexOf(py_type) > -1) { //如果是指定门店，就要判断 if(gd.pick_group_ids){ @@ -3582,8 +3609,22 @@ Page({ store_id: oo.stoid } }); + + + //判断秒杀的指定门店 + if(i_arr[j].prom_type==1 && i_arr[j].prom && i_arr[j].prom.pick_up_lists && i_arr[j].selected){ + var idx0=i_arr[j].prom.pick_up_lists.findIndex(function (e){ + return e.pickup_id==i_arr[j].pick_id; + }) + if(idx0<0){ + getApp().confirmBox(i_arr[j].service_name + "秒杀活动的门店不可售"); + wx.hideLoading(); + return false; + } + } } } + //排除失效服务结算 this.data.invalidList.map(item => { if (item.selected && item.classType == 1) { @@ -3596,6 +3637,8 @@ Page({ }); } }) + + wx.hideLoading(); getApp().goto("/packageA/pages/cart2_ser/cart2_ser?is_cart=1"); } diff --git a/pages/cart/cart_wk/cart_wk.js b/pages/cart/cart_wk/cart_wk.js index a8ed543..eff2ef6 100644 --- a/pages/cart/cart_wk/cart_wk.js +++ b/pages/cart/cart_wk/cart_wk.js @@ -51,7 +51,10 @@ Page({ bn_is_post_temp:1, //是不是进行计算包邮模板 paying:0, //支付中 - same_ok:1 //同城配送的控制 + same_ok:1, //同城配送的控制 + formData:{ + order_prom_amount:0 + } }, diff --git a/pages/cart/cart_wk/cart_wk.wxml b/pages/cart/cart_wk/cart_wk.wxml index d030b69..884f90b 100644 --- a/pages/cart/cart_wk/cart_wk.wxml +++ b/pages/cart/cart_wk/cart_wk.wxml @@ -134,7 +134,7 @@ 支付合计： ¥{{filters.toFix(order.tail_money+exp_price,2)}} --> - 支付合计：¥{{filters.toFix(order.tail_money+exp_price-(bn_use_commission?goods.use_commission:0)-formData.order_prom_amount ,2)}} + 支付合计：¥{{filters.toFix(order.tail_money+exp_price-(bn_use_commission?goods.use_commission:0)-(formData.order_prom_amount?formData.order_prom_amount:0) ,2)}} 支付尾款 diff --git a/pages/goods/goodsInfo/goodsInfo.js b/pages/goods/goodsInfo/goodsInfo.js index 4347382..f2f6e6b 100644 --- a/pages/goods/goodsInfo/goodsInfo.js +++ b/pages/goods/goodsInfo/goodsInfo.js @@ -274,6 +274,8 @@ Page({ showFold:true, new_share_imgurl:'', //普通商品分享图片 + adding:0 //加入购物车的避免重复 + }, //------初始化加载---------- @@ -919,6 +921,8 @@ Page({ //---展示--- onShow: function () { + //添加购物车的控制要清理0 + this.data.adding=0; getApp().check_can_share(this); @@ -1389,6 +1393,15 @@ Page({ return false; } + if(th.data.adding) return false; + th.data.adding=1; + + wx.showLoading({ + mask:true + }) + + + //如果是秒杀的话，要看redis够不够 @@ -1403,7 +1416,8 @@ Page({ this.getactLen(function (num) { if (num < th.data.goodsInputNum) { - + wx.hideLoading(); + th.data.adding=0; // getApp().my_warnning("活动库存不足!", 0, th); wx.showToast({ title: '活动库存不足!', @@ -1583,10 +1597,14 @@ Page({ add_cart_func: function (t) { var i = getApp().request; if (oo.user_id == null) { + wx.hideLoading(); + th.data.adding=0; return s.my_warnning("还未登录！", 0, this); } if (!getApp().globalData.userInfo) { + wx.hideLoading(); + th.data.adding=0; return s.my_warnning("还未登录！", 0, this); } @@ -1601,6 +1619,8 @@ Page({ //---判断商品是否超出限购--- if (th.data.g_buy_num != null && th.data.sele_g.viplimited > 0) { if (th.data.goodsInputNum + th.data.g_buy_num.get(th.data.sele_g.goods_id) > th.data.sele_g.viplimited) { + wx.hideLoading(); + th.data.adding=0; wx.showToast({ title: '超出商品限购', icon: 'none', @@ -1612,6 +1632,8 @@ Page({ //---判断商品是否超出活动限购--- if ((th.data.prom_buy_num != -1 && th.data.prom_buy_limit > 0) && !th.data.is_normal) { if (th.data.goodsInputNum + th.data.prom_buy_num > th.data.prom_buy_limit) { + wx.hideLoading(); + th.data.adding=0; wx.showToast({ title: '超出商品活动限购', icon: 'none', @@ -1621,12 +1643,20 @@ Page({ } } - if (th.data.goodsInputNum <= 0) return s.my_warnning("商品数量不能为0", 0, th); + if (th.data.goodsInputNum <= 0){ + wx.hideLoading(); + th.data.adding=0; + return s.my_warnning("商品数量不能为0", 0, th); + } if (th.data.sto_sele_name == null || th.data.sto_sele_name == undefined) th.setData({ sto_sele_name: "" }); - if (th.data.sto_sele_name == "") return s.my_warnning("请选择门店", 0, th); + if (th.data.sto_sele_name == ""){ + wx.hideLoading(); + th.data.adding=0; + return s.my_warnning("请选择门店", 0, th); + } //--------------此时操作的数据------------ var newd = { @@ -1703,6 +1733,8 @@ Page({ th.check_CanOutQty(th.data.sele_g, pick, function (CanOutQty) { if (CanOutQty) { if (CanOutQty < e.data.goodsInputNum) { + wx.hideLoading(); + th.data.adding=0; wx.showToast({ title: '库存不足！', icon: 'none', @@ -1712,6 +1744,8 @@ Page({ th.add_cart_next(e, t, a, o, newd, CanOutQty); } else { + wx.hideLoading(); + th.data.adding=0; wx.showToast({ title: '库存不足！', icon: 'none', @@ -1723,47 +1757,52 @@ Page({ } else { if (o.store_count <= 0) { + wx.hideLoading(); + th.data.adding=0; wx.showToast({ title: '库存已为空！', icon: 'none' }); return false; - }; + } if (o.store_count < e.data.goodsInputNum) { + wx.hideLoading(); + th.data.adding=0; wx.showToast({ title: '库存不足！', icon: 'none', }); return false; // return s.my_warnning("库存不足！", 0, th); - }; + } th.add_cart_next(e, t, a, o, newd); //加入购物车下一步 }; - return false; } newd.goods_price = th.data.prom_price; newd.member_goods_price = th.data.prom_price, - newd.prom_type = th.data.prom_type; + newd.prom_type = th.data.prom_type; newd.prom_id = th.data.prom_id; if (o.store_count <= 0) { + wx.hideLoading(); + th.data.adding=0; wx.showToast({ title: '库存已为空！', icon: 'none', }); return false; - //return s.my_warnning("库存已为空！", 0, th); - }; + } if (o.store_count < e.data.goodsInputNum) { + wx.hideLoading(); + th.data.adding=0; wx.showToast({ title: '库存不足！', icon: 'none', }); return false; - }; - + } th.add_cart_next(e, t, a, o, newd); //加入购物车下一步 } else if (o.prom_type == 7) { @@ -1776,6 +1815,8 @@ Page({ newd.prom_id = th.data.sele_g.act.id; newd.prom_type = 7; if (o.store_count <= 0) { + wx.hideLoading(); + th.data.adding=0; wx.showToast({ title: '库存已为空！', icon: 'none', @@ -1783,6 +1824,8 @@ Page({ return false; }; if (o.store_count < e.data.goodsInputNum) { + wx.hideLoading(); + th.data.adding=0; wx.showToast({ title: '库存不足！', icon: 'none', @@ -1801,6 +1844,8 @@ Page({ if (CanOutQty) { if (CanOutQty < e.data.goodsInputNum) { + wx.hideLoading(); + th.data.adding=0; wx.showToast({ title: '库存不足！', icon: 'none', @@ -1810,6 +1855,8 @@ Page({ th.add_cart_next(e, t, a, o, newd, CanOutQty); } else { + wx.hideLoading(); + th.data.adding=0; wx.showToast({ title: '库存不足！', icon: 'none', @@ -1820,6 +1867,8 @@ Page({ } else { if (o.store_count <= 0) { + wx.hideLoading(); + th.data.adding=0; wx.showToast({ title: '库存已为空！', icon: 'none', @@ -1828,6 +1877,8 @@ Page({ //return s.my_warnning("库存已为空！", 0, th); }; if (o.store_count < e.data.goodsInputNum) { + wx.hideLoading(); + th.data.adding=0; wx.showToast({ title: '库存不足！', icon: 'none', @@ -1854,6 +1905,8 @@ Page({ if (CanOutQty) { if (CanOutQty < e.data.goodsInputNum) { + wx.hideLoading(); + th.data.adding=0; wx.showToast({ title: '库存不足！', icon: 'none', @@ -1863,6 +1916,7 @@ Page({ th.add_cart_next(e, t, a, o, newd, CanOutQty); } else { + wx.hideLoading(); wx.showToast({ title: '库存不足！', icon: 'none', @@ -1873,6 +1927,7 @@ Page({ } else { if (o.store_count <= 0) { + wx.hideLoading(); wx.showToast({ title: '库存已为空！', icon: 'none', @@ -1881,13 +1936,14 @@ Page({ //return s.my_warnning("库存已为空！", 0, th); }; if (o.store_count < e.data.goodsInputNum) { + wx.hideLoading(); wx.showToast({ title: '库存不足！', icon: 'none', }); return false; //return s.my_warnning("库存不足！", 0, th); - }; + } th.add_cart_next(e, t, a, o, newd); //加入购物车下一步 } } @@ -1899,6 +1955,8 @@ Page({ //---加入购物车的最后一步--- add_cart_next(e, t, a, o, newd, CanOutQty) { + + if (getApp().globalData.groupchat_id) { newd.groupchat_id = getApp().globalData.groupchat_id } @@ -1933,26 +1991,10 @@ Page({ //if (this.data.data.goods.is_virtual) return this.buyVirtualGoods(d); if ("add" == t.currentTarget.dataset.action) { - if ([3, 5, 10].indexOf(newd.prom_type) > -1) { - newd.prom_type = 0; - newd.prom_id = 0; - } - - //如果有搭配购的时候的时候 - if (th.data.collocationGoods && newd.prom_type == 0) { - newd.prom_type = 5; - newd.prom_id = th.data.collocationGoods.id; - } - - //如果有搭配购的时候的时候 - if (th.data.zh_act && (!th.data.zh_act.zh_num || th.data.zh_act.zh_buy_num < th.data.zh_act.zh_num) && newd.prom_type == 0) { - newd.prom_type = 7; - newd.prom_id = th.data.zh_act.id; + if( [3,5,7,10].indexOf(newd.prom_type)>-1){ + newd.prom_type=0; + newd.prom_id=0; } - // if( [3,5,10].indexOf(newd.prom_type)>-1){ - // newd.prom_type=0; - // newd.prom_id=0; - // } // // //如果有搭配购的时候的时候 // if(th.data.collocationGoods && newd.prom_type==0){ @@ -1973,6 +2015,8 @@ Page({ user_id: oo.user_id, goods_id: a, pick_id: e.data.sto_sele_id, + prom_type: newd.prom_type, + prom_id: newd.prom_id, state: 0, }, success: function (re) { @@ -2002,6 +2046,8 @@ Page({ //判断数量，要看下购物车中有没有该商品 if (CanOutQty) { if (item.goods_num + th.data.goodsInputNum > CanOutQty) { + wx.hideLoading(); + th.data.adding=0; wx.showToast({ title: '库存不足！', icon: 'none', @@ -2011,6 +2057,8 @@ Page({ } } else { if (item.goods_num + th.data.goodsInputNum > o.store_count) { + wx.hideLoading(); + th.data.adding=0; wx.showToast({ title: '库存不足！', icon: 'none', @@ -2019,7 +2067,10 @@ Page({ //return s.my_warnning("库存不足！", 0, th); } - if (item.goods_num + th.data.goodsInputNum + th.data.prom_buy_num > th.data.prom_buy_limit && (th.data.prom_type == 1 || th.data.prom_type == 2)) { + //秒杀有限购的时候，同时不是普通购买 + if ( item.goods_num + th.data.goodsInputNum + th.data.prom_buy_num > th.data.prom_buy_limit && th.data.prom_buy_limit>0 && !newd.is_pd_normal && (th.data.prom_type == 1 || th.data.prom_type == 2)) { + wx.hideLoading(); + th.data.adding=0; wx.showToast({ title: '此商品已在购物车，去购物车结算！', icon: 'none', @@ -2035,9 +2086,14 @@ Page({ goods_price: newd.goods_price, member_goods_price: newd.goods_price, store_id: th.data.stoid, - prom_id: newd.prom_id //把活动id带上去(用于购物车失效变成有效商品) + prom_id: newd.prom_id, //把活动id带上去(用于购物车失效变成有效商品) + prom_type: newd.prom_type }; + if(newd.is_pd_normal){ + updata.is_pd_normal=1 + } + //---是不是从收藏夹出来的--- if (th.data.c_guide_id) { updata['guide_id'] = th.data.c_guide_id; @@ -2055,6 +2111,8 @@ Page({ getApp().request.put("/api/weshop/cart/update", { data: updata, success: function (t) { + wx.hideLoading(); + th.data.adding=0; getApp().my_warnning('加入购物车成功', 1, th, 450); var c_num = th.data.cartGoodsNum + th.data.goodsInputNum; th.setData({ @@ -2067,6 +2125,8 @@ Page({ getApp().request.post("/api/weshop/cart/save", { data: newd, success: function (t) { + wx.hideLoading(); + th.data.adding=0; getApp().my_warnning('加入购物车成功', 1, th, 450); var c_num = th.data.cartGoodsNum + e.data.goodsInputNum; th.setData({ @@ -3223,6 +3283,7 @@ Page({ //要把不匹配还原 if (th.data.def_pick_store && JSON.stringify(th.data.def_pick_store) != '{}'){ th.data.def_pick_store.is_no_dis=0; + th.data.def_pick_store.is_no_dis_nor=0; th.setData({def_pick_store:th.data.def_pick_store}) } @@ -3569,14 +3630,25 @@ Page({ if (e.data.code == 0 && e.data.data && e.data.data.pageData && e.data.data.pageData.length > 0) { + var pickup_ids=th.data.sele_g.pickup_ids; + //不是单独购买的时候，要清空商品pickup_ids + if(!is_normal && th.data.prom_type>0){ + pickup_ids=null; + } + + //指定门店判断， 不是普通购买的时候，秒杀的时候，秒杀有指定门店 + if(!is_normal && th.data.prom_type==1 && th.data.prom_act.pick_up_lists){ + pickup_ids=th.data.prom_act.pick_up_lists + } + //-- 如果有指定门店的时候 -- - if(th.data.sele_g.pickup_ids){ + if(pickup_ids){ var ok_arr=[]; for (let i in e.data.data.pageData) { let ite = e.data.data.pageData[i]; //-- 查找一下门店有没有在 -- - var idx=th.data.sele_g.pickup_ids.findIndex(function (e){ + var idx=pickup_ids.findIndex(function (e){ return e.pickup_id==ite.pickup_id; }) if(idx>-1){ @@ -3588,22 +3660,44 @@ Page({ if (th.data.def_pick_store && JSON.stringify(th.data.def_pick_store) != '{}'){ //-- 查找一下门店有没有在 -- - var idx1=th.data.sele_g.pickup_ids.findIndex(function (e){ + var idx1=pickup_ids.findIndex(function (e){ return e.pickup_id==th.data.def_pick_store.pickup_id; }) if(idx1<0){ - th.data.def_pick_store.is_no_dis_nor=1; - that.setData({ - def_pick_store: th.data.def_pick_store - }) + //如果是秒杀的指定门店，就要设置秒杀的 + if(!is_normal && th.data.prom_type==1){ + th.data.def_pick_store.is_no_dis_act=1; + }else{ + th.data.def_pick_store.is_no_dis_nor=1; + } + + }else{ + th.data.def_pick_store.is_no_dis_nor=0; + th.data.def_pick_store.is_no_dis_act=0; } + + that.setData({ + def_pick_store: th.data.def_pick_store + }) + } - e.data.data.pageData=ok_arr; //数组重新赋值 + e.data.data.pageData=ok_arr; //数组重新赋值 e.data.data.total=ok_arr.length; //数组的长度 } + else{ + //-- 多规格指定门店优化 -- + if (th.data.def_pick_store && JSON.stringify(th.data.def_pick_store) != '{}'){ + th.data.def_pick_store.is_no_dis_nor=0; + th.data.def_pick_store.is_no_dis_act=0; + that.setData({ + def_pick_store: th.data.def_pick_store + }) + } + + } var his_cate_num = 0; for (let i in e.data.data.pageData) { @@ -5087,6 +5181,13 @@ Page({ //如果是拼单活动的普通购买 if (ind == 1) { + + //要把不匹配还原 + if (th.data.def_pick_store && JSON.stringify(th.data.def_pick_store) != '{}'){ + th.data.def_pick_store.is_no_dis_nor=0; + th.setData({def_pick_store:th.data.def_pick_store}) + } + if (!th.data.is_normal) { th.data.g_buy_num = new Map(); } @@ -5207,6 +5308,12 @@ Page({ th = e, o = this.data.sele_g; + if(th.data.adding) return false; + th.data.adding=0; + + wx.showLoading({ + mask:true + }) //----------添加到购物车时，要判断限购数量，-------- e.get_buy_num(o, async function (ee) { @@ -5214,6 +5321,9 @@ Page({ //---判断商品是否超出限购--- if (th.data.g_buy_num != null && th.data.sele_g.viplimited > 0) { if (th.data.goodsInputNum + th.data.g_buy_num.get(th.data.sele_g.goods_id) > th.data.sele_g.viplimited) { + + wx.hideLoading(); + th.data.adding=0; wx.showToast({ title: '超出商品限购', icon: 'none', @@ -5231,6 +5341,8 @@ Page({ //---判断商品是否超出活动限购,拼团的普通购买不计算活动的限购--- if (th.data.prom_buy_num != -1 && th.data.prom_buy_limit > 0 && th.data.is_normal != 1) { if (th.data.goodsInputNum + th.data.prom_buy_num > th.data.prom_buy_limit) { + wx.hideLoading(); + th.data.adding=0; wx.showToast({ title: '超出商品活动限购', icon: 'none', @@ -5250,6 +5362,8 @@ Page({ if (th.data.is_normal != 1) { if (o.store_count <= 0) { + wx.hideLoading(); + th.data.adding=0; wx.showToast({ title: '库存已为空！', icon: 'none', @@ -5265,6 +5379,8 @@ Page({ }) if (th.data.goodsInputNum > redis_num) { + wx.hideLoading(); + th.data.adding=0; wx.showToast({ title: '超出商品活动库存', icon: 'none', @@ -5278,6 +5394,8 @@ Page({ } } else { if (o.store_count <= 0) { + wx.hideLoading(); + th.data.adding=0; wx.showToast({ title: '库存已为空！', icon: 'none', @@ -5288,6 +5406,8 @@ Page({ } if (th.data.goodsInputNum <= 0) { + wx.hideLoading(); + th.data.adding=0; wx.showToast({ title: '商品数量不能为0', icon: 'none', @@ -5297,9 +5417,8 @@ Page({ }; if (th.data.goodsInputNum > o.store_count) { - // th.setData({ - // goodsInputNum: o.store_count - // }) + wx.hideLoading(); + th.data.adding=0; wx.showToast({ title: '超出商品库存', icon: 'none', @@ -5312,7 +5431,11 @@ Page({ th.setData({ sto_sele_name: "" }); - if (th.data.sto_sele_name == "") return s.my_warnning("请选择门店", 0, th); + if (th.data.sto_sele_name == ""){ + wx.hideLoading(); + th.data.adding=0; + return s.my_warnning("请选择门店", 0, th); + } //--------------此时操作的数据------------ var newd = { goods_id: o.goods_id, @@ -7959,6 +8082,13 @@ Page({ this.data.g_buy_num = new Map(); var th = this; + + //要把不匹配还原 + if (th.data.def_pick_store && JSON.stringify(th.data.def_pick_store) != '{}'){ + th.data.def_pick_store.is_no_dis_nor=0; + th.setData({def_pick_store:th.data.def_pick_store}) + } + if (th.data.sku_g_pt) { //要同步指定门店 @@ -8031,9 +8161,25 @@ Page({ url += "&groupchat_id=" + getApp().globalData.groupchat_id } + //获取有活动的取活动图片，没有活动的取主图 + var img = th.data.sele_g.original_img; + if(th.data.new_share_imgurl){ + img = th.data.iurl + th.data.new_share_imgurl + } + if (th.data.prom_type == 6 || th.data.prom_type == 1 || th.data.prom_type == 4) { + // title = th.data.prom_act.share_title; + // if (!title) title = th.data.prom_act.title; + // if (th.data.prom_type == 4) title = th.data.prom_act.name; + + if (th.data.prom_act.share_imgurl) + img = th.data.iurl + th.data.prom_act.share_imgurl; + } + let user_id = getApp().globalData.user_id + console.error(img); return { title: this.data.data.goods_name + '-' + store_name, - imageUrl: this.data.gallery[0].image_url, + // imageUrl: this.data.gallery[0].image_url, + imageUrl: img, query: 'first_leader=' + user_id + url } }, @@ -8486,7 +8632,16 @@ Page({ open_ind_store: 5, }); //拼团直接给4 + //要把不匹配还原 + if (th.data.def_pick_store && JSON.stringify(th.data.def_pick_store) != '{}'){ + th.data.def_pick_store.is_no_dis_nor=0; + th.setData({def_pick_store:th.data.def_pick_store}) + } + if (th.data.sku_g_pt) { + //要同步指定门店 + th.set_sele_g(th.data.sku_g_pt); + this.get_sto(1) this.setData({ openSpecModal_flash_normal: 1 diff --git a/pages/goods/goodsInfo/goodsInfo.wxml b/pages/goods/goodsInfo/goodsInfo.wxml index 3c01209..e1337e7 100644 --- a/pages/goods/goodsInfo/goodsInfo.wxml +++ b/pages/goods/goodsInfo/goodsInfo.wxml @@ -712,6 +712,9 @@ (该店不可售) + + (该店不可售) + (库存不足) @@ -1325,7 +1328,10 @@ (库存不足) (配送不匹配) + (该店不可售) + (该店不可售) + (该店不可售) (库存不足) @@ -1385,6 +1391,12 @@ 该店不可售 + + 该店不可售 + + + 该店不可售 + @@ -1641,6 +1653,8 @@ (库存不足) (配送不匹配) (该店不可售) + (该店不可售) + (该店不可售) @@ -1670,6 +1684,8 @@ {{item.pickup_name}} (配送不匹配) (该店不可售) + (该店不可售) + (该店不可售) (库存不足) diff --git a/pages/goods/goodsList/goodsList.js b/pages/goods/goodsList/goodsList.js index 765e2e7..2cd84fd 100644 --- a/pages/goods/goodsList/goodsList.js +++ b/pages/goods/goodsList/goodsList.js @@ -43,10 +43,17 @@ Page({ fil_price_state:0, limit_num:0, gr_fir:0, //分组第一次 + share_imgurl:'', //分享图片 }, onLoad: function(t) { + //----------商品分组自定义分享图片---------- + if (t.gid || t.group_id) { + let id = t.gid || t.group_id + this.get_share_imgurl(id) //获取分享图片 + } + //---------------------end------------ this.data.rq_data=t; //接受有没有导购的参数 @@ -241,6 +248,18 @@ Page({ onShow:function () { getApp().check_can_share(); }, + //获取商品分组分享图片 + get_share_imgurl(gid){ + getApp().request.promiseGet("/api/weshop/goodsGroup/get/" + oo.stoid + "/" + gid, {}).then(res => { + if (res.data.code == 0) { + let prom = res.data.data; + let share_imgurl =prom.share_imgurl + this.setData({ + share_imgurl + }) + } + }) + }, //获取优惠活动 async getprom(prom_id){ await getApp().request.promiseGet("/api/weshop/promgoods/get/" + oo.stoid + "/" + prom_id, {}).then(res => { @@ -306,6 +325,10 @@ Page({ }, changeTab: function(t) { + + //清空 + this.data.gr_fir=0; + var ord = t.currentTarget.dataset.href; var ad = t.currentTarget.dataset.ad; var url = this.data.requestUrl; @@ -335,7 +358,6 @@ Page({ t += "&orderField=" + e.data.tabname; t += "&orderType=" + e.data.adname; } - this.data.gr_fir=0; t +="&page=" + e.data.currentPage; @@ -487,9 +509,11 @@ Page({ } } console.log("11-11"+pagePath); + let share_imgurl=this.data.iurl + this.data.share_imgurl return { title: "商品列表", path:pagePath, + imageUrl:share_imgurl } }, //---图片失败，默认图片--- @@ -547,11 +571,18 @@ Page({ }, /*-- 和筛选相关的 --*/ - bind_pk_sort(e){ com_fil.bind_pk_sort(e,this); }, + bind_pk_sort(e){ //清空 + this.data.gr_fir=0; com_fil.bind_pk_sort(e,this); + }, set_screen(url){ com_fil.set_screen(url,this); }, - filterGoods(e){ com_fil.filterGoods(e,this); }, + filterGoods(e){ + //清空 + this.data.gr_fir=0;com_fil.filterGoods(e,this); + }, open_more(e){ com_fil.open_more(e,this); }, - clear_fil(){ com_fil.clear_fil(this); } + clear_fil(){ //清空 + this.data.gr_fir=0;com_fil.clear_fil(this); + } }); \ No newline at end of file diff --git a/pages/user/index/index.js b/pages/user/index/index.js index 536b0b8..3180f93 100644 --- a/pages/user/index/index.js +++ b/pages/user/index/index.js @@ -699,7 +699,7 @@ Page({ //--跳到绑定页面-- gobindtel: function () { wx.navigateTo({ - url: '/packageE/pages/togoin/togoin', + url: '/packageE/pages/togoin/togoin?is_reg=1', }) }, diff --git a/pages/user/order_detail/order_detail.js b/pages/user/order_detail/order_detail.js index 2def5cc..36fb685 100644 --- a/pages/user/order_detail/order_detail.js +++ b/pages/user/order_detail/order_detail.js @@ -978,6 +978,19 @@ Page({ } //----------如果有活动，并且在进行中，就不计算线下库存--------------- if (prom) { + + //指定门店的控制 + if (goodsinfo.prom_type == 1 && prom.pick_up_lists) { + var idx0=prom.pick_up_lists.findIndex(function (e){ + return e.pickup_id==order.pickup_id; + }) + if(idx0<0){ + getApp().confirmBox(goodsinfo.goods_name + "秒杀活动的门店不可售"); + th.setData({ paying: 0 }); + return false; + } + } + var now = ut.gettimestamp(); if (prom.is_end == 1 && prom.end_time < now) { var content = goodsinfo.goods_name + '商品的活动已经结束,请取消订单' @@ -2119,7 +2132,7 @@ Page({ good_url="/packageC/pages/presell/goodsInfo/goodsInfo?goods_id="+gd+"&prom_id="+item.act_id break; default: - good_url="/pages/goods/goodsInfo/goodsInfo?goods_id="+gd+"&prom_id="+item.act_id+"&prom_type=1"; + good_url="/pages/goods/goodsInfo/goodsInfo?goods_id="+gd+"&prom_id="+item.act_id+"&prom_type="+item.prom_type; break } } diff --git a/pages/user/order_list/order_list.js b/pages/user/order_list/order_list.js index 766eab5..95b35b4 100644 --- a/pages/user/order_list/order_list.js +++ b/pages/user/order_list/order_list.js @@ -1292,6 +1292,20 @@ Page({ } //----------如果有活动，并且在进行中，就不计算线下库存--------------- if (prom) { + + //指定门店的控制 + if (goodsinfo.prom_type == 1 && prom.pick_up_lists) { + var idx0=prom.pick_up_lists.findIndex(function (e){ + return e.pickup_id==order.pickup_id; + }) + if(idx0<0){ + getApp().confirmBox(goodsinfo.goods_name + "秒杀活动的门店不可售"); + th.setData({ paying: 0 }); + return false; + } + } + + var now = ut.gettimestamp(); if (prom.is_end == 1 && prom.end_time < now) { var content = goodsinfo.goods_name + '商品的活动已经结束,请取消订单' @@ -2849,10 +2863,24 @@ Page({ return false; } + + //指定门店的控制 + if (act_details.pick_up_lists) { + var idx0=act_details.pick_up_lists.findIndex(function (e){ + return e.pickup_id==it.pickup_id; + }) + if(idx0<0){ + getApp().confirmBox(it.service_name + "秒杀活动的门店不可售"); + th.setData({ paying: 0 }); + flag = false; + return false; + } + } + } }); - if(act_details.buy_limit>0 && flag){ + if(act_details && act_details.buy_limit>0 && flag){ await getApp().request.promiseGet("/api/weshop/rechargeServicelist/getUserBuyGoodsNum", { data: { store_id: store_id,