Commit 3e89cdaec565b48cdd4010a2158d95572c2e0ec9
预售合并
Showing
6 changed files
with
257 additions
and
302 deletions
packageC/pages/presell/cart/cart.js
| @@ -1859,11 +1859,26 @@ Page({ | @@ -1859,11 +1859,26 @@ Page({ | ||
| 1859 | th.setData({ quan_price: 0 }) | 1859 | th.setData({ quan_price: 0 }) |
| 1860 | } | 1860 | } |
| 1861 | 1861 | ||
| 1862 | + | ||
| 1863 | + //---获取订单优惠--- | ||
| 1864 | + var condition = allpice - quan_price; //判断的条件 | ||
| 1865 | + var prom_ord=null | ||
| 1866 | + if(condition > 0 && this.data.pre_arr.is_useorderyh) { | ||
| 1867 | + await getApp().request.promiseGet("/api/weshop/promorder/getOrderPromotion", { | ||
| 1868 | + data: {store_id: os.stoid, orderAmount: condition} | ||
| 1869 | + }).then(res => { | ||
| 1870 | + if (res.data.code == 0) { | ||
| 1871 | + prom_ord = res.data.data; | ||
| 1872 | + } | ||
| 1873 | + | ||
| 1874 | + }) | ||
| 1875 | + } | ||
| 1876 | + | ||
| 1862 | //-----------当地址不为空，且是物流时，计算物流费用---------- | 1877 | //-----------当地址不为空，且是物流时，计算物流费用---------- |
| 1863 | if (th.data.user_addr != null && th.data.exp_type == 0 && good.is_free_shipping == 0) { | 1878 | if (th.data.user_addr != null && th.data.exp_type == 0 && good.is_free_shipping == 0) { |
| 1864 | //看是不是有调用过包邮券,如果活动可以使用优化券的情况下 | 1879 | //看是不是有调用过包邮券,如果活动可以使用优化券的情况下 |
| 1865 | if (!th.data.isget_by_quan[bn_pick] && th.data.act.is_usecoupon) { | 1880 | if (!th.data.isget_by_quan[bn_pick] && th.data.act.is_usecoupon) { |
| 1866 | - var condition = allpice - quan_price; | 1881 | + |
| 1867 | //--判断要不要显示包邮券,链式调用接口，调取包邮券，已经是减了优惠的金额，见到优惠券的钱--- | 1882 | //--判断要不要显示包邮券,链式调用接口，调取包邮券，已经是减了优惠的金额，见到优惠券的钱--- |
| 1868 | getApp().request.promiseGet("/api/weshop/userfeemail/pageAndArea", { | 1883 | getApp().request.promiseGet("/api/weshop/userfeemail/pageAndArea", { |
| 1869 | data: { | 1884 | data: { |
| @@ -1897,14 +1912,19 @@ Page({ | @@ -1897,14 +1912,19 @@ Page({ | ||
| 1897 | var user_addr=th.data.user_addr; | 1912 | var user_addr=th.data.user_addr; |
| 1898 | var req_d = { | 1913 | var req_d = { |
| 1899 | province: user_addr.province, city: user_addr.city, district: user_addr.district, | 1914 | province: user_addr.province, city: user_addr.city, district: user_addr.district, |
| 1900 | - wuliu: parseFloat(allpice).toFixed(2), store_id: os.stoid | 1915 | + wuliu: parseFloat(condition).toFixed(2), store_id: os.stoid |
| 1901 | } | 1916 | } |
| 1902 | var back_data = null; | 1917 | var back_data = null; |
| 1903 | - await getApp().request.promisePost("/api/weshop/order/areaFreight", { | ||
| 1904 | - is_json: 1, data: req_d | ||
| 1905 | - }).then(rs => { | ||
| 1906 | - if (rs.data.code == 0) back_data = rs.data.data; | ||
| 1907 | - }); | 1918 | + |
| 1919 | + //-- 判断是不是包邮 -- | ||
| 1920 | + if (this.data.act.is_post_temp && (!prom_ord || prom_ord.is_post_temp)) { | ||
| 1921 | + | ||
| 1922 | + await getApp().request.promisePost("/api/weshop/order/areaFreight", { | ||
| 1923 | + is_json: 1, data: req_d | ||
| 1924 | + }).then(rs => { | ||
| 1925 | + if (rs.data.code == 0) back_data = rs.data.data; | ||
| 1926 | + }); | ||
| 1927 | + } | ||
| 1908 | 1928 | ||
| 1909 | var gd_arr_list = []; | 1929 | var gd_arr_list = []; |
| 1910 | gd_arr_list.push(good); | 1930 | gd_arr_list.push(good); |
| @@ -1993,12 +2013,13 @@ Page({ | @@ -1993,12 +2013,13 @@ Page({ | ||
| 1993 | 2013 | ||
| 1994 | exp_price = parseFloat(shipping_price).toFixed(2); | 2014 | exp_price = parseFloat(shipping_price).toFixed(2); |
| 1995 | } | 2015 | } |
| 1996 | - th.wuliu_next(allpice, quan_price, exp_price); | 2016 | + th.wuliu_next(allpice, quan_price, exp_price,prom_ord,1); |
| 1997 | } else { | 2017 | } else { |
| 1998 | - th.wuliu_next(allpice, quan_price, exp_price); | 2018 | + th.wuliu_next(allpice, quan_price, exp_price,prom_ord,1); |
| 1999 | } | 2019 | } |
| 2000 | //}); | 2020 | //}); |
| 2001 | }, | 2021 | }, |
| 2022 | + | ||
| 2002 | async calculate_same_city() { | 2023 | async calculate_same_city() { |
| 2003 | var th = this, | 2024 | var th = this, |
| 2004 | good = th.data.goods, | 2025 | good = th.data.goods, |
| @@ -2061,20 +2082,35 @@ Page({ | @@ -2061,20 +2082,35 @@ Page({ | ||
| 2061 | 2082 | ||
| 2062 | 2083 | ||
| 2063 | 2084 | ||
| 2064 | - //相同的东西统一在一起 | ||
| 2065 | - wuliu_next(allpice, quan_price, exp_price) { | 2085 | + //相同的东西统一在一起，is_get表示订单优惠有没有被读取一遍 |
| 2086 | + async wuliu_next(allpice, quan_price, exp_price,ord_prom,is_get) { | ||
| 2066 | var th = this; | 2087 | var th = this; |
| 2067 | var o_condition = parseFloat(allpice) - parseFloat(quan_price); | 2088 | var o_condition = parseFloat(allpice) - parseFloat(quan_price); |
| 2068 | if (o_condition < 0) o_condition = 0; | 2089 | if (o_condition < 0) o_condition = 0; |
| 2090 | + | ||
| 2091 | + if(!ord_prom && !is_get){ | ||
| 2092 | + if(o_condition > 0 && this.data.pre_arr.is_useorderyh){ | ||
| 2093 | + await getApp().request.promiseGet("/api/weshop/promorder/getOrderPromotion", { | ||
| 2094 | + data: { store_id: os.stoid, orderAmount: condition } | ||
| 2095 | + }).then(res => { | ||
| 2096 | + if (res.data.code == 0) { | ||
| 2097 | + ord_prom = res.data.data; | ||
| 2098 | + } | ||
| 2099 | + }) | ||
| 2100 | + } | ||
| 2101 | + } | ||
| 2102 | + | ||
| 2103 | + | ||
| 2069 | //如果同意参与订单优惠 | 2104 | //如果同意参与订单优惠 |
| 2070 | - if (o_condition > 0 && this.data.pre_arr.is_useorderyh) { | ||
| 2071 | - th.check_is_order_prom(o_condition,async function (ord_price) { | 2105 | + if (ord_prom) { |
| 2106 | + //th.check_is_order_prom(o_condition,async function (ord_price) { | ||
| 2107 | + var ord_price=o_condition; | ||
| 2072 | var bn_pick = th.data.pickup.pickup_id | 2108 | var bn_pick = th.data.pickup.pickup_id |
| 2073 | var order_prom_amount = 0; | 2109 | var order_prom_amount = 0; |
| 2074 | var order_prom_id = 0; | 2110 | var order_prom_id = 0; |
| 2075 | var order_m = 0; | 2111 | var order_m = 0; |
| 2076 | - if (th.data.order_prom[bn_pick]) { | ||
| 2077 | - var ord_prom = th.data.order_prom[bn_pick]; | 2112 | + //if (th.data.order_prom[bn_pick]) { |
| 2113 | + //var ord_prom = th.data.order_prom[bn_pick]; | ||
| 2078 | //么有使用券，或者活动没有限制使用优惠券 | 2114 | //么有使用券，或者活动没有限制使用优惠券 |
| 2079 | if (quan_price <= 0 || !ord_prom.is_xz_yh) { | 2115 | if (quan_price <= 0 || !ord_prom.is_xz_yh) { |
| 2080 | order_prom_id = ord_prom['id']; | 2116 | order_prom_id = ord_prom['id']; |
| @@ -2090,7 +2126,7 @@ Page({ | @@ -2090,7 +2126,7 @@ Page({ | ||
| 2090 | } | 2126 | } |
| 2091 | ord_price = order_m; | 2127 | ord_price = order_m; |
| 2092 | } | 2128 | } |
| 2093 | - } | 2129 | + //} |
| 2094 | 2130 | ||
| 2095 | //--订单优惠的显示-- | 2131 | //--订单优惠的显示-- |
| 2096 | if (order_prom_id > 0) { | 2132 | if (order_prom_id > 0) { |
| @@ -2177,11 +2213,9 @@ Page({ | @@ -2177,11 +2213,9 @@ Page({ | ||
| 2177 | if( th.data.bn_use_commission){ | 2213 | if( th.data.bn_use_commission){ |
| 2178 | the_price-=th.data.bn_use_commission; | 2214 | the_price-=th.data.bn_use_commission; |
| 2179 | } | 2215 | } |
| 2180 | - | ||
| 2181 | - | ||
| 2182 | th.setData({ exp_price: exp_price, order_m: the_price, show_submit: 1, }) | 2216 | th.setData({ exp_price: exp_price, order_m: the_price, show_submit: 1, }) |
| 2183 | 2217 | ||
| 2184 | - }) | 2218 | + //}) |
| 2185 | } else { | 2219 | } else { |
| 2186 | 2220 | ||
| 2187 | var o_condition1 = parseFloat(o_condition) - parseFloat(th.data.presell.presell_deposit); | 2221 | var o_condition1 = parseFloat(o_condition) - parseFloat(th.data.presell.presell_deposit); |
packageC/pages/presell/cart/cart2.js
| @@ -408,6 +408,10 @@ Page({ | @@ -408,6 +408,10 @@ Page({ | ||
| 408 | 408 | ||
| 409 | t.data.data.original_img = oo.imghost + t.data.data.original_img; | 409 | t.data.data.original_img = oo.imghost + t.data.data.original_img; |
| 410 | t.data.data['buynum'] = th.data.gg.goods_num; | 410 | t.data.data['buynum'] = th.data.gg.goods_num; |
| 411 | + t.data.data.prom_id=th.data.gg.prom_id; | ||
| 412 | + t.data.data.prom_type=8; | ||
| 413 | + | ||
| 414 | + | ||
| 411 | var distr_t = 0, et = 0; | 415 | var distr_t = 0, et = 0; |
| 412 | 416 | ||
| 413 | if(t.data.data.is_minishop==1 && getApp().is_sp_hao()){ | 417 | if(t.data.data.is_minishop==1 && getApp().is_sp_hao()){ |
| @@ -641,12 +645,11 @@ Page({ | @@ -641,12 +645,11 @@ Page({ | ||
| 641 | calculatePrice2: async function () { | 645 | calculatePrice2: async function () { |
| 642 | var th = this, good = this.data.bn_goods; | 646 | var th = this, good = this.data.bn_goods; |
| 643 | if (!good) return false; | 647 | if (!good) return false; |
| 644 | - | ||
| 645 | //搭配的计算要用购物的车计算方法 | 648 | //搭配的计算要用购物的车计算方法 |
| 646 | - if (good.prom_type == 5) { | ||
| 647 | - th.calculatePrice(); | ||
| 648 | - return false; | ||
| 649 | - } | 649 | + // if (good.prom_type == 5) { |
| 650 | + // th.calculatePrice(); | ||
| 651 | + // return false; | ||
| 652 | + // } | ||
| 650 | 653 | ||
| 651 | th.setData({dis_btn:1}) | 654 | th.setData({dis_btn:1}) |
| 652 | 655 | ||
| @@ -678,8 +681,7 @@ Page({ | @@ -678,8 +681,7 @@ Page({ | ||
| 678 | } | 681 | } |
| 679 | 682 | ||
| 680 | 683 | ||
| 681 | - // to.getConfig2(function (ee) { | ||
| 682 | - // to.getwuliuprice(async function (rs) { | 684 | + |
| 683 | 685 | ||
| 684 | var o_shipping_price = 0, goods_weight = -1, goods_piece = -1; | 686 | var o_shipping_price = 0, goods_weight = -1, goods_piece = -1; |
| 685 | var out_of_weight = null; //超出多少重量 | 687 | var out_of_weight = null; //超出多少重量 |
| @@ -708,6 +710,30 @@ Page({ | @@ -708,6 +710,30 @@ Page({ | ||
| 708 | } | 710 | } |
| 709 | } | 711 | } |
| 710 | 712 | ||
| 713 | + //-----------------支付价,优惠券不减物流----------------- | ||
| 714 | + var total_m = (parseFloat(allpice1)).toFixed(2); | ||
| 715 | + var order_m = (parseFloat(allpice - cut_price) - quan_price).toFixed(2); | ||
| 716 | + var coupon_price = quan_price; //优惠券优惠了多少钱 | ||
| 717 | + if (order_m < 0) { | ||
| 718 | + order_m = 0; | ||
| 719 | + coupon_price = parseFloat(order_m).toFixed(2); | ||
| 720 | + } | ||
| 721 | + //--看一下有没有订单优惠-- | ||
| 722 | + var o_condition = parseFloat(order_m); | ||
| 723 | + | ||
| 724 | + //-- 判断订单优惠的叠加 -- | ||
| 725 | + var ord_prom=null; | ||
| 726 | + var o_condition=allpice; | ||
| 727 | + if (o_condition > 0 && th.data.act.is_useorderyh) { | ||
| 728 | + await getApp().request.promiseGet("/api/weshop/promorder/getOrderPromotion", { | ||
| 729 | + data: { store_id: os.stoid, orderAmount: o_condition, user_id: getApp().globalData.user_id } | ||
| 730 | + }).then(res => { | ||
| 731 | + if (res.data.code == 0) { | ||
| 732 | + ord_prom = res.data.data; | ||
| 733 | + } | ||
| 734 | + }) | ||
| 735 | + } | ||
| 736 | + | ||
| 711 | //-----------当地址不为空，且是物流时，计算物流费用,并同时商品不是优惠活动的包邮---------- | 737 | //-----------当地址不为空，且是物流时，计算物流费用,并同时商品不是优惠活动的包邮---------- |
| 712 | if (th.data.user_addr != null && th.data.bn_exp_type == 0 && good.is_free_shipping == 0 && good.is_past != 1) { | 738 | if (th.data.user_addr != null && th.data.bn_exp_type == 0 && good.is_free_shipping == 0 && good.is_past != 1) { |
| 713 | //看是不是有调用过包邮券 | 739 | //看是不是有调用过包邮券 |
| @@ -757,11 +783,16 @@ Page({ | @@ -757,11 +783,16 @@ Page({ | ||
| 757 | wuliu: parseFloat(parseFloat(allpice) - cut_price - quan_price).toFixed(2), store_id: os.stoid | 783 | wuliu: parseFloat(parseFloat(allpice) - cut_price - quan_price).toFixed(2), store_id: os.stoid |
| 758 | } | 784 | } |
| 759 | var back_data = null; | 785 | var back_data = null; |
| 760 | - await getApp().request.promisePost("/api/weshop/order/areaFreight", { | ||
| 761 | - is_json: 1, data: req_d | ||
| 762 | - }).then(rs => { | ||
| 763 | - if (rs.data.code == 0) back_data = rs.data.data; | ||
| 764 | - }); | 786 | + |
| 787 | + if(!ord_prom || ord_prom.is_post_temp) { | ||
| 788 | + if (th.data.act.is_post_temp){ | ||
| 789 | + await getApp().request.promisePost("/api/weshop/order/areaFreight", { | ||
| 790 | + is_json: 1, data: req_d | ||
| 791 | + }).then(rs => { | ||
| 792 | + if (rs.data.code == 0) back_data = rs.data.data; | ||
| 793 | + }); | ||
| 794 | + } | ||
| 795 | + } | ||
| 765 | 796 | ||
| 766 | var cut_good_weight = 0; | 797 | var cut_good_weight = 0; |
| 767 | for (let i in gd_arr_list) { | 798 | for (let i in gd_arr_list) { |
| @@ -868,306 +899,171 @@ Page({ | @@ -868,306 +899,171 @@ Page({ | ||
| 868 | th.setData({ [wl_txt]: 0, }) | 899 | th.setData({ [wl_txt]: 0, }) |
| 869 | } | 900 | } |
| 870 | } | 901 | } |
| 871 | - //-----------------支付价,优惠券不减物流----------------- | ||
| 872 | - var total_m = (parseFloat(allpice1)).toFixed(2); | ||
| 873 | - var order_m = (parseFloat(allpice - cut_price) - quan_price).toFixed(2); | ||
| 874 | - var coupon_price = quan_price; //优惠券优惠了多少钱 | ||
| 875 | - if (order_m < 0) { | ||
| 876 | - order_m = 0; | ||
| 877 | - coupon_price = parseFloat(order_m).toFixed(2); | ||
| 878 | - } | ||
| 879 | - //--看一下有没有订单优惠-- | ||
| 880 | - var o_condition = parseFloat(order_m); | ||
| 881 | - | ||
| 882 | 902 | ||
| 883 | 903 | ||
| 884 | - if (o_condition > 0 && th.data.act.is_useorderyh) { | ||
| 885 | - th.check_is_order_prom(o_condition, async function () { | ||
| 886 | - var order_prom_amount = 0; | ||
| 887 | - var order_prom_id = 0; | ||
| 888 | - if (th.data.order_prom[th.data.bn_pick]) { | ||
| 889 | - var ord_prom = th.data.order_prom[th.data.bn_pick]; | ||
| 890 | - if (!ord_prom.is_xz_yh || quan_price <= 0) { | ||
| 891 | - order_prom_id = ord_prom['id']; | ||
| 892 | - switch (ord_prom['type']) { | ||
| 893 | - case 0: | ||
| 894 | - order_m = Math.round(o_condition * ord_prom['expression']) / 100;//满额打折 | ||
| 895 | - order_prom_amount = (o_condition - order_m).toFixed(2); | ||
| 896 | - break; | ||
| 897 | - case 1: | ||
| 898 | - | ||
| 899 | - var bs=1; | ||
| 900 | - if(ord_prom.is_bz){ | ||
| 901 | - bs=Math.floor(o_condition/ord_prom.money); | ||
| 902 | - } | ||
| 903 | - | ||
| 904 | - order_m = o_condition - bs*ord_prom['expression'];//满额优惠金额 | ||
| 905 | - order_prom_amount = bs*ord_prom['expression']; | ||
| 906 | - break; | 904 | + var order_prom_amount = 0; |
| 905 | + var order_prom_id = 0; | ||
| 906 | + var order_prom_txt1 = "formData.order_prom_id"; | ||
| 907 | + var order_prom_txt2 = "formData.order_prom_amount"; | ||
| 908 | + if(ord_prom){ | ||
| 909 | + if (!ord_prom.is_xz_yh || quan_price <= 0) { | ||
| 910 | + order_prom_id = ord_prom['id']; | ||
| 911 | + switch (ord_prom['type']) { | ||
| 912 | + case 0: | ||
| 913 | + order_m = Math.round(o_condition * ord_prom['expression']) / 100;//满额打折 | ||
| 914 | + order_prom_amount = (o_condition - order_m).toFixed(2); | ||
| 915 | + break; | ||
| 916 | + case 1: | ||
| 917 | + | ||
| 918 | + var bs=1; | ||
| 919 | + if(ord_prom.is_bz){ | ||
| 920 | + bs=Math.floor(o_condition/ord_prom.money); | ||
| 907 | } | 921 | } |
| 908 | - } | ||
| 909 | - } | ||
| 910 | - //--订单优惠的显示-- | ||
| 911 | - if (order_prom_id > 0) { | ||
| 912 | - var order_prom_txt1 = "formData.order_prom_id"; | ||
| 913 | - var order_prom_txt2 = "formData.order_prom_amount"; | ||
| 914 | - th.setData({ [order_prom_txt1]: order_prom_id, [order_prom_txt2]: order_prom_amount }) | 922 | + order_m = o_condition - bs*ord_prom['expression'];//满额优惠金额 |
| 923 | + order_prom_amount = bs*ord_prom['expression']; | ||
| 924 | + break; | ||
| 915 | } | 925 | } |
| 926 | + } | ||
| 927 | + //--订单优惠的显示-- | ||
| 928 | + if (order_prom_id > 0) { | ||
| 929 | + th.setData({ [order_prom_txt1]: order_prom_id, [order_prom_txt2]: order_prom_amount }) | ||
| 930 | + } | ||
| 931 | + }else { | ||
| 932 | + th.setData({ [order_prom_txt1]: 0, [order_prom_txt2]: 0 }) | ||
| 933 | + } | ||
| 916 | 934 | ||
| 917 | - //判断是否同城配送,而且没有调用过 | ||
| 918 | - if(th.data.bn_exp_type==2 && th.data.user_addr) { | ||
| 919 | - | ||
| 920 | - var lon=0;var lat=0; | ||
| 921 | - //-- 获取距离 -- | ||
| 922 | - await getApp().request.promisePost("/api/weshop/order/sameCityExp/getGeocoder", { | ||
| 923 | - is_json: 1, data: {address:th.data.user_addr.more_address+th.data.user_addr.address} | ||
| 924 | - }).then(res=>{ | ||
| 925 | - if(res.data.code==0){ | ||
| 926 | - var data= JSON.parse(res.data.data); | ||
| 927 | - if(data.status==0){ | ||
| 928 | - lon=data.result.location.lng; | ||
| 929 | - lat=data.result.location.lat; | ||
| 930 | - } | ||
| 931 | - } | ||
| 932 | - }) | ||
| 933 | 935 | ||
| 936 | + var order_prom_txt1 = "formData.order_prom_id"; | ||
| 937 | + var order_prom_txt2 = "formData.order_prom_amount"; | ||
| 938 | + th.setData({ [order_prom_txt1]: order_prom_id, [order_prom_txt2]: order_prom_amount }) | ||
| 934 | 939 | ||
| 935 | - var gd_w = good['weight'] * good['buynum']; | ||
| 936 | - //-- 获取距离 -- | ||
| 937 | - var req_data = { | ||
| 938 | - store_id: os.stoid, | ||
| 939 | - order_amount: parseFloat(order_m), | ||
| 940 | - lon: lon, lat: lat, | ||
| 941 | - pickup_id: bn_pick, | ||
| 942 | - goods_weight: gd_w | ||
| 943 | - } | ||
| 944 | 940 | ||
| 945 | - var is_next=1; | ||
| 946 | - //获取同城配送参数 | ||
| 947 | - await getApp().request.promisePost("/api/weshop/order/sameCityExp/getMoney", { | ||
| 948 | - is_json: 1, | ||
| 949 | - data: req_data | ||
| 950 | - }).then(res => { | ||
| 951 | - if (res.data.code == 0) { | ||
| 952 | - var wl_txt = "formData.shipping_price"; | ||
| 953 | - th.setData({ [wl_txt]: res.data.data, }) | ||
| 954 | - }else{ | ||
| 955 | - is_next=0; | ||
| 956 | - wx.showToast({ | ||
| 957 | - title: res.data.msg, icon: 'none', duration: 2000 | ||
| 958 | - }) | ||
| 959 | - } | ||
| 960 | - }) | ||
| 961 | - if(!is_next) return false | 941 | + //判断是否同城配送,而且没有调用过 |
| 942 | + if(th.data.bn_exp_type==2 && th.data.user_addr) { | ||
| 943 | + var lon=0;var lat=0; | ||
| 944 | + //-- 获取距离 -- | ||
| 945 | + await getApp().request.promisePost("/api/weshop/order/sameCityExp/getGeocoder", { | ||
| 946 | + is_json: 1, data: {address:th.data.user_addr.more_address+th.data.user_addr.address} | ||
| 947 | + }).then(res=>{ | ||
| 948 | + if(res.data.code==0){ | ||
| 949 | + var data= JSON.parse(res.data.data); | ||
| 950 | + if(data.status==0){ | ||
| 951 | + lon=data.result.location.lng; | ||
| 952 | + lat=data.result.location.lat; | ||
| 953 | + } | ||
| 962 | } | 954 | } |
| 955 | + }) | ||
| 963 | 956 | ||
| 957 | + var gd_w = good['weight'] * good['buynum']; | ||
| 958 | + //-- 获取距离 -- | ||
| 959 | + var req_data = { | ||
| 960 | + store_id: os.stoid, | ||
| 961 | + order_amount:parseFloat(order_m), | ||
| 962 | + lon: lon, lat: lat, | ||
| 963 | + pickup_id: bn_pick, | ||
| 964 | + goods_weight: gd_w | ||
| 965 | + } | ||
| 964 | 966 | ||
| 965 | - | ||
| 966 | - total_m = parseFloat(total_m) + parseFloat(th.data.formData.shipping_price); | ||
| 967 | - order_m = parseFloat(order_m) + parseFloat(th.data.formData.shipping_price); | ||
| 968 | - | ||
| 969 | - total_m = total_m.toFixed(2); | ||
| 970 | - order_m = order_m.toFixed(2); | ||
| 971 | - | ||
| 972 | - var atxt = "formData.total_amount"; | ||
| 973 | - th.setData({ [atxt]: total_m, }) | ||
| 974 | - | ||
| 975 | - var txt = "formData.user_money"; | ||
| 976 | - var txt2 = "formData.order_amount"; | ||
| 977 | - var txt3 = "formData.coupon_price"; | ||
| 978 | - | ||
| 979 | - if(parseFloat(order_m)<parseFloat(th.data.bn_goods.use_commission)){ | ||
| 980 | - | 967 | + var is_next=1; |
| 968 | + //获取同城配送参数 | ||
| 969 | + await getApp().request.promisePost("/api/weshop/order/sameCityExp/getMoney", { | ||
| 970 | + is_json: 1, | ||
| 971 | + data: req_data | ||
| 972 | + }).then(res => { | ||
| 973 | + if (res.data.code == 0) { | ||
| 974 | + var wl_txt = "formData.shipping_price"; | ||
| 975 | + th.setData({ [wl_txt]: res.data.data, }) | ||
| 976 | + }else{ | ||
| 977 | + is_next=0; | ||
| 981 | wx.showToast({ | 978 | wx.showToast({ |
| 982 | - title: '应付金额小于本单佣金，不可使用！', | ||
| 983 | - icon: 'none', | ||
| 984 | - duration: 2000 | ||
| 985 | - }) | ||
| 986 | - | ||
| 987 | - th.setData({ | ||
| 988 | - bn_use_commission:0 | 979 | + title: res.data.msg, icon: 'none', duration: 2000 |
| 989 | }) | 980 | }) |
| 990 | - | ||
| 991 | - } | ||
| 992 | - | ||
| 993 | - var txt4 = "formData.use_commission"; | ||
| 994 | - | ||
| 995 | - if(th.data.bn_use_commission){ | ||
| 996 | - order_m=(parseFloat(order_m)- parseFloat(th.data.bn_goods.use_commission)).toFixed(2); | ||
| 997 | - th.setData({[txt4]:th.data.bn_goods.use_commission}) | ||
| 998 | - } | ||
| 999 | - | ||
| 1000 | - var amoney = parseFloat(th.data.userinfo.user_money - th.data.txmon - th.data.userinfo.frozen_money); | ||
| 1001 | - //--------------如果使用余额--------------------- | ||
| 1002 | - if (th.data.bn_use_money == 1) { | ||
| 1003 | - if (amoney > parseFloat(order_m)) { | ||
| 1004 | - order_m = parseFloat(order_m).toFixed(2); | ||
| 1005 | - th.setData({ [txt]: order_m, [txt2]: 0, [txt3]: coupon_price, show_submit: 1,dis_btn:0 }) | ||
| 1006 | - } else { | ||
| 1007 | - order_m = parseFloat(order_m) - parseFloat(amoney); | ||
| 1008 | - order_m = order_m.toFixed(2); | ||
| 1009 | - th.setData({ [txt]: amoney, [txt2]: order_m, [txt3]: coupon_price, show_submit: 1,dis_btn:0 }) | ||
| 1010 | - } | ||
| 1011 | - } else { | ||
| 1012 | - th.setData({ [txt]: 0, [txt2]: order_m, [txt3]: coupon_price, show_submit: 1,dis_btn:0 }) | ||
| 1013 | - } | ||
| 1014 | - //优惠活动送积分 | ||
| 1015 | - if (good.s_intValue) { | ||
| 1016 | - txt = "formData.give_integral"; | ||
| 1017 | - th.setData({ [txt]: good.s_intValue }); | ||
| 1018 | - } | ||
| 1019 | - //优惠送券 | ||
| 1020 | - if (good.s_coupon_id) { | ||
| 1021 | - var i_txt = "formData.give_coupon_id"; | ||
| 1022 | - //这个是json格式的 | ||
| 1023 | - var i_txt1 = "formData.g_coupon_num"; | ||
| 1024 | - var ob = [{ "num": good.s_coupon_num, "c_id": good.s_coupon_id }]; | ||
| 1025 | - ob = JSON.stringify(ob); | ||
| 1026 | - th.setData({ [i_txt]: good.s_coupon_id, [i_txt1]: ob }); | ||
| 1027 | - } | ||
| 1028 | - //优惠礼包 | ||
| 1029 | - if (good.s_libao) { | ||
| 1030 | - var l_txt = "formData.give_lb_id"; | ||
| 1031 | - //这个是json格式的 | ||
| 1032 | - var l_txt1 = "formData.g_lb_num"; | ||
| 1033 | - var ob = [{ "num": good.s_lb_num, "l_id": good.s_libao }]; | ||
| 1034 | - ob = JSON.stringify(ob); | ||
| 1035 | - th.setData({ [l_txt]: good.s_libao, [l_txt1]: ob }); | ||
| 1036 | } | 981 | } |
| 1037 | }) | 982 | }) |
| 1038 | - } else { | ||
| 1039 | - var order_prom_txt1 = "formData.order_prom_id"; | ||
| 1040 | - var order_prom_txt2 = "formData.order_prom_amount"; | ||
| 1041 | - th.setData({ [order_prom_txt1]: 0, [order_prom_txt2]: 0 }) | ||
| 1042 | - | ||
| 1043 | - | ||
| 1044 | - //判断是否同城配送,而且没有调用过 | ||
| 1045 | - if(th.data.bn_exp_type==2 && th.data.user_addr) { | ||
| 1046 | - var lon=0;var lat=0; | ||
| 1047 | - //-- 获取距离 -- | ||
| 1048 | - await getApp().request.promisePost("/api/weshop/order/sameCityExp/getGeocoder", { | ||
| 1049 | - is_json: 1, data: {address:th.data.user_addr.more_address+th.data.user_addr.address} | ||
| 1050 | - }).then(res=>{ | ||
| 1051 | - if(res.data.code==0){ | ||
| 1052 | - var data= JSON.parse(res.data.data); | ||
| 1053 | - if(data.status==0){ | ||
| 1054 | - lon=data.result.location.lng; | ||
| 1055 | - lat=data.result.location.lat; | ||
| 1056 | - } | ||
| 1057 | - } | ||
| 1058 | - }) | ||
| 1059 | - | ||
| 1060 | - var gd_w = good['weight'] * good['buynum']; | ||
| 1061 | - //-- 获取距离 -- | ||
| 1062 | - var req_data = { | ||
| 1063 | - store_id: os.stoid, | ||
| 1064 | - order_amount:parseFloat(order_m), | ||
| 1065 | - lon: lon, lat: lat, | ||
| 1066 | - pickup_id: bn_pick, | ||
| 1067 | - goods_weight: gd_w | ||
| 1068 | - } | ||
| 1069 | - | ||
| 1070 | - var is_next=1; | ||
| 1071 | - //获取同城配送参数 | ||
| 1072 | - await getApp().request.promisePost("/api/weshop/order/sameCityExp/getMoney", { | ||
| 1073 | - is_json: 1, | ||
| 1074 | - data: req_data | ||
| 1075 | - }).then(res => { | ||
| 1076 | - if (res.data.code == 0) { | ||
| 1077 | - var wl_txt = "formData.shipping_price"; | ||
| 1078 | - th.setData({ [wl_txt]: res.data.data, }) | ||
| 1079 | - }else{ | ||
| 1080 | - is_next=0; | ||
| 1081 | - wx.showToast({ | ||
| 1082 | - title: res.data.msg, icon: 'none', duration: 2000 | ||
| 1083 | - }) | ||
| 1084 | - } | ||
| 1085 | - }) | ||
| 1086 | - if(!is_next) return false | ||
| 1087 | - } | ||
| 1088 | - | ||
| 1089 | - total_m = parseFloat(total_m) + parseFloat(th.data.formData.shipping_price); | ||
| 1090 | - order_m = parseFloat(order_m) + parseFloat(th.data.formData.shipping_price); | ||
| 1091 | - var atxt = "formData.total_amount"; | 983 | + if(!is_next) return false |
| 984 | + } | ||
| 1092 | 985 | ||
| 1093 | - total_m = total_m.toFixed(2); | ||
| 1094 | - order_m = order_m.toFixed(2); | 986 | + total_m = parseFloat(total_m) + parseFloat(th.data.formData.shipping_price); |
| 987 | + order_m = parseFloat(order_m) + parseFloat(th.data.formData.shipping_price); | ||
| 988 | + var atxt = "formData.total_amount"; | ||
| 1095 | 989 | ||
| 1096 | - th.setData({ [atxt]: total_m, }) | 990 | + total_m = total_m.toFixed(2); |
| 991 | + order_m = order_m.toFixed(2); | ||
| 1097 | 992 | ||
| 1098 | - var txt = "formData.user_money"; | ||
| 1099 | - var txt2 = "formData.order_amount"; | ||
| 1100 | - var txt3 = "formData.coupon_price"; | 993 | + th.setData({ [atxt]: total_m, }) |
| 1101 | 994 | ||
| 1102 | - if(parseFloat(order_m)<parseFloat(th.data.bn_goods.use_commission)){ | 995 | + var txt = "formData.user_money"; |
| 996 | + var txt2 = "formData.order_amount"; | ||
| 997 | + var txt3 = "formData.coupon_price"; | ||
| 1103 | 998 | ||
| 1104 | - if(th.data.bn_use_commission){ | ||
| 1105 | - wx.showToast({ | ||
| 1106 | - title: '应付金额小于本单佣金，不可使用！', | ||
| 1107 | - icon: 'none', | ||
| 1108 | - duration: 2000 | ||
| 1109 | - }) | ||
| 1110 | - } | 999 | + if(parseFloat(order_m)<parseFloat(th.data.bn_goods.use_commission)){ |
| 1111 | 1000 | ||
| 1112 | - th.setData({ | ||
| 1113 | - bn_use_commission:0 | 1001 | + if(th.data.bn_use_commission){ |
| 1002 | + wx.showToast({ | ||
| 1003 | + title: '应付金额小于本单佣金，不可使用！', | ||
| 1004 | + icon: 'none', | ||
| 1005 | + duration: 2000 | ||
| 1114 | }) | 1006 | }) |
| 1115 | } | 1007 | } |
| 1116 | 1008 | ||
| 1009 | + th.setData({ | ||
| 1010 | + bn_use_commission:0 | ||
| 1011 | + }) | ||
| 1012 | + } | ||
| 1117 | 1013 | ||
| 1118 | 1014 | ||
| 1119 | - var txt4 = "formData.use_commission"; | ||
| 1120 | 1015 | ||
| 1121 | - if(th.data.bn_use_commission){ | ||
| 1122 | - order_m=(parseFloat(order_m)- parseFloat(th.data.bn_goods.use_commission)).toFixed(2); | ||
| 1123 | - th.setData({[txt4]:th.data.bn_goods.use_commission}) | ||
| 1124 | - } | 1016 | + var txt4 = "formData.use_commission"; |
| 1125 | 1017 | ||
| 1018 | + if(th.data.bn_use_commission){ | ||
| 1019 | + order_m=(parseFloat(order_m)- parseFloat(th.data.bn_goods.use_commission)).toFixed(2); | ||
| 1020 | + th.setData({[txt4]:th.data.bn_goods.use_commission}) | ||
| 1021 | + } | ||
| 1126 | 1022 | ||
| 1127 | 1023 | ||
| 1128 | - var amoney = parseFloat(th.data.userinfo.user_money - th.data.txmon - th.data.userinfo.frozen_money); | ||
| 1129 | - //--------------如果使用余额--------------------- | ||
| 1130 | - if (th.data.bn_use_money == 1) { | ||
| 1131 | - if (amoney > order_m) { | ||
| 1132 | - order_m = parseFloat(order_m).toFixed(2); | ||
| 1133 | - th.setData({ [txt]: order_m, [txt2]: 0, [txt3]: coupon_price, show_submit: 1,dis_btn:0 }) | ||
| 1134 | - } else { | ||
| 1135 | - order_m = parseFloat(order_m) - parseFloat(amoney); | ||
| 1136 | - order_m = order_m.toFixed(2); | ||
| 1137 | - th.setData({ [txt]: amoney, [txt2]: order_m, [txt3]: coupon_price, show_submit: 1,dis_btn:0 }) | ||
| 1138 | - } | 1024 | + |
| 1025 | + var amoney = parseFloat(th.data.userinfo.user_money - th.data.txmon - th.data.userinfo.frozen_money); | ||
| 1026 | + //--------------如果使用余额--------------------- | ||
| 1027 | + if (th.data.bn_use_money == 1) { | ||
| 1028 | + if (amoney > order_m) { | ||
| 1029 | + order_m = parseFloat(order_m).toFixed(2); | ||
| 1030 | + th.setData({ [txt]: order_m, [txt2]: 0, [txt3]: coupon_price, show_submit: 1,dis_btn:0 }) | ||
| 1139 | } else { | 1031 | } else { |
| 1140 | - th.setData({ [txt]: 0, [txt2]: order_m, [txt3]: coupon_price, show_submit: 1,dis_btn:0 }) | ||
| 1141 | - } | ||
| 1142 | - //优惠活动送积分 | ||
| 1143 | - if (good.s_intValue) { | ||
| 1144 | - txt = "formData.give_integral"; | ||
| 1145 | - th.setData({ [txt]: good.s_intValue }); | ||
| 1146 | - } | ||
| 1147 | - //优惠送券 | ||
| 1148 | - if (good.s_coupon_id) { | ||
| 1149 | - var i_txt = "formData.give_coupon_id"; | ||
| 1150 | - //这个是json格式的 | ||
| 1151 | - var i_txt1 = "formData.g_coupon_num"; | ||
| 1152 | - var ob = [{ "num": good.s_coupon_num, "c_id": good.s_coupon_id }]; | ||
| 1153 | - ob = JSON.stringify(ob); | ||
| 1154 | - th.setData({ [i_txt]: good.s_coupon_id, [i_txt1]: ob }); | ||
| 1155 | - } | ||
| 1156 | - //优惠礼包 | ||
| 1157 | - if (good.s_libao) { | ||
| 1158 | - var l_txt = "formData.give_lb_id"; | ||
| 1159 | - //这个是json格式的 | ||
| 1160 | - var l_txt1 = "formData.g_lb_num"; | ||
| 1161 | - var ob = [{ "num": good.s_lb_num, "l_id": good.s_libao }]; | ||
| 1162 | - ob = JSON.stringify(ob); | ||
| 1163 | - th.setData({ [l_txt]: good.s_coupon_id, [l_txt1]: ob }); | 1032 | + order_m = parseFloat(order_m) - parseFloat(amoney); |
| 1033 | + order_m = order_m.toFixed(2); | ||
| 1034 | + th.setData({ [txt]: amoney, [txt2]: order_m, [txt3]: coupon_price, show_submit: 1,dis_btn:0 }) | ||
| 1164 | } | 1035 | } |
| 1036 | + } else { | ||
| 1037 | + th.setData({ [txt]: 0, [txt2]: order_m, [txt3]: coupon_price, show_submit: 1,dis_btn:0 }) | ||
| 1038 | + } | ||
| 1039 | + //优惠活动送积分 | ||
| 1040 | + if (good.s_intValue) { | ||
| 1041 | + txt = "formData.give_integral"; | ||
| 1042 | + th.setData({ [txt]: good.s_intValue }); | ||
| 1043 | + } | ||
| 1044 | + //优惠送券 | ||
| 1045 | + if (good.s_coupon_id) { | ||
| 1046 | + var i_txt = "formData.give_coupon_id"; | ||
| 1047 | + //这个是json格式的 | ||
| 1048 | + var i_txt1 = "formData.g_coupon_num"; | ||
| 1049 | + var ob = [{ "num": good.s_coupon_num, "c_id": good.s_coupon_id }]; | ||
| 1050 | + ob = JSON.stringify(ob); | ||
| 1051 | + th.setData({ [i_txt]: good.s_coupon_id, [i_txt1]: ob }); | ||
| 1052 | + } | ||
| 1053 | + //优惠礼包 | ||
| 1054 | + if (good.s_libao) { | ||
| 1055 | + var l_txt = "formData.give_lb_id"; | ||
| 1056 | + //这个是json格式的 | ||
| 1057 | + var l_txt1 = "formData.g_lb_num"; | ||
| 1058 | + var ob = [{ "num": good.s_lb_num, "l_id": good.s_libao }]; | ||
| 1059 | + ob = JSON.stringify(ob); | ||
| 1060 | + th.setData({ [l_txt]: good.s_coupon_id, [l_txt1]: ob }); | ||
| 1165 | } | 1061 | } |
| 1166 | 1062 | ||
| 1063 | + | ||
| 1167 | wx.hideLoading(); | 1064 | wx.hideLoading(); |
| 1168 | 1065 | ||
| 1169 | - // }); | ||
| 1170 | - // }); | 1066 | + |
| 1171 | }, | 1067 | }, |
| 1172 | 1068 | ||
| 1173 | //--------------------提交订单----------------------- | 1069 | //--------------------提交订单----------------------- |
| @@ -1241,12 +1137,12 @@ Page({ | @@ -1241,12 +1137,12 @@ Page({ | ||
| 1241 | 1137 | ||
| 1242 | var order_prom_list = {}; | 1138 | var order_prom_list = {}; |
| 1243 | //--判断有没有优惠活动-- | 1139 | //--判断有没有优惠活动-- |
| 1244 | - if (th.data.order_prom[item.pickup_id]) { | 1140 | + //if (th.data.order_prom[item.pickup_id]) { |
| 1245 | if (th.data.formData.order_prom_amount > 0) { | 1141 | if (th.data.formData.order_prom_amount > 0) { |
| 1246 | order_prom_list.order_prom_id = th.data.formData.order_prom_id; | 1142 | order_prom_list.order_prom_id = th.data.formData.order_prom_id; |
| 1247 | order_prom_list.order_prom_amount = th.data.formData.order_prom_amount; | 1143 | order_prom_list.order_prom_amount = th.data.formData.order_prom_amount; |
| 1248 | } | 1144 | } |
| 1249 | - } | 1145 | + //} |
| 1250 | 1146 | ||
| 1251 | //--判断优惠活动的提交-- | 1147 | //--判断优惠活动的提交-- |
| 1252 | if (th.data.formData.cut_price > 0) { | 1148 | if (th.data.formData.cut_price > 0) { |
packageC/pages/presell/cart/cart2_pre.js
| @@ -187,6 +187,8 @@ Page({ | @@ -187,6 +187,8 @@ Page({ | ||
| 187 | 187 | ||
| 188 | t.data.data.original_img = os.imghost + t.data.data.original_img; | 188 | t.data.data.original_img = os.imghost + t.data.data.original_img; |
| 189 | t.data.data['buynum'] = gg.goods_num; | 189 | t.data.data['buynum'] = gg.goods_num; |
| 190 | + t.data.data.prom_type=8; | ||
| 191 | + t.data.data.prom_id=gg.prom_id; | ||
| 190 | 192 | ||
| 191 | var distr_t = 0, et = 0; | 193 | var distr_t = 0, et = 0; |
| 192 | 194 |
packageC/pages/presell/goodsInfo/goodsInfo.js
| @@ -769,6 +769,9 @@ Page({ | @@ -769,6 +769,9 @@ Page({ | ||
| 769 | title: t.data.data.goods_name, | 769 | title: t.data.data.goods_name, |
| 770 | }); | 770 | }); |
| 771 | 771 | ||
| 772 | + t.data.data.prom_id= th.data.presell_id; | ||
| 773 | + t.data.data.prom_type= 8; | ||
| 774 | + | ||
| 772 | //-- 把商品的赋值 -- | 775 | //-- 把商品的赋值 -- |
| 773 | ee.data.fir_goods = JSON.parse(JSON.stringify(t.data.data)); | 776 | ee.data.fir_goods = JSON.parse(JSON.stringify(t.data.data)); |
| 774 | ee.data.sele_g_id = t.data.data.goods_id; | 777 | ee.data.sele_g_id = t.data.data.goods_id; |
| @@ -1151,7 +1154,7 @@ Page({ | @@ -1151,7 +1154,7 @@ Page({ | ||
| 1151 | newd.goods_price = th.data.prom_price; | 1154 | newd.goods_price = th.data.prom_price; |
| 1152 | newd.member_goods_price = th.data.prom_price, | 1155 | newd.member_goods_price = th.data.prom_price, |
| 1153 | newd.prom_type = 8; | 1156 | newd.prom_type = 8; |
| 1154 | - newd.prom_id = o.prom_id; | 1157 | + newd.prom_id = th.data.presell_id; |
| 1155 | 1158 | ||
| 1156 | if (o.store_count <= 0) return s.my_warnning("库存已为空！", 0, th); | 1159 | if (o.store_count <= 0) return s.my_warnning("库存已为空！", 0, th); |
| 1157 | if (o.store_count < e.data.goodsInputNum) return s.my_warnning("库存不足！", 0, th); | 1160 | if (o.store_count < e.data.goodsInputNum) return s.my_warnning("库存不足！", 0, th); |
| @@ -1734,11 +1737,11 @@ Page({ | @@ -1734,11 +1737,11 @@ Page({ | ||
| 1734 | is_on_sale: 1, | 1737 | is_on_sale: 1, |
| 1735 | pageSize: 500, | 1738 | pageSize: 500, |
| 1736 | orderField: 'gg_ordid,goods_spec,sort', | 1739 | orderField: 'gg_ordid,goods_spec,sort', |
| 1737 | - prom_type: 8, | 1740 | + //prom_type: 8, |
| 1738 | }; | 1741 | }; |
| 1739 | 1742 | ||
| 1740 | if (tt.data.presellForm && tt.data.presellForm.id) { | 1743 | if (tt.data.presellForm && tt.data.presellForm.id) { |
| 1741 | - rq_data.prom_id = tt.data.presellForm.id; | 1744 | + //rq_data.prom_id = tt.data.presellForm.id; |
| 1742 | } | 1745 | } |
| 1743 | 1746 | ||
| 1744 | await getApp().request.promiseGet("/api/weshop/goods/page", { | 1747 | await getApp().request.promiseGet("/api/weshop/goods/page", { |
| @@ -4370,6 +4373,7 @@ Page({ | @@ -4370,6 +4373,7 @@ Page({ | ||
| 4370 | if (res.data.code == 0 && res.data.data) { | 4373 | if (res.data.code == 0 && res.data.data) { |
| 4371 | var arr = res.data.data; | 4374 | var arr = res.data.data; |
| 4372 | presell_id = arr.presell_id; | 4375 | presell_id = arr.presell_id; |
| 4376 | + th.data.presell_id=presell_id; | ||
| 4373 | th.setData({ | 4377 | th.setData({ |
| 4374 | presellList: arr, | 4378 | presellList: arr, |
| 4375 | }) | 4379 | }) |
| @@ -4457,7 +4461,7 @@ Page({ | @@ -4457,7 +4461,7 @@ Page({ | ||
| 4457 | 4461 | ||
| 4458 | var userInfo = getApp().globalData.userInfo; | 4462 | var userInfo = getApp().globalData.userInfo; |
| 4459 | // timetype: 1, | 4463 | // timetype: 1, |
| 4460 | - var pre_data = { store_id: os.stoid, is_end: 0, isuse: 1, prom_type: 8, prom_id: presell_id, pageSize: 1000 }; | 4464 | + var pre_data = { store_id: os.stoid, is_end: 0, isuse: 1,presell_id: presell_id, pageSize: 1000 }; |
| 4461 | if (userInfo) { | 4465 | if (userInfo) { |
| 4462 | pre_data.user_id = userInfo.user_id; | 4466 | pre_data.user_id = userInfo.user_id; |
| 4463 | } | 4467 | } |
pages/goods/goodsInfo/goodsInfo.js
| @@ -7788,12 +7788,16 @@ Page({ | @@ -7788,12 +7788,16 @@ Page({ | ||
| 7788 | let item = arr_data[i]; | 7788 | let item = arr_data[i]; |
| 7789 | //找不到活动要剔除 | 7789 | //找不到活动要剔除 |
| 7790 | if (!item.act_name) continue; | 7790 | if (!item.act_name) continue; |
| 7791 | +<<<<<<< HEAD | ||
| 7791 | if ([1,2,4,6].indexOf(item.prom_type)==-1) continue; | 7792 | if ([1,2,4,6].indexOf(item.prom_type)==-1) continue; |
| 7792 | 7793 | ||
| 7793 | var s_time=item.warm_uptime; | 7794 | var s_time=item.warm_uptime; |
| 7794 | if(!s_time) item.s_time; | 7795 | if(!s_time) item.s_time; |
| 7795 | if(s_time>ut.gettimestamp()) continue; | 7796 | if(s_time>ut.gettimestamp()) continue; |
| 7796 | 7797 | ||
| 7798 | +======= | ||
| 7799 | + if ([1,2,4,6,8].indexOf(item.prom_type)==-1) continue; | ||
| 7800 | +>>>>>>> dev_presell | ||
| 7797 | new_arr.push(item); | 7801 | new_arr.push(item); |
| 7798 | } | 7802 | } |
| 7799 | 7803 | ||
| @@ -7814,7 +7818,20 @@ Page({ | @@ -7814,7 +7818,20 @@ Page({ | ||
| 7814 | var prom_id = e.currentTarget.dataset.id; | 7818 | var prom_id = e.currentTarget.dataset.id; |
| 7815 | var prom_type = e.currentTarget.dataset.prom_type; | 7819 | var prom_type = e.currentTarget.dataset.prom_type; |
| 7816 | var goods_id = this.data.data.goods_id; | 7820 | var goods_id = this.data.data.goods_id; |
| 7817 | - var url = "/pages/goods/goodsInfo/goodsInfo?goods_id=" + goods_id + "&prom_id=" + prom_id + "&prom_type="+prom_type; | 7821 | + var url = ""; |
| 7822 | + | ||
| 7823 | + switch (parseInt(prom_type)){ | ||
| 7824 | + case 1: | ||
| 7825 | + case 2: | ||
| 7826 | + case 4: | ||
| 7827 | + case 6: | ||
| 7828 | + url = "/pages/goods/goodsInfo/goodsInfo?goods_id=" + goods_id + "&prom_id=" + prom_id + "&prom_type="+prom_type; | ||
| 7829 | + break; | ||
| 7830 | + case 8: | ||
| 7831 | + url = "/packageC/pages/presell/goodsInfo/goodsInfo?goods_id=" + goods_id+ "&prom_id=" + prom_id; | ||
| 7832 | + } | ||
| 7833 | + | ||
| 7834 | + | ||
| 7818 | getApp().goto(url); | 7835 | getApp().goto(url); |
| 7819 | }, | 7836 | }, |
| 7820 | 7837 |
pages/goods/goodsInfo/goodsInfo.wxml
| @@ -604,6 +604,7 @@ | @@ -604,6 +604,7 @@ | ||
| 604 | <view wx:if="{{item.prom_type==2}}" class="cx-sizs wsize" style="width: 144rpx">团购</view> | 604 | <view wx:if="{{item.prom_type==2}}" class="cx-sizs wsize" style="width: 144rpx">团购</view> |
| 605 | <view wx:if="{{item.prom_type==4}}" class="cx-sizs wsize" style="width: 144rpx">积分购</view> | 605 | <view wx:if="{{item.prom_type==4}}" class="cx-sizs wsize" style="width: 144rpx">积分购</view> |
| 606 | <view wx:if="{{item.prom_type==6}}" class="cx-sizs wsize" style="width: 144rpx">天天拼单</view> | 606 | <view wx:if="{{item.prom_type==6}}" class="cx-sizs wsize" style="width: 144rpx">天天拼单</view> |
| 607 | + <view wx:if="{{item.prom_type==8}}" class="cx-sizs wsize" style="width: 144rpx">预售</view> | ||
| 607 | 608 | ||
| 608 | <!-- 中间显示层 --> | 609 | <!-- 中间显示层 --> |
| 609 | <view class="flex ai-center jc_sb" style="width: 570rpx" bindtap="go_more_flash" data-prom_type="{{item.prom_type}}" data-id="{{item.act_id}}"> | 610 | <view class="flex ai-center jc_sb" style="width: 570rpx" bindtap="go_more_flash" data-prom_type="{{item.prom_type}}" data-id="{{item.act_id}}"> |
| @@ -613,6 +614,7 @@ | @@ -613,6 +614,7 @@ | ||
| 613 | <view wx:if="{{item.prom_type==2}}" class="miao_lab">团</view> | 614 | <view wx:if="{{item.prom_type==2}}" class="miao_lab">团</view> |
| 614 | <view wx:if="{{item.prom_type==4}}" class="miao_lab">积</view> | 615 | <view wx:if="{{item.prom_type==4}}" class="miao_lab">积</view> |
| 615 | <view wx:if="{{item.prom_type==6}}" class="miao_lab">拼</view> | 616 | <view wx:if="{{item.prom_type==6}}" class="miao_lab">拼</view> |
| 617 | + <view wx:if="{{item.prom_type==6}}" class="miao_lab">预</view> | ||
| 616 | 618 | ||
| 617 | 619 | ||
| 618 | <view class="order_hui"> | 620 | <view class="order_hui"> |