Commit 68ce9894535c7f8e5d17cfc1dfa140273f1a571e
1 parent
5f235574
服务卡项秒杀
Showing
5 changed files
with
39 additions
and
559 deletions
packageA/pages/cart2_ser/cart2_ser.js
| ... | ... | @@ -249,11 +249,6 @@ Page({ |
| 249 | 249 | t.data.data.original_img = oo.imghost + t.data.data.imgUrl; |
| 250 | 250 | t.data.data['buynum'] = gg.goods_num; |
| 251 | 251 | t.data.data.shop_price = gd.money; |
| 252 | - | |
| 253 | - if(th.data.postdata.prom_type == 1) { | |
| 254 | - let postdata = th.data.postdata; | |
| 255 | - t.data.data.shop_price = postdata.prom_price; | |
| 256 | - }; | |
| 257 | 252 | |
| 258 | 253 | th.setData({ |
| 259 | 254 | bn_goods: t.data.data, |
| ... | ... | @@ -515,12 +510,6 @@ Page({ |
| 515 | 510 | // 'price': th.data.formData.order_amount, |
| 516 | 511 | 'pickup_id': gg.pick_id, |
| 517 | 512 | 'pickup_keyid': gg.keyid, |
| 518 | - 'prom_type': this.data.postdata.prom_type, //促销活动类型 | |
| 519 | - 'prom_id': this.data.postdata.prom_id, //促销活动id | |
| 520 | - }; | |
| 521 | - | |
| 522 | - if(this.data.postdata.prom_type == 1) { | |
| 523 | - goods.price = this.data.postdata.prom_price; | |
| 524 | 513 | }; |
| 525 | 514 | |
| 526 | 515 | //--导购分享过来的id-- |
| ... | ... | @@ -536,7 +525,6 @@ Page({ |
| 536 | 525 | } |
| 537 | 526 | }) |
| 538 | 527 | } |
| 539 | - console.log('goooooooooooooooooods', goods); | |
| 540 | 528 | item.list.push(goods); |
| 541 | 529 | } |
| 542 | 530 | ... | ... |
packageA/pages/goodsInfo/goodsInfo.js
| ... | ... | @@ -205,9 +205,6 @@ Page({ |
| 205 | 205 | hui_condition:null, |
| 206 | 206 | sto_sele_name_1:'',//分享的门店名称 |
| 207 | 207 | |
| 208 | - // 秒杀 | |
| 209 | - prom_st: 1, | |
| 210 | - prom_r_null: 0, | |
| 211 | 208 | }, |
| 212 | 209 | |
| 213 | 210 | //------初始化加载---------- |
| ... | ... | @@ -219,11 +216,11 @@ Page({ |
| 219 | 216 | } |
| 220 | 217 | // <=== |
| 221 | 218 | |
| 222 | - self = this; | |
| 219 | + | |
| 223 | 220 | |
| 224 | - this.setData({ | |
| 225 | - options: t, | |
| 226 | - }); | |
| 221 | + self = this; | |
| 222 | + this.data.options = t; // { goods_id: ...} | |
| 223 | + | |
| 227 | 224 | |
| 228 | 225 | var ee = this, |
| 229 | 226 | that = ee, |
| ... | ... | @@ -388,7 +385,7 @@ Page({ |
| 388 | 385 | var ser_card=th.data.data; |
| 389 | 386 | //--如果默认门店不在等级卡的默认们店以内 |
| 390 | 387 | if(ser_card.storageId!=null && ser_card.storageId!="" && ser_card.storageId.indexOf(ee.keyid)==-1){ |
| 391 | - ee.is_no_dis=1; | |
| 388 | + ee.is_no_dis=1; | |
| 392 | 389 | } |
| 393 | 390 | |
| 394 | 391 | var appd=getApp().globalData; |
| ... | ... | @@ -457,7 +454,6 @@ Page({ |
| 457 | 454 | }); |
| 458 | 455 | |
| 459 | 456 | }, |
| 460 | - | |
| 461 | 457 | //------------程序初始化入口------------- |
| 462 | 458 | async init(gid) { |
| 463 | 459 | var ee = this, |
| ... | ... | @@ -498,58 +494,6 @@ Page({ |
| 498 | 494 | // }) |
| 499 | 495 | |
| 500 | 496 | |
| 501 | - // ----> 秒杀 | |
| 502 | - let prom_type = this.data.options.prom_type; | |
| 503 | - | |
| 504 | - let goods_id = this.data.options.goods_id; | |
| 505 | - if(!goods_id) goods_id = this.data.data.goods_id; | |
| 506 | - | |
| 507 | - if(prom_type) { // 进入商品详情页地址传参有带goods_id、prom_type、prom_id参数, 即从秒杀入口进入 | |
| 508 | - let prom_id = this.data.options.prom_id; | |
| 509 | - this.check_prom(goods_id, prom_type, prom_id); | |
| 510 | - } else { // 从非秒杀入口进入,地址不带prom_type、prom_id参数 | |
| 511 | - getApp().request.promiseGet('/api/weshop/activitylist/getGoodActInfo', { | |
| 512 | - data: { | |
| 513 | - store_id: os.stoid, | |
| 514 | - goodsidlist: goods_id, | |
| 515 | - is_detail: 1, | |
| 516 | - goods_type: 1, | |
| 517 | - user_id: oo.user_id, | |
| 518 | - } | |
| 519 | - }).then(res => { | |
| 520 | - if (res.data.code == 0) { | |
| 521 | - let result = res.data.data; | |
| 522 | - let resLength = result.length; | |
| 523 | - if(resLength == 1) { // 如果数组长度为1，则直接显示当前活动 | |
| 524 | - let goods_id = this.data.options.goods_id; | |
| 525 | - let prom_type = result[0].prom_type; | |
| 526 | - let prom_id = result[0].act_id; | |
| 527 | - this.setData({ | |
| 528 | - 'options.prom_type': prom_type, | |
| 529 | - }); | |
| 530 | - this.check_prom(goods_id, prom_type, prom_id); | |
| 531 | - } else if(resLength > 1) { //如果数组长度大于1，表示当前商品参加多个活动，以列表形式显示多活动 | |
| 532 | - this.setData({ | |
| 533 | - actList: res.data.data, | |
| 534 | - }); | |
| 535 | - }; | |
| 536 | - | |
| 537 | - console.log('!!!!!!~~~~~~~~~prom~~~~~~~~~~!!!!!!'); | |
| 538 | - // this.setData({ | |
| 539 | - // prom, | |
| 540 | - // }); | |
| 541 | - | |
| 542 | - }; | |
| 543 | - }); | |
| 544 | - }; | |
| 545 | - // <---- 秒杀 | |
| 546 | - | |
| 547 | - | |
| 548 | - | |
| 549 | - | |
| 550 | - | |
| 551 | - | |
| 552 | - | |
| 553 | 497 | //------是否收藏---------- |
| 554 | 498 | await getApp().request.promiseGet("/api/weshop/goodscollect/page", { |
| 555 | 499 | data: { |
| ... | ... | @@ -573,6 +517,8 @@ Page({ |
| 573 | 517 | store_id: os.stoid, |
| 574 | 518 | service_id: gid |
| 575 | 519 | }, |
| 520 | + //failRollback: !0, | |
| 521 | + | |
| 576 | 522 | }).then(res => { |
| 577 | 523 | console.log('get评价统计数量', res.data.data); |
| 578 | 524 | var t = res; |
| ... | ... | @@ -592,7 +538,7 @@ Page({ |
| 592 | 538 | |
| 593 | 539 | categories3 = dd; |
| 594 | 540 | } |
| 595 | - }); | |
| 541 | + }) | |
| 596 | 542 | |
| 597 | 543 | //----获取详情页的评价---- |
| 598 | 544 | await getApp().request.promiseGet("/api/weshop/serviceComment/pageComment", { |
| ... | ... | @@ -607,7 +553,7 @@ Page({ |
| 607 | 553 | }).then(res => { |
| 608 | 554 | console.log('get详情页评价', res.data.data); |
| 609 | 555 | fir_com = res.data.data.pageData; |
| 610 | - }); | |
| 556 | + }) | |
| 611 | 557 | |
| 612 | 558 | if (fir_com) { |
| 613 | 559 | for (var ind in fir_com) { |
| ... | ... | @@ -615,7 +561,7 @@ Page({ |
| 615 | 561 | if (fir_com[ind].img) fir_com[ind].img = ut.unserialize(fir_com[ind].img); |
| 616 | 562 | if (fir_com[ind].weapp_img) fir_com[ind].weapp_img = JSON.parse(fir_com[ind].weapp_img); |
| 617 | 563 | } |
| 618 | - }; | |
| 564 | + } | |
| 619 | 565 | |
| 620 | 566 | this.getTaohe(); |
| 621 | 567 | |
| ... | ... | @@ -654,7 +600,6 @@ Page({ |
| 654 | 600 | var ee = this,gid = this.data.gid, i = getApp().request; |
| 655 | 601 | this.data.is_timer = 1; |
| 656 | 602 | this.wait_for_store_config(); |
| 657 | - | |
| 658 | 603 | |
| 659 | 604 | i.get("/api/weshop/serviceCard/get/" + o.stoid + "/" + ee.data.gid, { |
| 660 | 605 | failRollback: !0, |
| ... | ... | @@ -731,8 +676,6 @@ Page({ |
| 731 | 676 | this.data.enterAddressPage && (this.data.enterAddressPage = !1); |
| 732 | 677 | this.get_sto(); |
| 733 | 678 | |
| 734 | - | |
| 735 | - | |
| 736 | 679 | }, |
| 737 | 680 | |
| 738 | 681 | enterAddress: function() { |
| ... | ... | @@ -746,7 +689,6 @@ Page({ |
| 746 | 689 | clearInterval(i); |
| 747 | 690 | } |
| 748 | 691 | }, |
| 749 | - | |
| 750 | 692 | onHide: function() { |
| 751 | 693 | this.data.is_timer = 0; |
| 752 | 694 | for(var i = 1; i < 100; i++) { |
| ... | ... | @@ -760,7 +702,6 @@ Page({ |
| 760 | 702 | activeCategoryId: e |
| 761 | 703 | }), 1 == e ? this.tabGoodsContent() : 2 == e && this.tabComment(); |
| 762 | 704 | }, |
| 763 | - | |
| 764 | 705 | tabClick2: function(t) { |
| 765 | 706 | this.setData({ |
| 766 | 707 | activeCategoryId2: t.currentTarget.id |
| ... | ... | @@ -794,7 +735,7 @@ Page({ |
| 794 | 735 | //商品详情的时候调用 |
| 795 | 736 | tabGoodsContent: function() { |
| 796 | 737 | var th = this, |
| 797 | - i = getApp().request; | |
| 738 | + i = getApp().request; | |
| 798 | 739 | this.setData({ |
| 799 | 740 | activeCategoryId: 1 |
| 800 | 741 | }); |
| ... | ... | @@ -808,7 +749,7 @@ Page({ |
| 808 | 749 | var action= t.currentTarget.dataset.action; |
| 809 | 750 | if(!ind) ind = t.currentTarget.dataset.openspecmodal_ind; |
| 810 | 751 | |
| 811 | - th.setData({ | |
| 752 | + th.setData({ | |
| 812 | 753 | open_ind_store: ind |
| 813 | 754 | }); |
| 814 | 755 | |
| ... | ... | @@ -829,16 +770,8 @@ Page({ |
| 829 | 770 | newd['pick_name'] = th.data.sto_sele_name; |
| 830 | 771 | newd['guide_id'] = getApp().globalData.guide_id; |
| 831 | 772 | newd['guide_type']=0; |
| 832 | - | |
| 833 | - if(this.data.prom_type && this.data.prom_type == 1) { | |
| 834 | - newd['prom_type'] = this.data.prom_type; | |
| 835 | - newd['prom_id'] = this.data.prom_id; | |
| 836 | - newd['prom_price'] = this.data.prom_price; | |
| 837 | - } | |
| 838 | - | |
| 839 | - // console.log('newd++++++++', newd); | |
| 840 | 773 | th.buyNow(newd); |
| 841 | - } else { | |
| 774 | + }else{ | |
| 842 | 775 | |
| 843 | 776 | var newd = { |
| 844 | 777 | service_id: th.data.data.id, |
| ... | ... | @@ -948,8 +881,7 @@ Page({ |
| 948 | 881 | }, |
| 949 | 882 | |
| 950 | 883 | openSpecModel: function(t) { |
| 951 | - // console.log('****ttttttt***', t); | |
| 952 | - var th=this; | |
| 884 | + var th=this; | |
| 953 | 885 | var open_store = t.currentTarget.dataset.ind; |
| 954 | 886 | this.setData({ |
| 955 | 887 | store: 0, |
| ... | ... | @@ -2817,278 +2749,7 @@ Page({ |
| 2817 | 2749 | }; |
| 2818 | 2750 | }; |
| 2819 | 2751 | }); |
| 2820 | - }, | |
| 2821 | - | |
| 2822 | - | |
| 2823 | - | |
| 2824 | - | |
| 2825 | - //---小于10的格式化函数---- | |
| 2826 | - // timeFormat(param) { | |
| 2827 | - // return param < 10 ? '0' + param : param; | |
| 2828 | - // }, | |
| 2829 | - | |
| 2830 | - //----倒计时函数----- | |
| 2831 | - countDown(time, prom_st) { | |
| 2832 | - if (!this.data.is_timer) return false; | |
| 2833 | - var th = this; | |
| 2834 | - // 获取当前时间，同时得到活动结束时间数组 | |
| 2835 | - var endTime = time; | |
| 2836 | - var newTime = ut.gettimestamp(); | |
| 2837 | - // 对结束时间进行处理渲染到页面 | |
| 2838 | - var obj = null; | |
| 2839 | - // 如果活动未结束，对时间进行处理 | |
| 2840 | - if (endTime - newTime > 0) { | |
| 2841 | - var time = (endTime - newTime); | |
| 2842 | - // 获取天、时、分、秒 | |
| 2843 | - var day = parseInt(time / (60 * 60 * 24)); | |
| 2844 | - var hou = parseInt(time % (60 * 60 * 24) / 3600); | |
| 2845 | - var min = parseInt(time % (60 * 60 * 24) % 3600 / 60); | |
| 2846 | - var sec = parseInt(time % (60 * 60 * 24) % 3600 % 60); | |
| 2847 | - obj = { | |
| 2848 | - day: this.timeFormat(day), | |
| 2849 | - hou: this.timeFormat(hou), | |
| 2850 | - min: this.timeFormat(min), | |
| 2851 | - sec: this.timeFormat(sec) | |
| 2852 | - } | |
| 2853 | - } else { | |
| 2854 | - if (th.data.prom_st == 0) { | |
| 2855 | - //var endTime2 = new Date(th.data.prom_end_time).getTime(); | |
| 2856 | - var endTime2 = th.data.prom_act.end_time; | |
| 2857 | - th.setData({ | |
| 2858 | - prom_time_text: '距结束还剩:', | |
| 2859 | - prom_st: 1 | |
| 2860 | - }) | |
| 2861 | - setTimeout(function () { | |
| 2862 | - th.countDown(endTime2) | |
| 2863 | - }, 1000); | |
| 2864 | - return false; | |
| 2865 | - | |
| 2866 | - } else { | |
| 2867 | - //活动已结束，全部设置为'00' | |
| 2868 | - obj = { | |
| 2869 | - day: '00', | |
| 2870 | - hou: '00', | |
| 2871 | - min: '00', | |
| 2872 | - sec: '00' | |
| 2873 | - } | |
| 2874 | - th.setData({ | |
| 2875 | - prom_time_text: '活动已经结束:', | |
| 2876 | - prom_st: 3 | |
| 2877 | - }) | |
| 2878 | - th.setData({ | |
| 2879 | - djs: obj | |
| 2880 | - }); | |
| 2881 | - return false; | |
| 2882 | - } | |
| 2883 | - } | |
| 2884 | - | |
| 2885 | - th.setData({ | |
| 2886 | - djs: obj | |
| 2887 | - }); | |
| 2888 | - setTimeout(function () { | |
| 2889 | - th.countDown(endTime) | |
| 2890 | - }, 1000); | |
| 2891 | - }, | |
| 2892 | - | |
| 2893 | - | |
| 2894 | - get_normal(gid) { | |
| 2895 | - this.setData({ | |
| 2896 | - prom_type: 0, | |
| 2897 | - isshow: 1, | |
| 2898 | - }); | |
| 2899 | - // this.get_sku(os.stoid, this.data.data, gid); | |
| 2900 | - // this.get_sto(); | |
| 2901 | - // this.check_is_youhui(gid, 1); | |
| 2902 | - this.data.is_normal = 1; | |
| 2903 | - }, | |
| 2904 | - | |
| 2905 | - | |
| 2906 | - | |
| 2907 | - | |
| 2908 | - //--------检查是否活动，活动是否开始，或者是否结束------- | |
| 2909 | - async check_prom(gid, prom_type, prom_id) { | |
| 2910 | - console.log('check_prom'); | |
| 2911 | - var ee = this, th = ee; | |
| 2912 | - var user_id = getApp().globalData.user_id; | |
| 2913 | - if (!user_id) user_id = 0; | |
| 2914 | - | |
| 2915 | - // if (prom_type == 3 || prom_type == 0 || prom_type == 5 || prom_type == 7 || prom_type == 9 || prom_type == 10) { | |
| 2916 | - // this.setData({ | |
| 2917 | - // prom_type: 0, isshow: 1, | |
| 2918 | - // }); | |
| 2919 | - // return false; | |
| 2920 | - // } | |
| 2921 | - | |
| 2922 | - | |
| 2923 | - | |
| 2924 | - // if (prom_type == 1 && prom_id == 0) { | |
| 2925 | - // this.setData({ | |
| 2926 | - // prom_type: 0, isshow: 1, | |
| 2927 | - // }); | |
| 2928 | - | |
| 2929 | - // //获取门店 | |
| 2930 | - // this.get_sto(); | |
| 2931 | - // this.get_sku(o.stoid, this.data.data, gid); | |
| 2932 | - // this.check_has_flash(); | |
| 2933 | - // this.data.is_normal = 1; | |
| 2934 | - // this.check_is_youhui(gid, 1); | |
| 2935 | - // return false; | |
| 2936 | - // } | |
| 2937 | - | |
| 2938 | - //if (prom_type != 3 && prom_type!=0){ | |
| 2939 | - //---判断秒杀---- | |
| 2940 | - if (prom_type == 1 && prom_id > 0) { | |
| 2941 | - //-------判断活动是否抢光--------- | |
| 2942 | - await getApp().request.promiseGet("/api/weshop/activitylist/getActLen/" + os.stoid + "/" + prom_type + "/" + prom_id, { | |
| 2943 | - 1: 1 | |
| 2944 | - }).then(res => { | |
| 2945 | - var em = res; | |
| 2946 | - if (res.data.code == 0) { | |
| 2947 | - // console.log('!!!!!!res!!!!', res); | |
| 2948 | - if (res.data.data <= 0) ee.setData({ | |
| 2949 | - prom_r_null: 1 | |
| 2950 | - }); | |
| 2951 | - //拿取价格并且判断时间-- | |
| 2952 | - getApp().request.get("/api/ms/flash_sale/getNew/" + os.stoid + "/" + user_id + "/" + prom_id, { | |
| 2953 | - success: function (t) { | |
| 2954 | - // console.log('!!!!!!t!!!!', t); | |
| 2955 | - if (t.data.code != 0) { | |
| 2956 | - ee.get_normal(gid); | |
| 2957 | - return false; | |
| 2958 | - } | |
| 2959 | - //----已经结束----- | |
| 2960 | - if (t.data.data.is_end == 1) { | |
| 2961 | - ee.get_normal(gid); | |
| 2962 | - return false; | |
| 2963 | - } | |
| 2964 | - //----已经过期----- | |
| 2965 | - var now = ut.gettimestamp(); | |
| 2966 | - if (t.data.data.end_time < now) { | |
| 2967 | - ee.get_normal(gid); | |
| 2968 | - return false; | |
| 2969 | - } | |
| 2970 | - /*-- 还没有开始预热的也不显示 --*/ | |
| 2971 | - if (t.data.data.show_time > now) { | |
| 2972 | - ee.get_normal(gid); | |
| 2973 | - return false; | |
| 2974 | - } | |
| 2975 | - | |
| 2976 | - var t_gd = ee.data.data; | |
| 2977 | - var prom_end_time = ut.formatTime(t.data.data.end_time, "yyyy-MM-dd hh:mm:ss"); | |
| 2978 | - var prom_start_time = ut.formatTime(t.data.data.start_time, "yyyy-MM-dd hh:mm:ss"); | |
| 2979 | - | |
| 2980 | - ee.setData({ | |
| 2981 | - 'data.shop_price': t.data.data.user_price, | |
| 2982 | - prom_price: t.data.data.user_price, | |
| 2983 | - prom_type: 1, | |
| 2984 | - prom_id: prom_id, | |
| 2985 | - prom_buy_limit: t.data.data.buy_limit, | |
| 2986 | - prom_act: t.data.data, | |
| 2987 | - prom_end_time: prom_end_time, | |
| 2988 | - prom_start_time: prom_start_time, | |
| 2989 | - isshow: 1, | |
| 2990 | - }); | |
| 2991 | - | |
| 2992 | - ee.get_sto(); | |
| 2993 | - var newTime = ut.gettimestamp(); | |
| 2994 | - var endTime2 = t.data.data.end_time; | |
| 2995 | - var endTime1 = t.data.data.start_time; | |
| 2996 | - if (endTime1 > newTime) { | |
| 2997 | - ee.setData({ | |
| 2998 | - prom_time_text: '距秒杀开始还有', | |
| 2999 | - prom_st: 0, | |
| 3000 | - }) | |
| 3001 | - ee.countDown(endTime1, 0); | |
| 3002 | - } else { | |
| 3003 | - if (endTime2 > newTime) { | |
| 3004 | - ee.setData({ | |
| 3005 | - prom_time_text: '距秒杀结束还有', | |
| 3006 | - prom_st: 1 | |
| 3007 | - }) | |
| 3008 | - ee.countDown(endTime2); | |
| 3009 | - } | |
| 3010 | - } | |
| 3011 | - | |
| 3012 | - //如果是进行中的话 | |
| 3013 | - // if (endTime1 < newTime) { | |
| 3014 | - // //-- 获取秒杀活动的多少规格 -- | |
| 3015 | - // ee.get_more_flahs(function (list) { | |
| 3016 | - // if (list && list.length > 1) { | |
| 3017 | - | |
| 3018 | - // var n_item = list[0]; | |
| 3019 | - // var ind = list.findIndex(function (ele) { | |
| 3020 | - // return ele.goods_id == ee.data.data.goods_id; | |
| 3021 | - // }) | |
| 3022 | - // if (ind < 0) return false; | |
| 3023 | - // if (ind > 0) { | |
| 3024 | - // n_item = JSON.parse(JSON.stringify(list[ind])); | |
| 3025 | - // list.splice(ind, 1); | |
| 3026 | - // list.unshift(n_item); | |
| 3027 | - // } | |
| 3028 | - | |
| 3029 | - // ee.data.sele_g.viplimited = n_item.viplimited; | |
| 3030 | - // ee.data.data.viplimited = n_item.viplimited; | |
| 3031 | - | |
| 3032 | - // var gb = 1; | |
| 3033 | - // //-- 显示多规格 -- | |
| 3034 | - // for (let i in list) { | |
| 3035 | - // let item = list[i]; | |
| 3036 | - // var gg = ""; | |
| 3037 | - // if (item.goods_spec == "null" || item.goods_spec == null) item.goods_spec = ""; | |
| 3038 | - // if (item.goods_color == "null" || item.goods_color == null) item.goods_color = ""; | |
| 3039 | - | |
| 3040 | - // if (item.goods_spec != "" && item.goods_color != "") { | |
| 3041 | - // gg = item.goods_spec + "/" + item.goods_color; | |
| 3042 | - // } else if (item.goods_spec != "" || item.goods_color != "") { | |
| 3043 | - // gg = item.goods_spec + item.goods_color; | |
| 3044 | - // } else { | |
| 3045 | - // gg = "规格" + gb; | |
| 3046 | - // gb++; | |
| 3047 | - // } | |
| 3048 | - // item.gg = gg; | |
| 3049 | - // item.prom_id = item.prom_id; | |
| 3050 | - // item.prom_type = 1; | |
| 3051 | - // } | |
| 3052 | - | |
| 3053 | - // ee.setData({ | |
| 3054 | - // sku_g: list, | |
| 3055 | - // }); | |
| 3056 | - | |
| 3057 | - // } | |
| 3058 | - // }) | |
| 3059 | - // } | |
| 3060 | - | |
| 3061 | - } | |
| 3062 | - }); | |
| 3063 | - } | |
| 3064 | - }) | |
| 3065 | - } | |
| 3066 | - | |
| 3067 | - }, | |
| 3068 | - | |
| 3069 | - | |
| 3070 | - | |
| 3071 | - viewFlash(e) { | |
| 3072 | - let prom_type = e.currentTarget.dataset.promtype; | |
| 3073 | - let prom_id = e.currentTarget.dataset.promid; | |
| 3074 | - let goods_id = this.data.data.goods_id; | |
| 3075 | - let url = `/packageA/pages/goodsInfo/goodsInfo?goods_id=${goods_id}&prom_type=${prom_type}&prom_id=${prom_id}`; | |
| 3076 | - // console.log('url~~~~', url); | |
| 3077 | - getApp().goto(url); | |
| 3078 | - }, | |
| 3079 | - | |
| 3080 | - | |
| 3081 | - | |
| 3082 | - | |
| 3083 | - | |
| 3084 | - | |
| 3085 | - | |
| 3086 | - | |
| 3087 | - | |
| 3088 | - | |
| 3089 | - | |
| 3090 | - | |
| 3091 | - | |
| 2752 | + } | |
| 3092 | 2753 | |
| 3093 | 2754 | |
| 3094 | 2755 | ... | ... |
packageA/pages/goodsInfo/goodsInfo.wxml
| ... | ... | @@ -51,7 +51,6 @@ |
| 51 | 51 | </view> |
| 52 | 52 | </view> |
| 53 | 53 | |
| 54 | - | |
| 55 | 54 | |
| 56 | 55 | <view id="id" bindtouchstart="handletouchtart" bindtouchmove="handletouchmove" wx:else> |
| 57 | 56 | <view class="xc-videos-picture rel"> |
| ... | ... | @@ -64,30 +63,6 @@ |
| 64 | 63 | </swiper> |
| 65 | 64 | </view> |
| 66 | 65 | </view> |
| 67 | - | |
| 68 | - | |
| 69 | - <!-- --显示秒杀价 --> | |
| 70 | - <view class="prom_show rel" wx:if="{{options.prom_type == 1}}"> | |
| 71 | - <!-- 即将开始 --> | |
| 72 | - <image class="secondkill-img" src='{{iurl+"/miniapp/images/blue_ks.png"}}' wx:if="{{prom_st==0}}"></image> | |
| 73 | - <!-- 进行中 --> | |
| 74 | - <image class="secondkill-img" src='{{iurl+"/miniapp/images/red_jx.png"}}' wx:elif="{{prom_st!=0}}"></image> | |
| 75 | - <image class="abs spike-img" src="{{iurl}}/miniapp/images/xsmiaosha.png"></image> | |
| 76 | - <view class="start fs26 abs" wx:if="{{prom_st==0}}">距活动开始还有</view> | |
| 77 | - <view class="stop fs26 abs" wx:if="{{prom_st==1 || prom_st==3}}">距活动结束还有</view> | |
| 78 | - <view class="secview flex abs fs24 xc-miaosha-time"> | |
| 79 | - <block wx:if="djs.day"> | |
| 80 | - <view class='day-val' style="color:{{(prom_st==1 || prom_st==3)?'#d40022':'#0097e0'}}">{{djs.day}}</view> | |
| 81 | - <view class="day white" style="color: {{(prom_st==1 || prom_st==3)?'#d40022':'#0097e0'}}">天</view> | |
| 82 | - </block> | |
| 83 | - <view class='time-val white t-c' style=" background:{{(prom_st==1 || prom_st==3)?'#d40022':'#0097e0'}}">{{djs.hou}}</view> | |
| 84 | - <view class="time" style="color: {{(prom_st==1 || prom_st==3)?'#d40022':'#0097e0'}}">时</view> | |
| 85 | - <view class='time-val white t-c' style=" background:{{(prom_st==1 || prom_st==3)?'#d40022':'#0097e0'}}">{{djs.min}}</view> | |
| 86 | - <view class="time" style="color: {{(prom_st==1 || prom_st==3)?'#d40022':'#0097e0'}}">分</view> | |
| 87 | - <view class='time-val white t-c' style=";background:{{(prom_st==1 || prom_st==3)?'#d40022':'#0097e0'}}">{{djs.sec}}</view> | |
| 88 | - <view class="time" style="color: {{(prom_st==1 || prom_st==3)?'#d40022':'#0097e0'}}">秒</view> | |
| 89 | - </view> | |
| 90 | - </view> | |
| 91 | 66 | |
| 92 | 67 | |
| 93 | 68 | <!-- <block> --> |
| ... | ... | @@ -98,9 +73,6 @@ |
| 98 | 73 | </view> |
| 99 | 74 | |
| 100 | 75 | <view> |
| 101 | - <!-- 秒杀价 --> | |
| 102 | - <!-- <view class="co-red" wx:if="{{options.prom_type == 1}}"><text class="rel yuan fs28">￥</text>{{filters.toFix(prom_price,2)}}</view> --> | |
| 103 | - <!-- 手店价 --> | |
| 104 | 76 | <view class="co-red"><text class="rel yuan fs28">￥</text>{{filters.toFix(data.shop_price,2)}}</view> |
| 105 | 77 | <view class="goods-title"> |
| 106 | 78 | <view class="goods-name elli">{{data.goods_name}}</view> |
| ... | ... | @@ -152,41 +124,6 @@ |
| 152 | 124 | </view> |
| 153 | 125 | |
| 154 | 126 | </view> |
| 155 | - | |
| 156 | - | |
| 157 | - <view class="bdt16" wx:if="{{actList}}"> | |
| 158 | - <view class="cx-frame" style="position: relative; height: auto"> | |
| 159 | - <!-- <block> --> | |
| 160 | - <view class="flex ai_c" wx:for="{{actList}}"> | |
| 161 | - <view class="cx-sizs fs30 pdr40" wx:if="{{item.prom_type == 1}}">秒杀{{index+1}}</view> | |
| 162 | - <view class="f1"> | |
| 163 | - <!-- <view class="fs28 f1"> --> | |
| 164 | - <!-- <view> | |
| 165 | - <text class="prom_condition"> | |
| 166 | - <text class="fill-box">消费满</text>享优惠 | |
| 167 | - </text> | |
| 168 | - </view> --> | |
| 169 | - | |
| 170 | - <!-- <view class="word f1 fs26"> --> | |
| 171 | - <!-- <text class="tick lh2 pdr20" wx:if="{{item.money>0}}">减价{{item.money}}元</text> | |
| 172 | - <text class="tick lh2 pdr20" wx:if="{{item.sale>0}}">打{{item.sale}}折</text> | |
| 173 | - <text class="tick lh2 pdr20" wx:if="{{item.past==1}}">包邮</text> | |
| 174 | - <text class="tick lh2 pdr20" wx:if="{{item.intValue>0}}">送{{item.intValue}}积分</text> | |
| 175 | - <view class="tick lh2 pdr20" wx:if="{{item.couponId>0}}">送{{item.couponMoney}}元优惠券</view> | |
| 176 | - <view class="tick ellipsis-1x lh2" wx:if="{{item.gift_id>0}}">送商品{{item.goods_name}}</view> | |
| 177 | - <view class="tick ellipsis-1x lh2 details pdr40" wx:if="{{item.lb_id>0}}" data-id="{{item.lb_id}}" bindtap="viewLbDetails">送{{item.lbtitle}}</view> --> | |
| 178 | - <view class="tick ellipsis-1x lh2 details pdr40" bindtap="viewFlash" data-promtype="{{item.prom_type}}" data-promid="{{item.act_id}}">{{item.act_name}}</view> | |
| 179 | - <!-- </view> --> | |
| 180 | - <!-- </view> --> | |
| 181 | - </view> | |
| 182 | - </view> | |
| 183 | - | |
| 184 | - | |
| 185 | - <!-- </block> --> | |
| 186 | - </view> | |
| 187 | - </view> | |
| 188 | - | |
| 189 | - | |
| 190 | 127 | |
| 191 | 128 | <view class="bz_view flex bdt16" wx:if="{{store_config}}"> |
| 192 | 129 | <image class="bzfu_img" src="{{iurl}}/miniapp/images/bzfu_w.png"></image> |
| ... | ... | @@ -301,7 +238,7 @@ |
| 301 | 238 | </block> |
| 302 | 239 | </block> |
| 303 | 240 | |
| 304 | - <!-- <view class="table_s" wx:if="{{service_list}}"> | |
| 241 | + <view class="table_s" wx:if="{{service_list}}"> | |
| 305 | 242 | <view class="tb_item tb-l"> |
| 306 | 243 | <view class="item_left f1"> |
| 307 | 244 | <text>项目名称</text> |
| ... | ... | @@ -324,7 +261,7 @@ |
| 324 | 261 | <text>{{item.frequency}}</text> |
| 325 | 262 | </view> |
| 326 | 263 | </view> |
| 327 | - </view> --> | |
| 264 | + </view> | |
| 328 | 265 | |
| 329 | 266 | <view class="wxParse"> |
| 330 | 267 | <template is="wxParse" data="{{wxParseData:content.nodes}}"></template> |
| ... | ... | @@ -502,63 +439,11 @@ |
| 502 | 439 | </view> |
| 503 | 440 | </view> |
| 504 | 441 | |
| 505 | - | |
| 442 | + | |
| 506 | 443 | <view class="flex f1 btn-group"> |
| 507 | - | |
| 508 | - <!-- 从“秒杀”入口进入购买商品 --> | |
| 509 | - <!-- <block wx:if="{{options.prom_type == 1}}"> --> | |
| 510 | - <block wx:if="{{options.prom_type == 1}}"> | |
| 511 | - <block wx:if="{{prom_st==1 && !prom_r_null}}"> | |
| 512 | - <view bindtap="openSpecModel" data-ind="1" class="join-btn cart-btn f1">加入购物车</view> | |
| 513 | - <view bindtap="openSpecModel" data-ind="2" class="buy-btn cart-btn f1">立即抢购</view> | |
| 514 | - </block> | |
| 515 | - | |
| 516 | - <block wx:if="{{prom_st == 0 && !prom_r_null}}"> | |
| 517 | - <!-- 秒杀预热要单独购买 --> | |
| 518 | - <block wx:if="{{prom_type==1 && prom_act.is_shop_buy}}"> | |
| 519 | - <view bindtap="openSpecModel_Nor" data-nor="1" class="join-btn cart-btn f1">单独购买</view> | |
| 520 | - <view class="buy-btn cart-btn lanse">即将开始</view> | |
| 521 | - </block> | |
| 522 | - <block wx:else> | |
| 523 | - <view class="buy-btn cart-btn cart-btn-lg lanse set_width f1">即将开始</view> | |
| 524 | - </block> | |
| 525 | - </block> | |
| 526 | - | |
| 527 | - | |
| 528 | - <block wx:if="{{prom_r_null}}"> | |
| 529 | - | |
| 530 | - <block wx:if="{{prom_type==1 && prom_act.is_shop_buy}}"> | |
| 531 | - <view bindtap="openSpecModel_Nor" data-nor="1" class="join-btn cart-btn f1">单独购买</view> | |
| 532 | - <view class="buy-btn cart-btn huise f1">已抢光</view> | |
| 533 | - </block> | |
| 534 | - <view wx:else class="buy-btn cart-btn cart-btn-lg huise set_width f1">已抢光</view> | |
| 535 | - </block> | |
| 536 | - | |
| 537 | - <block wx:if="{{prom_st==3 && !prom_r_null}}"> | |
| 538 | - <block wx:if="{{prom_type==1 && prom_act.is_shop_buy}}"> | |
| 539 | - <view bindtap="openSpecModel_Nor" data-nor="1" class="join-btn cart-btn f1">单独购买</view> | |
| 540 | - <view class="buy-btn cart-btn huise f1">活动已经结束</view> | |
| 541 | - </block> | |
| 542 | - | |
| 543 | - <view wx:else class="buy-btn cart-btn cart-btn-lg huise set_width f1">活动已经结束</view> | |
| 544 | - </block> | |
| 545 | - </block> | |
| 546 | - <!-- </block> --> | |
| 547 | - | |
| 548 | - | |
| 549 | - <!-- 从“我的服务”入口进入购买商品 --> | |
| 550 | - <block wx:else> | |
| 551 | - <view bindtap="openSpecModel" data-ind="1" class="join-btn cart-btn f1">加入购物车</view> | |
| 552 | - <view bindtap="openSpecModel" data-ind="2" class="buy-btn cart-btn f1">立即购买</view> | |
| 553 | - </block> | |
| 554 | - | |
| 555 | - | |
| 556 | - | |
| 444 | + <view bindtap="openSpecModel" data-ind="1" class="join-btn cart-btn f1">加入购物车</view> | |
| 445 | + <view bindtap="openSpecModel" data-ind="2" class="buy-btn cart-btn f1">立即购买</view> | |
| 557 | 446 | </view> |
| 558 | - | |
| 559 | - | |
| 560 | - | |
| 561 | - | |
| 562 | 447 | |
| 563 | 448 | </view> |
| 564 | 449 | |
| ... | ... | @@ -673,20 +558,10 @@ |
| 673 | 558 | <block wx:else> |
| 674 | 559 | <view wx:if="{{openSpecModal_ind==1}}" bindtap="addCart" data-openSpecModal_ind="{{openSpecModal_ind}}" class="spec-cart-btn yellow fs32 {{!sto_sele_name?'gray':''}}" |
| 675 | 560 | data-action="add">加入购物车</view> |
| 676 | - <!-- 秒杀 --> | |
| 677 | - <block wx:if="{{options.prom_type == 1}}"> | |
| 678 | - <view wx:if="{{openSpecModal_ind==2}}" bindtap="addCart" data-openSpecModal_ind="{{openSpecModal_ind}}" class="spec-cart-btn spec-buy {{!sto_sele_name?'gray':''}}" | |
| 679 | - data-action="buy" data-promtype="{{options.prom_type}}" data-promid="{{options.prom_id}}"> | |
| 680 | - {{sele_g.offline_price?"券后购买":"立即购买"}} | |
| 681 | - </view> | |
| 682 | - </block> | |
| 683 | - <!-- 普通商品 --> | |
| 684 | - <block wx:else> | |
| 685 | - <view wx:if="{{openSpecModal_ind==2}}" bindtap="addCart" data-openSpecModal_ind="{{openSpecModal_ind}}" class="spec-cart-btn spec-buy {{!sto_sele_name?'gray':''}}" | |
| 686 | - data-action="buy"> | |
| 687 | - {{sele_g.offline_price?"券后购买":"立即购买"}} | |
| 688 | - </view> | |
| 689 | - </block> | |
| 561 | + <view wx:if="{{openSpecModal_ind==2}}" bindtap="addCart" data-openSpecModal_ind="{{openSpecModal_ind}}" class="spec-cart-btn spec-buy {{!sto_sele_name?'gray':''}}" | |
| 562 | + data-action="buy"> | |
| 563 | + {{sele_g.offline_price?"券后购买":"立即购买"}} | |
| 564 | + </view> | |
| 690 | 565 | </block> |
| 691 | 566 | </block> |
| 692 | 567 | </block> | ... | ... |
packageA/pages/goodsInfo/goodsInfo.wxss
| ... | ... | @@ -2907,45 +2907,3 @@ button.custom-service::after{ |
| 2907 | 2907 | .del { |
| 2908 | 2908 | text-decoration: line-through; |
| 2909 | 2909 | } |
| 2910 | - | |
| 2911 | - | |
| 2912 | - | |
| 2913 | - | |
| 2914 | -.tick { | |
| 2915 | - position: relative; | |
| 2916 | -} | |
| 2917 | - | |
| 2918 | -.tick:before { | |
| 2919 | - content: ''; | |
| 2920 | - display: inline-block; | |
| 2921 | - vertical-align: middle; | |
| 2922 | - margin-top: -4rpx; | |
| 2923 | - margin-right: 12rpx; | |
| 2924 | - width: 22rpx; | |
| 2925 | - height: 22rpx; | |
| 2926 | - background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABYAAAAWCAMAAADzapwJAAAABGdBTUEAALGPC/xhBQAAAAFzUkdCAK7OHOkAAABCUExURUdwTPInDPInDPgoDfMnDPYqEvInDPInDPInDP87NPUoDv8vEvMoDPInDPIoDPMnDvInDPInDPInDPIoDPQoDfInDEON4KMAAAAVdFJOUwD45yawG4zz3gQ0DmLOfECQZpPlS54kMQ4AAAC0SURBVBjTbZFREoMgDERDS0xQQNHu/a/alEGtaIYfHrBhs0S1pujVifo40VkhC+BUHSDzQTlBhjHY8bjogXmDZ+orJKwXwMUeUoa/0PeGbH8Q4Y5CJopYOjosiOQxdpRGk1UXOkrBKdkimtN8UrKrJBVXdzsllSYSjR/0J9JaGn81WluWtonYKQ0op51P3M2L2bmZN9n8MKoVqTph/RsseyjfYxAkfgot/82CpuJVLOLSIv4Cd5AJ37BgpFwAAAAASUVORK5CYII=) no-repeat; | |
| 2927 | - background-size: 22rpx auto; | |
| 2928 | -} | |
| 2929 | - | |
| 2930 | -.details::after { | |
| 2931 | - content: ''; | |
| 2932 | - position: absolute; | |
| 2933 | - right: 0; | |
| 2934 | - top: 0; | |
| 2935 | - bottom: 0; | |
| 2936 | - margin: auto; | |
| 2937 | - display: inline-block; | |
| 2938 | - width: 40rpx; | |
| 2939 | - height: 40rpx; | |
| 2940 | - background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACgAAAAoBAMAAAB+0KVeAAAABGdBTUEAALGPC/xhBQAAAAFzUkdCAK7OHOkAAAAVUExURUdwTIyMjCYmJiYmJi0tLY+PjyYmJidnOsIAAAAGdFJOUwDt6aYcSSEXj/YAAAA8SURBVCjPY2AYBTQBLEbKDhiCTmlpKggeq2AAiDJLS0tGcBkFBUActbS0JAY4F6sgVu1YLcLnpFFAFQAATwgLKVhjC9UAAAAASUVORK5CYII=); | |
| 2941 | - background-repeat: no-repeat; | |
| 2942 | - background-size: 40rpx auto; | |
| 2943 | -} | |
| 2944 | - | |
| 2945 | -.lh2 { | |
| 2946 | - line-height: 2; | |
| 2947 | -} | |
| 2948 | - | |
| 2949 | -.huise { | |
| 2950 | - background: gray | |
| 2951 | -} | ... | ... |
pages/index/index/index.wxml
| ... | ... | @@ -172,23 +172,21 @@ |
| 172 | 172 | <view class="seckill-list"> |
| 173 | 173 | <swiper class="s_prom" indicator-dots="{{false}}" bindchange="flashSwiperChange"> |
| 174 | 174 | <swiper-item wx:for="{{saleGoods}}" wx:key="{{index}}" class="p_swiper" wx:key="saleGoods" style="740rpx !important;padding: 0; margin-left: 10rpx"> |
| 175 | - <navigator style="flex-shrink: 0;width: 247rpx" class="nav" hover-class="none" url="{{aitem.goods_type == 0 ? ('/pages/goods/goodsInfo/goodsInfo?goods_id=' + aitem.goods_id + '&title=' + aitem.goods_name + '&prom_type=1&prom_id=' + aitem.id):('/packageA/pages/goodsInfo/goodsInfo?goods_id=' + aitem.goods_id + '&title=' + aitem.goods_name + '&prom_type=1&prom_id=' + aitem.id )}}" wx:for="{{item}}" wx:key="item" wx:for-item="aitem" wx:for-index="aind"> | |
| 176 | - <view class="imgview"> | |
| 177 | - <image src="{{url+aitem.original_img}}" mode="aspectFill" lazy-load="true" data-errorimg="saleGoods[{{index}}][{{aind}}].original_img" binderror="bind_bnerr3" data-img="{{aitem.original_img}}"></image> | |
| 178 | - | |
| 179 | - <image wx:if="{{aitem.status==0}}" class="status_img" src="{{url}}/miniapp/images/miao/yure.png"></image> | |
| 180 | - <image wx:if="{{aitem.status==1}}" class="status_img" src="{{url}}/miniapp/images/miao/going.png"></image> | |
| 181 | - <image wx:if="{{aitem.status==2}}" class="status_img" src="{{url}}/miniapp/images/miao/mend.png"></image> | |
| 182 | - </view> | |
| 183 | - <view class="ellipsis-2 mar-top10" style="height: 76rpx;">{{aitem.goods_name}}</view> | |
| 184 | - <!-- <view class="red-co mar-top10 is_seckill_height"> --> | |
| 185 | - <view class="co-red mar-top10"> | |
| 186 | - <text class="fs20">￥</text>{{aitem.price}} | |
| 187 | - <text class="un_line">￥{{aitem.market_price}}</text> | |
| 188 | - </view> | |
| 189 | - </navigator> | |
| 190 | - | |
| 191 | - | |
| 175 | + <navigator style="flex-shrink: 0;width: 247rpx" class="nav" hover-class="none" url="/pages/goods/goodsInfo/goodsInfo?goods_id={{aitem.goods_id}}&title={{aitem.goods_name}}&prom_type=1&prom_id={{aitem.id}}" wx:for="{{item}}" wx:key="item" wx:for-item="aitem" wx:for-index="aind"> | |
| 176 | + <view class="imgview "> | |
| 177 | + <image src="{{url+aitem.original_img}}" mode="aspectFill" lazy-load="true" data-errorimg="saleGoods[{{index}}][{{aind}}].original_img" binderror="bind_bnerr3" data-img="{{aitem.original_img}}"></image> | |
| 178 | + | |
| 179 | + <image wx:if="{{aitem.status==0}}" class="status_img" src="{{url}}/miniapp/images/miao/yure.png"></image> | |
| 180 | + <image wx:if="{{aitem.status==1}}" class="status_img" src="{{url}}/miniapp/images/miao/going.png"></image> | |
| 181 | + <image wx:if="{{aitem.status==2}}" class="status_img" src="{{url}}/miniapp/images/miao/mend.png"></image> | |
| 182 | + </view> | |
| 183 | + <view class="ellipsis-2 mar-top10" style="height: 76rpx;">{{aitem.goods_name}}</view> | |
| 184 | + <!-- <view class="red-co mar-top10 is_seckill_height"> --> | |
| 185 | + <view class="co-red mar-top10"> | |
| 186 | + <text class="fs20">￥</text>{{aitem.price}} | |
| 187 | + <text class="un_line">￥{{aitem.market_price}}</text> | |
| 188 | + </view> | |
| 189 | + </navigator> | |
| 192 | 190 | </swiper-item> |
| 193 | 191 | </swiper> |
| 194 | 192 | <!-- <view class="flex-center-around translation"> | ... | ... |