Commit bdd4fa471f593acaeeacf8d2884bba00aceafc10
1 parent
a2b4bec6
优惠促销多活动的优化
Showing
3 changed files
with
269 additions
and
150 deletions
pages/goods/goodsInfo/goodsInfo.js
| @@ -268,6 +268,8 @@ Page({ | @@ -268,6 +268,8 @@ Page({ | ||
| 268 | base_nor_prom_id:0, | 268 | base_nor_prom_id:0, |
| 269 | base_nor_goods_id:0, | 269 | base_nor_goods_id:0, |
| 270 | user_pre_buynum:0, //用户优惠促销参与次数 | 270 | user_pre_buynum:0, //用户优惠促销参与次数 |
| 271 | + | ||
| 272 | + cx_prom_group:[], //促销活动，用于显示和判断默认要用什么促销活动 | ||
| 271 | }, | 273 | }, |
| 272 | 274 | ||
| 273 | //------初始化加载---------- | 275 | //------初始化加载---------- |
| @@ -2768,26 +2770,11 @@ Page({ | @@ -2768,26 +2770,11 @@ Page({ | ||
| 2768 | 2770 | ||
| 2769 | var r_data = res.data.data; | 2771 | var r_data = res.data.data; |
| 2770 | 2772 | ||
| 2771 | - if(r_data.collocationList){ | ||
| 2772 | - th.data.ladderLists =null; | ||
| 2773 | - th.data.prom_goods =null; | ||
| 2774 | - r_data.promGoodsLists=null; | ||
| 2775 | - r_data.ladderLists=null; | ||
| 2776 | - } | ||
| 2777 | - | ||
| 2778 | if (r_data.ladderLists) { | 2773 | if (r_data.ladderLists) { |
| 2779 | var act_id = r_data.ladderLists[0].form_id; | 2774 | var act_id = r_data.ladderLists[0].form_id; |
| 2780 | //-- 判断会员能不能参与阶梯促销 -- | 2775 | //-- 判断会员能不能参与阶梯促销 -- |
| 2781 | await getApp().request.promiseGet("/api/weshop/prom/ladderForm/getNew/" + os.stoid + "/" + usr.user_id + "/" + act_id, {}).then(res => { | 2776 | await getApp().request.promiseGet("/api/weshop/prom/ladderForm/getNew/" + os.stoid + "/" + usr.user_id + "/" + act_id, {}).then(res => { |
| 2782 | if (res.data.code == 0 && res.data.data) { | 2777 | if (res.data.code == 0 && res.data.data) { |
| 2783 | - var prom_content = ""; | ||
| 2784 | - //暂定优惠促销还不能重叠 | ||
| 2785 | - if (res.data.data.good_object == 0 && (r_data.promGoodsLists || th.data.zh_act)) { | ||
| 2786 | - return false; | ||
| 2787 | - } | ||
| 2788 | - if (res.data.data.good_object == 1) { | ||
| 2789 | - r_data.promGoodsLists = null; | ||
| 2790 | - } | ||
| 2791 | th.data.ladderLists = r_data.ladderLists; | 2778 | th.data.ladderLists = r_data.ladderLists; |
| 2792 | } | 2779 | } |
| 2793 | }) | 2780 | }) |
| @@ -3294,7 +3281,7 @@ Page({ | @@ -3294,7 +3281,7 @@ Page({ | ||
| 3294 | 3281 | ||
| 3295 | 3282 | ||
| 3296 | //普通商品多规格的时候，商品切换 | 3283 | //普通商品多规格的时候，商品切换 |
| 3297 | - if([1,2,4,8,9].indexOf(this.data.base_nor_prom_type)==-1){ | 3284 | + if([1,2,4,6,8,9].indexOf(this.data.base_nor_prom_type)==-1){ |
| 3298 | this.setData({ | 3285 | this.setData({ |
| 3299 | prom_goods:null, | 3286 | prom_goods:null, |
| 3300 | jieti_prom:null, | 3287 | jieti_prom:null, |
| @@ -3337,7 +3324,7 @@ Page({ | @@ -3337,7 +3324,7 @@ Page({ | ||
| 3337 | if (nor) that.get_sto(1); | 3324 | if (nor) that.get_sto(1); |
| 3338 | else that.get_sto(); | 3325 | else that.get_sto(); |
| 3339 | 3326 | ||
| 3340 | - if (!item.whsle_id) that.check_is_youhui(gid, that.data.is_normal); | 3327 | + |
| 3341 | 3328 | ||
| 3342 | //默认门店要拿下门店库存 | 3329 | //默认门店要拿下门店库存 |
| 3343 | if (that.data.sales_rules >= 2 && that.data.def_pick_store && !that.data.sele_g.whsle_id) { | 3330 | if (that.data.sales_rules >= 2 && that.data.def_pick_store && !that.data.sele_g.whsle_id) { |
| @@ -3356,7 +3343,7 @@ Page({ | @@ -3356,7 +3343,7 @@ Page({ | ||
| 3356 | this.sele_spec_chech_activity(nor); | 3343 | this.sele_spec_chech_activity(nor); |
| 3357 | 3344 | ||
| 3358 | //如果是秒杀，拼团等互动，就不重新算界面 | 3345 | //如果是秒杀，拼团等互动，就不重新算界面 |
| 3359 | - if([1,2,4,8,9].indexOf(this.data.base_nor_prom_type)>0){ return false; } | 3346 | + if([1,2,4,6,8,9].indexOf(this.data.base_nor_prom_type)>0){ return false; } |
| 3360 | 3347 | ||
| 3361 | this.check_has_flash(gid); | 3348 | this.check_has_flash(gid); |
| 3362 | var url = '/api/weshop/activitylist/listGoodActInfo2New'; | 3349 | var url = '/api/weshop/activitylist/listGoodActInfo2New'; |
| @@ -3376,6 +3363,8 @@ Page({ | @@ -3376,6 +3363,8 @@ Page({ | ||
| 3376 | var arr3 = arr.filter(function (e) { | 3363 | var arr3 = arr.filter(function (e) { |
| 3377 | return e.s_time < ut.gettimestamp() && e.prom_type==7; | 3364 | return e.s_time < ut.gettimestamp() && e.prom_type==7; |
| 3378 | }) | 3365 | }) |
| 3366 | + | ||
| 3367 | + //-- 组合购要在面前计算 --,计算完之后，再来计算check_is_youhui -- | ||
| 3379 | if(arr3 && arr3.length>0){ | 3368 | if(arr3 && arr3.length>0){ |
| 3380 | //获取活动信息 | 3369 | //获取活动信息 |
| 3381 | var url = "/api/weshop/prom/zhbuy/get/" + os.stoid + "/" + | 3370 | var url = "/api/weshop/prom/zhbuy/get/" + os.stoid + "/" + |
| @@ -3393,10 +3382,12 @@ Page({ | @@ -3393,10 +3382,12 @@ Page({ | ||
| 3393 | }); | 3382 | }); |
| 3394 | th.getUserBuyPromNum(e.data.data.id) | 3383 | th.getUserBuyPromNum(e.data.data.id) |
| 3395 | } | 3384 | } |
| 3396 | - | ||
| 3397 | } | 3385 | } |
| 3386 | + if (!item.whsle_id) that.check_is_youhui(gid, that.data.is_normal); | ||
| 3398 | } | 3387 | } |
| 3399 | }); | 3388 | }); |
| 3389 | + }else{ | ||
| 3390 | + if (!item.whsle_id) that.check_is_youhui(gid, that.data.is_normal); | ||
| 3400 | } | 3391 | } |
| 3401 | 3392 | ||
| 3402 | } | 3393 | } |
| @@ -7378,6 +7369,17 @@ Page({ | @@ -7378,6 +7369,17 @@ Page({ | ||
| 7378 | } | 7369 | } |
| 7379 | } | 7370 | } |
| 7380 | 7371 | ||
| 7372 | + //-- 如果有组合购的时候 -- | ||
| 7373 | + if(th.data.zh_act){ | ||
| 7374 | + //-- 开始组装数据 -- | ||
| 7375 | + th.add_cx_prom_group({ | ||
| 7376 | + id: fir_act.prom_id, | ||
| 7377 | + condition: fir_act.condition + (item.prom_type == 1 ? '件' : '元'), | ||
| 7378 | + limit: '每人' + (fir_act.limit_num ? '限参与' + fir_act.limit_num + '次' : '参与不限次'), | ||
| 7379 | + more: more_arr, | ||
| 7380 | + prom_type:7 | ||
| 7381 | + }); | ||
| 7382 | + } | ||
| 7381 | 7383 | ||
| 7382 | //调用接口判断订单优惠， | 7384 | //调用接口判断订单优惠， |
| 7383 | await getApp().request.promiseGet("/api/weshop/goods/getGoodsPromListNew1/" + os.stoid + "/" + gid + "/0" + "/" + user_id, { | 7385 | await getApp().request.promiseGet("/api/weshop/goods/getGoodsPromListNew1/" + os.stoid + "/" + gid + "/0" + "/" + user_id, { |
| @@ -7385,13 +7387,8 @@ Page({ | @@ -7385,13 +7387,8 @@ Page({ | ||
| 7385 | if (res.data.code == 0 && res.data.data) { | 7387 | if (res.data.code == 0 && res.data.data) { |
| 7386 | var r_data = res.data.data; | 7388 | var r_data = res.data.data; |
| 7387 | var max = 0, min = 0; | 7389 | var max = 0, min = 0; |
| 7388 | - //暂时积分够 不和 优惠，阶梯重叠 | ||
| 7389 | - if(th.data.zh_act){ | ||
| 7390 | - r_data.collocationList=null; | ||
| 7391 | - r_data.ladderLists=null; | ||
| 7392 | - r_data.promGoodsLists=null; | ||
| 7393 | - } | ||
| 7394 | 7390 | ||
| 7391 | + //如果是搭配购的时候 | ||
| 7395 | if (r_data.collocationList) { | 7392 | if (r_data.collocationList) { |
| 7396 | for (var i in r_data.collocationList) { | 7393 | for (var i in r_data.collocationList) { |
| 7397 | if (max == 0) max = r_data.collocationList[i].price; | 7394 | if (max == 0) max = r_data.collocationList[i].price; |
| @@ -7402,13 +7399,20 @@ Page({ | @@ -7402,13 +7399,20 @@ Page({ | ||
| 7402 | } | 7399 | } |
| 7403 | r_data.collocationPromList.max = (max + th.data.data.shop_price).toFixed(2); | 7400 | r_data.collocationPromList.max = (max + th.data.data.shop_price).toFixed(2); |
| 7404 | r_data.collocationPromList.min = (min + th.data.data.shop_price).toFixed(2); | 7401 | r_data.collocationPromList.min = (min + th.data.data.shop_price).toFixed(2); |
| 7405 | - | ||
| 7406 | - //如果有搭配促销先不和 阶梯促销和优惠测序重合,做到后台可以重合 | ||
| 7407 | - r_data.ladderLists=null; | ||
| 7408 | - r_data.promGoodsLists=null; | 7402 | + var show_price= '￥'+r_data.collocationPromList.max+'-'+ r_data.collocationPromList.min; |
| 7403 | + var show_time=ut.formatTime(r_data.collocationPromList.start_time)+"至"+ ut.formatTime(r_data.collocationPromList.end_time); | ||
| 7404 | + | ||
| 7405 | + //-- 开始组装数据 -- | ||
| 7406 | + th.add_cx_prom_group({ | ||
| 7407 | + id: r_data.collocationPromList.id, | ||
| 7408 | + title: r_data.collocationPromList.title, | ||
| 7409 | + show_price: show_price, | ||
| 7410 | + show_time: show_time, | ||
| 7411 | + prom_type:5 | ||
| 7412 | + }); | ||
| 7409 | } | 7413 | } |
| 7410 | 7414 | ||
| 7411 | - | 7415 | + //-- 如果是阶梯促销的时候 -- |
| 7412 | if (r_data.ladderLists) { | 7416 | if (r_data.ladderLists) { |
| 7413 | var act_id = r_data.ladderLists[0].form_id; | 7417 | var act_id = r_data.ladderLists[0].form_id; |
| 7414 | //-- 判断会员能不能参与阶梯促销 -- | 7418 | //-- 判断会员能不能参与阶梯促销 -- |
| @@ -7416,15 +7420,6 @@ Page({ | @@ -7416,15 +7420,6 @@ Page({ | ||
| 7416 | if (res.data.code == 0 && res.data.data) { | 7420 | if (res.data.code == 0 && res.data.data) { |
| 7417 | var prom_content = ""; | 7421 | var prom_content = ""; |
| 7418 | 7422 | ||
| 7419 | - //暂定优惠促销还不能重叠 | ||
| 7420 | - if(res.data.data.good_object==0 && (r_data.promGoodsLists || th.data.zh_act)){ | ||
| 7421 | - return false; | ||
| 7422 | - } | ||
| 7423 | - | ||
| 7424 | - if(res.data.data.good_object==1){ | ||
| 7425 | - r_data.promGoodsLists=null; | ||
| 7426 | - } | ||
| 7427 | - | ||
| 7428 | for (let jj in r_data.ladderLists) { | 7423 | for (let jj in r_data.ladderLists) { |
| 7429 | if (r_data.ladderLists[jj].discount == 10) { | 7424 | if (r_data.ladderLists[jj].discount == 10) { |
| 7430 | prom_content += "第" + (parseInt(jj) + 1) + "件原价，"; | 7425 | prom_content += "第" + (parseInt(jj) + 1) + "件原价，"; |
| @@ -7433,16 +7428,58 @@ Page({ | @@ -7433,16 +7428,58 @@ Page({ | ||
| 7433 | } | 7428 | } |
| 7434 | } | 7429 | } |
| 7435 | prom_content = ut.sub_last(prom_content); | 7430 | prom_content = ut.sub_last(prom_content); |
| 7436 | - th.data.prom_type = 10; | ||
| 7437 | - th.data.prom_id = act_id; | ||
| 7438 | - th.setData({ | ||
| 7439 | - jieti_prom: prom_content, | ||
| 7440 | - ladder_act_id: act_id | ||
| 7441 | - }) | 7431 | + |
| 7432 | + // th.data.prom_type = 10; | ||
| 7433 | + // th.data.prom_id = act_id; | ||
| 7434 | + // th.setData({ | ||
| 7435 | + // jieti_prom: prom_content, | ||
| 7436 | + // ladder_act_id: act_id | ||
| 7437 | + // }) | ||
| 7438 | + | ||
| 7439 | + var s_time=res.data.data.start_time; | ||
| 7440 | + var e_time=res.data.data.end_time; | ||
| 7441 | + th.add_cx_prom_group({ | ||
| 7442 | + id: act_id, | ||
| 7443 | + title: prom_content, | ||
| 7444 | + show_time: ut.formatTime(s_time) + "至" + ut.formatTime(e_time), | ||
| 7445 | + prom_type:10 | ||
| 7446 | + }); | ||
| 7447 | + | ||
| 7442 | } | 7448 | } |
| 7443 | }) | 7449 | }) |
| 7444 | } | 7450 | } |
| 7445 | 7451 | ||
| 7452 | + //优惠促销的时候 | ||
| 7453 | + if (r_data.promGoodsLists) { | ||
| 7454 | + var fir_act = r_data.promGoodsLists[0]; | ||
| 7455 | + var more_arr = []; | ||
| 7456 | + //减价 | ||
| 7457 | + if (fir_act.money > 0) more_arr.push('减价'+fir_act.money+'元'); | ||
| 7458 | + if (fir_act.sale > 0) more_arr.push('打'+fir_act.sale+'折'); | ||
| 7459 | + if (fir_act.past ==1) more_arr.push('包邮'); | ||
| 7460 | + if (fir_act.intValue > 0) more_arr.push('送'+fir_act.intValue+'积分'); | ||
| 7461 | + if (fir_act.couponId > 0) more_arr.push('送'+fir_act.couponMoney+'元优惠券'); | ||
| 7462 | + if (fir_act.gift_id) { | ||
| 7463 | + var is_more_gf=fir_act.gift_id.split(',') | ||
| 7464 | + if(is_more_gf.length>1){ | ||
| 7465 | + more_arr.push('送赠品'); | ||
| 7466 | + }else{ | ||
| 7467 | + more_arr.push('送'+fir_act.goods_name+' x'+fir_act.zp_num); | ||
| 7468 | + } | ||
| 7469 | + } | ||
| 7470 | + if (fir_act.lb_id) more_arr.push('送'+fir_act.lbtitle); | ||
| 7471 | + if (fir_act.zxlb_id) more_arr.push('送'+fir_act.zxlbtitle); | ||
| 7472 | + | ||
| 7473 | + //-- 开始组装数据 -- | ||
| 7474 | + th.add_cx_prom_group( { | ||
| 7475 | + id: fir_act.prom_id, | ||
| 7476 | + condition: fir_act.condition + (item.prom_type == 1 ? '件' : '元'), | ||
| 7477 | + limit: '每人' + (fir_act.limit_num ? '限参与' + fir_act.limit_num + '次' : '参与不限次'), | ||
| 7478 | + more: more_arr, | ||
| 7479 | + prom_type:3 | ||
| 7480 | + | ||
| 7481 | + }); | ||
| 7482 | + } | ||
| 7446 | 7483 | ||
| 7447 | //普通购买不在界面显示 | 7484 | //普通购买不在界面显示 |
| 7448 | if(is_nor){ | 7485 | if(is_nor){ |
| @@ -7456,6 +7493,7 @@ Page({ | @@ -7456,6 +7493,7 @@ Page({ | ||
| 7456 | }) | 7493 | }) |
| 7457 | } | 7494 | } |
| 7458 | th.is_show_more_buy(); | 7495 | th.is_show_more_buy(); |
| 7496 | + | ||
| 7459 | } | 7497 | } |
| 7460 | }) | 7498 | }) |
| 7461 | 7499 | ||
| @@ -7464,6 +7502,52 @@ Page({ | @@ -7464,6 +7502,52 @@ Page({ | ||
| 7464 | 7502 | ||
| 7465 | }, | 7503 | }, |
| 7466 | 7504 | ||
| 7505 | + //获取促销活动的组合 | ||
| 7506 | + add_cx_prom_group(data){ | ||
| 7507 | + var th=this; | ||
| 7508 | + getApp().getConfig2(function (e) { | ||
| 7509 | + //需要读者系统顺序 | ||
| 7510 | + var json_d = JSON.parse(e.switch_list); | ||
| 7511 | + var auto_promote_sale=json_d.auto_promote_sale; | ||
| 7512 | + if(auto_promote_sale){ | ||
| 7513 | + var auto_promote_sale=auto_promote_sale.split(','); | ||
| 7514 | + var fd=auto_promote_sale.indexOf(data.prom_type); | ||
| 7515 | + data.sort=fd; | ||
| 7516 | + }else{ | ||
| 7517 | + data.sort=data.prom_type; | ||
| 7518 | + } | ||
| 7519 | + | ||
| 7520 | + var fdix=th.data.cx_prom_group.findIndex(function (em){ | ||
| 7521 | + return em.prom_type==data.prom_type | ||
| 7522 | + }) | ||
| 7523 | + | ||
| 7524 | + if(fdix>-1){ | ||
| 7525 | + th.data.cx_prom_group.splice(fdix,1); | ||
| 7526 | + } | ||
| 7527 | + | ||
| 7528 | + th.data.cx_prom_group.push(data); | ||
| 7529 | + | ||
| 7530 | + //-- 排序一下 -- | ||
| 7531 | + function comp(a, b) { | ||
| 7532 | + return a.sort-b.sort; //升序 | ||
| 7533 | + } | ||
| 7534 | + var ppdata = this.data.cx_prom_group; | ||
| 7535 | + //使用sort排序 | ||
| 7536 | + ppdata.sort(comp); | ||
| 7537 | + | ||
| 7538 | + th.setData({ | ||
| 7539 | + cx_prom_group:ppdata | ||
| 7540 | + }) | ||
| 7541 | + | ||
| 7542 | + }) | ||
| 7543 | + }, | ||
| 7544 | + | ||
| 7545 | + //-- 获取默认的促销活动的默认活动 -- | ||
| 7546 | + check_prom_custom() { | ||
| 7547 | + if (!this.data.cx_prom_group.length) return 3; | ||
| 7548 | + return data[0].prom_type; | ||
| 7549 | + }, | ||
| 7550 | + | ||
| 7467 | closePoster() { | 7551 | closePoster() { |
| 7468 | this.setData({ | 7552 | this.setData({ |
| 7469 | showPoster: false, | 7553 | showPoster: false, |
| @@ -7483,6 +7567,11 @@ Page({ | @@ -7483,6 +7567,11 @@ Page({ | ||
| 7483 | 7567 | ||
| 7484 | is_show_more_buy: async function () { | 7568 | is_show_more_buy: async function () { |
| 7485 | var prom_goods = this.data.prom_goods; | 7569 | var prom_goods = this.data.prom_goods; |
| 7570 | + if(!prom_goods) return false; | ||
| 7571 | + //如果系统默认的顺序不是以优惠促销为默认第一位的时候 | ||
| 7572 | + if(th.check_prom_custom()!==3){ | ||
| 7573 | + return false; | ||
| 7574 | + } | ||
| 7486 | var per_price = this.data.sele_g.shop_price | 7575 | var per_price = this.data.sele_g.shop_price |
| 7487 | if (this.data.card_field && this.data.sele_g[this.data.card_field] > 0) { | 7576 | if (this.data.card_field && this.data.sele_g[this.data.card_field] > 0) { |
| 7488 | per_price = this.data.sele_g[this.data.card_field]; | 7577 | per_price = this.data.sele_g[this.data.card_field]; |
| @@ -7633,7 +7722,7 @@ Page({ | @@ -7633,7 +7722,7 @@ Page({ | ||
| 7633 | }); | 7722 | }); |
| 7634 | }, | 7723 | }, |
| 7635 | 7724 | ||
| 7636 | - //积分购和拼团的普通购买的的时候，要判断有没有全场优惠活动 | 7725 | + //-- 积分购和拼团的普通购买的的时候，要判断有没有全场优惠活动,普通购买的时候一定要注意 -- |
| 7637 | check_nor_promgood(goods_id, back) { | 7726 | check_nor_promgood(goods_id, back) { |
| 7638 | var th=this; | 7727 | var th=this; |
| 7639 | var user_id=getApp().globalData.user_id; | 7728 | var user_id=getApp().globalData.user_id; |
pages/goods/goodsInfo/goodsInfo.wxml
| @@ -501,65 +501,65 @@ | @@ -501,65 +501,65 @@ | ||
| 501 | 501 | ||
| 502 | 502 | ||
| 503 | <!-- 要判断是不是有促销活动 --> | 503 | <!-- 要判断是不是有促销活动 --> |
| 504 | - <block wx:if="{{prom_goods}}"> | ||
| 505 | - <view class="cx-frame flex" style="position: relative; height: auto" hidden="{{prom_type==4 || prom_type==6}}"> | ||
| 506 | - <!-- 中间显示层 --> | ||
| 507 | - <block> | ||
| 508 | - <view class="cx-sizs fs30 pdr20">促销</view> | ||
| 509 | - <view class="f1"> | ||
| 510 | - <view class="fs28 f1" wx:for="{{prom_goods}}"> | ||
| 511 | - <view> | ||
| 512 | - <text class="prom_condition"> | ||
| 513 | - <text class="fill-box">消费满{{item.condition}}{{item.prom_type==1 ? '件':'元'}}</text>享优惠(每人{{item.limit_num ? '限参与'+item.limit_num+'次' : '参与不限次' }}) | ||
| 514 | - </text> | ||
| 515 | - </view> | ||
| 516 | - | ||
| 517 | - <view class="word f1 fs26"> | ||
| 518 | - <text class="tick lh2 pdr20" wx:if="{{item.money>0}}">减价{{item.money}}元</text> | ||
| 519 | - <text class="tick lh2 pdr20" wx:if="{{item.sale>0}}">打{{item.sale}}折</text> | ||
| 520 | - <text class="tick lh2 pdr20" wx:if="{{item.past==1}}">包邮</text> | ||
| 521 | - <text class="tick lh2 pdr20" wx:if="{{item.intValue>0}}">送{{item.intValue}}积分</text> | ||
| 522 | - <view class="tick lh2 pdr20" wx:if="{{item.couponId>0}}">送{{item.couponMoney}}元优惠券</view> | ||
| 523 | - | ||
| 524 | - <block wx:if="{{item.gift_id}}"> | ||
| 525 | - <view class="tick ellipsis-1x lh2 details pdr40" bindtap="show_zp" data-index="{{index}}" data-prom="{{item.prom_id}}" wx:if="{{g_filters.is_more_gift(item.gift_id)>1}}">送赠品</view> | ||
| 526 | - <view class="tick ellipsis-1x lh2" style="display: flex;align-items: center;" wx:else> | ||
| 527 | - <block wx:if="{{item.zp_num>0}}"> | ||
| 528 | - <view class="ellipsis-1x">送{{item.goods_name}}</view> | ||
| 529 | - <view style="color: red;margin-left: 20rpx;">x{{item.zp_num}}</view> | ||
| 530 | - </block> | ||
| 531 | - </view> | ||
| 532 | - </block> | ||
| 533 | - | ||
| 534 | - | 504 | +<!-- <block wx:if="{{prom_goods}}">--> |
| 505 | +<!-- <view class="cx-frame flex" style="position: relative; height: auto" hidden="{{prom_type==4 || prom_type==6}}">--> | ||
| 506 | +<!-- <!– 中间显示层 –>--> | ||
| 507 | +<!-- <block>--> | ||
| 508 | +<!-- <view class="cx-sizs fs30 pdr20">促销</view>--> | ||
| 509 | +<!-- <view class="f1">--> | ||
| 510 | +<!-- <view class="fs28 f1" wx:for="{{prom_goods}}">--> | ||
| 511 | +<!-- <view>--> | ||
| 512 | +<!-- <text class="prom_condition">--> | ||
| 513 | +<!-- <text class="fill-box">消费满{{item.condition}}{{item.prom_type==1 ? '件':'元'}}</text>享优惠(每人{{item.limit_num ? '限参与'+item.limit_num+'次' : '参与不限次' }})--> | ||
| 514 | +<!-- </text>--> | ||
| 515 | +<!-- </view>--> | ||
| 516 | + | ||
| 517 | +<!-- <view class="word f1 fs26">--> | ||
| 518 | +<!-- <text class="tick lh2 pdr20" wx:if="{{item.money>0}}">减价{{item.money}}元</text>--> | ||
| 519 | +<!-- <text class="tick lh2 pdr20" wx:if="{{item.sale>0}}">打{{item.sale}}折</text>--> | ||
| 520 | +<!-- <text class="tick lh2 pdr20" wx:if="{{item.past==1}}">包邮</text>--> | ||
| 521 | +<!-- <text class="tick lh2 pdr20" wx:if="{{item.intValue>0}}">送{{item.intValue}}积分</text>--> | ||
| 522 | +<!-- <view class="tick lh2 pdr20" wx:if="{{item.couponId>0}}">送{{item.couponMoney}}元优惠券</view>--> | ||
| 523 | + | ||
| 524 | +<!-- <block wx:if="{{item.gift_id}}">--> | ||
| 525 | +<!-- <view class="tick ellipsis-1x lh2 details pdr40" bindtap="show_zp" data-index="{{index}}" data-prom="{{item.prom_id}}" wx:if="{{g_filters.is_more_gift(item.gift_id)>1}}">送赠品</view>--> | ||
| 526 | +<!-- <view class="tick ellipsis-1x lh2" style="display: flex;align-items: center;" wx:else>--> | ||
| 527 | +<!-- <block wx:if="{{item.zp_num>0}}">--> | ||
| 528 | +<!-- <view class="ellipsis-1x">送{{item.goods_name}}</view>--> | ||
| 529 | +<!-- <view style="color: red;margin-left: 20rpx;">x{{item.zp_num}}</view>--> | ||
| 530 | +<!-- </block>--> | ||
| 531 | +<!-- </view>--> | ||
| 532 | +<!-- </block>--> | ||
| 533 | + | ||
| 534 | + | ||
| 535 | + | ||
| 536 | +<!-- <view class="tick ellipsis-1x lh2 details pdr40" wx:if="{{item.lb_id>0}}" data-id="{{item.lb_id}}" bindtap="viewLbDetails">送{{item.lbtitle}}</view>--> | ||
| 537 | +<!-- <view class="tick ellipsis-1x lh2 details pdr40" wx:if="{{item.zxlb_id>0}}" data-id="{{item.zxlb_id}}" data-flag="1" bindtap="viewLbDetails">送{{item.zxlbtitle}}</view>--> | ||
| 538 | +<!-- </view>--> | ||
| 539 | +<!-- </view>--> | ||
| 540 | +<!-- </view>--> | ||
| 541 | + | ||
| 542 | +<!-- </block>--> | ||
| 543 | +<!-- </view>--> | ||
| 544 | +<!-- </block>--> | ||
| 545 | + | ||
| 546 | +<!-- <block wx:if="{{jieti_prom}}">--> | ||
| 547 | +<!-- <view class="cx-frame flex jc_sb" bindtap="go_more_ladder" data-id="{{ladder_act_id}}" style="position: relative; height: auto">--> | ||
| 548 | +<!-- <view class="flex" style="width: 92%">--> | ||
| 549 | +<!-- <view class="cx-sizs fs30" style="width: 90rpx;flex-shrink: 0">阶梯促</view>--> | ||
| 550 | +<!-- <!– 中间显示层 –>--> | ||
| 551 | +<!-- <view class="ellipsis-1 fs24">--> | ||
| 552 | +<!-- <text class="jie_show fs22">阶</text>--> | ||
| 553 | +<!-- {{jieti_prom}}--> | ||
| 554 | +<!-- </view>--> | ||
| 555 | +<!-- </view>--> | ||
| 556 | +<!-- <view data-coupon="1" bindtap="show_more_cx" class="cx-obtain-coupon wsize">--> | ||
| 557 | +<!-- <text class="bg_jj" style="position: relative;right: 3rpx"></text>--> | ||
| 558 | +<!-- </view>--> | ||
| 559 | +<!-- </view>--> | ||
| 560 | +<!-- </block>--> | ||
| 535 | 561 | ||
| 536 | - <view class="tick ellipsis-1x lh2 details pdr40" wx:if="{{item.lb_id>0}}" data-id="{{item.lb_id}}" bindtap="viewLbDetails">送{{item.lbtitle}}</view> | ||
| 537 | - <view class="tick ellipsis-1x lh2 details pdr40" wx:if="{{item.zxlb_id>0}}" data-id="{{item.zxlb_id}}" data-flag="1" bindtap="viewLbDetails">送{{item.zxlbtitle}}</view> | ||
| 538 | - </view> | ||
| 539 | - </view> | ||
| 540 | - </view> | ||
| 541 | - | ||
| 542 | - </block> | ||
| 543 | - </view> | ||
| 544 | - </block> | ||
| 545 | 562 | ||
| 546 | - <block wx:if="{{jieti_prom}}"> | ||
| 547 | - <view class="cx-frame flex jc_sb" bindtap="go_more_ladder" data-id="{{ladder_act_id}}" style="position: relative; height: auto"> | ||
| 548 | - <view class="flex" style="width: 92%"> | ||
| 549 | - <view class="cx-sizs fs30" style="width: 90rpx;flex-shrink: 0">阶梯促</view> | ||
| 550 | - <!-- 中间显示层 --> | ||
| 551 | - <view class="ellipsis-1 fs24"> | ||
| 552 | - <text class="jie_show fs22">阶</text> | ||
| 553 | - {{jieti_prom}} | ||
| 554 | - </view> | ||
| 555 | - </view> | ||
| 556 | - <view data-coupon="1" bindtap="show_more_cx" class="cx-obtain-coupon wsize"> | ||
| 557 | - <text class="bg_jj" style="position: relative;right: 3rpx"></text> | ||
| 558 | - </view> | ||
| 559 | - </view> | ||
| 560 | - </block> | ||
| 561 | - | ||
| 562 | - <!-- 要判断是不是有订单优惠 --> | ||
| 563 | <block wx:if="{{order_prom}}"> | 563 | <block wx:if="{{order_prom}}"> |
| 564 | <view class="cx-frame flex" style="position: relative; height: auto"> | 564 | <view class="cx-frame flex" style="position: relative; height: auto"> |
| 565 | <view class="cx-sizs fs30 pdr20">订单优惠</view> | 565 | <view class="cx-sizs fs30 pdr20">订单优惠</view> |
| @@ -575,27 +575,29 @@ | @@ -575,27 +575,29 @@ | ||
| 575 | </view> | 575 | </view> |
| 576 | </view> | 576 | </view> |
| 577 | </block> | 577 | </block> |
| 578 | - <!-- 要判断是不是有组合优惠 --> | ||
| 579 | - <block wx:if="{{zh_act}}"> | ||
| 580 | - <view class="cx-frame flex" style="position: relative; height: auto"> | ||
| 581 | - <view class="cx-sizs wsize" style="width: 144rpx">组合购</view> | ||
| 582 | - <!-- 中间显示层 --> | ||
| 583 | - <view class="flex ai-center jc_sb" style="width: 570rpx" bindtap="go_zh" data-id="{{zh_act.id}}"> | ||
| 584 | - <view class="flex"> | ||
| 585 | - <image class="hui_img" src="{{iurl}}/miniapp//images/hui.png"></image> | ||
| 586 | - <view class="order_hui"> | ||
| 587 | - <view class="fs28 ellipsis-1">{{zh_act.name}}</view> | ||
| 588 | - <view class="fs26"> | ||
| 589 | - (活动时间：{{tool.format_tt(zh_act.start_time)}} - {{tool.format_tt(zh_act.end_time)}}) | ||
| 590 | - </view> | ||
| 591 | - </view> | ||
| 592 | - </view> | ||
| 593 | - <view> | ||
| 594 | - <text class="bg_jj is_more_cx" style="position: relative;top:-10rpx"></text> | ||
| 595 | - </view> | ||
| 596 | - </view> | ||
| 597 | - </view> | ||
| 598 | - </block> | 578 | + |
| 579 | +<!-- <block wx:if="{{zh_act}}">--> | ||
| 580 | +<!-- <view class="cx-frame flex" style="position: relative; height: auto">--> | ||
| 581 | +<!-- <view class="cx-sizs wsize" style="width: 144rpx">组合购</view>--> | ||
| 582 | +<!-- <!– 中间显示层 –>--> | ||
| 583 | +<!-- <view class="flex ai-center jc_sb" style="width: 570rpx" bindtap="go_zh" data-id="{{zh_act.id}}">--> | ||
| 584 | +<!-- <view class="flex">--> | ||
| 585 | +<!-- <image class="hui_img" src="{{iurl}}/miniapp//images/hui.png"></image>--> | ||
| 586 | +<!-- <view class="order_hui">--> | ||
| 587 | +<!-- <view class="fs28 ellipsis-1">{{zh_act.name}}</view>--> | ||
| 588 | +<!-- <view class="fs26">--> | ||
| 589 | +<!-- (活动时间：{{tool.format_tt(zh_act.start_time)}} - {{tool.format_tt(zh_act.end_time)}})--> | ||
| 590 | +<!-- </view>--> | ||
| 591 | +<!-- </view>--> | ||
| 592 | +<!-- </view>--> | ||
| 593 | +<!-- <view>--> | ||
| 594 | +<!-- <text class="bg_jj is_more_cx" style="position: relative;top:-10rpx"></text>--> | ||
| 595 | +<!-- </view>--> | ||
| 596 | +<!-- </view>--> | ||
| 597 | +<!-- </view>--> | ||
| 598 | +<!-- </block>--> | ||
| 599 | + | ||
| 600 | + | ||
| 599 | <!-- 判断是不是有秒杀 --> | 601 | <!-- 判断是不是有秒杀 --> |
| 600 | <!-- 判断是不是有秒杀 --> | 602 | <!-- 判断是不是有秒杀 --> |
| 601 | <block wx:if="{{more_flash}}"> | 603 | <block wx:if="{{more_flash}}"> |
| @@ -617,7 +619,7 @@ | @@ -617,7 +619,7 @@ | ||
| 617 | <view wx:if="{{item.prom_type==2}}" class="miao_lab">团</view> | 619 | <view wx:if="{{item.prom_type==2}}" class="miao_lab">团</view> |
| 618 | <view wx:if="{{item.prom_type==4}}" class="miao_lab">积</view> | 620 | <view wx:if="{{item.prom_type==4}}" class="miao_lab">积</view> |
| 619 | <view wx:if="{{item.prom_type==6}}" class="miao_lab">拼</view> | 621 | <view wx:if="{{item.prom_type==6}}" class="miao_lab">拼</view> |
| 620 | - <view wx:if="{{item.prom_type==6}}" class="miao_lab">预</view> | 622 | + <view wx:if="{{item.prom_type==8}}" class="miao_lab">预</view> |
| 621 | 623 | ||
| 622 | 624 | ||
| 623 | <view class="order_hui"> | 625 | <view class="order_hui"> |
| @@ -636,6 +638,29 @@ | @@ -636,6 +638,29 @@ | ||
| 636 | </block> | 638 | </block> |
| 637 | 639 | ||
| 638 | 640 | ||
| 641 | + <!-- 新增促销多活动的排版 --> | ||
| 642 | + <view class="bdt16" wx:if="{{ prom_type!=1 && prom_type!=2 && prom_type!=4 && prom_type!=6 && cx_prom_group.length>0}}"> | ||
| 643 | + <view data-coupon="1" bindtap="switchCoupon" class="cx-frame flex" style="position: relative" wx:if="{{fir_quan.length>0}}"> | ||
| 644 | + <view class="cx-sizs fs30">促销</view> | ||
| 645 | + <view class="flex ai_c f1 pdh20"> | ||
| 646 | + <view class="xc-coupon-fram" wx:for="{{cx_prom_group}}" > | ||
| 647 | + <view class="circle xc-circular xc-one"></view> | ||
| 648 | + | ||
| 649 | + <view wx:if="{{item.prom_type==3}}" class="xc-coupon t-c four-level-word">优惠促销</view> | ||
| 650 | + <view wx:if="{{item.prom_type==5}}" class="xc-coupon t-c four-level-word">搭配促销</view> | ||
| 651 | + <view wx:if="{{item.prom_type==7}}" class="xc-coupon t-c four-level-word">组合购</view> | ||
| 652 | + <view wx:if="{{item.prom_type==10}}" class="xc-coupon t-c four-level-word">阶梯促销</view> | ||
| 653 | + | ||
| 654 | + <view class="circle xc-circular xc-two"></view> | ||
| 655 | + </view> | ||
| 656 | + </view> | ||
| 657 | + <view class="cx-obtain-coupon wsize"> | ||
| 658 | + <text class="bg_jj"></text> | ||
| 659 | + </view> | ||
| 660 | + </view> | ||
| 661 | + </view> | ||
| 662 | + | ||
| 663 | + | ||
| 639 | <!-- 许程 7.24暂时注释 --> | 664 | <!-- 许程 7.24暂时注释 --> |
| 640 | <view class="bdt16" wx:if="{{ prom_type!=1 && prom_act.kttype!=3&&prom_act.kttype!=2&&prom_act.kttype!=1 && is_closecoupon!=1 && sele_g.is_xz_yh !=1}}"> | 665 | <view class="bdt16" wx:if="{{ prom_type!=1 && prom_act.kttype!=3&&prom_act.kttype!=2&&prom_act.kttype!=1 && is_closecoupon!=1 && sele_g.is_xz_yh !=1}}"> |
| 641 | <view data-coupon="1" bindtap="switchCoupon" class="cx-frame flex" style="position: relative" wx:if="{{fir_quan.length>0}}"> | 666 | <view data-coupon="1" bindtap="switchCoupon" class="cx-frame flex" style="position: relative" wx:if="{{fir_quan.length>0}}"> |
| @@ -654,6 +679,9 @@ | @@ -654,6 +679,9 @@ | ||
| 654 | </view> | 679 | </view> |
| 655 | </view> | 680 | </view> |
| 656 | </view> | 681 | </view> |
| 682 | + | ||
| 683 | + | ||
| 684 | + | ||
| 657 | <!-- 门店收货地址 --> | 685 | <!-- 门店收货地址 --> |
| 658 | <view class="xc-address_frame bdt16 flex-vertical xc-ash {{def_pick_store!=null?'sn_height':'on_height'}}"> | 686 | <view class="xc-address_frame bdt16 flex-vertical xc-ash {{def_pick_store!=null?'sn_height':'on_height'}}"> |
| 659 | <view class="address_frame" bindtap="choice_store" data-ind="0"> | 687 | <view class="address_frame" bindtap="choice_store" data-ind="0"> |
| @@ -704,29 +732,30 @@ | @@ -704,29 +732,30 @@ | ||
| 704 | </view> | 732 | </view> |
| 705 | 733 | ||
| 706 | <!-- - 搭配促销 -- --> | 734 | <!-- - 搭配促销 -- --> |
| 707 | - <view class="dp_cx_view" wx:if="{{collocationGoods}}"> | ||
| 708 | - <view class="bb_view"> | ||
| 709 | - <view>优惠热配</view> | ||
| 710 | - <view class="red_bb" bindtap="go_prom_list"> | ||
| 711 | - 查看全部 | ||
| 712 | - <text class="bg_jj"></text> | ||
| 713 | - </view> | ||
| 714 | - </view> | ||
| 715 | - <!-- 搭配的显示 --> | ||
| 716 | - <view class="flex" bindtap="go_prom_list"> | ||
| 717 | - <image class="dp_img" src="{{iurl+collocationGoods.img_url}}"></image> | ||
| 718 | - <view class="act_content"> | ||
| 719 | - <view class="fs32">{{collocationGoods.title}}</view> | ||
| 720 | - <view class="fs30 color_b" wx:if="{{collocationGoods.max!=collocationGoods.min}}"> | ||
| 721 | - 搭配价￥{{collocationGoods.min}}-{{collocationGoods.max}} | ||
| 722 | - </view> | ||
| 723 | - <view class="fs30 color_b" wx:else>搭配价￥{{collocationGoods.min}}</view> | ||
| 724 | - <view class="fs30 color-gray"> | ||
| 725 | - 活动至{{filters.format_time(collocationGoods.end_time,1)}} | ||
| 726 | - </view> | ||
| 727 | - </view> | ||
| 728 | - </view> | ||
| 729 | - </view> | 735 | +<!-- <view class="dp_cx_view" wx:if="{{collocationGoods}}">--> |
| 736 | +<!-- <view class="bb_view">--> | ||
| 737 | +<!-- <view>优惠热配</view>--> | ||
| 738 | +<!-- <view class="red_bb" bindtap="go_prom_list">--> | ||
| 739 | +<!-- 查看全部--> | ||
| 740 | +<!-- <text class="bg_jj"></text>--> | ||
| 741 | +<!-- </view>--> | ||
| 742 | +<!-- </view>--> | ||
| 743 | +<!-- <!– 搭配的显示 –>--> | ||
| 744 | +<!-- <view class="flex" bindtap="go_prom_list">--> | ||
| 745 | +<!-- <image class="dp_img" src="{{iurl+collocationGoods.img_url}}"></image>--> | ||
| 746 | +<!-- <view class="act_content">--> | ||
| 747 | +<!-- <view class="fs32">{{collocationGoods.title}}</view>--> | ||
| 748 | +<!-- <view class="fs30 color_b" wx:if="{{collocationGoods.max!=collocationGoods.min}}">--> | ||
| 749 | +<!-- 搭配价￥{{collocationGoods.min}}-{{collocationGoods.max}}--> | ||
| 750 | +<!-- </view>--> | ||
| 751 | +<!-- <view class="fs30 color_b" wx:else>搭配价￥{{collocationGoods.min}}</view>--> | ||
| 752 | +<!-- <view class="fs30 color-gray">--> | ||
| 753 | +<!-- 活动至{{filters.format_time(collocationGoods.end_time,1)}}--> | ||
| 754 | +<!-- </view>--> | ||
| 755 | +<!-- </view>--> | ||
| 756 | +<!-- </view>--> | ||
| 757 | +<!-- </view>--> | ||
| 758 | + | ||
| 730 | <!-- - 宝贝评价 -- --> | 759 | <!-- - 宝贝评价 -- --> |
| 731 | <view class="bdt16"> | 760 | <view class="bdt16"> |
| 732 | <view class="bb_view"> | 761 | <view class="bb_view"> |
pages/goods/goodsList/goodsList.wxml
| 1 | <wxs module="g_filter" src="../search/g_filter.wxs"></wxs> | 1 | <wxs module="g_filter" src="../search/g_filter.wxs"></wxs> |
| 2 | <view class="container" wx:if="{{show_all}}"> | 2 | <view class="container" wx:if="{{show_all}}"> |
| 3 | <view> | 3 | <view> |
| 4 | - | 4 | + |
| 5 | + <view wx:if="{{prom_goods_list}}" class="fs30"><text style="color: red;" wx:if="{{index==0 && limit_num>0}}">每人限参与{{limit_num}}次;</text></view> | ||
| 5 | <block wx:for="{{prom_goods_list}}"> | 6 | <block wx:for="{{prom_goods_list}}"> |
| 6 | <view class="fs30 ellipsis-1" style="padding: 20rpx 30rpx"> | 7 | <view class="fs30 ellipsis-1" style="padding: 20rpx 30rpx"> |
| 7 | - <text style="color: red;" wx:if="{{index==0 && limit_num>0}}">每人限参与{{limit_num}}次;</text> | ||
| 8 | 满{{item.condition}}<text space="{{true}}" wx:if="{{item.prom_type==0}}">元 </text> <text space="{{true}}" wx:else>件 </text> | 8 | 满{{item.condition}}<text space="{{true}}" wx:if="{{item.prom_type==0}}">元 </text> <text space="{{true}}" wx:else>件 </text> |
| 9 | <text space="{{true}}" wx:if="{{item.content.is_money && item.content.is_money!='0'}}">减{{item.content.money}}元 </text> | 9 | <text space="{{true}}" wx:if="{{item.content.is_money && item.content.is_money!='0'}}">减{{item.content.money}}元 </text> |
| 10 | + <text space="{{true}}" wx:if="{{item.content.past && item.content.past!='0'}}">包邮</text> | ||
| 10 | <text space="{{true}}" wx:if="{{item.content.is_sale && item.content.is_sale!='0'}}">打{{item.content.sale}}折 </text> | 11 | <text space="{{true}}" wx:if="{{item.content.is_sale && item.content.is_sale!='0'}}">打{{item.content.sale}}折 </text> |
| 11 | <text space="{{true}}" wx:if="{{item.content.is_int && item.content.is_int!='0'}}">送{{item.content.int}}积分 </text> | 12 | <text space="{{true}}" wx:if="{{item.content.is_int && item.content.is_int!='0'}}">送{{item.content.int}}积分 </text> |
| 12 | <text space="{{true}}" wx:if="{{item.content.is_coupon && item.content.is_coupon!='0'}}">送{{item.content.coupon}}元优惠券 </text> | 13 | <text space="{{true}}" wx:if="{{item.content.is_coupon && item.content.is_coupon!='0'}}">送{{item.content.coupon}}元优惠券 </text> |