Commit 7ddd8d91e39580d4446dde5140ed111e2248b939
1 parent
621a21f3
不包邮地区文图
Showing
4 changed files
with
22 additions
and
22 deletions
packageC/pages/luckyGo/luckyGo_cart/luckyGo_cart.js
| @@ -1425,16 +1425,16 @@ Page({ | @@ -1425,16 +1425,16 @@ Page({ | ||
| 1425 | if (by_qc.region_list != "" && by_qc.region_list != null && by_qc.region_list != undefined) { | 1425 | if (by_qc.region_list != "" && by_qc.region_list != null && by_qc.region_list != undefined) { |
| 1426 | if (th.check_by_area(by_qc.region_list)) { | 1426 | if (th.check_by_area(by_qc.region_list)) { |
| 1427 | freight_free = 0; | 1427 | freight_free = 0; |
| 1428 | - goods_weight = -1; | ||
| 1429 | - out_of_weight = 0; | 1428 | + // goods_weight = -1; |
| 1429 | + // out_of_weight = 0; | ||
| 1430 | th.data.is_no_by[pickid] = 1; | 1430 | th.data.is_no_by[pickid] = 1; |
| 1431 | } | 1431 | } |
| 1432 | } | 1432 | } |
| 1433 | //如果有设置不包邮区商品 | 1433 | //如果有设置不包邮区商品 |
| 1434 | if (by_qc.goods_list != "" && by_qc.goods_list != undefined && by_qc != null && freight_free > 0) { | 1434 | if (by_qc.goods_list != "" && by_qc.goods_list != undefined && by_qc != null && freight_free > 0) { |
| 1435 | freight_free = 0; | 1435 | freight_free = 0; |
| 1436 | - goods_weight = -1; | ||
| 1437 | - out_of_weight = 0; | 1436 | + // goods_weight = -1; |
| 1437 | + // out_of_weight = 0; | ||
| 1438 | th.data.is_no_by[pickid] = 1; | 1438 | th.data.is_no_by[pickid] = 1; |
| 1439 | no_ex_good = by_qc.goods_list; | 1439 | no_ex_good = by_qc.goods_list; |
| 1440 | } | 1440 | } |
| @@ -1902,7 +1902,7 @@ Page({ | @@ -1902,7 +1902,7 @@ Page({ | ||
| 1902 | if (res.data.data[0].region_list) { | 1902 | if (res.data.data[0].region_list) { |
| 1903 | if (th.check_by_area(res.data.data[0].region_list)) { | 1903 | if (th.check_by_area(res.data.data[0].region_list)) { |
| 1904 | freight_free = 0; | 1904 | freight_free = 0; |
| 1905 | - out_of_weight = 0; | 1905 | + // out_of_weight = 0; |
| 1906 | th.data.is_no_by[th.data.bn_pick] = 1; | 1906 | th.data.is_no_by[th.data.bn_pick] = 1; |
| 1907 | } | 1907 | } |
| 1908 | } | 1908 | } |
| @@ -1910,7 +1910,7 @@ Page({ | @@ -1910,7 +1910,7 @@ Page({ | ||
| 1910 | if (res.data.data[0].goods_list && freight_free) { | 1910 | if (res.data.data[0].goods_list && freight_free) { |
| 1911 | if (th.check_by_goods(res.data.data[0].goods_list)) { | 1911 | if (th.check_by_goods(res.data.data[0].goods_list)) { |
| 1912 | freight_free = 0; | 1912 | freight_free = 0; |
| 1913 | - out_of_weight = 0; | 1913 | + // out_of_weight = 0; |
| 1914 | th.data.is_no_by[th.data.bn_pick] = 1; | 1914 | th.data.is_no_by[th.data.bn_pick] = 1; |
| 1915 | } | 1915 | } |
| 1916 | } | 1916 | } |
| @@ -3798,7 +3798,7 @@ Page({ | @@ -3798,7 +3798,7 @@ Page({ | ||
| 3798 | if (no_by_data && no_by_data.region_list) { | 3798 | if (no_by_data && no_by_data.region_list) { |
| 3799 | if (th.check_by_area(no_by_data.region_list)) { | 3799 | if (th.check_by_area(no_by_data.region_list)) { |
| 3800 | gift_freight_free = 0; | 3800 | gift_freight_free = 0; |
| 3801 | - out_of_weight = 0; | 3801 | + // out_of_weight = 0; |
| 3802 | th.data.is_no_by[th.data.bn_pick] = 1; | 3802 | th.data.is_no_by[th.data.bn_pick] = 1; |
| 3803 | } | 3803 | } |
| 3804 | } | 3804 | } |
| @@ -3806,7 +3806,7 @@ Page({ | @@ -3806,7 +3806,7 @@ Page({ | ||
| 3806 | if (no_by_data && no_by_data.goods_list && gift_freight_free) { | 3806 | if (no_by_data && no_by_data.goods_list && gift_freight_free) { |
| 3807 | if (th.check_by_goods(no_by_data.goods_list, good.goods_id)) { | 3807 | if (th.check_by_goods(no_by_data.goods_list, good.goods_id)) { |
| 3808 | gift_freight_free = 0; | 3808 | gift_freight_free = 0; |
| 3809 | - out_of_weight = 0; | 3809 | + // out_of_weight = 0; |
| 3810 | th.data.is_no_by[th.data.bn_pick] = 1; | 3810 | th.data.is_no_by[th.data.bn_pick] = 1; |
| 3811 | //th.data.is_no_by[th.data.bn_pick]=1; | 3811 | //th.data.is_no_by[th.data.bn_pick]=1; |
| 3812 | } | 3812 | } |
packageC/pages/presell/cart/cart2.js
| @@ -713,8 +713,8 @@ Page({ | @@ -713,8 +713,8 @@ Page({ | ||
| 713 | if (res.data.data[0].region_list) { | 713 | if (res.data.data[0].region_list) { |
| 714 | if (th.check_by_area(res.data.data[0].region_list)) { | 714 | if (th.check_by_area(res.data.data[0].region_list)) { |
| 715 | freight_free = 0; | 715 | freight_free = 0; |
| 716 | - out_of_weight = 0; | ||
| 717 | - weight_free=-1; | 716 | + // out_of_weight = 0; |
| 717 | + // weight_free=-1; | ||
| 718 | th.data.is_no_by[th.data.bn_pick] = 1; | 718 | th.data.is_no_by[th.data.bn_pick] = 1; |
| 719 | } | 719 | } |
| 720 | } | 720 | } |
| @@ -722,8 +722,8 @@ Page({ | @@ -722,8 +722,8 @@ Page({ | ||
| 722 | if (res.data.data[0].goods_list && freight_free) { | 722 | if (res.data.data[0].goods_list && freight_free) { |
| 723 | if (th.check_by_goods(res.data.data[0].goods_list)) { | 723 | if (th.check_by_goods(res.data.data[0].goods_list)) { |
| 724 | freight_free = 0; | 724 | freight_free = 0; |
| 725 | - out_of_weight = 0; | ||
| 726 | - weight_free=-1; | 725 | + // out_of_weight = 0; |
| 726 | + // weight_free=-1; | ||
| 727 | th.data.is_no_by[th.data.bn_pick] = 1; | 727 | th.data.is_no_by[th.data.bn_pick] = 1; |
| 728 | } | 728 | } |
| 729 | } | 729 | } |
| @@ -2585,7 +2585,7 @@ Page({ | @@ -2585,7 +2585,7 @@ Page({ | ||
| 2585 | if (no_by_data && no_by_data.region_list) { | 2585 | if (no_by_data && no_by_data.region_list) { |
| 2586 | if (th.check_by_area(no_by_data.region_list)) { | 2586 | if (th.check_by_area(no_by_data.region_list)) { |
| 2587 | gift_freight_free = 0; | 2587 | gift_freight_free = 0; |
| 2588 | - out_of_weight = 0; | 2588 | + // out_of_weight = 0; |
| 2589 | th.data.is_no_by[th.data.bn_pick] = 1; | 2589 | th.data.is_no_by[th.data.bn_pick] = 1; |
| 2590 | } | 2590 | } |
| 2591 | } | 2591 | } |
| @@ -2593,7 +2593,7 @@ Page({ | @@ -2593,7 +2593,7 @@ Page({ | ||
| 2593 | if (no_by_data && no_by_data.goods_list && gift_freight_free) { | 2593 | if (no_by_data && no_by_data.goods_list && gift_freight_free) { |
| 2594 | if (th.check_by_goods(no_by_data.goods_list, good.goods_id)) { | 2594 | if (th.check_by_goods(no_by_data.goods_list, good.goods_id)) { |
| 2595 | gift_freight_free = 0; | 2595 | gift_freight_free = 0; |
| 2596 | - out_of_weight = 0; | 2596 | + // out_of_weight = 0; |
| 2597 | th.data.is_no_by[th.data.bn_pick]=1; | 2597 | th.data.is_no_by[th.data.bn_pick]=1; |
| 2598 | } | 2598 | } |
| 2599 | } | 2599 | } |
pages/cart/cart2/cart2.js
| @@ -2056,7 +2056,7 @@ Page({ | @@ -2056,7 +2056,7 @@ Page({ | ||
| 2056 | if (res.data.data[0].region_list) { | 2056 | if (res.data.data[0].region_list) { |
| 2057 | if (th.check_by_area(res.data.data[0].region_list)) { | 2057 | if (th.check_by_area(res.data.data[0].region_list)) { |
| 2058 | freight_free = 0; | 2058 | freight_free = 0; |
| 2059 | - out_of_weight = 0; | 2059 | + // out_of_weight = 0; |
| 2060 | th.data.is_no_by[th.data.bn_pick] = 1; | 2060 | th.data.is_no_by[th.data.bn_pick] = 1; |
| 2061 | } | 2061 | } |
| 2062 | } | 2062 | } |
| @@ -2064,7 +2064,7 @@ Page({ | @@ -2064,7 +2064,7 @@ Page({ | ||
| 2064 | if (res.data.data[0].goods_list && freight_free) { | 2064 | if (res.data.data[0].goods_list && freight_free) { |
| 2065 | if (th.check_by_goods(res.data.data[0].goods_list)) { | 2065 | if (th.check_by_goods(res.data.data[0].goods_list)) { |
| 2066 | freight_free = 0; | 2066 | freight_free = 0; |
| 2067 | - out_of_weight = 0; | 2067 | + // out_of_weight = 0; |
| 2068 | th.data.is_no_by[th.data.bn_pick] = 1; | 2068 | th.data.is_no_by[th.data.bn_pick] = 1; |
| 2069 | } | 2069 | } |
| 2070 | } | 2070 | } |
| @@ -4090,7 +4090,7 @@ Page({ | @@ -4090,7 +4090,7 @@ Page({ | ||
| 4090 | if (no_by_data && no_by_data.region_list) { | 4090 | if (no_by_data && no_by_data.region_list) { |
| 4091 | if (th.check_by_area(no_by_data.region_list)) { | 4091 | if (th.check_by_area(no_by_data.region_list)) { |
| 4092 | gift_freight_free = 0; | 4092 | gift_freight_free = 0; |
| 4093 | - out_of_weight = 0 | 4093 | + // out_of_weight = 0 |
| 4094 | th.data.is_no_by[th.data.bn_pick] = 1; | 4094 | th.data.is_no_by[th.data.bn_pick] = 1; |
| 4095 | } | 4095 | } |
| 4096 | } | 4096 | } |
| @@ -4098,7 +4098,7 @@ Page({ | @@ -4098,7 +4098,7 @@ Page({ | ||
| 4098 | if (no_by_data && no_by_data.goods_list && gift_freight_free) { | 4098 | if (no_by_data && no_by_data.goods_list && gift_freight_free) { |
| 4099 | if (th.check_by_goods(no_by_data.goods_list, good.goods_id)) { | 4099 | if (th.check_by_goods(no_by_data.goods_list, good.goods_id)) { |
| 4100 | gift_freight_free = 0; | 4100 | gift_freight_free = 0; |
| 4101 | - out_of_weight = 0 | 4101 | + // out_of_weight = 0 |
| 4102 | th.data.is_no_by[th.data.bn_pick]=1; | 4102 | th.data.is_no_by[th.data.bn_pick]=1; |
| 4103 | } | 4103 | } |
| 4104 | } | 4104 | } |
pages/cart/cart2_inte/cart2_inte.js
| @@ -484,8 +484,8 @@ Page({ | @@ -484,8 +484,8 @@ Page({ | ||
| 484 | if (res.data.data[0].region_list) { | 484 | if (res.data.data[0].region_list) { |
| 485 | if (th.check_by_area(res.data.data[0].region_list)) { | 485 | if (th.check_by_area(res.data.data[0].region_list)) { |
| 486 | freight_free = 0; | 486 | freight_free = 0; |
| 487 | - out_of_weight = 0; | ||
| 488 | - weight_free = -1; | 487 | + // out_of_weight = 0; |
| 488 | + // weight_free = -1; | ||
| 489 | th.data.is_no_by[th.data.bn_pick] = 1; | 489 | th.data.is_no_by[th.data.bn_pick] = 1; |
| 490 | } | 490 | } |
| 491 | } | 491 | } |
| @@ -493,8 +493,8 @@ Page({ | @@ -493,8 +493,8 @@ Page({ | ||
| 493 | if (res.data.data[0].goods_list && freight_free) { | 493 | if (res.data.data[0].goods_list && freight_free) { |
| 494 | if (th.check_by_goods(res.data.data[0].goods_list)) { | 494 | if (th.check_by_goods(res.data.data[0].goods_list)) { |
| 495 | freight_free = 0; | 495 | freight_free = 0; |
| 496 | - out_of_weight = 0; | ||
| 497 | - weight_free = -1; | 496 | + // out_of_weight = 0; |
| 497 | + // weight_free = -1; | ||
| 498 | th.data.is_no_by[th.data.bn_pick] = 1; | 498 | th.data.is_no_by[th.data.bn_pick] = 1; |
| 499 | } | 499 | } |
| 500 | } | 500 | } |